Merge pull request #1194 from crypto-com/dev

Merge Dev to Master

Author: crypto-matto

CHANGELOG.md

@@ -7,7 +7,8 @@ All notable changes to this project will be documented in this file.
 *Released*
 ## [v1.1.1] - 2022-07-15
 ### Bug fixes
-- Clean up duplicated rewards & delegations
+- Clean up duplicated rewards, delegations 
+- Incorrect display of Mainnet Cronos NFT transfer history for Testnet wallet
 ## [v1.1.0] - 2022-07-11
 ### Additions
 - View Governance Voting History

src/pages/nft/components/ChainSelect.tsx

@@ -1,7 +1,10 @@
 import { Select } from 'antd';
 import React, { useState } from 'react';
+import { useRecoilValue } from 'recoil';
 import { useCronosEvmAsset, useCronosTendermintAsset } from '../../../hooks/useCronosEvmAsset';
 import { UserAsset } from '../../../models/UserAsset';
+import { sessionState } from '../../../recoil/atom';
+import { checkIfTestnet } from '../../../utils/utils';
 
 interface IChainSelectProps {
   onChangeAsset: (asset: UserAsset | undefined) => void;
@@ -11,7 +14,11 @@ const ChainSelect = (props: IChainSelectProps) => {
   const cronosTendermintAsset = useCronosTendermintAsset();
   const cronosEvmAsset = useCronosEvmAsset();
   const [currentAsset, setCurrentAsset] = useState(cronosTendermintAsset);
-  const selectableAssets = [cronosTendermintAsset, cronosEvmAsset];
+  const currentSession = useRecoilValue(sessionState);
+  const selectableAssets = [
+    cronosTendermintAsset,
+    ...(!checkIfTestnet(currentSession.wallet.config.network) ? [cronosEvmAsset] : []),
+  ];
 
   return (
     <Select

src/pages/nft/tabs/transactions/Cronos.tsx

@@ -112,7 +112,9 @@ const CronosNFTTransactionList = () => {
       }}
       columns={NftTransactionColumns}
       dataSource={nftTransfers}
-      rowKey={record => record.tx_hash}
+      rowKey={record =>
+        `${record.tx_hash}_${record.event_type}_${record.token_address}_${record.token_name}`
+      }
     />
   );
 };

src/service/rpc/indexing/nft/cronos/CronosNftIndexingAPI.ts

@@ -71,7 +71,7 @@ export class CronosNftIndexingAPI {
       return [];
     }
 
-    nftTxsList.push(...response.data.nft_txs);
+    nftTxsList.push(...response.data.nft_txs.filter(tx => tx.event_type === 'Transfer'));
 
     let txsResponse: NftTxsResponse = response;
 
@@ -85,7 +85,7 @@ export class CronosNftIndexingAPI {
       txsResponse = pageNftsListRequest.data;
       paginationPage++;
       if (txsResponse.code === 0) {
-        nftTxsList.push(...txsResponse.data.nft_txs);
+        nftTxsList.push(...txsResponse.data.nft_txs.filter(tx => tx.event_type === 'Transfer'));
       }
     }