Merge branch 'develop' into fix-spelling-a-char

packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterLeft.tsx

@@ -13,12 +13,14 @@ export function PaymentMadeFormFooterLeft() {
     <React.Fragment>
       {/* --------- Internal Note--------- */}
       <InternalNoteFormGroup
-        name={'internal_note'}
+        name={'statement'}
         label={<T id={'payment_made.form.internal_note.label'} />}
+        fastField={true}
       >
         <FEditableText
-          name={'internal_note'}
+          name={'statement'}
           placeholder={intl.get('payment_made.form.internal_note.placeholder')}
+          fastField={true}
         />
       </InternalNoteFormGroup>
     </React.Fragment>

packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormTopBar.tsx

@@ -1,15 +1,14 @@
 // @ts-nocheck
 import React from 'react';
-import intl from 'react-intl-universal';
-import { Alignment, NavbarGroup, Button, Classes } from '@blueprintjs/core';
+import { Alignment, NavbarGroup, Classes } from '@blueprintjs/core';
 import { useSetPrimaryBranchToForm } from './utils';
 import { useFeatureCan } from '@/hooks/state';
 import {
-  Icon,
   BranchSelect,
   FeatureCan,
   FormTopbar,
   DetailsBarSkeletonBase,
+  FormBranchSelectButton,
 } from '@/components';
 import { usePaymentMadeFormContext } from './PaymentMadeFormProvider';
 import { Features } from '@/constants';
@@ -50,19 +49,9 @@ function PaymentMadeFormSelectBranch() {
     <BranchSelect
       name={'branch_id'}
       branches={branches}
-      input={PaymentMadeBranchSelectButton}
+      input={FormBranchSelectButton}
       popoverProps={{ minimal: true }}
-    />
-  );
-}
-
-function PaymentMadeBranchSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('payment_made.branch_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'branch-16'} iconSize={16} />}
+      fill={false}
     />
   );
 }