From 4dff3853c1c4b2899eb9fde6dae14a22dc214867 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Sun, 26 Feb 2023 14:00:41 +0100
Subject: demobank-ui: pass correct withdrawal ID instead of full URI

---
 packages/demobank-ui/src/pages/WithdrawalQRCode.tsx | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/demobank-ui/src/pages/WithdrawalQRCode.tsx b/packages/demobank-ui/src/pages/WithdrawalQRCode.tsx
index d4c95d830..5169fc00f 100644
--- a/packages/demobank-ui/src/pages/WithdrawalQRCode.tsx
+++ b/packages/demobank-ui/src/pages/WithdrawalQRCode.tsx
@@ -14,7 +14,7 @@
  GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
  */
 
-import { Logger } from "@gnu-taler/taler-util";
+import { Logger, parseWithdrawUri } from "@gnu-taler/taler-util";
 import {
   HttpResponsePaginated,
   useTranslationContext,
@@ -59,25 +59,29 @@ export function WithdrawalQRCode({
 
   logger.trace("withdrawal status", data);
   if (data.aborted) {
-    //signal that this withdrawal is aborted
-    //will redirect to account info
+    // signal that this withdrawal is aborted
+    // will redirect to account info
     onAbort();
     return <Loading />;
   }
 
+  const parsedUri = parseWithdrawUri(talerWithdrawUri);
+  if (!parsedUri) {
+    throw Error("can't parse withdrawal URI");
+  }
+
   if (!data.selection_done) {
     return (
       <QrCodeSection talerWithdrawUri={talerWithdrawUri} onAbort={onAbort} />
     );
   }
-  /**
-   * Wallet POSTed the withdrawal details!  Ask the
-   * user to authorize the operation (here CAPTCHA).
-   */
+
+  // Wallet POSTed the withdrawal details!  Ask the
+  // user to authorize the operation (here CAPTCHA).
   return (
     <WithdrawalConfirmationQuestion
       account={account}
-      withdrawalId={talerWithdrawUri}
+      withdrawalId={parsedUri.withdrawalOperationId}
     />
   );
 }
-- 
cgit v1.2.3