From 43198335d37fde0d8370bc5134c668e1ff361ea3 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 24 Nov 2022 07:11:44 -0500
Subject: [PATCH 1/2] Merge pull request #12990 from
Expensify/version-BUILD-ED0ABC6A-77C2-4599-BBD8-ECEF9257EFB5
Update version to 1.2.31-3 on main
(cherry picked from commit 97b2dbc3024ee1c81009ccf5a864418552a0eaf4)
---
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 0875a69e329b..6c13a48d910d 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 1001023102
- versionName "1.2.31-2"
+ versionCode 1001023103
+ versionName "1.2.31-3"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 56802dab9a9b..f7f122f207d3 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.2.31.2
+ 1.2.31.3
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 9942c1114242..cf32571394cd 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.2.31.2
+ 1.2.31.3
diff --git a/package-lock.json b/package-lock.json
index 1c11dd43378b..76a7e6c6adff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.2.31-2",
+ "version": "1.2.31-3",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.2.31-2",
+ "version": "1.2.31-3",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index cc80a407017d..11ca2a02ff7b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.2.31-2",
+ "version": "1.2.31-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 59d12f1f0d04c05cdcca879b0254a431cb3fe7d5 Mon Sep 17 00:00:00 2001
From: Robert Chen
Date: Thu, 24 Nov 2022 20:03:18 +0800
Subject: [PATCH 2/2] Merge pull request #12959 from
Expensify/georgia-fixSmallButtons
[No QA] Fix small button padding
(cherry picked from commit f712fd32af6fdb8ad4608c5021b2c8de191b0838)
---
src/styles/styles.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/styles/styles.js b/src/styles/styles.js
index 2248cd8c1bf9..081333327875 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -365,9 +365,9 @@ const styles = {
buttonSmall: {
borderRadius: variables.buttonBorderRadius,
height: variables.componentSizeSmall,
- paddingTop: 10,
+ paddingTop: 4,
paddingHorizontal: 14,
- paddingBottom: 10,
+ paddingBottom: 4,
backgroundColor: themeColors.buttonDefaultBG,
},