Merge branch 'master' into dev

golos-blockchain · Nov 29, 2024 · 0e4b4bd · 0e4b4bd
2 parents f5ae706 + a0c9b3c
commit 0e4b4bd
Show file tree

Hide file tree

Showing 17 changed files with 95 additions and 66 deletions.
diff --git a/app/components/cards/TransferHistoryRow.jsx b/app/components/cards/TransferHistoryRow.jsx
@@ -291,11 +291,13 @@ class TransferHistoryRow extends React.Component {
         else if (type === 'unlimit_cost') {
             description_start += tt('transferhistoryrow_jsx.claimed') + data.amount + tt('transferhistoryrow_jsx.from_tip') + tt('transferhistoryrow_jsx.for')
             if (data.target_type === 'comment') {
-                link = data.id1 + '/' + data.id2
+                link = blogsUrl('@' + data.id1 + '/' + data.id2)
                 linkTitle = tt('transferhistoryrow_jsx.comment')
+                linkExternal = true
             } else if (data.target_type === 'vote') {
-                link = data.id1 + '/' + (data.id2 || '')
+                link = blogsUrl('@' + data.id1 + '/' + (data.id2 || ''))
                 linkTitle = tt('transferhistoryrow_jsx.vote')
+                linkExternal = true
             } else {
                 description_start += tt('transferhistoryrow_jsx.action')
             }

diff --git a/app/components/elements/market/MarketPair.jsx b/app/components/elements/market/MarketPair.jsx
@@ -7,6 +7,7 @@ import { Asset, } from 'golos-lib-js/lib/utils'
 import PagedDropdownMenu from 'app/components/elements/PagedDropdownMenu'
 import Icon from 'app/components/elements/Icon'
 import { getAssetMeta, getTradablesFor } from 'app/utils/market/utils'
+import { proxifyNFTImage } from 'app/utils/ProxifyUrl'
 
 class MarketPair extends React.Component {
     static propTypes = {

diff --git a/app/components/elements/nft/NFTMarketCollections.jsx b/app/components/elements/nft/NFTMarketCollections.jsx
@@ -64,7 +64,7 @@ class NFTMarketCollections extends React.Component {
                 }
             }}
             selected={selected}
-            perPage={20}>
+            perPage={13}>
             {selected}
             <Icon name="dropdown-arrow" />
         </PagedDropdownMenu>

diff --git a/app/components/modules/QuickBuy.jsx b/app/components/modules/QuickBuy.jsx
@@ -181,15 +181,13 @@ class QuickBuy extends React.Component {
                 </DropdownMenu>
             </h3>
             <div className='row header-h1' style={{ marginTop: '1rem' }}>
-                <h1>{tt('quickbuy_jsx.how_to')}</h1>
-            </div>
-            <div className='row' style={{ marginTop: '1.5rem' }}>
-                {this.renderDetails()}
-            </div>
-            <div className='row header-h1' style={{ marginTop: '1rem', marginBottom: '1.5rem' }}>
                 <h1>{tt('quickbuy_jsx.go_step2')}</h1>
             </div>
             {content}
+            <div className='row blue-box' style={{ marginTop: '1.5rem' }}>
+                Например: <br />
+                {this.renderDetails()}
+            </div>
         </div>
     }
 }

diff --git a/app/components/modules/QuickBuy.scss b/app/components/modules/QuickBuy.scss
@@ -13,10 +13,9 @@
 		margin-bottom: .5rem;
 	}
 	.header-h1 h1 {
-		font-size: 1.2rem;
+		font-size: 1.1rem;
 		margin-bottom: 0;
 		padding-left: 3rem;
-		color: darkgray;
 	}
 	.header-h1 h1::before {
 		content: "";
@@ -36,4 +35,17 @@
 		height: .2rem;
 		background-color: #4BA2F2;
 	}
+	.blue-box {
+		font-size: 90%;
+		margin: 20px 0 20px;
+		padding: 15px;
+		overflow:hidden;
+		line-height:1.5;
+		display: block;
+	    color:#000000;
+	}
+	.blue-box {
+		background:#d6e8f2;
+		border-bottom:5px solid #5cace2;
+	}
 }
diff --git a/app/components/modules/TopRightMenu.jsx b/app/components/modules/TopRightMenu.jsx
@@ -79,6 +79,7 @@ function TopRightMenu({account, savings_withdraws, price_per_golos, globalprops,
     </li>;
     const walletLink = `/@${username}/transfers`;
     const uiaLink = `/@${username}/assets`;
+    const nftLink = `/@${username}/nft-tokens`;
     const inviteLink = `/@${username}/invites`;
     const ordersLink = `/@${username}/filled-orders`;
     const blogLink = blogsUrl(`/@${username}`);
@@ -129,7 +130,7 @@ function TopRightMenu({account, savings_withdraws, price_per_golos, globalprops,
         { link: '#', onClick: toggleNightmode, icon: 'editor/eye', value: tt('g.night_mode') },
         { link: '/rating', icon: 'trade', value: tt("navigation.market") },
         { link: blogsUrl('/services'), target: blogsTarget(), icon: 'new/monitor', value: tt("navigation.services") },
-        { link: blogsUrl('/search'), target: blogsTarget(), icon: 'new/search', value: tt("navigation.search") },
+        { link: '/nft', icon: 'editor-toolbar/picture', value: tt("header_jsx.nft_market") },
         { link: '/exchanges', icon: 'editor/coin', value: tt("navigation.buy_sell") },
         { link: '/~witnesses', icon: 'new/like', value: tt("navigation.witnesses") },
         { link: '/workers', icon: 'voters', value: tt("navigation.workers") },
@@ -160,8 +161,9 @@ function TopRightMenu({account, savings_withdraws, price_per_golos, globalprops,
 
     if (loggedIn) { // change back to if(username) after bug fix:  Clicking on Login does not cause drop-down to close #TEMP!
         let user_menu = [
-            {link: walletLink, icon: 'new/wallet', value: tt('g.wallet'), addon: <NotifiCounter fields="send,receive,delegate_vs,nft_receive,nft_token_sold,nft_buy_offer" />},
+            {link: walletLink, icon: 'new/wallet', value: tt('g.wallet'), addon: <NotifiCounter fields="send,receive,delegate_vs" />},
             {link: uiaLink, icon: 'editor/coin', value: tt('g.assets')},
+            {link: nftLink, icon: 'editor-toolbar/picture', value: tt('g.nft_tokens'), addon: <NotifiCounter fields="nft_receive,nft_token_sold,nft_buy_offer" />},
             {link: ordersLink, icon: 'trade', value: tt('navigation.market2'), addon: <NotifiCounter fields="fill_order" />},
             {link: inviteLink, icon: 'hf/hf19', value: tt('g.invites')},
             {link: blogLink, target: blogsTarget(), icon: 'new/blogging', value: tt('g.blog'), addon: <NotifiCounter fields="comment_reply,mention,new_sponsor,sponsor_inactive,referral" />},

diff --git a/app/components/modules/nft/CreateNFTCollection.jsx b/app/components/modules/nft/CreateNFTCollection.jsx
@@ -306,14 +306,14 @@ class CreateNFTCollection extends Component {
                     <div className='column small-5'>
                         {tt('create_nft_collection_jsx.name') + '*'}
                         <div className='input-group' style={{marginBottom: 5}}>
-                            <Field name='name' type='text' maxLength='14' autoFocus={true} 
+                            <Field name='name' type='text' maxLength='14' autoFocus={true} placeholder={tt('create_nft_collection_jsx.name_hint')} 
                                 onChange={(e) => this.onNameChange(e, values, setFieldValue)} />
                         </div>
                     </div>
                     <div className='column small-7 padding-left'>
                         {tt('create_nft_collection_jsx.coll_title') + '*'}
                         <div className='input-group' style={{marginBottom: 5}}>
-                            <Field name='title' type='text'
+                            <Field name='title' type='text' placeholder={tt('create_nft_collection_jsx.coll_title_hint')}
                                 onChange={(e) => this.onTitleChange(e, values, setFieldValue)} />
                         </div>
                         {!errors.name && <ErrorMessage name='title' component='div' className='error' />}
@@ -322,22 +322,18 @@ class CreateNFTCollection extends Component {
                 </div>
                 <div>
                     {tt('create_nft_collection_jsx.coll_descr')}
-                    {' '}
-                    {tt('create_nft_collection_jsx.not_required')}
                 </div>
                 <div className='row'>
                     <div className='column small-12'>
                         <div className='input-group' style={{marginBottom: 5}}>
-                            <Field name='description' type='text'
+                            <Field name='description' type='text' placeholder={tt('create_nft_collection_jsx.coll_descr_hint')}
                                 onChange={(e) => this.onDescriptionChange(e, values, setFieldValue)} />
                         </div>
                         <ErrorMessage name='description' component='div' className='error' />
                     </div>
                 </div>
                 <div>
                     {tt('create_nft_collection_jsx.image')}
-                    {' '}
-                    {tt('create_nft_collection_jsx.not_required')}
                 </div>
                 <div className='row'>
                     <div className='column small-12'>
@@ -351,7 +347,7 @@ class CreateNFTCollection extends Component {
                                     className={'none'}
                                     disableClick multiple={false} accept="image/*"
                                     ref={(node) => { this.dropzone = node; }}>
-                                <Field name='image' type='text' onBlur={this.onImageBlur}
+                                <Field name='image' type='text' onBlur={this.onImageBlur} placeholder={tt('create_nft_collection_jsx.image_hint')}
                                     onChange={(e) => this.onImageChange(e, values, setFieldValue)} />
                             </Dropzone>
                             <img src={values.image || 'empty'} className='image-preview' style={{ visibility: (showImage && values.image) ? 'visible' : 'hidden' }} />

diff --git a/app/components/modules/nft/IssueNFTToken.jsx b/app/components/modules/nft/IssueNFTToken.jsx
@@ -287,14 +287,14 @@ class IssueNFTToken extends Component {
                     <div className='column small-12'>
                         {tt('create_nft_collection_jsx.coll_title') + '*'}
                         <div className='input-group' style={{marginBottom: 5}}>
-                            <Field name='title' type='text' autoFocus
+                            <Field name='title' type='text' placeholder={tt('issue_nft_token_jsx.coll_title_hint')} autoFocus
                                 onChange={(e) => this.onTitleChange(e, values, setFieldValue)} />
                         </div>
                         <ErrorMessage name='title' component='div' className='error' />
                     </div>
                 </div>
                 <div>
-                    {tt('assets_jsx.transfer_new_owner')}
+                    {tt('assets_jsx.transfer_new_owner') + '*'}
                 </div>
                 <div className='row'>
                     <div className='column small-12'>
@@ -306,22 +306,18 @@ class IssueNFTToken extends Component {
                 </div>
                 <div>
                     {tt('create_nft_collection_jsx.coll_descr')}
-                    {' '}
-                    {tt('create_nft_collection_jsx.not_required')}
                 </div>
                 <div className='row'>
                     <div className='column small-12'>
                         <div className='input-group' style={{marginBottom: 5}}>
-                            <Field name='description' type='text'
+                            <Field name='description' type='text' placeholder={tt('issue_nft_token_jsx.coll_descr_hint')}
                                 onChange={(e) => this.onDescriptionChange(e, values, setFieldValue)} />
                         </div>
                         <ErrorMessage name='description' component='div' className='error' />
                     </div>
                 </div>
                 <div>
-                    {tt('create_nft_collection_jsx.image')}
-                    {' '}
-                    {tt('create_nft_collection_jsx.not_required')}
+                    {tt('issue_nft_token_jsx.image')}
                 </div>
                 <div className='row'>
                     <div className='column small-12'>
@@ -335,7 +331,7 @@ class IssueNFTToken extends Component {
                                     className={'none'}
                                     disableClick multiple={false} accept="image/*"
                                     ref={(node) => { this.dropzone = node; }}>
-                                <Field name='image' disabled={imageUploading} type='text' onBlur={this.onImageBlur}
+                                <Field name='image' disabled={imageUploading} type='text' onBlur={this.onImageBlur} placeholder={tt('issue_nft_token_jsx.image_hint')}
                                     onChange={(e) => this.onImageChange(e, values, setFieldValue)} />
                             </Dropzone>
                             <img src={values.image || 'empty'} className='image-preview' style={{ visibility: (showImage && values.image) ? 'visible' : 'hidden' }} />

diff --git a/app/components/modules/nft/NFTCollections.jsx b/app/components/modules/nft/NFTCollections.jsx
@@ -148,11 +148,15 @@ class NFTCollections extends Component {
             <div className="row">
                 <div className="column small-12">
                     <h4 className="Assets__header">{tt('g.nft_collections')}</h4>
+                    <Link to={`/nft`} className="button float-right">
+                        {tt('header_jsx.nft_market')}
+                    </Link>
                     {isMyAccount && <a href='#' onClick={this.showCreate} className="button hollow float-right">
                         {tt('nft_collections_jsx.create')}
                     </a>}
                 </div>
             </div>
+            <br />
             <div className="row">
                 <div className="column small-12">
                     {items}

diff --git a/app/components/modules/nft/NFTTokens.jsx b/app/components/modules/nft/NFTTokens.jsx
@@ -111,7 +111,7 @@ class NFTTokens extends Component {
             items = <LoadingIndicator type='circle' />
         } else if (!tokens.length) {
             if (isMyAccount) {
-                items = <span>{tt('nft_tokens_jsx.not_yet')}</span>
+                items = <span>{tt('nft_tokens_jsx.not_yet')} <a href='nft-collections'>{tt('nft_tokens_jsx.not_yet1')}</a>...</span>
             } else {
                 items = <span>{tt('nft_tokens_jsx.not_yet2') + accountName + tt('nft_tokens_jsx.not_yet3')}</span>
             }
@@ -163,7 +163,7 @@ class NFTTokens extends Component {
                 <div className="column small-12">
                     <h4 className="Assets__header">{tt('g.nft_tokens')}</h4>
                     <Link to={`/nft`} className="button float-right">
-                        {tt('g.buy')}
+                        {tt('header_jsx.nft_market')}
                     </Link>
                     <span className='float-right'>&nbsp;&nbsp;</span>
                     <DropdownMenu className='float-right' el='div' items={sortItems} selected={currentSort}>

diff --git a/app/components/modules/uia/TransferWaiter.jsx b/app/components/modules/uia/TransferWaiter.jsx
@@ -52,7 +52,7 @@ class TransferWaiter extends React.Component {
         }
         try {
             const initBal = await getBalance()
-            const pollMsec = process.env.NODE_ENV === 'development' ? 1000 : 30000
+            const pollMsec = process.env.NODE_ENV === 'development' ? 1000 : 20000
             this.pollInterval = setInterval(async () => {
                 const bal = await getBalance()
                 console.log(initBal.toString(), bal.toString())

diff --git a/app/components/pages/Exchanges.jsx b/app/components/pages/Exchanges.jsx
@@ -32,7 +32,7 @@ class Exchanges extends React.Component {
                                     <Icon name="line" /> <a target="_blank" href={blogsUrl('/@allforyou/golos-delistyat-s-kuny-perekhodim-na-rudex')}>{tt('exchanges_jsx.guide_user')} @allforyou <Icon name='extlink' /></a><br />
                                     <Icon name="line" /> <a target="_blank" href="https://www.youtube.com/results?search_query=%D0%B1%D0%B8%D1%80%D0%B6%D0%B0+rudex&sp=CAI%253D">Пользовательские видеообзоры <Icon name='extlink' /></a><br />
                                     <br />
-                                    <a target="_blank" href="https://market.rudex.org/#/market/RUDEX.GOLOS_RUDEX.USDT" className="button">GOLOS-USDT</a>&nbsp;&nbsp;<a target="_blank" href="https://market.rudex.org/#/market/RUDEX.GOLOS_GPH" className="button">GOLOS-GPH</a>&nbsp;&nbsp;<a target="_blank" href="https://market.rudex.org/#/market/RUDEX.GOLOS_RUDEX.BTS" className="button">GOLOS-BTS</a>
+                                    <a target="_blank" href="https://market.rudex.org/#/market/RUDEX.GOLOS_RUDEX.USDT" className="button">GOLOS-USDT</a>&nbsp;&nbsp;<a target="_blank" href="https://market.rudex.org/#/market/RUDEX.GOLOS_GPH" className="button">GOLOS-GPH</a>
                                     <br />
                                     <a target="_blank" href={blogsUrl('/@alex-pu/dexbot-na-vps-v-dokere-dlya-babushek')}>Настройка</a> и <a target="_blank" href={blogsUrl('/@alex-pu/dexbot-best-long-term-strategy')}>стратегии</a> торгового бота DEXbot, <a target="_blank" href="https://github.com/golos-blockchain/libs/wiki">примеры</a> операций <small>(JavaScript/Python)</small>.
                                 </div>
@@ -53,10 +53,9 @@ class Exchanges extends React.Component {
                                 <div className='landing-exchanges-block-center column large-12 medium-12 small-12'>
                                     <span className='new'>new</span> <Icon name="line" /> <a target="_blank" href={blogsUrl('/@lllll1ll/shlyuz-dlya-trkh-i-steem-na-golos')}>{tt('exchanges_jsx.guide_user')} @lllll1ll</a> <small>(на примере TRON и STEEM)</small> <Icon name='extlink' /><br />
                                     <span className='new'>new</span> <Icon name="line" /> <a target="_blank" href={blogsUrl('/@lllll1ll/instrukciya-po-shlyuzu-s-hive-na-golos')}>{tt('exchanges_jsx.guide_user')} @lllll1ll</a> <small>(на примере HIVE)</small> <Icon name='extlink' /><br />
-                                    <span className='new'>new</span> <Icon name="line" /> <a target="_blank" href={blogsUrl('/@lllll1ll/shlyuz-na-qiwi-dlya-vvoda-i-vyvoda-ybrub')}>{tt('exchanges_jsx.guide_user')} @lllll1ll</a> <small>(RUB через QIWI)</small> <Icon name='extlink' /><br />
                                     <Icon name="line" /> <a target="_blank" href={blogsUrl('/@gloriya/obzor-servisov-dex-c-shlyuzami-usdt-ltc-trx-dash-doge-rub')}>{tt('exchanges_jsx.guide_user')} @gloriya <Icon name='extlink' /></a><br />
                                     <br />
-                                    <a target="_blank" href="/market/GOLOS/YMUSDT" className="button">GOLOS-USDT</a>&nbsp;&nbsp;<a target="_blank" href="/market/GOLOS/YMPZM" className="button">GOLOS-PZM</a>&nbsp;&nbsp;<a target="_blank" href="/market/GOLOS/YMHIVE" className="button">GOLOS-HIVE</a><br />
+                                    <a target="_blank" href="/market/GOLOS/YMUSDT" className="button">GOLOS-USDT</a>&nbsp;&nbsp;<a target="_blank" href="/market/GOLOS/YMPZM" className="button">GOLOS-PZM</a>&nbsp;&nbsp;<a target="_blank" href="/market/GOLOS/YMBTC" className="button">GOLOS-BTC</a><br />
                                     Настройка и стратегии торгового бота DEXbot, <a target="_blank" href="https://github.com/golos-blockchain/libs/wiki">примеры</a> операций <small>(JavaScript/Python)</small>.<br />
                                 </div>
                             </div>
@@ -77,7 +76,7 @@ class Exchanges extends React.Component {
                                     <Icon name="line" /> <a target="_blank" href={blogsUrl('/@docsait/manual-raboty-pulov-goloschain-v-seti-minter')}>{tt('exchanges_jsx.guide_user')} @docsait <Icon name='extlink' /></a><br />
                                     <Icon name="line" /> <a target="_blank" href={blogsUrl('/@denis-skripnik/glsmp')}>{tt('exchanges_jsx.guide_user')} @denis-skripnik <Icon name='extlink' /></a>
                                     <br /><br />
-                                    <a target="_blank" href="https://chainik.io/pool/GOLOSCHAIN/BNB" className="button">GOLOS-BNB</a>&nbsp;&nbsp;<a target="_blank" href="https://chainik.io/pool/GOLOSCHAIN/USDTE" className="button">GOLOS-USDT</a>&nbsp;&nbsp;<a target="_blank" href="https://chainik.io/pool/GOLOSCHAIN/BIP" className="button">GOLOS-BIP</a>
+                                    <a target="_blank" href="https://chainik.io/pool/GOLOSCHAIN/BNB" className="button">GOLOS-BNB</a>&nbsp;&nbsp;<a target="_blank" href="https://chainik.io/pool/GOLOSCHAIN/USDTE" className="button">GOLOS-USDT</a>
                                 </div>
                             </div>
                         </div>