fix(suite): wait on solana transaction confirmation in review

trezor · Mar 8, 2024 · 766c424 · 766c424
1 parent 1e1a116
commit 766c424
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 6 deletions.
diff --git a/...mponents/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewModalContent.tsx b/...mponents/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewModalContent.tsx
@@ -45,6 +45,7 @@ export const TransactionReviewModalContent = ({
     const isActionAbortable = useSelector(selectIsActionAbortable);
     const dispatch = useDispatch();
     const [detailsOpen, setDetailsOpen] = useState(false);
+    const [isSending, setIsSending] = useState(false);
 
     const deviceModelInternal = device?.features?.internal_model;
 
@@ -73,10 +74,6 @@ export const TransactionReviewModalContent = ({
 
     const ethereumStakeType =
         'ethereumStakeType' in precomposedForm ? precomposedForm.ethereumStakeType : null;
-    const actionText = getTransactionReviewModalActionText({
-        ethereumStakeType,
-        isRbfAction,
-    });
 
     // omit other button requests (like passphrase)
     const buttonRequests = device.buttonRequests.filter(
@@ -140,7 +137,10 @@ export const TransactionReviewModalContent = ({
                 broadcast={precomposedForm.options.includes('broadcast')}
                 detailsOpen={detailsOpen}
                 onDetailsClick={() => setDetailsOpen(!detailsOpen)}
-                actionText={actionText}
+                actionText={getTransactionReviewModalActionText({
+                    ethereumStakeType,
+                    isRbfAction,
+                })}
             />
             <TransactionReviewOutputList
                 account={selectedAccount.account}
@@ -152,7 +152,13 @@ export const TransactionReviewModalContent = ({
                 outputs={outputs}
                 buttonRequestsCount={buttonRequestsCount}
                 isRbfAction={isRbfAction}
-                actionText={actionText}
+                actionText={getTransactionReviewModalActionText({
+                    ethereumStakeType,
+                    isRbfAction,
+                    isSending,
+                })}
+                isSending={isSending}
+                setIsSending={() => setIsSending(true)}
             />
             <TransactionReviewEvmExplanation account={selectedAccount.account} />
         </StyledModal>

diff --git a/...xModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutputList.tsx b/...xModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutputList.tsx
@@ -89,6 +89,8 @@ export interface TransactionReviewOutputListProps {
     buttonRequestsCount: number;
     isRbfAction: boolean;
     actionText: TranslationKey;
+    isSending?: boolean;
+    setIsSending?: () => void;
 }
 
 export const TransactionReviewOutputList = ({
@@ -102,6 +104,8 @@ export const TransactionReviewOutputList = ({
     buttonRequestsCount,
     isRbfAction,
     actionText,
+    isSending,
+    setIsSending,
 }: TransactionReviewOutputListProps) => {
     const dispatch = useDispatch();
     const { networkType } = account;
@@ -141,6 +145,9 @@ export const TransactionReviewOutputList = ({
             },
         });
     const handleSend = () => {
+        if (networkType === 'solana') {
+            setIsSending?.();
+        }
         if (decision) {
             decision.resolve(true);
 
@@ -228,6 +235,7 @@ export const TransactionReviewOutputList = ({
                         <StyledButton
                             data-test="@modal/send"
                             isDisabled={!signedTx}
+                            isLoading={isSending}
                             onClick={handleSend}
                         >
                             <Translation id={actionText} />

diff --git a/packages/suite/src/support/messages.ts b/packages/suite/src/support/messages.ts
@@ -6487,6 +6487,10 @@ export default defineMessages({
         id: 'TR_REPLACE_TX',
         defaultMessage: 'Replace transaction',
     },
+    TR_CONFIRMING_TX: {
+        id: 'TR_CONFIRMING_TX',
+        defaultMessage: 'Confirming transaction',
+    },
     TR_FINALIZE_TX: {
         id: 'TR_FINALIZE_TX',
         defaultMessage: 'Finalize transaction',

diff --git a/packages/suite/src/utils/suite/transactionReview.ts b/packages/suite/src/utils/suite/transactionReview.ts
@@ -4,11 +4,13 @@ import { StakeFormState } from '@suite-common/wallet-types';
 interface getTransactionReviewModalActionTextParams {
     ethereumStakeType: StakeFormState['ethereumStakeType'] | null;
     isRbfAction: boolean;
+    isSending?: boolean;
 }
 
 export const getTransactionReviewModalActionText = ({
     ethereumStakeType,
     isRbfAction,
+    isSending,
 }: getTransactionReviewModalActionTextParams): TranslationKey => {
     switch (ethereumStakeType) {
         case 'stake':
@@ -24,5 +26,9 @@ export const getTransactionReviewModalActionText = ({
         return 'TR_REPLACE_TX';
     }
 
+    if (isSending) {
+        return 'TR_CONFIRMING_TX';
+    }
+
     return 'SEND_TRANSACTION';
 };