From 2501626d7071716105bf1480a798481088eb0898 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Mon, 7 Mar 2022 20:46:48 +0200
Subject: [PATCH] feat(qucikpayment):add exchange rate muted & branch.

---
 .../QuickPaymentMadeFormDialogContent.js       | 17 ++---------------
 .../QuickPaymentMadeFormFields.js              | 15 ++++++++++++---
 .../QuickPaymentMadeFormProvider.js            |  8 +-------
 .../QuickPaymentMadeFormDialog/utils.js        |  7 -------
 .../QuickPaymentReceiveFormDialogContent.js    | 13 ++-----------
 .../QuickPaymentReceiveFormFields.js           | 18 +++++++++++++-----
 .../QuickPaymentReceiveFormDialog/utils.js     |  9 +--------
 7 files changed, 31 insertions(+), 56 deletions(-)

diff --git a/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormDialogContent.js b/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormDialogContent.js
index ca5ab5ef5..bfc35be0c 100644
--- a/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormDialogContent.js
+++ b/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormDialogContent.js
@@ -5,30 +5,17 @@ import 'style/pages/PaymentReceive/QuickPaymentReceiveDialog.scss';
 import { QuickPaymentMadeFormProvider } from './QuickPaymentMadeFormProvider';
 import QuickPaymentMadeForm from './QuickPaymentMadeForm';
 
-import withCurrentOrganization from 'containers/Organization/withCurrentOrganization';
-import { compose } from 'utils';
-
 /**
  * Quick payment made form dialog content.
  */
-function QuickPaymentMadeFormDialogContent({
+export default function QuickPaymentMadeFormDialogContent({
   // #ownProps
   dialogName,
   bill,
-  // #withCurrentOrganization
-  organization: { base_currency },
 }) {
   return (
-    <QuickPaymentMadeFormProvider
-      billId={bill}
-      baseCurrency={base_currency}
-      dialogName={dialogName}
-    >
+    <QuickPaymentMadeFormProvider billId={bill} dialogName={dialogName}>
       <QuickPaymentMadeForm />
     </QuickPaymentMadeFormProvider>
   );
 }
-
-export default compose(withCurrentOrganization())(
-  QuickPaymentMadeFormDialogContent,
-);
diff --git a/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormFields.js b/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormFields.js
index 34a4dd46a..36e9ef57f 100644
--- a/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormFields.js
+++ b/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormFields.js
@@ -2,6 +2,7 @@ import React from 'react';
 import styled from 'styled-components';
 import { FastField, ErrorMessage, useFormikContext } from 'formik';
 import { FormattedMessage as T } from 'components';
+import { isEqual } from 'lodash';
 import intl from 'react-intl-universal';
 import {
   Classes,
@@ -38,12 +39,17 @@ import {
 import { useSetPrimaryBranchToForm, useForeignAccount } from './utils';
 import { useQuickPaymentMadeContext } from './QuickPaymentMadeFormProvider';
 
+import withCurrentOrganization from 'containers/Organization/withCurrentOrganization';
+import { compose } from 'utils';
+
 /**
  * Quick payment made form fields.
  */
-export default function QuickPaymentMadeFormFields() {
+function QuickPaymentMadeFormFields({
+  // #withCurrentOrganization
+  organization: { base_currency },
+}) {
   const { accounts, branches, baseCurrency } = useQuickPaymentMadeContext();
-  const isForeigAccount = useForeignAccount();
 
   // Intl context.
   const { values } = useFormikContext();
@@ -145,7 +151,8 @@ export default function QuickPaymentMadeFormFields() {
           </FormGroup>
         )}
       </FastField>
-      <If condition={isForeigAccount}>
+
+      <If condition={!isEqual(base_currency, values.currency_code)}>
         {/*------------ exchange rate -----------*/}
         <ExchangeRateMutedField
           name={'exchange_rate'}
@@ -249,6 +256,8 @@ export default function QuickPaymentMadeFormFields() {
   );
 }
 
+export default compose(withCurrentOrganization())(QuickPaymentMadeFormFields);
+
 export const BranchRowDivider = styled.div`
   height: 1px;
   background: #ebf1f6;
diff --git a/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormProvider.js b/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormProvider.js
index 5533a6f39..449c80d6e 100644
--- a/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormProvider.js
+++ b/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormProvider.js
@@ -14,12 +14,7 @@ const QuickPaymentMadeContext = React.createContext();
 /**
  * Quick payment made dialog provider.
  */
-function QuickPaymentMadeFormProvider({
-  billId,
-  baseCurrency,
-  dialogName,
-  ...props
-}) {
+function QuickPaymentMadeFormProvider({ billId, dialogName, ...props }) {
   // Handle fetch bill details.
   const { isLoading: isBillLoading, data: bill } = useBill(billId, {
     enabled: !!billId,
@@ -48,7 +43,6 @@ function QuickPaymentMadeFormProvider({
     accounts,
     branches,
     dialogName,
-    baseCurrency,
     createPaymentMadeMutate,
     isBranchesSuccess,
   };
diff --git a/src/containers/Dialogs/QuickPaymentMadeFormDialog/utils.js b/src/containers/Dialogs/QuickPaymentMadeFormDialog/utils.js
index aa2f17e7b..427f7e194 100644
--- a/src/containers/Dialogs/QuickPaymentMadeFormDialog/utils.js
+++ b/src/containers/Dialogs/QuickPaymentMadeFormDialog/utils.js
@@ -47,10 +47,3 @@ export const useSetPrimaryBranchToForm = () => {
     }
   }, [isBranchesSuccess, setFieldValue, branches]);
 };
-
-export const useForeignAccount = () => {
-  const { values } = useFormikContext();
-  const { baseCurrency } = useQuickPaymentMadeContext();
-
-  return !isEqual(baseCurrency, values.currency_code);
-};
diff --git a/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFormDialogContent.js b/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFormDialogContent.js
index 48eb34183..94bfc506f 100644
--- a/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFormDialogContent.js
+++ b/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFormDialogContent.js
@@ -2,32 +2,23 @@ import React from 'react';
 
 import 'style/pages/PaymentReceive/QuickPaymentReceiveDialog.scss';
 
-import QuickPaymentReceiveForm from './QuickPaymentReceiveForm';
 import { QuickPaymentReceiveFormProvider } from './QuickPaymentReceiveFormProvider';
-
-import withCurrentOrganization from 'containers/Organization/withCurrentOrganization';
-import { compose } from 'utils';
+import QuickPaymentReceiveForm from './QuickPaymentReceiveForm';
 
 /**
  * Quick payment receive form dialog content.
  */
-function QuickPaymentReceiveFormDialogContent({
+export default function QuickPaymentReceiveFormDialogContent({
   // #ownProps
   dialogName,
   invoice,
-  // #withCurrentOrganization
-  organization: { base_currency },
 }) {
   return (
     <QuickPaymentReceiveFormProvider
       invoiceId={invoice}
       dialogName={dialogName}
-      baseCurrency={base_currency}
     >
       <QuickPaymentReceiveForm />
     </QuickPaymentReceiveFormProvider>
   );
 }
-export default compose(withCurrentOrganization())(
-  QuickPaymentReceiveFormDialogContent,
-);
diff --git a/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFormFields.js b/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFormFields.js
index 406f23c95..82859d7d3 100644
--- a/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFormFields.js
+++ b/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFormFields.js
@@ -4,6 +4,7 @@ import { FastField, ErrorMessage, useFormikContext } from 'formik';
 import { FormattedMessage as T } from 'components';
 import intl from 'react-intl-universal';
 import { useAutofocus } from 'hooks';
+import { isEqual } from 'lodash';
 import {
   Classes,
   FormGroup,
@@ -36,17 +37,22 @@ import {
   handleDateChange,
   compose,
 } from 'utils';
-import { useSetPrimaryBranchToForm, useForeignAccount } from './utils';
+import { useSetPrimaryBranchToForm } from './utils';
 import { useQuickPaymentReceiveContext } from './QuickPaymentReceiveFormProvider';
+
+import withCurrentOrganization from 'containers/Organization/withCurrentOrganization';
 import withSettings from 'containers/Settings/withSettings';
 
 /**
  * Quick payment receive form fields.
  */
-function QuickPaymentReceiveFormFields({ paymentReceiveAutoIncrement }) {
-  const { accounts, branches, baseCurrency } = useQuickPaymentReceiveContext();
+function QuickPaymentReceiveFormFields({
+  paymentReceiveAutoIncrement,
 
-  const isForeigAccount = useForeignAccount();
+  // #withCurrentOrganization
+  organization: { base_currency },
+}) {
+  const { accounts, branches, baseCurrency } = useQuickPaymentReceiveContext();
 
   // Intl context.
   const { values } = useFormikContext();
@@ -151,7 +157,7 @@ function QuickPaymentReceiveFormFields({ paymentReceiveAutoIncrement }) {
         )}
       </FastField>
 
-      <If condition={isForeigAccount}>
+      <If condition={!isEqual(base_currency, values.currency_code)}>
         {/*------------ exchange rate -----------*/}
         <ExchangeRateMutedField
           name={'exchange_rate'}
@@ -242,6 +248,7 @@ function QuickPaymentReceiveFormFields({ paymentReceiveAutoIncrement }) {
           </FormGroup>
         )}
       </FastField>
+
       {/* --------- Statement --------- */}
       <FastField name={'statement'}>
         {({ form, field, meta: { error, touched } }) => (
@@ -261,6 +268,7 @@ export default compose(
   withSettings(({ paymentReceiveSettings }) => ({
     paymentReceiveAutoIncrement: paymentReceiveSettings?.autoIncrement,
   })),
+  withCurrentOrganization(),
 )(QuickPaymentReceiveFormFields);
 
 export const BranchRowDivider = styled.div`
diff --git a/src/containers/Dialogs/QuickPaymentReceiveFormDialog/utils.js b/src/containers/Dialogs/QuickPaymentReceiveFormDialog/utils.js
index b269620fc..bac86a4a9 100644
--- a/src/containers/Dialogs/QuickPaymentReceiveFormDialog/utils.js
+++ b/src/containers/Dialogs/QuickPaymentReceiveFormDialog/utils.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import moment from 'moment';
 import intl from 'react-intl-universal';
-import { first, isEqual } from 'lodash';
+import { first } from 'lodash';
 
 import { useFormikContext } from 'formik';
 import { useQuickPaymentReceiveContext } from './QuickPaymentReceiveFormProvider';
@@ -55,10 +55,3 @@ export const useSetPrimaryBranchToForm = () => {
     }
   }, [isBranchesSuccess, setFieldValue, branches]);
 };
-
-export const useForeignAccount = () => {
-  const { values } = useFormikContext();
-  const { baseCurrency } = useQuickPaymentReceiveContext();
-
-  return !isEqual(baseCurrency, values.currency_code);
-};