From b6a1c9ab4b4ba618323e9b30f81678795d6b19d2 Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Mon, 26 Jun 2023 20:57:52 +0200
Subject: [PATCH 1/9] fix(webapp): payment made form does not handle not unique
 number an error message

---
 .../Dialogs/QuickPaymentMadeFormDialog/utils.tsx           | 7 ++++---
 .../Purchases/PaymentMades/PaymentForm/utils.tsx           | 5 +++--
 .../src/containers/Purchases/PaymentMades/constants.ts     | 5 +++++
 3 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 packages/webapp/src/containers/Purchases/PaymentMades/constants.ts

diff --git a/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/utils.tsx b/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/utils.tsx
index 1b659194d..b90e21da8 100644
--- a/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/utils.tsx
+++ b/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/utils.tsx
@@ -7,6 +7,7 @@ import { Intent } from '@blueprintjs/core';
 import { AppToaster } from '@/components';
 import { useFormikContext } from 'formik';
 import { useQuickPaymentMadeContext } from './QuickPaymentMadeFormProvider';
+import { PAYMENT_MADE_ERRORS } from '@/containers/Purchases/PaymentMades/constants';
 
 // Default initial values of payment made.
 export const defaultPaymentMade = {
@@ -24,16 +25,16 @@ export const defaultPaymentMade = {
 export const transformErrors = (errors, { setFieldError }) => {
   const getError = (errorType) => errors.find((e) => e.type === errorType);
 
-  if (getError('PAYMENT.NUMBER.NOT.UNIQUE')) {
+  if (getError(PAYMENT_MADE_ERRORS.PAYMENT_NUMBER_NOT_UNIQUE)) {
     setFieldError('payment_number', intl.get('payment_number_is_not_unique'));
   }
-  if (getError('INVALID_BILL_PAYMENT_AMOUNT')) {
+  if (getError(PAYMENT_MADE_ERRORS.INVALID_BILL_PAYMENT_AMOUNT)) {
     setFieldError(
       'payment_amount',
       intl.get('the_payment_amount_bigger_than_invoice_due_amount'),
     );
   }
-  if (getError('WITHDRAWAL_ACCOUNT_CURRENCY_INVALID')) {
+  if (getError(PAYMENT_MADE_ERRORS.WITHDRAWAL_ACCOUNT_CURRENCY_INVALID)) {
     AppToaster.show({
       message: intl.get(
         'payment_made.error.withdrawal_account_currency_invalid',
diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/utils.tsx b/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/utils.tsx
index 0714d1042..1b94ef4d6 100644
--- a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/utils.tsx
+++ b/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/utils.tsx
@@ -15,6 +15,7 @@ import {
   formattedAmount,
 } from '@/utils';
 import { useCurrentOrganization } from '@/hooks/state';
+import { PAYMENT_MADE_ERRORS } from '../constants';
 
 export const ERRORS = {
   PAYMENT_NUMBER_NOT_UNIQUE: 'PAYMENT.NUMBER.NOT.UNIQUE',
@@ -124,10 +125,10 @@ export const useSetPrimaryBranchToForm = () => {
 export const transformErrors = (errors, { setFieldError }) => {
   const getError = (errorType) => errors.find((e) => e.type === errorType);
 
-  if (getError('PAYMENT_NUMBER_NOT_UNIQUE')) {
+  if (getError(PAYMENT_MADE_ERRORS.PAYMENT_NUMBER_NOT_UNIQUE)) {
     setFieldError('payment_number', intl.get('payment_number_is_not_unique'));
   }
-  if (getError('WITHDRAWAL_ACCOUNT_CURRENCY_INVALID')) {
+  if (getError(PAYMENT_MADE_ERRORS.WITHDRAWAL_ACCOUNT_CURRENCY_INVALID)) {
     AppToaster.show({
       message: intl.get(
         'payment_made.error.withdrawal_account_currency_invalid',
diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/constants.ts b/packages/webapp/src/containers/Purchases/PaymentMades/constants.ts
new file mode 100644
index 000000000..1813c867c
--- /dev/null
+++ b/packages/webapp/src/containers/Purchases/PaymentMades/constants.ts
@@ -0,0 +1,5 @@
+export const PAYMENT_MADE_ERRORS = {
+  PAYMENT_NUMBER_NOT_UNIQUE: 'PAYMENT.NUMBER.NOT.UNIQUE',
+  WITHDRAWAL_ACCOUNT_CURRENCY_INVALID: 'WITHDRAWAL_ACCOUNT_CURRENCY_INVALID',
+  INVALID_BILL_PAYMENT_AMOUNT: 'INVALID_BILL_PAYMENT_AMOUNT'
+};

From 6373862044932020f821cb281203d990145cb5ba Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Tue, 27 Jun 2023 21:32:04 +0200
Subject: [PATCH 2/9] fix(webapp): No currency in amount field on money in/out
 dialogs

---
 packages/webapp/src/constants/sidebarMenu.tsx |   8 +-
 .../MoneyInDialog/MoneyInContentFields.tsx    |  26 ++--
 .../MoneyInDialog/MoneyInDialogContent.tsx    |   1 -
 .../MoneyInDialog/MoneyInDialogProvider.tsx   |  25 +--
 .../MoneyInExchangeRateField.tsx              |  26 ++++
 .../MoneyInDialog/MoneyInFieldsProvider.tsx   |  34 ++++
 .../CashFlow/MoneyInDialog/MoneyInForm.tsx    |  18 +--
 .../MoneyInDialog/MoneyInFormFields.tsx       |  10 +-
 .../OtherIncome/OtherIncomeFormFields.tsx     | 126 +++++----------
 .../OwnerContributionFormFields.tsx           | 112 +++++---------
 .../MoneyInDialog/TransactionTypeFields.tsx   |  61 +++-----
 .../TransferFromAccountFormFields.tsx         | 135 +++++-----------
 .../CashFlow/MoneyInDialog/index.tsx          |   1 -
 .../CashFlow/MoneyInDialog/utils.tsx          |   3 +-
 .../MoneyOutDialog/MoneyOutContentFields.tsx  |  25 ++-
 .../MoneyOutDialog/MoneyOutDialogProvider.tsx |  28 ++--
 .../MoneyOutExchangeRateField.tsx             |  31 ++++
 .../MoneyOutDialog/MoneyOutFieldsProvider.tsx |  34 ++++
 .../MoneyOutFloatingActions.tsx               |  10 +-
 .../CashFlow/MoneyOutDialog/MoneyOutForm.tsx  |  16 +-
 .../MoneyOutDialog/MoneyOutFormDialog.tsx     |   1 +
 .../MoneyOutDialog/MoneyOutFormFields.tsx     |  14 +-
 .../OtherExpense/OtherExpnseFormFields.tsx    | 137 +++++-----------
 .../OwnerDrawings/OwnerDrawingsFormFields.tsx | 126 +++++----------
 .../MoneyOutDialog/TransactionTypeFields.tsx  |  72 ++++-----
 .../TransferToAccountFormFields.tsx           | 146 ++++++------------
 .../CashFlow/MoneyOutDialog/utils.tsx         |   3 +-
 .../CashFlow/CashflowTransactionForm.scss     |  30 +---
 28 files changed, 519 insertions(+), 740 deletions(-)
 create mode 100644 packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInExchangeRateField.tsx
 create mode 100644 packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInFieldsProvider.tsx
 create mode 100644 packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutExchangeRateField.tsx
 create mode 100644 packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFieldsProvider.tsx

diff --git a/packages/webapp/src/constants/sidebarMenu.tsx b/packages/webapp/src/constants/sidebarMenu.tsx
index 9a60691d2..3f5c16cb1 100644
--- a/packages/webapp/src/constants/sidebarMenu.tsx
+++ b/packages/webapp/src/constants/sidebarMenu.tsx
@@ -25,6 +25,7 @@ import {
   CashflowAction,
   PreferencesAbility,
 } from '@/constants/abilityOption';
+import { DialogsName } from './dialogs';
 
 export const SidebarMenu = [
   // ---------------
@@ -114,7 +115,7 @@ export const SidebarMenu = [
                 text: <T id={'sidebar.new_item_category'} />,
                 href: '/items/categories/new',
                 type: ISidebarMenuItemType.Dialog,
-                dialogName: 'item-category-form',
+                dialogName: DialogsName.ItemCategoryForm,
                 permission: {
                   subject: AbilitySubject.Item,
                   ability: ItemAction.Create,
@@ -458,7 +459,7 @@ export const SidebarMenu = [
             text: <T id={'sidebar.add_money_in'} />,
             href: '/cashflow-accounts',
             type: ISidebarMenuItemType.Dialog,
-            dialogName: 'money-in',
+            dialogName: DialogsName.MoneyInForm,
             permission: {
               subject: AbilitySubject.Cashflow,
               ability: CashflowAction.Create,
@@ -468,6 +469,7 @@ export const SidebarMenu = [
             text: <T id={'sidebar.add_money_out'} />,
             href: '/cashflow-accounts',
             type: ISidebarMenuItemType.Dialog,
+            dialogName: DialogsName.MoneyOutForm,
             permission: {
               subject: AbilitySubject.Cashflow,
               ability: CashflowAction.Create,
@@ -477,6 +479,7 @@ export const SidebarMenu = [
             text: <T id={'sidebar.add_cash_account'} />,
             href: '/cashflow-accounts',
             type: ISidebarMenuItemType.Dialog,
+            dialogName: DialogsName.AccountForm,
             permission: {
               subject: AbilitySubject.Cashflow,
               ability: CashflowAction.Create,
@@ -486,6 +489,7 @@ export const SidebarMenu = [
             text: <T id={'sidebar.add_bank_account'} />,
             href: '/cashflow-accounts',
             type: ISidebarMenuItemType.Dialog,
+            dialogName: DialogsName.AccountForm,
             permission: {
               subject: AbilitySubject.Cashflow,
               ability: CashflowAction.Create,
diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInContentFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInContentFields.tsx
index ee862b763..a5746c5f5 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInContentFields.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInContentFields.tsx
@@ -1,18 +1,22 @@
 // @ts-nocheck
-import React from 'react';
+import React, { useMemo } from 'react';
+import { useFormikContext } from 'formik';
 
 import OwnerContributionFormFields from './OwnerContribution/OwnerContributionFormFields';
 import OtherIncomeFormFields from './OtherIncome/OtherIncomeFormFields';
 import TransferFromAccountFormFields from './TransferFromAccount/TransferFromAccountFormFields';
+import { MoneyInFieldsProvider } from './MoneyInFieldsProvider';
 
 /**
- *
- * @param param0
- * @returns
+ * Money-in dialog content.
+ * Switches between fields based on the given transaction type.
+ * @returns {JSX.Element}
  */
-export default function MoneyInContentFields({ accountType }) {
-  const handleTransactionType = () => {
-    switch (accountType) {
+export default function MoneyInContentFields() {
+  const { values } = useFormikContext();
+
+  const transactionFields = useMemo(() => {
+    switch (values.transaction_type) {
       case 'owner_contribution':
         return <OwnerContributionFormFields />;
 
@@ -24,6 +28,10 @@ export default function MoneyInContentFields({ accountType }) {
       default:
         break;
     }
-  };
-  return <React.Fragment>{handleTransactionType()}</React.Fragment>;
+  }, [values.transaction_type]);
+
+  // Cannot continue if transaction type or account is not selected.
+  if (!values.transaction_type || !values.cashflow_account_id) return null;
+
+  return <MoneyInFieldsProvider>{transactionFields}</MoneyInFieldsProvider>;
 }
diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInDialogContent.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInDialogContent.tsx
index 1674c4ab7..690d720ef 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInDialogContent.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInDialogContent.tsx
@@ -1,6 +1,5 @@
 // @ts-nocheck
 import React from 'react';
-
 import { MoneyInDialogProvider } from './MoneyInDialogProvider';
 import MoneyInForm from './MoneyInForm';
 
diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInDialogProvider.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInDialogProvider.tsx
index 338bcf045..163f87119 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInDialogProvider.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInDialogProvider.tsx
@@ -1,11 +1,10 @@
 // @ts-nocheck
-import React from 'react';
+import React, { useState } from 'react';
 import { DialogContent } from '@/components';
 import { Features } from '@/constants';
 import { useFeatureCan } from '@/hooks/state';
 import {
   useCreateCashflowTransaction,
-  useAccount,
   useAccounts,
   useBranches,
   useCashflowAccounts,
@@ -18,22 +17,21 @@ const MoneyInDialogContent = React.createContext();
  * Money in dialog provider.
  */
 function MoneyInDialogProvider({
-  accountId,
+  accountId: defaultAccountId,
   accountType,
   dialogName,
   ...props
 }) {
+  // Holds the selected account id.
+  const [accountId, setAccountId] = useState<number | null>(defaultAccountId);
+
+  // Detarmines whether the feature is enabled.
   const { featureCan } = useFeatureCan();
   const isBranchFeatureCan = featureCan(Features.Branches);
 
   // Fetches accounts list.
   const { isLoading: isAccountsLoading, data: accounts } = useAccounts();
 
-  // Fetches the specific account details.
-  const { data: account, isLoading: isAccountLoading } = useAccount(accountId, {
-    enabled: !!accountId,
-  });
-
   // Fetches the branches list.
   const {
     data: branches,
@@ -41,10 +39,11 @@ function MoneyInDialogProvider({
     isSuccess: isBranchesSuccess,
   } = useBranches({}, { enabled: isBranchFeatureCan });
 
-  // Fetch cash flow list .
+  // Fetch cash flow list.
   const { data: cashflowAccounts, isLoading: isCashFlowAccountsLoading } =
     useCashflowAccounts({}, { keepPreviousData: true });
 
+  // Mutation create cashflow transaction.
   const { mutateAsync: createCashflowTransactionMutate } =
     useCreateCashflowTransaction();
 
@@ -57,9 +56,12 @@ function MoneyInDialogProvider({
   // Provider data.
   const provider = {
     accounts,
-    account,
     branches,
+
     accountId,
+    defaultAccountId,
+    setAccountId,
+
     accountType,
     isAccountsLoading,
     isBranchesSuccess,
@@ -77,8 +79,7 @@ function MoneyInDialogProvider({
     isAccountsLoading ||
     isCashFlowAccountsLoading ||
     isBranchesLoading ||
-    isSettingsLoading ||
-    isAccountLoading;
+    isSettingsLoading;
 
   return (
     <DialogContent isLoading={isLoading}>
diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInExchangeRateField.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInExchangeRateField.tsx
new file mode 100644
index 000000000..9f5dc056b
--- /dev/null
+++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInExchangeRateField.tsx
@@ -0,0 +1,26 @@
+// @ts-nocheck
+import React from 'react';
+import { ExchangeRateMutedField } from '@/components';
+import { useForeignAccount } from './utils';
+import { useFormikContext } from 'formik';
+import { useMoneyInFieldsContext } from './MoneyInFieldsProvider';
+
+export function MoneyInExchangeRateField() {
+  const { account } = useMoneyInFieldsContext();
+  const { values } = useFormikContext();
+
+  const isForeigAccount = useForeignAccount();
+
+  if (!isForeigAccount) return null;
+
+  return (
+    <ExchangeRateMutedField
+      name={'exchange_rate'}
+      fromCurrency={values.currency_code}
+      toCurrency={account.currency_code}
+      formGroupProps={{ label: '', inline: false }}
+      date={values.date}
+      exchangeRate={values.exchange_rate}
+    />
+  );
+}
diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInFieldsProvider.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInFieldsProvider.tsx
new file mode 100644
index 000000000..22756d430
--- /dev/null
+++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInFieldsProvider.tsx
@@ -0,0 +1,34 @@
+// @ts-nocheck
+import React from 'react';
+import { DialogContent } from '@/components';
+import { useAccount } from '@/hooks/query';
+import { useMoneyInDailogContext } from './MoneyInDialogProvider';
+
+const MoneyInFieldsContext = React.createContext();
+
+/**
+ * Money in dialog provider.
+ */
+function MoneyInFieldsProvider({ ...props }) {
+  const { accountId } = useMoneyInDailogContext();
+
+  // Fetches the specific account details.
+  const { data: account, isLoading: isAccountLoading } = useAccount(accountId, {
+    enabled: !!accountId,
+  });
+  // Provider data.
+  const provider = {
+    account,
+  };
+  const isLoading = isAccountLoading;
+
+  return (
+    <DialogContent isLoading={isLoading}>
+      <MoneyInFieldsContext.Provider value={provider} {...props} />
+    </DialogContent>
+  );
+}
+
+const useMoneyInFieldsContext = () => React.useContext(MoneyInFieldsContext);
+
+export { MoneyInFieldsProvider, useMoneyInFieldsContext };
diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInForm.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInForm.tsx
index e741e8ae5..9bdc1f9ed 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInForm.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInForm.tsx
@@ -53,7 +53,6 @@ function MoneyInForm({
     accountId,
     accountType,
     createCashflowTransactionMutate,
-    submitPayload,
   } = useMoneyInDailogContext();
 
   // transaction number.
@@ -61,7 +60,6 @@ function MoneyInForm({
     transactionNumberPrefix,
     transactionNextNumber,
   );
-
   // Initial form values.
   const initialValues = {
     ...defaultInitialValues,
@@ -95,15 +93,13 @@ function MoneyInForm({
   };
 
   return (
-    <div>
-      <Formik
-        validationSchema={CreateMoneyInFormSchema}
-        initialValues={initialValues}
-        onSubmit={handleFormSubmit}
-      >
-        <MoneyInFormContent />
-      </Formik>
-    </div>
+    <Formik
+      validationSchema={CreateMoneyInFormSchema}
+      initialValues={initialValues}
+      onSubmit={handleFormSubmit}
+    >
+      <MoneyInFormContent />
+    </Formik>
   );
 }
 
diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInFormFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInFormFields.tsx
index cd1e2a46d..ec6729dcc 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInFormFields.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInFormFields.tsx
@@ -12,17 +12,13 @@ import { useMoneyInDailogContext } from './MoneyInDialogProvider';
  * Money in form fields.
  */
 function MoneyInFormFields() {
-  const { values } = useFormikContext();
-
   // Money in dialog context.
-  const { accountId } = useMoneyInDailogContext();
+  const { defaultAccountId } = useMoneyInDailogContext();
 
   return (
     <div className={Classes.DIALOG_BODY}>
-      <If condition={!accountId}>
-        <TransactionTypeFields />
-      </If>
-      <MoneyInContentFields accountType={values.transaction_type} />
+      {!defaultAccountId && <TransactionTypeFields />}
+      <MoneyInContentFields />
     </div>
   );
 }
diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/OtherIncome/OtherIncomeFormFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/OtherIncome/OtherIncomeFormFields.tsx
index 06ccffea0..30ad76e9b 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyInDialog/OtherIncome/OtherIncomeFormFields.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/OtherIncome/OtherIncomeFormFields.tsx
@@ -1,10 +1,9 @@
 // @ts-nocheck
 import React from 'react';
-import { FastField, Field, ErrorMessage, useFormikContext } from 'formik';
+import { FastField, ErrorMessage } from 'formik';
 import {
   Classes,
   FormGroup,
-  InputGroup,
   TextArea,
   Position,
   ControlGroup,
@@ -18,14 +17,15 @@ import {
   FieldRequiredHint,
   Col,
   Row,
-  If,
   FeatureCan,
   BranchSelect,
   BranchSelectButton,
-  ExchangeRateMutedField,
+  FInputGroup,
+  FFormGroup,
+  FTextArea,
+  FMoneyInputGroup,
 } from '@/components';
 import { DateInput } from '@blueprintjs/datetime';
-import { useAutofocus } from '@/hooks';
 import { CLASSES, ACCOUNT_TYPE, Features } from '@/constants';
 
 import {
@@ -36,22 +36,18 @@ import {
 } from '@/utils';
 
 import { useMoneyInDailogContext } from '../MoneyInDialogProvider';
-import {
-  useSetPrimaryBranchToForm,
-  useForeignAccount,
-  BranchRowDivider,
-} from '../utils';
+import { useSetPrimaryBranchToForm, BranchRowDivider } from '../utils';
 import { MoneyInOutTransactionNoField } from '../../_components';
+import { useMoneyInFieldsContext } from '../MoneyInFieldsProvider';
+import { MoneyInExchangeRateField } from '../MoneyInExchangeRateField';
 
 /**
  * Other income form fields.
  */
 export default function OtherIncomeFormFields() {
   // Money in dialog context.
-  const { accounts, account, branches } = useMoneyInDailogContext();
-  const { values } = useFormikContext();
-  const amountFieldRef = useAutofocus();
-  const isForeigAccount = useForeignAccount();
+  const { accounts, branches } = useMoneyInDailogContext();
+  const { account } = useMoneyInFieldsContext();
 
   // Sets the primary branch to form.
   useSetPrimaryBranchToForm();
@@ -61,17 +57,14 @@ export default function OtherIncomeFormFields() {
       <FeatureCan feature={Features.Branches}>
         <Row>
           <Col xs={5}>
-            <FormGroup
-              label={<T id={'branch'} />}
-              className={classNames('form-group--select-list', Classes.FILL)}
-            >
+            <FFormGroup name={'amount'} label={<T id={'branch'} />}>
               <BranchSelect
                 name={'branch_id'}
                 branches={branches}
                 input={BranchSelectButton}
                 popoverProps={{ minimal: true }}
               />
-            </FormGroup>
+            </FFormGroup>
           </Col>
         </Row>
         <BranchRowDivider />
@@ -111,48 +104,26 @@ export default function OtherIncomeFormFields() {
           <MoneyInOutTransactionNoField />
         </Col>
       </Row>
-      {/*------------ amount -----------*/}
-      <FastField name={'amount'}>
-        {({
-          form: { values, setFieldValue },
-          field: { value },
-          meta: { error, touched },
-        }) => (
-          <FormGroup
+
+      {/*------------ Amount -----------*/}
+      <Row>
+        <Col xs={10}>
+          <FFormGroup
+            name={'amount'}
             label={<T id={'amount'} />}
             labelInfo={<FieldRequiredHint />}
-            intent={inputIntent({ error, touched })}
-            helperText={<ErrorMessage name="amount" />}
-            className={'form-group--amount'}
           >
             <ControlGroup>
               <InputPrependText text={account.currency_code} />
-
-              <MoneyInputGroup
-                value={value}
-                minimal={true}
-                onChange={(amount) => {
-                  setFieldValue('amount', amount);
-                }}
-                inputRef={(ref) => (amountFieldRef.current = ref)}
-                intent={inputIntent({ error, touched })}
-              />
+              <FMoneyInputGroup name={'amount'} minimal={true} />
             </ControlGroup>
-          </FormGroup>
-        )}
-      </FastField>
+          </FFormGroup>
+        </Col>
+      </Row>
+
+      {/*------------ Exchange rate -----------*/}
+      <MoneyInExchangeRateField />
 
-      <If condition={isForeigAccount}>
-        {/*------------ exchange rate -----------*/}
-        <ExchangeRateMutedField
-          name={'exchange_rate'}
-          fromCurrency={values.currency_code}
-          toCurrency={account.currency_code}
-          formGroupProps={{ label: '', inline: false }}
-          date={values.date}
-          exchangeRate={values.exchange_rate}
-        />
-      </If>
       <Row>
         <Col xs={5}>
           {/*------------ other income account -----------*/}
@@ -182,43 +153,24 @@ export default function OtherIncomeFormFields() {
             )}
           </FastField>
         </Col>
+
         <Col xs={5}>
           {/*------------ Reference -----------*/}
-          <FastField name={'reference_no'}>
-            {({ form, field, meta: { error, touched } }) => (
-              <FormGroup
-                label={<T id={'reference_no'} />}
-                intent={inputIntent({ error, touched })}
-                helperText={<ErrorMessage name="reference_no" />}
-                className={'form-group--reference-no'}
-              >
-                <InputGroup
-                  intent={inputIntent({ error, touched })}
-                  {...field}
-                />
-              </FormGroup>
-            )}
-          </FastField>
+          <FFormGroup label={<T id={'reference_no'} />} name={'reference_no'}>
+            <FInputGroup name={'reference_no'} />
+          </FFormGroup>
         </Col>
       </Row>
-      {/*------------ description -----------*/}
-      <FastField name={'description'}>
-        {({ field, meta: { error, touched } }) => (
-          <FormGroup
-            label={<T id={'description'} />}
-            className={'form-group--description'}
-            intent={inputIntent({ error, touched })}
-            helperText={<ErrorMessage name={'description'} />}
-          >
-            <TextArea
-              growVertically={true}
-              large={true}
-              intent={inputIntent({ error, touched })}
-              {...field}
-            />
-          </FormGroup>
-        )}
-      </FastField>
+
+      {/*------------ Description -----------*/}
+      <FFormGroup name={'description'} label={<T id={'description'} />}>
+        <FTextArea
+          name={'description'}
+          growVertically={true}
+          large={true}
+          fill={true}
+        />
+      </FFormGroup>
     </React.Fragment>
   );
 }
diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/OwnerContribution/OwnerContributionFormFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/OwnerContribution/OwnerContributionFormFields.tsx
index 204de591b..520c2d51c 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyInDialog/OwnerContribution/OwnerContributionFormFields.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/OwnerContribution/OwnerContributionFormFields.tsx
@@ -1,14 +1,7 @@
 // @ts-nocheck
 import React from 'react';
-import { FastField, Field, ErrorMessage, useFormikContext } from 'formik';
-import {
-  Classes,
-  FormGroup,
-  InputGroup,
-  TextArea,
-  Position,
-  ControlGroup,
-} from '@blueprintjs/core';
+import { FastField, ErrorMessage, useFormikContext } from 'formik';
+import { FormGroup, Position, ControlGroup } from '@blueprintjs/core';
 import classNames from 'classnames';
 
 import {
@@ -24,9 +17,12 @@ import {
   BranchSelect,
   BranchSelectButton,
   FeatureCan,
+  FFormGroup,
+  FMoneyInputGroup,
+  FTextArea,
+  FInputGroup,
 } from '@/components';
 import { DateInput } from '@blueprintjs/datetime';
-import { useAutofocus } from '@/hooks';
 import { ACCOUNT_TYPE, CLASSES, Features } from '@/constants';
 import {
   inputIntent,
@@ -41,6 +37,7 @@ import {
   BranchRowDivider,
 } from '../../MoneyInDialog/utils';
 import { MoneyInOutTransactionNoField } from '../../_components';
+import { useMoneyInFieldsContext } from '../MoneyInFieldsProvider';
 
 /**
 /**
@@ -48,12 +45,11 @@ import { MoneyInOutTransactionNoField } from '../../_components';
  */
 export default function OwnerContributionFormFields() {
   // Money in dialog context.
-  const { accounts, account, branches } = useMoneyInDailogContext();
+  const { accounts, branches } = useMoneyInDailogContext();
+  const { account } = useMoneyInFieldsContext();
 
   const { values } = useFormikContext();
 
-  const amountFieldRef = useAutofocus();
-
   const isForeigAccount = useForeignAccount();
 
   // Sets the primary branch to form.
@@ -64,21 +60,19 @@ export default function OwnerContributionFormFields() {
       <FeatureCan feature={Features.Branches}>
         <Row>
           <Col xs={5}>
-            <FormGroup
-              label={<T id={'branch'} />}
-              className={classNames('form-group--select-list', Classes.FILL)}
-            >
+            <FFormGroup name={'branch_id'} label={<T id={'branch'} />}>
               <BranchSelect
                 name={'branch_id'}
                 branches={branches}
                 input={BranchSelectButton}
                 popoverProps={{ minimal: true }}
               />
-            </FormGroup>
+            </FFormGroup>
           </Col>
         </Row>
         <BranchRowDivider />
       </FeatureCan>
+
       <Row>
         <Col xs={5}>
           {/*------------ Date -----------*/}
@@ -113,36 +107,23 @@ export default function OwnerContributionFormFields() {
           <MoneyInOutTransactionNoField />
         </Col>
       </Row>
-      {/*------------ amount -----------*/}
-      <Field name={'amount'}>
-        {({
-          form: { values, setFieldValue },
-          field: { value },
-          meta: { error, touched },
-        }) => (
-          <FormGroup
+
+      {/*------------ Amount -----------*/}
+      <Row>
+        <Col xs={10}>
+          <FFormGroup
+            name={'amount'}
             label={<T id={'amount'} />}
             labelInfo={<FieldRequiredHint />}
-            intent={inputIntent({ error, touched })}
-            helperText={<ErrorMessage name="amount" />}
-            className={'form-group--amount'}
           >
             <ControlGroup>
-              <InputPrependText text={account?.currency_code} />
-
-              <MoneyInputGroup
-                value={value}
-                minimal={true}
-                onChange={(amount) => {
-                  setFieldValue('amount', amount);
-                }}
-                inputRef={(ref) => (amountFieldRef.current = ref)}
-                intent={inputIntent({ error, touched })}
-              />
+              <InputPrependText text={account?.currency_code || '--'} />
+              <FMoneyInputGroup name={'amount'} minimal={true} />
             </ControlGroup>
-          </FormGroup>
-        )}
-      </Field>
+          </FFormGroup>
+        </Col>
+      </Row>
+
       <If condition={isForeigAccount}>
         {/*------------ exchange rate -----------*/}
         <ExchangeRateMutedField
@@ -181,43 +162,24 @@ export default function OwnerContributionFormFields() {
             )}
           </FastField>
         </Col>
+
         <Col xs={5}>
           {/*------------ Reference -----------*/}
-          <FastField name={'reference_no'}>
-            {({ form, field, meta: { error, touched } }) => (
-              <FormGroup
-                label={<T id={'reference_no'} />}
-                intent={inputIntent({ error, touched })}
-                helperText={<ErrorMessage name="reference_no" />}
-                className={'form-group--reference-no'}
-              >
-                <InputGroup
-                  intent={inputIntent({ error, touched })}
-                  {...field}
-                />
-              </FormGroup>
-            )}
-          </FastField>
+          <FFormGroup name={'reference_no'} label={<T id={'reference_no'} />}>
+            <FInputGroup name={'reference_no'} />
+          </FFormGroup>
         </Col>
       </Row>
+
       {/*------------ description -----------*/}
-      <FastField name={'description'}>
-        {({ field, meta: { error, touched } }) => (
-          <FormGroup
-            label={<T id={'description'} />}
-            className={'form-group--description'}
-            intent={inputIntent({ error, touched })}
-            helperText={<ErrorMessage name={'description'} />}
-          >
-            <TextArea
-              growVertically={true}
-              large={true}
-              intent={inputIntent({ error, touched })}
-              {...field}
-            />
-          </FormGroup>
-        )}
-      </FastField>
+      <FFormGroup name={'description'} label={<T id={'description'} />}>
+        <FTextArea
+          name={'description'}
+          growVertically={true}
+          large={true}
+          fill={true}
+        />
+      </FFormGroup>
     </React.Fragment>
   );
 }
diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/TransactionTypeFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/TransactionTypeFields.tsx
index 8a4c37ac4..b9fc9ac8c 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyInDialog/TransactionTypeFields.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/TransactionTypeFields.tsx
@@ -10,6 +10,8 @@ import {
   ListSelect,
   Col,
   Row,
+  FFormGroup,
+  FSelect,
 } from '@/components';
 import { inputIntent } from '@/utils';
 import { CLASSES, getAddMoneyInOptions } from '@/constants';
@@ -21,7 +23,7 @@ import { useMoneyInDailogContext } from './MoneyInDialogProvider';
  */
 export default function TransactionTypeFields() {
   // Money in dialog context.
-  const { cashflowAccounts } = useMoneyInDailogContext();
+  const { cashflowAccounts, setAccountId } = useMoneyInDailogContext();
 
   // Retrieves the add money in button options.
   const addMoneyInOptions = useMemo(() => getAddMoneyInOptions(), []);
@@ -29,6 +31,23 @@ export default function TransactionTypeFields() {
   return (
     <div className="trasnaction-type-fileds">
       <Row>
+        <Col xs={5}>
+          {/*------------ Transaction type -----------*/}
+          <FFormGroup
+            name={'transaction_type'}
+            label={<T id={'transaction_type'} />}
+            labelInfo={<FieldRequiredHint />}
+          >
+            <FSelect
+              name={'transaction_type'}
+              items={addMoneyInOptions}
+              popoverProps={{ minimal: true }}
+              valueAccessor={'value'}
+              textAccessor={'name'}
+            />
+          </FFormGroup>
+        </Col>
+
         <Col xs={5}>
           {/*------------ Current account -----------*/}
           <FastField name={'cashflow_account_id'}>
@@ -46,9 +65,10 @@ export default function TransactionTypeFields() {
               >
                 <AccountsSuggestField
                   accounts={cashflowAccounts}
-                  onAccountSelected={({ id }) =>
-                    form.setFieldValue('cashflow_account_id', id)
-                  }
+                  onAccountSelected={({ id }) => {
+                    form.setFieldValue('cashflow_account_id', id);
+                    setAccountId(id);
+                  }}
                   inputProps={{
                     intent: inputIntent({ error, touched }),
                   }}
@@ -56,39 +76,6 @@ export default function TransactionTypeFields() {
               </FormGroup>
             )}
           </FastField>
-          {/*------------ Transaction type -----------*/}
-        </Col>
-        <Col xs={5}>
-          <Field name={'transaction_type'}>
-            {({
-              form: { values, setFieldValue },
-              field: { value },
-              meta: { error, touched },
-            }) => (
-              <FormGroup
-                label={<T id={'transaction_type'} />}
-                labelInfo={<FieldRequiredHint />}
-                helperText={<ErrorMessage name="transaction_type" />}
-                intent={inputIntent({ error, touched })}
-                className={classNames(
-                  CLASSES.FILL,
-                  'form-group--transaction_type',
-                )}
-              >
-                <ListSelect
-                  items={addMoneyInOptions}
-                  onItemSelect={(type) => {
-                    setFieldValue('transaction_type', type.value);
-                  }}
-                  filterable={false}
-                  selectedItem={value}
-                  selectedItemProp={'value'}
-                  textProp={'name'}
-                  popoverProps={{ minimal: true }}
-                />
-              </FormGroup>
-            )}
-          </Field>
         </Col>
       </Row>
     </div>
diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/TransferFromAccount/TransferFromAccountFormFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/TransferFromAccount/TransferFromAccountFormFields.tsx
index 0aba83da9..047d62e44 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyInDialog/TransferFromAccount/TransferFromAccountFormFields.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/TransferFromAccount/TransferFromAccountFormFields.tsx
@@ -1,33 +1,27 @@
 // @ts-nocheck
 import React from 'react';
-import { FastField, Field, ErrorMessage, useFormikContext } from 'formik';
+import { FastField, ErrorMessage } from 'formik';
 import { DateInput } from '@blueprintjs/datetime';
-import {
-  Classes,
-  FormGroup,
-  InputGroup,
-  TextArea,
-  Position,
-  ControlGroup,
-} from '@blueprintjs/core';
+import { FormGroup, Position, ControlGroup } from '@blueprintjs/core';
 import classNames from 'classnames';
 import {
   FormattedMessage as T,
   AccountsSuggestField,
   InputPrependText,
-  MoneyInputGroup,
   FieldRequiredHint,
   Col,
   Row,
-  If,
-  ExchangeRateMutedField,
   FeatureCan,
   BranchSelect,
   BranchSelectButton,
+  FMoneyInputGroup,
+  FInputGroup,
+  FFormGroup,
+  FTextArea,
 } from '@/components';
-import { useAutofocus } from '@/hooks';
+import { MoneyInOutTransactionNoField } from '../../_components';
+import { MoneyInExchangeRateField } from '../MoneyInExchangeRateField';
 import { CLASSES, ACCOUNT_TYPE, Features } from '@/constants';
-
 import {
   inputIntent,
   momentFormatter,
@@ -35,25 +29,19 @@ import {
   handleDateChange,
 } from '@/utils';
 import { useMoneyInDailogContext } from '../MoneyInDialogProvider';
+import { useMoneyInFieldsContext } from '../MoneyInFieldsProvider';
 import {
   useSetPrimaryBranchToForm,
-  useForeignAccount,
   BranchRowDivider,
 } from '../../MoneyInDialog/utils';
 
-import { MoneyInOutTransactionNoField } from '../../_components';
-
 /**
  * Transfer from account form fields.
  */
 export default function TransferFromAccountFormFields() {
   // Money in dialog context.
-  const { accounts, account, branches } = useMoneyInDailogContext();
-
-  const isForeigAccount = useForeignAccount();
-  const amountFieldRef = useAutofocus();
-
-  const { values } = useFormikContext();
+  const { accounts, branches } = useMoneyInDailogContext();
+  const { account } = useMoneyInFieldsContext();
 
   // Sets the primary branch to form.
   useSetPrimaryBranchToForm();
@@ -63,17 +51,14 @@ export default function TransferFromAccountFormFields() {
       <FeatureCan feature={Features.Branches}>
         <Row>
           <Col xs={5}>
-            <FormGroup
-              label={<T id={'branch'} />}
-              className={classNames('form-group--select-list', Classes.FILL)}
-            >
+            <FFormGroup label={<T id={'branch'} />} name={'branch_id'}>
               <BranchSelect
                 name={'branch_id'}
                 branches={branches}
                 input={BranchSelectButton}
                 popoverProps={{ minimal: true }}
               />
-            </FormGroup>
+            </FFormGroup>
           </Col>
         </Row>
         <BranchRowDivider />
@@ -112,50 +97,27 @@ export default function TransferFromAccountFormFields() {
           <MoneyInOutTransactionNoField />
         </Col>
       </Row>
-      {/*------------ amount -----------*/}
-      <FastField name={'amount'}>
-        {({
-          form: { values, setFieldValue },
-          field: { value },
-          meta: { error, touched },
-        }) => (
+      {/*------------ Amount -----------*/}
+      <Row>
+        <Col xs={10}>
           <FormGroup
             label={<T id={'amount'} />}
             labelInfo={<FieldRequiredHint />}
-            intent={inputIntent({ error, touched })}
-            helperText={<ErrorMessage name="amount" />}
-            className={'form-group--amount'}
           >
             <ControlGroup>
-              <InputPrependText text={account.currency_code} />
-
-              <MoneyInputGroup
-                value={value}
-                minimal={true}
-                onChange={(amount) => {
-                  setFieldValue('amount', amount);
-                }}
-                inputRef={(ref) => (amountFieldRef.current = ref)}
-                intent={inputIntent({ error, touched })}
-              />
+              <InputPrependText text={account.currency_code || '--'} />
+              <FMoneyInputGroup name={'amount'} minimal={true} />
             </ControlGroup>
           </FormGroup>
-        )}
-      </FastField>
-      <If condition={isForeigAccount}>
-        {/*------------ exchange rate -----------*/}
-        <ExchangeRateMutedField
-          name={'exchange_rate'}
-          fromCurrency={values.currency_code}
-          toCurrency={account.currency_code}
-          formGroupProps={{ label: '', inline: false }}
-          date={values.date}
-          exchangeRate={values.exchange_rate}
-        />
-      </If>
+        </Col>
+      </Row>
+
+      {/*------------ Exchange rate -----------*/}
+      <MoneyInExchangeRateField />
+
       <Row>
         <Col xs={5}>
-          {/*------------ transfer from account -----------*/}
+          {/*------------ Transfer from account -----------*/}
           <FastField name={'credit_account_id'}>
             {({ form, field, meta: { error, touched } }) => (
               <FormGroup
@@ -185,43 +147,24 @@ export default function TransferFromAccountFormFields() {
             )}
           </FastField>
         </Col>
+
         <Col xs={5}>
           {/*------------ Reference -----------*/}
-          <FastField name={'reference_no'}>
-            {({ form, field, meta: { error, touched } }) => (
-              <FormGroup
-                label={<T id={'reference_no'} />}
-                intent={inputIntent({ error, touched })}
-                helperText={<ErrorMessage name="reference_no" />}
-                className={'form-group--reference-no'}
-              >
-                <InputGroup
-                  intent={inputIntent({ error, touched })}
-                  {...field}
-                />
-              </FormGroup>
-            )}
-          </FastField>
+          <FFormGroup name={'reference_no'} label={<T id={'reference_no'} />}>
+            <FInputGroup name={'reference_no'} />
+          </FFormGroup>
         </Col>
       </Row>
-      {/*------------ description -----------*/}
-      <FastField name={'description'}>
-        {({ field, meta: { error, touched } }) => (
-          <FormGroup
-            label={<T id={'description'} />}
-            className={'form-group--description'}
-            intent={inputIntent({ error, touched })}
-            helperText={<ErrorMessage name={'description'} />}
-          >
-            <TextArea
-              growVertically={true}
-              large={true}
-              intent={inputIntent({ error, touched })}
-              {...field}
-            />
-          </FormGroup>
-        )}
-      </FastField>
+
+      {/*------------ Description -----------*/}
+      <FormGroup name={'description'} label={<T id={'description'} />}>
+        <FTextArea
+          name={'description'}
+          growVertically={true}
+          large={true}
+          fill={true}
+        />
+      </FormGroup>
     </React.Fragment>
   );
 }
diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/index.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/index.tsx
index 18e1bb292..15b48cf4d 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyInDialog/index.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/index.tsx
@@ -3,7 +3,6 @@ import React from 'react';
 import intl from 'react-intl-universal';
 import { Dialog, DialogSuspense } from '@/components';
 import withDialogRedux from '@/components/DialogReduxConnect';
-
 import { compose } from '@/utils';
 
 const MoneyInDialogContent = React.lazy(() => import('./MoneyInDialogContent'));
diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/utils.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/utils.tsx
index bd4333dec..d1bc1739c 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyInDialog/utils.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/utils.tsx
@@ -6,6 +6,7 @@ import { transactionNumber } from '@/utils';
 import { isEqual, isNull, first } from 'lodash';
 
 import { useMoneyInDailogContext } from './MoneyInDialogProvider';
+import { useMoneyInFieldsContext } from './MoneyInFieldsProvider';
 
 export const useObserveTransactionNoSettings = (prefix, nextNumber) => {
   const { setFieldValue } = useFormikContext();
@@ -33,7 +34,7 @@ export const useSetPrimaryBranchToForm = () => {
 
 export const useForeignAccount = () => {
   const { values } = useFormikContext();
-  const { account } = useMoneyInDailogContext();
+  const { account } = useMoneyInFieldsContext();
 
   return (
     !isEqual(account.currency_code, values.currency_code) &&
diff --git a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutContentFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutContentFields.tsx
index 5f0f18876..1e8012e3d 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutContentFields.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutContentFields.tsx
@@ -1,13 +1,22 @@
 // @ts-nocheck
-import React from 'react';
+import React, { useMemo } from 'react';
+import { useFormikContext } from 'formik';
 
 import OtherExpnseFormFields from './OtherExpense/OtherExpnseFormFields';
 import OwnerDrawingsFormFields from './OwnerDrawings/OwnerDrawingsFormFields';
 import TransferToAccountFormFields from './TransferToAccount/TransferToAccountFormFields';
+import { MoneyOutFieldsProvider } from './MoneyOutFieldsProvider';
 
-function MoneyOutContentFields({ accountType }) {
-  const handleTransactionType = () => {
-    switch (accountType) {
+/**
+ * Money out content fields.
+ * Switches between form fields based on the given transaction type.
+ * @returns {JSX.Element}
+ */
+function MoneyOutContentFields() {
+  const { values } = useFormikContext();
+
+  const transactionType = useMemo(() => {
+    switch (values.transaction_type) {
       case 'OwnerDrawing':
         return <OwnerDrawingsFormFields />;
 
@@ -19,8 +28,12 @@ function MoneyOutContentFields({ accountType }) {
       default:
         break;
     }
-  };
-  return <React.Fragment>{handleTransactionType()}</React.Fragment>;
+  }, [values.transaction_type]);
+
+  // Cannot continue if transaction type or account is not selected.
+  if (!values.transaction_type || !values.cashflow_account_id) return null;
+
+  return <MoneyOutFieldsProvider>{transactionType}</MoneyOutFieldsProvider>;
 }
 
 export default MoneyOutContentFields;
diff --git a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutDialogProvider.tsx b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutDialogProvider.tsx
index 357eb354c..e975e1a55 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutDialogProvider.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutDialogProvider.tsx
@@ -1,11 +1,10 @@
 // @ts-nocheck
-import React from 'react';
+import React, { useState } from 'react';
 import { DialogContent } from '@/components';
 import { Features } from '@/constants';
 import { useFeatureCan } from '@/hooks/state';
 import {
   useAccounts,
-  useAccount,
   useBranches,
   useCreateCashflowTransaction,
   useCashflowAccounts,
@@ -17,7 +16,15 @@ const MoneyInDialogContent = React.createContext();
 /**
  * Money out dialog provider.
  */
-function MoneyOutProvider({ accountId, accountType, dialogName, ...props }) {
+function MoneyOutProvider({
+  accountId: defaultAccountId,
+  accountType,
+  dialogName,
+  ...props
+}) {
+  // Holds the selected account id of the dialog.
+  const [accountId, setAccountId] = useState<number | null>(defaultAccountId);
+
   // Features guard.
   const { featureCan } = useFeatureCan();
   const isBranchFeatureCan = featureCan(Features.Branches);
@@ -25,11 +32,6 @@ function MoneyOutProvider({ accountId, accountType, dialogName, ...props }) {
   // Fetches accounts list.
   const { isLoading: isAccountsLoading, data: accounts } = useAccounts();
 
-  // Fetches the specific account details.
-  const { data: account, isLoading: isAccountLoading } = useAccount(accountId, {
-    enabled: !!accountId,
-  });
-
   // Fetches the branches list.
   const {
     data: branches,
@@ -41,6 +43,7 @@ function MoneyOutProvider({ accountId, accountType, dialogName, ...props }) {
   const { data: cashflowAccounts, isLoading: isCashFlowAccountsLoading } =
     useCashflowAccounts({}, { keepPreviousData: true });
 
+  // Mutation to create a new cashflow account.
   const { mutateAsync: createCashflowTransactionMutate } =
     useCreateCashflowTransaction();
 
@@ -52,9 +55,11 @@ function MoneyOutProvider({ accountId, accountType, dialogName, ...props }) {
 
   // Provider data.
   const provider = {
-    accounts,
-    account,
     accountId,
+    setAccountId,
+    defaultAccountId,
+
+    accounts,
     accountType,
     branches,
     isAccountsLoading,
@@ -73,8 +78,7 @@ function MoneyOutProvider({ accountId, accountType, dialogName, ...props }) {
     isAccountsLoading ||
     isCashFlowAccountsLoading ||
     isBranchesLoading ||
-    isSettingsLoading ||
-    isAccountLoading;
+    isSettingsLoading;
 
   return (
     <DialogContent isLoading={isLoading}>
diff --git a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutExchangeRateField.tsx b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutExchangeRateField.tsx
new file mode 100644
index 000000000..cb9134e14
--- /dev/null
+++ b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutExchangeRateField.tsx
@@ -0,0 +1,31 @@
+// @ts-nocheck
+import React from 'react';
+import { useFormikContext } from 'formik';
+import { useForeignAccount } from './utils';
+import { ExchangeRateMutedField } from '@/components';
+import { useMoneyOutFieldsContext } from './MoneyOutFieldsProvider';
+
+/**
+ * Money-out exchange rate field.
+ * @returns {JSX.Element}
+ */
+export function MoneyOutExchangeRateField() {
+  const { values } = useFormikContext();
+
+  const { account } = useMoneyOutFieldsContext();
+  const isForeigAccount = useForeignAccount();
+
+  // Cannot continue if the account is not foreign account.
+  if (!isForeigAccount) return null;
+
+  return (
+    <ExchangeRateMutedField
+      name={'exchange_rate'}
+      fromCurrency={values?.currency_code}
+      toCurrency={account?.currency_code}
+      formGroupProps={{ label: '', inline: false }}
+      date={values.date}
+      exchangeRate={values.exchange_rate}
+    />
+  );
+}
diff --git a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFieldsProvider.tsx b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFieldsProvider.tsx
new file mode 100644
index 000000000..e6fbdb4cd
--- /dev/null
+++ b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFieldsProvider.tsx
@@ -0,0 +1,34 @@
+// @ts-nocheck
+import React from 'react';
+import { DialogContent } from '@/components';
+import { useAccount } from '@/hooks/query';
+import { useMoneyOutDialogContext } from './MoneyOutDialogProvider';
+
+const MoneyOutFieldsContext = React.createContext();
+
+/**
+ * Money out fields dialog provider.
+ */
+function MoneyOutFieldsProvider({ ...props }) {
+  const { accountId } = useMoneyOutDialogContext();
+
+  // Fetches the specific account details.
+  const { data: account, isLoading: isAccountLoading } = useAccount(accountId, {
+    enabled: !!accountId,
+  });
+  // Provider data.
+  const provider = {
+    account,
+  };
+  const isLoading = isAccountLoading;
+
+  return (
+    <DialogContent isLoading={isLoading}>
+      <MoneyOutFieldsContext.Provider value={provider} {...props} />
+    </DialogContent>
+  );
+}
+
+const useMoneyOutFieldsContext = () => React.useContext(MoneyOutFieldsContext);
+
+export { MoneyOutFieldsProvider, useMoneyOutFieldsContext };
diff --git a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFloatingActions.tsx b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFloatingActions.tsx
index a370d328d..a39c34409 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFloatingActions.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFloatingActions.tsx
@@ -24,18 +24,16 @@ function MoneyOutFloatingActions({
     useMoneyOutDialogContext();
 
   // handle submit as draft button click.
-  const handleSubmitDraftBtnClick = (event) => {
+  const handleSubmitDraftBtnClick = () => {
     setSubmitPayload({ publish: false });
     submitForm();
   };
-
   // Handle submit  button click.
-  const handleSubmittBtnClick = (event) => {
+  const handleSubmittBtnClick = () => {
     setSubmitPayload({ publish: true });
   };
-
   // Handle close button click.
-  const handleCloseBtnClick = (event) => {
+  const handleCloseBtnClick = () => {
     closeDialog(dialogName);
   };
 
@@ -49,7 +47,7 @@ function MoneyOutFloatingActions({
         >
           <T id={'close'} />
         </Button>
-    
+
         <Button
           intent={Intent.PRIMARY}
           disabled={isSubmitting}
diff --git a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutForm.tsx b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutForm.tsx
index 432726f31..8f48e07dd 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutForm.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutForm.tsx
@@ -92,15 +92,13 @@ function MoneyOutForm({
       });
   };
   return (
-    <div>
-      <Formik
-        validationSchema={CreateMoneyOutSchema}
-        initialValues={initialValues}
-        onSubmit={handleFormSubmit}
-      >
-        <MoneyOutFormContent />
-      </Formik>
-    </div>
+    <Formik
+      validationSchema={CreateMoneyOutSchema}
+      initialValues={initialValues}
+      onSubmit={handleFormSubmit}
+    >
+      <MoneyOutFormContent />
+    </Formik>
   );
 }
 
diff --git a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFormDialog.tsx b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFormDialog.tsx
index d104fce21..2febd6961 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFormDialog.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFormDialog.tsx
@@ -17,6 +17,7 @@ export default function MoneyOutFormDialog() {
     setFieldValue('transaction_number', incrementNumber || '');
     setFieldValue('transaction_number_manually', manually);
   };
+
   return (
     <React.Fragment>
       <TransactionNumberDialog
diff --git a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFormFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFormFields.tsx
index 7cd637420..ba9ab01e2 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFormFields.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFormFields.tsx
@@ -1,28 +1,18 @@
 // @ts-nocheck
 import React from 'react';
-import { useFormikContext } from 'formik';
 import { Classes } from '@blueprintjs/core';
 
-import { If } from '@/components';
-
 import MoneyOutContentFields from './MoneyOutContentFields';
 import TransactionTypeFields from './TransactionTypeFields';
-import { useMoneyOutDialogContext } from './MoneyOutDialogProvider';
 
 /**
  * Money out form fields.
  */
 function MoneyOutFormFields() {
-  // Money in dialog context.
-  const { accountId } = useMoneyOutDialogContext();
-
-  const { values } = useFormikContext();
   return (
     <div className={Classes.DIALOG_BODY}>
-      <If condition={!accountId}>
-        <TransactionTypeFields />
-      </If>
-      <MoneyOutContentFields accountType={values.transaction_type} />
+      <TransactionTypeFields />
+      <MoneyOutContentFields />
     </div>
   );
 }
diff --git a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/OtherExpense/OtherExpnseFormFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/OtherExpense/OtherExpnseFormFields.tsx
index bfbdf845c..36373c84a 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/OtherExpense/OtherExpnseFormFields.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/OtherExpense/OtherExpnseFormFields.tsx
@@ -1,33 +1,25 @@
 // @ts-nocheck
 import React from 'react';
-import { FastField, Field, ErrorMessage, useFormikContext } from 'formik';
-import {
-  Classes,
-  FormGroup,
-  InputGroup,
-  TextArea,
-  Position,
-  ControlGroup,
-} from '@blueprintjs/core';
+import { FastField, ErrorMessage } from 'formik';
+import { FormGroup, Position, ControlGroup } from '@blueprintjs/core';
 import classNames from 'classnames';
 import {
   FormattedMessage as T,
   AccountsSuggestField,
   InputPrependText,
-  MoneyInputGroup,
   FieldRequiredHint,
   Col,
   Row,
-  If,
   FeatureCan,
   BranchSelect,
   BranchSelectButton,
-  ExchangeRateMutedField,
+  FTextArea,
+  FFormGroup,
+  FInputGroup,
+  FMoneyInputGroup,
 } from '@/components';
 import { DateInput } from '@blueprintjs/datetime';
-import { useAutofocus } from '@/hooks';
 import { Features, ACCOUNT_TYPE } from '@/constants';
-
 import {
   inputIntent,
   momentFormatter,
@@ -36,25 +28,18 @@ import {
 } from '@/utils';
 import { CLASSES } from '@/constants/classes';
 import { useMoneyOutDialogContext } from '../MoneyOutDialogProvider';
-import {
-  useSetPrimaryBranchToForm,
-  useForeignAccount,
-  BranchRowDivider,
-} from '../utils';
-
+import { useSetPrimaryBranchToForm, BranchRowDivider } from '../utils';
 import { MoneyInOutTransactionNoField } from '../../_components';
+import { MoneyOutExchangeRateField } from '../MoneyOutExchangeRateField';
+import { useMoneyOutFieldsContext } from '../MoneyOutFieldsProvider';
 
 /**
  * Other expense form fields.
  */
 export default function OtherExpnseFormFields() {
   // Money in dialog context.
-  const { accounts, account, branches } = useMoneyOutDialogContext();
-
-  const isForeigAccount = useForeignAccount();
-  const { values } = useFormikContext();
-
-  const amountFieldRef = useAutofocus();
+  const { accounts, branches } = useMoneyOutDialogContext();
+  const { account } = useMoneyOutFieldsContext();
 
   // Sets the primary branch to form.
   useSetPrimaryBranchToForm();
@@ -64,21 +49,19 @@ export default function OtherExpnseFormFields() {
       <FeatureCan feature={Features.Branches}>
         <Row>
           <Col xs={5}>
-            <FormGroup
-              label={<T id={'branch'} />}
-              className={classNames('form-group--select-list', Classes.FILL)}
-            >
+            <FFormGroup name={'branch_id'} label={<T id={'branch'} />}>
               <BranchSelect
                 name={'branch_id'}
                 branches={branches}
                 input={BranchSelectButton}
                 popoverProps={{ minimal: true }}
               />
-            </FormGroup>
+            </FFormGroup>
           </Col>
         </Row>
         <BranchRowDivider />
       </FeatureCan>
+
       <Row>
         <Col xs={5}>
           {/*------------ Date -----------*/}
@@ -113,47 +96,27 @@ export default function OtherExpnseFormFields() {
           <MoneyInOutTransactionNoField />
         </Col>
       </Row>
+
       {/*------------ amount -----------*/}
-      <FastField name={'amount'}>
-        {({
-          form: { values, setFieldValue },
-          field: { value },
-          meta: { error, touched },
-        }) => (
-          <FormGroup
+
+      <Row>
+        <Col xs={10}>
+          <FFormGroup
+            name={'amount'}
             label={<T id={'amount'} />}
             labelInfo={<FieldRequiredHint />}
-            intent={inputIntent({ error, touched })}
-            helperText={<ErrorMessage name="amount" />}
-            className={'form-group--amount'}
           >
             <ControlGroup>
               <InputPrependText text={account.currency_code} />
-
-              <MoneyInputGroup
-                value={value}
-                minimal={true}
-                onChange={(amount) => {
-                  setFieldValue('amount', amount);
-                }}
-                inputRef={(ref) => (amountFieldRef.current = ref)}
-                intent={inputIntent({ error, touched })}
-              />
+              <FMoneyInputGroup name={'amount'} minimal={true} />
             </ControlGroup>
-          </FormGroup>
-        )}
-      </FastField>
-      <If condition={isForeigAccount}>
-        {/*------------ exchange rate -----------*/}
-        <ExchangeRateMutedField
-          name={'exchange_rate'}
-          fromCurrency={values.currency_code}
-          toCurrency={account.currency_code}
-          formGroupProps={{ label: '', inline: false }}
-          date={values.date}
-          exchangeRate={values.exchange_rate}
-        />
-      </If>
+          </FFormGroup>
+        </Col>
+      </Row>
+
+      {/*------------ Exchange rate -----------*/}
+      <MoneyOutExchangeRateField />
+
       <Row>
         <Col xs={5}>
           {/*------------ other expense account -----------*/}
@@ -183,44 +146,24 @@ export default function OtherExpnseFormFields() {
             )}
           </FastField>
         </Col>
+
         <Col xs={5}>
           {/*------------ Reference -----------*/}
-          <FastField name={'reference_no'}>
-            {({ form, field, meta: { error, touched } }) => (
-              <FormGroup
-                label={<T id={'reference_no'} />}
-                intent={inputIntent({ error, touched })}
-                helperText={<ErrorMessage name="reference_no" />}
-                className={'form-group--reference-no'}
-              >
-                <InputGroup
-                  intent={inputIntent({ error, touched })}
-                  {...field}
-                />
-              </FormGroup>
-            )}
-          </FastField>
+          <FFormGroup name={'reference_no'} label={<T id={'reference_no'} />}>
+            <FInputGroup name={'reference_no'} />
+          </FFormGroup>
         </Col>
       </Row>
 
       {/*------------ description -----------*/}
-      <FastField name={'description'}>
-        {({ field, meta: { error, touched } }) => (
-          <FormGroup
-            label={<T id={'description'} />}
-            className={'form-group--description'}
-            intent={inputIntent({ error, touched })}
-            helperText={<ErrorMessage name={'description'} />}
-          >
-            <TextArea
-              growVertically={true}
-              large={true}
-              intent={inputIntent({ error, touched })}
-              {...field}
-            />
-          </FormGroup>
-        )}
-      </FastField>
+      <FFormGroup name={'description'} label={<T id={'description'} />}>
+        <FTextArea
+          name={'description'}
+          growVertically={true}
+          large={true}
+          fill={true}
+        />
+      </FFormGroup>
     </React.Fragment>
   );
 }
diff --git a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/OwnerDrawings/OwnerDrawingsFormFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/OwnerDrawings/OwnerDrawingsFormFields.tsx
index 8630c5b03..ffb944f90 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/OwnerDrawings/OwnerDrawingsFormFields.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/OwnerDrawings/OwnerDrawingsFormFields.tsx
@@ -1,31 +1,24 @@
 // @ts-nocheck
 import React from 'react';
-import { FastField, Field, ErrorMessage, useFormikContext } from 'formik';
+import { FastField, ErrorMessage } from 'formik';
 import { DateInput } from '@blueprintjs/datetime';
-import {
-  Classes,
-  FormGroup,
-  InputGroup,
-  TextArea,
-  Position,
-  ControlGroup,
-} from '@blueprintjs/core';
+import { FormGroup, Position, ControlGroup } from '@blueprintjs/core';
 import classNames from 'classnames';
 import {
   FormattedMessage as T,
   AccountsSuggestField,
   InputPrependText,
-  MoneyInputGroup,
   FieldRequiredHint,
-  If,
   Col,
   Row,
   FeatureCan,
   BranchSelect,
   BranchSelectButton,
-  ExchangeRateMutedField,
+  FFormGroup,
+  FTextArea,
+  FInputGroup,
+  FMoneyInputGroup,
 } from '@/components';
-import { useAutofocus } from '@/hooks';
 import { CLASSES, Features, ACCOUNT_TYPE } from '@/constants';
 import {
   inputIntent,
@@ -36,21 +29,19 @@ import {
 import { useMoneyOutDialogContext } from '../MoneyOutDialogProvider';
 import {
   useSetPrimaryBranchToForm,
-  useForeignAccount,
   BranchRowDivider,
 } from '../../MoneyOutDialog/utils';
 import { MoneyInOutTransactionNoField } from '../../_components';
+import { useMoneyOutFieldsContext } from '../MoneyOutFieldsProvider';
+import { MoneyOutExchangeRateField } from '../MoneyOutExchangeRateField';
 
 /**
  * Owner drawings form fields.
  */
 export default function OwnerDrawingsFormFields() {
   // Money out dialog context.
-  const { accounts, account, branches } = useMoneyOutDialogContext();
-  const { values } = useFormikContext();
-  const isForeigAccount = useForeignAccount();
-
-  const amountFieldRef = useAutofocus();
+  const { accounts, branches } = useMoneyOutDialogContext();
+  const { account } = useMoneyOutFieldsContext();
 
   // Sets the primary branch to form.
   useSetPrimaryBranchToForm();
@@ -60,21 +51,19 @@ export default function OwnerDrawingsFormFields() {
       <FeatureCan feature={Features.Branches}>
         <Row>
           <Col xs={5}>
-            <FormGroup
-              label={<T id={'branch'} />}
-              className={classNames('form-group--select-list', Classes.FILL)}
-            >
+            <FFormGroup label={<T id={'branch'} />} name={'branch_id'}>
               <BranchSelect
                 name={'branch_id'}
                 branches={branches}
                 input={BranchSelectButton}
                 popoverProps={{ minimal: true }}
               />
-            </FormGroup>
+            </FFormGroup>
           </Col>
         </Row>
         <BranchRowDivider />
       </FeatureCan>
+
       <Row>
         <Col xs={5}>
           {/*------------ Date -----------*/}
@@ -109,48 +98,27 @@ export default function OwnerDrawingsFormFields() {
           <MoneyInOutTransactionNoField />
         </Col>
       </Row>
-      {/*------------ amount -----------*/}
-      <Field name={'amount'}>
-        {({
-          form: { values, setFieldValue },
-          field: { value },
-          meta: { error, touched },
-        }) => (
+
+      {/*------------ Amount -----------*/}
+
+      <Row>
+        <Col xs={10}>
           <FormGroup
+            name={'amount'}
             label={<T id={'amount'} />}
             labelInfo={<FieldRequiredHint />}
-            intent={inputIntent({ error, touched })}
-            helperText={<ErrorMessage name="amount" />}
-            className={'form-group--amount'}
           >
             <ControlGroup>
               <InputPrependText text={account.currency_code} />
-
-              <MoneyInputGroup
-                value={value}
-                minimal={true}
-                onChange={(amount) => {
-                  setFieldValue('amount', amount);
-                }}
-                inputRef={(ref) => (amountFieldRef.current = ref)}
-                intent={inputIntent({ error, touched })}
-              />
+              <FMoneyInputGroup name={'amount'} minimal={true} />
             </ControlGroup>
           </FormGroup>
-        )}
-      </Field>
+        </Col>
+      </Row>
+
+      {/*------------ Exchange rate -----------*/}
+      <MoneyOutExchangeRateField />
 
-      <If condition={isForeigAccount}>
-        {/*------------ exchange rate -----------*/}
-        <ExchangeRateMutedField
-          name={'exchange_rate'}
-          fromCurrency={values?.currency_code}
-          toCurrency={account?.currency_code}
-          formGroupProps={{ label: '', inline: false }}
-          date={values.date}
-          exchangeRate={values.exchange_rate}
-        />
-      </If>
       <Row>
         <Col xs={5}>
           {/*------------ equitty account -----------*/}
@@ -177,44 +145,24 @@ export default function OwnerDrawingsFormFields() {
             )}
           </FastField>
         </Col>
+
         <Col xs={5}>
           {/*------------ Reference -----------*/}
-          <FastField name={'reference_no'}>
-            {({ form, field, meta: { error, touched } }) => (
-              <FormGroup
-                label={<T id={'reference_no'} />}
-                intent={inputIntent({ error, touched })}
-                helperText={<ErrorMessage name="reference_no" />}
-                className={'form-group--reference-no'}
-              >
-                <InputGroup
-                  intent={inputIntent({ error, touched })}
-                  {...field}
-                />
-              </FormGroup>
-            )}
-          </FastField>
+          <FFormGroup name={'reference_no'} label={<T id={'reference_no'} />}>
+            <FInputGroup name={'reference_no'} />
+          </FFormGroup>
         </Col>
       </Row>
 
       {/*------------ description -----------*/}
-      <FastField name={'description'}>
-        {({ field, meta: { error, touched } }) => (
-          <FormGroup
-            label={<T id={'description'} />}
-            className={'form-group--description'}
-            intent={inputIntent({ error, touched })}
-            helperText={<ErrorMessage name={'description'} />}
-          >
-            <TextArea
-              growVertically={true}
-              large={true}
-              intent={inputIntent({ error, touched })}
-              {...field}
-            />
-          </FormGroup>
-        )}
-      </FastField>
+      <FFormGroup name={'description'} label={<T id={'description'} />}>
+        <FTextArea
+          name={'description'}
+          growVertically={true}
+          large={true}
+          fill={true}
+        />
+      </FFormGroup>
     </React.Fragment>
   );
 }
diff --git a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/TransactionTypeFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/TransactionTypeFields.tsx
index da51489b8..97ffa963e 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/TransactionTypeFields.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/TransactionTypeFields.tsx
@@ -1,22 +1,21 @@
 // @ts-nocheck
 import React, { useMemo } from 'react';
-import { FastField, Field, ErrorMessage } from 'formik';
+import { FastField, ErrorMessage } from 'formik';
 import { FormGroup } from '@blueprintjs/core';
 import classNames from 'classnames';
 import {
   FormattedMessage as T,
   AccountsSuggestField,
   FieldRequiredHint,
-  ListSelect,
   Col,
   Row,
+  FSelect,
+  FFormGroup,
 } from '@/components';
-
 import { inputIntent } from '@/utils';
-import { CLASSES } from '@/constants/classes';
 import { getAddMoneyOutOptions } from '@/constants/cashflowOptions';
-
 import { useMoneyOutDialogContext } from './MoneyOutDialogProvider';
+import { CLASSES } from '@/constants/classes';
 
 /**
  * Transaction type fields.
@@ -27,9 +26,32 @@ function TransactionTypeFields() {
 
   const addMoneyOutOptions = useMemo(() => getAddMoneyOutOptions(), []);
 
+  // Money in dialog context.
+  const { defaultAccountId, setAccountId } = useMoneyOutDialogContext();
+
+  // Cannot continue if the default account id is defined.
+  if (defaultAccountId) return null;
+
   return (
     <div className="trasnaction-type-fileds">
       <Row>
+        {/*------------ Transaction type -----------*/}
+        <Col xs={5}>
+          <FFormGroup
+            name={'transaction_type'}
+            label={<T id={'transaction_type'} />}
+            labelInfo={<FieldRequiredHint />}
+          >
+            <FSelect
+              name={'transaction_type'}
+              items={addMoneyOutOptions}
+              popoverProps={{ minimal: true }}
+              valueAccessor={'value'}
+              textAccessor={'name'}
+            />
+          </FFormGroup>
+        </Col>
+
         <Col xs={5}>
           {/*------------ Current account -----------*/}
           <FastField name={'cashflow_account_id'}>
@@ -47,9 +69,10 @@ function TransactionTypeFields() {
               >
                 <AccountsSuggestField
                   accounts={cashflowAccounts}
-                  onAccountSelected={({ id }) =>
-                    form.setFieldValue('cashflow_account_id', id)
-                  }
+                  onAccountSelected={({ id }) => {
+                    form.setFieldValue('cashflow_account_id', id);
+                    setAccountId(id);
+                  }}
                   inputProps={{
                     intent: inputIntent({ error, touched }),
                   }}
@@ -57,39 +80,6 @@ function TransactionTypeFields() {
               </FormGroup>
             )}
           </FastField>
-          {/*------------ Transaction type -----------*/}
-        </Col>
-        <Col xs={5}>
-          <Field name={'transaction_type'}>
-            {({
-              form: { values, setFieldValue },
-              field: { value },
-              meta: { error, touched },
-            }) => (
-              <FormGroup
-                label={<T id={'transaction_type'} />}
-                labelInfo={<FieldRequiredHint />}
-                helperText={<ErrorMessage name="transaction_type" />}
-                intent={inputIntent({ error, touched })}
-                className={classNames(
-                  CLASSES.FILL,
-                  'form-group--transaction_type',
-                )}
-              >
-                <ListSelect
-                  items={addMoneyOutOptions}
-                  onItemSelect={(type) => {
-                    setFieldValue('transaction_type', type.value);
-                  }}
-                  filterable={false}
-                  selectedItem={value}
-                  selectedItemProp={'value'}
-                  textProp={'name'}
-                  popoverProps={{ minimal: true }}
-                />
-              </FormGroup>
-            )}
-          </Field>
         </Col>
       </Row>
     </div>
diff --git a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/TransferToAccount/TransferToAccountFormFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/TransferToAccount/TransferToAccountFormFields.tsx
index ff8a986e8..504a9c8b8 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/TransferToAccount/TransferToAccountFormFields.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/TransferToAccount/TransferToAccountFormFields.tsx
@@ -1,65 +1,46 @@
 // @ts-nocheck
 import React from 'react';
-import { FastField, Field, ErrorMessage, useFormikContext } from 'formik';
-import {
-  Classes,
-  FormGroup,
-  InputGroup,
-  TextArea,
-  Position,
-  ControlGroup,
-} from '@blueprintjs/core';
+import { FastField, ErrorMessage } from 'formik';
+import { FormGroup, Position, ControlGroup } from '@blueprintjs/core';
 import classNames from 'classnames';
 import {
   FormattedMessage as T,
   AccountsSuggestField,
   InputPrependText,
-  MoneyInputGroup,
   FieldRequiredHint,
-  Icon,
   Col,
   Row,
-  If,
-  InputPrependButton,
   FeatureCan,
   BranchSelect,
   BranchSelectButton,
-  ExchangeRateMutedField,
+  FFormGroup,
+  FTextArea,
+  FMoneyInputGroup,
+  FInputGroup,
 } from '@/components';
 import { DateInput } from '@blueprintjs/datetime';
-import { useAutofocus } from '@/hooks';
 import { ACCOUNT_TYPE } from '@/constants/accountTypes';
-
 import {
   inputIntent,
   momentFormatter,
   tansformDateValue,
   handleDateChange,
-  compose,
 } from '@/utils';
 import { Features } from '@/constants';
 import { CLASSES } from '@/constants/classes';
 import { useMoneyOutDialogContext } from '../MoneyOutDialogProvider';
-import {
-  useObserveTransactionNoSettings,
-  useSetPrimaryBranchToForm,
-  useForeignAccount,
-  BranchRowDivider,
-} from '../utils';
-import withSettings from '@/containers/Settings/withSettings';
-import withDialogActions from '@/containers/Dialog/withDialogActions';
+import { useSetPrimaryBranchToForm, BranchRowDivider } from '../utils';
 import { MoneyInOutTransactionNoField } from '../../_components';
+import { MoneyOutExchangeRateField } from '../MoneyOutExchangeRateField';
+import { useMoneyOutFieldsContext } from '../MoneyOutFieldsProvider';
 
 /**
  * Transfer to account form fields.
  */
 export default function TransferToAccountFormFields() {
   // Money in dialog context.
-  const { accounts, account, branches } = useMoneyOutDialogContext();
-  const { values } = useFormikContext();
-  const isForeigAccount = useForeignAccount();
-
-  const accountRef = useAutofocus();
+  const { accounts, branches } = useMoneyOutDialogContext();
+  const { account } = useMoneyOutFieldsContext();
 
   // Sets the primary branch to form.
   useSetPrimaryBranchToForm();
@@ -69,21 +50,19 @@ export default function TransferToAccountFormFields() {
       <FeatureCan feature={Features.Branches}>
         <Row>
           <Col xs={5}>
-            <FormGroup
-              label={<T id={'branch'} />}
-              className={classNames('form-group--select-list', Classes.FILL)}
-            >
+            <FFormGroup label={<T id={'branch'} />} name={'branch_id'}>
               <BranchSelect
                 name={'branch_id'}
                 branches={branches}
                 input={BranchSelectButton}
                 popoverProps={{ minimal: true }}
               />
-            </FormGroup>
+            </FFormGroup>
           </Col>
         </Row>
         <BranchRowDivider />
       </FeatureCan>
+
       <Row>
         <Col xs={5}>
           {/*------------ Date -----------*/}
@@ -113,52 +92,32 @@ export default function TransferToAccountFormFields() {
             )}
           </FastField>
         </Col>
+
         <Col xs={5}>
           {/*------------ Transaction number -----------*/}
           <MoneyInOutTransactionNoField />
         </Col>
       </Row>
-      {/*------------ amount -----------*/}
-      <FastField name={'amount'}>
-        {({
-          form: { values, setFieldValue },
-          field: { value },
-          meta: { error, touched },
-        }) => (
-          <FormGroup
+
+      {/*------------ Amount -----------*/}
+      <Row>
+        <Col xs={10}>
+          <FFormGroup
+            name={'amount'}
             label={<T id={'amount'} />}
             labelInfo={<FieldRequiredHint />}
-            intent={inputIntent({ error, touched })}
-            helperText={<ErrorMessage name="amount" />}
-            className={'form-group--amount'}
           >
             <ControlGroup>
               <InputPrependText text={account.currency_code} />
-
-              <MoneyInputGroup
-                value={value}
-                minimal={true}
-                onChange={(amount) => {
-                  setFieldValue('amount', amount);
-                }}
-                inputRef={accountRef}
-                intent={inputIntent({ error, touched })}
-              />
+              <FMoneyInputGroup name={'amount'} minimal={true} />
             </ControlGroup>
-          </FormGroup>
-        )}
-      </FastField>
-      <If condition={isForeigAccount}>
-        {/*------------ exchange rate -----------*/}
-        <ExchangeRateMutedField
-          name={'exchange_rate'}
-          fromCurrency={values?.currency_code}
-          toCurrency={account?.currency_code}
-          formGroupProps={{ label: '', inline: false }}
-          date={values.date}
-          exchangeRate={values.exchange_rate}
-        />
-      </If>
+          </FFormGroup>
+        </Col>
+      </Row>
+
+      {/*------------ Exchange rate -----------*/}
+      <MoneyOutExchangeRateField />
+
       <Row>
         <Col xs={5}>
           {/*------------ transfer from account -----------*/}
@@ -191,43 +150,24 @@ export default function TransferToAccountFormFields() {
             )}
           </FastField>
         </Col>
+
         <Col xs={5}>
           {/*------------ Reference -----------*/}
-          <FastField name={'reference_no'}>
-            {({ form, field, meta: { error, touched } }) => (
-              <FormGroup
-                label={<T id={'reference_no'} />}
-                intent={inputIntent({ error, touched })}
-                helperText={<ErrorMessage name="reference_no" />}
-                className={'form-group--reference-no'}
-              >
-                <InputGroup
-                  intent={inputIntent({ error, touched })}
-                  {...field}
-                />
-              </FormGroup>
-            )}
-          </FastField>
+          <FFormGroup name={'reference_no'} label={<T id={'reference_no'} />}>
+            <FInputGroup name={'reference_no'} />
+          </FFormGroup>
         </Col>
       </Row>
-      {/*------------ description -----------*/}
-      <FastField name={'description'}>
-        {({ field, meta: { error, touched } }) => (
-          <FormGroup
-            label={<T id={'description'} />}
-            className={'form-group--description'}
-            intent={inputIntent({ error, touched })}
-            helperText={<ErrorMessage name={'description'} />}
-          >
-            <TextArea
-              growVertically={true}
-              large={true}
-              intent={inputIntent({ error, touched })}
-              {...field}
-            />
-          </FormGroup>
-        )}
-      </FastField>
+
+      {/*------------ Description -----------*/}
+      <FFormGroup name={'description'} label={<T id={'description'} />}>
+        <FTextArea
+          name={'description'}
+          growVertically={true}
+          large={true}
+          fill={true}
+        />
+      </FFormGroup>
     </React.Fragment>
   );
 }
diff --git a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/utils.tsx b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/utils.tsx
index f661b6557..7cb3d244c 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/utils.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/utils.tsx
@@ -6,6 +6,7 @@ import { transactionNumber } from '@/utils';
 import { first, isEqual, isNull } from 'lodash';
 
 import { useMoneyOutDialogContext } from './MoneyOutDialogProvider';
+import { useMoneyOutFieldsContext } from './MoneyOutFieldsProvider';
 
 export const useObserveTransactionNoSettings = (prefix, nextNumber) => {
   const { setFieldValue } = useFormikContext();
@@ -33,7 +34,7 @@ export const useSetPrimaryBranchToForm = () => {
 
 export const useForeignAccount = () => {
   const { values } = useFormikContext();
-  const { account } = useMoneyOutDialogContext();
+  const { account } = useMoneyOutFieldsContext();
 
   return (
     !isEqual(account.currency_code, values.currency_code) &&
diff --git a/packages/webapp/src/style/pages/CashFlow/CashflowTransactionForm.scss b/packages/webapp/src/style/pages/CashFlow/CashflowTransactionForm.scss
index db852724d..d034edc91 100644
--- a/packages/webapp/src/style/pages/CashFlow/CashflowTransactionForm.scss
+++ b/packages/webapp/src/style/pages/CashFlow/CashflowTransactionForm.scss
@@ -1,34 +1,14 @@
 .dialog--money-in,
 .dialog--money-out {
-  .bp3-form-group {
-    margin-bottom: 15px;
-
-    label.bp3-label {
-      font-size: 13px;
-      margin-bottom: 3px;
-    }
-  }
-  .form-group {
-    &--description {
-      .bp3-form-content {
-        textarea {
-          width: 100%;
-          min-width: 100%;
-          font-size: 14px;
-        }
-      }
-    }
-    &--reference-no,
-    &--amount,
-    &--credit_account_id {
-      max-width: 380px;
-    }
-  }
 
   .trasnaction-type-fileds {
     margin-bottom: 18px;
-    padding: 16px 0px 12px 0px;
+    padding: 0 0px 16px 0px;
     border-bottom: 2px solid #e9e9e9;
+
+    .bp3-form-group{
+      margin-bottom: 0;
+    }
   }
 
   .bp3-dialog-footer {

From 39786e5b1f51274772b0839cb3412f14c21d269e Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Wed, 28 Jun 2023 00:58:47 +0200
Subject: [PATCH 3/9] fix(server): storing cash flow transaction statement to
 GL entry note

---
 packages/server/src/interfaces/Ledger.ts      |  2 ++
 .../server/src/services/Accounting/utils.ts   |  2 ++
 .../CashflowTransactionJournalEntries.ts      | 26 +++++++++++--------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/packages/server/src/interfaces/Ledger.ts b/packages/server/src/interfaces/Ledger.ts
index 4e021718a..8af6ac8b8 100644
--- a/packages/server/src/interfaces/Ledger.ts
+++ b/packages/server/src/interfaces/Ledger.ts
@@ -41,6 +41,8 @@ export interface ILedgerEntry {
   index: number;
   indexGroup?: number;
 
+  note?: string;
+
   userId?: number;
   itemId?: number;
   branchId?: number;
diff --git a/packages/server/src/services/Accounting/utils.ts b/packages/server/src/services/Accounting/utils.ts
index 081a0d14c..45a3de94e 100644
--- a/packages/server/src/services/Accounting/utils.ts
+++ b/packages/server/src/services/Accounting/utils.ts
@@ -21,6 +21,8 @@ export const transformLedgerEntryToTransaction = (
     transactionNumber: entry.transactionNumber,
     referenceNumber: entry.referenceNumber,
 
+    note: entry.note,
+
     index: entry.index,
     indexGroup: entry.indexGroup,
 
diff --git a/packages/server/src/services/Cashflow/CashflowTransactionJournalEntries.ts b/packages/server/src/services/Cashflow/CashflowTransactionJournalEntries.ts
index 93d23e3b1..21df84f34 100644
--- a/packages/server/src/services/Cashflow/CashflowTransactionJournalEntries.ts
+++ b/packages/server/src/services/Cashflow/CashflowTransactionJournalEntries.ts
@@ -25,8 +25,8 @@ export default class CashflowTransactionJournalEntries {
 
   /**
    * Retrieves the common entry of cashflow transaction.
-   * @param   {ICashflowTransaction} cashflowTransaction
-   * @returns {}
+   * @param {ICashflowTransaction} cashflowTransaction
+   * @returns {Partial<ILedgerEntry>}
    */
   private getCommonEntry = (cashflowTransaction: ICashflowTransaction) => {
     const { entries, ...transaction } = cashflowTransaction;
@@ -41,7 +41,9 @@ export default class CashflowTransactionJournalEntries {
       ),
       transactionId: transaction.id,
       transactionNumber: transaction.transactionNumber,
-      referenceNo: transaction.referenceNo,
+      referenceNumber: transaction.referenceNo,
+
+      note: transaction.description,
 
       branchId: cashflowTransaction.branchId,
       userId: cashflowTransaction.userId,
@@ -76,9 +78,9 @@ export default class CashflowTransactionJournalEntries {
 
   /**
    * Retrieves the cashflow credit GL entry.
-   * @param   {ICashflowTransaction} cashflowTransaction
-   * @param   {ICashflowTransactionLine} entry
-   * @param   {number} index
+   * @param {ICashflowTransaction} cashflowTransaction
+   * @param {ICashflowTransactionLine} entry
+   * @param {number} index
    * @returns {ILedgerEntry}
    */
   private getCashflowCreditGLEntry = (
@@ -102,10 +104,10 @@ export default class CashflowTransactionJournalEntries {
 
   /**
    * Retrieves the cashflow transaction GL entry.
-   * @param   {ICashflowTransaction} cashflowTransaction
-   * @param   {ICashflowTransactionLine} entry
-   * @param   {number} index
-   * @returns
+   * @param {ICashflowTransaction} cashflowTransaction
+   * @param {ICashflowTransactionLine} entry
+   * @param {number} index
+   * @returns {ILedgerEntry[]}
    */
   private getJournalEntries = (
     cashflowTransaction: ICashflowTransaction
@@ -118,7 +120,7 @@ export default class CashflowTransactionJournalEntries {
 
   /**
    * Retrieves the cashflow GL ledger.
-   * @param   {ICashflowTransaction} cashflowTransaction
+   * @param {ICashflowTransaction} cashflowTransaction
    * @returns {Ledger}
    */
   private getCashflowLedger = (cashflowTransaction: ICashflowTransaction) => {
@@ -130,6 +132,7 @@ export default class CashflowTransactionJournalEntries {
    * Write the journal entries of the given cashflow transaction.
    * @param {number} tenantId
    * @param {ICashflowTransaction} cashflowTransaction
+   * @return {Promise<void>}
    */
   public writeJournalEntries = async (
     tenantId: number,
@@ -153,6 +156,7 @@ export default class CashflowTransactionJournalEntries {
    * Delete the journal entries.
    * @param {number} tenantId - Tenant id.
    * @param {number} cashflowTransactionId - Cashflow transaction id.
+   * @return {Promise<void>}
    */
   public revertJournalEntries = async (
     tenantId: number,

From 4e0037d1c0518a455d567f5cf63252c575e3bc69 Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Wed, 28 Jun 2023 01:00:27 +0200
Subject: [PATCH 4/9] fix(server): showing transaction statement on cash flow
 transactions details drawer

---
 .../OtherIncome/OtherIncomeFormFields.tsx     |  2 +
 .../CashflowTransactionDrawerDetails.tsx      | 10 +++--
 .../CashflowTransactionDrawerFooter.tsx       | 37 +++++--------------
 .../CashflowTransactionDrawerTableFooter.tsx  | 35 ++++++++++++++++++
 .../InvoiceDetailFooter.tsx                   |  1 -
 packages/webapp/src/lang/en/index.json        |  1 +
 6 files changed, 54 insertions(+), 32 deletions(-)
 create mode 100644 packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerTableFooter.tsx

diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/OtherIncome/OtherIncomeFormFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/OtherIncome/OtherIncomeFormFields.tsx
index 06ccffea0..11d371cac 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyInDialog/OtherIncome/OtherIncomeFormFields.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/OtherIncome/OtherIncomeFormFields.tsx
@@ -106,11 +106,13 @@ export default function OtherIncomeFormFields() {
             )}
           </FastField>
         </Col>
+
         <Col xs={5}>
           {/*------------ Transaction number -----------*/}
           <MoneyInOutTransactionNoField />
         </Col>
       </Row>
+
       {/*------------ amount -----------*/}
       <FastField name={'amount'}>
         {({
diff --git a/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerDetails.tsx b/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerDetails.tsx
index 4dec0dae4..22544b57b 100644
--- a/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerDetails.tsx
+++ b/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerDetails.tsx
@@ -1,12 +1,13 @@
 // @ts-nocheck
 import React from 'react';
 
-import { Card } from '@/components';
+import { Card, CommercialDocBox } from '@/components';
 
 import CashflowTransactionDrawerActionBar from './CashflowTransactionDrawerActionBar';
 import CashflowTransactionDrawerHeader from './CashflowTransactionDrawerHeader';
 import CashflowTransactionDrawerTable from './CashflowTransactionDrawerTable';
-import CashflowTransactionDrawerFooter from './CashflowTransactionDrawerFooter';
+import CashflowTransactionDrawerTableFooter from './CashflowTransactionDrawerTableFooter';
+import { CashflowTransactionDrawerFooter } from './CashflowTransactionDrawerFooter';
 /**
  * Cashflow transaction view details.
  */
@@ -16,11 +17,12 @@ export default function CashflowTransactionDrawerDetails() {
       <CashflowTransactionDrawerActionBar />
 
       <div className="cashflow-drawer__content">
-        <Card>
+        <CommercialDocBox>
           <CashflowTransactionDrawerHeader />
           <CashflowTransactionDrawerTable />
+          <CashflowTransactionDrawerTableFooter />
           <CashflowTransactionDrawerFooter />
-        </Card>
+        </CommercialDocBox>
       </div>
     </div>
   );
diff --git a/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerFooter.tsx b/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerFooter.tsx
index 79c6a0706..b3a7ea58f 100644
--- a/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerFooter.tsx
+++ b/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerFooter.tsx
@@ -1,35 +1,18 @@
 // @ts-nocheck
 import React from 'react';
+import { CommercialDocFooter, DetailsMenu, DetailItem, T } from '@/components';
 import { useCashflowTransactionDrawerContext } from './CashflowTransactionDrawerProvider';
-import { T, FormatNumber } from '@/components';
 
-export default function CashflowTransactionDrawerFooter() {
-  const {
-    cashflowTransaction: { formatted_amount },
-  } = useCashflowTransactionDrawerContext();
+export function CashflowTransactionDrawerFooter() {
+  const { cashflowTransaction } = useCashflowTransactionDrawerContext();
 
   return (
-    <div className="cashflow-drawer__content-footer">
-      <div class="total-lines">
-        <div class="total-lines__line total-lines__line--subtotal">
-          <div class="title">
-            <T id={'manual_journal.details.subtotal'} />
-          </div>
-          <div class="debit">
-            <FormatNumber value={formatted_amount} />
-          </div>
-          <div class="credit">
-            <FormatNumber value={formatted_amount} />
-          </div>
-        </div>
-        <div class="total-lines__line total-lines__line--total">
-          <div class="title">
-            <T id={'manual_journal.details.total'} />
-          </div>
-          <div class="debit">{formatted_amount}</div>
-          <div class="credit">{formatted_amount}</div>
-        </div>
-      </div>
-    </div>
+    <CommercialDocFooter>
+      <DetailsMenu direction={'horizantal'} minLabelSize={'180px'}>
+        <DetailItem label={<T id={'cash_flow.drawer.label.statement'} />}>
+          {cashflowTransaction.description}
+        </DetailItem>
+      </DetailsMenu>
+    </CommercialDocFooter>
   );
 }
diff --git a/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerTableFooter.tsx b/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerTableFooter.tsx
new file mode 100644
index 000000000..b46f6c0fe
--- /dev/null
+++ b/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerTableFooter.tsx
@@ -0,0 +1,35 @@
+// @ts-nocheck
+import React from 'react';
+import { useCashflowTransactionDrawerContext } from './CashflowTransactionDrawerProvider';
+import { T, FormatNumber } from '@/components';
+
+export default function CashflowTransactionDrawerTableFooter() {
+  const {
+    cashflowTransaction: { formatted_amount },
+  } = useCashflowTransactionDrawerContext();
+
+  return (
+    <div className="cashflow-drawer__content-footer">
+      <div class="total-lines">
+        <div class="total-lines__line total-lines__line--subtotal">
+          <div class="title">
+            <T id={'manual_journal.details.subtotal'} />
+          </div>
+          <div class="debit">
+            <FormatNumber value={formatted_amount} />
+          </div>
+          <div class="credit">
+            <FormatNumber value={formatted_amount} />
+          </div>
+        </div>
+        <div class="total-lines__line total-lines__line--total">
+          <div class="title">
+            <T id={'manual_journal.details.total'} />
+          </div>
+          <div class="debit">{formatted_amount}</div>
+          <div class="credit">{formatted_amount}</div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailFooter.tsx b/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailFooter.tsx
index fb1360c6d..237254652 100644
--- a/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailFooter.tsx
+++ b/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailFooter.tsx
@@ -1,6 +1,5 @@
 // @ts-nocheck
 import React from 'react';
-
 import {
   CommercialDocFooter,
   T,
diff --git a/packages/webapp/src/lang/en/index.json b/packages/webapp/src/lang/en/index.json
index a329faa9b..ed0537d77 100644
--- a/packages/webapp/src/lang/en/index.json
+++ b/packages/webapp/src/lang/en/index.json
@@ -1452,6 +1452,7 @@
   "cash_flow.setting_your_auto_generated_transaction_number": "Setting your auto-generated transaction number",
   "cash_flow_drawer.label_transaction_type": "Transaction type",
   "cash_flow.drawer.label_transaction_no": "Transaction number",
+  "cash_flow.drawer.label.statement": "Statement",
   "cash_flow.drawer.label_transaction": "Cash flow Transaction {number}",
   "cash_flow.account_transactions.no_results": "There are no deposit/withdrawal transactions on the current account.",
   "cash_flow_balance_in": "Balance in {name}",

From 02489a907a605fa075b874648e6a1c8994e3fba5 Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Wed, 28 Jun 2023 11:06:33 +0200
Subject: [PATCH 5/9] fix(webapp): internal note of invoice/bill payment does
 not saving

---
 .../PaymentForm/PaymentMadeFormFooterLeft.tsx |  6 ++--
 .../PaymentReceiveFormFootetLeft.tsx          | 35 ++++---------------
 2 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterLeft.tsx b/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterLeft.tsx
index 23b60eecf..8c119e60c 100644
--- a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterLeft.tsx
+++ b/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>
diff --git a/packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormFootetLeft.tsx b/packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormFootetLeft.tsx
index 0aea4912b..8c139e655 100644
--- a/packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormFootetLeft.tsx
+++ b/packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormFootetLeft.tsx
@@ -7,25 +7,18 @@ import { FFormGroup, FEditableText, FormattedMessage as T } from '@/components';
 export function PaymentReceiveFormFootetLeft() {
   return (
     <React.Fragment>
-      {/* --------- Statement--------- */}
-      <PaymentMsgFormGroup
-        name={'message'}
-        label={<T id={'payment_receive_form.message.label'} />}
-      >
-        <FEditableText
-          name={'message'}
-          placeholder={intl.get('payment_receive_form.message.placeholder')}
-        />
-      </PaymentMsgFormGroup>
-
       {/* --------- Internal Note--------- */}
       <TermsConditsFormGroup
-        name={'internal_note'}
+        name={'statement'}
         label={<T id={'payment_receive_form.label.note'} />}
+        fastField={true}
       >
         <FEditableText
-          name={'internal_note'}
-          placeholder={intl.get('payment_receive_form.internal_note.placeholder')}
+          name={'statement'}
+          placeholder={intl.get(
+            'payment_receive_form.internal_note.placeholder',
+          )}
+          fastField={true}
         />
       </TermsConditsFormGroup>
     </React.Fragment>
@@ -43,17 +36,3 @@ const TermsConditsFormGroup = styled(FFormGroup)`
     }
   }
 `;
-
-const PaymentMsgFormGroup = styled(FFormGroup)`
-  &.bp3-form-group {
-    margin-bottom: 40px;
-
-    .bp3-label {
-      font-size: 12px;
-      margin-bottom: 12px;
-    }
-    .bp3-form-content {
-      margin-left: 10px;
-    }
-  }
-`;

From 3d4fd0b9041a6f94955eaa5ffae03603f5c4ec12 Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Wed, 28 Jun 2023 12:21:22 +0200
Subject: [PATCH 6/9] fix(webapp): transaction number duplicated variable name

---
 .../MoneyInDialog/MoneyInDialogProvider.tsx   |  2 +-
 .../OwnerContributionFormFields.tsx           | 30 +++++--------------
 .../src/containers/CashFlow/_components.tsx   |  4 +--
 3 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInDialogProvider.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInDialogProvider.tsx
index 163f87119..20eba8d94 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInDialogProvider.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInDialogProvider.tsx
@@ -22,7 +22,7 @@ function MoneyInDialogProvider({
   dialogName,
   ...props
 }) {
-  // Holds the selected account id.
+  // Holds the selected account id of the dialog.
   const [accountId, setAccountId] = useState<number | null>(defaultAccountId);
 
   // Detarmines whether the feature is enabled.
diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/OwnerContribution/OwnerContributionFormFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/OwnerContribution/OwnerContributionFormFields.tsx
index 520c2d51c..408a72078 100644
--- a/packages/webapp/src/containers/CashFlow/MoneyInDialog/OwnerContribution/OwnerContributionFormFields.tsx
+++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/OwnerContribution/OwnerContributionFormFields.tsx
@@ -1,19 +1,16 @@
 // @ts-nocheck
 import React from 'react';
-import { FastField, ErrorMessage, useFormikContext } from 'formik';
+import { FastField, ErrorMessage } from 'formik';
 import { FormGroup, Position, ControlGroup } from '@blueprintjs/core';
 import classNames from 'classnames';
-
+import { DateInput } from '@blueprintjs/datetime';
 import {
   FormattedMessage as T,
   AccountsSuggestField,
   InputPrependText,
-  MoneyInputGroup,
   FieldRequiredHint,
   Col,
   Row,
-  If,
-  ExchangeRateMutedField,
   BranchSelect,
   BranchSelectButton,
   FeatureCan,
@@ -22,7 +19,6 @@ import {
   FTextArea,
   FInputGroup,
 } from '@/components';
-import { DateInput } from '@blueprintjs/datetime';
 import { ACCOUNT_TYPE, CLASSES, Features } from '@/constants';
 import {
   inputIntent,
@@ -33,11 +29,11 @@ import {
 import { useMoneyInDailogContext } from '../MoneyInDialogProvider';
 import {
   useSetPrimaryBranchToForm,
-  useForeignAccount,
   BranchRowDivider,
 } from '../../MoneyInDialog/utils';
 import { MoneyInOutTransactionNoField } from '../../_components';
 import { useMoneyInFieldsContext } from '../MoneyInFieldsProvider';
+import { MoneyInExchangeRateField } from '../MoneyInExchangeRateField';
 
 /**
 /**
@@ -48,10 +44,6 @@ export default function OwnerContributionFormFields() {
   const { accounts, branches } = useMoneyInDailogContext();
   const { account } = useMoneyInFieldsContext();
 
-  const { values } = useFormikContext();
-
-  const isForeigAccount = useForeignAccount();
-
   // Sets the primary branch to form.
   useSetPrimaryBranchToForm();
 
@@ -124,17 +116,9 @@ export default function OwnerContributionFormFields() {
         </Col>
       </Row>
 
-      <If condition={isForeigAccount}>
-        {/*------------ exchange rate -----------*/}
-        <ExchangeRateMutedField
-          name={'exchange_rate'}
-          fromCurrency={values.currency_code}
-          toCurrency={account.currency_code}
-          formGroupProps={{ label: '', inline: false }}
-          date={values.date}
-          exchangeRate={values.exchange_rate}
-        />
-      </If>
+      {/*------------ Exchange rate -----------*/}
+      <MoneyInExchangeRateField />
+
       <Row>
         <Col xs={5}>
           {/*------------ equity account -----------*/}
@@ -171,7 +155,7 @@ export default function OwnerContributionFormFields() {
         </Col>
       </Row>
 
-      {/*------------ description -----------*/}
+      {/*------------ Description -----------*/}
       <FFormGroup name={'description'} label={<T id={'description'} />}>
         <FTextArea
           name={'description'}
diff --git a/packages/webapp/src/containers/CashFlow/_components.tsx b/packages/webapp/src/containers/CashFlow/_components.tsx
index 4b9e7ca86..0195b298f 100644
--- a/packages/webapp/src/containers/CashFlow/_components.tsx
+++ b/packages/webapp/src/containers/CashFlow/_components.tsx
@@ -38,11 +38,11 @@ export const MoneyInOutSyncIncrementSettingsToForm = R.compose(
       // Do not update if the invoice auto-increment is disabled.
       if (!transactionAutoIncrement) return null;
 
-      const transactionNumber = transactionNumber(
+      const newTransactionNumber = transactionNumber(
         transactionNumberPrefix,
         transactionNextNumber,
       );
-      setFieldValue('transaction_number', transactionNumber);
+      setFieldValue('transaction_number', newTransactionNumber);
     }, [setFieldValue, transactionNumberPrefix, transactionNextNumber]);
 
     return null;

From 8d990ae85d6cfcb549b31c9235e2fb332b7bca7b Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Wed, 28 Jun 2023 18:07:47 +0200
Subject: [PATCH 7/9] fix(webapp): no default branch for customer/vendor
 opening balance branch

---
 .../src/components/Branches/BranchSelect.tsx  | 61 ++++---------------
 .../webapp/src/components/Forms/Select.tsx    |  2 +-
 .../PageForm/FormTopbarSelectInputs.tsx       | 27 ++++++++
 .../webapp/src/components/PageForm/index.ts   |  1 +
 .../components/Warehouses/WarehouseSelect.tsx |  2 +-
 .../MakeJournal/MakeJournalFormTopBar.tsx     | 14 +----
 .../CustomerForm/CustomerFinancialPanel.tsx   |  3 -
 .../ExpenseForm/ExpenseFormTopBar.tsx         | 19 ++----
 .../Bills/BillForm/BillFormTopBar.tsx         | 33 ++--------
 .../VendorCreditNoteFormTopBar.tsx            | 31 ++--------
 .../PaymentForm/PaymentMadeFormTopBar.tsx     | 19 ++----
 .../CreditNoteForm/CreditNoteFormTopBar.tsx   | 34 +++--------
 .../EstimateForm/EstimtaeFormTopBar.tsx       | 33 ++--------
 .../InvoiceForm/InvoiceFormTopBar.tsx         | 33 ++--------
 .../PaymentReceiveFormTopBar.tsx              | 26 +++-----
 .../ReceiptForm/ReceiptFormTopbar.tsx         | 34 ++---------
 .../VendorForm/VendorFinanicalPanelTab.tsx    |  3 -
 packages/webapp/src/lang/en/index.json        | 18 +-----
 18 files changed, 100 insertions(+), 293 deletions(-)
 create mode 100644 packages/webapp/src/components/PageForm/FormTopbarSelectInputs.tsx

diff --git a/packages/webapp/src/components/Branches/BranchSelect.tsx b/packages/webapp/src/components/Branches/BranchSelect.tsx
index 6e463ad9a..2641f2704 100644
--- a/packages/webapp/src/components/Branches/BranchSelect.tsx
+++ b/packages/webapp/src/components/Branches/BranchSelect.tsx
@@ -5,59 +5,20 @@ import { MenuItem, Button } from '@blueprintjs/core';
 import { FSelect } from '../Forms';
 
 /**
- *
- * @param {*} query
- * @param {*} branch
- * @param {*} _index
- * @param {*} exactMatch
- * @returns
- */
-const branchItemPredicate = (query, branch, _index, exactMatch) => {
-  const normalizedTitle = branch.name.toLowerCase();
-  const normalizedQuery = query.toLowerCase();
-
-  if (exactMatch) {
-    return normalizedTitle === normalizedQuery;
-  } else {
-    return `${branch.code}. ${normalizedTitle}`.indexOf(normalizedQuery) >= 0;
-  }
-};
-
-/**
- *
- * @param {*} film
- * @param {*} param1
- * @returns
- */
-const branchItemRenderer = (branch, { handleClick, modifiers, query }) => {
-  const text = `${branch.name}`;
-
-  return (
-    <MenuItem
-      active={modifiers.active}
-      disabled={modifiers.disabled}
-      label={branch.code}
-      key={branch.id}
-      onClick={handleClick}
-      text={text}
-    />
-  );
-};
-
-const branchSelectProps = {
-  itemPredicate: branchItemPredicate,
-  itemRenderer: branchItemRenderer,
-  valueAccessor: 'id',
-  labelAccessor: 'name',
-};
-
-/**
- *
+ * Branch select field.
  * @param {*} param0
- * @returns
+ * @returns {JSX.Element}
  */
 export function BranchSelect({ branches, ...rest }) {
-  return <FSelect {...branchSelectProps} {...rest} items={branches} />;
+  return (
+    <FSelect
+      valueAccessor={'id'}
+      textAccessor={'name'}
+      labelAccessor={'code'}
+      {...rest}
+      items={branches}
+    />
+  );
 }
 
 /**
diff --git a/packages/webapp/src/components/Forms/Select.tsx b/packages/webapp/src/components/Forms/Select.tsx
index 459912b62..6916e115c 100644
--- a/packages/webapp/src/components/Forms/Select.tsx
+++ b/packages/webapp/src/components/Forms/Select.tsx
@@ -16,7 +16,7 @@ export function FSelect({ ...props }) {
       />
     );
   };
-  return <Select input={input} {...props} fill={true} />;
+  return <Select input={input} fill={true} {...props} />;
 }
 
 const SelectButton = styled(Button)`
diff --git a/packages/webapp/src/components/PageForm/FormTopbarSelectInputs.tsx b/packages/webapp/src/components/PageForm/FormTopbarSelectInputs.tsx
new file mode 100644
index 000000000..f3f2f1f84
--- /dev/null
+++ b/packages/webapp/src/components/PageForm/FormTopbarSelectInputs.tsx
@@ -0,0 +1,27 @@
+// @ts-nocheck
+import React from 'react';
+import intl from 'react-intl-universal';
+import { Button } from '@blueprintjs/core';
+import { Icon } from '@/components';
+
+export function FormWarehouseSelectButton({ text }) {
+  return (
+    <Button
+      text={intl.get('page_form.warehouse_button.label', { text })}
+      minimal={true}
+      small={true}
+      icon={<Icon icon={'warehouse-16'} iconSize={16} />}
+    />
+  );
+}
+
+export function FormBranchSelectButton({ text }) {
+  return (
+    <Button
+      text={intl.get('page_form.branch_button.label', { text })}
+      minimal={true}
+      small={true}
+      icon={<Icon icon={'branch-16'} iconSize={16} />}
+    />
+  );
+}
diff --git a/packages/webapp/src/components/PageForm/index.ts b/packages/webapp/src/components/PageForm/index.ts
index f4fac33f0..56a507b60 100644
--- a/packages/webapp/src/components/PageForm/index.ts
+++ b/packages/webapp/src/components/PageForm/index.ts
@@ -1,3 +1,4 @@
 // @ts-nocheck
 export * from './FormTopbar';
+export * from './FormTopbarSelectInputs';
 export * from './PageFormBigNumber';
diff --git a/packages/webapp/src/components/Warehouses/WarehouseSelect.tsx b/packages/webapp/src/components/Warehouses/WarehouseSelect.tsx
index c681e7205..5582a9de2 100644
--- a/packages/webapp/src/components/Warehouses/WarehouseSelect.tsx
+++ b/packages/webapp/src/components/Warehouses/WarehouseSelect.tsx
@@ -18,4 +18,4 @@ export function WarehouseSelect({ warehouses, ...rest }) {
       items={warehouses}
     />
   );
-}
\ No newline at end of file
+}
diff --git a/packages/webapp/src/containers/Accounting/MakeJournal/MakeJournalFormTopBar.tsx b/packages/webapp/src/containers/Accounting/MakeJournal/MakeJournalFormTopBar.tsx
index 784fe7906..c4607181f 100644
--- a/packages/webapp/src/containers/Accounting/MakeJournal/MakeJournalFormTopBar.tsx
+++ b/packages/webapp/src/containers/Accounting/MakeJournal/MakeJournalFormTopBar.tsx
@@ -11,6 +11,7 @@ import {
   FeatureCan,
   FormTopbar,
   DetailsBarSkeletonBase,
+  FormBranchSelectButton,
 } from '@/components';
 import { useMakeJournalFormContext } from './MakeJournalProvider';
 
@@ -51,18 +52,9 @@ function MakeJournalFormSelectBranch() {
     <BranchSelect
       name={'branch_id'}
       branches={branches}
-      input={MakeJournalBranchSelectButton}
+      input={FormBranchSelectButton}
       popoverProps={{ minimal: true }}
-    />
-  );
-}
-function MakeJournalBranchSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('make_journal.branch_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'branch-16'} iconSize={16} />}
+      fill={false}
     />
   );
 }
diff --git a/packages/webapp/src/containers/Customers/CustomerForm/CustomerFinancialPanel.tsx b/packages/webapp/src/containers/Customers/CustomerForm/CustomerFinancialPanel.tsx
index 8de4eb45c..f6104ae44 100644
--- a/packages/webapp/src/containers/Customers/CustomerForm/CustomerFinancialPanel.tsx
+++ b/packages/webapp/src/containers/Customers/CustomerForm/CustomerFinancialPanel.tsx
@@ -10,7 +10,6 @@ import {
   InputPrependText,
   CurrencySelectList,
   BranchSelect,
-  BranchSelectButton,
   FeatureCan,
   Row,
   Col,
@@ -78,12 +77,10 @@ export default function CustomerFinancialPanel() {
               label={<T id={'customer.label.opening_branch'} />}
               name={'opening_balance_branch_id'}
               inline={true}
-              className={classNames('form-group--select-list', Classes.FILL)}
             >
               <BranchSelect
                 name={'opening_balance_branch_id'}
                 branches={branches}
-                input={BranchSelectButton}
                 popoverProps={{ minimal: true }}
               />
             </FFormGroup>
diff --git a/packages/webapp/src/containers/Expenses/ExpenseForm/ExpenseFormTopBar.tsx b/packages/webapp/src/containers/Expenses/ExpenseForm/ExpenseFormTopBar.tsx
index 9d7d4561b..20f00eecb 100644
--- a/packages/webapp/src/containers/Expenses/ExpenseForm/ExpenseFormTopBar.tsx
+++ b/packages/webapp/src/containers/Expenses/ExpenseForm/ExpenseFormTopBar.tsx
@@ -1,16 +1,15 @@
 // @ts-nocheck
 import React from 'react';
-import intl from 'react-intl-universal';
-import { Button, Alignment, NavbarGroup, Classes } from '@blueprintjs/core';
+import { Alignment, NavbarGroup, Classes } from '@blueprintjs/core';
 import { useSetPrimaryBranchToForm } from './utils';
 import { useFeatureCan } from '@/hooks/state';
 import { Features } from '@/constants';
 import {
-  Icon,
   BranchSelect,
   FeatureCan,
   FormTopbar,
   DetailsBarSkeletonBase,
+  FormBranchSelectButton,
 } from '@/components';
 import { useExpenseFormContext } from './ExpenseFormPageProvider';
 
@@ -51,19 +50,9 @@ function ExpenseFormSelectBranch() {
     <BranchSelect
       name={'branch_id'}
       branches={branches}
-      input={ExpenseBranchSelectButton}
+      input={FormBranchSelectButton}
       popoverProps={{ minimal: true }}
-    />
-  );
-}
-
-function ExpenseBranchSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('expense.branch_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'branch-16'} iconSize={16} />}
+      fill={false}
     />
   );
 }
diff --git a/packages/webapp/src/containers/Purchases/Bills/BillForm/BillFormTopBar.tsx b/packages/webapp/src/containers/Purchases/Bills/BillForm/BillFormTopBar.tsx
index dcccafddd..2c400b032 100644
--- a/packages/webapp/src/containers/Purchases/Bills/BillForm/BillFormTopBar.tsx
+++ b/packages/webapp/src/containers/Purchases/Bills/BillForm/BillFormTopBar.tsx
@@ -1,11 +1,9 @@
 // @ts-nocheck
 import React from 'react';
-import intl from 'react-intl-universal';
 import {
   Alignment,
   NavbarGroup,
   NavbarDivider,
-  Button,
   Classes,
 } from '@blueprintjs/core';
 import {
@@ -14,12 +12,13 @@ import {
 } from './utils';
 import { useFeatureCan } from '@/hooks/state';
 import {
-  Icon,
   BranchSelect,
   FeatureCan,
   WarehouseSelect,
   FormTopbar,
   DetailsBarSkeletonBase,
+  FormWarehouseSelectButton,
+  FormBranchSelectButton,
 } from '@/components';
 import { useBillFormContext } from './BillFormProvider';
 import { Features } from '@/constants';
@@ -70,8 +69,9 @@ function BillFormSelectBranch() {
     <BranchSelect
       name={'branch_id'}
       branches={branches}
-      input={BillBranchSelectButton}
+      input={FormBranchSelectButton}
       popoverProps={{ minimal: true }}
+      fill={false}
     />
   );
 }
@@ -86,30 +86,9 @@ function BillFormSelectWarehouse() {
     <WarehouseSelect
       name={'warehouse_id'}
       warehouses={warehouses}
-      input={BillWarehouseSelectButton}
+      input={FormWarehouseSelectButton}
       popoverProps={{ minimal: true }}
-    />
-  );
-}
-
-function BillWarehouseSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('bill.warehouse_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'warehouse-16'} iconSize={16} />}
-    />
-  );
-}
-
-function BillBranchSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('bill.branch_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'branch-16'} iconSize={16} />}
+      fill={false}
     />
   );
 }
diff --git a/packages/webapp/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormTopBar.tsx b/packages/webapp/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormTopBar.tsx
index ce3195301..de22808f7 100644
--- a/packages/webapp/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormTopBar.tsx
+++ b/packages/webapp/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormTopBar.tsx
@@ -1,6 +1,5 @@
 // @ts-nocheck
 import React from 'react';
-import intl from 'react-intl-universal';
 import {
   Alignment,
   NavbarGroup,
@@ -20,6 +19,8 @@ import {
   WarehouseSelect,
   FormTopbar,
   DetailsBarSkeletonBase,
+  FormWarehouseSelectButton,
+  FormBranchSelectButton,
 } from '@/components';
 import { useVendorCreditNoteFormContext } from './VendorCreditNoteFormProvider';
 import { Features } from '@/constants';
@@ -70,8 +71,9 @@ function VendorCreditNoteFormSelectBranch() {
     <BranchSelect
       name={'branch_id'}
       branches={branches}
-      input={VendorCreditNoteBranchSelectButton}
+      input={FormBranchSelectButton}
       popoverProps={{ minimal: true }}
+      fill={false}
     />
   );
 }
@@ -86,30 +88,9 @@ function VendorCreditFormSelectWarehouse() {
     <WarehouseSelect
       name={'warehouse_id'}
       warehouses={warehouses}
-      input={VendorCreditNoteWarehouseSelectButton}
+      input={FormWarehouseSelectButton}
       popoverProps={{ minimal: true }}
-    />
-  );
-}
-
-function VendorCreditNoteWarehouseSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('vendor_credit.warehouse_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'warehouse-16'} iconSize={16} />}
-    />
-  );
-}
-
-function VendorCreditNoteBranchSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('vendor_credit.branch_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'branch-16'} iconSize={16} />}
+      fill={false}
     />
   );
 }
diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormTopBar.tsx b/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormTopBar.tsx
index 031fd8e60..f9d683924 100644
--- a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormTopBar.tsx
+++ b/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}
     />
   );
 }
diff --git a/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormTopBar.tsx b/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormTopBar.tsx
index 5c45e44dd..fe826612c 100644
--- a/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormTopBar.tsx
+++ b/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormTopBar.tsx
@@ -1,11 +1,10 @@
 // @ts-nocheck
 import React from 'react';
-import intl from 'react-intl-universal';
+
 import {
   Alignment,
   NavbarGroup,
   NavbarDivider,
-  Button,
   Classes,
 } from '@blueprintjs/core';
 import {
@@ -15,12 +14,13 @@ import {
 import { Features } from '@/constants';
 import { useFeatureCan } from '@/hooks/state';
 import {
-  Icon,
   BranchSelect,
   FeatureCan,
   WarehouseSelect,
   FormTopbar,
   DetailsBarSkeletonBase,
+  FormWarehouseSelectButton,
+  FormBranchSelectButton,
 } from '@/components';
 import { useCreditNoteFormContext } from './CreditNoteFormProvider';
 
@@ -70,8 +70,9 @@ function CreditNoteFormSelectBranch() {
     <BranchSelect
       name={'branch_id'}
       branches={branches}
-      input={CreditNoteBranchSelectButton}
+      input={FormBranchSelectButton}
       popoverProps={{ minimal: true }}
+      fill={false}
     />
   );
 }
@@ -86,30 +87,9 @@ function CreditFormSelectWarehouse() {
     <WarehouseSelect
       name={'warehouse_id'}
       warehouses={warehouses}
-      input={CreditNoteWarehouseSelectButton}
+      input={FormWarehouseSelectButton}
       popoverProps={{ minimal: true }}
-    />
-  );
-}
-
-function CreditNoteWarehouseSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('credit_note.warehouse_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'warehouse-16'} iconSize={16} />}
-    />
-  );
-}
-
-function CreditNoteBranchSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('credit_note.branch_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'branch-16'} iconSize={16} />}
+      fill={false}
     />
   );
 }
diff --git a/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimtaeFormTopBar.tsx b/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimtaeFormTopBar.tsx
index cd8ccd3d0..1670a40ff 100644
--- a/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimtaeFormTopBar.tsx
+++ b/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimtaeFormTopBar.tsx
@@ -1,11 +1,9 @@
 // @ts-nocheck
 import React from 'react';
-import intl from 'react-intl-universal';
 import {
   Alignment,
   NavbarGroup,
   NavbarDivider,
-  Button,
   Classes,
 } from '@blueprintjs/core';
 import {
@@ -15,12 +13,13 @@ import {
 import { Features } from '@/constants';
 import { useFeatureCan } from '@/hooks/state';
 import {
-  Icon,
   BranchSelect,
   FeatureCan,
   WarehouseSelect,
   FormTopbar,
   DetailsBarSkeletonBase,
+  FormWarehouseSelectButton,
+  FormBranchSelectButton,
 } from '@/components';
 import { useEstimateFormContext } from './EstimateFormProvider';
 
@@ -70,8 +69,9 @@ function EstimateFormSelectBranch() {
     <BranchSelect
       name={'branch_id'}
       branches={branches}
-      input={EstimateBranchSelectButton}
+      input={FormBranchSelectButton}
       popoverProps={{ minimal: true }}
+      fill={false}
     />
   );
 }
@@ -86,30 +86,9 @@ function EstimateFormSelectWarehouse() {
     <WarehouseSelect
       name={'warehouse_id'}
       warehouses={warehouses}
-      input={EstimateWarehouseSelectButton}
+      input={FormWarehouseSelectButton}
       popoverProps={{ minimal: true }}
-    />
-  );
-}
-
-function EstimateWarehouseSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('estimate.warehouse_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'warehouse-16'} iconSize={16} />}
-    />
-  );
-}
-
-function EstimateBranchSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('estimate.branch_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'branch-16'} iconSize={16} />}
+      fill={false}
     />
   );
 }
diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.tsx
index 064cacc9a..a2726304f 100644
--- a/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.tsx
+++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.tsx
@@ -1,12 +1,10 @@
 // @ts-nocheck
 import React from 'react';
-import intl from 'react-intl-universal';
 import styled from 'styled-components';
 import {
   Alignment,
   NavbarGroup,
   NavbarDivider,
-  Button,
   Classes,
 } from '@blueprintjs/core';
 import {
@@ -18,11 +16,12 @@ import { Features } from '@/constants';
 import { useInvoiceFormContext } from './InvoiceFormProvider';
 import { useFeatureCan } from '@/hooks/state';
 import {
-  Icon,
   BranchSelect,
   FeatureCan,
   WarehouseSelect,
   FormTopbar,
+  FormWarehouseSelectButton,
+  FormBranchSelectButton,
 } from '@/components';
 
 /**
@@ -70,8 +69,9 @@ function InvoiceFormSelectBranch() {
     <BranchSelect
       name={'branch_id'}
       branches={branches}
-      input={InvoiceBranchSelectButton}
+      input={FormBranchSelectButton}
       popoverProps={{ minimal: true }}
+      fill={false}
     />
   );
 }
@@ -86,30 +86,9 @@ function InvoiceFormSelectWarehouse() {
     <WarehouseSelect
       name={'warehouse_id'}
       warehouses={warehouses}
-      input={InvoiceWarehouseSelectButton}
+      input={FormWarehouseSelectButton}
       popoverProps={{ minimal: true }}
-    />
-  );
-}
-
-function InvoiceWarehouseSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('invoice.warehouse_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'warehouse-16'} iconSize={16} />}
-    />
-  );
-}
-
-function InvoiceBranchSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('invoice.branch_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'branch-16'} iconSize={16} />}
+      fill={false}
     />
   );
 }
diff --git a/packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormTopBar.tsx b/packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormTopBar.tsx
index 073fbc42b..8d48a416a 100644
--- a/packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormTopBar.tsx
+++ b/packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormTopBar.tsx
@@ -1,22 +1,21 @@
 // @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 { usePaymentReceiveFormContext } from './PaymentReceiveFormProvider';
 import { Features } from '@/constants';
 
 /**
  * Payment receive from top bar.
- * @returns
+ * @returns {JSX.Element}
  */
 export default function PaymentReceiveFormTopBar() {
   // Features guard.
@@ -29,7 +28,6 @@ export default function PaymentReceiveFormTopBar() {
   if (!featureCan(Features.Branches)) {
     return null;
   }
-
   return (
     <FormTopbar>
       <NavbarGroup align={Alignment.LEFT}>
@@ -41,6 +39,10 @@ export default function PaymentReceiveFormTopBar() {
   );
 }
 
+/**
+ * Branch select of payment receive form.
+ * @returns {JSX.Element}
+ */
 function PaymentReceiveFormSelectBranch() {
   // payment receive form context.
   const { branches, isBranchesLoading } = usePaymentReceiveFormContext();
@@ -51,19 +53,9 @@ function PaymentReceiveFormSelectBranch() {
     <BranchSelect
       name={'branch_id'}
       branches={branches}
-      input={PaymentReceiveBranchSelectButton}
+      input={FormBranchSelectButton}
       popoverProps={{ minimal: true }}
-    />
-  );
-}
-
-function PaymentReceiveBranchSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('payment_receive.branch_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'branch-16'} iconSize={16} />}
+      fill={false}
     />
   );
 }
diff --git a/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormTopbar.tsx b/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormTopbar.tsx
index c1cb46eaf..82db65c66 100644
--- a/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormTopbar.tsx
+++ b/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormTopbar.tsx
@@ -1,12 +1,9 @@
 // @ts-nocheck
 import React from 'react';
-import intl from 'react-intl-universal';
-import styled from 'styled-components';
 import {
   Alignment,
   NavbarGroup,
   NavbarDivider,
-  Button,
   Classes,
 } from '@blueprintjs/core';
 import {
@@ -18,12 +15,13 @@ import { Features } from '@/constants';
 import { useFeatureCan } from '@/hooks/state';
 import { useReceiptFormContext } from './ReceiptFormProvider';
 import {
-  Icon,
   BranchSelect,
   FeatureCan,
   WarehouseSelect,
   FormTopbar,
   DetailsBarSkeletonBase,
+  FormBranchSelectButton,
+  FormWarehouseSelectButton,
 } from '@/components';
 
 /**
@@ -76,8 +74,9 @@ function ReceiptFormSelectBranch() {
     <BranchSelect
       name={'branch_id'}
       branches={branches}
-      input={ReceiptBranchSelectButton}
+      input={FormBranchSelectButton}
       popoverProps={{ minimal: true }}
+      fill={false}
     />
   );
 }
@@ -96,30 +95,9 @@ function ReceiptFormSelectWarehouse() {
     <WarehouseSelect
       name={'warehouse_id'}
       warehouses={warehouses}
-      input={ReceiptWarehouseSelectButton}
+      input={FormWarehouseSelectButton}
       popoverProps={{ minimal: true }}
-    />
-  );
-}
-
-function ReceiptBranchSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('receipt.branch_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'branch-16'} iconSize={16} />}
-    />
-  );
-}
-
-function ReceiptWarehouseSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('receipt.warehouse_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'warehouse-16'} iconSize={16} />}
+      fill={false}
     />
   );
 }
diff --git a/packages/webapp/src/containers/Vendors/VendorForm/VendorFinanicalPanelTab.tsx b/packages/webapp/src/containers/Vendors/VendorForm/VendorFinanicalPanelTab.tsx
index 511ba5cc2..c9c56549e 100644
--- a/packages/webapp/src/containers/Vendors/VendorForm/VendorFinanicalPanelTab.tsx
+++ b/packages/webapp/src/containers/Vendors/VendorForm/VendorFinanicalPanelTab.tsx
@@ -9,7 +9,6 @@ import {
   InputPrependText,
   CurrencySelectList,
   BranchSelect,
-  BranchSelectButton,
   FeatureCan,
   Row,
   Col,
@@ -75,12 +74,10 @@ export default function VendorFinanicalPanelTab() {
               label={<T id={'vendor.label.opening_branch'} />}
               name={'opening_balance_branch_id'}
               inline={true}
-              className={classNames('form-group--select-list', Classes.FILL)}
             >
               <BranchSelect
                 name={'opening_balance_branch_id'}
                 branches={branches}
-                input={BranchSelectButton}
                 popoverProps={{ minimal: true }}
               />
             </FFormGroup>
diff --git a/packages/webapp/src/lang/en/index.json b/packages/webapp/src/lang/en/index.json
index ed0537d77..2010d32b1 100644
--- a/packages/webapp/src/lang/en/index.json
+++ b/packages/webapp/src/lang/en/index.json
@@ -1938,8 +1938,8 @@
   "warehouse.alert.mark_primary_message": "The given warehouse has been marked as primary.",
   "warehouse.alert.are_you_sure_you_want_to_make": "Are you sure you want to make a primary warehouse?",
   "make_primary": "Make as Primary",
-  "invoice.branch_button.label": "Branch: {label}",
-  "invoice.warehouse_button.label": "Warehouse: {label}",
+  "page_form.branch_button.label": "Branch: {text}",
+  "page_form.warehouse_button.label": "Warehouse: {text}",
   "branches_multi_select.label": "Branches",
   "branches_multi_select.placeholder": "Filter by branches…",
   "warehouses_multi_select.label": "Warehouses",
@@ -2024,20 +2024,6 @@
   "make_journal.label.total": "TOTAL",
   "expense.label.subtotal": "Subtotal",
   "expense.label.total": "TOTAL",
-  "expense.branch_button.label": "Branch: {label}",
-  "make_journal.branch_button.label": "Branch: {label}",
-  "bill.branch_button.label": "Branch: {label}",
-  "bill.warehouse_button.label": "Warehouse: {label}",
-  "vendor_credit.branch_button.label": "Branch: {label}",
-  "vendor_credit.warehouse_button.label": "Warehouse: {label}",
-  "payment_receive.branch_button.label": "Branch: {label}",
-  "payment_made.branch_button.label": "Branch: {label}",
-  "credit_note.branch_button.label": "Branch: {label}",
-  "credit_note.warehouse_button.label": "Warehouse: {label}",
-  "estimate.branch_button.label": "Branch: {label}",
-  "estimate.warehouse_button.label": "Warehouse: {label}",
-  "receipt.branch_button.label": "Branch: {label}",
-  "receipt.warehouse_button.label": "Warehouse: {label}",
   "warehouse_transfer.empty_status.title": "Manage transfer orders between warehouses.",
   "warehouse_transfer.empty_status.description": "Business with multiply warehouses often transfers items from on warehouse to another when they are in immediate need of vendors.",
   "warehouse_transfer.form.reason.label": "Reason",

From c992562760f9f4bbe98a4e143388f1ae0c722c6c Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Wed, 28 Jun 2023 19:37:33 +0200
Subject: [PATCH 8/9] update CHANGELOG.md

---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2e1eae73..e60eb9c26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 All notable changes to Bigcapital server-side will be in this file.
 
+# [0.9.9] - 28-06-2023
+
+* refactor: Customer and vendor select component by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/171
+* chore: Move auto-increment components in separate files by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/170
+* fix: Style of quick item drawer by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/173
+* fix: Should not show the form before loading account by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/172
+* fix: Payment made form does not handle not unique number an e… by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/177
+* fix: Internal note of invoice/bill payment does not saving by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/181
+* fix: Storing cash flow transaction description by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/180
+* fix: No currency in amount field on money in/out dialogs by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/179
+* fix: No default branch for customer/vendor opening balance branch by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/182
+
 # [0.9.8] - 19-06-2023
 
 `bigcapitalhq/webapp`

From b24badfa52445d3244fed9763200e96ca1d09a06 Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Fri, 7 Jul 2023 01:14:37 +0200
Subject: [PATCH 9/9] chore: add api rewrite to vercel configure

---
 vercel.json | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/vercel.json b/vercel.json
index 39a032ef2..565e459c9 100644
--- a/vercel.json
+++ b/vercel.json
@@ -3,7 +3,12 @@
   "buildCommand": "CI='' npm run build:webapp",
   "outputDirectory": "packages/webapp/build",
   "rewrites": [{
-    "source": "/(.*)",
-    "destination": "/"
-  }]
+      "source": "/api/:slug*",
+      "destination": "https://dev.bigcapital.ly/api/:slug*"
+    },
+    {
+      "source": "/(.*)",
+      "destination": "/"
+    }
+  ]
 }
\ No newline at end of file