diff --git a/src/useQortalGetSaveSettings.tsx b/src/useQortalGetSaveSettings.tsx index 9e31853..c74f1a2 100644 --- a/src/useQortalGetSaveSettings.tsx +++ b/src/useQortalGetSaveSettings.tsx @@ -1,4 +1,4 @@ -import React, { useCallback, useEffect } from 'react'; +import { useCallback, useEffect } from 'react'; import { useRecoilState, useSetRecoilState } from 'recoil'; import { canSaveSettingToQdnAtom, @@ -46,6 +46,7 @@ const getPublishRecord = async (myName) => { return { hasPublishRecord: false }; }; + const getPublish = async (myName) => { try { let data; @@ -57,7 +58,6 @@ const getPublish = async (myName) => { if (!data) throw new Error('Unable to fetch publish'); const decryptedKey: any = await decryptResource(data); - const dataint8Array = base64ToUint8Array(decryptedKey.data); const decryptedKeyToObject = uint8ArrayToObject(dataint8Array); return decryptedKeyToObject; @@ -112,6 +112,7 @@ export const useQortalGetSaveSettings = (myName, isAuthenticated) => { }, [] ); + useEffect(() => { if ( !myName || diff --git a/src/useRetrieveDataLocalStorage.tsx b/src/useRetrieveDataLocalStorage.tsx index fafcd5c..41c2b8e 100644 --- a/src/useRetrieveDataLocalStorage.tsx +++ b/src/useRetrieveDataLocalStorage.tsx @@ -1,55 +1,69 @@ -import React, { useCallback, useEffect } from 'react' +import { useCallback, useEffect } from 'react'; import { useSetRecoilState } from 'recoil'; -import { isUsingImportExportSettingsAtom, oldPinnedAppsAtom, settingsLocalLastUpdatedAtom, settingsQDNLastUpdatedAtom, sortablePinnedAppsAtom } from './atoms/global'; +import { + isUsingImportExportSettingsAtom, + oldPinnedAppsAtom, + settingsLocalLastUpdatedAtom, + settingsQDNLastUpdatedAtom, + sortablePinnedAppsAtom, +} from './atoms/global'; function fetchFromLocalStorage(key) { - try { - const serializedValue = localStorage.getItem(key); - if (serializedValue === null) { - return null; - } - return JSON.parse(serializedValue); - } catch (error) { - console.error('Error fetching from localStorage:', error); - return null; + try { + const serializedValue = localStorage.getItem(key); + if (serializedValue === null) { + return null; } + return JSON.parse(serializedValue); + } catch (error) { + console.error('Error fetching from localStorage:', error); + return null; + } } export const useRetrieveDataLocalStorage = (address) => { - const setSortablePinnedApps = useSetRecoilState(sortablePinnedAppsAtom); - const setSettingsLocalLastUpdated = useSetRecoilState(settingsLocalLastUpdatedAtom); - const setIsUsingImportExportSettings = useSetRecoilState(isUsingImportExportSettingsAtom) - const setSettingsQDNLastUpdated = useSetRecoilState(settingsQDNLastUpdatedAtom); - const setOldPinnedApps = useSetRecoilState(oldPinnedAppsAtom) + const setSortablePinnedApps = useSetRecoilState(sortablePinnedAppsAtom); - const getSortablePinnedApps = useCallback(()=> { - const pinnedAppsLocal = fetchFromLocalStorage('ext_saved_settings') - if(pinnedAppsLocal?.sortablePinnedApps){ - setSortablePinnedApps(pinnedAppsLocal?.sortablePinnedApps) - setSettingsLocalLastUpdated(pinnedAppsLocal?.timestamp || -1) - } else { - setSettingsLocalLastUpdated(-1) - } - - }, []) - const getSortablePinnedAppsImportExport = useCallback(()=> { - const pinnedAppsLocal = fetchFromLocalStorage('ext_saved_settings_import_export') - if(pinnedAppsLocal?.sortablePinnedApps){ - setOldPinnedApps(pinnedAppsLocal?.sortablePinnedApps) - - - setIsUsingImportExportSettings(true) - setSettingsQDNLastUpdated(pinnedAppsLocal?.timestamp || 0) - - } else { - setIsUsingImportExportSettings(false) - } - - }, []) - useEffect(()=> { - - getSortablePinnedApps() - getSortablePinnedAppsImportExport() - }, [getSortablePinnedApps, address]) - -} + const setSettingsLocalLastUpdated = useSetRecoilState( + settingsLocalLastUpdatedAtom + ); + + const setIsUsingImportExportSettings = useSetRecoilState( + isUsingImportExportSettingsAtom + ); + + const setSettingsQDNLastUpdated = useSetRecoilState( + settingsQDNLastUpdatedAtom + ); + + const setOldPinnedApps = useSetRecoilState(oldPinnedAppsAtom); + + const getSortablePinnedApps = useCallback(() => { + const pinnedAppsLocal = fetchFromLocalStorage('ext_saved_settings'); + + if (pinnedAppsLocal?.sortablePinnedApps) { + setSortablePinnedApps(pinnedAppsLocal?.sortablePinnedApps); + setSettingsLocalLastUpdated(pinnedAppsLocal?.timestamp || -1); + } else { + setSettingsLocalLastUpdated(-1); + } + }, []); + + const getSortablePinnedAppsImportExport = useCallback(() => { + const pinnedAppsLocal = fetchFromLocalStorage( + 'ext_saved_settings_import_export' + ); + if (pinnedAppsLocal?.sortablePinnedApps) { + setOldPinnedApps(pinnedAppsLocal?.sortablePinnedApps); + setIsUsingImportExportSettings(true); + setSettingsQDNLastUpdated(pinnedAppsLocal?.timestamp || 0); + } else { + setIsUsingImportExportSettings(false); + } + }, []); + + useEffect(() => { + getSortablePinnedApps(); + getSortablePinnedAppsImportExport(); + }, [getSortablePinnedApps, address]); +};