Commit 1e464ce
Merge branch 'main' (Phase 7 headless errors) into ramps-ub2-immediate-order-details
Conflicts resolved in:
- app/components/UI/Ramp/Views/Checkout/Checkout.tsx
- app/components/UI/Ramp/Views/Checkout/Checkout.test.tsx
- app/components/UI/Ramp/hooks/useTransakRouting.ts
- app/components/UI/Ramp/hooks/useTransakRouting.test.ts
Reconciled with main's Phase 7 (`feat(ramp): surface headless buy errors as data`):
- `Checkout.tsx`: imports `failSession` and adds `failHeadlessCheckout` to
forward callback exceptions and WebView HTTP errors to the headless
consumer's `onError` callback instead of showing the in-app `ErrorView`.
This branch's non-headless path (navigate immediately to `OrderDetails`
with callback params) is preserved; the headless branch still fetches the
order and fires `onOrderCreated` before pop.
- `useTransakRouting.ts`: imports `failSession`, calls it in the headless
catch path of `handleNavigationStateChange`, and reintroduces
`navigateToOrderProcessingCallback` so the manual bank transfer
approval flow can hand a successful headless order to `onOrderCreated`
without showing the toast or routing to bank-details. `LimitExceededError`
now carries `headlessBuyErrorCode: 'LIMIT_EXCEEDED'` and `details` so the
Host can surface limit failures as data; the approved-flow catch
rethrows it unchanged.
- Tests cover: callback failure → `failSession` (no ErrorView), WebView
HTTP error → `failSession`, `LimitExceededError` preservation,
manual bank transfer headless success path.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>73 files changed
Lines changed: 2218 additions & 668 deletions
File tree
- .github/workflows
- app
- components
- UI
- Money
- Views/MoneyHomeView
- components
- MoneyEarningsInfoSheet
- MoneyEarnings
- MoneyMetaMaskCard
- MoneyPotentialEarnings
- Predict/components
- PredictMarketMultiple
- PredictMarketSingle
- PredictMarketSportCard
- PredictMarket
- Ramp
- Views
- BuildQuote
- Checkout
- HeadlessHost
- headless
- hooks
- Rewards/components/Campaigns
- Trending/components/TrendingTokenRowItem
- Views
- ActivityView
- TrendingView
- components
- feeds
- dapps
- perps
- predictions
- sites
- tokens
- search
- tabs
- Wallet
- core
- Analytics
- Engine
- controllers
- keyring-controller
- messengers
- multichain-accounts/AccountTreeInitService
- locales/languages
- tests
- scripts
- smoke/fixtures
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
125 | 125 | | |
126 | 126 | | |
127 | 127 | | |
| 128 | + | |
128 | 129 | | |
129 | 130 | | |
130 | 131 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
142 | 142 | | |
143 | 143 | | |
144 | 144 | | |
| 145 | + | |
145 | 146 | | |
146 | 147 | | |
147 | 148 | | |
| |||
165 | 166 | | |
166 | 167 | | |
167 | 168 | | |
| 169 | + | |
168 | 170 | | |
169 | 171 | | |
170 | 172 | | |
171 | 173 | | |
172 | 174 | | |
173 | 175 | | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
174 | 179 | | |
175 | 180 | | |
176 | 181 | | |
177 | 182 | | |
178 | 183 | | |
179 | 184 | | |
| 185 | + | |
180 | 186 | | |
181 | 187 | | |
182 | 188 | | |
| |||
333 | 339 | | |
334 | 340 | | |
335 | 341 | | |
336 | | - | |
| 342 | + | |
337 | 343 | | |
338 | 344 | | |
339 | 345 | | |
| |||
376 | 382 | | |
377 | 383 | | |
378 | 384 | | |
379 | | - | |
| 385 | + | |
380 | 386 | | |
381 | 387 | | |
382 | 388 | | |
383 | 389 | | |
384 | 390 | | |
385 | | - | |
| 391 | + | |
386 | 392 | | |
387 | 393 | | |
388 | 394 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
255 | 255 | | |
256 | 256 | | |
257 | 257 | | |
258 | | - | |
| 258 | + | |
259 | 259 | | |
260 | 260 | | |
261 | 261 | | |
| |||
0 commit comments