diff --git a/app/assets/icons/copy_ok.svg b/app/assets/icons/copy_ok.svg new file mode 100644 index 00000000..978d0117 --- /dev/null +++ b/app/assets/icons/copy_ok.svg @@ -0,0 +1,22 @@ + + + + +Created by potrace 1.15, written by Peter Selinger 2001-2017 + + + + + diff --git a/app/components/cards/PostSummary.jsx b/app/components/cards/PostSummary.jsx index 1f0ea412..a3995419 100644 --- a/app/components/cards/PostSummary.jsx +++ b/app/components/cards/PostSummary.jsx @@ -324,7 +324,7 @@ class PostSummary extends React.Component { {isOnlyblog && {tt('g.for_followers')}} {isOnlyapp && {tt('g.only_app')}} - {isOnlySponsors && {tt('g.for_sponsors')}} + {isOnlySponsors && {tt('g.for_sponsors')}} {foreignApp && } {warn && {detransliterate(nsfwTitle)}} {worker_post && {tt('workers.worker_post')}} diff --git a/app/components/elements/EncryptedStub.jsx b/app/components/elements/EncryptedStub.jsx index 9c444ef6..c6b185d5 100644 --- a/app/components/elements/EncryptedStub.jsx +++ b/app/components/elements/EncryptedStub.jsx @@ -17,7 +17,7 @@ class EncryptedStub extends React.Component { {title} {'@' + author} - {'. '} + } @@ -25,10 +25,10 @@ class EncryptedStub extends React.Component { if (!sub) return null sub = sub.toJS() return
- {tt('poststub.for_sponsors2')} +
{tt('poststub.for_sponsors2')} {Asset(sub.cost).floatString} {sub.tip_cost ? tt('poststub.for_sponsors3') : null} - {tt('poststub.for_sponsors4')}{' '} + {tt('poststub.for_sponsors4')}{' '}
{tt('poststub.for_sponsors5')}{' '}
} diff --git a/app/components/elements/Icon.jsx b/app/components/elements/Icon.jsx index faf1e030..b8b3c121 100644 --- a/app/components/elements/Icon.jsx +++ b/app/components/elements/Icon.jsx @@ -22,7 +22,8 @@ const icons = new Map([ ['vk', require('app/assets/icons/vk.svg')], ['link', require('app/assets/icons/link.svg')], ['clock', require('app/assets/icons/clock.svg')], - ['copy', require('app/assets/icons/copy.svg')], + ['copy', require('app/assets/icons/copy.svg')], + ['copy_ok', require('app/assets/icons/copy_ok.svg')], ['extlink', require('app/assets/icons/extlink.svg')], ['golos', require('app/assets/icons/golos.svg')], ['dropdown-arrow', require('app/assets/icons/dropdown-arrow.svg')], diff --git a/app/components/elements/postEditor/PostOptions/PostOptions.jsx b/app/components/elements/postEditor/PostOptions/PostOptions.jsx index 8d92e071..e94e8f36 100644 --- a/app/components/elements/postEditor/PostOptions/PostOptions.jsx +++ b/app/components/elements/postEditor/PostOptions/PostOptions.jsx @@ -74,6 +74,7 @@ class PostOptions extends React.PureComponent { } render() { + const { editMode, decryptFee } = this.props const { showCoinMenu, showLockMenu, curatorPercent, minCurationPercent, maxCurationPercent, decryptFeeToSave } = this.state; const hasDecryptFee = (decryptFee && decryptFee.amount > 0) diff --git a/app/components/modules/Donate.jsx b/app/components/modules/Donate.jsx index 1372d762..a4a5d25c 100644 --- a/app/components/modules/Donate.jsx +++ b/app/components/modules/Donate.jsx @@ -215,7 +215,7 @@ class Donate extends React.Component { - } diff --git a/app/components/modules/Referrals.jsx b/app/components/modules/Referrals.jsx index e5c70b75..d1ecabc4 100644 --- a/app/components/modules/Referrals.jsx +++ b/app/components/modules/Referrals.jsx @@ -24,6 +24,7 @@ class Referrals extends React.Component { } state = { + copied_addr: false, } componentDidMount() { @@ -134,9 +135,9 @@ class Referrals extends React.Component { {refUrl} - + this.setState({copied_addr: true})}> - + {this.state.copied_addr ? : null}    diff --git a/app/components/pages/Services.jsx b/app/components/pages/Services.jsx index ba834ce2..cfa4c9ac 100644 --- a/app/components/pages/Services.jsx +++ b/app/components/pages/Services.jsx @@ -23,7 +23,7 @@ class Services extends React.Component {
Golos Wallet + DEX
 -

Кошелек и торговля на внутренней бирже и обменнике, веб-клиентах dex.golos.app или gls.exchange

+

Кошелек и торговля на бирже/обменнике, веб-клиентах dex.golos.app или gls.exchange, витрина NFT-маркета

@@ -74,6 +74,9 @@ class Services extends React.Component {

однорукий бандит

{tt('services.developer')} @jackvote

Классическая слот-машина "однорукий бандит" с тремя барабанами... {tt('g.more_hint')}

+

лото голос

+ {tt('services.developer')} @m0ssa99 +

Голос Лото, ставки, билеты, джекпоты... {tt('g.more_hint')}

diff --git a/app/components/pages/app/AppUpdate.jsx b/app/components/pages/app/AppUpdate.jsx index e80fd9af..6b409992 100644 --- a/app/components/pages/app/AppUpdate.jsx +++ b/app/components/pages/app/AppUpdate.jsx @@ -13,7 +13,7 @@ class AppUpdate extends React.Component { appUpdaterUrl = (file) => { let url = new URL( - '/desktop-' + ($STM_Config.platform === 'linux' ? 'linux' : 'win') + '/' + file, + '/desktop-' + ($STM_Config.platform === 'linux' ? 'linux' : 'windows') + '/' + file, $STM_Config.app_updater.host ) return url.toString() diff --git a/app/locales/en.json b/app/locales/en.json index 68b6dbca..9196646d 100644 --- a/app/locales/en.json +++ b/app/locales/en.json @@ -1202,7 +1202,7 @@ "logs": "Logs" }, "app_update": { - "notify_VERSION": "Доступна новая версия GOLOS Блогов - %(VERSION)s", + "notify_VERSION": "New version is available Golos Desktop - %(VERSION)s", "download": "Download" } } \ No newline at end of file diff --git a/app/locales/ru-RU.json b/app/locales/ru-RU.json index 5198765c..4af19b0e 100644 --- a/app/locales/ru-RU.json +++ b/app/locales/ru-RU.json @@ -647,9 +647,9 @@ "install": "Установить приложение", "login_to_see_comment": "Авторизуйтесь, чтобы видеть комментарий.", "for_sponsors": "Этот пост доступен только спонсорам ", - "for_sponsors2": "Цена - ", + "for_sponsors2": "Оформите подписку за ", "for_sponsors3": " (TIP-баланс)", - "for_sponsors4": " в месяц.", + "for_sponsors4": " в месяц и получите доступ ко всему контенту.", "for_sponsors5": "Первый платеж спишется сейчас, а потом - автоматически раз в месяц.", "become_sponsor": "Стать спонсором", "sponsorship_expired": "Ваше спонсорство истекло. Продлите его, чтобы читать посты ", @@ -1268,7 +1268,7 @@ "logs": "Логи" }, "app_update": { - "notify_VERSION": "Доступна новая версия GOLOS Блогов - %(VERSION)s", + "notify_VERSION": "Доступна новая версия Golos Desktop - %(VERSION)s", "download": "Скачать" } } diff --git a/app/utils/sponsors.js b/app/utils/sponsors.js index 027a15b1..532f0cd8 100644 --- a/app/utils/sponsors.js +++ b/app/utils/sponsors.js @@ -137,7 +137,6 @@ export async function tryDecryptContents(contents) { content.encrypted_sub = sub content.encrypted_decrypt_fee = decrypt_fee } -console.time('xxx') if (entries.length) { try { const { head_block_number, witness } = await golos.api.getDynamicGlobalPropertiesAsync() diff --git a/config/default.json b/config/default.json index 6ea5cb57..6292eb9a 100644 --- a/config/default.json +++ b/config/default.json @@ -4,6 +4,7 @@ "ws_connection_client": "wss://apibeta.golos.today/ws", "ws_connection_server": "wss://apibeta.golos.today/ws", "proxy_node": false, + "authorization_required": false, "helmet": { "directives": { "defaultSrc": "'self'", diff --git a/package.json b/package.json index cf7d10f6..b0b3c320 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "type": "git", "url": "https://github.com/golos-blockchain/ui-blogs.git" }, - "version": "1.5.0", + "version": "1.6.0", "description": "Golos Blogs — децентрализованная платформа блогов, работающая на блокчейне Golos.", "main": "dist/electron/electron.js", "scripts": {