Solve merge bugs

app/components/Nav/Main/MainNavigator.js

@@ -41,6 +41,7 @@ import PaymentRequestSuccess from '../../UI/PaymentRequestSuccess';
 import Amount from '../../Views/SendFlow/Amount';
 import Confirm from '../../Views/SendFlow/Confirm';
 import ContactForm from '../../Views/Settings/Contacts/ContactForm';
+import ActivityView from '../../Views/ActivityView';
 import SwapsAmountView from '../../UI/Swaps';
 import SwapsQuotesView from '../../UI/Swaps/QuotesView';
 import CollectiblesDetails from '../../UI/CollectibleModal';
@@ -58,6 +59,7 @@ import Regions from '../../UI/FiatOnRampAggregator/Views/Regions';
 import ThemeSettings from '../../Views/ThemeSettings';
 import { SnapsDev } from '../../Views/Snaps';
 import { colors as importedColors } from '../../../styles/common';
+import OrderDetails from '../../UI/FiatOnRampAggregator/Views/OrderDetails';
 import TabBar from '../../../component-library/components/Navigation/TabBar';
 import BrowserUrlModal from '../../Views/BrowserUrlModal';
 import Routes from '../../../constants/navigation/Routes';
@@ -161,6 +163,16 @@ const WalletTabStackFlow = () => (
   </Stack.Navigator>
 );
 
+const TransactionsHome = () => (
+  <Stack.Navigator>
+    <Stack.Screen name={Routes.TRANSACTIONS_VIEW} component={ActivityView} />
+    <Stack.Screen
+      name={Routes.FIAT_ON_RAMP_AGGREGATOR.ORDER_DETAILS}
+      component={OrderDetails}
+    />
+  </Stack.Navigator>
+);
+
 const WalletTabModalFlow = () => (
   <Stack.Navigator mode={'modal'} screenOptions={clearStackNavigatorOptions}>
     <Stack.Screen name={'WalletTabStackFlow'} component={WalletTabStackFlow} />
@@ -586,16 +598,6 @@ const SetPasswordFlow = () => (
   </Stack.Navigator>
 );
 
-// const ConnectQRHardwareFlow = () => (
-//   <Stack.Navigator
-//     screenOptions={{
-//       headerShown: false,
-//     }}
-//   >
-//     <Stack.Screen name="ConnectQRHardware" component={ConnectQRHardware} />
-//   </Stack.Navigator>
-// );
-
 const SnapsDevUI = () => (
   <Stack.Navigator>
     <Stack.Screen
@@ -630,19 +632,12 @@ const MainNavigator = () => (
     <Stack.Screen name="Home" component={HomeTabs} />
     <Stack.Screen name="Webview" component={Webview} />
     <Stack.Screen name="SettingsView" component={SettingsModalStack} />
+    <Stack.Screen name="TransactionsHome" component={TransactionsHome} />
     <Stack.Screen
       name={Routes.SNAPS.HOME}
       mode={'modal'}
       component={SnapsDevUI}
     />
-    {/* <Stack.Screen
-      name="ImportPrivateKeyView"
-      component={ImportPrivateKeyView}
-    /> */}
-    {/* <Stack.Screen
-      name="ConnectQRHardwareFlow"
-      component={ConnectQRHardwareFlow}
-    /> */}
     <Stack.Screen name="SendView" component={SendView} />
     <Stack.Screen name="SendFlowView" component={SendFlowView} />
     <Stack.Screen name="AddBookmarkView" component={AddBookmarkView} />

app/components/Views/AccountConnect/AccountConnect.tsx

@@ -35,7 +35,7 @@ import { getUrlObj } from '../../../util/browser';
 import { strings } from '../../../../locales/i18n';
 import { AvatarAccountType } from '../../../component-library/components/Avatars/Avatar/variants/AvatarAccount';
 import { safeToChecksumAddress } from '../../../util/address';
-import USER_INTENT from '../../../constants/permissions';
+import { USER_INTENT } from '../../../constants/permissions';
 
 // Internal dependencies.
 import {

app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.tsx

@@ -21,7 +21,7 @@ import ButtonLink from '../../../../component-library/components/Buttons/Button/
 import styleSheet from './AccountConnectMultiSelector.styles';
 import { AccountConnectMultiSelectorProps } from './AccountConnectMultiSelector.types';
 import { ButtonSecondaryVariants } from '../../../../component-library/components/Buttons/Button/variants/ButtonSecondary';
-import USER_INTENT from '../../../../constants/permissions';
+import { USER_INTENT } from '../../../../constants/permissions';
 
 const AccountConnectMultiSelector = ({
   accounts,

app/components/Views/AccountConnect/AccountConnectMultiSelector/AccountConnectMultiSelector.types.ts

@@ -4,7 +4,7 @@ import { ImageSourcePropType } from 'react-native';
 // External dependencies.
 import { UseAccounts } from '../../../hooks/useAccounts';
 import { IconName } from '../../../../component-library/components/Icon';
-import USER_INTENT from '../../../../constants/permissions';
+import { USER_INTENT } from '../../../../constants/permissions';
 
 /**
  * AccountConnectMultiSelector props.

app/components/Views/AccountConnect/AccountConnectSingle/AccountConnectSingle.tsx

@@ -29,7 +29,7 @@ import { AccountConnectScreens } from '../AccountConnect.types';
 // Internal dependencies.
 import { AccountConnectSingleProps } from './AccountConnectSingle.types';
 import styleSheet from './AccountConnectSingle.styles';
-import USER_INTENT from '../../../../constants/permissions';
+import { USER_INTENT } from '../../../../constants/permissions';
 
 import {
   ACCOUNT_APROVAL_MODAL_CONTAINER_ID,

app/components/Views/AccountConnect/AccountConnectSingle/AccountConnectSingle.types.ts

@@ -5,7 +5,7 @@ import { ImageSourcePropType } from 'react-native';
 import { AccountConnectScreens } from '../AccountConnect.types';
 import { Account } from '../../../hooks/useAccounts';
 import { IconName } from '../../../../component-library/components/Icon';
-import USER_INTENT from '../../../../constants/permissions';
+import { USER_INTENT } from '../../../../constants/permissions';
 
 /**
  * AccountConnectSingle props.

app/components/Views/AccountConnect/AccountConnectSingleSelector/AccountConnectSingleSelector.tsx

@@ -12,7 +12,7 @@ import { AccountConnectScreens } from '../AccountConnect.types';
 // Internal dependencies.
 import { AccountConnectSingleSelectorProps } from './AccountConnectSingleSelector.types';
 import styles from './AccountConnectSingleSelector.styles';
-import USER_INTENT from '../../../../constants/permissions';
+import { USER_INTENT } from '../../../../constants/permissions';
 
 const AccountConnectSingleSelector = ({
   accounts,

app/components/Views/AccountConnect/AccountConnectSingleSelector/AccountConnectSingleSelector.types.ts

@@ -1,6 +1,6 @@
 // External dependencies.
 import { UseAccounts } from '../../../hooks/useAccounts';
-import USER_INTENT from '../../../../constants/permissions';
+import { USER_INTENT } from '../../../../constants/permissions';
 import { AccountConnectScreens } from '../AccountConnect.types';
 
 /**

app/components/Views/AccountPermissions/AccountPermissions.tsx

@@ -45,7 +45,7 @@ import {
 } from './AccountPermissions.types';
 import AccountPermissionsConnected from './AccountPermissionsConnected';
 import AccountPermissionsRevoke from './AccountPermissionsRevoke';
-import USER_INTENT from '../../../constants/permissions';
+import { USER_INTENT } from '../../../constants/permissions';
 
 const AccountPermissions = (props: AccountPermissionsProps) => {
   const navigation = useNavigation();

app/components/Views/Wallet/index.tsx

@@ -1,5 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-nocheck
 import React, {
   useEffect,
   useRef,

app/constants/navigation/Routes.ts

@@ -67,23 +67,6 @@ const Routes = {
   WALLET: {
     HOME: 'WalletTabHome',
   },
-  SHEET: {
-    ACCOUNT_SELECTOR: 'AccountSelector',
-    ACCOUNT_CONNECT: 'AccountConnect',
-    ACCOUNT_PERMISSIONS: 'AccountPermissions',
-  },
-  BROWSER: {
-    HOME: 'BrowserTabHome',
-    URL_MODAL: 'BrowserUrlModal',
-    VIEW: 'BrowserView',
-  },
-  WEBVIEW: {
-    MAIN: 'Webview',
-    SIMPLE: 'SimpleWebview',
-  },
-  WALLET: {
-    HOME: 'WalletTabHome',
-  },
   SNAPS: {
     HOME: 'SnapsHome',
   },

app/core/Engine.js

@@ -496,6 +496,8 @@ class Engine {
               swapsUtils.SWAPS_TESTNET_CHAIN_ID,
               swapsUtils.POLYGON_CHAIN_ID,
               swapsUtils.AVALANCHE_CHAIN_ID,
+              swapsUtils.ARBITRUM_CHAIN_ID,
+              swapsUtils.OPTIMISM_CHAIN_ID,
             ],
           },
         ),