From ba71679b5580ec470aa28c898a728fa8c996a267 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Wed, 23 Mar 2022 00:07:16 +0200
Subject: [PATCH] Fix: expenses.

---
 .../Expenses/ExpenseForm/ExpenseFormFooterRight.js   |  5 ++---
 .../Expenses/ExpenseForm/ExpenseFormPage.js          | 11 +++--------
 .../Expenses/ExpenseForm/ExpenseFormPageProvider.js  | 12 +-----------
 .../Expenses/ExpenseForm/ExpenseFormTopBar.js        |  2 +-
 4 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/containers/Expenses/ExpenseForm/ExpenseFormFooterRight.js b/src/containers/Expenses/ExpenseForm/ExpenseFormFooterRight.js
index 9b9ed5685..8ce88a308 100644
--- a/src/containers/Expenses/ExpenseForm/ExpenseFormFooterRight.js
+++ b/src/containers/Expenses/ExpenseForm/ExpenseFormFooterRight.js
@@ -15,14 +15,13 @@ export function ExpenseFormFooterRight() {
   return (
     <ExpensesTotalLines>
       <TotalLine
-        title={<T id={'manual_journal.details.subtotal'} />}
+        title={<T id={'expense.label.subtotal'} />}
         value={formattedSubtotal}
         borderStyle={TotalLineBorderStyle.None}
       />
       <TotalLine
-        title={<T id={'manual_journal.details.total'} />}
+        title={<T id={'expense.label.total'} />}
         value={formattedTotal}
-        // borderStyle={TotalLineBorderStyle.SingleDark}
         textStyle={TotalLineTextStyle.Bold}
       />
     </ExpensesTotalLines>
diff --git a/src/containers/Expenses/ExpenseForm/ExpenseFormPage.js b/src/containers/Expenses/ExpenseForm/ExpenseFormPage.js
index adfaa957f..0aecf6428 100644
--- a/src/containers/Expenses/ExpenseForm/ExpenseFormPage.js
+++ b/src/containers/Expenses/ExpenseForm/ExpenseFormPage.js
@@ -5,22 +5,17 @@ import 'style/pages/Expense/PageForm.scss';
 
 import ExpenseForm from './ExpenseForm';
 import { ExpenseFormPageProvider } from './ExpenseFormPageProvider';
-import withCurrentOrganization from 'containers/Organization/withCurrentOrganization';
-import { compose } from 'utils';
+
 /**
  * Expense page form.
  */
-function ExpenseFormPage({
-  // #withCurrentOrganization
-  organization: { base_currency },
-}) {
+export default function ExpenseFormPage() {
   const { id } = useParams();
   const expenseId = parseInt(id, 10);
 
   return (
-    <ExpenseFormPageProvider expenseId={expenseId} baseCurrency={base_currency}>
+    <ExpenseFormPageProvider expenseId={expenseId}>
       <ExpenseForm />
     </ExpenseFormPageProvider>
   );
 }
-export default compose(withCurrentOrganization())(ExpenseFormPage);
diff --git a/src/containers/Expenses/ExpenseForm/ExpenseFormPageProvider.js b/src/containers/Expenses/ExpenseForm/ExpenseFormPageProvider.js
index 3d8d69741..48528a3d1 100644
--- a/src/containers/Expenses/ExpenseForm/ExpenseFormPageProvider.js
+++ b/src/containers/Expenses/ExpenseForm/ExpenseFormPageProvider.js
@@ -1,5 +1,4 @@
 import React, { createContext } from 'react';
-import { isEqual, isUndefined } from 'lodash';
 import DashboardInsider from 'components/Dashboard/DashboardInsider';
 import { Features } from 'common';
 import { useFeatureCan } from 'hooks/state';
@@ -18,7 +17,7 @@ const ExpenseFormPageContext = createContext();
 /**
  * Accounts chart data provider.
  */
-function ExpenseFormPageProvider({ query, expenseId, baseCurrency, ...props }) {
+function ExpenseFormPageProvider({ query, expenseId, ...props }) {
   // Features guard.
   const { featureCan } = useFeatureCan();
   const isBranchFeatureCan = featureCan(Features.Branches);
@@ -52,23 +51,15 @@ function ExpenseFormPageProvider({ query, expenseId, baseCurrency, ...props }) {
 
   // Submit form payload.
   const [submitPayload, setSubmitPayload] = React.useState({});
-  const [selectCustomer, setSelectCustomer] = React.useState(null);
 
   // Detarmines whether the form in new mode.
   const isNewMode = !expenseId;
 
-  // Determines whether the foreign customer.
-  const isForeignCustomer =
-    !isEqual(selectCustomer?.currency_code, baseCurrency) &&
-    !isUndefined(selectCustomer?.currency_code);
-
   // Provider payload.
   const provider = {
     isNewMode,
-    isForeignCustomer,
     expenseId,
     submitPayload,
-    selectCustomer,
 
     currencies,
     customers,
@@ -85,7 +76,6 @@ function ExpenseFormPageProvider({ query, expenseId, baseCurrency, ...props }) {
     createExpenseMutate,
     editExpenseMutate,
     setSubmitPayload,
-    setSelectCustomer,
   };
 
   return (
diff --git a/src/containers/Expenses/ExpenseForm/ExpenseFormTopBar.js b/src/containers/Expenses/ExpenseForm/ExpenseFormTopBar.js
index 04ebddacc..88348bb83 100644
--- a/src/containers/Expenses/ExpenseForm/ExpenseFormTopBar.js
+++ b/src/containers/Expenses/ExpenseForm/ExpenseFormTopBar.js
@@ -59,7 +59,7 @@ function ExpenseFormSelectBranch() {
 function ExpenseBranchSelectButton({ label }) {
   return (
     <Button
-      text={intl.get('invoice.branch_button.label', { label })}
+      text={intl.get('expense.branch_button.label', { label })}
       minimal={true}
       small={true}
       icon={<Icon icon={'branch-16'} iconSize={16} />}