[DDW-1111] Address PR feedback

Author: Marcin Mazurek

source/renderer/app/api/api.ts

@@ -227,7 +227,7 @@ import Asset from '../domains/Asset';
 import { getAssets } from './assets/requests/getAssets';
 import { getAccountPublicKey } from './wallets/requests/getAccountPublicKey';
 import { doesWalletRequireAdaToRemainToSupportTokens } from './utils/apiHelpers';
-import { AssetLocalData, defaultAssetLocalData } from '../types/localDataTypes';
+import { AssetLocalData } from '../types/localDataTypes';
 
 export default class AdaApi {
   config: RequestConfig;
@@ -670,8 +670,7 @@ export default class AdaApi {
       const assets = response.map((asset) =>
         _createAssetFromServerData(
           asset,
-          assetsLocalData[asset.policy_id + asset.asset_name] ||
-            defaultAssetLocalData,
+          assetsLocalData[asset.policy_id + asset.asset_name] || {},
           this.storedAssetMetadata
         )
       );

source/renderer/app/api/utils/localStorage.ts

@@ -26,7 +26,6 @@ import {
   HardwareWalletsLocalData,
   UnpairedHardwareWalletData,
   WalletLocalData,
-  defaultAssetLocalData,
 } from '../../types/localDataTypes';
 
 export type SetHardwareWalletLocalDataRequestType = {
@@ -278,11 +277,7 @@ export default class LocalStorageApi {
     policyId: string,
     assetName: string
   ): Promise<AssetLocalData> =>
-    LocalStorageApi.get(
-      keys.ASSET_DATA,
-      defaultAssetLocalData,
-      `${policyId}${assetName}`
-    );
+    LocalStorageApi.get(keys.ASSET_DATA, {}, `${policyId}${assetName}`);
   setAssetLocalData = (
     policyId: string,
     assetName: string,

source/renderer/app/components/assets/AssetSettingsDialog.tsx

@@ -17,7 +17,7 @@ import {
   MAX_DECIMAL_PRECISION,
 } from '../../config/assetsConfig';
 import { DiscreetTokenWalletAmount } from '../../features/discreet-mode';
-import { isRecommendedDecimal } from '../wallet/tokens/wallet-token/helpers';
+import { isNonRecommendedDecimalSettingUsed } from '../wallet/tokens/wallet-token/helpers';
 
 const messages = defineMessages({
   title: {
@@ -154,7 +154,7 @@ class AssetSettingsDialog extends Component<Props, State> {
       },
     ];
 
-    const hasWarning = isRecommendedDecimal({
+    const hasWarning = isNonRecommendedDecimalSettingUsed({
       recommendedDecimals,
       decimals: savedDecimals,
     });

source/renderer/app/components/wallet/tokens/wallet-token/WalletToken.tsx

@@ -6,7 +6,7 @@ import AssetContent from '../../../assets/AssetContent';
 import type { AssetToken } from '../../../../api/assets/types';
 import WalletTokenFooter from './WalletTokenFooter';
 import WalletTokenHeader from './WalletTokenHeader';
-import { isRecommendedDecimal } from './helpers';
+import { isNonRecommendedDecimalSettingUsed } from './helpers';
 
 type Props = {
   anyAssetWasHovered: boolean;
@@ -49,7 +49,7 @@ const WalletToken = observer((props: Props) => {
     setIsExpanded(!isExpanded);
   }, [setIsExpanded, isExpanded]);
 
-  const hasWarning = isRecommendedDecimal({
+  const hasWarning = isNonRecommendedDecimalSettingUsed({
     decimals: asset.decimals,
     recommendedDecimals: asset.recommendedDecimals,
   });

source/renderer/app/components/wallet/tokens/wallet-token/helpers.spec.ts

@@ -0,0 +1,69 @@
+import { isNonRecommendedDecimalSettingUsed } from './helpers';
+
+describe('isNonRecommendedDecimalSettingUsed', () => {
+  it('returns false if asset does not have recommended decimals', async () => {
+    expect(
+      isNonRecommendedDecimalSettingUsed({
+        decimals: 0,
+        recommendedDecimals: undefined,
+      })
+    ).toEqual(false);
+
+    expect(
+      isNonRecommendedDecimalSettingUsed({
+        decimals: 5,
+        recommendedDecimals: undefined,
+      })
+    ).toEqual(false);
+  });
+
+  it('returns false if recommended decimal settings are applied by user', async () => {
+    expect(
+      isNonRecommendedDecimalSettingUsed({
+        decimals: 0,
+        recommendedDecimals: 0,
+      })
+    ).toEqual(false);
+
+    expect(
+      isNonRecommendedDecimalSettingUsed({
+        decimals: 5,
+        recommendedDecimals: 5,
+      })
+    ).toEqual(false);
+  });
+
+  it('returns false if 0 (default value) is recommended and user never changed settings', async () => {
+    expect(
+      isNonRecommendedDecimalSettingUsed({
+        decimals: undefined,
+        recommendedDecimals: 0,
+      })
+    ).toEqual(false);
+  });
+
+  it('returns true if non-zero decimals are recommended but user never changed settings', async () => {
+    expect(
+      isNonRecommendedDecimalSettingUsed({
+        decimals: undefined,
+        recommendedDecimals: 3,
+      })
+    ).toEqual(true);
+  });
+
+  it('returns true if user applied non-recommended decimal settings', async () => {
+    expect(
+      isNonRecommendedDecimalSettingUsed({
+        decimals: 3,
+        recommendedDecimals: 0,
+      })
+    ).toEqual(true);
+
+    expect(
+      isNonRecommendedDecimalSettingUsed({
+        decimals: 0,
+        recommendedDecimals: 3,
+      })
+    ).toEqual(true);
+  });
+});

source/renderer/app/components/wallet/tokens/wallet-token/helpers.ts

@@ -1,15 +1,24 @@
-type IsRecommendedDecimal = {
+type IsNonRecommendedDecimalSettingUsedArgs = {
   decimals: number | null | undefined;
   recommendedDecimals: number | null | undefined;
 };
 
-export const isRecommendedDecimal = ({
+export const isNonRecommendedDecimalSettingUsed = ({
   recommendedDecimals,
   decimals,
-}: IsRecommendedDecimal) => {
-  return (
-    typeof recommendedDecimals === 'number' &&
-    typeof decimals === 'number' &&
-    decimals !== recommendedDecimals
-  );
+}: IsNonRecommendedDecimalSettingUsedArgs) => {
+  const hasRecommendedDecimals = typeof recommendedDecimals === 'number';
+  const hasConfiguredDecimals = typeof decimals === 'number';
+
+  if (!hasRecommendedDecimals) {
+    return false;
+  }
+  if (hasConfiguredDecimals) {
+    return decimals !== recommendedDecimals;
+  }
+  if (!hasConfiguredDecimals && recommendedDecimals === 0) {
+    return false;
+  }
+
+  return true;
 };

source/renderer/app/types/localDataTypes.ts

@@ -35,9 +35,5 @@ export type HardwareWalletsLocalData = Record<string, HardwareWalletLocalData>;
 export type HardwareWalletDevicesType = Record<string, TransportDevice>;
 
 export type AssetLocalData = {
-  decimals: number;
-};
-
-export const defaultAssetLocalData: AssetLocalData = {
-  decimals: 0,
+  decimals?: number;
 };