Skip to content

Commit

Permalink
Merge pull request #12844 from Expensify/OSBotify-cherry-pick-staging…
Browse files Browse the repository at this point in the history
…-12829

🍒 Cherry pick PR #12829 to staging 🍒
  • Loading branch information
OSBotify authored Nov 17, 2022
2 parents e10ee76 + 327300c commit bf7c2ff
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.2.29.3</string>
<string>1.2.29.4</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensifyTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.2.29.3</string>
<string>1.2.29.4</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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.",
Expand Down
6 changes: 3 additions & 3 deletions src/styles/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ const styles = {

buttonDropdown: {
borderLeftWidth: 1,
borderColor: themeColors.text,
borderColor: themeColors.textLight,
},

noRightBorderRadius: {
Expand Down Expand Up @@ -480,11 +480,11 @@ const styles = {
},

buttonSuccessText: {
color: themeColors.text,
color: themeColors.textLight,
},

buttonDangerText: {
color: themeColors.text,
color: themeColors.textLight,
},

hoveredComponentBG: {
Expand Down
2 changes: 1 addition & 1 deletion src/styles/themes/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down

0 comments on commit bf7c2ff

Please sign in to comment.