diff --git a/src/components/LexicalEditor/plugins/InlineImagePlugin/index.tsx b/src/components/LexicalEditor/plugins/InlineImagePlugin/index.tsx
index 17c924d..31ff3dd 100644
--- a/src/components/LexicalEditor/plugins/InlineImagePlugin/index.tsx
+++ b/src/components/LexicalEditor/plugins/InlineImagePlugin/index.tsx
@@ -170,7 +170,7 @@ export function InsertInlineImageDialog({
           data-test-id="image-modal-file-upload-btn"
           disabled={isDisabled}
           onClick={() => handleOnClick()}>
-          Confirm
+          {uploading ? 'Uploading, Pls wait...' : 'Confirm'}
         </Button>
       </DialogActions>
     </>
diff --git a/src/views/Conversations/Online/Input/EmailEditorPopup.jsx b/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
index e6f0ca5..b03ceb4 100644
--- a/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
+++ b/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
@@ -330,7 +330,7 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, toEma
     body.attaList = fileList;
     body.opi_sn = emailOPI;
     body.mat_sn = emailMat;
-    body.coli_sn = emailOrder;
+    body.coli_sn = emailOrder || '';
     // console.log('body', body, '\n', emailOrder);
     const values = await form.validateFields();
     body.cc = values.cc || '';