Merge remote-tracking branch 'origin/main' into asynckeyexchange

.github/workflows/add-team-label.yml

@@ -7,6 +7,8 @@ on:
 
 jobs:
   add-team-label:
-    uses: metamask/github-tools/.github/workflows/add-team-label.yml@7c10eb3bafb3f221111a9e4309ae5dcaee171de5
+    uses: metamask/github-tools/.github/workflows/add-team-label.yml@058012b49ff2fbd9649c566ba43b29497f93b21d
+    permissions:
+      pull-requests: write
     secrets:
       PERSONAL_ACCESS_TOKEN: ${{ secrets.RELEASE_LABEL_TOKEN }}

app/component-library/components/Pickers/PickerAccount/PickerAccount.types.ts

@@ -31,7 +31,7 @@ export interface PickerAccountProps extends Omit<PickerBaseProps, 'children'> {
   /**
    * Account type label.
    */
-  accountTypeLabel?: string;
+  accountTypeLabel?: string | null;
 }
 
 /**

app/components/Approvals/SignatureApproval/SignatureApproval.tsx

@@ -9,6 +9,7 @@ const SignatureApproval = () => {
   const onSignConfirm = useCallback(async () => {
     await onConfirm({
       waitForResult: true,
+      //@ts-expect-error - this is added via patch of approval controller
       deleteAfterResult: true,
       handleErrors: false,
     });

app/components/Nav/App/index.test.tsx

@@ -1,12 +1,16 @@
-import { renderScreen } from '../../../util/test/renderWithProvider';
+import {
+  DeepPartial,
+  renderScreen,
+} from '../../../util/test/renderWithProvider';
 import { backgroundState } from '../../../util/test/initial-root-state';
 import App from './';
 import { MetaMetrics } from '../../../core/Analytics';
 import { waitFor } from '@testing-library/react-native';
+import { RootState } from '../../../reducers';
 
-const initialState = {
+const initialState: DeepPartial<RootState> = {
   user: {
-    loggedIn: true,
+    userLoggedIn: true,
   },
   engine: {
     backgroundState,

app/components/Nav/Main/index.test.tsx

@@ -74,7 +74,10 @@ function renderUseSwapConfirmedEventHook({
       state: {
         engine: {
           backgroundState: {
-            TransactionController: { swapsTransactions },
+            TransactionController: {
+              //@ts-expect-error - swaps transactions is something we do not have implemented on TransacitonController yet
+              swapsTransactions,
+            },
           },
         },
       },

app/components/UI/AccountInfoCard/index.test.tsx

@@ -1,11 +1,14 @@
 import React from 'react';
 import AccountInfoCard from './';
-import renderWithProvider from '../../../util/test/renderWithProvider';
+import renderWithProvider, {
+  DeepPartial,
+} from '../../../util/test/renderWithProvider';
 import { backgroundState } from '../../../util/test/initial-root-state';
 import {
   MOCK_ACCOUNTS_CONTROLLER_STATE,
   MOCK_ADDRESS_1,
 } from '../../../util/test/accountsControllerTestUtils';
+import { RootState } from '../../../reducers';
 
 jest.mock('../../../core/Engine', () => ({
   resetState: jest.fn(),
@@ -21,7 +24,7 @@ jest.mock('../../../core/Engine', () => ({
   },
 }));
 
-const mockInitialState = {
+const mockInitialState: DeepPartial<RootState> = {
   settings: {
     useBlockieIcon: false,
   },

app/components/UI/AssetSearch/index.tsx

@@ -1,5 +1,12 @@
 import React, { memo, useEffect, useState, useCallback } from 'react';
-import { TextInput, View, StyleSheet, Platform, TextStyle } from 'react-native';
+import {
+  TextInput,
+  View,
+  StyleSheet,
+  Platform,
+  TextStyle,
+  DimensionValue,
+} from 'react-native';
 import { fontStyles } from '../../../styles/common';
 import { strings } from '../../../../locales/i18n';
 import Fuse from 'fuse.js';
@@ -102,7 +109,7 @@ interface Props {
 // eslint-disable-next-line react/display-name
 const AssetSearch = memo(({ onSearch, onFocus, onBlur }: Props) => {
   const [searchQuery, setSearchQuery] = useState('');
-  const [inputDimensions, setInputDimensions] = useState('85%');
+  const [inputDimensions, setInputDimensions] = useState<DimensionValue>('85%');
   const [isFocus, setIsFocus] = useState(false);
   const tokenList = useSelector(selectTokenListArray);
   const { colors, themeAppearance } = useTheme();