From d757a18a7b1347ea2d31caddc211c59fde42c29e Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 30 Dec 2021 13:21:21 -0800
Subject: [PATCH 1/3] Merge pull request #6963 from
 Expensify/version-BUILD-9c8af65fd4cee6a25d9e7f33c51ba90fd59f37b0

(cherry picked from commit 7fcb02c85d461593e05f860aeea084550356e050)
---
 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 f73710e0fca1..fbfc463b3964 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -149,8 +149,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001012403
-        versionName "1.1.24-3"
+        versionCode 1001012408
+        versionName "1.1.24-8"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index f3178f2e26cc..ac5a3af7fdab 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.24.3</string>
+	<string>1.1.24.8</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 0d619f3a18b9..0e8523e64536 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.24.3</string>
+	<string>1.1.24.8</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 481d06548363..c12d0ec1feb4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.24-3",
+  "version": "1.1.24-8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9943baf7bb3b..a333d398d2f6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.24-3",
+  "version": "1.1.24-8",
   "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 dd6232e13aee62b2a19360e6c5f1df3c78fb4961 Mon Sep 17 00:00:00 2001
From: Aldo Canepa Garay <87341702+aldo-expensify@users.noreply.github.com>
Date: Thu, 30 Dec 2021 13:58:43 -0300
Subject: [PATCH 2/3] Merge pull request #6951 from parasharrajat/room-page

fix: room page layout
(cherry picked from commit e78742336773b60081dd1a74705d2975690ea5c4)
---
 src/pages/workspace/WorkspaceNewRoomPage.js | 68 +++++++++++++--------
 1 file changed, 44 insertions(+), 24 deletions(-)

diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
index 7c5d3eeed700..fac820ad35e5 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.js
+++ b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -19,6 +19,7 @@ import FixedFooter from '../../components/FixedFooter';
 import * as Report from '../../libs/actions/Report';
 import Permissions from '../../libs/Permissions';
 import Log from '../../libs/Log';
+import KeyboardAvoidingView from '../../components/KeyboardAvoidingView';
 
 const propTypes = {
     /** All reports shared with the user */
@@ -137,6 +138,7 @@ class WorkspaceNewRoomPage extends React.Component {
 
         return (
             <ScreenWrapper>
+<<<<<<< HEAD
                 <HeaderWithCloseButton
                     title={this.props.translate('newRoomPage.newRoom')}
                     onCloseButtonPress={() => Navigation.dismissModal()}
@@ -150,33 +152,51 @@ class WorkspaceNewRoomPage extends React.Component {
                         onChangeText={roomName => this.setState({roomName: this.checkAndModifyRoomName(roomName)})}
                         value={this.state.roomName.substr(1)}
                         errorText={this.state.error}
+=======
+                <KeyboardAvoidingView>
+                    <HeaderWithCloseButton
+                        title={this.props.translate('newRoomPage.newRoom')}
+                        onCloseButtonPress={() => Navigation.dismissModal()}
+>>>>>>> e78742336 (Merge pull request #6951 from parasharrajat/room-page)
                     />
-                    <View style={styles.mb5}>
+                    <ScrollView style={styles.flex1} contentContainerStyle={styles.p5}>
+                        <TextInputWithLabel
+                            label={this.props.translate('newRoomPage.roomName')}
+                            prefixCharacter="#"
+                            placeholder={this.props.translate('newRoomPage.social')}
+                            containerStyles={[styles.mb5]}
+                            onChangeText={roomName => this.setState({roomName: this.checkAndModifyRoomName(roomName)})}
+                            value={this.state.roomName.substr(1)}
+                            errorText={this.state.error}
+                            autoCapitalize="none"
+                        />
+                        <View style={styles.mb5}>
+                            <ExpensiPicker
+                                value={this.state.policyID}
+                                label={this.props.translate('workspace.common.workspace')}
+                                placeholder={{value: '', label: this.props.translate('newRoomPage.selectAWorkspace')}}
+                                items={this.state.workspaceOptions}
+                                onChange={this.onWorkspaceSelect}
+                            />
+                        </View>
                         <ExpensiPicker
-                            value={this.state.policyID}
-                            label={this.props.translate('workspace.common.workspace')}
-                            placeholder={{value: '', label: this.props.translate('newRoomPage.selectAWorkspace')}}
-                            items={this.state.workspaceOptions}
-                            onChange={this.onWorkspaceSelect}
+                            value={this.state.visibility}
+                            label={this.props.translate('newRoomPage.visibility')}
+                            items={visibilityOptions}
+                            onChange={visibility => this.setState({visibility})}
                         />
-                    </View>
-                    <ExpensiPicker
-                        value={this.state.visibility}
-                        label={this.props.translate('newRoomPage.visibility')}
-                        items={visibilityOptions}
-                        onChange={visibility => this.setState({visibility})}
-                    />
-                </ScrollView>
-                <FixedFooter>
-                    <Button
-                        isLoading={this.props.isLoadingCreatePolicyRoom}
-                        isDisabled={shouldDisableSubmit}
-                        success
-                        onPress={this.onSubmit}
-                        style={[styles.w100]}
-                        text={this.props.translate('newRoomPage.createRoom')}
-                    />
-                </FixedFooter>
+                    </ScrollView>
+                    <FixedFooter>
+                        <Button
+                            isLoading={this.props.isLoadingCreatePolicyRoom}
+                            isDisabled={shouldDisableSubmit}
+                            success
+                            onPress={this.onSubmit}
+                            style={[styles.w100]}
+                            text={this.props.translate('newRoomPage.createRoom')}
+                        />
+                    </FixedFooter>
+                </KeyboardAvoidingView>
             </ScreenWrapper>
         );
     }

From 84481192cd814bbfd12c3f89548d11586088e530 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Thu, 30 Dec 2021 18:31:43 -0300
Subject: [PATCH 3/3] Resolve conflicts

---
 src/pages/workspace/WorkspaceNewRoomPage.js | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
index fac820ad35e5..d53ec322f712 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.js
+++ b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -138,26 +138,10 @@ class WorkspaceNewRoomPage extends React.Component {
 
         return (
             <ScreenWrapper>
-<<<<<<< HEAD
-                <HeaderWithCloseButton
-                    title={this.props.translate('newRoomPage.newRoom')}
-                    onCloseButtonPress={() => Navigation.dismissModal()}
-                />
-                <ScrollView style={styles.flex1} contentContainerStyle={styles.p5}>
-                    <TextInputWithLabel
-                        label={this.props.translate('newRoomPage.roomName')}
-                        prefixCharacter="#"
-                        placeholder={this.props.translate('newRoomPage.social')}
-                        containerStyles={[styles.mb5]}
-                        onChangeText={roomName => this.setState({roomName: this.checkAndModifyRoomName(roomName)})}
-                        value={this.state.roomName.substr(1)}
-                        errorText={this.state.error}
-=======
                 <KeyboardAvoidingView>
                     <HeaderWithCloseButton
                         title={this.props.translate('newRoomPage.newRoom')}
                         onCloseButtonPress={() => Navigation.dismissModal()}
->>>>>>> e78742336 (Merge pull request #6951 from parasharrajat/room-page)
                     />
                     <ScrollView style={styles.flex1} contentContainerStyle={styles.p5}>
                         <TextInputWithLabel