Commit 2a9777c

authored

Merge pull request #5806 from EdgeApp/jon/fix/ramps-approve-abort

Require onClose for fiat/ramps webviews

2 parents c2dcf5d + dd85625 commit 2a9777cCopy full SHA for 2a9777c

File tree

7 files changed

+22

-5

lines changed

src/plugins
- gui
  - fiatPlugin.tsx
  - providers
  - scenes
    - FiatPluginWebView.tsx
- ramps
  - moonpay
    - moonpayRampPlugin.ts
  - paybis
    - paybisRampPlugin.ts

7 files changed

+22

-5

lines changed

`‎src/plugins/gui/fiatPlugin.tsx‎`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,15 @@ export const executePlugin = async (params: {`
`192`	`192`	`showToastSpinner,`
`193`	`193`	`openWebView: async (params): Promise<void> => {`
`194`	`194`	`maybeNavigateToCorrectTabScene()`
`195`		`- navigation.navigate('guiPluginWebView', params)`
	`195`	`+ // Ensure onClose is provided per route type. For legacy callers, default to noop.`
	`196`	`+ navigation.navigate('guiPluginWebView', {`
	`197`	`+ ...params,`
	`198`	`+ onClose:`
	`199`	`+ params.onClose ??`
	`200`	`+ (() => {`
	`201`	`+ // TODO: Audit close handling for non-ramp plugin callers`
	`202`	`+ })`
	`203`	`+ })`
`196`	`204`	`},`
`197`	`205`
`198`	`206`	`openExternalWebView: async (params): Promise<void> => {`

`‎src/plugins/gui/providers/kadoProvider.ts‎`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -779,7 +779,8 @@ export const kadoProvider: FiatProviderFactory = {`
`779`	`779`	`if (direction === 'buy') {`
`780`	`780`	`await showUi.openWebView({`
`781`	`781`	`url: url.href,`
`782`		`- onMessage`
	`782`	`+ onMessage,`
	`783`	`+ onClose: () => {}`
`783`	`784`	`})`
`784`	`785`	`return`
`785`	`786`	`}`
`@@ -1026,6 +1027,7 @@ export const kadoProvider: FiatProviderFactory = {`
`1026`	`1027`	`}`
`1027`	`1028`	`await showUi.openWebView({`
`1028`	`1029`	`url: url.href,`
	`1030`	`+ onClose: () => {},`
`1029`	`1031`	`onMessage,`
`1030`	`1032`	`onUrlChange: newUrl => {`
`1031`	`1033`	`onUrlChangeAsync(newUrl).catch((error: unknown) => {`

`‎src/plugins/gui/providers/moonpayProvider.ts‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -870,7 +870,8 @@ export const moonpayProvider: FiatProviderFactory = {`
`870`	`870`	`}`
`871`	`871`	`await showUi.openWebView({`
`872`	`872`	`url: urlObj.href,`
`873`		`- onUrlChange`
	`873`	`+ onUrlChange,`
	`874`	`+ onClose: () => {}`
`874`	`875`	`})`
`875`	`876`	`}`
`876`	`877`	`await openWebView()`

`‎src/plugins/gui/providers/paybisProvider.ts‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1079,7 +1079,8 @@ export const paybisProvider: FiatProviderFactory = {`
`1079`	`1079`	`}`
`1080`	`1080`	`await showUi.openWebView({`
`1081`	`1081`	`url: webviewUrl,`
`1082`		`- onUrlChange`
	`1082`	`+ onUrlChange,`
	`1083`	`+ onClose: () => {}`
`1083`	`1084`	`})`
`1084`	`1085`	`}`
`1085`	`1086`	`await openWebView()`

`‎src/plugins/gui/scenes/FiatPluginWebView.tsx‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import type { BuySellTabSceneProps } from '../../../types/routerTypes'`
`10`	`10`	`export interface FiatPluginOpenWebViewParams {`
`11`	`11`	`url: string`
`12`	`12`	`injectedJs?: string`
`13`		`- onClose?: (() => boolean) \| (() => void)`
	`13`	`+ onClose: (() => boolean) \| (() => void)`
`14`	`14`	`onMessage?: (message: string, injectJs: (js: string) => void) => void`
`15`	`15`	`onUrlChange?: (url: string) => void \| Promise<void>`
`16`	`16`	`}`

`‎src/plugins/ramps/moonpay/moonpayRampPlugin.ts‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -915,6 +915,9 @@ export const moonpayRampPlugin: RampPluginFactory = (`
`915`	`915`	`await new Promise<void>((resolve, reject) => {`
`916`	`916`	`navigation.navigate('guiPluginWebView', {`
`917`	`917`	`url: urlObj.href,`
	`918`	`+ onClose: () => {`
	`919`	`+ resolve()`
	`920`	`+ },`
`918`	`921`	`onUrlChange: async (uri: string): Promise<void> => {`
`919`	`922`	`console.log('Moonpay WebView url change: ' + uri)`
`920`	`923`

`‎src/plugins/ramps/paybis/paybisRampPlugin.ts‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1216,6 +1216,8 @@ export const paybisRampPlugin: RampPluginFactory = (`
`1216`	`1216`	`const openWebView = async (): Promise<void> => {`
`1217`	`1217`	`navigation.navigate('guiPluginWebView', {`
`1218`	`1218`	`url: webviewUrl,`
	`1219`	`+ // No pending promise to resolve`
	`1220`	`+ onClose: () => {},`
`1219`	`1221`	`onUrlChange: newUrl => {`
`1220`	`1222`	`handleUrlChange(newUrl).catch((error: unknown) => {`
`1221`	`1223`	`showError(error)`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 2a9777c

File tree

7 files changed

7 files changed

`‎src/plugins/gui/fiatPlugin.tsx‎`

`‎src/plugins/gui/providers/kadoProvider.ts‎`

`‎src/plugins/gui/providers/moonpayProvider.ts‎`

`‎src/plugins/gui/providers/paybisProvider.ts‎`

`‎src/plugins/gui/scenes/FiatPluginWebView.tsx‎`

`‎src/plugins/ramps/moonpay/moonpayRampPlugin.ts‎`

`‎src/plugins/ramps/paybis/paybisRampPlugin.ts‎`

0 commit comments