render snap install success/error

MetaMask · Oct 25, 2023 · c436d48 · c436d48
1 parent d41e9d3
commit c436d48
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/app/components/Approvals/InstallSnapApproval/InstallSnapApproval.tsx b/app/components/Approvals/InstallSnapApproval/InstallSnapApproval.tsx
@@ -12,13 +12,12 @@ const InstallSnapApproval = () => {
     setIsFinished(true);
   };
 
+  const isModalVisible =
+    approvalRequest?.type === ApprovalTypes.INSTALL_SNAP ||
+    (!isFinished && approvalRequest);
+
   return (
-    <ApprovalModal
-      isVisible={
-        approvalRequest?.type === ApprovalTypes.INSTALL_SNAP && !isFinished
-      }
-      onCancel={onReject}
-    >
+    <ApprovalModal isVisible={isModalVisible} onCancel={onReject}>
       <InstallSnapApprovalFlow
         onCancel={onReject}
         onConfirm={onConfirm}

diff --git a/app/components/UI/InstallSnapApprovalFlow/InstallSnapApprovalFlow.tsx b/app/components/UI/InstallSnapApprovalFlow/InstallSnapApprovalFlow.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import {
   InstallSnapApprovalArgs,
   SnapInstallState,
@@ -12,7 +12,7 @@ import { SNAP_INSTALL_FLOW } from '../../../constants/test-ids';
 import Logger from '../../../util/Logger';
 
 const InstallSnapApprovalFlow = ({
-  requestData,
+  requestData: requestDataProp,
   onConfirm,
   onFinish,
   onCancel,
@@ -25,6 +25,14 @@ const InstallSnapApprovalFlow = ({
     undefined,
   );
 
+  const [requestData, setRequestData] = useState(requestDataProp);
+
+  useEffect(() => {
+    if (requestDataProp) {
+      setRequestData(requestDataProp);
+    }
+  }, [requestDataProp]);
+
   const onConfirmNext = useCallback(() => {
     setInstallState(SnapInstallState.AcceptPermissions);
   }, []);