From b248fb183d6d9dccd2afefd2dfe5be61717543b9 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Thu, 4 May 2023 15:49:02 -0400 Subject: [PATCH 1/2] Merge pull request #18435 from Expensify/version-BUILD-2053B1DE-95F7-4892-A03C-380301B17774 Update version to 1.3.10-3 on main (cherry picked from commit 883163d9e67b12c778309f56121d10a68c468c81) --- 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 381d18fdaa49e..5f5cd2a60c44f 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -106,8 +106,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001031002 - versionName "1.3.10-2" + versionCode 1001031003 + versionName "1.3.10-3" } splits { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index dcf861bdf93e0..adf22a4ee8b09 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.3.10.2 + 1.3.10.3 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index afa3af7ff73f6..1fbf1a32713fa 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.3.10.2 + 1.3.10.3 diff --git a/package-lock.json b/package-lock.json index a56a1723b5010..3e8ad0119d364 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.3.10-2", + "version": "1.3.10-3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.3.10-2", + "version": "1.3.10-3", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 15e5737b00701..cef5b1a4f0dd9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.3.10-2", + "version": "1.3.10-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 59242e35f9ecc40f5b8220a1d8f6c1900460c3cc Mon Sep 17 00:00:00 2001 From: Alexander Mechler Date: Thu, 4 May 2023 12:39:44 -0700 Subject: [PATCH 2/2] Merge pull request #18430 from Expensify/scott-revertFontVariant (cherry picked from commit 9bdc8ef558dfe019b1e9f1703ceed2bd8fa292e6) --- src/styles/styles.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index 613838edeee1a..df2ec6918a12d 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -3018,7 +3018,6 @@ const styles = { fontSize: 13, marginLeft: 4, fontWeight: 'bold', - fontVariant: ['tabular-nums'], }, fontColorReactionLabel: {