merge develop

Emurgo · Jan 27, 2025 · c480eb3 · c480eb3
1 parent 2b08f5e
commit c480eb3
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 38 deletions.
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useLegacyOnConfirm.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useLegacyOnConfirm.tsx
@@ -48,41 +48,46 @@ export const useLegacyOnConfirm = ({
     }
     const {isHW, isEasyConfirmationEnabled} = meta
     if (isHW) {
-      openModal(
-        strings.signTransaction,
-        <ConfirmTxWithHwModal
-          onCancel={closeModal}
-          unsignedTx={unsignedTx}
-          onSuccess={handleOnSuccess}
-          onNotSupportedCIP1694={() => {
-            if (onNotSupportedCIP1694) {
-              closeModal()
-              onNotSupportedCIP1694()
-            }
-          }}
-          onCIP36SupportChange={onCIP36SupportChange ?? undefined}
-        />,
-        400,
-      )
+      openModal({
+        title: strings.signTransaction,
+        content: (
+          <ConfirmTxWithHwModal
+            onCancel={closeModal}
+            unsignedTx={unsignedTx}
+            onSuccess={handleOnSuccess}
+            onNotSupportedCIP1694={() => {
+              if (onNotSupportedCIP1694) {
+                closeModal()
+                onNotSupportedCIP1694()
+              }
+            }}
+            onCIP36SupportChange={onCIP36SupportChange ?? undefined}
+          />
+        ),
+        height: 400,
+      })
       return
     }
 
     if (!isHW && !isEasyConfirmationEnabled) {
-      openModal(
-        strings.signTransaction,
-        <ConfirmTxWithSpendingPasswordModal
-          unsignedTx={unsignedTx}
-          onSuccess={handleOnSuccess}
-          onError={handleOnError}
-        />,
-      )
+      openModal({
+        title: strings.signTransaction,
+        content: (
+          <ConfirmTxWithSpendingPasswordModal
+            unsignedTx={unsignedTx}
+            onSuccess={handleOnSuccess}
+            onError={handleOnError}
+          />
+        ),
+        height: 400,
+      })
       return
     }
 
-    openModal(
-      strings.signTransaction,
-      <ConfirmTxWithOsModal unsignedTx={unsignedTx} onSuccess={handleOnSuccess} onError={handleOnError} />,
-    )
+    openModal({
+      title: strings.signTransaction,
+      content: <ConfirmTxWithOsModal unsignedTx={unsignedTx} onSuccess={handleOnSuccess} onError={handleOnError} />,
+    })
   }
 
   return {legacyOnConfirm} as const

diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/usePromptRootKey.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/usePromptRootKey.tsx
@@ -29,21 +29,21 @@ export const usePromptRootKey = () => {
       }
 
       if (meta.isEasyConfirmationEnabled) {
-        openModal(
-          title ?? strings.confirmTx,
-          <ConfirmRawTxWithOs onSuccess={handleOnConfirm} onError={onError} />,
-          modalHeight,
+        openModal({
+          title: title ?? strings.confirmTx,
+          content: <ConfirmRawTxWithOs onSuccess={handleOnConfirm} onError={onError} />,
+          height: modalHeight,
           onClose,
-        )
+        })
         return
       }
 
-      openModal(
-        title ?? strings.confirmTx,
-        <ConfirmRawTxWithPassword summary={summary} onConfirm={handleOnConfirm} />,
-        modalHeight,
+      openModal({
+        title: title ?? strings.confirmTx,
+        content: <ConfirmRawTxWithPassword summary={summary} onConfirm={handleOnConfirm} />,
+        height: modalHeight,
         onClose,
-      )
+      })
     },
     [closeModal, meta.isEasyConfirmationEnabled, openModal, strings.confirmTx],
   )