Merge branch 'main' into dev/dehli/fix-6057

build-system-tests/scripts/mega-app-install.sh

@@ -106,7 +106,15 @@ if [ "$PKG_MANAGER" == 'yarn' ]; then
 else
     if [[ "$FRAMEWORK" == "react-native" ]]; then
         # react-native-safe-area-context v5.0.0+ does not support RN 0.74 and lower
-        DEPENDENCIES="$TAGGED_UI_FRAMEWORK @aws-amplify/react-native aws-amplify react-native-safe-area-context@^4.2.5 @react-native-community/netinfo @react-native-async-storage/async-storage react-native-get-random-values react-native-url-polyfill"
+        DEPENDENCIES="$TAGGED_UI_FRAMEWORK @aws-amplify/react-native aws-amplify @react-native-community/netinfo @react-native-async-storage/async-storage react-native-get-random-values react-native-url-polyfill"
+
+        # react-native-safe-area-context v5 is required for >= 0.78
+        if [[ "$FRAMEWORK_VERSION" == "latest" || $FRAMEWORK_VERSION > "0.77" ]]; then
+            DEPENDENCIES="$DEPENDENCIES react-native-safe-area-context@^5.2.0 --force"
+        else
+            DEPENDENCIES="$DEPENDENCIES react-native-safe-area-context@^4.2.5"
+        fi;
+
         echo "npm install $DEPENDENCIES"
         install_dependencies_with_retries npm "$DEPENDENCIES"
         if [[ "$BUILD_TOOL" == "expo" ]]; then

packages/e2e/features/ui/components/authenticator/sign-in-with-phone.feature

@@ -56,9 +56,9 @@ Feature: Sign In with Phone Number
     When I update my country code from "+82" to "+20"
     Then I type my "phone number" with status "UNCONFIRMED"
     Then I type my password
-    Then I click the "Sign in" button
     Then I intercept '{ "headers": { "X-Amz-Target": "AWSCognitoIdentityProviderService.InitiateAuth" } }' with error fixture "user-not-confirmed-exception"
     Then I intercept '{ "headers": { "X-Amz-Target": "AWSCognitoIdentityProviderService.ResendConfirmationCode" } }' with fixture "resend-confirmation-code-email"
+    Then I click the "Sign in" button
     Then I see "Confirmation Code"
 
   @angular @react @vue @react-native
@@ -89,9 +89,9 @@ Feature: Sign In with Phone Number
 
   @angular @react @vue
   Scenario: Phone number field autocompletes username
-  
-  On sign in form, autocomplete prefers usage of username instead of phone number. 
-  See https://www.chromium.org/developers/design-documents/form-styles-that-chromium-understands/.
+
+    On sign in form, autocomplete prefers usage of username instead of phone number.
+    See https://www.chromium.org/developers/design-documents/form-styles-that-chromium-understands/.
 
     Then "Phone Number" field autocompletes "username"