@aurora-is-near/intents-swap-widget 3.14.0-redesign.2 → 3.14.0-redesign.7

package/src/utils/localstorage.ts

@@ -14,11 +14,14 @@ const defaultValues: LocalStorage = {
 
 const isBrowser = typeof window !== 'undefined' && !!window.localStorage;
 
+const KEY_PREFIX = 'sw';
+const getStorageKey = (key: string) => `${KEY_PREFIX}.${key}`;
+
 const getItem = <T extends keyof LocalStorage>(key: T): LocalStorage[T] => {
   if (!isBrowser) {
     if (process.env.NODE_ENV === 'development') {
       logger.debug(
-        `[WIDGET] Attempted to read ${key} on server; returning default`,
+        `[WIDGET] Attempted to read ${getStorageKey(key)} from localstorage on server; returning default`,
       );
     }
 
@@ -26,13 +29,25 @@ const getItem = <T extends keyof LocalStorage>(key: T): LocalStorage[T] => {
   }
 
   try {
+    const storedValueLegacy = window.localStorage.getItem(key);
+    let storedValue = window.localStorage.getItem(getStorageKey(key));
+
+    // Migrate legacy key to new namespaced key
+    if (storedValueLegacy && !storedValue) {
+      storedValue = storedValueLegacy;
+      window.localStorage.setItem(getStorageKey(key), storedValueLegacy);
+      window.localStorage.removeItem(key);
+    }
+
     return (
       // @ts-expect-error It's ok to pass null to JSON.parse
-      (JSON.parse(window.localStorage.getItem(key)) as LocalStorage[T]) ??
-      defaultValues[key]
+      (JSON.parse(storedValue) as LocalStorage[T]) ?? defaultValues[key]
     );
   } catch (error) {
-    logger.warn(`[WIDGET] Failed to parse ${key} from localStorage:`, error);
+    logger.warn(
+      `[WIDGET] Failed to parse ${getStorageKey(key)} from localStorage:`,
+      error,
+    );
 
     return defaultValues[key];
   }
@@ -44,7 +59,9 @@ const setItem = <T extends keyof LocalStorage>(
 ) => {
   if (!isBrowser) {
     if (process.env.NODE_ENV === 'development') {
-      logger.debug(`[WIDGET] Attempted to set ${key} on server; skipping`);
+      logger.debug(
+        `[WIDGET] Attempted to set ${getStorageKey(key)} on server; skipping`,
+      );
     }
 
     return;
@@ -58,25 +75,33 @@ const setItem = <T extends keyof LocalStorage>(
         ? String(value)
         : JSON.stringify(value);
 
-    window.localStorage.setItem(key, serialized);
+    window.localStorage.setItem(getStorageKey(key), serialized);
   } catch (error) {
-    logger.warn(`[WIDGET] Failed to set ${key} in localStorage:`, error);
+    logger.warn(
+      `[WIDGET] Failed to set ${getStorageKey(key)} in localStorage:`,
+      error,
+    );
   }
 };
 
 const removeItem = (key: keyof LocalStorage) => {
   if (!isBrowser) {
     if (process.env.NODE_ENV === 'development') {
-      logger.debug(`[WIDGET] Attempted to remove ${key} on server; skipping`);
+      logger.debug(
+        `[WIDGET] Attempted to remove ${getStorageKey(key)} from localstorage on server; skipping`,
+      );
     }
 
     return;
   }
 
   try {
-    window.localStorage.removeItem(key);
+    window.localStorage.removeItem(getStorageKey(key));
   } catch (error) {
-    logger.warn(`[WIDGET] Failed to remove ${key} from localStorage:`, error);
+    logger.warn(
+      `[WIDGET] Failed to remove ${getStorageKey(key)} from localStorage:`,
+      error,
+    );
   }
 };
 

package/src/widgets/WidgetDeposit/WidgetDepositContent.tsx

@@ -62,11 +62,11 @@ export const WidgetDepositContent = ({
   const { tokenModalOpen, updateTokenModalState } = useTokenModal({ onMsg });
 
   const isCompatibilityCheckRequired = useIsCompatibilityCheckRequired();
-  const [isCompatibilityOpen, setIsCompatibilityOpen] = useState(true);
+  const [isCompatibilityOpen, setIsCompatibilityOpen] = useState(false);
 
   useEffect(() => {
-    if (!isCompatibilityCheckRequired) {
-      setIsCompatibilityOpen(false);
+    if (isCompatibilityCheckRequired) {
+      setIsCompatibilityOpen(true);
     }
   }, [isCompatibilityCheckRequired]);
 

package/src/widgets/WidgetSwap/WidgetSwapContent.tsx

@@ -65,11 +65,13 @@ export const WidgetSwapContent = ({
     useTokenInputPair();
 
   const isCompatibilityCheckRequired = useIsCompatibilityCheckRequired();
-  const [isCompatibilityOpen, setIsCompatibilityOpen] = useState(true);
+  const [isCompatibilityOpen, setIsCompatibilityOpen] = useState(
+    isCompatibilityCheckRequired,
+  );
 
   useEffect(() => {
-    if (!isCompatibilityCheckRequired) {
-      setIsCompatibilityOpen(false);
+    if (isCompatibilityCheckRequired) {
+      setIsCompatibilityOpen(isCompatibilityCheckRequired);
     }
   }, [isCompatibilityCheckRequired]);
 

package/src/widgets/WidgetWithdraw/WidgetWithdrawContent.tsx

@@ -61,11 +61,11 @@ export const WidgetWithdrawContent = ({
     useTokenInputPair();
 
   const isCompatibilityCheckRequired = useIsCompatibilityCheckRequired();
-  const [isCompatibilityOpen, setIsCompatibilityOpen] = useState(true);
+  const [isCompatibilityOpen, setIsCompatibilityOpen] = useState(false);
 
   useEffect(() => {
-    if (!isCompatibilityCheckRequired) {
-      setIsCompatibilityOpen(false);
+    if (isCompatibilityCheckRequired) {
+      setIsCompatibilityOpen(true);
     }
   }, [isCompatibilityCheckRequired]);