[fix][610] fix export address file name (#3594)

* [fix][610] fix export address file name * fix filter erc721_activities
aura-nw · Jul 5, 2024 · 16bb857 · 16bb857
1 parent 8a7f53e
commit 16bb857
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/app/core/services/user.service.ts b/src/app/core/services/user.service.ts
@@ -500,7 +500,10 @@ export class UserService {
             type
           }
           erc721_activities(
-            where: { _or: [{ to: { _eq: $receiver } }, { from: { _eq: $sender } }] }
+            where: {
+              _or: [{ to: { _eq: $receiver } }, { from: { _eq: $sender } }]
+              action: { _in: $actionIn, _nin: $actionNotIn }
+            }
           ) {
             action
             from

diff --git a/src/app/pages/export-csv/export-csv.component.ts b/src/app/pages/export-csv/export-csv.component.ts
@@ -244,11 +244,13 @@ export class ExportCsvComponent implements OnInit, OnDestroy {
       type: 'text/csv;charset=utf-8',
     });
 
+    const evmAddressTypes = [TabsAccountLink.EVMExecutedTxs, ETypeFtExport.ERC20, ETypeNftExport.ERC721];
+    const address = evmAddressTypes.includes(payload.dataType) ? payload.evmAddress : payload.address;
     const fileName =
       'export-account-' +
       (payload.dataType === TabsAccountLink.NativeTxs ? 'native-ibc-transfer' : nameTab) +
       '-' +
-      payload.address +
+      address +
       '.csv';
     saveAs(data, fileName);
     this.isDownload = false;