Add getFileExt utility and test

MetaMask · Jul 30, 2021 · b90f0e2 · b90f0e2
1 parent 5d7c648
commit b90f0e2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/assets/TokenListController.test.ts b/src/assets/TokenListController.test.ts
@@ -13,8 +13,8 @@ import {
   GetTokenListState,
   TokenListMap,
   IconPath,
-  MediaExtType,
   ContractMap,
+  getFileExt,
 } from './TokenListController';
 
 const name = 'TokenListController';
@@ -26,10 +26,7 @@ for (const tokenAddress in contractMap) {
   const { erc20, logo: filePath, ...token } = (contractMap as ContractMap)[
     tokenAddress
   ];
-  const extType = filePath
-    .substr(filePath.lastIndexOf('.') + 1)
-    .toUpperCase() as MediaExtType;
-  const iconPath: IconPath = { filePath, type: extType };
+  const iconPath: IconPath = { filePath, type: getFileExt(filePath) };
   if (erc20) {
     staticTokenList[tokenAddress] = {
       ...token,
@@ -1146,4 +1143,9 @@ describe('TokenListController', () => {
 
     controller.destroy();
   });
+
+  it('should get the file extension', () => {
+    const { iconUrl } = sampleMainnetTokenList[0];
+    expect(getFileExt(iconUrl)).toBe('PNG');
+  });
 });
diff --git a/src/assets/TokenListController.ts b/src/assets/TokenListController.ts
@@ -94,6 +94,9 @@ const defaultState: TokenListState = {
   tokensChainsCache: {},
 };
 
+export const getFileExt = (filePath: string): MediaExtType =>
+  filePath.substr(filePath.lastIndexOf('.') + 1).toUpperCase() as MediaExtType;
+
 /**
  * Controller that passively polls on a set interval for the list of tokens from metaswaps api
  */
@@ -230,10 +233,7 @@ export class TokenListController extends BaseController<
       const { erc20, logo: filePath, ...token } = (contractMap as ContractMap)[
         tokenAddress
       ];
-      const extType = filePath
-        .substr(filePath.lastIndexOf('.') + 1)
-        .toUpperCase() as MediaExtType;
-      const iconPath: IconPath = { filePath, type: extType };
+      const iconPath: IconPath = { filePath, type: getFileExt(filePath) };
       if (erc20) {
         // Specify iconUrl here as filePath for backwards compatibility for extension
         tokenList[tokenAddress] = {