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

Feature: Send image with text via composer #3708

Merged
merged 2 commits into from
Jun 22, 2021
Merged

Feature: Send image with text via composer #3708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18f5521
send image with text via composer
parasharrajat Jun 21, 2021
6283e8e
fix transplations
parasharrajat Jun 22, 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 src/components/AttachmentModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ class AttachmentModal extends PureComponent {
>
<HeaderWithCloseButton
title={this.props.isUploadingAttachment
? this.props.translate('reportActionCompose.uploadAttachment')
? this.props.translate('reportActionCompose.sendAttachment')
: this.props.translate('common.attachment')}
shouldShowBorderBottom
shouldShowDownloadButton
Expand All @@ -137,7 +137,7 @@ class AttachmentModal extends PureComponent {
success
style={[styles.buttonConfirm]}
textStyles={[styles.buttonConfirmText]}
text={this.props.translate('common.upload')}
text={this.props.translate('common.send')}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you remove the old upload const value if it is unused now?

onPress={this.submitAndClose}
/>
)}
Expand Down
4 changes: 2 additions & 2 deletions src/languages/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
export default {
common: {
cancel: 'Cancel',
upload: 'Upload',
yes: 'Yes',
no: 'No',
attachment: 'Attachment',
Expand Down Expand Up @@ -49,6 +48,7 @@ export default {
invite: 'Invite',
iAcceptThe: 'I accept the ',
passwordCannotBeBlank: 'Password cannot be blank',
send: 'Send',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also make sure these updates are included in the es.js file? You can just google translate to Spanish for now

},
attachmentPicker: {
cameraPermissionRequired: 'Camera Permission Required',
Expand Down Expand Up @@ -92,7 +92,7 @@ export default {
phrase3: 'Your payments get to you as fast as you can get your point across.',
},
reportActionCompose: {
uploadAttachment: 'Upload Attachment',
sendAttachment: 'Send Attachment',
addAttachment: 'Add Attachment',
writeSomething: 'Write something...',
youAppearToBeOffline: 'You appear to be offline.',
Expand Down
4 changes: 2 additions & 2 deletions src/languages/es.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
export default {
common: {
cancel: 'Cancelar',
upload: 'Subir',
yes: 'Si',
no: 'No',
attachment: 'Archivo Adjunto',
Expand Down Expand Up @@ -45,6 +44,7 @@ export default {
invite: 'Invitar',
iAcceptThe: 'Acepto los ',
passwordCannotBeBlank: 'La contraseña no puede estar vacía',
send: 'Enviar',
},
attachmentPicker: {
cameraPermissionRequired: 'Se necesita permiso para usar la cámara',
Expand Down Expand Up @@ -88,7 +88,7 @@ export default {
phrase3: 'Tus pagos llegan tan rápido como tus mensajes.',
},
reportActionCompose: {
uploadAttachment: 'Subir Archivo Adjunto',
sendAttachment: 'Enviar adjunto',
addAttachment: 'Agregar Archivo Adjunto',
writeSomething: 'Escribe algo...',
youAppearToBeOffline: 'Parece que estás desconectado.',
Expand Down
1 change: 1 addition & 0 deletions src/pages/home/report/ReportActionCompose.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,7 @@ class ReportActionCompose extends React.Component {
<AttachmentModal
isUploadingAttachment
onConfirm={(file) => {
this.submitForm();
addAction(this.props.reportID, '', file);
this.setTextInputShouldClear(false);
}}
Expand Down