Merge pull request #60856 from allroundexperts/fix-60828

(cherry picked from commit a329cec)

(CP triggered by AndrewGable)

Author: blimpich

src/pages/OnboardingPersonalDetails/index.native.tsx

@@ -1,8 +1,29 @@
-import React from 'react';
+import {useFocusEffect} from '@react-navigation/native';
+import React, {useCallback} from 'react';
+import {BackHandler} from 'react-native';
 import BaseOnboardingPersonalDetails from './BaseOnboardingPersonalDetails';
 import type {OnboardingPersonalDetailsProps} from './types';
 
 function OnboardingPersonalDetails({...rest}: OnboardingPersonalDetailsProps) {
+    const {index: routeIndex} = rest.navigation.getState();
+
+    // To block android native back button behavior
+    useFocusEffect(
+        useCallback(() => {
+            // We don't want to block the back button if this is not the first route
+            if (routeIndex !== 0) {
+                return;
+            }
+
+            // Return true to indicate that the back button press is handled here
+            const backAction = () => true;
+
+            const backHandler = BackHandler.addEventListener('hardwareBackPress', backAction);
+
+            return () => backHandler.remove();
+        }, [routeIndex]),
+    );
+
     return (
         <BaseOnboardingPersonalDetails
             shouldUseNativeStyles

src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx

@@ -75,7 +75,7 @@ function BaseOnboardingPrivateDomain({shouldUseNativeStyles, route}: BaseOnboard
                 onBackButtonPress={Navigation.goBack}
             />
             <View style={[styles.flex1, onboardingIsMediumOrLargerScreenWidth && styles.mt5, onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5, styles.justifyContentBetween]}>
-                <View>
+                <View style={[styles.flexGrow1, styles.mb5]}>
                     <Text style={styles.textHeadlineH1}>{translate('onboarding.peopleYouMayKnow')}</Text>
                     <Text style={[styles.textAlignLeft, styles.mt5]}>{translate('onboarding.workspaceYouMayJoin', {domain, email})}</Text>
                     <ValidateCodeForm