Merge pull request #182 from chain4travel/fix-wallet-switcher

add update wallet name to wallet component methods
chain4travel · Dec 29, 2023 · 1748af5 · 1748af5
2 parents 1ea29fb + 46a0b47
commit 1748af5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/components/Navbar/LoggedInAccount.tsx b/src/components/Navbar/LoggedInAccount.tsx
@@ -18,8 +18,8 @@ const LoggedInAccount = () => {
 
     useEffect(() => {
         if (isMultiSigWallet()) {
-            setWalletName(getNameOfMultiSigWallet() || getPchainAddress()[0])
-        } else setWalletName(getPchainAddress()[0])
+            setWalletName(getNameOfMultiSigWallet() || pChainAddress || getPchainAddress()[0])
+        } else setWalletName(pChainAddress || getPchainAddress()[0])
     }, [pChainAddress, activeNetwork])
     return (
         <>

diff --git a/src/views/wallet/WalletApp.tsx b/src/views/wallet/WalletApp.tsx
@@ -7,6 +7,7 @@ import { useEffectOnce } from '../../hooks/useEffectOnce'
 import {
     updateAccount,
     updateNotificationStatus,
+    updatePchainAddress,
     updateShowButton,
     updateValues,
 } from '../../redux/slices/app-config'
@@ -17,8 +18,11 @@ const LoadWallet = () => {
     const [logOut, setLogOut] = useState(false)
     const dispatch = useAppDispatch()
     const ref = useRef(null)
+    const [walletSwitched, setWalletSwitched] = React.useState('')
     const navigate = useNavigate()
-
+    useEffect(() => {
+        dispatch(updatePchainAddress(walletSwitched))
+    }, [walletSwitched]) // eslint-disable-line react-hooks/exhaustive-deps
     const dispatchNotification = ({ message, type }) =>
         dispatch(updateNotificationStatus({ message, severity: type }))
     const setAccount = account => dispatch(updateAccount(account))
@@ -44,6 +48,7 @@ const LoadWallet = () => {
                 dispatchNotification,
                 updateShowAlias,
                 navigate: location => navigate(location),
+                setWalletSwitched,
             })
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [fetch])