From 4cd580ca7f497104eb97ae5676f3d5334384f4dc Mon Sep 17 00:00:00 2001
From: Vojtech Simetka <vojtech@simetka.cz>
Date: Fri, 24 Jun 2022 14:03:07 +0200
Subject: [PATCH] fix: bee data auto-refresh (#436)

---
 src/pages/restart/LightModeRestart.tsx | 11 +++++++++--
 src/providers/Bee.tsx                  | 17 ++++++++---------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/pages/restart/LightModeRestart.tsx b/src/pages/restart/LightModeRestart.tsx
index 99e12ef..b2bb66e 100644
--- a/src/pages/restart/LightModeRestart.tsx
+++ b/src/pages/restart/LightModeRestart.tsx
@@ -6,17 +6,24 @@ import { Waiting } from '../../components/Waiting'
 import { Context } from '../../providers/Bee'
 import { ROUTES } from '../../routes'
 
-export default function Settings(): ReactElement {
-  const [startedAt] = useState(Date.now())
+const STARTED_UPGRADE_AT = 'started-upgrade-at'
+
+export default function LightModeRestart(): ReactElement {
+  const [startedAt] = useState(Number.parseInt(localStorage.getItem(STARTED_UPGRADE_AT) ?? Date.now().toFixed()))
   const { apiHealth, nodeInfo } = useContext(Context)
   const navigate = useNavigate()
 
+  useEffect(() => {
+    localStorage.setItem(STARTED_UPGRADE_AT, startedAt.toFixed())
+  }, [startedAt])
+
   useEffect(() => {
     if (Date.now() - startedAt < 45_000) {
       return
     }
 
     if (apiHealth && nodeInfo?.beeMode === BeeModes.LIGHT) {
+      localStorage.removeItem(STARTED_UPGRADE_AT)
       navigate(ROUTES.INFO)
     }
   }, [startedAt, navigate, nodeInfo, apiHealth])
diff --git a/src/providers/Bee.tsx b/src/providers/Bee.tsx
index e96154a..91f60c4 100644
--- a/src/providers/Bee.tsx
+++ b/src/providers/Bee.tsx
@@ -66,7 +66,6 @@ interface ContextInterface {
   chainState: ChainState | null
   latestBeeRelease: LatestBeeRelease | null
   isLoading: boolean
-  isRefreshing: boolean
   lastUpdate: number | null
   start: (frequency?: number) => void
   stop: () => void
@@ -104,7 +103,6 @@ const initialValues: ContextInterface = {
   chainState: null,
   latestBeeRelease: null,
   isLoading: true,
-  isRefreshing: false,
   lastUpdate: null,
   start: () => {}, // eslint-disable-line
   stop: () => {}, // eslint-disable-line
@@ -186,6 +184,9 @@ function getStatus(
   return status
 }
 
+// This does not need to be exposed and works much better as variable than state variable which may trigger some unnecessary re-renders
+let isRefreshing = false
+
 export function Provider({ children }: Props): ReactElement {
   const { beeApi, beeDebugApi } = useContext(SettingsContext)
   const { provider } = useContext(TopUpContext)
@@ -207,7 +208,6 @@ export function Provider({ children }: Props): ReactElement {
 
   const [error, setError] = useState<Error | null>(initialValues.error)
   const [isLoading, setIsLoading] = useState<boolean>(initialValues.isLoading)
-  const [isRefreshing, setIsRefreshing] = useState<boolean>(initialValues.isRefreshing)
   const [lastUpdate, setLastUpdate] = useState<number | null>(initialValues.lastUpdate)
   const [frequency, setFrequency] = useState<number | null>(30000)
 
@@ -265,7 +265,7 @@ export function Provider({ children }: Props): ReactElement {
     }
 
     try {
-      setIsRefreshing(true)
+      isRefreshing = true
       setError(null)
 
       // Wrap the chequebook balance call to return BZZ values as Token object
@@ -374,11 +374,11 @@ export function Provider({ children }: Props): ReactElement {
       await Promise.allSettled(promises)
     } catch (e) {
       setError(e as Error)
-    } finally {
-      setIsLoading(false)
-      setIsRefreshing(false)
-      setLastUpdate(Date.now())
     }
+
+    setIsLoading(false)
+    isRefreshing = false
+    setLastUpdate(Date.now())
   }
 
   const start = (freq = REFRESH_WHEN_OK) => {
@@ -447,7 +447,6 @@ export function Provider({ children }: Props): ReactElement {
         chainState,
         latestBeeRelease,
         isLoading,
-        isRefreshing,
         lastUpdate,
         start,
         stop,