try to fix asset cache

spectrum-finance · Jan 5, 2024 · fc5dfc0 · fc5dfc0
1 parent c7ea97d
commit fc5dfc0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/src/common/constants/settings.ts b/src/common/constants/settings.ts
@@ -1,4 +1,5 @@
 import { fractionsToNum } from '../../utils/math';
+import { makeId } from '../utils/makeId.ts';
 import { DEFAULT_MINER_FEE, ERG_DECIMALS, MIN_EX_FEE } from './erg';
 
 export const defaultMinerFee = fractionsToNum(DEFAULT_MINER_FEE, ERG_DECIMALS);
@@ -15,3 +16,5 @@ export const SlippageDecimals = 2;
 export const PoolFeeMax = 0.25;
 
 export const UI_REWARD_ADDRESS = '';
+
+export const appId = makeId(10);
diff --git a/src/components/AssetIcon/AssetIcon.tsx b/src/components/AssetIcon/AssetIcon.tsx
@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react';
 import * as React from 'react';
 
+import { appId } from '../../common/constants/settings.ts';
 import { AssetInfo } from '../../common/models/AssetInfo';
 import { UnknownTokenIcon } from '../UnknownTokenIcon/UnknownTokenIcon';
 
@@ -46,15 +47,23 @@ const AssetIcon: React.FC<TokenIconProps> = ({
   const [errorState, setErrorState] = useState<ErrorState | undefined>(
     undefined,
   );
-  const [assetLogoUrl, setAssetLogoUrl] = useState(asset?.icon);
-  const [assetLogoAltUrl, setAssetLogoAltUrl] = useState(asset?.url);
+  const [assetLogoUrl, setAssetLogoUrl] = useState(
+    asset?.icon ? `${asset?.icon}?${appId}` : asset?.icon,
+  );
+  const [assetLogoAltUrl, setAssetLogoAltUrl] = useState(
+    asset?.url ? `${asset?.url}?${appId}` : asset?.url,
+  );
 
   useEffect(() => {
     setAssetLogoUrl((prev) => {
-      return prev === asset?.icon ? prev : asset?.icon;
+      return prev === `${asset?.icon}?${appId}`
+        ? prev
+        : `${asset?.icon}?${appId}`;
     });
     setAssetLogoAltUrl((prev) => {
-      return prev === asset?.url ? prev : asset?.url;
+      return prev === `${asset?.url}?${appId}`
+        ? prev
+        : `${asset?.url}?${appId}`;
     });
     if (asset) {
       setErrorState(undefined);
@@ -82,7 +91,7 @@ const AssetIcon: React.FC<TokenIconProps> = ({
       }}
       {...rest}
     >
-      {errorState === ErrorState.ICON_NOT_FOUND ? (
+      {errorState === ErrorState.ICON_NOT_FOUND || !assetLogoAltUrl ? (
         <UnknownTokenIcon asset={asset} size={MAP_SIZE_TO_NUMBER[size]} />
       ) : errorState === ErrorState.ALT_ICON ? (
         <img