feat: useDappApproveAction support close window after resolved (#2704)

OneKeyHQ · Mar 14, 2023 · a4de502 · a4de502
1 parent 6414f84
commit a4de502
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/packages/kit/src/hooks/useDappApproveAction.ts b/packages/kit/src/hooks/useDappApproveAction.ts
@@ -12,11 +12,13 @@ function useDappApproveAction({
   id,
   getResolveData,
   closeOnError,
+  closeWindowAfterResolved,
 }: {
   id: number | string;
   // Case of rejection only
   getResolveData?: () => Promise<any> | any;
   closeOnError?: boolean;
+  closeWindowAfterResolved?: boolean;
 }) {
   const isExtStandaloneWindow = platformEnv.isExtensionUiStandaloneWindow;
   const [rejectError, setRejectError] = useState<Error | null>(null);
@@ -53,13 +55,18 @@ function useDappApproveAction({
           data,
         });
         close?.();
+        if (isExtStandaloneWindow && closeWindowAfterResolved) {
+          setTimeout(() => {
+            window.close();
+          }, 0);
+        }
       } catch (error) {
         console.error('getResolveData ERROR:', error);
         setRejectError(error as Error);
         throw error;
       }
     },
-    [getResolveData, id],
+    [getResolveData, id, isExtStandaloneWindow, closeWindowAfterResolved],
   );
 
   useEffect(() => {

diff --git a/packages/kit/src/views/ManageNetworks/SwitchRpc/index.tsx b/packages/kit/src/views/ManageNetworks/SwitchRpc/index.tsx
@@ -99,6 +99,7 @@ export function SwitchRpcModal() {
   const queryInfo = useDappParams();
   const dappApprove = useDappApproveAction({
     id: queryInfo.sourceInfo?.id ?? '',
+    closeWindowAfterResolved: true,
   });
 
   const { result, loading } = useAsync(