From 52be13b1ea7c548e7f2a13ea05a68be0cd2f76d0 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Tue, 29 Aug 2023 15:23:07 +0800
Subject: [PATCH 1/4] fix sign in top content scroll conflict with the page

---
 src/pages/signin/SignInPageLayout/SignInPageContent.js | 5 ++++-
 src/pages/signin/SignInPageLayout/index.js             | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/signin/SignInPageLayout/SignInPageContent.js b/src/pages/signin/SignInPageLayout/SignInPageContent.js
index ea069cac2d92..8763966d9027 100755
--- a/src/pages/signin/SignInPageLayout/SignInPageContent.js
+++ b/src/pages/signin/SignInPageLayout/SignInPageContent.js
@@ -26,6 +26,9 @@ const propTypes = {
      * on form type (for example. sign in) and small vs large screens */
     welcomeHeader: PropTypes.string.isRequired,
 
+    /** Whether to show the sign in content in a small screen style */
+    shouldShowSmallScreen: PropTypes.bool.isRequired,
+
     /** Whether to show welcome text on a particular page */
     shouldShowWelcomeText: PropTypes.bool.isRequired,
 
@@ -41,7 +44,7 @@ function SignInPageContent(props) {
         <ScrollView
             contentContainerStyle={[styles.flex1, styles.signInPageLeftContainer]}
             keyboardShouldPersistTaps="handled"
-            style={[!props.isSmallScreenWidth && styles.signInPageLeftContainerWide, styles.flex1]}
+            style={[!props.isSmallScreenWidth && styles.signInPageLeftContainerWide, styles.flex1, props.shouldShowSmallScreen && styles.overflowHidden]}
         >
             <View style={[styles.flex1, styles.alignSelfCenter, styles.signInPageWelcomeFormContainer]}>
                 {/* This empty view creates margin on the top of the sign in form which will shrink and grow depending on if the keyboard is open or not */}
diff --git a/src/pages/signin/SignInPageLayout/index.js b/src/pages/signin/SignInPageLayout/index.js
index 13c8c1d9ab07..1bdba5487d08 100644
--- a/src/pages/signin/SignInPageLayout/index.js
+++ b/src/pages/signin/SignInPageLayout/index.js
@@ -94,6 +94,7 @@ function SignInPageLayout(props) {
                     <SignInPageContent
                         welcomeHeader={props.welcomeHeader}
                         welcomeText={props.welcomeText}
+                        shouldShowSmallScreen={false}
                         shouldShowWelcomeText={props.shouldShowWelcomeText}
                         shouldShowWelcomeHeader={props.shouldShowWelcomeHeader}
                     >
@@ -149,6 +150,7 @@ function SignInPageLayout(props) {
                         <SignInPageContent
                             welcomeHeader={props.welcomeHeader}
                             welcomeText={props.welcomeText}
+                            shouldShowSmallScreen
                             shouldShowWelcomeText={props.shouldShowWelcomeText}
                             shouldShowWelcomeHeader={props.shouldShowWelcomeHeader}
                         >

From 25bf1ba599a1626bf10888d579a363a653ae2408 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Tue, 29 Aug 2023 21:05:39 +0800
Subject: [PATCH 2/4] Move scrollview to the appropriate place

---
 .../SignInPageLayout/SignInPageContent.js     | 11 ++--------
 src/pages/signin/SignInPageLayout/index.js    | 21 +++++++++++--------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/pages/signin/SignInPageLayout/SignInPageContent.js b/src/pages/signin/SignInPageLayout/SignInPageContent.js
index 8763966d9027..5a01a34bdbb8 100755
--- a/src/pages/signin/SignInPageLayout/SignInPageContent.js
+++ b/src/pages/signin/SignInPageLayout/SignInPageContent.js
@@ -26,9 +26,6 @@ const propTypes = {
      * on form type (for example. sign in) and small vs large screens */
     welcomeHeader: PropTypes.string.isRequired,
 
-    /** Whether to show the sign in content in a small screen style */
-    shouldShowSmallScreen: PropTypes.bool.isRequired,
-
     /** Whether to show welcome text on a particular page */
     shouldShowWelcomeText: PropTypes.bool.isRequired,
 
@@ -41,11 +38,7 @@ const propTypes = {
 
 function SignInPageContent(props) {
     return (
-        <ScrollView
-            contentContainerStyle={[styles.flex1, styles.signInPageLeftContainer]}
-            keyboardShouldPersistTaps="handled"
-            style={[!props.isSmallScreenWidth && styles.signInPageLeftContainerWide, styles.flex1, props.shouldShowSmallScreen && styles.overflowHidden]}
-        >
+        <View style={[styles.flex1, styles.signInPageLeftContainer]}>
             <View style={[styles.flex1, styles.alignSelfCenter, styles.signInPageWelcomeFormContainer]}>
                 {/* This empty view creates margin on the top of the sign in form which will shrink and grow depending on if the keyboard is open or not */}
                 <View style={[styles.flexGrow1, props.isSmallScreenWidth ? styles.signInPageContentTopSpacerSmallScreens : styles.signInPageContentTopSpacer]} />
@@ -85,7 +78,7 @@ function SignInPageContent(props) {
                     ) : null}
                 </View>
             </View>
-        </ScrollView>
+        </View>
     );
 }
 
diff --git a/src/pages/signin/SignInPageLayout/index.js b/src/pages/signin/SignInPageLayout/index.js
index 1bdba5487d08..a76f890438da 100644
--- a/src/pages/signin/SignInPageLayout/index.js
+++ b/src/pages/signin/SignInPageLayout/index.js
@@ -91,15 +91,19 @@ function SignInPageLayout(props) {
         <View style={containerStyles}>
             {!shouldShowSmallScreen ? (
                 <View style={contentContainerStyles}>
-                    <SignInPageContent
-                        welcomeHeader={props.welcomeHeader}
-                        welcomeText={props.welcomeText}
-                        shouldShowSmallScreen={false}
-                        shouldShowWelcomeText={props.shouldShowWelcomeText}
-                        shouldShowWelcomeHeader={props.shouldShowWelcomeHeader}
+                    <ScrollView
+                        keyboardShouldPersistTaps="handled"
+                        style={[styles.signInPageLeftContainerWide, styles.flex1]}
                     >
-                        {props.children}
-                    </SignInPageContent>
+                        <SignInPageContent
+                            welcomeHeader={props.welcomeHeader}
+                            welcomeText={props.welcomeText}
+                            shouldShowWelcomeText={props.shouldShowWelcomeText}
+                            shouldShowWelcomeHeader={props.shouldShowWelcomeHeader}
+                        >
+                            {props.children}
+                        </SignInPageContent>
+                    </ScrollView>
                     <ScrollView
                         style={[styles.flex1, StyleUtils.getBackgroundColorStyle(themeColors.signInPage)]}
                         contentContainerStyle={[styles.flex1]}
@@ -150,7 +154,6 @@ function SignInPageLayout(props) {
                         <SignInPageContent
                             welcomeHeader={props.welcomeHeader}
                             welcomeText={props.welcomeText}
-                            shouldShowSmallScreen
                             shouldShowWelcomeText={props.shouldShowWelcomeText}
                             shouldShowWelcomeHeader={props.shouldShowWelcomeHeader}
                         >

From de5428856f63e9068c7ca472760748b3fdf76560 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Tue, 29 Aug 2023 21:09:20 +0800
Subject: [PATCH 3/4] add back flex 1 content container style

---
 src/pages/signin/SignInPageLayout/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/signin/SignInPageLayout/index.js b/src/pages/signin/SignInPageLayout/index.js
index a76f890438da..52a8875a8e04 100644
--- a/src/pages/signin/SignInPageLayout/index.js
+++ b/src/pages/signin/SignInPageLayout/index.js
@@ -94,6 +94,7 @@ function SignInPageLayout(props) {
                     <ScrollView
                         keyboardShouldPersistTaps="handled"
                         style={[styles.signInPageLeftContainerWide, styles.flex1]}
+                        contentContainerStyle={[styles.flex1]}
                     >
                         <SignInPageContent
                             welcomeHeader={props.welcomeHeader}

From 99f818cedac8636d81c602579a59a3f530b42e51 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Tue, 29 Aug 2023 21:11:49 +0800
Subject: [PATCH 4/4] remove unused import

---
 src/pages/signin/SignInPageLayout/SignInPageContent.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/signin/SignInPageLayout/SignInPageContent.js b/src/pages/signin/SignInPageLayout/SignInPageContent.js
index 5a01a34bdbb8..571af6a640b7 100755
--- a/src/pages/signin/SignInPageLayout/SignInPageContent.js
+++ b/src/pages/signin/SignInPageLayout/SignInPageContent.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import {View, ScrollView} from 'react-native';
+import {View} from 'react-native';
 import PropTypes from 'prop-types';
 import {withSafeAreaInsets} from 'react-native-safe-area-context';
 import styles from '../../../styles/styles';