From c6908a5ed0ec8fa3ffe27a0db283efaf139463c6 Mon Sep 17 00:00:00 2001 From: ost-ptk Date: Tue, 17 Sep 2024 13:43:43 +0300 Subject: [PATCH] update deploy result for transfers and add refetch time for the single deploy --- .../deploy-details/components/deploy-details-result.tsx | 8 ++++++-- src/constants.ts | 4 ++-- src/libs/services/deploys/use-fetch-single-deploy.ts | 6 +++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/apps/popup/pages/deploy-details/components/deploy-details-result.tsx b/src/apps/popup/pages/deploy-details/components/deploy-details-result.tsx index f99bb3c9..e9a72702 100644 --- a/src/apps/popup/pages/deploy-details/components/deploy-details-result.tsx +++ b/src/apps/popup/pages/deploy-details/components/deploy-details-result.tsx @@ -90,8 +90,12 @@ export const DeployDetailsResult = ({ deploy }: DeployDetailsResultProps) => { key={id} callerAccountInfo={action.callerAccountInfo} recipientAccountInfo={action.recipientAccountInfo} - toPublicKey={action.recipientKey} - fromPublicKey={action.callerPublicKey} + toPublicKey={ + action.recipientKey || action.recipientAccountInfo?.accountHash! + } + fromPublicKey={ + action.callerPublicKey || action.callerAccountInfo?.accountHash! + } fiatAmount={action.fiatAmount} /> ))} diff --git a/src/constants.ts b/src/constants.ts index bf934174..91835661 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -13,6 +13,8 @@ export const ACCOUNT_DEPLOY_REFRESH_RATE = 30 * SECOND; export const ACCOUNT_CASPER_ACTIVITY_REFRESH_RATE = 30 * SECOND; export const ERC20_TOKEN_ACTIVITY_REFRESH_RATE = 30 * SECOND; export const VALIDATORS_REFRESH_RATE = 30 * SECOND; +export const PENDING_DEPLOY_REFETCH_INTERVAL = 5 * SECOND; +export const DEPLOY_DETAILS_REFRESH_RATE = 30 * SECOND; export const LOGIN_RETRY_ATTEMPTS_LIMIT = 5; export const ERROR_DISPLAYED_BEFORE_ATTEMPT_IS_DECREMENTED = 1; @@ -27,8 +29,6 @@ export const STAKE_COST_MOTES = '2500000000'; // 2.5 CSPR export const DELEGATION_MIN_AMOUNT_MOTES = '500000000000'; // 500 CSPR export const MAX_DELEGATORS = 1200; -export const PENDING_DEPLOY_REFETCH_INTERVAL = 5 * 1000; - export const getBlockExplorerAccountUrl = ( casperLiveUrl: string, publicKey: string diff --git a/src/libs/services/deploys/use-fetch-single-deploy.ts b/src/libs/services/deploys/use-fetch-single-deploy.ts index c60229c8..1f953ed3 100644 --- a/src/libs/services/deploys/use-fetch-single-deploy.ts +++ b/src/libs/services/deploys/use-fetch-single-deploy.ts @@ -2,6 +2,8 @@ import { useQuery } from '@tanstack/react-query'; import { CasperNetwork } from 'casper-wallet-core/src/domain/common/common'; import { useSelector } from 'react-redux'; +import { DEPLOY_DETAILS_REFRESH_RATE } from '@src/constants'; + import { selectActiveNetworkSetting } from '@background/redux/settings/selectors'; import { selectVaultActiveAccount } from '@background/redux/vault/selectors'; import { deploysRepository } from '@background/wallet-repositories'; @@ -17,7 +19,9 @@ export const useFetchSingleDeploy = (deployHash?: string) => { deployHash: deployHash ?? '', activePublicKey: activeAccount?.publicKey ?? '', network: network.toLowerCase() as CasperNetwork - }) + }), + refetchInterval: DEPLOY_DETAILS_REFRESH_RATE, + staleTime: DEPLOY_DETAILS_REFRESH_RATE }); return {