diff --git a/src/ui/views/Approval/components/Actions/components/TransactionActionList.tsx b/src/ui/views/Approval/components/Actions/components/TransactionActionList.tsx
index 26234a35e47..0396b311a9c 100644
--- a/src/ui/views/Approval/components/Actions/components/TransactionActionList.tsx
+++ b/src/ui/views/Approval/components/Actions/components/TransactionActionList.tsx
@@ -64,6 +64,7 @@ export const TransactionActionList: React.FC<{
React.useEffect(() => {
if (requireData && 'extraState' in requireData) {
requireData.extraState.hasInteraction?.();
+ requireData.extraState.receiverHasTransfer?.();
}
}, []);
diff --git a/src/ui/views/Approval/components/Actions/components/Values.tsx b/src/ui/views/Approval/components/Actions/components/Values.tsx
index 9eff10eb1e2..23e7caf763c 100644
--- a/src/ui/views/Approval/components/Actions/components/Values.tsx
+++ b/src/ui/views/Approval/components/Actions/components/Values.tsx
@@ -27,8 +27,20 @@ import { findChain } from '@/utils/chain';
import clsx from 'clsx';
import { copyAddress } from '@/ui/utils/clipboard';
-const Boolean = ({ value }: { value: boolean }) => {
- return <>{value ? 'Yes' : 'No'}>;
+const Boolean = ({ value }: { value: boolean | null }) => {
+ const { t } = useTranslation();
+
+ return (
+ <>
+ {value === null ? (
+ 'loading'
+ ) : value ? (
+ <>{t('page.signTx.yes')}>
+ ) : (
+ <>{t('page.signTx.no')}>
+ )}
+ >
+ );
};
const TokenAmountWrapper = styled.div`
@@ -432,29 +444,9 @@ const DisplayChain = ({ chainServerId }: { chainServerId: string }) => {
);
};
-const Interacted = ({ value }: { value: boolean | null }) => {
- const { t } = useTranslation();
- return (
-
- {value === null ? (
- 'loading'
- ) : value ? (
- <>{t('page.signTx.yes')}>
- ) : (
- <>{t('page.signTx.no')}>
- )}
-
- );
-};
+const Interacted = Boolean;
-const Transacted = ({ value }: { value: boolean }) => {
- const { t } = useTranslation();
- return (
-
- {value ? <>{t('page.signTx.yes')}> : <>{t('page.signTx.no')}>}
-
- );
-};
+const Transacted = Boolean;
const TokenSymbol = ({
token,
diff --git a/src/ui/views/Approval/components/Actions/components/ViewMorePopup/ReceiverPopup.tsx b/src/ui/views/Approval/components/Actions/components/ViewMorePopup/ReceiverPopup.tsx
index 5eacca2a6b9..268fab9ed5f 100644
--- a/src/ui/views/Approval/components/Actions/components/ViewMorePopup/ReceiverPopup.tsx
+++ b/src/ui/views/Approval/components/Actions/components/ViewMorePopup/ReceiverPopup.tsx
@@ -27,7 +27,7 @@ export interface ReceiverData {
} | null;
contract: Record | null;
usd_value: number;
- hasTransfer: boolean;
+ hasTransfer: boolean | null;
isTokenContract: boolean;
name: string | null;
onTransferWhitelist: boolean;