wip

RabbyHub · Dec 18, 2024 · 9ccd589 · 9ccd589
1 parent f13f133
commit 9ccd589
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 25 deletions.
diff --git 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
@@ -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 (
-    <span className="flex">
-      {value === null ? (
-        'loading'
-      ) : value ? (
-        <>{t('page.signTx.yes')}</>
-      ) : (
-        <>{t('page.signTx.no')}</>
-      )}
-    </span>
-  );
-};
+const Interacted = Boolean;
 
-const Transacted = ({ value }: { value: boolean }) => {
-  const { t } = useTranslation();
-  return (
-    <span className="flex">
-      {value ? <>{t('page.signTx.yes')}</> : <>{t('page.signTx.no')}</>}
-    </span>
-  );
-};
+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
@@ -27,7 +27,7 @@ export interface ReceiverData {
   } | null;
   contract: Record<string, ContractDesc> | null;
   usd_value: number;
-  hasTransfer: boolean;
+  hasTransfer: boolean | null;
   isTokenContract: boolean;
   name: string | null;
   onTransferWhitelist: boolean;