Merge branch 'done' into release-4.44.0

BitBoxSwiss · Sep 15, 2024 · 84e75d4 · 84e75d4
2 parents 262a98e + 15e4df2
commit 84e75d4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/frontends/web/package-lock.json b/frontends/web/package-lock.json
diff --git a/frontends/web/package.json b/frontends/web/package.json
@@ -38,7 +38,7 @@
  "react-i18next": "14.1.2",
  "react-router-dom": "6.4.3",
  "react-select": "5.8.0",
- "request-address": "0.0.9"
+ "request-address": "0.0.10"
  },
  "eslintConfig": {
  "extends": [

diff --git a/frontends/web/src/routes/exchange/pocket.tsx b/frontends/web/src/routes/exchange/pocket.tsx
@@ -16,6 +16,7 @@
 
 import { useTranslation } from 'react-i18next';
 import { useState, useEffect, createRef } from 'react';
+import { useNavigate } from 'react-router-dom';
 import { RequestAddressV0Message, MessageVersion, parseMessage, serializeMessage, V0MessageType, PaymentRequestV0Message } from 'request-address';
 import { getConfig } from '@/utils/config';
 import { Dialog } from '@/components/dialog/dialog';
@@ -40,6 +41,7 @@ interface TProps {
 
 export const Pocket = ({ code, action }: TProps) => {
  const { t } = useTranslation();
+ const navigate = useNavigate();
 
  const [height, setHeight] = useState(0);
  const [iframeLoaded, setIframeLoaded] = useState(false);
@@ -259,6 +261,9 @@ export const Pocket = ({ code, action }: TProps) => {
  case V0MessageType.PaymentRequest:
  handlePaymentRequest(message);
  break;
+ case V0MessageType.Close:
+ navigate(`/account/${code}`, { replace: true });
+ break;
  }
  } catch (e) {
  console.log(e);