fixup! feat(suite-native): advanced recipient address validation

trezor · Nov 27, 2024 · 9c98ecc · 9c98ecc
1 parent b37362f
commit 9c98ecc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/suite-native/module-send/src/screens/SendOutputsScreen.tsx b/suite-native/module-send/src/screens/SendOutputsScreen.tsx
@@ -110,7 +110,7 @@ export const SendOutputsScreen = ({
             isValueInSats: isAmountInSats,
             feeLevelsMaxAmount,
             decimals: tokenInfo?.decimals ?? network?.decimals,
-            isTaprootUnavailable: !deviceUnavailableCapabilities?.taproot,
+            isTaprootAvailable: !deviceUnavailableCapabilities?.taproot,
         },
         defaultValues: getDefaultValues({ tokenContract }),
     });

diff --git a/suite-native/module-send/src/sendOutputsFormSchema.ts b/suite-native/module-send/src/sendOutputsFormSchema.ts
@@ -23,7 +23,7 @@ export type SendFormFormContext = {
     isTokenFlow?: boolean;
     feeLevelsMaxAmount?: FeeLevelsMaxAmount;
     decimals?: number;
-    isTaprootUnavailable?: boolean;
+    isTaprootAvailable?: boolean;
 };
 
 const isAmountDust = (amount: string, context?: SendFormFormContext) => {
@@ -99,14 +99,18 @@ export const sendOutputsFormValidationSchema = yup.object({
                             if (!value || !context) {
                                 return false;
                             }
-                            const { networkSymbol, isTaprootUnavailable } = context;
+                            const { networkSymbol, isTaprootAvailable } = context;
+
+                            if (!networkSymbol) return false;
+
+                            const isTaprootValid =
+                                !isTaprootAddress(value, networkSymbol) || isTaprootAvailable;
 
                             return (
-                                G.isNotNullable(networkSymbol) &&
                                 isAddressValid(value, networkSymbol) &&
                                 !isAddressDeprecated(value, networkSymbol) &&
                                 !isBech32AddressUppercase(value) && // bech32 addresses are valid as uppercase but are not accepted by Trezor
-                                !(isTaprootAddress(value, networkSymbol) && isTaprootUnavailable) // bech32m/Taproot addresses are valid but may not be supported by older FW
+                                isTaprootValid // bech32m/Taproot addresses are valid but may not be supported by older FW
                             );
                         },
                     ),