From 1f37ed590e27ff59f5b1b5ed1dd6d3490c6fb047 Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Tue, 20 Oct 2026 10:37:53 -0300 Subject: [PATCH 1/3] feat: use dropdown chevron on funding source button Co-Authored-By: Claude Opus 5.5 --- .../screens/wallets/send/SendAmountScreen.kt | 3 ++- app/src/main/res/drawable/ic_chevron_down.xml | 10 +++++++++ changelog.d/next/1612.changed.md | 1 + journeys/send/funding-source-dropdown.xml | 22 +++++++++++++++++++ 4 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 app/src/main/res/drawable/ic_chevron_down.xml create mode 100644 changelog.d/next/1612.changed.md create mode 100644 journeys/send/funding-source-dropdown.xml diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendAmountScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendAmountScreen.kt index 45eabb6bb7..1639d345eb 100644 --- a/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendAmountScreen.kt +++ b/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendAmountScreen.kt @@ -489,7 +489,8 @@ private fun PaymentMethodButton( } else { AppTextStyles.CaptionM }, - icon = if (uiState.canSwitchFundingSource) R.drawable.ic_transfer else null, + outlined = uiState.canSwitchFundingSource, + trailingIcon = if (uiState.canSwitchFundingSource) R.drawable.ic_chevron_down else null, onClick = { expanded = true }, enabled = uiState.fundingOptions.isNotEmpty(), isLoading = uiState.isFundingSourceLoading, diff --git a/app/src/main/res/drawable/ic_chevron_down.xml b/app/src/main/res/drawable/ic_chevron_down.xml new file mode 100644 index 0000000000..a0e6106878 --- /dev/null +++ b/app/src/main/res/drawable/ic_chevron_down.xml @@ -0,0 +1,10 @@ + + + diff --git a/changelog.d/next/1612.changed.md b/changelog.d/next/1612.changed.md new file mode 100644 index 0000000000..9d6f647e50 --- /dev/null +++ b/changelog.d/next/1612.changed.md @@ -0,0 +1 @@ +The wallet picker on the send amount screen now shows a dropdown arrow instead of the switch icon. diff --git a/journeys/send/funding-source-dropdown.xml b/journeys/send/funding-source-dropdown.xml new file mode 100644 index 0000000000..92c51197c7 --- /dev/null +++ b/journeys/send/funding-source-dropdown.xml @@ -0,0 +1,22 @@ + + + Verifies that the Send Amount wallet picker opens as a dropdown: an outlined button with the + selected wallet name followed by a downward chevron. Preconditions: an onboarded regtest wallet + with confirmed Savings funds and a usable Spending channel, a fresh zero-amount unified BIP21 URI + (on-chain address plus Lightning invoice) from another wallet, and a fresh on-chain address + from another wallet. Close each send without paying. + + With a single funding source the button shows no chevron and does not open a list. Android keeps + that single-source button filled; iOS keeps it outlined. + + + Open the zero-amount unified BIP21 URI with a bitcoin: deep link + Verify Send Amount shows the funding source button (testTag "AssetButton-switch") as an outlined button with the selected wallet name and a downward chevron after it, and no switch arrows before the name + Tap the funding source button and verify the dropdown (testTag "SendFundingSources") lists Savings and Spending with their balances and a check next to the selected wallet + Select the wallet that is not checked and verify the button shows its name in its color, orange for Savings and purple for Spending, still outlined with the downward chevron + Tap the funding source button again and verify the check moved to the newly selected wallet; dismiss the dropdown + Close the send sheet without paying + Open the on-chain address with a bitcoin: deep link and verify the funding source button shows Savings with no chevron + Close the send sheet without paying + + From d3ad55f6c637480f76b8aa42e86820ff7ce39c1f Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Tue, 20 Oct 2026 10:45:19 -0300 Subject: [PATCH 2/3] feat: outline single source funding button Co-Authored-By: Claude Opus 5.5 --- .../to/bitkit/ui/screens/wallets/send/SendAmountScreen.kt | 2 +- journeys/send/funding-source-dropdown.xml | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendAmountScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendAmountScreen.kt index 1639d345eb..145e7c52bb 100644 --- a/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendAmountScreen.kt +++ b/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendAmountScreen.kt @@ -489,7 +489,7 @@ private fun PaymentMethodButton( } else { AppTextStyles.CaptionM }, - outlined = uiState.canSwitchFundingSource, + outlined = true, trailingIcon = if (uiState.canSwitchFundingSource) R.drawable.ic_chevron_down else null, onClick = { expanded = true }, enabled = uiState.fundingOptions.isNotEmpty(), diff --git a/journeys/send/funding-source-dropdown.xml b/journeys/send/funding-source-dropdown.xml index 92c51197c7..c35edd68e8 100644 --- a/journeys/send/funding-source-dropdown.xml +++ b/journeys/send/funding-source-dropdown.xml @@ -5,9 +5,6 @@ with confirmed Savings funds and a usable Spending channel, a fresh zero-amount unified BIP21 URI (on-chain address plus Lightning invoice) from another wallet, and a fresh on-chain address from another wallet. Close each send without paying. - - With a single funding source the button shows no chevron and does not open a list. Android keeps - that single-source button filled; iOS keeps it outlined. Open the zero-amount unified BIP21 URI with a bitcoin: deep link @@ -16,7 +13,7 @@ Select the wallet that is not checked and verify the button shows its name in its color, orange for Savings and purple for Spending, still outlined with the downward chevron Tap the funding source button again and verify the check moved to the newly selected wallet; dismiss the dropdown Close the send sheet without paying - Open the on-chain address with a bitcoin: deep link and verify the funding source button shows Savings with no chevron + Open the on-chain address with a bitcoin: deep link and verify the funding source button shows Savings outlined in orange with no chevron or other icon Close the send sheet without paying From c0b8dd79c2f5573073bea6312cc056879fe86700 Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Tue, 20 Oct 2026 11:52:55 -0300 Subject: [PATCH 3/3] test: check disabled source in funding dropdown journey Co-Authored-By: Claude Opus 5.5 --- journeys/send/funding-source-dropdown.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/journeys/send/funding-source-dropdown.xml b/journeys/send/funding-source-dropdown.xml index c35edd68e8..7bf5922e74 100644 --- a/journeys/send/funding-source-dropdown.xml +++ b/journeys/send/funding-source-dropdown.xml @@ -14,6 +14,7 @@ Tap the funding source button again and verify the check moved to the newly selected wallet; dismiss the dropdown Close the send sheet without paying Open the on-chain address with a bitcoin: deep link and verify the funding source button shows Savings outlined in orange with no chevron or other icon + Tap the funding source button and verify the dropdown (testTag "SendFundingSources") opens with Savings checked and Spending dimmed with its balance; tap Spending and verify the selection does not change Close the send sheet without paying