From 18f55212070a21e8895ddcbd1ee908e42ec3226b Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Mon, 21 Jun 2021 22:07:43 +0530
Subject: [PATCH 1/2] send image with text via composer

---
 src/components/AttachmentModal.js            | 4 ++--
 src/languages/en.js                          | 3 ++-
 src/pages/home/report/ReportActionCompose.js | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/AttachmentModal.js b/src/components/AttachmentModal.js
index 599456e55442..65590a0d7c05 100755
--- a/src/components/AttachmentModal.js
+++ b/src/components/AttachmentModal.js
@@ -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
@@ -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')}
                             onPress={this.submitAndClose}
                         />
                     )}
diff --git a/src/languages/en.js b/src/languages/en.js
index 5d6d6ddbb897..ca343429f02d 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -49,6 +49,7 @@ export default {
         invite: 'Invite',
         iAcceptThe: 'I accept the ',
         passwordCannotBeBlank: 'Password cannot be blank',
+        send: 'Send',
     },
     attachmentPicker: {
         cameraPermissionRequired: 'Camera Permission Required',
@@ -92,7 +93,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.',
diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index ad70a94168f0..a495f0268678 100755
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -403,6 +403,7 @@ class ReportActionCompose extends React.Component {
                     <AttachmentModal
                         isUploadingAttachment
                         onConfirm={(file) => {
+                            this.submitForm();
                             addAction(this.props.reportID, '', file);
                             this.setTextInputShouldClear(false);
                         }}

From 6283e8e3c6ed1360f0ee9ac013993ba172d21c53 Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Tue, 22 Jun 2021 12:02:25 +0530
Subject: [PATCH 2/2] fix transplations

---
 src/languages/en.js | 1 -
 src/languages/es.js | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index ca343429f02d..c75e6254b805 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -2,7 +2,6 @@
 export default {
     common: {
         cancel: 'Cancel',
-        upload: 'Upload',
         yes: 'Yes',
         no: 'No',
         attachment: 'Attachment',
diff --git a/src/languages/es.js b/src/languages/es.js
index 8a0fd6565c1e..2aa1ec036af1 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -2,7 +2,6 @@
 export default {
     common: {
         cancel: 'Cancelar',
-        upload: 'Subir',
         yes: 'Si',
         no: 'No',
         attachment: 'Archivo Adjunto',
@@ -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',
@@ -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.',