From ffdf0b4f25052a331432d5222f8517679e180fb6 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Thu, 17 Nov 2022 16:51:20 -0500 Subject: [PATCH 1/2] Merge pull request #12843 from Expensify/version-BUILD-7C17F1BE-8B2E-4E1B-910C-14F6409AA57F Update version to 1.2.29-4 on main (cherry picked from commit b1e517df990c5c7866f33ea90d8ee4e0a25dc2a2) --- 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 8ac594421746..d53295af34d3 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 1001022903 - versionName "1.2.29-3" + versionCode 1001022904 + versionName "1.2.29-4" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 8f0a8f9945e2..2c00d1744f4b 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.2.29.3 + 1.2.29.4 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 71b969e3801e..80e441e385d5 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.2.29.3 + 1.2.29.4 diff --git a/package-lock.json b/package-lock.json index 16e5184c40fe..3f8ebe6a315d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.2.29-3", + "version": "1.2.29-4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.2.29-3", + "version": "1.2.29-4", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 5838adbff7d4..0c1365375edc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.2.29-3", + "version": "1.2.29-4", "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 327300c41e246f5bb0d590c0c80019f12ee5e08a Mon Sep 17 00:00:00 2001 From: Vit Horacek <36083550+mountiny@users.noreply.github.com> Date: Thu, 17 Nov 2022 21:46:11 +0000 Subject: [PATCH 2/2] Merge pull request #12829 from Expensify/georgia-fix-button [CP Staging] Fix Success / Danger Button Text Color, Fix Growl Colors (cherry picked from commit db2fea4b31a025b3fe7e24fe4909b6262a54b810) --- src/styles/styles.js | 6 +++--- src/styles/themes/default.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index 0d4e97012dec..a66bea2c3629 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -448,7 +448,7 @@ const styles = { buttonDropdown: { borderLeftWidth: 1, - borderColor: themeColors.text, + borderColor: themeColors.textLight, }, noRightBorderRadius: { @@ -480,11 +480,11 @@ const styles = { }, buttonSuccessText: { - color: themeColors.text, + color: themeColors.textLight, }, buttonDangerText: { - color: themeColors.text, + color: themeColors.textLight, }, hoveredComponentBG: { diff --git a/src/styles/themes/default.js b/src/styles/themes/default.js index ec561b881226..648387852f65 100644 --- a/src/styles/themes/default.js +++ b/src/styles/themes/default.js @@ -106,7 +106,7 @@ const oldTheme = { successHover: colors.greenHover, successPressed: colors.greenPressed, transparent: colors.transparent, - inverse: colors.white, + inverse: colors.dark, textLight: colors.white, textDark: colors.dark, };