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.0.65-4 on staging #3458

Merged
merged 6 commits into from
Jun 9, 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 @@ -148,8 +148,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001006503
versionName "1.0.65-3"
versionCode 1001006504
versionName "1.0.65-4"
}
splits {
abi {
Expand Down
2 changes: 1 addition & 1 deletion ios/ExpensifyCash/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.0.65.3</string>
<string>1.0.65.4</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/ExpensifyCashTests/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.0.65.3</string>
<string>1.0.65.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": "expensify.cash",
"version": "1.0.65-3",
"version": "1.0.65-4",
"author": "Expensify, Inc.",
"homepage": "https://expensify.cash",
"description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
Expand Down
5 changes: 2 additions & 3 deletions src/components/AttachmentPicker/index.native.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class AttachmentPicker extends Component {
{
icon: Paperclip,
text: this.props.translate('attachmentPicker.chooseDocument'),
pickAttachment: this.showDocumentPicker,
pickAttachment: () => this.showDocumentPicker(),
},
];

Expand Down Expand Up @@ -145,8 +145,7 @@ class AttachmentPicker extends Component {
this.showGeneralAlert(response.error);
break;
}
const errorDescription = this.props.translate('attachmentPicker.errorDuringAttachmentSelection');
reject(new Error(`${errorDescription}: ${response.error}`));
reject(new Error(`Error during attachment selection: ${response.error}`));
}

resolve(response);
Expand Down
3 changes: 1 addition & 2 deletions src/languages/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ export default {
contacts: 'Contacts',
recents: 'Recents',
close: 'Close',
settings: 'Settings',
},
attachmentPicker: {
cameraPermissionRequired: 'Camera Permission Required',
expensifyDoesntHaveAccessToCamera: 'Expensify.cash does not have access to your camera, please enable the permission and try again.',
attachmentError: 'Attachment Error',
errorWhileSelectingAttachment: 'An error occurred while selecting an attachment, please try again',
errorWhileSelectingCorruptedImage: 'An error occurred while selecting a corrupted attachment, please try another file',
errorDuringAttachmentSelection: 'Error during attachment selection',
takePhoto: 'Take Photo',
chooseFromGallery: 'Choose from Gallery',
chooseDocument: 'Choose Document',
Expand Down Expand Up @@ -156,7 +156,6 @@ export default {
sendValidation: 'Send Validation',
},
initialSettingsPage: {
settings: 'Settings',
about: 'About',
aboutPage: {
description: 'Expensify.cash is built by a community of open source developers from around the world. Come help us build the next generation of Expensify.',
Expand Down
3 changes: 1 addition & 2 deletions src/languages/es.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ export default {
delete: 'Eliminar',
contacts: 'Contactos',
recents: 'Recientes',
settings: 'Configuración',
},
attachmentPicker: {
cameraPermissionRequired: 'Se necesita permiso para usar la cámara',
expensifyDoesntHaveAccessToCamera: 'Expensify.cash no tiene acceso a tu cámara, por favor activa el permiso y vuelve a intentarlo.',
attachmentError: 'Error al adjuntar archivo',
errorWhileSelectingAttachment: 'Ha ocurrido un error al seleccionar un adjunto, por favor inténtalo de nuevo',
errorWhileSelectingCorruptedImage: 'Ha ocurrido un error al seleccionar un adjunto corrupto, por favor intentalo con otro archivo',
errorDuringAttachmentSelection: 'Error al seleccionar un archivo adjunto',
takePhoto: 'Hacer una Foto',
chooseFromGallery: 'Elegir de la galería',
chooseDocument: 'Elegir Documento',
Expand Down Expand Up @@ -153,7 +153,6 @@ export default {
sendValidation: 'Enviar validación',
},
initialSettingsPage: {
settings: 'Configuración',
about: 'Acerca de',
aboutPage: {
description: 'Expensify.cash está desarrollado por una comunidad de desarrolladores open source de todo el mundo. Ayúdanos a construir la próxima generación de Expensify.',
Expand Down
2 changes: 1 addition & 1 deletion src/pages/settings/InitialPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ const InitialSettingsPage = ({
return (
<ScreenWrapper>
<HeaderWithCloseButton
title={translate('initialSettingsPage.settings')}
title={translate('common.settings')}
onCloseButtonPress={() => Navigation.dismissModal(true)}
/>
<ScrollView style={[styles.settingsPageBackground]} bounces={false}>
Expand Down