From 858a6c276e10ed2edb51f8d7db4f62b7e3ba4e88 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Mon, 26 Jul 2021 19:11:21 -0700 Subject: [PATCH 1/2] Merge pull request #4244 from Expensify/version-BUILD-dbf4579a91d6f42fe5f8002bd445bc25dfc21806 (cherry picked from commit 06a56abe7f08847c34fd6be73b6bce3b2406e9db) --- 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 f2c0450fd3cf..2d7aa0b46534 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 1001008000 - versionName "1.0.80-0" + versionCode 1001008001 + versionName "1.0.80-1" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index b533a5b493a0..c24b4495add5 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.80.0 + 1.0.80.1 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index d4a2205b9a43..237fd0793fc7 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.80.0 + 1.0.80.1 diff --git a/package-lock.json b/package-lock.json index 593979c5c69a..d093e4575523 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.80-0", + "version": "1.0.80-1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 690fd5f82d84..166318fe73bf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.80-0", + "version": "1.0.80-1", "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 d29e304c9b81df73c7df42bd6e8bfa5d5953ef21 Mon Sep 17 00:00:00 2001 From: Rory Abraham <47436092+roryabraham@users.noreply.github.com> Date: Mon, 26 Jul 2021 19:09:07 -0700 Subject: [PATCH 2/2] Merge pull request #4243 from helaoutar/bugfix/center_new_expensify_icon_in_about_page_ Web - Settings - Dropdown symbol overlaps with text in the box (cherry picked from commit dbf4579a91d6f42fe5f8002bd445bc25dfc21806) --- src/pages/settings/AboutPage.js | 2 +- src/styles/styles.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/settings/AboutPage.js b/src/pages/settings/AboutPage.js index f0e398209c3a..03706a6d0cdf 100644 --- a/src/pages/settings/AboutPage.js +++ b/src/pages/settings/AboutPage.js @@ -88,7 +88,7 @@ const AboutPage = ({translate, session}) => { > - +