Merge pull request #646 from Psychedelic/fix/update-with-dev

Fix/update with dev
Psychedelic · Oct 20, 2022 · 75f56ec · 75f56ec
2 parents b00d8e8 + bde3280
commit 75f56ec
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/source/Background/Keyring/index.js b/source/Background/Keyring/index.js
@@ -109,6 +109,7 @@ export const HANDLER_TYPES = {
   GET_CURRENT_NETWORK: 'get-current-network',
   IMPORT_PEM_ACCOUNT: 'import-pem-account',
   REMOVE_PEM_ACCOUNT: 'remove-pem-account',
+  REMOVE_CUSTOM_TOKEN: 'remove-custom-token',
 };
 
 export const getKeyringErrorMessage = (type) => ({

diff --git a/source/components/AssetItem/index.jsx b/source/components/AssetItem/index.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
 import NumberFormat from 'react-number-format';
 import PropTypes from 'prop-types';
 import Typography from '@material-ui/core/Typography';
@@ -8,7 +8,6 @@ import clsx from 'clsx';
 import Skeleton from 'react-loading-skeleton';
 import 'react-loading-skeleton/dist/skeleton.css';
 
-import { TOKENS } from '@shared/constants/currencies';
 import RefreshIcon from '@assets/icons/blue-refresh.png';
 import DeleteIcon from '@assets/icons/delete.svg';
 import TokenIcon from '../TokenIcon';
@@ -67,7 +66,13 @@ const AssetItem = ({
 
   return (
     <div
-      className={clsx(classes.root, failed && classes.failedContainer, shouldRemove && classes.removeAnimation)}
+      className={
+        clsx(
+          classes.root,
+          failed && classes.failedContainer,
+          shouldRemove && classes.removeAnimation,
+        )
+      }
       onMouseOver={handleMouseOver}
       onAnimationEnd={removeAsset}
       onMouseOut={handleMouseOut}
@@ -139,7 +144,13 @@ const AssetItem = ({
         )}
       { !failed && !loading && (
         <div
-          className={clsx(classes.deleteToken, !value && classes.deleteTokenMoveRight, isHovering && classes.deleteTokenActive)}
+          className={
+            clsx(
+              classes.deleteToken,
+              !value && classes.deleteTokenMoveRight,
+              isHovering && classes.deleteTokenActive,
+            )
+          }
         >
           <img
             onClick={() => setOpenDelete(true)}
@@ -170,4 +181,5 @@ AssetItem.propTypes = {
   failed: PropTypes.bool,
   assetNameTestId: PropTypes.string,
   removeAsset: PropTypes.func.isRequired,
+  protectedAsset: PropTypes.bool.isRequired,
 };
diff --git a/source/components/Profile/index.jsx b/source/components/Profile/index.jsx
@@ -1,3 +1,4 @@
+/* eslint-disable max-len */
 import React, { useState, useEffect } from 'react';
 import MenuList from '@material-ui/core/MenuList';
 import Button from '@material-ui/core/Button';

diff --git a/source/redux/wallet.js b/source/redux/wallet.js
@@ -110,8 +110,6 @@ export const {
   setTransactionsLoading,
   setAssets,
   setAssetsLoading,
-  setCollections,
-  setCollectionsLoading,
   blockNFTFetch,
 } = walletSlice.actions;