diff --git a/suite-native/module-send/src/screens/SendOutputsScreen.tsx b/suite-native/module-send/src/screens/SendOutputsScreen.tsx index b9108534c597..dbe02f3b522e 100644 --- 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 index b6daa5e062ad..824986561495 100644 --- 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 ); }, ),