[Issue-1780] Update type evmWatchTransactionRequest

Koniverse · Sep 7, 2024 · 49b973d · 49b973d
1 parent 12a5ad2
commit 49b973d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/src/screens/Confirmations/index.tsx b/src/screens/Confirmations/index.tsx
@@ -192,10 +192,13 @@ export const Confirmations = () => {
         account = request.account;
         canSign = !_isMessage || !account.isHardware;
         isMessage = _isMessage;
-      } else if (confirmation.type === 'evmSignatureRequest' || confirmation.type === 'evmSendTransactionRequest') {
+      } else if (
+        ['evmSignatureRequest', 'evmSendTransactionRequest', 'evmWatchTransactionRequest'].includes(confirmation.type)
+      ) {
         const request = confirmation.item as ConfirmationDefinitions[
           | 'evmSignatureRequest'
-          | 'evmSendTransactionRequest'][0];
+          | 'evmSendTransactionRequest'
+          | 'evmWatchTransactionRequest'][0];
 
         account = request.payload.account;
         canSign = request.payload.canSign;
@@ -244,6 +247,7 @@ export const Confirmations = () => {
             navigation={navigation}
           />
         );
+      case 'evmWatchTransactionRequest':
       case 'evmSendTransactionRequest':
         return (
           <EvmTransactionConfirmation

diff --git a/src/screens/Confirmations/variants/Transaction/index.tsx b/src/screens/Confirmations/variants/Transaction/index.tsx
@@ -130,11 +130,11 @@ export const TransactionConfirmation = (props: Props) => {
           txExpirationTime={txExpirationTime}
         />
       )}
-      {type === 'evmSendTransactionRequest' && (
+      {(type === 'evmSendTransactionRequest' || type === 'evmWatchTransactionRequest') && (
         <EvmSignArea
           id={item.id}
-          payload={item as ConfirmationDefinitions['evmSendTransactionRequest'][0]}
-          type="evmSendTransactionRequest"
+          payload={item as ConfirmationDefinitions['evmSendTransactionRequest' | 'evmWatchTransactionRequest'][0]}
+          type={type}
           navigation={navigation}
           txExpirationTime={txExpirationTime}
         />

diff --git a/src/stores/base/RequestState.ts b/src/stores/base/RequestState.ts
@@ -42,6 +42,7 @@ export const CONFIRMATIONS_FIELDS: Array<keyof RequestState> = [
   'addTokenRequest',
   'evmSignatureRequest',
   'evmSendTransactionRequest',
+  'evmWatchTransactionRequest',
   'errorConnectNetwork',
   'connectWCRequest',
 ];

diff --git a/src/types/confirmation.ts b/src/types/confirmation.ts
@@ -2,7 +2,7 @@ import { ConfirmationDefinitions } from '@subwallet/extension-base/background/Ko
 
 export type EvmSignatureSupportType = keyof Pick<
   ConfirmationDefinitions,
-  'evmSignatureRequest' | 'evmSendTransactionRequest'
+  'evmSignatureRequest' | 'evmSendTransactionRequest' | 'evmWatchTransactionRequest'
 >;
 
 export type EvmErrorSupportType = keyof Pick<ConfirmationDefinitions, 'errorConnectNetwork'>;