From 4c91e1f708d9b9986febe8e47394cf857a38d30b Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Fri, 15 Sep 2023 10:48:41 +0800
Subject: [PATCH 1/5] use border color instead of old midtone (green700) for
 future theme support

---
 src/components/TabSelector/TabSelector.js             | 4 ++--
 src/pages/settings/Profile/CustomStatus/StatusPage.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/TabSelector/TabSelector.js b/src/components/TabSelector/TabSelector.js
index e1f8927bcb9b..3c69da78b860 100644
--- a/src/components/TabSelector/TabSelector.js
+++ b/src/components/TabSelector/TabSelector.js
@@ -79,10 +79,10 @@ const getBackgroundColor = (position, routesLength, tabIndex) => {
 
         return position.interpolate({
             inputRange,
-            outputRange: _.map(inputRange, (i) => (i === tabIndex ? themeColors.midtone : themeColors.appBG)),
+            outputRange: _.map(inputRange, (i) => (i === tabIndex ? themeColors.border : themeColors.appBG)),
         });
     }
-    return themeColors.midtone;
+    return themeColors.border;
 };
 
 function TabSelector({state, navigation, onTabPress, position}) {
diff --git a/src/pages/settings/Profile/CustomStatus/StatusPage.js b/src/pages/settings/Profile/CustomStatus/StatusPage.js
index 0d7e1c09454d..1b3788818a9e 100644
--- a/src/pages/settings/Profile/CustomStatus/StatusPage.js
+++ b/src/pages/settings/Profile/CustomStatus/StatusPage.js
@@ -68,7 +68,7 @@ function StatusPage({draftStatus, currentUserPersonalDetails}) {
         <StaticHeaderPageLayout
             title={localize.translate('statusPage.status')}
             onBackButtonPress={navigateBackToSettingsPage}
-            backgroundColor={themeColors.midtone}
+            backgroundColor={themeColors.border}
             image={MobileBackgroundImage}
             footer={footerComponent}
         >

From ee0b6fa76991d3fecc756780146e6477bc0e0250 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Fri, 15 Sep 2023 11:01:28 +0800
Subject: [PATCH 2/5] use page pattern for status

---
 src/pages/settings/Profile/CustomStatus/StatusPage.js | 2 +-
 src/styles/themes/default.js                          | 1 +
 src/styles/themes/light.js                            | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/settings/Profile/CustomStatus/StatusPage.js b/src/pages/settings/Profile/CustomStatus/StatusPage.js
index 1b3788818a9e..f178b25fd0fb 100644
--- a/src/pages/settings/Profile/CustomStatus/StatusPage.js
+++ b/src/pages/settings/Profile/CustomStatus/StatusPage.js
@@ -68,7 +68,7 @@ function StatusPage({draftStatus, currentUserPersonalDetails}) {
         <StaticHeaderPageLayout
             title={localize.translate('statusPage.status')}
             onBackButtonPress={navigateBackToSettingsPage}
-            backgroundColor={themeColors.border}
+            backgroundColor={themeColors.PAGE_BACKGROUND_COLORS[ROUTES.SETTINGS_STATUS]}
             image={MobileBackgroundImage}
             footer={footerComponent}
         >
diff --git a/src/styles/themes/default.js b/src/styles/themes/default.js
index 7c43e140f0b1..c101a668666b 100644
--- a/src/styles/themes/default.js
+++ b/src/styles/themes/default.js
@@ -88,6 +88,7 @@ darkTheme.PAGE_BACKGROUND_COLORS = {
     [SCREENS.HOME]: darkTheme.sidebar,
     [SCREENS.SETTINGS.PREFERENCES]: colors.blue500,
     [SCREENS.SETTINGS.WORKSPACES]: colors.pink800,
+    [ROUTES.SETTINGS_STATUS]: colors.green700,
     [ROUTES.I_KNOW_A_TEACHER]: colors.tangerine800,
     [ROUTES.SETTINGS_SECURITY]: colors.ice500,
 };
diff --git a/src/styles/themes/light.js b/src/styles/themes/light.js
index 7961403fbdf0..1a945cb84913 100644
--- a/src/styles/themes/light.js
+++ b/src/styles/themes/light.js
@@ -87,6 +87,7 @@ lightTheme.PAGE_BACKGROUND_COLORS = {
     [SCREENS.HOME]: lightTheme.sidebar,
     [SCREENS.SETTINGS.PREFERENCES]: colors.blue500,
     [SCREENS.SETTINGS.WORKSPACES]: colors.pink800,
+    [ROUTES.SETTINGS_STATUS]: colors.green700,
     [ROUTES.I_KNOW_A_TEACHER]: colors.tangerine800,
     [ROUTES.SETTINGS_SECURITY]: colors.ice500,
 };

From 6682d2ac538554d316d49d88661ca7f36121d33f Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Fri, 15 Sep 2023 11:19:00 +0800
Subject: [PATCH 3/5] error dot should be red

---
 src/components/FormHelpMessage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/FormHelpMessage.js b/src/components/FormHelpMessage.js
index 39242511937d..f7366f8dfef6 100644
--- a/src/components/FormHelpMessage.js
+++ b/src/components/FormHelpMessage.js
@@ -42,7 +42,7 @@ function FormHelpMessage(props) {
             {props.isError && (
                 <Icon
                     src={Expensicons.DotIndicator}
-                    fill={themeColors.success}
+                    fill={themeColors.danger}
                 />
             )}
             <View style={[styles.flex1, props.isError && styles.ml2]}>

From 364b1bb3831a5059dbe84d6b9b8b03c03e57d709 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Fri, 15 Sep 2023 11:21:09 +0800
Subject: [PATCH 4/5] Remove non-used key

---
 src/pages/ReimbursementAccount/BankAccountStep.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/ReimbursementAccount/BankAccountStep.js b/src/pages/ReimbursementAccount/BankAccountStep.js
index 147e0cb76932..b513b1443d5a 100644
--- a/src/pages/ReimbursementAccount/BankAccountStep.js
+++ b/src/pages/ReimbursementAccount/BankAccountStep.js
@@ -164,7 +164,7 @@ function BankAccountStep(props) {
                             <View style={[styles.ml1]}>
                                 <Icon
                                     src={Expensicons.Lock}
-                                    fill={themeColors.BRAND_COLORS.blue400}
+                                    fill={themeColors.heroCard}
                                 />
                             </View>
                         </PressableWithoutFeedback>

From 67913fe3f05c4ba6ea3a730b85d5a1ae9e5f4d52 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Fri, 15 Sep 2023 11:27:24 +0800
Subject: [PATCH 5/5] use link color to match text

---
 src/pages/ReimbursementAccount/BankAccountStep.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/ReimbursementAccount/BankAccountStep.js b/src/pages/ReimbursementAccount/BankAccountStep.js
index b513b1443d5a..74482ef612ed 100644
--- a/src/pages/ReimbursementAccount/BankAccountStep.js
+++ b/src/pages/ReimbursementAccount/BankAccountStep.js
@@ -164,7 +164,7 @@ function BankAccountStep(props) {
                             <View style={[styles.ml1]}>
                                 <Icon
                                     src={Expensicons.Lock}
-                                    fill={themeColors.heroCard}
+                                    fill={themeColors.link}
                                 />
                             </View>
                         </PressableWithoutFeedback>