fix bugs

wanchain · Mar 16, 2023 · edb0c8b · edb0c8b
1 parent fd29313
commit edb0c8b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/app/stores/crossChain.js b/src/app/stores/crossChain.js
@@ -244,7 +244,7 @@ class CrossChain {
           value: item.srcChainType === 'WAN' && item.tokenSymbol === 'WAN' ? formatNum(formatNumByDecimals(item.value || '0', decimals)) : formatNum(formatNumByDecimals(item.contractValue, decimals)),
           crossValue: item.srcChainType === 'WAN' && item.tokenSymbol === 'WAN' ? formatNum(formatNumByDecimals(item.value || '0', decimals)) : formatNum(formatNumByDecimals(item.contractValue || '0', decimals)),
           crosschainFee: item.crosschainFee,
-          receivedAmount: item.receivedAmount,
+          receivedAmount: item.status === 'Redeemed' ? item.receivedAmount : '0',
           status: item.status,
           sendTime: item.sendTime,
           approveTxHash: item.approveTxHash,

diff --git a/src/app/stores/openstoreman.js b/src/app/stores/openstoreman.js
@@ -320,7 +320,10 @@ class OpenStoreman {
       runInAction(() => {
         // Re-Duplicates by wkAddr
         let temp = _.unionBy(ret.flat(), 'wkAddr');
-        temp = temp.filter(v => !v.isWhite);
+        temp = temp.filter(v => {
+          let ret = this.storemanGroupList.find(j => [v.groupId, v.nextGroupId].includes(j.groupId));
+          return !v.isWhite && !!ret
+        });
         temp.forEach(item => {
           let temp = this.storemanGroupList.find(v => [item.groupId, item.nextGroupId].includes(v.groupId));
           item.chain1 = temp.chain1;