Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🍒 Cherry pick PR #6951 to staging 🍒 #6964

Merged
merged 3 commits into from
Dec 30, 2021
Merged

🍒 Cherry pick PR #6951 to staging 🍒 #6964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d757a18
Merge pull request #6963 from Expensify/version-BUILD-9c8af65fd4cee6a…
OSBotify Dec 30, 2021
dd6232e
Merge pull request #6951 from parasharrajat/room-page
aldo-expensify Dec 30, 2021
8448119
Resolve conflicts
aldo-expensify Dec 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensifyTests/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.",
Expand Down
78 changes: 41 additions & 37 deletions src/pages/workspace/WorkspaceNewRoomPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -137,46 +138,49 @@ class WorkspaceNewRoomPage extends React.Component {

return (
<ScreenWrapper>
<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()}
/>
<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>
);
}
Expand Down