From bc0f4f4cd9f2b3ab415eb4279c22a061f03b0f75 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Wed, 23 Mar 2022 00:04:13 +0200
Subject: [PATCH] Fix: make journal.

---
 .../Accounting/MakeJournal/MakeJournalEntriesPage.js | 11 ++---------
 .../MakeJournal/MakeJournalFormFooterRight.js        |  5 ++---
 .../Accounting/MakeJournal/MakeJournalFormTopBar.js  |  2 +-
 .../Accounting/MakeJournal/MakeJournalProvider.js    | 12 ++----------
 4 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/containers/Accounting/MakeJournal/MakeJournalEntriesPage.js b/src/containers/Accounting/MakeJournal/MakeJournalEntriesPage.js
index a00a2cec4..9d83207ac 100644
--- a/src/containers/Accounting/MakeJournal/MakeJournalEntriesPage.js
+++ b/src/containers/Accounting/MakeJournal/MakeJournalEntriesPage.js
@@ -6,22 +6,15 @@ import 'style/pages/ManualJournal/MakeJournal.scss';
 import MakeJournalEntriesForm from './MakeJournalEntriesForm';
 import { MakeJournalProvider } from './MakeJournalProvider';
 
-import withCurrentOrganization from 'containers/Organization/withCurrentOrganization';
-import { compose } from 'utils';
-
 /**
  * Make journal entries page.
  */
-function MakeJournalEntriesPage({
-  // #withCurrentOrganization
-  organization: { base_currency },
-}) {
+export default function MakeJournalEntriesPage() {
   const { id: journalId } = useParams();
 
   return (
-    <MakeJournalProvider journalId={journalId} baseCurrency={base_currency}>
+    <MakeJournalProvider journalId={journalId}>
       <MakeJournalEntriesForm />
     </MakeJournalProvider>
   );
 }
-export default compose(withCurrentOrganization())(MakeJournalEntriesPage);
diff --git a/src/containers/Accounting/MakeJournal/MakeJournalFormFooterRight.js b/src/containers/Accounting/MakeJournal/MakeJournalFormFooterRight.js
index fc18018f4..69e4e57bc 100644
--- a/src/containers/Accounting/MakeJournal/MakeJournalFormFooterRight.js
+++ b/src/containers/Accounting/MakeJournal/MakeJournalFormFooterRight.js
@@ -15,14 +15,13 @@ export function MakeJournalFormFooterRight() {
   return (
     <MakeJouranlTotalLines>
       <TotalLine
-        title={<T id={'manual_journal.details.subtotal'} />}
+        title={<T id={'make_journal.label.subtotal'} />}
         value={formattedSubtotal}
         borderStyle={TotalLineBorderStyle.None}
       />
       <TotalLine
-        title={<T id={'manual_journal.details.total'} />}
+        title={<T id={'make_journal.label.total'} />}
         value={formattedTotal}
-        // borderStyle={TotalLineBorderStyle.SingleDark}
         textStyle={TotalLineTextStyle.Bold}
       />
     </MakeJouranlTotalLines>
diff --git a/src/containers/Accounting/MakeJournal/MakeJournalFormTopBar.js b/src/containers/Accounting/MakeJournal/MakeJournalFormTopBar.js
index 52758a952..9f96f4912 100644
--- a/src/containers/Accounting/MakeJournal/MakeJournalFormTopBar.js
+++ b/src/containers/Accounting/MakeJournal/MakeJournalFormTopBar.js
@@ -59,7 +59,7 @@ function MakeJournalFormSelectBranch() {
 function MakeJournalBranchSelectButton({ label }) {
   return (
     <Button
-      text={intl.get('invoice.branch_button.label', { label })}
+      text={intl.get('make_journal.branch_button.label', { label })}
       minimal={true}
       small={true}
       icon={<Icon icon={'branch-16'} iconSize={16} />}
diff --git a/src/containers/Accounting/MakeJournal/MakeJournalProvider.js b/src/containers/Accounting/MakeJournal/MakeJournalProvider.js
index ab127c698..2e51a5551 100644
--- a/src/containers/Accounting/MakeJournal/MakeJournalProvider.js
+++ b/src/containers/Accounting/MakeJournal/MakeJournalProvider.js
@@ -20,7 +20,7 @@ const MakeJournalFormContext = createContext();
 /**
  * Make journal form provider.
  */
-function MakeJournalProvider({ journalId, query, baseCurrency, ...props }) {
+function MakeJournalProvider({ journalId, query, ...props }) {
   // Features guard.
   const { featureCan } = useFeatureCan();
   const isBranchFeatureCan = featureCan(Features.Branches);
@@ -58,21 +58,16 @@ function MakeJournalProvider({ journalId, query, baseCurrency, ...props }) {
 
   // Submit form payload.
   const [submitPayload, setSubmitPayload] = useState({});
-  const [selectJournalCurrency, setSelactJournalCurrency] = useState(null);
 
   // Determines whether the warehouse and branches are loading.
   const isFeatureLoading = isBranchesLoading;
 
-  const isForeignJournal =
-    !isEqual(selectJournalCurrency?.currency_code, baseCurrency) &&
-    !isUndefined(selectJournalCurrency?.currency_code);
-
   const provider = {
     accounts,
     contacts,
     currencies,
     manualJournal,
-    baseCurrency,
+
     branches,
 
     createJournalMutate,
@@ -84,14 +79,11 @@ function MakeJournalProvider({ journalId, query, baseCurrency, ...props }) {
     isJournalLoading,
     isFeatureLoading,
     isSettingsLoading,
-    isForeignJournal,
     isBranchesSuccess,
     isNewMode: !journalId,
 
     submitPayload,
     setSubmitPayload,
-    selectJournalCurrency,
-    setSelactJournalCurrency,
   };
 
   return (