Merge branch 'master' into upgrade-navigation-v6

ts/features/bonus/cgn/components/detail/CgnUnsubscribe.tsx

@@ -11,6 +11,7 @@ import { isError, isReady } from "../../../../../common/model/RemoteValue";
 import { navigateBack } from "../../../../../store/actions/navigation";
 import { cgnDetails } from "../../store/actions/details";
 import { IOToast } from "../../../../../components/Toast";
+import { skipToastShowingDueToE2ECrash } from "./ToastPatch";
 
 const CgnUnsubscribe = () => {
   const dispatch = useIODispatch();
@@ -38,7 +39,11 @@ const CgnUnsubscribe = () => {
     if (isReady(unsubscriptionStatus)) {
       navigateBack();
       dispatch(cgnDetails.request());
-      IOToast.success(I18n.t("bonus.cgn.activation.deactivate.toast"));
+      // This is needed to prevent a crash while running E2E tests. Showing
+      // the toast causes random crashes upon calling device.reloadReactNative
+      if (!skipToastShowingDueToE2ECrash) {
+        IOToast.success(I18n.t("bonus.cgn.activation.deactivate.toast"));
+      }
     }
     if (isError(unsubscriptionStatus) && !isFirstRender.current) {
       IOToast.error(I18n.t("global.genericError"));

ts/features/bonus/cgn/components/detail/ToastPatch.e2e.ts

@@ -0,0 +1 @@
+export const skipToastShowingDueToE2ECrash = true;

ts/features/bonus/cgn/components/detail/ToastPatch.ts

@@ -0,0 +1 @@
+export const skipToastShowingDueToE2ECrash = false;

ts/features/wallet/onboarding/__e2e__/creditCardOnboarding.e2e.ts

@@ -17,16 +17,12 @@ describe("Credit Card onboarding", () => {
       // Footer, Wallet icon
       await element(by.text(I18n.t("global.navigator.wallet"))).tap();
 
-      await waitFor(
-        element(by.text(I18n.t("wallet.newPaymentMethod.add").toUpperCase()))
-      )
+      await waitFor(element(by.id("walletAddNewPaymentMethodTestId")))
         .toBeVisible()
         .withTimeout(e2eWaitRenderTimeout);
 
       // Button "+ Add"
-      await element(
-        by.text(I18n.t("wallet.newPaymentMethod.add").toUpperCase())
-      ).tap();
+      await element(by.id("walletAddNewPaymentMethodTestId")).tap();
 
       await waitFor(element(by.text(I18n.t("wallet.paymentMethod"))))
         .toBeVisible()

ts/navigation/components/HeaderFirstLevelHandler.tsx

@@ -166,10 +166,12 @@ export const HeaderFirstLevelHandler = () => {
           type: "twoActions",
           firstAction: helpAction,
           backgroundColor: "dark",
+          testID: "wallet-home-header-title",
           secondAction: {
             icon: "add",
             accessibilityLabel: I18n.t("wallet.accessibility.addElement"),
-            onPress: presentWalletHomeHeaderBottomsheet
+            onPress: presentWalletHomeHeaderBottomsheet,
+            testID: "walletAddNewPaymentMethodTestId"
           }
         };
         break;

ts/utils/permission.ts

@@ -11,6 +11,11 @@ export const requestIOPermission = async (
   permission: RNPermissions.Permission,
   rationale?: RNPermissions.Rationale
 ): Promise<boolean> => {
+  // Be aware that some permissions may return "unavailable" event if the library
+  // documents them as supported. One notorious case is the iOS PHOTO_LIBRARY_ADD_ONLY
+  // permission. If such permission is automatically handled by the system upon request
+  // (such as PHOTO_LIBRARY_ADD_ONLY is), then you should not use this function to
+  // check nor to request such permission
   const checkResult = await RNPermissions.check(permission);
   if (checkResult === "granted") {
     return true;
@@ -83,8 +88,10 @@ export const requestSaveToGalleryPermission = async (
       RNPermissions.PERMISSIONS.ANDROID.WRITE_EXTERNAL_STORAGE,
       rationale
     ),
-    ios: requestIOPermission(
-      RNPermissions.PERMISSIONS.IOS.PHOTO_LIBRARY_ADD_ONLY
-    ),
+    // on iOS the permission is handled by adding NSPhotoLibraryAddUsageDescription and NSPhotoLibraryUsageDescription
+    // into the Info.plist file and the permission request is automatically handled by the system when using the
+    // Cameraroll.save method. Asking for the PHOTO_LIBRARY_ADD_ONLY permission results in an "unavailable" response
+    // from the react-native-permissions library (even if the library documentation declares that it is supported) so
+    // it cannot be used to determine the permission status.
     default: Promise.resolve(true)
   });