From 054648e2c86aeafcb6f1a77e3708f865b82c869b Mon Sep 17 00:00:00 2001
From: Eugene Chybisov <imchybisov@gmail.com>
Date: Tue, 5 Jul 2022 14:34:20 +0100
Subject: [PATCH] fix: sometimes account signer is not found after page refresh

---
 packages/widget/src/hooks/useRouteExecution.ts | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/widget/src/hooks/useRouteExecution.ts b/packages/widget/src/hooks/useRouteExecution.ts
index 14e7a8c40..e32dffba9 100644
--- a/packages/widget/src/hooks/useRouteExecution.ts
+++ b/packages/widget/src/hooks/useRouteExecution.ts
@@ -1,5 +1,5 @@
 import { Route } from '@lifinance/sdk';
-import { useCallback, useEffect } from 'react';
+import { useCallback, useEffect, useRef } from 'react';
 import { useMutation } from 'react-query';
 import shallow from 'zustand/shallow';
 import { LiFi } from '../lifi';
@@ -9,6 +9,7 @@ import { deepClone } from '../utils/deepClone';
 
 export const useRouteExecution = (routeId: string) => {
   const { account, switchChain } = useWallet();
+  const resumedAfterMount = useRef(false);
   const { route, status } = useRouteStore(
     (state) => state.routes[routeId] ?? {},
   );
@@ -139,12 +140,19 @@ export const useRouteExecution = (routeId: string) => {
       (step) => step.execution?.status === 'FAILED',
     );
     const alreadyStarted = route.steps.some((step) => step.execution);
-    if (!isDone && !isFailed && alreadyStarted) {
+    if (
+      !isDone &&
+      !isFailed &&
+      alreadyStarted &&
+      account.signer &&
+      !resumedAfterMount.current
+    ) {
+      resumedAfterMount.current = true;
       resumeRoute();
     }
     return () => LiFi.moveExecutionToBackground(route);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [account.signer]);
 
   return {
     executeRoute,