using CTA for manual withdrawal

1 files changed, 15 insertions, 10 deletions

diff --git a/packages/taler-wallet-webextension/src/wallet/Application.tsx b/packages/taler-wallet-webextension/src/wallet/Application.tsx
index 316a1c0e5..b39a7936b 100644
--- a/packages/taler-wallet-webextension/src/wallet/Application.tsx
+++ b/packages/taler-wallet-webextension/src/wallet/Application.tsx
@@ -37,7 +37,10 @@ import {
 import { PaymentPage } from "../cta/Payment/index.js";
 import { RefundPage } from "../cta/Refund/index.js";
 import { TipPage } from "../cta/Tip/index.js";
-import { WithdrawPage } from "../cta/Withdraw/index.js";
+import {
+  WithdrawPageFromParams,
+  WithdrawPageFromURI,
+} from "../cta/Withdraw/index.js";
 import { DepositPage as DepositPageCTA } from "../cta/Deposit/index.js";
 import { Pages, WalletNavBar } from "../NavigationBar.js";
 import { DeveloperPage } from "./DeveloperPage.js";
@@ -151,7 +154,10 @@ export function Application(): VNode {
                 path={Pages.receiveCash.pattern}
                 component={DestinationSelectionGetCash}
                 goToWalletManualWithdraw={(amount?: string) =>
-                  redirectTo(Pages.balanceManualWithdraw({ amount }))
+                  redirectTo(Pages.ctaWithdrawManual({ amount }))
+                }
+                goToWalletWalletInvoice={(amount?: string) =>
+                  redirectTo(Pages.ctaWithdrawManual({ amount }))
                 }
               />
               <Route
@@ -163,12 +169,6 @@ export function Application(): VNode {
               />
 
               <Route
-                path={Pages.balanceManualWithdraw.pattern}
-                component={ManualWithdrawPage}
-                onCancel={() => redirectTo(Pages.balance)}
-              />
-
-              <Route
                 path={Pages.balanceDeposit.pattern}
                 component={DepositPage}
                 onCancel={(currency: string) => {
@@ -237,7 +237,7 @@ export function Application(): VNode {
                 path={Pages.ctaPay}
                 component={PaymentPage}
                 goToWalletManualWithdraw={(amount?: string) =>
-                  redirectTo(Pages.balanceManualWithdraw({ amount }))
+                  redirectTo(Pages.ctaWithdrawManual({ amount }))
                 }
                 cancel={() => redirectTo(Pages.balance)}
               />
@@ -253,7 +253,12 @@ export function Application(): VNode {
               />
               <Route
                 path={Pages.ctaWithdraw}
-                component={WithdrawPage}
+                component={WithdrawPageFromURI}
+                cancel={() => redirectTo(Pages.balance)}
+              />
+              <Route
+                path={Pages.ctaWithdrawManual.pattern}
+                component={WithdrawPageFromParams}
                 cancel={() => redirectTo(Pages.balance)}
               />
               <Route