From 91deb3561fcb629044f36b0ab47ee77c81c8381a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Metehan=20=C3=96zyurt?= <bmmozyurt@gmail.com>
Date: Sat, 30 Jul 2022 10:03:58 +0300
Subject: [PATCH 1/5] Login container center issue fixed

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

diff --git a/src/pages/signin/SignInPageLayout/SignInPageContent.js b/src/pages/signin/SignInPageLayout/SignInPageContent.js
index 4006d65a0093..b761ecd69ca2 100755
--- a/src/pages/signin/SignInPageLayout/SignInPageContent.js
+++ b/src/pages/signin/SignInPageLayout/SignInPageContent.js
@@ -56,7 +56,8 @@ const SignInPageContent = props => (
                 behavior="position"
                 contentContainerStyle={[
                     props.isSmallScreenWidth ? styles.signInPageNarrowContentMargin : {},
-                    !props.isMediumScreenWidth ? styles.signInPageWideLeftContentMargin : {},
+                    !props.isMediumScreenWidth
+                    || (props.isMediumScreenWidth && props.windowHeight < variables.minHeightToShowGraphics) ? styles.signInPageWideLeftContentMargin : {},
                     styles.mb3,
                     StyleUtils.getModalPaddingStyles({
                         shouldAddBottomSafeAreaPadding: true,

From 30d8dcbfb4b8cb9ac52565e4522e1c8f3844dd21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Metehan=20=C3=96zyurt?= <bmmozyurt@gmail.com>
Date: Wed, 3 Aug 2022 09:05:59 +0300
Subject: [PATCH 2/5] code has been simplified

---
 .../SignInPageLayout/SignInPageContent.js     |  4 +---
 src/styles/StyleUtils.js                      | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/pages/signin/SignInPageLayout/SignInPageContent.js b/src/pages/signin/SignInPageLayout/SignInPageContent.js
index b761ecd69ca2..97e42ea4b7d2 100755
--- a/src/pages/signin/SignInPageLayout/SignInPageContent.js
+++ b/src/pages/signin/SignInPageLayout/SignInPageContent.js
@@ -55,9 +55,7 @@ const SignInPageContent = props => (
             <LoginKeyboardAvoidingView
                 behavior="position"
                 contentContainerStyle={[
-                    props.isSmallScreenWidth ? styles.signInPageNarrowContentMargin : {},
-                    !props.isMediumScreenWidth
-                    || (props.isMediumScreenWidth && props.windowHeight < variables.minHeightToShowGraphics) ? styles.signInPageWideLeftContentMargin : {},
+                    StyleUtils.getLoginContainerMarginStyles(props),
                     styles.mb3,
                     StyleUtils.getModalPaddingStyles({
                         shouldAddBottomSafeAreaPadding: true,
diff --git a/src/styles/StyleUtils.js b/src/styles/StyleUtils.js
index a34fed355b4b..93ceef7c6abe 100644
--- a/src/styles/StyleUtils.js
+++ b/src/styles/StyleUtils.js
@@ -319,6 +319,26 @@ function getModalPaddingStyles({
     };
 }
 
+/**
+ * Gives the margin style for login container
+ *
+ * @param {Object} params
+ * @returns {Object}
+ */
+function getLoginContainerMarginStyles({
+    isSmallScreenWidth,
+    isMediumScreenWidth,
+    windowHeight,
+}) {
+    if (isSmallScreenWidth) {
+        return styles.signInPageNarrowContentMargin;
+    }
+    if (!isMediumScreenWidth || (isMediumScreenWidth && windowHeight < variables.minHeightToShowGraphics)) {
+        return styles.signInPageWideLeftContentMargin;
+    }
+    return {};
+}
+
 /**
  * Takes fontStyle and fontWeight and returns the correct fontFamily
  *
@@ -490,6 +510,7 @@ export {
     getAnimatedFABStyle,
     getWidthAndHeightStyle,
     getModalPaddingStyles,
+    getLoginContainerMarginStyles,
     getFontFamilyMonospace,
     getEmojiPickerStyle,
     getLoginPagePromoStyle,

From 5eb6f4a983748d528c88ca722400866c5acdcbc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Metehan=20=C3=96zyurt?= <bmmozyurt@gmail.com>
Date: Fri, 5 Aug 2022 22:38:29 +0300
Subject: [PATCH 3/5] logic bug fixed

---
 src/styles/StyleUtils.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/styles/StyleUtils.js b/src/styles/StyleUtils.js
index 93ceef7c6abe..1e7e5aeabdf4 100644
--- a/src/styles/StyleUtils.js
+++ b/src/styles/StyleUtils.js
@@ -330,13 +330,14 @@ function getLoginContainerMarginStyles({
     isMediumScreenWidth,
     windowHeight,
 }) {
+    let marginStyle = {};
     if (isSmallScreenWidth) {
-        return styles.signInPageNarrowContentMargin;
+        marginStyle = {...marginStyle, ...styles.signInPageNarrowContentMargin};
     }
     if (!isMediumScreenWidth || (isMediumScreenWidth && windowHeight < variables.minHeightToShowGraphics)) {
-        return styles.signInPageWideLeftContentMargin;
+        marginStyle = {...marginStyle, ...styles.signInPageWideLeftContentMargin};
     }
-    return {};
+    return marginStyle;
 }
 
 /**

From 2dbe4fb6aa8eb10e99299372bec75e4e036eb855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Metehan=20=C3=96zyurt?= <bmmozyurt@gmail.com>
Date: Mon, 8 Aug 2022 22:43:39 +0300
Subject: [PATCH 4/5] code reverted

---
 .../SignInPageLayout/SignInPageContent.js     |  3 ++-
 src/styles/StyleUtils.js                      | 22 -------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/pages/signin/SignInPageLayout/SignInPageContent.js b/src/pages/signin/SignInPageLayout/SignInPageContent.js
index 97e42ea4b7d2..002ef6b76b7e 100755
--- a/src/pages/signin/SignInPageLayout/SignInPageContent.js
+++ b/src/pages/signin/SignInPageLayout/SignInPageContent.js
@@ -55,7 +55,8 @@ const SignInPageContent = props => (
             <LoginKeyboardAvoidingView
                 behavior="position"
                 contentContainerStyle={[
-                    StyleUtils.getLoginContainerMarginStyles(props),
+                    props.isSmallScreenWidth ? styles.signInPageNarrowContentMargin : {},
+                    !props.isMediumScreenWidth || (props.isMediumScreenWidth && props.windowHeight < variables.minHeightToShowGraphics) ? styles.signInPageWideLeftContentMargin : {},
                     styles.mb3,
                     StyleUtils.getModalPaddingStyles({
                         shouldAddBottomSafeAreaPadding: true,
diff --git a/src/styles/StyleUtils.js b/src/styles/StyleUtils.js
index 1e7e5aeabdf4..a34fed355b4b 100644
--- a/src/styles/StyleUtils.js
+++ b/src/styles/StyleUtils.js
@@ -319,27 +319,6 @@ function getModalPaddingStyles({
     };
 }
 
-/**
- * Gives the margin style for login container
- *
- * @param {Object} params
- * @returns {Object}
- */
-function getLoginContainerMarginStyles({
-    isSmallScreenWidth,
-    isMediumScreenWidth,
-    windowHeight,
-}) {
-    let marginStyle = {};
-    if (isSmallScreenWidth) {
-        marginStyle = {...marginStyle, ...styles.signInPageNarrowContentMargin};
-    }
-    if (!isMediumScreenWidth || (isMediumScreenWidth && windowHeight < variables.minHeightToShowGraphics)) {
-        marginStyle = {...marginStyle, ...styles.signInPageWideLeftContentMargin};
-    }
-    return marginStyle;
-}
-
 /**
  * Takes fontStyle and fontWeight and returns the correct fontFamily
  *
@@ -511,7 +490,6 @@ export {
     getAnimatedFABStyle,
     getWidthAndHeightStyle,
     getModalPaddingStyles,
-    getLoginContainerMarginStyles,
     getFontFamilyMonospace,
     getEmojiPickerStyle,
     getLoginPagePromoStyle,

From 80bd6dea8aec75a2d843f1fbb57469acdba703ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Metehan=20=C3=96zyurt?= <bmmozyurt@gmail.com>
Date: Wed, 10 Aug 2022 08:59:32 +0300
Subject: [PATCH 5/5] conflicts resolved

---
 .../SignInPageLayout/SignInPageContent.js     | 24 +------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/src/pages/signin/SignInPageLayout/SignInPageContent.js b/src/pages/signin/SignInPageLayout/SignInPageContent.js
index 81b08330fcf0..1bbfc1838ee7 100755
--- a/src/pages/signin/SignInPageLayout/SignInPageContent.js
+++ b/src/pages/signin/SignInPageLayout/SignInPageContent.js
@@ -46,33 +46,11 @@ const SignInPageContent = props => (
             !props.isSmallScreenWidth && styles.ph6,
         ]}
     >
-<<<<<<< HEAD
-        <SignInPageForm style={[
-            styles.flex1,
-            styles.alignSelfStretch,
-            props.isSmallScreenWidth && styles.signInPageNarrowContentContainer,
-            props.isSmallScreenWidth ? styles.ph5 : styles.ph4,
-        ]}
-        >
-            <LoginKeyboardAvoidingView
-                behavior="position"
-                contentContainerStyle={[
-                    props.isSmallScreenWidth ? styles.signInPageNarrowContentMargin : {},
-                    !props.isMediumScreenWidth || (props.isMediumScreenWidth && props.windowHeight < variables.minHeightToShowGraphics) ? styles.signInPageWideLeftContentMargin : {},
-                    styles.mb3,
-                    StyleUtils.getModalPaddingStyles({
-                        shouldAddBottomSafeAreaPadding: true,
-                        modalContainerStylePaddingBottom: 20,
-                        safeAreaPaddingBottom: props.insets.bottom,
-                    }),
-                ]}
-=======
         <View style={[styles.flex1, styles.flexRow]}>
             <View style={[
                 styles.flex1,
                 props.isSmallScreenWidth && styles.signInPageNarrowContentContainer,
             ]}
->>>>>>> f5f076a13bb4a991dbeaf32a8f7a7b0625e8a3cc
             >
                 <SignInPageForm style={[
                     styles.flex1,
@@ -84,7 +62,7 @@ const SignInPageContent = props => (
                         behavior="position"
                         contentContainerStyle={[
                             props.isSmallScreenWidth ? styles.signInPageNarrowContentMargin : {},
-                            !props.isMediumScreenWidth ? styles.signInPageWideLeftContentMargin : {},
+                            !props.isMediumScreenWidth || (props.isMediumScreenWidth && props.windowHeight < variables.minHeightToShowGraphics) ? styles.signInPageWideLeftContentMargin : {},
                             styles.mb3,
                             StyleUtils.getModalPaddingStyles({
                                 shouldAddBottomSafeAreaPadding: true,