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.

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

Update version to 1.1.3-4 on staging #5613

Merged
merged 7 commits into from
Sep 30, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001010303
versionName "1.1.3-3"
versionCode 1001010304
versionName "1.1.3-4"
}
splits {
abi {
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.1.3.3</string>
<string>1.1.3.4</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensifyTests/Info.plist
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.3.3</string>
<string>1.1.3.4</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion package-lock.json

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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
"version": "1.1.3-3",
"version": "1.1.3-4",
"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: 0 additions & 1 deletion src/languages/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ export default {
isRequiredField: 'is a required field',
whatThis: 'What\'s this?',
iAcceptThe: 'I accept the ',
passwordCannotBeBlank: 'Password cannot be blank',
remove: 'Remove',
admin: 'Admin',
dateFormat: 'YYYY-MM-DD',
Expand Down
1 change: 0 additions & 1 deletion src/languages/es.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ export default {
isRequiredField: 'es un campo obligatorio',
whatThis: '¿Qué es esto?',
iAcceptThe: 'Acepto los ',
passwordCannotBeBlank: 'La contraseña no puede estar vacía',
remove: 'Eliminar',
admin: 'Administrador',
dateFormat: 'AAAA-MM-DD',
Expand Down
2 changes: 1 addition & 1 deletion src/libs/API.js
Original file line number Diff line number Diff line change
Expand Up @@ -968,7 +968,7 @@ function BankAccount_SetupWithdrawal(parameters) {

requireParameters(['currentStep'], parameters, commandName);
return Network.post(
commandName, {additionalData: JSON.stringify(additionalData), password: parameters.password},
commandName, {additionalData: JSON.stringify(additionalData)},
CONST.NETWORK.METHOD.POST,
true,
);
Expand Down
20 changes: 0 additions & 20 deletions src/pages/ReimbursementAccount/CompanyStep.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ class CompanyStep extends React.Component {
incorporationDate: ReimbursementAccountUtils.getDefaultStateForField(props, 'incorporationDate'),
incorporationState: ReimbursementAccountUtils.getDefaultStateForField(props, 'incorporationState'),
hasNoConnectionToCannabis: ReimbursementAccountUtils.getDefaultStateForField(props, 'hasNoConnectionToCannabis', false),
password: '',
};

// These fields need to be filled out in order to submit the form
Expand All @@ -79,7 +78,6 @@ class CompanyStep extends React.Component {
'incorporationDate',
'incorporationState',
'incorporationType',
'password',
'companyPhone',
'hasNoConnectionToCannabis',
];
Expand All @@ -95,7 +93,6 @@ class CompanyStep extends React.Component {
companyTaxID: 'bankAccount.error.taxID',
incorporationDate: 'bankAccount.error.incorporationDate',
incorporationType: 'bankAccount.error.companyType',
password: 'common.passwordCannotBeBlank',
hasNoConnectionToCannabis: 'bankAccount.error.restrictedBusiness',
};

Expand Down Expand Up @@ -281,23 +278,6 @@ class CompanyStep extends React.Component {
/>
</View>
</View>
<ExpensiTextInput
label={`Expensify ${this.props.translate('common.password')}`}
containerStyles={[styles.mt4]}
secureTextEntry
textContentType="password"
onChangeText={(value) => {
this.setState({password: value});
this.clearError('password');
}}
value={this.state.password}
onSubmitEditing={this.submit}
errorText={this.getErrorText('password')}

// Use new-password to prevent an autoComplete bug https://github.com/Expensify/Expensify/issues/173177
// eslint-disable-next-line react/jsx-props-no-multi-spaces
autoCompleteType="new-password"
/>
<CheckboxWithLabel
isChecked={this.state.hasNoConnectionToCannabis}
onPress={() => {
Expand Down