From 93216d0145169f94c4edf3c872f87158f9647d94 Mon Sep 17 00:00:00 2001 From: Marcos Rodriguez Velez Date: Fri, 3 Jan 2025 11:29:12 -0400 Subject: [PATCH 1/8] FIX: Coin Selected bar was visible without coins selected --- screen/send/SendDetails.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/screen/send/SendDetails.tsx b/screen/send/SendDetails.tsx index eeba03657..bbce19a11 100644 --- a/screen/send/SendDetails.tsx +++ b/screen/send/SendDetails.tsx @@ -1170,7 +1170,7 @@ const SendDetails = () => { const renderWalletSelectionOrCoinsSelected = () => { if (isVisible) return null; - if (utxos !== null) { + if (utxos && utxos?.length > 0) { return ( Date: Fri, 3 Jan 2025 11:31:15 -0400 Subject: [PATCH 2/8] Update SendDetails.tsx --- screen/send/SendDetails.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/screen/send/SendDetails.tsx b/screen/send/SendDetails.tsx index bbce19a11..941bf0ec7 100644 --- a/screen/send/SendDetails.tsx +++ b/screen/send/SendDetails.tsx @@ -1174,7 +1174,7 @@ const SendDetails = () => { return ( { LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut); From e88ce6f505079005091e630410be16e914c01d02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Rodriguez=20V=C3=A9lez?= Date: Fri, 3 Jan 2025 14:49:42 -0400 Subject: [PATCH 3/8] Update SendDetails.tsx --- screen/send/SendDetails.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/screen/send/SendDetails.tsx b/screen/send/SendDetails.tsx index 941bf0ec7..272d76f77 100644 --- a/screen/send/SendDetails.tsx +++ b/screen/send/SendDetails.tsx @@ -1174,7 +1174,7 @@ const SendDetails = () => { return ( { LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut); From 2ccd73e2f10faef9cfd751404629b9afaad26a9f Mon Sep 17 00:00:00 2001 From: Marcos Rodriguez Velez Date: Mon, 6 Jan 2025 20:24:41 -0400 Subject: [PATCH 4/8] Revert "Update SendDetails.tsx" This reverts commit e88ce6f505079005091e630410be16e914c01d02. --- screen/send/SendDetails.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/screen/send/SendDetails.tsx b/screen/send/SendDetails.tsx index 272d76f77..941bf0ec7 100644 --- a/screen/send/SendDetails.tsx +++ b/screen/send/SendDetails.tsx @@ -1174,7 +1174,7 @@ const SendDetails = () => { return ( { LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut); From 73637a9ff6932d0400adc91bae8cf77954f6d5c3 Mon Sep 17 00:00:00 2001 From: Marcos Rodriguez Velez Date: Mon, 6 Jan 2025 20:24:46 -0400 Subject: [PATCH 5/8] Update ScanQRCode.js --- screen/send/ScanQRCode.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/screen/send/ScanQRCode.js b/screen/send/ScanQRCode.js index 239c11cee..41acd661f 100644 --- a/screen/send/ScanQRCode.js +++ b/screen/send/ScanQRCode.js @@ -335,16 +335,7 @@ const ScanQRCode = () => { }; const dismiss = () => { - if (launchedBy) { - let merge = true; - if (typeof onBarScanned !== 'function') { - merge = false; - } - navigation.navigate({ name: launchedBy, params: {}, merge }); - } else { - navigation.goBack(); - } - if (onDismiss) onDismiss(); + navigation.goBack(); }; const render = isLoading ? ( From 13254b0045e9f503dc91c87fa787021e8d99a895 Mon Sep 17 00:00:00 2001 From: Marcos Rodriguez Velez Date: Mon, 6 Jan 2025 20:31:36 -0400 Subject: [PATCH 6/8] Update ScanQRCode.js --- screen/send/ScanQRCode.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/screen/send/ScanQRCode.js b/screen/send/ScanQRCode.js index 219996803..18d76bd5a 100644 --- a/screen/send/ScanQRCode.js +++ b/screen/send/ScanQRCode.js @@ -89,7 +89,7 @@ const ScanQRCode = () => { const previousRoute = navigationState.routes[navigationState.routes.length - 2]; const defaultLaunchedBy = previousRoute ? previousRoute.name : undefined; - const { launchedBy = defaultLaunchedBy, onBarScanned, onDismiss, showFileImportButton } = route.params || {}; + const { launchedBy = defaultLaunchedBy, onBarScanned, showFileImportButton } = route.params || {}; const scannedCache = {}; const { colors } = useTheme(); const isFocused = useIsFocused(); From 008b7d98a85462b9c53c47d4d572e2ac3f5bda45 Mon Sep 17 00:00:00 2001 From: Marcos Rodriguez Velez Date: Mon, 6 Jan 2025 20:34:09 -0400 Subject: [PATCH 7/8] Update SendDetails.tsx --- screen/send/SendDetails.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/screen/send/SendDetails.tsx b/screen/send/SendDetails.tsx index 941bf0ec7..eeba03657 100644 --- a/screen/send/SendDetails.tsx +++ b/screen/send/SendDetails.tsx @@ -1170,11 +1170,11 @@ const SendDetails = () => { const renderWalletSelectionOrCoinsSelected = () => { if (isVisible) return null; - if (utxos && utxos?.length > 0) { + if (utxos !== null) { return ( { LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut); From 714702aac0df75fd563d64f45ac0fcb666dff94d Mon Sep 17 00:00:00 2001 From: Marcos Rodriguez Velez Date: Tue, 7 Jan 2025 11:51:11 -0400 Subject: [PATCH 8/8] Update DetailViewStackParamList.ts --- navigation/DetailViewStackParamList.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/navigation/DetailViewStackParamList.ts b/navigation/DetailViewStackParamList.ts index 036c2d6de..4e47fdb9f 100644 --- a/navigation/DetailViewStackParamList.ts +++ b/navigation/DetailViewStackParamList.ts @@ -9,7 +9,6 @@ export type ScanQRCodeParamList = { urTotal?: number; urHave?: number; backdoorText?: string; - onDismiss?: () => void; onBarScanned?: (data: string) => void; showFileImportButton?: boolean; backdoorVisible?: boolean;