Merge branch 'main' into feat/infra-3527-bitrise-ios-runners-poc

Author: Qbandev

app/components/Nav/App/App.tsx

@@ -41,6 +41,7 @@ import { usePredictToastRegistrations } from '../../UI/Predict/hooks/usePredictT
 import { usePerpsWithdrawToastRegistrations } from '../../UI/Perps/hooks/usePerpsWithdrawToastRegistrations';
 import AccountSelector from '../../../components/Views/AccountSelector';
 import AddressSelector from '../../../components/Views/AddressSelector';
+import AddWallet from '../../../components/Views/AddWallet';
 import { TokenSortBottomSheet } from '../../UI/Tokens/TokenSortBottomSheet/TokenSortBottomSheet';
 import ProfilerManager from '../../../components/UI/ProfilerManager';
 import NetworkManager from '../../../components/UI/NetworkManager';
@@ -473,6 +474,19 @@ const RootModalFlow = (props: RootModalFlowProps) => (
         detachPreviousScreen: false,
       }}
     />
+    <Stack.Screen
+      name={Routes.SHEET.ADD_WALLET}
+      component={AddWallet}
+      options={{
+        cardStyle: { backgroundColor: importedColors.transparent },
+        cardStyleInterpolator: () => ({
+          overlayStyle: {
+            opacity: 0,
+          },
+        }),
+        detachPreviousScreen: false,
+      }}
+    />
     <Stack.Screen
       name={Routes.SHEET.ADDRESS_SELECTOR}
       component={AddressSelector}
@@ -984,7 +998,7 @@ const AppFlow = () => {
         component={RootModalFlow as ScreenComponent}
       />
       <Stack.Screen
-        name="ImportPrivateKeyView"
+        name={Routes.IMPORT_PRIVATE_KEY_VIEW}
         component={ImportPrivateKeyView}
         options={{
           animationEnabled: true,

app/components/Nav/Main/MainNavigator.js

@@ -144,7 +144,7 @@ import RewardOptInAccountGroupModal from '../../UI/Rewards/components/Settings/R
 import EndOfSeasonClaimBottomSheet from '../../UI/Rewards/components/EndOfSeasonClaimBottomSheet/EndOfSeasonClaimBottomSheet';
 import RewardsSelectSheet from '../../UI/Rewards/components/RewardsSelectSheet';
 import OndoPendingSheet from '../../UI/Rewards/components/Campaigns/OndoPendingSheet';
-import CampaignTourStepView from '../../UI/Rewards/Views/CampaignTourStepView';
+
 import SitesFullView from '../../Views/SitesFullView/SitesFullView';
 import { TokenDetails } from '../../UI/TokenDetails/Views/TokenDetails';
 import BenefitFullView from '../../UI/Rewards/Views/BenefitFullView';
@@ -285,6 +285,7 @@ const TransactionsHome = () => {
       <Stack.Screen
         name={Routes.RAMP.RAMPS_ORDER_DETAILS}
         component={RampsOrderDetails}
+        options={{ headerShown: false }}
       />
       <Stack.Screen
         name={Routes.DEPOSIT.ORDER_DETAILS}
@@ -615,7 +616,7 @@ const SettingsFlow = () => {
       <Stack.Screen
         name={Routes.SETTINGS.REGION_SELECTOR}
         component={RegionSelector}
-        options={RegionSelector.navigationOptions}
+        options={{ headerShown: false }}
       />
       {
         ///: BEGIN:ONLY_INCLUDE_IF(external-snaps)
@@ -1391,11 +1392,6 @@ const MainNavigator = () => {
         ///: END:ONLY_INCLUDE_IF
       }
       <Stack.Screen name={Routes.CARD.ROOT} component={CardRoutes} />
-      <Stack.Screen
-        name={Routes.REWARDS_CAMPAIGN_TOUR_STEP}
-        component={CampaignTourStepView}
-        options={{ headerShown: false }}
-      />
       <Stack.Screen
         name={Routes.RAMP.MODALS.PROCESSING_INFO}
         component={ProcessingInfoModal}

app/components/Nav/Main/__snapshots__/MainNavigator.test.tsx.snap

@@ -419,15 +419,6 @@ exports[`MainNavigator Tab Bar Visibility hides tab bar when browser is active 1
     component={[Function]}
     name="CardScreens"
   />
-  <Screen
-    component={[Function]}
-    name="RewardsCampaignTourStep"
-    options={
-      {
-        "headerShown": false,
-      }
-    }
-  />
   <Screen
     component={[Function]}
     name="RampProcessingInfoModal"
@@ -865,15 +856,6 @@ exports[`MainNavigator Tab Bar Visibility shows tab bar when not in browser 1`]
     component={[Function]}
     name="CardScreens"
   />
-  <Screen
-    component={[Function]}
-    name="RewardsCampaignTourStep"
-    options={
-      {
-        "headerShown": false,
-      }
-    }
-  />
   <Screen
     component={[Function]}
     name="RampProcessingInfoModal"
@@ -1311,15 +1293,6 @@ exports[`MainNavigator matches rendered snapshot 1`] = `
     component={[Function]}
     name="CardScreens"
   />
-  <Screen
-    component={[Function]}
-    name="RewardsCampaignTourStep"
-    options={
-      {
-        "headerShown": false,
-      }
-    }
-  />
   <Screen
     component={[Function]}
     name="RampProcessingInfoModal"