From c65a29f22b92ba474a53ecfc7373413e7c9da1fd Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 28 Oct 2021 11:32:09 -0700
Subject: [PATCH 1/2] Merge pull request #6100 from
Expensify/version-BUILD-b110524af841c808247f7b5b5038002635fd005e
(cherry picked from commit ef9b8bbfa2e5e740b5401b3319b064e27fa2ded3)
---
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 df0217be1a99..6cda859c1d58 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 1001011001
- versionName "1.1.10-1"
+ versionCode 1001011002
+ versionName "1.1.10-2"
}
splits {
abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index e4f6f0d67f4b..6352979ecae5 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
CFBundleVersion
- 1.1.10.1
+ 1.1.10.2
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index f7617b3e4532..4fd64d8132f4 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.10.1
+ 1.1.10.2
diff --git a/package-lock.json b/package-lock.json
index 60b56d2037c0..084b4253672f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.10-1",
+ "version": "1.1.10-2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index df00baaeabff..fcbab00602fd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.10-1",
+ "version": "1.1.10-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 1b9dac91d4965ba84ab6e71a4ab8260df9bb78e6 Mon Sep 17 00:00:00 2001
From: Rory Abraham <47436092+roryabraham@users.noreply.github.com>
Date: Thu, 28 Oct 2021 11:27:35 -0700
Subject: [PATCH 2/2] Merge pull request #6099 from
Expensify/Rory-FixKeyboardSpacerOnNewChatPage
(cherry picked from commit b110524af841c808247f7b5b5038002635fd005e)
---
src/pages/NewChatPage.js | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/pages/NewChatPage.js b/src/pages/NewChatPage.js
index 1f56a2b9f61c..fd6df170d6a9 100755
--- a/src/pages/NewChatPage.js
+++ b/src/pages/NewChatPage.js
@@ -9,7 +9,6 @@ import {getNewChatOptions, getHeaderMessage} from '../libs/OptionsListUtils';
import ONYXKEYS from '../ONYXKEYS';
import styles from '../styles/styles';
import {fetchOrCreateChatReport} from '../libs/actions/Report';
-import KeyboardSpacer from '../components/KeyboardSpacer';
import CONST, {EXPENSIFY_EMAILS} from '../CONST';
import withWindowDimensions, {windowDimensionsPropTypes} from '../components/withWindowDimensions';
import HeaderWithCloseButton from '../components/HeaderWithCloseButton';
@@ -263,7 +262,6 @@ class NewChatPage extends Component {
hideAdditionalOptionStates
forceTextUnreadStyle
/>
- {!this.props.isGroupChat && }
{this.props.isGroupChat && lodashGet(this.state, 'selectedOptions', []).length > 0 && (