diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 536976ae751..727f5b7c4d0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -92,3 +92,12 @@ app/components/Views/DetectedTokens @MetaMask/metamask-assets
 app/components/Views/NFTAutoDetectionModal @MetaMask/metamask-assets
 app/components/Views/NftDetails @MetaMask/metamask-assets
 app/reducers/collectibles @MetaMask/metamask-assets
+
+# UX Team
+app/components                       @MetaMask/wallet-ux
+app/reducers/experimentalSettings    @MetaMask/wallet-ux
+app/reducers/modals                  @MetaMask/wallet-ux
+app/reducers/navigation              @MetaMask/wallet-ux
+app/reducers/onboarding              @MetaMask/wallet-ux
+app/reducers/privacy                 @MetaMask/wallet-ux
+app/reducers/settings                @MetaMask/wallet-ux
diff --git a/app/components/UI/AccountRightButton/index.tsx b/app/components/UI/AccountRightButton/index.tsx
index 84351a1b056..4b21c8a6702 100644
--- a/app/components/UI/AccountRightButton/index.tsx
+++ b/app/components/UI/AccountRightButton/index.tsx
@@ -29,6 +29,7 @@ import { MetaMetricsEvents } from '../../../core/Analytics';
 import { AccountOverviewSelectorsIDs } from '../../../../e2e/selectors/AccountOverview.selectors';
 import { useMetrics } from '../../../components/hooks/useMetrics';
 import { useNetworkInfo } from '../../../selectors/selectedNetworkController';
+import UrlParser from 'url-parse';
 
 const styles = StyleSheet.create({
   leftButton: {
@@ -138,7 +139,7 @@ const AccountRightButton = ({
   const currentUrl = route.params?.url;
   let hostname;
   if (currentUrl) {
-    hostname = new URL(currentUrl).hostname;
+    hostname = new UrlParser(currentUrl)?.hostname;
   }
 
   const { networkName, networkImageSource } = useNetworkInfo(hostname);
diff --git a/app/components/UI/GenericButton/index.ios.js b/app/components/UI/GenericButton/index.ios.tsx
similarity index 80%
rename from app/components/UI/GenericButton/index.ios.js
rename to app/components/UI/GenericButton/index.ios.tsx
index 751d66c2809..26fc68606eb 100644
--- a/app/components/UI/GenericButton/index.ios.js
+++ b/app/components/UI/GenericButton/index.ios.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
-import PropTypes from 'prop-types';
-import { ViewPropTypes, TouchableOpacity } from 'react-native';
+import { TouchableOpacity, ViewStyle, GestureResponderEvent } from 'react-native';
 
 /**
  * @deprecated The `<GenericButton>` component has been deprecated in favor of the new `<Button>` component from the component-library.
@@ -10,31 +9,32 @@ import { ViewPropTypes, TouchableOpacity } from 'react-native';
  * If you would like to help with the replacement of the old `Button` component, please submit a pull request against this GitHub issue:
  * {@link https://github.com/MetaMask/metamask-mobile/issues/8107}
  */
-const GenericButton = (props) => (
-  <TouchableOpacity
-    onPress={props.onPress}
-    style={props.style}
-    delayPressIn={50}
-  >
-    {props.children}
-  </TouchableOpacity>
-);
 
-GenericButton.propTypes = {
+interface GenericButtonProps {
   /**
    * Children components of the GenericButton
    * it can be a text node, an image, or an icon
    * or an Array with a combination of them
    */
-  children: PropTypes.any,
+  children?: React.ReactNode;
   /**
    * Styles to be applied to the GenericButton
    */
-  style: ViewPropTypes.style,
+  style?: ViewStyle;
   /**
    * Function to be called on press
    */
-  onPress: PropTypes.func,
-};
+  onPress?: (event: GestureResponderEvent) => void;
+}
+
+const GenericButton: React.FC<GenericButtonProps> = (props) => (
+  <TouchableOpacity
+    onPress={props.onPress}
+    style={props.style}
+    delayPressIn={50}
+  >
+    {props.children}
+  </TouchableOpacity>
+);
 
 export default GenericButton;
diff --git a/bitrise.yml b/bitrise.yml
index ee7c4fbcb58..91a3df90f69 100644
--- a/bitrise.yml
+++ b/bitrise.yml
@@ -139,8 +139,8 @@ stages:
       - run_tag_smoke_assets_android: {}
       - run_tag_smoke_confirmations_ios: {}
       - run_tag_smoke_confirmations_android: {}
-      - run_tag_smoke_swaps_ios: {}
-      - run_tag_smoke_swaps_android: {}
+      # - run_tag_smoke_swaps_ios: {}
+      # - run_tag_smoke_swaps_android: {}
       - run_tag_smoke_core_ios: {}
       - run_tag_smoke_core_android: {}
   build_regression_e2e_ios_android_stage:
diff --git a/e2e/specs/swaps/swap-action-regression.spec.js b/e2e/specs/swaps/swap-action-regression.spec.js
index 65d6e366313..ef2a8acce3e 100644
--- a/e2e/specs/swaps/swap-action-regression.spec.js
+++ b/e2e/specs/swaps/swap-action-regression.spec.js
@@ -18,12 +18,12 @@ import { CustomNetworks } from '../../resources/networks.e2e';
 import TestHelpers from '../../helpers';
 import FixtureServer from '../../fixtures/fixture-server';
 import { getFixturesServerPort } from '../../fixtures/utils';
-import { Regression } from '../../tags';
+import { SmokeSwaps } from '../../tags';
 import Assertions from '../../utils/Assertions';
 
 const fixtureServer = new FixtureServer();
 
-describe(Regression('Multiple Swaps from Actions'), () => {
+describe(SmokeSwaps('Multiple Swaps from Actions'), () => {
   let swapOnboarded = true; // TODO: Set it to false once we show the onboarding page again.
   beforeAll(async () => {
     await TestHelpers.reverseServerPort();