fix issues with deploy fetching and small improvements

make-software · Sep 10, 2024 · c517183 · c517183
1 parent 2b87b37
commit c517183
Show file tree

Hide file tree

Showing 19 changed files with 110 additions and 367 deletions.
diff --git a/src/apps/popup/index.tsx b/src/apps/popup/index.tsx
@@ -24,23 +24,23 @@ import { GlobalStyle, darkTheme, lightTheme } from '@libs/ui';
 
 import { AppRouter } from './app-router';
 
+const queryClient = new QueryClient({
+  defaultOptions: {
+    queries: {
+      staleTime: 3 * 60 * 1000,
+      refetchInterval: 3 * 60 * 1000,
+      gcTime: 3 * 60 * 1000,
+      retry: false
+    },
+    mutations: {
+      retry: false
+    }
+  }
+});
+
 const Tree = () => {
   const [state, setState] = useState<PopupState | null>(null);
 
-  const queryClient = new QueryClient({
-    defaultOptions: {
-      queries: {
-        staleTime: 3 * 60 * 1000,
-        refetchInterval: 3 * 60 * 1000,
-        gcTime: 3 * 60 * 1000,
-        retry: false
-      },
-      mutations: {
-        retry: false
-      }
-    }
-  });
-
   setCSPForSafari();
 
   const isSystemDarkTheme = useSystemThemeDetector();

diff --git a/src/apps/popup/pages/deploy-details/components/action-rows/cep18-action-rows.tsx b/src/apps/popup/pages/deploy-details/components/action-rows/cep18-action-rows.tsx
@@ -101,6 +101,7 @@ export const Cep18ActionRows = ({ deploy }: Cep18ActionRowsProps) => {
       title={title}
       contractPackageHash={contractPackageHash}
       contractName={contractName}
+      iconUrl={iconUrl || DeployIcon.Cep18Default}
       additionalInfo="CEP-18 Token"
     />
   );

diff --git a/src/apps/popup/pages/deploy-details/components/action-rows/nft-actions-rows.tsx b/src/apps/popup/pages/deploy-details/components/action-rows/nft-actions-rows.tsx
@@ -145,7 +145,7 @@ export const NftActionsRows = ({ deploy }: NftActionsRowsProps) => {
       contractPackageHash={contractPackageHash}
       contractName={contractName}
       additionalInfo="CEP-47 NFT"
-      iconUrl={DeployIcon.NFTDefault}
+      iconUrl={iconUrl || DeployIcon.NFTDefault}
     />
   );
 };
diff --git a/src/apps/popup/pages/deploy-details/components/common.tsx b/src/apps/popup/pages/deploy-details/components/common.tsx
@@ -57,9 +57,11 @@ export const ContainerWithAmount = ({
   fiatAmount
 }: ActionContainerWithAmountProps) => (
   <LeftAlignedFlexColumn gap={SpacingSize.Tiny}>
-    <AlignedFlexRow gap={SpacingSize.Small}>
+    <AlignedFlexRow gap={SpacingSize.Small} style={{ maxWidth: '296px' }}>
       <Typography type="bodySemiBold">{title}</Typography>
-      <Typography type="bodyHash">{amount}</Typography>
+      <Typography type="bodyHash" ellipsis>
+        {amount}
+      </Typography>
       <Typography type="bodyHash" color="contentSecondary">
         CSPR
       </Typography>
@@ -206,13 +208,15 @@ export const AmountRow = ({
   const { t } = useTranslation();
 
   return (
-    <AlignedFlexRow gap={SpacingSize.Small}>
+    <AlignedFlexRow gap={SpacingSize.Small} style={{ maxWidth: '296px' }}>
       {label && (
         <Typography type="captionRegular" color="contentSecondary">
           <Trans t={t}>{label}</Trans>
         </Typography>
       )}
-      <Typography type="bodyHash">{amount}</Typography>
+      <Typography type="bodyHash" ellipsis>
+        {amount}
+      </Typography>
       <Typography type="bodyHash" color="contentSecondary">
         {symbol}
       </Typography>

diff --git a/src/apps/popup/pages/deploy-details/content.tsx b/src/apps/popup/pages/deploy-details/content.tsx
@@ -1,15 +1,12 @@
 import { IDeploy } from 'casper-wallet-core';
 import React, { useEffect, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
-import { useSelector } from 'react-redux';
 import styled from 'styled-components';
 
 import { DeployDetailsAction } from '@popup/pages/deploy-details/components/deploy-details-action';
 import { DeployDetailsResult } from '@popup/pages/deploy-details/components/deploy-details-result';
 import { getEntryPointName } from '@popup/pages/deploy-details/utils';
 
-import { selectVaultActiveAccount } from '@background/redux/vault/selectors';
-
 import {
   AlignedSpaceBetweenFlexRow,
   BorderBottomPseudoElementProps,
@@ -22,7 +19,7 @@ import {
   SpacingSize,
   borderBottomPseudoElementRules
 } from '@libs/layout';
-import { dispatchFetchExtendedDeploysInfo } from '@libs/services/account-activity-service';
+import { useFetchDeploy } from '@libs/services/deploys/use-fetch-deploy';
 import {
   DeployStatus,
   Hash,
@@ -69,22 +66,17 @@ export const DeployDetailsPageContent = ({
 
   const { t } = useTranslation();
 
-  const activeAccount = useSelector(selectVaultActiveAccount);
-
   useEffect(() => {
     setSingleDeploy(deploy);
   }, [deploy]);
 
+  const { deployData } = useFetchDeploy(deploy?.deployHash);
+
   useEffect(() => {
-    if (deploy?.deployHash && activeAccount?.publicKey) {
-      dispatchFetchExtendedDeploysInfo(
-        deploy.deployHash,
-        activeAccount?.publicKey
-      ).then(({ payload: resp }) => {
-        setSingleDeploy(resp);
-      });
+    if (deployData) {
+      setSingleDeploy(deployData);
     }
-  }, [activeAccount?.publicKey, deploy?.deployHash]);
+  }, [deployData]);
 
   if (!singleDeploy) {
     return null;

diff --git a/src/background/index.ts b/src/background/index.ts
@@ -34,12 +34,7 @@ import {
 } from '@background/redux/account-balances/actions';
 import {
   accountBalanceChanged,
-  accountCasperActivityCountChanged,
-  accountCep18TransferDeploysDataChanged,
-  accountCsprTransferDeploysDataChanged,
   accountCurrencyRateChanged,
-  accountDeploysCountChanged,
-  accountDeploysDataChanged,
   accountErc20Changed,
   accountInfoReset,
   accountNftTokensAdded,
@@ -619,18 +614,13 @@ runtime.onMessage.addListener(
           case getType(recipientPublicKeyReseted):
           case getType(accountBalanceChanged):
           case getType(accountCurrencyRateChanged):
-          case getType(accountCsprTransferDeploysDataChanged):
           case getType(accountInfoReset):
           case getType(accountPendingDeployHashesChanged):
           case getType(accountPendingDeployHashesRemove):
           case getType(accountErc20Changed):
-          case getType(accountCep18TransferDeploysDataChanged):
-          case getType(accountDeploysDataChanged):
           case getType(accountNftTokensAdded):
           case getType(accountNftTokensUpdated):
           case getType(accountNftTokensCountChanged):
-          case getType(accountDeploysCountChanged):
-          case getType(accountCasperActivityCountChanged):
           case getType(accountTrackingIdOfSentNftTokensChanged):
           case getType(accountTrackingIdOfSentNftTokensRemoved):
           case getType(newContactAdded):

diff --git a/src/background/redux/account-info/actions.ts b/src/background/redux/account-info/actions.ts
@@ -1,11 +1,5 @@
 import { createAction } from 'typesafe-actions';
 
-import {
-  AccountDeploysDataType,
-  Cep18TransferDeploysDataType,
-  CsprTransferDeploysDataType
-} from '@background/redux/account-info/types';
-
 import { AccountBalance } from '@libs/services/balance-service/types';
 import { ContractPackageWithBalance } from '@libs/services/erc20-service/types';
 import { NFTTokenResult } from '@libs/services/nft-service/types';
@@ -22,17 +16,6 @@ export const accountCurrencyRateChanged = createAction(
   'ACCOUNT_CURRENCY_RATE_CHANGED'
 )<number | null>();
 
-export const accountCsprTransferDeploysDataChanged = createAction(
-  'ACCOUNT_CSPR_TRANSFER_DEPLOYS_DATA_CHANGED'
-)<CsprTransferDeploysDataType>();
-
-export const accountCep18TransferDeploysDataChanged = createAction(
-  'ACCOUNT_CEP18_TRANSFER_DEPLOYS_DATA_CHANGED'
-)<{
-  cep18TransferDeploysData: Cep18TransferDeploysDataType;
-  contractPackageHash: string;
-}>();
-
 export const accountInfoReset = createAction('ACCOUNT_INFO_RESET')();
 
 export const accountPendingDeployHashesChanged = createAction(
@@ -43,10 +26,6 @@ export const accountPendingDeployHashesRemove = createAction(
   'ACCOUNT_PENDING_TRANSACTIONS_REMOVE'
 )<string>();
 
-export const accountDeploysDataChanged = createAction(
-  'ACCOUNT_DEPLOYS_DATA_CHANGED'
-)<AccountDeploysDataType>();
-
 export const accountNftTokensAdded = createAction('ACCOUNT_NFT_TOKENS_ADDED')<
   NFTTokenResult[] | null
 >();
@@ -59,14 +38,6 @@ export const accountNftTokensCountChanged = createAction(
   'ACCOUNT_NFT_TOKENS_COUNT_CHANGED'
 )<number>();
 
-export const accountDeploysCountChanged = createAction(
-  'ACCOUNT_DEPLOYS_COUNT_CHANGED'
-)<number>();
-
-export const accountCasperActivityCountChanged = createAction(
-  'ACCOUNT_CASPER_ACTIVITY_COUNT_CHANGED'
-)<number>();
-
 export const accountTrackingIdOfSentNftTokensChanged = createAction(
   'ACCOUNT_TRACKING_ID_OF_SENT_NFT_TOKENS_CHANGED'
 )<{