HF 30 - NFT fixes - small, but significant...

golos-blockchain · Jun 2, 2024 · f6e44a1 · f6e44a1
1 parent 4cee597
commit f6e44a1
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/app/components/cards/TransferHistoryRow.jsx b/app/components/cards/TransferHistoryRow.jsx
@@ -406,6 +406,9 @@ class TransferHistoryRow extends React.Component {
             linkExternal3 = true
             description_end = tt('transferhistoryrow_jsx.for')
             description_end += Asset(data.price).floatString
+            if (!data.actor) {
+                description_end += tt('transferhistoryrow_jsx.via_auction')
+            }
         } else if (type === 'nft_buy') {
             if (!data.order_id) {
                 link = data.buyer

diff --git a/app/locales/en.json b/app/locales/en.json
@@ -1064,7 +1064,8 @@
     "nft_issued_for": " for ",
     "nft_issued_cost":  "issue cost is ",
     "nft_sell": " placed order of selling ",
-    "sold": " sold "
+    "sold": " sold ",
+    "via_auction": " (via auction)"
   },
   "savingswithdrawhistory_jsx": {
     "cancel_this_withdraw_request": "Cancel this withdraw request?",

diff --git a/app/locales/ru-RU.json b/app/locales/ru-RU.json
@@ -976,7 +976,8 @@
     "nft_issued_for": " для ",
     "nft_issued_cost":  "за выпуск списано ",
     "nft_sell": " выставил на продажу ",
-    "sold": " продал "
+    "sold": " продал ",
+    "via_auction": " (на аукционе)"
   },
   "user_profile": {
     "unknown_account": "Неизвестный аккаунт",

diff --git a/app/redux/FetchDataSaga.js b/app/redux/FetchDataSaga.js
@@ -267,7 +267,7 @@ export function* fetchState(location_change_action) {
                         state.witnesses[uname] = yield call([api, api.getWitnessByAccountAsync], uname)
                     break
                     case 'nft-history':
-                        const nftHistory = yield call([api, api.getAccountHistoryAsync], uname, -1, 1000, {select_ops: ['nft_token', 'nft_transfer', 'nft_buy', 'nft_cancel_order', 'nft_token_sold']})
+                        const nftHistory = yield call([api, api.getAccountHistoryAsync], uname, -1, 1000, {select_ops: ['nft_token', 'nft_transfer', 'nft_buy', /*'nft_cancel_order',*/ 'nft_token_sold']})
                         account.nft_history = []
 
                         state.cprops = yield call([api, api.getChainPropertiesAsync])
@@ -745,6 +745,20 @@ export function* fetchNftCollectionTokens({ payload: { collectionName, start_tok
             next_from = nft_tokens.pop().token_id
         }
 
+        const select_token_ids = []
+        const tokens_by_id = {}
+
+        try {
+            for (const no of nft_tokens) {
+                select_token_ids.push(no.token_id)
+                tokens_by_id[no.token_id] = no
+            }
+        } catch (err) {
+            console.error(err)
+        }
+
+        yield fillNftTokenOrders(select_token_ids, tokens_by_id)
+
         let nft_assets
 
         try {