From 3699b61da3000b05b62984f0b8220a99d1948f1a Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 12 Aug 2021 19:13:24 -0700
Subject: [PATCH 1/2] Merge pull request #4642 from
 Expensify/version-BUILD-95dfa6f4f0f159fafb7035d039d3bf27c1e6f944

(cherry picked from commit dd9a0ed80d8e587ea75a5b1a18bc8559771beb9d)
---
 android/app/build.gradle          | 4 ++--
 ios/ExpensifyCash/Info.plist      | 2 +-
 ios/ExpensifyCashTests/Info.plist | 2 +-
 package-lock.json                 | 2 +-
 package.json                      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 1dc80b8f77a5..59904cfa80a8 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001008504
-        versionName "1.0.85-4"
+        versionCode 1001008505
+        versionName "1.0.85-5"
     }
     splits {
         abi {
diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist
index bbaa1f847e2c..f65610ba14aa 100644
--- a/ios/ExpensifyCash/Info.plist
+++ b/ios/ExpensifyCash/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.85.4</string>
+	<string>1.0.85.5</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
index 10f9dabd76b5..1f1945216456 100644
--- a/ios/ExpensifyCashTests/Info.plist
+++ b/ios/ExpensifyCashTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.85.4</string>
+	<string>1.0.85.5</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 97af61b17c90..f3fe5e58bd20 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.0.85-4",
+  "version": "1.0.85-5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a911d509473c..0eb58fb7eef4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.0.85-4",
+  "version": "1.0.85-5",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From e86963858cf8775d53b5a2f0e1f86461f375bb01 Mon Sep 17 00:00:00 2001
From: Rory Abraham <47436092+roryabraham@users.noreply.github.com>
Date: Thu, 12 Aug 2021 19:11:29 -0700
Subject: [PATCH 2/2] Merge pull request #4641 from
 studio-504/change-picker-value-color

Change picker value color

(cherry picked from commit 95dfa6f4f0f159fafb7035d039d3bf27c1e6f944)
---
 src/styles/styles.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/styles/styles.js b/src/styles/styles.js
index aa5acafba932..876b58cae1fa 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -18,6 +18,7 @@ import codeStyles from './codeStyles';
 
 const expensiPicker = {
     backgroundColor: 'transparent',
+    color: themeColors.text,
     fontFamily: fontFamily.GTA,
     fontSize: variables.fontSizeNormal,
     paddingHorizontal: 12,