updates types

MetaMask · Feb 26, 2024 · 58f9090 · 58f9090
1 parent 04d8a10
commit 58f9090
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 36 deletions.
diff --git a/ui/components/multichain/connected-status/connected-status.tsx b/ui/components/multichain/connected-status/connected-status.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
 import {
   BackgroundColor,
@@ -18,7 +17,15 @@ import {
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { BadgeStatus } from '../badge-status';
 
-export const ConnectedStatus = ({ address = '', isActive = false }) => {
+export type ConnectedStatusProps = {
+  address: string;
+  isActive?: boolean;
+};
+
+export const ConnectedStatus: React.FC<ConnectedStatusProps> = ({
+  address = '',
+  isActive,
+}): JSX.Element => {
   const t = useSelector(useI18nContext);
 
   const addressConnectedSubjectMap: any = useSelector(
@@ -31,13 +38,11 @@ export const ConnectedStatus = ({ address = '', isActive = false }) => {
     selectedAddressSubjectMap?.[originOfCurrentTab],
   );
 
-  let status;
+  let status = STATUS_NOT_CONNECTED;
   if (isActive) {
     status = STATUS_CONNECTED;
   } else if (currentTabIsConnectedToSelectedAddress) {
     status = STATUS_CONNECTED_TO_ANOTHER_ACCOUNT;
-  } else {
-    status = STATUS_NOT_CONNECTED;
   }
 
   let badgeBorderColor = BackgroundColor.backgroundDefault; // TODO: Replace it once border-color has this value.
@@ -76,14 +81,3 @@ export const ConnectedStatus = ({ address = '', isActive = false }) => {
     />
   );
 };
-
-ConnectedStatus.propTypes = {
-  /**
-   * Address for AvatarAccount
-   */
-  address: PropTypes.string.isRequired,
-  /**
-   * Boolean to determine active status
-   */
-  isActive: PropTypes.bool,
-};
diff --git a/ui/components/multichain/pages/send/components/account-picker.test.tsx b/ui/components/multichain/pages/send/components/account-picker.test.tsx
@@ -7,32 +7,33 @@ import { SendPageAccountPicker } from '.';
 const render = (props = {}) => {
   const store = configureStore({
     ...mockState,
-   metamask: {...mockState.metamask,
-              permissionHistory: {
-          'https://test.dapp': {
-            eth_accounts: {
-              accounts: {
-                '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': 1596681857076,
-              },
+    metamask: {
+      ...mockState.metamask,
+      permissionHistory: {
+        'https://test.dapp': {
+          eth_accounts: {
+            accounts: {
+              '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': 1596681857076,
             },
           },
         },
-        subjects: {
-          'https://test.dapp': {
-            permissions: {
-              eth_accounts: {
-                caveats: [
-                  {
-                    type: 'restrictReturnedAccounts',
-                    value: ['0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc'],
-                  },
-                ],
-                invoker: 'https://test.dapp',
-                parentCapability: 'eth_accounts',
-              },
+      },
+      subjects: {
+        'https://test.dapp': {
+          permissions: {
+            eth_accounts: {
+              caveats: [
+                {
+                  type: 'restrictReturnedAccounts',
+                  value: ['0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc'],
+                },
+              ],
+              invoker: 'https://test.dapp',
+              parentCapability: 'eth_accounts',
             },
           },
         },
+      },
     },
     activeTab: {
       origin: 'https://test.dapp',