Merge branch 'dev' into beta

golos-blockchain · Nov 28, 2024 · c8c9976 · c8c9976
2 parents 15313e4 + e180d41
commit c8c9976
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 16 deletions.
diff --git a/app/assets/icons/copy_ok.svg b/app/assets/icons/copy_ok.svg
diff --git a/app/components/cards/PostSummary.jsx b/app/components/cards/PostSummary.jsx
@@ -324,7 +324,7 @@ class PostSummary extends React.Component {
             </a>
             {isOnlyblog && <span className="nsfw_post" title={tt('post_editor.onlyblog_hint')}>{tt('g.for_followers')}</span>}
             {isOnlyapp && <span className="nsfw_post">{tt('g.only_app')}</span>}
-            {isOnlySponsors && <span className="nsfw_post" title={tt('post_editor.visible_option_onlysponsors')}>{tt('g.for_sponsors')}</span>}
+            {isOnlySponsors && <span className="worker_post" title={tt('post_editor.visible_option_onlysponsors')}>{tt('g.for_sponsors')}</span>}
             {foreignApp && <ForeignApp foreignApp={foreignApp} />}
             {warn && <span className="nsfw_post" title={tt('post_editor.nsfw_hint')}>{detransliterate(nsfwTitle)}</span>}
             {worker_post && <a target="_blank" href={worker_post}><span className="worker_post">{tt('workers.worker_post')}</span></a>}

diff --git a/app/components/elements/EncryptedStub.jsx b/app/components/elements/EncryptedStub.jsx
@@ -17,18 +17,18 @@ class EncryptedStub extends React.Component {
             {title}
             <LinkEx to={'/@' + author}>
                 {'@' + author}
-            </LinkEx>{'. '}
+            </LinkEx>
         </div>
     }
 
     _renderSub = (sub) => {
         if (!sub) return null
         sub = sub.toJS()
         return <div>
-            {tt('poststub.for_sponsors2')}
+            <br />{tt('poststub.for_sponsors2')}
             <b>{Asset(sub.cost).floatString}</b>
             {sub.tip_cost ? tt('poststub.for_sponsors3') : null}
-            {tt('poststub.for_sponsors4')}{' '}
+            {tt('poststub.for_sponsors4')}{' '}<br />
             {tt('poststub.for_sponsors5')}{' '}
         </div>
     }

diff --git 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
@@ -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
@@ -215,7 +215,7 @@ class Donate extends React.Component {
                 <button type='submit' disabled={disabled} className='button'>
                     {tt('g.donate_support')}
                 </button>
-                <button className='button hollow' onClick={this.showGiftNft}>
+                <button className='button hollow float-right' onClick={this.showGiftNft}>
                     {tt('transfer_jsx.gift_nft')}
                 </button>
             </span>}

diff --git 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 {
                 <span style={{border: '1px solid lightgray', padding: '5px', borderRadius: '3px'}}>
                     <a target="_blank" href={refUrl}>{refUrl}</a>
                 </span>
-                <CopyToClipboard text={refUrl}>
+                <CopyToClipboard text={refUrl} onCopy={() => this.setState({copied_addr: true})}>
                     <span style={{cursor: 'pointer'}}>
-                        <Icon name="copy" size="2x" />
+                        <Icon name="copy" size="2x" /> {this.state.copied_addr ? <Icon name="copy_ok" /> : null}
                     </span>
                 </CopyToClipboard>
                 <span className='float-right'>&nbsp;&nbsp;</span>

diff --git a/app/components/pages/Services.jsx b/app/components/pages/Services.jsx
@@ -23,7 +23,7 @@ class Services extends React.Component {
                             <div className='column large-3 medium-3 small-6'>
                                 <a target="_blank" href="https://wallet.golos.id"><Icon name='money' size='10x'/>
                                 <h5>Golos Wallet + DEX</h5></a>
-                                <p className='landing-services-block-icon-text'>Кошелек и торговля на <a target="_blank" href="https://wallet.golos.id/rating">внутренней бирже</a> и <a target="_blank" href="https://wallet.golos.id/convert/GOLOS/YMUSDT">обменнике</a>, веб-клиентах <a target="_blank" href="https://dex.golos.app/#/trade/GOLOS_YMUSDT">dex.golos.app</a> или <a target="_blank" href="https://gls.exchange/#/trade/GOLOS_YMUSDT">gls.exchange</a></p>
+                                <p className='landing-services-block-icon-text'>Кошелек и торговля на <a target="_blank" href="https://wallet.golos.id/rating">бирже</a>/<a target="_blank" href="https://wallet.golos.id/convert/GOLOS/YMUSDT">обменнике</a>, веб-клиентах <a target="_blank" href="https://dex.golos.app/#/trade/GOLOS_YMUSDT">dex.golos.app</a> или <a target="_blank" href="https://gls.exchange/#/trade/GOLOS_YMUSDT">gls.exchange</a>, витрина <a target="_blank" href="https://wallet.golos.id/nft">NFT-маркета</a></p>
                             </div>
                             <div className='column large-3 medium-3 small-6'>
                                 <a target="_blank" href="https://chat.golos.app"><Icon name='rocket' size='10x'/>
@@ -74,6 +74,9 @@ class Services extends React.Component {
                                 <h4><a target="_blank" href="/@one-armed"><Icon name="new/monitor" /> однорукий бандит</a></h4>
                                 {tt('services.developer')} <a href="/@jackvote">@jackvote</a>
                                 <p>Классическая слот-машина "однорукий бандит" с тремя барабанами... <a href="/@one-armed/slot-mashina-tri-kita">{tt('g.more_hint')}</a> <Icon name="extlink" /></p>
+                                <h4><a target="_blank" href="/@golos.lotto"><Icon name="new/monitor" /> лото голос</a></h4>
+                                {tt('services.developer')} <a href="/@m0ssa99">@m0ssa99</a>
+                                <p>Голос Лото, ставки, билеты, джекпоты... <a href="/@m0ssa99/xe34shq4hfzffxx">{tt('g.more_hint')}</a> <Icon name="extlink" /></p>
                             </div>
                         </div>
                     </div>

diff --git 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
@@ -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"
   }
 }
diff --git 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
@@ -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
@@ -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
@@ -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": {