fix: spdv-973

This commit is contained in:
rolandlor
2026-03-12 19:00:30 +01:00
committed by Bálint Ujvári
parent e8e01c054a
commit 3c4d618cc8
7 changed files with 99 additions and 77 deletions
@@ -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),
@@ -172,6 +172,10 @@ export function InitialModal({
useEffect(() => {
const getStamps = async () => {
if (!beeApi) {
return
}
const stamps = await getUsableStamps(beeApi)
safeSetState(isMountedRef, setUsableStamps)([...stamps])
@@ -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[] = []
@@ -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) {
@@ -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()))
+1 -5
View File
@@ -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[]> => {
if (!bee) {
return []
}
export const getUsableStamps = async (bee: Bee): Promise<PostageBatch[]> => {
try {
return (await bee.getPostageBatches())
.filter(s => s.usable)
+28 -22
View File
@@ -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,9 +129,12 @@ export function Provider({ children }: Props) {
setFiles([...manager.fileInfoList])
}, [])
const syncDrives = useCallback(
async (manager: FileManagerBase, di?: DriveInfo, remove?: boolean): Promise<void> => {
const usableStamps = await getUsableStamps(beeApi)
const syncDrives = useCallback(async (manager: FileManagerBase, di?: DriveInfo, remove?: boolean): Promise<void> => {
if (!beeInstanceRef.current) {
return
}
const usableStamps = await getUsableStamps(beeInstanceRef.current)
if (di) {
const isNotExpired = usableStamps.some(s => s.batchID.toString() === di.batchId.toString())
@@ -188,9 +192,7 @@ export function Provider({ children }: Props) {
setAdminDrive(tmpAdminDrive)
setDrives(userDrives)
setExpiredDrives(expiredDrives)
},
[beeApi],
)
}, [])
const syncDrivesPublic = useCallback(async () => {
if (fm) {
@@ -198,9 +200,12 @@ export function Provider({ children }: Props) {
}
}, [fm, syncDrives])
const refreshStamp = useCallback(
async (batchId: string): Promise<PostageBatch | undefined> => {
const usableStamps = await getUsableStamps(beeApi)
const refreshStamp = useCallback(async (batchId: string): Promise<PostageBatch | undefined> => {
if (!beeInstanceRef.current) {
return
}
const usableStamps = await getUsableStamps(beeInstanceRef.current)
const refreshedStamp = usableStamps.find(s => s.batchID.toString() === batchId)
setCurrentStamp(prev => {
@@ -212,9 +217,7 @@ export function Provider({ children }: Props) {
})
return refreshedStamp
},
[beeApi],
)
}, [])
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 })
const manager = new FileManagerBase(bee)
if (!beeInstanceRef.current) {
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 (!pk || fm || initInProgressRef.current) return
if (!apiUrl || initInProgressRef.current) {
return
}
const initFromLocalState = async () => {
await init()
}
initFromLocalState()
}, [fm, init])
}, [apiUrl, init])
useEffect(() => {
if (fm && drives.length === 0 && !adminDrive) {