sync: bring main-only fixes (158820a) into develop - #62
Merged
Merged
Conversation
Develop → main: PSE/BRE-B fixes, session-expiry, TOS stale-session dialog
fix(pse): send phone number in E.164, not bare local digits
fix(send): don't require a card account to send to Colombian banks
Develop → main: fix Colombian bank transfer selector
Develop → main: sync Colombian bank list with SDK 0.13.0
Develop → main: fix Colombian-bank rate/medium mismatch
Develop → main: restore BRE-B key resolution
chore: promote develop to main — RTP payout + ACH payin
release: wallet visual theme matching new landing page (BQE-2597)
Develop → main: fix KYC retry after rejection
Develop → main: fix BRE-B transfer step 3 rate race
Develop → main: fix BQE-2642 global movements ignoring COP/KSM
Merge develop into main
Merge develop into main
chore: promote develop to main (fix/send-colombian-banks-amount)
#59) (#60) * fix(payments): step-back navigation and mismatched flow copy in US-bank steps - UsAmountStep had no back button, trapping users on that step - topup/send us-banks flows showed a generic account error even when the real cause was a rejected KYC - TopUpConfirmStep/TopUpAmountStep (used only by send/colombian-banks) leaked topup/PSE-specific copy (title, PSE disclaimer, PSE fee label) into the send flow * feat(accounts): allow creating a pocket account anchored to an existing ledger - CreateVirtualAccountInput/createVirtualAccount now pass ledgerId through to the SDK, matching card/polygon — needed to attach a pocket to an account whose ledger already exists but has no pocket product yet (see BQE-2653: external-us-bank accounts stuck with no destination pocket) - account detail's "add product" now offers a pocket/"Cuenta" option alongside card/breb/polygon, wired the same way (ledgerId: account.ledgerId) - home quick actions (topup/send/BRE-B) are disabled with a toast hint when the user has no account yet, instead of failing deep inside each flow with a confusing "no destination account" error - the "+ new account" card is visually highlighted (primary border, underlined label) when the user has zero accounts * fix(home): don't treat a still-loading accounts query as "no accounts" hasAccount and the carousel's highlight both read accounts.length off the query's data, which is [] before it resolves too — that flashed the quick actions as disabled (with the "create an account" toast) and highlighted the add-account card for users who do have one, on first login/cold cache. --------- Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
# Conflicts: # src/i18n/locales/en.json # src/i18n/locales/es.json # src/routes/_authed/send/us-banks/index.tsx # src/routes/_authed/topup/-components/amount-step.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why
mainhad a commit (158820a, PR #59/#60) never merged back intodevelop— pocket-account creation anchored to an existing ledger, KYC-rejected error distinguishing in US-bank flows, UsAmountStep back button, quick-actions disabled state when no account exists, and a fix for the accounts-loading race on home.developalso has newer work (#61) that main lacked.How
Merged
origin/maininto a branch offdevelop, no conflicts other than 4 trivial ones wheredevelopalready had develop-only additions: kept develop's side in all 4 (fee>0 conditional wrap, AccountCarousel import,sourceAccountLabeli18n key in en/es). Verified those 4 resolved files are byte-identical to develop's current state — nothing from PR #61 (currently under test) was touched or reverted.Risk
Low. No overlapping logic changes — main's unique commit touches different files/sections (home quick-actions, ports.ts, accounts-repository.ts, UsAmountStep) than what PR #61 changed. Confirmed no naming collision between
account-carousel.tsx(PR #61's new component) and the pre-existingaccounts-carousel.tsx(home page, untouched).