From 4689ca9e3286886ed350e82279ebb46a9a4ca3bb Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Tue, 29 Nov 2022 14:10:43 -0500
Subject: [PATCH 1/2] Merge pull request #13148 from
Expensify/version-BUILD-48FA7A22-EC61-4500-95D2-032DD05601E1
Update version to 1.2.33-3 on main
(cherry picked from commit e646a34c3b14c40853be2b4954f52b29a1289b87)
---
android/app/build.gradle | 4 ++--
ios/NewExpensify/Info.plist | 2 +-
ios/NewExpensifyTests/Info.plist | 2 +-
package-lock.json | 4 ++--
package.json | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 30026fb95db1..9aa1c32b4dcb 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -156,8 +156,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001023302
- versionName "1.2.33-2"
+ versionCode 1001023303
+ versionName "1.2.33-3"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 2a866e20f610..38ceebd01da5 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.2.33.2
+ 1.2.33.3
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index b94c9b0915f3..8bba026d8888 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.2.33.2
+ 1.2.33.3
diff --git a/package-lock.json b/package-lock.json
index 3db4871d1993..a2f5f14fef6f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.2.33-2",
+ "version": "1.2.33-3",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.2.33-2",
+ "version": "1.2.33-3",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index 1baf1fc2c1bc..f450de3391bd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.2.33-2",
+ "version": "1.2.33-3",
"author": "Expensify, Inc.",
"homepage": "https://new.expensify.com",
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
From 3fa4a8441ffcc19d276f398a1f04f4d3637156ab Mon Sep 17 00:00:00 2001
From: Carlos Martins
Date: Tue, 29 Nov 2022 12:05:21 -0700
Subject: [PATCH 2/2] Merge pull request #13142 from
dhairyasenjaliya/DatePickerColorScheme
Dark Picker Icon Colour Scheme Added
(cherry picked from commit 66ab7c077bbcb7a5b9ee42dad4a550c2069bff8f)
---
src/components/DatePicker/styles.css | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/components/DatePicker/styles.css b/src/components/DatePicker/styles.css
index e477dc4c8451..bdf35ec68006 100644
--- a/src/components/DatePicker/styles.css
+++ b/src/components/DatePicker/styles.css
@@ -9,6 +9,7 @@
position: absolute;
right: 12px;
top: 13px;
+ color-scheme: dark;
}
.expensify-datepicker::-webkit-date-and-time-value {
text-align: left;