chore: rebase adjustments

pagopa · Nov 20, 2023 · f609f1b · f609f1b
1 parent b9ec214
commit f609f1b
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 44 deletions.
diff --git a/ts/components/screens/__tests__/__snapshots__/OperationResultScreenContent.test.tsx.snap b/ts/components/screens/__tests__/__snapshots__/OperationResultScreenContent.test.tsx.snap
@@ -625,7 +625,6 @@ exports[`OperationResultScreenContent should match the snapshot with default pro
                                                         "overflow": "hidden",
                                                       },
                                                       false,
-                                                      false,
                                                       Object {
                                                         "height": 40,
                                                       },

diff --git a/ts/features/barcode/screens/BarcodeScanScreen.tsx b/ts/features/barcode/screens/BarcodeScanScreen.tsx
@@ -1,5 +1,5 @@
 import { Divider, ListItemNav, VSpacer } from "@pagopa/io-app-design-system";
-import { useNavigation } from "@react-navigation/native";
+import { CommonActions, useNavigation } from "@react-navigation/native";
 import React from "react";
 import { Alert, View } from "react-native";
 import ReactNativeHapticFeedback, {
@@ -38,7 +38,8 @@ import {
 } from "../types/IOBarcode";
 import { BarcodeFailure } from "../types/failure";
 import { getIOBarcodesByType } from "../utils/getBarcodesByType";
-import { itWalletEnabled } from "../../../config";
+import NavigationService from "../../../navigation/NavigationService";
+import { ITW_ROUTES } from "../../it-wallet/navigation/ItwRoutes";
 
 const BarcodeScanScreen = () => {
   const navigation = useNavigation<IOStackNavigationProp<AppParamsList>>();
@@ -139,7 +140,16 @@ const BarcodeScanScreen = () => {
         openDeepLink(barcode.authUrl);
         break;
       case "ITWALLET":
-        // TODO: blocked by [SIW-272]
+        const params = {
+          authReqUrl: barcode.requestUri,
+          clientId: barcode.clientId
+        };
+        NavigationService.dispatchNavigationAction(
+          CommonActions.navigate(ITW_ROUTES.MAIN, {
+            screen: ITW_ROUTES.PRESENTATION.CROSS_DEVICE.INIT,
+            params
+          })
+        );
         break;
     }
   };

diff --git a/ts/features/it-wallet/components/design/BadgeButton.tsx b/ts/features/it-wallet/components/design/BadgeButton.tsx
@@ -12,10 +12,10 @@ import Animated, {
 import {
   IOScaleValues,
   IOSpringValues,
-  Badge
+  Badge,
+  IOButtonStyles
 } from "@pagopa/io-app-design-system";
 import { WithTestID } from "../../../../types/WithTestID";
-import { IOButtonStyles } from "../../../../components/core/variables/IOStyles";
 
 export type BadgeButton = WithTestID<
   {

diff --git a/ts/navigation/AppStackNavigator.tsx b/ts/navigation/AppStackNavigator.tsx
@@ -3,12 +3,7 @@ import { LinkingOptions, NavigationContainer } from "@react-navigation/native";
 import * as React from "react";
 import { useRef } from "react";
 import { View } from "react-native";
-import {
-  IOColors,
-  IOThemeDark,
-  IOThemeLight,
-  useIOExperimentalDesign
-} from "@pagopa/io-app-design-system";
+import { useIOExperimentalDesign } from "@pagopa/io-app-design-system";
 import LoadingSpinnerOverlay from "../components/LoadingSpinnerOverlay";
 import {
   bpdEnabled,

diff --git a/ts/navigation/AuthenticatedStackNavigator.tsx b/ts/navigation/AuthenticatedStackNavigator.tsx
@@ -62,8 +62,6 @@ import {
   isIdPayEnabledSelector
 } from "../store/reducers/backendStatus";
 import { isGestureEnabled } from "../utils/navigation";
-import { IdPayCodeRoutes } from "../features/idpay/code/navigation/routes";
-import { IdPayCodeNavigator } from "../features/idpay/code/navigation/navigator";
 import { ItwStackNavigator } from "../features/it-wallet/navigation/ItwStackNavigator";
 import { ITW_ROUTES } from "../features/it-wallet/navigation/ItwRoutes";
 import { MessagesStackNavigator } from "./MessagesNavigator";

diff --git a/ts/navigation/ProfileNavigator.tsx b/ts/navigation/ProfileNavigator.tsx
@@ -63,6 +63,9 @@ const ProfileStackNavigator = () => {
         name={ROUTES.PROFILE_MAIN}
         component={ProfileMainScreen}
         initialParams={{ hasBackButton: true }}
+        options={{
+          headerShown: false
+        }}
       />
       <Stack.Screen
         options={{

diff --git a/ts/navigation/TabNavigator.tsx b/ts/navigation/TabNavigator.tsx
@@ -4,7 +4,6 @@ import * as React from "react";
 import { StyleSheet } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { IOColors } from "@pagopa/io-app-design-system";
-import { useNavigation } from "@react-navigation/native";
 import { makeFontStyleObject } from "../components/core/fonts";
 import LoadingSpinnerOverlay from "../components/LoadingSpinnerOverlay";
 import { TabIconComponent } from "../components/ui/TabIconComponent";
@@ -18,7 +17,6 @@ import { StartupStatusEnum, isStartupLoaded } from "../store/reducers/startup";
 import variables from "../theme/variables";
 import { itWalletEnabled } from "../config";
 import ItwHomeScreen from "../features/it-wallet/screens/ItwHomeScreen";
-import { AppParamsList, IOStackNavigationProp } from "./params/AppParamsList";
 import { MainTabParamsList } from "./params/MainTabParamsList";
 import ROUTES from "./routes";
 import { AppParamsList, IOStackNavigationProp } from "./params/AppParamsList";
@@ -121,7 +119,7 @@ export const MainTabNavigator = () => {
             }}
           />
         )}
-        {itWalletEnabled && (
+        {isDesignSystemEnabled && (
           <Tab.Screen
             name={ROUTES.BARCODE_SCAN}
             component={EmptyComponent}
@@ -163,29 +161,6 @@ export const MainTabNavigator = () => {
             )
           }}
         />
-        {isDesignSystemEnabled && (
-          <Tab.Screen
-            name={ROUTES.BARCODE_SCAN}
-            component={EmptyComponent}
-            listeners={{
-              tabPress: ({ preventDefault }) => {
-                preventDefault();
-                navigateToBarcodeScanScreen();
-              }
-            }}
-            options={{
-              title: I18n.t("global.navigator.scan"),
-              tabBarIcon: ({ color, focused }) => (
-                <TabIconComponent
-                  iconName={"navScan"}
-                  iconNameFocused={"navScan"}
-                  color={color}
-                  focused={focused}
-                />
-              )
-            }}
-          />
-        )}
         <Tab.Screen
           name={ROUTES.SERVICES_HOME}
           component={ServicesHomeScreen}

diff --git a/ts/sagas/startup.ts b/ts/sagas/startup.ts
@@ -104,7 +104,6 @@ import {
   isPnEnabledSelector
 } from "../store/reducers/backendStatus";
 import { refreshSessionToken } from "../features/fastLogin/store/actions/tokenRefreshActions";
-import { enableWhatsNewCheck } from "../features/whatsnew/store/actions";
 import { watchItwSaga } from "../features/it-wallet/saga";
 import { itwLifecycleIsValidSelector } from "../features/it-wallet/store/reducers/itwLifecycleReducer";
 import { itwDecodePid } from "../features/it-wallet/store/actions/itwCredentialsActions";

diff --git a/ts/screens/messages/MessagesHomeScreen.tsx b/ts/screens/messages/MessagesHomeScreen.tsx
@@ -43,7 +43,6 @@ import {
 } from "../../utils/accessibility";
 import { useOnFirstRender } from "../../utils/hooks/useOnFirstRender";
 import { showToast } from "../../utils/showToast";
-import { useWhatsNew } from "../../features/whatsnew/hook/useWhatsNew";
 
 import ROUTES from "../../navigation/routes";
 import { ScreenContentHeader } from "../../components/screens/ScreenContentHeader";
@@ -74,8 +73,6 @@ const MessagesHomeScreen = ({
   latestMessageOperation
 }: Props) => {
   const needsMigration = Object.keys(messagesStatus).length > 0;
-
-  const { checkToShowWhatsNew, autoResizableBottomSheet } = useWhatsNew();
   const navigation = useNavigation();
 
   useOnFirstRender(() => {