Skip to content

Commit

Permalink
Merge pull request #13980 from Expensify/update-staging-from-main
Browse files Browse the repository at this point in the history 
Update version to 1.2.48-1 on staging
  • Loading branch information
@OSBotify
OSBotify authored Jan 4, 2023
2 parents ee891a6 + cf29a2f commit 5d24644
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 73 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001024800
versionName "1.2.48-0"
versionCode 1001024801
versionName "1.2.48-1"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()

if (isNewArchitectureEnabled()) {
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.2.48.0</string>
<string>1.2.48.1</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensifyTests/Info.plist
View file
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.2.48.0</string>
<string>1.2.48.1</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions package-lock.json
View file

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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
"version": "1.2.48-0",
"version": "1.2.48-1",
"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
1 change: 1 addition & 0 deletions src/ONYXKEYS.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ export default {
PROFILE_SETTINGS_FORM: 'profileSettingsForm',
DISPLAY_NAME_FORM: 'displayNameForm',
NEW_ROOM_FORM: 'newRoomForm',
ROOM_SETTINGS_FORM: 'roomSettingsForm',
},

// Whether we should show the compose input or not
Expand Down
102 changes: 36 additions & 66 deletions src/pages/ReportSettingsPage.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {View, ScrollView, Keyboard} from 'react-native';
import {View, Keyboard} from 'react-native';
import {withOnyx} from 'react-native-onyx';
import _ from 'underscore';
import lodashGet from 'lodash/get';
Expand All @@ -15,13 +15,13 @@ import HeaderWithCloseButton from '../components/HeaderWithCloseButton';
import ScreenWrapper from '../components/ScreenWrapper';
import withLocalize, {withLocalizePropTypes} from '../components/withLocalize';
import Text from '../components/Text';
import Button from '../components/Button';
import RoomNameInput from '../components/RoomNameInput';
import Picker from '../components/Picker';
import * as ValidationUtils from '../libs/ValidationUtils';
import OfflineWithFeedback from '../components/OfflineWithFeedback';
import reportPropTypes from './reportPropTypes';
import withReportOrNavigateHome from './home/report/withReportOrNavigateHome';
import Form from '../components/Form';

const propTypes = {
/** Route params */
Expand Down Expand Up @@ -53,15 +53,8 @@ class ReportSettingsPage extends Component {
constructor(props) {
super(props);

this.roomNameInputRef = null;

this.state = {
newRoomName: this.props.report.reportName,
errors: {},
};

this.resetToPreviousName = this.resetToPreviousName.bind(this);
this.validateAndUpdatePolicyRoomName = this.validateAndUpdatePolicyRoomName.bind(this);
this.validate = this.validate.bind(this);
this.updatePolicyRoomName = this.updatePolicyRoomName.bind(this);
}

getNotificationPreferenceOptions() {
Expand All @@ -73,61 +66,46 @@ class ReportSettingsPage extends Component {
}

/**
* When the user dismisses the error updating the policy room name,
* reset the report name to the previously saved name and clear errors.
* @param {Object} values - form input values passed by the Form component
*/
resetToPreviousName() {
this.setState({newRoomName: this.props.report.reportName});
Report.clearPolicyRoomNameErrors(this.props.report.reportID);
}
updatePolicyRoomName(values) {
Keyboard.dismiss();

validateAndUpdatePolicyRoomName() {
if (!this.validate()) {
// When the room name has not changed, skip the Form submission
if (values.newRoomName === this.props.report.reportName) {
return;
}
Keyboard.dismiss();
Report.updatePolicyRoomName(this.props.report, this.state.newRoomName);
Report.updatePolicyRoomName(this.props.report, values.newRoomName);
}

validate() {
/**
* @param {Object} values - form input values passed by the Form component
* @returns {Boolean}
*/
validate(values) {
const errors = {};

// When the report name is not changed, skip the form submission. Added check here to keep the code clean
if (this.state.newRoomName === this.props.report.reportName) {
return false;
// We should skip validation hence we return an empty errors and we skip Form submission on the onSubmit method
if (values.newRoomName === this.props.report.reportName) {
return errors;
}

// Show error if the room name already exists
if (ValidationUtils.isExistingRoomName(this.state.newRoomName, this.props.reports, this.props.report.policyID)) {
if (ValidationUtils.isExistingRoomName(values.newRoomName, this.props.reports, this.props.report.policyID)) {
errors.newRoomName = this.props.translate('newRoomPage.roomAlreadyExistsError');
}

// We error if the user doesn't enter a room name or left blank
if (!this.state.newRoomName || this.state.newRoomName === CONST.POLICY.ROOM_PREFIX) {
if (!values.newRoomName || values.newRoomName === CONST.POLICY.ROOM_PREFIX) {
errors.newRoomName = this.props.translate('newRoomPage.pleaseEnterRoomName');
}

// Certain names are reserved for default rooms and should not be used for policy rooms.
if (ValidationUtils.isReservedRoomName(this.state.newRoomName)) {
if (ValidationUtils.isReservedRoomName(values.newRoomName)) {
errors.newRoomName = this.props.translate('newRoomPage.roomNameReservedError');
}

this.setState({errors});
return _.isEmpty(errors);
}

/**
* @param {String} inputKey
* @param {String} value
*/
clearErrorAndSetValue(inputKey, value) {
this.setState(prevState => ({
[inputKey]: value,
errors: {
...prevState.errors,
[inputKey]: '',
},
}));
return errors;
}

render() {
Expand All @@ -144,7 +122,15 @@ class ReportSettingsPage extends Component {
onBackButtonPress={Navigation.goBack}
onCloseButtonPress={Navigation.dismissModal}
/>
<ScrollView style={styles.flex1} contentContainerStyle={styles.p5} keyboardShouldPersistTaps="handled">
<Form
formID={ONYXKEYS.FORMS.ROOM_SETTINGS_FORM}
submitButtonText={this.props.translate('common.save')}
style={[styles.mh5, styles.mt5, styles.flexGrow1]}
validate={this.validate}
onSubmit={this.updatePolicyRoomName}
isSubmitButtonVisible={shouldShowRoomName && !shouldDisableRename}
enabledWhenOffline
>
<View>
<View style={[styles.mt2]}>
<Picker
Expand All @@ -170,7 +156,7 @@ class ReportSettingsPage extends Component {
<OfflineWithFeedback
pendingAction={lodashGet(this.props.report, 'pendingFields.reportName', null)}
errors={lodashGet(this.props.report, 'errorFields.reportName', null)}
onClose={this.resetToPreviousName}
onClose={() => Report.clearPolicyRoomNameErrors(this.props.report.reportID)}
>
<View style={[styles.flexRow]}>
<View style={[styles.flex3]}>
Expand All @@ -180,33 +166,17 @@ class ReportSettingsPage extends Component {
{this.props.translate('newRoomPage.roomName')}
</Text>
<Text numberOfLines={1} style={[styles.optionAlternateText]}>
{this.state.newRoomName}
{this.props.report.reportName}
</Text>
</View>
)
: (
<RoomNameInput
ref={el => this.roomNameInputRef = el}
value={this.state.newRoomName}
policyID={linkedWorkspace && linkedWorkspace.id}
errorText={this.state.errors.newRoomName}
onChangeText={newRoomName => this.clearErrorAndSetValue('newRoomName', newRoomName)}
disabled={shouldDisableRename}
inputID="newRoomName"
defaultValue={this.props.report.reportName}
/>
)}
</View>
{!shouldDisableRename && (
<Button
large
success={!shouldDisableRename}
text={this.props.translate('common.save')}
onPress={this.validateAndUpdatePolicyRoomName}
style={[styles.ml2, styles.mnw25]}
textStyles={[styles.label]}
innerStyles={[styles.saveButtonPadding]}
isDisabled={shouldDisableRename}
/>
)}
</View>
</OfflineWithFeedback>
</View>
Expand Down Expand Up @@ -238,7 +208,7 @@ class ReportSettingsPage extends Component {
</Text>
</View>
)}
</ScrollView>
</Form>
</ScreenWrapper>
);
}
Expand Down

0 comments on commit 5d24644

Please sign in to comment.