[ENG-5333] Update Batch PSBT Signing Screen for Single PSBT

secretkeylabs · Oct 4, 2024 · 6db827a · 6db827a
1 parent c7d1906
commit 6db827a
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 21 deletions.
diff --git a/src/app/components/batchPsbtSigning/index.tsx b/src/app/components/batchPsbtSigning/index.tsx
@@ -59,7 +59,8 @@ function BatchPsbtSigning({ onSigned, psbts, onCancel }: BatchPsbtSigningProps)
   const [isSigningComplete, setIsSigningComplete] = useState(false);
   const [signingPsbtIndex, setSigningPsbtIndex] = useState(1);
   const [currentPsbtIndex, setCurrentPsbtIndex] = useState(0);
-  const [reviewTransaction, setReviewTransaction] = useState(false);
+  const singlePsbt = psbts.length === 1;
+  const [reviewTransaction, setReviewTransaction] = useState(singlePsbt);
   const [isLoading, setIsLoading] = useState(true);
   const txnContext = useTransactionContext();
   useTrackMixPanelPageViewed();
@@ -256,13 +257,36 @@ function BatchPsbtSigning({ onSigned, psbts, onCancel }: BatchPsbtSigningProps)
     );
   };
 
-  const reviewDoneText = hasDuplicateInputs ? t('CONFIRM_ALL') : t('DONE');
-  const onReviewDone = hasDuplicateInputs
-    ? onSignPsbtConfirmed
-    : () => {
-        setReviewTransaction(false);
-        setCurrentPsbtIndex(0);
-      };
+  const modalOnClose =
+    singlePsbt || hasDuplicateInputs
+      ? onCancel
+      : () => {
+          setReviewTransaction(false);
+          setCurrentPsbtIndex(0);
+        };
+
+  const reviewTitle = singlePsbt
+    ? t('SIGN_TRANSACTION')
+    : `${t('TRANSACTION')} ${currentPsbtIndex + 1}/${parsedPsbts.length}`;
+  const reviewBackText = singlePsbt ? t('CANCEL') : t('PREVIOUS');
+  const reviewBackIcon = singlePsbt ? null : <ArrowLeft color="white" size={16} weight="bold" />;
+  const reviewBackDisabled = singlePsbt ? false : currentPsbtIndex === 0;
+  const onReviewBackClick = singlePsbt
+    ? onCancel
+    : () => setCurrentPsbtIndex((prevIndex) => prevIndex - 1);
+
+  const reviewDoneText = hasDuplicateInputs
+    ? t('CONFIRM_ALL')
+    : singlePsbt
+    ? t('CONFIRM')
+    : t('DONE');
+  const onReviewDone =
+    hasDuplicateInputs || singlePsbt
+      ? onSignPsbtConfirmed
+      : () => {
+          setReviewTransaction(false);
+          setCurrentPsbtIndex(0);
+        };
 
   return (
     <>
@@ -271,16 +295,11 @@ function BatchPsbtSigning({ onSigned, psbts, onCancel }: BatchPsbtSigningProps)
       <StyledSheet
         header=""
         visible={reviewTransaction || hasDuplicateInputs}
-        onClose={() => {
-          setReviewTransaction(false);
-          setCurrentPsbtIndex(0);
-        }}
+        onClose={modalOnClose}
       >
         <OuterContainer>
           <ModalContainer>
-            <ReviewTransactionText>
-              {t('TRANSACTION')} {currentPsbtIndex + 1}/{parsedPsbts.length}
-            </ReviewTransactionText>
+            <ReviewTransactionText>{reviewTitle}</ReviewTransactionText>
             {!!parsedPsbts[currentPsbtIndex] && (
               <TxSummaryContext.Provider value={individualTxSummaryContext}>
                 <TransactionSummary />
@@ -290,13 +309,11 @@ function BatchPsbtSigning({ onSigned, psbts, onCancel }: BatchPsbtSigningProps)
         </OuterContainer>
         <TxReviewModalControls>
           <Button
-            title={t('PREVIOUS')}
+            title={reviewBackText}
             variant="secondary"
-            onClick={() => {
-              setCurrentPsbtIndex((prevIndex) => prevIndex - 1);
-            }}
-            icon={<ArrowLeft color="white" size={16} weight="bold" />}
-            disabled={currentPsbtIndex === 0}
+            onClick={onReviewBackClick}
+            icon={reviewBackIcon}
+            disabled={reviewBackDisabled}
           />
           {currentPsbtIndex < parsedPsbts.length - 1 && (
             <Button

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -349,6 +349,7 @@
     "BUNDLE_PLUS_FEES": "Bundle size + fees",
     "REVIEW_TRANSACTION": "Review transaction",
     "SIGN_TRANSACTIONS": "Sign {{count}} transactions",
+    "SIGN_TRANSACTION": "Sign transaction",
     "AMOUNT": "Amount",
     "INSUFFICIENT_BALANCE": "Insufficient balance",
     "YOUR_ADDRESS": "My address",