diff options
author | Sebastian <sebasjm@gmail.com> | 2023-05-22 14:36:59 -0300 |
---|---|---|
committer | Sebastian <sebasjm@gmail.com> | 2023-05-22 14:36:59 -0300 |
commit | bc4964d4ffb39bb5c2fe8ec16dce4851f2e968f8 (patch) | |
tree | 6e48986f23fc8414b6cf17c447eb2d790e8d4ccc /packages/taler-wallet-webextension | |
parent | 5fb13fae2461b13c021ed6f2636e179705a3bb19 (diff) | |
download | wallet-core-bc4964d4ffb39bb5c2fe8ec16dce4851f2e968f8.tar.xz |
use redirect instead of openFromPopup on qr detection
Diffstat (limited to 'packages/taler-wallet-webextension')
-rw-r--r-- | packages/taler-wallet-webextension/src/NavigationBar.tsx | 5 | ||||
-rw-r--r-- | packages/taler-wallet-webextension/src/wallet/Application.tsx | 12 |
2 files changed, 14 insertions, 3 deletions
diff --git a/packages/taler-wallet-webextension/src/NavigationBar.tsx b/packages/taler-wallet-webextension/src/NavigationBar.tsx index 2817f3299..8a41ee68e 100644 --- a/packages/taler-wallet-webextension/src/NavigationBar.tsx +++ b/packages/taler-wallet-webextension/src/NavigationBar.tsx @@ -59,7 +59,10 @@ function replaceAll( ): string { let result = pattern; for (const v in vars) { - result = result.replace(vars[v], !values[v] ? "" : values[v]); + result = result.replace( + vars[v], + !values[v] ? "" : encodeURIComponent(values[v]), + ); } return result; } diff --git a/packages/taler-wallet-webextension/src/wallet/Application.tsx b/packages/taler-wallet-webextension/src/wallet/Application.tsx index 194e34e6d..aef271442 100644 --- a/packages/taler-wallet-webextension/src/wallet/Application.tsx +++ b/packages/taler-wallet-webextension/src/wallet/Application.tsx @@ -20,7 +20,11 @@ * @author sebasjm */ -import { TalerUri, TranslatedString } from "@gnu-taler/taler-util"; +import { + TalerUri, + TranslatedString, + stringifyTalerUri, +} from "@gnu-taler/taler-util"; import { TranslationProvider, useTranslationContext, @@ -103,7 +107,11 @@ export function Application(): VNode { <WalletTemplate goToTransaction={redirectToTxInfo}> <QrReaderPage onDetected={(talerActionUrl: TalerUri) => { - platform.openWalletURIFromPopup(talerActionUrl); + redirectTo( + Pages.defaultCta({ + uri: stringifyTalerUri(talerActionUrl), + }), + ); }} /> </WalletTemplate> |