Merge pull request #279 from itenium-be/fix-comments

fix NotesModalButton
itenium-be · Jul 3, 2024 · c06f760 · c06f760
2 parents 2466afc + 6441bef
commit c06f760
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/frontend/src/components/controls/form-controls/button/NotesModalButton.tsx b/frontend/src/components/controls/form-controls/button/NotesModalButton.tsx
@@ -23,6 +23,7 @@ export const NotesModalButton = ({claim, value, onChange, title, variant, disabl
 
   const icon = !value ? 'far fa-comment' : 'far fa-comment-dots';
   const showConfirm = !disabled && (!claim || (claim && authService.getClaims().includes(claim)));
+
   return (
     <>
       <Button

diff --git a/frontend/src/components/invoice/invoice-edit/EditInvoice.tsx b/frontend/src/components/invoice/invoice-edit/EditInvoice.tsx
@@ -95,13 +95,13 @@ const EditInvoice = () => {
             </div>
             <div>
               <div className={`invoice-top-buttonbar ${storeInvoice?._id ? 'invoice-edit' : 'invoice-new'}`}>
-                <NotesModalButton
+                {invoice.note && <NotesModalButton
                   claim={invoice.isQuotation ? Claim.ManageQuotations : Claim.ManageInvoices}
                   value={invoice.note}
                   onChange={val => updateInvoice('note', val)}
                   title={t('projectMonth.note')}
                   variant="link"
-                />
+                />}
                 {initInvoice._id && <DownloadInvoiceButton invoice={initInvoice} />}
                 {storeInvoice?._id && !storeInvoice?.isQuotation && <InvoiceDownloadIcon invoice={invoice} fileType='xml' style={{color: '#0062cc', marginLeft: 20}} />}
               </div>
-Original file line number
+Diff line change
@@ Expand Up @@
       const icon = !value ? 'far fa-comment' : 'far fa-comment-dots';
       const showConfirm = !disabled && (!claim || (claim && authService.getClaims().includes(claim)));
       return (
         <>
           <Button
@@ Expand Down @@