fix: spdv-973

src/modules/filemanager/components/FileBrowser/FileItem/FileItem.tsx

@@ -121,6 +121,10 @@ export function FileItem({
     isMountedRef.current = true
 
     const getStamps = async () => {
+      if (!beeApi) {
+        return
+      }
+
       const stamps = await getUsableStamps(beeApi)
       const driveStamp = stamps.find(s =>
         drives.some(d => d.batchId.toString() === s.batchID.toString() && d.id === fileInfo.driveId),

src/modules/filemanager/components/InitialModal/InitialModal.tsx

@@ -172,6 +172,10 @@ export function InitialModal({
 
   useEffect(() => {
     const getStamps = async () => {
+      if (!beeApi) {
+        return
+      }
+
       const stamps = await getUsableStamps(beeApi)
 
       safeSetState(isMountedRef, setUsableStamps)([...stamps])

src/modules/filemanager/components/NotificationBar/NotificationBar.tsx

@@ -38,6 +38,10 @@ export function NotificationBar({ setErrorMessage }: NotificationBarProps): Reac
     let isMounted = true
 
     const getStamps = async () => {
+      if (!beeApi) {
+        return
+      }
+
       const allStamps = await getUsableStamps(beeApi)
       const expiringStamps: PostageBatch[] = []
       const expiringDrives: DriveInfo[] = []

src/modules/filemanager/components/Sidebar/Sidebar.tsx

@@ -59,6 +59,10 @@ export function Sidebar({ setErrorMessage, loading }: SidebarProps): ReactElemen
     let isMounted = true
 
     const getStamps = async () => {
+      if (!beeApi) {
+        return
+      }
+
       const stamps = await getUsableStamps(beeApi)
 
       if (isMounted) {

src/modules/filemanager/hooks/useBulkActions.ts

@@ -55,6 +55,10 @@ export function useBulkActions({ listToRender, trackDownload, setErrorMessage }:
     isMountedRef.current = true
 
     const getStamps = async () => {
+      if (!beeApi) {
+        return
+      }
+
       const stamps = await getUsableStamps(beeApi)
       const stampList = stamps.filter(s => drives.some(d => d.batchId.toString() === s.batchID.toString()))
 

src/modules/filemanager/utils/bee.ts

@@ -11,11 +11,7 @@ import React from 'react'
 import { getHumanReadableFileSize } from '../../../utils/file'
 import { ActionTag } from '../constants/transfers'
 
-export const getUsableStamps = async (bee: Bee | null): Promise<PostageBatch[]> => {
+export const getUsableStamps = async (bee: Bee): Promise<PostageBatch[]> => {
-  if (!bee) {
-    return []
-  }
-
   try {
     return (await bee.getPostageBatches())
       .filter(s => s.usable)

src/providers/FileManager.tsx

@@ -86,8 +86,9 @@ const findDrives = (
 
 export function Provider({ children }: Props) {
   const initInProgressRef = useRef(false)
+  const beeInstanceRef = useRef<Bee | null>(null)
 
-  const { apiUrl, beeApi } = useContext(SettingsContext)
+  const { apiUrl } = useContext(SettingsContext)
 
   const [fm, setFm] = useState<FileManagerBase | null>(null)
   const [shallReset, setShallReset] = useState<boolean>(false)
@@ -128,69 +129,70 @@ export function Provider({ children }: Props) {
     setFiles([...manager.fileInfoList])
   }, [])
 
-  const syncDrives = useCallback(
+  const syncDrives = useCallback(async (manager: FileManagerBase, di?: DriveInfo, remove?: boolean): Promise<void> => {
-    async (manager: FileManagerBase, di?: DriveInfo, remove?: boolean): Promise<void> => {
+    if (!beeInstanceRef.current) {
-      const usableStamps = await getUsableStamps(beeApi)
+      return
+    }
 
-      if (di) {
+    const usableStamps = await getUsableStamps(beeInstanceRef.current)
-        const isNotExpired = usableStamps.some(s => s.batchID.toString() === di.batchId.toString())
 
-        if (isNotExpired) {
+    if (di) {
-          if (remove) {
+      const isNotExpired = usableStamps.some(s => s.batchID.toString() === di.batchId.toString())
-            setDrives(prev => prev.filter(d => d.id.toString() !== di.id.toString()))
-
-            return
-          }
-
-          if (di.isAdmin) {
-            setAdminDrive(di)
-
-            return
-          }
-
-          setDrives(prev => {
-            const existingIndex = prev.findIndex(d => d.id.toString() === di.id.toString())
-
-            if (existingIndex >= 0) {
-              const updated = [...prev]
-              updated[existingIndex] = di
-
-              return updated
-            }
-
-            return [...prev, di]
-          })
-
-          return
-        }
 
+      if (isNotExpired) {
         if (remove) {
-          setExpiredDrives(prev => prev.filter(d => d.id.toString() !== di.id.toString()))
+          setDrives(prev => prev.filter(d => d.id.toString() !== di.id.toString()))
 
           return
         }
 
-        if (!di.isAdmin) {
+        if (di.isAdmin) {
-          setExpiredDrives(prev => {
+          setAdminDrive(di)
-            const exists = prev.some(d => d.id.toString() === di.id.toString())
-
-            return exists ? prev : [...prev, di]
-          })
 
           return
         }
 
-        // TODO: handle admin drive expiration!
+        setDrives(prev => {
+          const existingIndex = prev.findIndex(d => d.id.toString() === di.id.toString())
+
+          if (existingIndex >= 0) {
+            const updated = [...prev]
+            updated[existingIndex] = di
+
+            return updated
+          }
+
+          return [...prev, di]
+        })
+
         return
       }
 
-      const { adminDrive: tmpAdminDrive, userDrives, expiredDrives } = findDrives(manager.driveList, usableStamps)
+      if (remove) {
-      setAdminDrive(tmpAdminDrive)
+        setExpiredDrives(prev => prev.filter(d => d.id.toString() !== di.id.toString()))
-      setDrives(userDrives)
+
-      setExpiredDrives(expiredDrives)
+        return
-    },
+      }
-    [beeApi],
+
-  )
+      if (!di.isAdmin) {
+        setExpiredDrives(prev => {
+          const exists = prev.some(d => d.id.toString() === di.id.toString())
+
+          return exists ? prev : [...prev, di]
+        })
+
+        return
+      }
+
+      // TODO: handle admin drive expiration!
+      return
+    }
+
+    const { adminDrive: tmpAdminDrive, userDrives, expiredDrives } = findDrives(manager.driveList, usableStamps)
+    setAdminDrive(tmpAdminDrive)
+    setDrives(userDrives)
+    setExpiredDrives(expiredDrives)
+  }, [])
 
   const syncDrivesPublic = useCallback(async () => {
     if (fm) {
@@ -198,23 +200,24 @@ export function Provider({ children }: Props) {
     }
   }, [fm, syncDrives])
 
-  const refreshStamp = useCallback(
+  const refreshStamp = useCallback(async (batchId: string): Promise<PostageBatch | undefined> => {
-    async (batchId: string): Promise<PostageBatch | undefined> => {
+    if (!beeInstanceRef.current) {
-      const usableStamps = await getUsableStamps(beeApi)
+      return
-      const refreshedStamp = usableStamps.find(s => s.batchID.toString() === batchId)
+    }
 
-      setCurrentStamp(prev => {
+    const usableStamps = await getUsableStamps(beeInstanceRef.current)
-        if (prev && prev.batchID.toString() === batchId && refreshedStamp) {
+    const refreshedStamp = usableStamps.find(s => s.batchID.toString() === batchId)
-          return refreshedStamp
-        }
 
-        return prev
+    setCurrentStamp(prev => {
-      })
+      if (prev && prev.batchID.toString() === batchId && refreshedStamp) {
+        return refreshedStamp
+      }
 
-      return refreshedStamp
+      return prev
-    },
+    })
-    [beeApi],
+
-  )
+    return refreshedStamp
+  }, [])
 
   const init = useCallback(async (): Promise<FileManagerBase | null> => {
     const pk = getSignerPk()
@@ -231,8 +234,11 @@ export function Provider({ children }: Props) {
     setCurrentDrive(undefined)
     setCurrentStamp(undefined)
 
-    const bee = new Bee(apiUrl, { signer: pk })
+    if (!beeInstanceRef.current) {
-    const manager = new FileManagerBase(bee)
+      beeInstanceRef.current = new Bee(apiUrl, { signer: pk })
+    }
+
+    const manager = new FileManagerBase(beeInstanceRef.current)
 
     const handleInitialized = (success: boolean) => {
       setInitializationError(!success)
@@ -316,28 +322,28 @@ export function Provider({ children }: Props) {
 
     const manager = await init()
 
-    if (prevDriveId && manager) {
+    if (prevDriveId && manager && beeInstanceRef.current) {
       const refreshedDrive = manager.driveList.find(d => d.id.toString() === prevDriveId)
       setCurrentDrive(refreshedDrive)
 
-      const uStamps: PostageBatch[] = await getUsableStamps(beeApi)
+      const uStamps: PostageBatch[] = await getUsableStamps(beeInstanceRef.current)
       const isValidCurrentStamp = uStamps.find(s => s.batchID.toString() === prevStamp?.batchID.toString())
 
       setCurrentStamp(isValidCurrentStamp)
     }
-  }, [currentDrive?.id, currentStamp, init, beeApi])
+  }, [currentDrive?.id, currentStamp, init])
 
   useEffect(() => {
-    const pk = getSignerPk()
+    if (!apiUrl || initInProgressRef.current) {
-
+      return
-    if (!pk || fm || initInProgressRef.current) return
+    }
 
     const initFromLocalState = async () => {
       await init()
     }
 
     initFromLocalState()
-  }, [fm, init])
+  }, [apiUrl, init])
 
   useEffect(() => {
     if (fm && drives.length === 0 && !adminDrive) {