diff --git a/app/components/cards/TransferHistoryRow.jsx b/app/components/cards/TransferHistoryRow.jsx index 46e3eaa..9c13e5b 100644 --- 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 index 4ddf019..7d6ee2b 100644 --- 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 index e1c4a0f..e96d6c0 100644 --- 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} diff --git a/app/components/modules/QuickBuy.jsx b/app/components/modules/QuickBuy.jsx index d8af7ce..bcbb0aa 100644 --- a/app/components/modules/QuickBuy.jsx +++ b/app/components/modules/QuickBuy.jsx @@ -181,15 +181,13 @@ class QuickBuy extends React.Component {
-

{tt('quickbuy_jsx.how_to')}

-
-
- {this.renderDetails()} -
-

{tt('quickbuy_jsx.go_step2')}

{content} +
+ Например:
+ {this.renderDetails()} +
} } diff --git a/app/components/modules/QuickBuy.scss b/app/components/modules/QuickBuy.scss index 968e31b..117d1ca 100644 --- 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; + } } \ No newline at end of file diff --git a/app/components/modules/TopRightMenu.jsx b/app/components/modules/TopRightMenu.jsx index 0d7c051..6460b95 100644 --- 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, ; 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: }, + {link: walletLink, icon: 'new/wallet', value: tt('g.wallet'), addon: }, {link: uiaLink, icon: 'editor/coin', value: tt('g.assets')}, + {link: nftLink, icon: 'editor-toolbar/picture', value: tt('g.nft_tokens'), addon: }, {link: ordersLink, icon: 'trade', value: tt('navigation.market2'), addon: }, {link: inviteLink, icon: 'hf/hf19', value: tt('g.invites')}, {link: blogLink, target: blogsTarget(), icon: 'new/blogging', value: tt('g.blog'), addon: }, diff --git a/app/components/modules/nft/CreateNFTCollection.jsx b/app/components/modules/nft/CreateNFTCollection.jsx index 0611d24..78fdd9e 100644 --- a/app/components/modules/nft/CreateNFTCollection.jsx +++ b/app/components/modules/nft/CreateNFTCollection.jsx @@ -306,14 +306,14 @@ class CreateNFTCollection extends Component {
{tt('create_nft_collection_jsx.name') + '*'}
- this.onNameChange(e, values, setFieldValue)} />
{tt('create_nft_collection_jsx.coll_title') + '*'}
- this.onTitleChange(e, values, setFieldValue)} />
{!errors.name && } @@ -322,13 +322,11 @@ class CreateNFTCollection extends Component {
{tt('create_nft_collection_jsx.coll_descr')} - {' '} - {tt('create_nft_collection_jsx.not_required')}
- this.onDescriptionChange(e, values, setFieldValue)} />
@@ -336,8 +334,6 @@ class CreateNFTCollection extends Component {
{tt('create_nft_collection_jsx.image')} - {' '} - {tt('create_nft_collection_jsx.not_required')}
@@ -351,7 +347,7 @@ class CreateNFTCollection extends Component { className={'none'} disableClick multiple={false} accept="image/*" ref={(node) => { this.dropzone = node; }}> - this.onImageChange(e, values, setFieldValue)} /> diff --git a/app/components/modules/nft/IssueNFTToken.jsx b/app/components/modules/nft/IssueNFTToken.jsx index 1b07785..45994be 100644 --- a/app/components/modules/nft/IssueNFTToken.jsx +++ b/app/components/modules/nft/IssueNFTToken.jsx @@ -287,14 +287,14 @@ class IssueNFTToken extends Component {
{tt('create_nft_collection_jsx.coll_title') + '*'}
- this.onTitleChange(e, values, setFieldValue)} />
- {tt('assets_jsx.transfer_new_owner')} + {tt('assets_jsx.transfer_new_owner') + '*'}
@@ -306,22 +306,18 @@ class IssueNFTToken extends Component {
{tt('create_nft_collection_jsx.coll_descr')} - {' '} - {tt('create_nft_collection_jsx.not_required')}
- this.onDescriptionChange(e, values, setFieldValue)} />
- {tt('create_nft_collection_jsx.image')} - {' '} - {tt('create_nft_collection_jsx.not_required')} + {tt('issue_nft_token_jsx.image')}
@@ -335,7 +331,7 @@ class IssueNFTToken extends Component { className={'none'} disableClick multiple={false} accept="image/*" ref={(node) => { this.dropzone = node; }}> - this.onImageChange(e, values, setFieldValue)} /> diff --git a/app/components/modules/nft/NFTCollections.jsx b/app/components/modules/nft/NFTCollections.jsx index bdcedbe..b598951 100644 --- a/app/components/modules/nft/NFTCollections.jsx +++ b/app/components/modules/nft/NFTCollections.jsx @@ -148,11 +148,15 @@ class NFTCollections extends Component {

{tt('g.nft_collections')}

+ + {tt('header_jsx.nft_market')} + {isMyAccount && {tt('nft_collections_jsx.create')} }
+
{items} diff --git a/app/components/modules/nft/NFTTokens.jsx b/app/components/modules/nft/NFTTokens.jsx index 338242c..4a0653d 100644 --- a/app/components/modules/nft/NFTTokens.jsx +++ b/app/components/modules/nft/NFTTokens.jsx @@ -111,7 +111,7 @@ class NFTTokens extends Component { items = } else if (!tokens.length) { if (isMyAccount) { - items = {tt('nft_tokens_jsx.not_yet')} + items = {tt('nft_tokens_jsx.not_yet')} {tt('nft_tokens_jsx.not_yet1')}... } else { items = {tt('nft_tokens_jsx.not_yet2') + accountName + tt('nft_tokens_jsx.not_yet3')} } @@ -163,7 +163,7 @@ class NFTTokens extends Component {

{tt('g.nft_tokens')}

- {tt('g.buy')} + {tt('header_jsx.nft_market')}    diff --git a/app/components/modules/uia/TransferWaiter.jsx b/app/components/modules/uia/TransferWaiter.jsx index d501fb7..6e2607d 100644 --- 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 index 1017a1f..203c488 100644 --- a/app/components/pages/Exchanges.jsx +++ b/app/components/pages/Exchanges.jsx @@ -32,7 +32,7 @@ class Exchanges extends React.Component { {tt('exchanges_jsx.guide_user')} @allforyou
Пользовательские видеообзоры

- GOLOS-USDT  GOLOS-GPH  GOLOS-BTS + GOLOS-USDT  GOLOS-GPH
Настройка и стратегии торгового бота DEXbot, примеры операций (JavaScript/Python).
@@ -53,10 +53,9 @@ class Exchanges extends React.Component {
new {tt('exchanges_jsx.guide_user')} @lllll1ll (на примере TRON и STEEM)
new {tt('exchanges_jsx.guide_user')} @lllll1ll (на примере HIVE)
- new {tt('exchanges_jsx.guide_user')} @lllll1ll (RUB через QIWI)
{tt('exchanges_jsx.guide_user')} @gloriya

- GOLOS-USDT  GOLOS-PZM  GOLOS-HIVE
+ GOLOS-USDT  GOLOS-PZM  GOLOS-BTC
Настройка и стратегии торгового бота DEXbot, примеры операций (JavaScript/Python).
@@ -77,7 +76,7 @@ class Exchanges extends React.Component { {tt('exchanges_jsx.guide_user')} @docsait
{tt('exchanges_jsx.guide_user')} @denis-skripnik

- GOLOS-BNB  GOLOS-USDT  GOLOS-BIP + GOLOS-BNB  GOLOS-USDT
diff --git a/app/components/pages/LeavePage.jsx b/app/components/pages/LeavePage.jsx index dc250a7..e91d8c9 100644 --- a/app/components/pages/LeavePage.jsx +++ b/app/components/pages/LeavePage.jsx @@ -22,18 +22,18 @@ class LeavePage extends Component {

- Вы покидаете сайт Golos Блоги + Вы покидаете сайт Golos Wallet

Ссылка, на которую вы нажали, переадресует вас по адресу: {targetPage}

- Golos Блоги не имеют отношения к этому сайту, и мы не можем гарантировать безопасность его использования. Ресурсы с закрытым исходным кодом могут содержать вредоносные скрипты и использовать мошеннические схемы. + Golos Wallet не имеют отношения к этому сайту, и мы не можем гарантировать безопасность его использования. Ресурсы с закрытым исходным кодом могут содержать вредоносные скрипты и использовать мошеннические схемы.

Рекомендуем вам не переходить по ссылке, если у вас нет оснований доверять этому сайту.

- Помните, что ключи вашего аккаунта на Golos Блоги не могут быть восстановлены, а доступ к ним позволит завладеть вашими средствами. + Помните, что ключи вашего аккаунта на Golos Wallet не могут быть восстановлены, а доступ к ним позволит завладеть вашими средствами.