fix: allow no chainId for permit (#2195)

RabbyHub · Apr 12, 2024 · 416f4ae · 416f4ae
1 parent 1cb57e1
commit 416f4ae
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 13 deletions.
diff --git a/src/ui/views/Approval/components/Actions/components/UserListDrawer.tsx b/src/ui/views/Approval/components/Actions/components/UserListDrawer.tsx
@@ -68,7 +68,6 @@ const GlobalStyle = createGlobalStyle`
 
 interface Props {
   address: string;
-  chain: Chain;
   onWhitelist: boolean;
   onBlacklist: boolean;
   onChange({
@@ -82,7 +81,6 @@ interface Props {
 
 const UserListDrawer = ({
   address,
-  chain,
   onWhitelist,
   onBlacklist,
   onChange,
@@ -147,7 +145,7 @@ export default ({
   onChange,
 }: {
   address: string;
-  chain: Chain;
+  chain?: Chain;
   onWhitelist: boolean;
   onBlacklist: boolean;
   onChange({
@@ -162,7 +160,6 @@ export default ({
     content: (
       <UserListDrawer
         address={address}
-        chain={chain}
         onWhitelist={onWhitelist}
         onBlacklist={onBlacklist}
         onChange={(res) => {
@@ -174,7 +171,7 @@ export default ({
     height: 240,
     closable: true,
     title: i18n.t('page.signTx.myMarkWithContract', {
-      chainName: chain.name,
+      chainName: chain?.name,
     }),
     className: 'user-list-drawer',
     onClose: () => destroy(),

diff --git a/src/ui/views/Approval/components/Actions/components/Values.tsx b/src/ui/views/Approval/components/Actions/components/Values.tsx
@@ -121,11 +121,11 @@ const AddressMark = ({
   onWhitelist: boolean;
   onBlacklist: boolean;
   address: string;
-  chain: Chain;
+  chain?: Chain;
   isContract?: boolean;
   onChange(): void;
 }) => {
-  const chainId = chain.serverId;
+  const chainId = chain?.serverId;
   const wallet = useWallet();
   const dispatch = useRabbyDispatch();
   const { t } = useTranslation();

diff --git a/src/ui/views/Approval/components/Actions/components/ViewMorePopup/SpenderPopup.tsx b/src/ui/views/Approval/components/Actions/components/ViewMorePopup/SpenderPopup.tsx
@@ -8,7 +8,7 @@ import { isSameAddress } from '@/ui/utils';
 
 interface SpenderData {
   spender: string;
-  chain: Chain;
+  chain?: Chain;
   protocol: {
     name: string;
     logo_url: string;
@@ -41,12 +41,12 @@ export const SpenderPopup: React.FC<Props> = ({ data }) => {
       isInBlackList: contractBlacklist.some(
         ({ address, chainId }) =>
           isSameAddress(address, data.spender) &&
-          chainId === data.chain.serverId
+          chainId === data.chain?.serverId
       ),
       isInWhiteList: contractWhitelist.some(
         ({ address, chainId }) =>
           isSameAddress(address, data.spender) &&
-          chainId === data.chain.serverId
+          chainId === data.chain?.serverId
       ),
     };
   }, [data.spender, data.chain, contractBlacklist, contractWhitelist]);
@@ -111,7 +111,7 @@ export const SpenderPopup: React.FC<Props> = ({ data }) => {
             {data.rank
               ? t('page.signTx.contractPopularity', [
                   data.rank,
-                  data.chain.name,
+                  data.chain?.name,
                 ])
               : '-'}
           </Row>

diff --git a/src/ui/views/Approval/components/TypedDataActions/Permit.tsx b/src/ui/views/Approval/components/TypedDataActions/Permit.tsx
@@ -42,7 +42,7 @@ const Permit = ({
 }: {
   data: TypedDataActionData['permit'];
   requireData: ApproveTokenRequireData;
-  chain: Chain;
+  chain?: Chain;
   engineResults: Result[];
 }) => {
   const actionData = data!;

diff --git a/src/ui/views/Approval/components/TypedDataActions/index.tsx b/src/ui/views/Approval/components/TypedDataActions/index.tsx
@@ -232,7 +232,7 @@ const Actions = ({
           <>
             {(data?.actionType || data?.actionType === null) && (
               <div className="container">
-                {data.permit && chain && (
+                {data.permit && (
                   <Permit
                     data={data.permit}
                     requireData={requireData as ApproveTokenRequireData}