From c1228a747b0851255c56dc41d140446d6c657b94 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 17 Jan 2022 10:21:35 -0800
Subject: [PATCH 1/2] Merge pull request #7282 from
Expensify/version-BUILD-c224cfe5ba9f9fc2214a2963d6c02d855dc1c96e
(cherry picked from commit e32390631534ac930209d86d0a7e878b77da70d3)
---
android/app/build.gradle | 4 ++--
ios/NewExpensify/Info.plist | 2 +-
ios/NewExpensifyTests/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 7e87ac547cd2..bf2f10e8b971 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -152,8 +152,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001013001
- versionName "1.1.30-1"
+ versionCode 1001013002
+ versionName "1.1.30-2"
}
splits {
abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 4ec8fb8761a8..9577a45a2aab 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
CFBundleVersion
- 1.1.30.1
+ 1.1.30.2
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 8a868a44119e..6c0263051b6c 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.30.1
+ 1.1.30.2
diff --git a/package-lock.json b/package-lock.json
index 546582a66480..f22887263856 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.30-1",
+ "version": "1.1.30-2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 0ce3652d6b91..1724927b84cd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.30-1",
+ "version": "1.1.30-2",
"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 d4735c019457c9fc9e7372609251b1c71f07b80e Mon Sep 17 00:00:00 2001
From: Brandon Stites <42391420+stitesExpensify@users.noreply.github.com>
Date: Mon, 17 Jan 2022 09:50:38 -0700
Subject: [PATCH 2/2] Merge pull request #7255 from
mananjadhav/fix/emojis-freq-used-error
[No QA] fix: Fixed error with frequently used emojis not showing up
(cherry picked from commit 73cc4ab274599a40b12f84fc420f3df998338579)
---
src/libs/EmojiUtils.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/libs/EmojiUtils.js b/src/libs/EmojiUtils.js
index 1f1fe18961de..be23ae476e22 100644
--- a/src/libs/EmojiUtils.js
+++ b/src/libs/EmojiUtils.js
@@ -140,8 +140,7 @@ function mergeEmojisWithFrequentlyUsedEmojis(emojis, frequentlyUsedEmojis = [])
}];
allEmojis = allEmojis.concat(frequentlyUsedEmojis, emojis);
- allEmojis = addSpacesToEmojiCategories(emojis);
- return allEmojis;
+ return addSpacesToEmojiCategories(allEmojis);
}
/**