fix: still having request when gracePeriod is over

rsksmart · Mar 29, 2024 · 2e309a7 · 2e309a7
1 parent a62861d
commit 2e309a7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/core/Core.tsx b/src/core/Core.tsx
@@ -36,7 +36,7 @@ export const Core = () => {
   const topColor = useAppSelector(selectTopColor)
   const setGlobalError = useSetGlobalError()
   const isOffline = useIsOffline()
-  const { active } = useStateSubscription()
+  const { active, unlocked } = useStateSubscription()
   const { wallet, initializeWallet } = useContext(WalletContext)
 
   const unlockAppFn = useCallback(async () => {
@@ -62,7 +62,7 @@ export const Core = () => {
           <WalletConnect2Provider wallet={wallet}>
             <>
               <RootNavigationComponent />
-              {requests.length !== 0 && wallet && (
+              {requests.length !== 0 && wallet && unlocked && (
                 <RequestHandler
                   wallet={wallet}
                   request={requests[0]}

diff --git a/src/core/hooks/useStateSubscription.ts b/src/core/hooks/useStateSubscription.ts
@@ -7,6 +7,8 @@ import {
   setPreviouslyUnlocked,
   setUnlocked as setIsUnlocked,
   unlockApp,
+  closeRequest,
+  setFullscreen,
 } from 'store/slices/settingsSlice'
 import { useAppDispatch, useAppSelector } from 'store/storeUtils'
 import { SocketsEvents, socketsEvents } from 'src/subscriptions/rifSockets'
@@ -52,6 +54,9 @@ export const useStateSubscription = () => {
 
           setUnlocked(false)
           dispatch(setPreviouslyUnlocked(true))
+          // request needs to be reset when gracePeriod is over
+          dispatch(closeRequest())
+          dispatch(setFullscreen(false))
           //reset wallet state
           setWallet(null)
           setWalletIsDeployed(null)