Merge pull request #6951 from parasharrajat/room-page

fix: room page layout
(cherry picked from commit e787423)

.github/workflows/OSBotify-private-key.asc

@@ -0,0 +1,105 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+lQcYBGGX7SQBEAC1uj1tgtNWxQEGgswOJUjoarb1C5Ay+7IgoF2KoYhS0YJ3uTEE
+ljDA320grW9SEXesGMEZjGAn+bYGbRysw7ehKUL+yqHKVcNfX++VleSMAHyhxEVP
+kTMKggtfHE4qvGeVwPwuS7cB9JDPC/4VrDVinCi6VkSGZyii+b/z82g+DUMc6L3K
+SPup/P2yKWEi6MK25/6yZzm3OkYKY+rZ7VIBZoVORBBS6jYuBOniTgMu6nWNe3fw
+CpyXu070RSZCEgYtJSRElb1gmZlHhYvkz87URPAP8EsF31JyAhqJssbrmut6+4A/
+s6BMMaxfl5H5Z6otrmDOWsOwqsXNV+RZuNYupKqh+GhRbwDU2DvnzXPOFvN38iGa
+bYQYHITSUwJSscqibNT8sp63i0+sGUcqa/9d0njpK4bpbhoMI6pcvJeQp2cpLLfo
+rJQ4Kr26zjIqzbYu+e9axF7rznJ5YMstGzRVA6T597ABdfFQefvoKPc0FjSRXFcY
+TbAoPpahCLJjFqzpio0Dda/XFIVF0Fmp8f/QjfFt4w6NRkHRUzeIlEFU1tuZvIiJ
+Viij3z6cwWHxpevkoXV7tQqC173ByTDGyyD+DOqZZT2JJCk50YHbzlhewg53q/uv
+mjOrMGmB+jeitBSkqNNniwbfZTriET2CTMv2yRfE1USRzeKYTOG8yzNGaQARAQAB
+AA//TC1VsqI0lRrf4yrQ/t0CQur45p+CQtzfPm36yDIOQykv15/5vEJ5DWCbDiel
+knFgCPQXfe4qIJe8hdUXQBSK1TPGsaefSoHI9CHy/HFo7IcHt4fexgvHqY/51FS5
+L5Dqmwvaqk1y2Y77ZM9SIyOc/UkYiYPAFdcIYcjvfgN6nwhQKb4mULVnSUqTzisq
+XMfVV3bIfWBoATacRZ68w72Hsq6XEsfVT+x96ayFnie1jeUagcRP8n+ARNpvrlWO
+RAPqMuJu4ZEjYWsBpcmFatTxjmmXeBbyW/PRS5k2JqKaYAkAzPzANfPGLipkZ23R
+8wpRe/Ss/9NsVJJBeGJvhmzE2vNghQNs0uo/uNlgBbLcyP74UyBsFSSb+ZE+uuqf
+WAXb0uqh3XD0lYWfkETdc2P3HArC3Sz5jsELSI7onKMJwBPIWJBLEYkqkBDxLop4
+oPZxtjl/TNZobCuall4TvIkxLd0Ozl8230qHbpLuKsVSvwfBD/v/+nU1wyTDqIEe
+JNvtCklQim+ssH1lfPyGcZqFHgvRzuMc3m7hpYrpDqEWnTLvvc7U/CQ2/qGqpSfd
+o7iy2jFZn9Pi/hWKaRm8bY3DWYl5LbgEBcB7rtpRmUrdMXeE6PAInU5eSaFAoiLE
+Ml65Vx2vg8mvSntZAIbP7ve+e2E7gdw1zZbhg32jzIgHTkEIAMrhHIirj87mMCW0
+TQQWnLSKrkhMfDttQlP29ux2GNgv2MQdjZE+DfRussiZ/MHanxy4uUtOVmlqe3Zb
+eVxDk54f/4761En9eOGnhPryRiA6H0U50VGmDukUnQTgw7dnC2Om7fJpWNFif/8T
+l8i0NOMVOMXLHxlTXxd1ICHtEULSeBzsAteLb6oURfGk5gzUa1LNFk9WHze8+bUj
+L5IuIvgfDafKlbPLOA9SKDS3Ss/nXGefOuJCR1TNOe1oPUzAp8nXxTD71iSqXGCG
+n9IgoPOXuB5zjRqOH1SRQcSE/5XeeuSysKNvqn/2kdKo+zK66H52j9XX/u1i5yEr
+oRovU7cIAOVPVReajdKfm/cIIpZZgQq6Uwyw/AvCwt+8aUEHWwzbtl2G5vpxv4+G
+kOfh4cLLu9wUNDOA7R+UMNyPo04UJVDEI962DhVkkILGmN3EyA9Eeqc9KAjQZW55
+IJCaGTRC3A4Oo6vEzxjKhH43zeImCAw1CsljqDJF5WIcKVY7y9goz3MLbEOS4i2N
+094T6B3ptnr0+n6Wkgdci3X8QQ7ZNkEFJo8f9JeZx20ig5W8SUr/b5XxhuwaN7Rc
+VzbUi8jEdlj3Lczqf4R6GZ7mLY5Fym+UHbx7oqg9/5AB92sqKlJvgtxebVBgmSOO
+mjLMFlAQR/6szstRWMKJ4hUhNt21dt8H/3eHWFhro/+ttIok+wIvd6jOtLxaCadF
+xaCc4tQNfrVfg6jgbT1VsLvQstVP13G8/o/WPYkSDbxCa2H4W3+f90YMMHpV0jDe
++KEH1kQR5TdMW2Lm2f0qYwqF3bRf2VOmbWE8QrBJWoK55KyBpKVXvjqq7zCg4cIz
+M93XYjmA5UPoSCU9pMnmjaOlyX1pDSlI/XW6stxcVhneoL1KvrD1SwjKIO5RQOq2
+sPNAjYXVWIYnTsINYw7xwGvafiBmLM+ai5ncLeVUUYbEJ3F5eI62IPSsTu2B1lBT
+Yvo9JrNF/o81KwR47wUqm/qxbc+VAaCdGxUk+Fa+E1dOphynEa8i8h6R+rQnT1NC
+b3RpZnkgPGluZnJhK29zYm90aWZ5QGV4cGVuc2lmeS5jb20+iQJOBBMBCAA4FiEE
+5RRZhYpxKS+/BB9g2/Y3APYPVTAFAmGX7SQCGwMFCwkIBwIGFQoJCAsCBBYCAwEC
+HgECF4AACgkQ2/Y3APYPVTDeUBAAjKHchPir1cSGIE2gKdr3IzkO1Tx+uzobroYj
+xRTirFi/A0ng1G8GFUUidSU9Sx9+s1XwQR2CT21MC8nxIPlXcweLqV9ry5WYuMJI
+nAu9eMZrNE3vLzatELjtaE43pd/F+u/5JYKYGY4wz0zrsfxRga8zAI41nv/bBB0q
+mpcyYnV20UiDW2+MCYyTuRZqY6k88QnRTVkYxJEGhCmM5yP7fzRoCk3N3X/a46PE
+gGvDmjanpu1xn7zKH/BvM+G6zDBV5DjBCjqspg5VW7k0x2jRl5wvX8dxMzgSSkrZ
+/NDL9mCqAdW+YY3YFqI/kjV9tFligqh3ettENArtA3+yLjKkGDuJgZjBJZYQlUgm
+BPeMlIh3gwMBRr7QXrNocMI3YBxk4LGEzWxpLN2vpZokIP8ekEq6ZexbiCJxcCAr
+UBzZnF+UZbTAzoc/9hTPi1Pj/wvoPs8XwMe3IQTNXUitqmUJv16w4Tf2ERa6sCSv
+IBb9syfWQv7bwmgN2oS2QIpjUo/cQYwzTGG4IrB4gvDFItdojRl3mpmV2cI4w650
+611liHG0yncswb3D6y16q5RcARWoO2H8V/sSH4wuU92acUu09pbI0bOAj45o+iwS
+cR17KLcEs29kYaR92Z90qJHW/unkuG2zR4ePknk3/NX7vtdxwhijLN+xq+lPj6bn
+qXyitIidBxgEYZftJAEQAPVlaiyPzNqNe1WiEo3DjNMwnzoROg617KW4t6DZgCHJ
+1losYQuPQu4V07/Kmjd9XAavx5r0iLBjZsqWSetpOqn1pxAB/e2uvJ2e5sRKQL1o
+UepfnyEO51a2oK1SsfDAzG87YQMChApZy6/JylzDcD02wYmFJsdpkfddiAEWZg9z
+eGYDp3M1dcSo+P4sqQU4CxzJP5Y5z/XY6MlKW/yhtpsf6AELtZI2pvjbUnpBOO1n
+m4s7wRsOOzEkZbmVPJKu+jf2dyQ/0zAoySwWuenJWHRKvc6/l6sq4lIl5jMVBrFQ
+QNsNtRXuuZDt7zTygT7k+TdM63Xb7ylxKxdnWi7xQuAU846nPlSQ9vuHIBpA04pq
+t7xGzULnZQgUfLQhb7V6xz74pGOy5MuHgLs6r9yo2zytcX2P0OK6o+WUk05aJQY6
+zWh0CzDVAg9IwdzXeWpSHNQOldo40d++hjGYWn7rCX4rJEXC3ICUh59cFBT+4Tqx
+LZTa1VVLXiitGk5vt94du/hA4ntj+ntNb6rTLIqxjYRaNZ+0yEFAgawKZMGPBzAA
+UlvNwNSqZYZpeAUBmyi2BP43prFo3rwlokiN/U1tYn6GRkAPzrzfaqCtqs+IIAPC
+9ufk+xjoIlfyuAxECL7nbGQuJ5EBtxQsUpjNwLE/WA8/2wuzMeen7cSImuQxGLG7
+ABEBAAEAD/4ousfoFIgGQFRXrrpQoEPX66qJ60ENHwHjsah8wIzlTshOmC4VSpZr
+yOCn5Rs6mYp0K6nAHNUxHZZ6in5DXehYPEcZv5LjZ8yzhqO7sa1UIqPx+CQDyyL3
+gAFkMyUIlh94WM0twDWlOCk4CJCXW/LdniB6UEjS8UFCYtpHf+25o8s4d2PMGfPt
+i7QkD8qP7LDfesGckATlw7ZDbp2c7URPM/kAb26YEY0eIdzrILcvpDIrZmQTNwX5
+Dpb5ufzfRb6PGk/FCvjk9egJ8s2xsXMGfj9JuQAV71y4EMVH9jXxqSXSldBYDxLq
+rKs2yQdNpph8pr4wBiyIXtmtnUBZKT8VegD73dhpbXsQBDqSlhG/L0yJEv+JsvMp
+OnLuC/pjXGnMp0sCL3oLRZLjtrfxFF7kwxtQykPhSH9o2uyMvZH8fG10cUqJkR3B
+w0IqOhLIt15Dh2eo4h0CPJb3H5ayXfqHmcwpPS81OQUxsojJ84Qya7r07cerE8Gz
+47UKlWwfpMOunP5j6PA4lrUFuDS0mkvr0hOun++iRTUk58DLG0AApVQDrzO//WSp
+GrFnFnf2o0lRKb6RtBWY6VBigikMOZod1+SJMBPREwQoGiwkkX3wbiYd4e8/FLB0
+31hjCjx4sK8eze+VvbBlfluRenrlAC6woB1uqyTH/n9OrvNH+8wMtQgA+eXRzsZ7
+gTwEZn/b0qmuFybwJ80W2v0RoEfzLXgJHtPayZ5U/c/VsT2odxHaYJtFwo9JSWn9
+ZuuNv2LVu83SF4wzVIXBB/R19TGAM39oRzQk+YCVgtVV5TMMuJvpAa3E+kOScRz3
+thALBY5wSKbY/R9mMHHBixfT1ZD7U8kheEVQNv20j61wJ0jGr04aGfvhR73Awlcp
+Vz6MpX2EEZwlGPJvs2Ki7BR9MLLG4MaUuZdOcMT/g6+Wvx81/ZPPDhFT+ZaL70zG
+sopoNI3GQ1ZaNB4qEnm6IEw1B7U0QnDzYtxttTzCT1Z5PkWEOt3kTx1sa9tD6Acb
+URuSOrysAJFbZQgA+2N0XMM5NynEcDf3JttguHFDgCxdpfxhf90lPK4JX5tMh22r
+hSvdl+QUesj5+pXpGkHjLxMuatOlnogueyOUJmjm7ENLotj6WS29U+YsTrybCdo/
+gNXr3n9oc/WQYHJour0RYT9Cor/cjJf3MbY2Kmcy8X9E7Ec767IUgeFqJc2PxSX7
+bwQJtA1wozq2a3nRJ0LdoFWfl9hyys3rh2TzFCthaD8HmdiGqnGI1K6pNWVDKYi8
+CP9AufilF0DmFjW51E4+eUfoz7s7m3Tr29iGwnsehpE1dHmqqOVMaxZm/DTA/PZA
+wHizV14ybTKqmWqXv3CrmNzY/ovw2Qe/jFlWnwf/QdN6fJqSfMZZa0njUfcmDq+w
+z7KKvZATqz6Lsx8MWEiDpzqB90IFf97JqQCZoHwk0I/dTtJgxCcCBKCLGRR9LgE2
+C3OLv4DmU+5itbXINKxRsJwuM2FL54dCpZxqLD1yGOr41wxDpBWN9vsnAOB+tklq
++2dCrPOyB4Dt62Wu/iW2xguDFckO1q977pnUkXUGewN6Fup5zxrwe9yVEVaoslW9
+e+zXw3J7cOokbvUwt01yyry6opvsNPnzFYsmAkCnRPLpEQh7Wwyj5T83oevRXMi7
+0cWoWup4WLHyAeDobgaXBW9bIQ/5UqJWMR3EXbHztBraRLWYFMB49/E8/5gnmIUv
+iQI2BBgBCAAgFiEE5RRZhYpxKS+/BB9g2/Y3APYPVTAFAmGX7SQCGwwACgkQ2/Y3
+APYPVTDaNQ//UjhtVhlvYPbhxOsxlWUcSoCBvwCevFNLV4FdQzQAGeyo2oeDkFUa
+gR6YHCAZRMWv+XILlxpuHDwEsjbMu/mKAmHPQUnm1PwPruyPmzqFbvyMORNKz9Pl
+HGuOFhtozxYPWk+UfY6rfnz7rGSzg9bW4G+VKFgZwm9pKwvZcug+hf+So2rckzFA
+bL0jpStsCl6OTau/QH/U8bdRS4h7+YuxJLMYGDvXswRvwMbux4ZWJr9AI59Fyo+b
+t+CtALmHYUgFv0kRhXcPR/MLSu3xjWyJ46xDcST98/lesB4HAjh7mRPPRO1tQgdI
+I8XT/y98LhCn4siwz8sv2hCE0vEWywfhi9xy0FjP7i6J/QyB7SPQ7gfx00fmlaGN
+5tSpcrI1KkS7823y86pmXdPs0pMIZr6dp85XMBjIMc6O17p0CLtQuVvyY4bJC43U
+LhCkiLxu1lFzaP/WfacDaYWm8sbGNUTbMxsFYWVxeTGYxTlPAAZ9OKLYsfl0CLIh
+H0J6Vcq1BiSBIYOeVMf//5mRIj0HKeHg4wBkWKtqJvZqhTUlBBLtBmYAq5llEcU8
+GbH7ubF3qMPPhft0XI4yxy8kiYHRi+CfVp/oDw0xMPZx2wQSgUwvQ7YbxZhM9pNW
+uUayVeacn8qgHqzjEtrnyam594s4aBoksei1UX6qY6+xicp1OeJLEpw=
+=Jm2N
+-----END PGP PRIVATE KEY BLOCK-----

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>
         );
     }