diff --git a/src/components/BranchSuggestField.js b/src/components/BranchSuggestField.js
index 1f4241692..a856a33e0 100644
--- a/src/components/BranchSuggestField.js
+++ b/src/components/BranchSuggestField.js
@@ -39,10 +39,10 @@ export default function BranchSuggestField({
       <MenuItem
         // active={modifiers.active}
         disabled={modifiers.disabled}
-        label={branch.code.toString()}
+        label={branch.code}
         key={branch.id}
         onClick={handleClick}
-        text={branch.name.toString()}
+        text={branch.name}
       />
     );
   };
diff --git a/src/containers/Accounting/MakeJournal/MakeJournalEntriesHeaderFields.js b/src/containers/Accounting/MakeJournal/MakeJournalEntriesHeaderFields.js
index 64f31c831..148eba972 100644
--- a/src/containers/Accounting/MakeJournal/MakeJournalEntriesHeaderFields.js
+++ b/src/containers/Accounting/MakeJournal/MakeJournalEntriesHeaderFields.js
@@ -195,32 +195,35 @@ function MakeJournalEntriesHeader({
       </FastField>
 
       {/*------------ Currency  -----------*/}
-      {/* <FeatureCan feature={Features.ManualJournal}> */}
-      <FastField
-        name={'currency_code'}
-        currencies={currencies}
-        shouldUpdate={currenciesFieldShouldUpdate}
-      >
-        {({ form, field: { value }, meta: { error, touched } }) => (
-          <FormGroup
-            label={<T id={'currency'} />}
-            className={classNames('form-group--currency', CLASSES.FILL)}
-            inline={true}
-          >
-            <CurrencySelectList
-              currenciesList={currencies}
-              selectedCurrencyCode={value}
-              onCurrencySelected={(currencyItem) => {
-                form.setFieldValue('currency_code', currencyItem.currency_code);
-                form.setFieldValue('exchange_rate', '');
-                setSelactJournalCurrency(currencyItem);
-              }}
-              defaultSelectText={value}
-            />
-          </FormGroup>
-        )}
-      </FastField>
-      {/* </FeatureCan> */}
+      <FeatureCan feature={Features.ManualJournal}>
+        <FastField
+          name={'currency_code'}
+          currencies={currencies}
+          shouldUpdate={currenciesFieldShouldUpdate}
+        >
+          {({ form, field: { value }, meta: { error, touched } }) => (
+            <FormGroup
+              label={<T id={'currency'} />}
+              className={classNames('form-group--currency', CLASSES.FILL)}
+              inline={true}
+            >
+              <CurrencySelectList
+                currenciesList={currencies}
+                selectedCurrencyCode={value}
+                onCurrencySelected={(currencyItem) => {
+                  form.setFieldValue(
+                    'currency_code',
+                    currencyItem.currency_code,
+                  );
+                  form.setFieldValue('exchange_rate', '');
+                  setSelactJournalCurrency(currencyItem);
+                }}
+                defaultSelectText={value}
+              />
+            </FormGroup>
+          )}
+        </FastField>
+      </FeatureCan>
 
       {/* ----------- Exchange rate ----------- */}
       <If condition={isForeignJournal}>
diff --git a/src/containers/Purchases/Bills/BillForm/BillFormTopBar.js b/src/containers/Purchases/Bills/BillForm/BillFormTopBar.js
index f248c7ecf..ba5b673c2 100644
--- a/src/containers/Purchases/Bills/BillForm/BillFormTopBar.js
+++ b/src/containers/Purchases/Bills/BillForm/BillFormTopBar.js
@@ -38,7 +38,7 @@ export default function BillFormTopBar() {
   useSetPrimaryBranchToForm();
 
   // Can't display the navigation bar if warehouses or branches feature is not enabled.
-  if (!featureCan(Features.Warehouses) || !featureCan(Features.Branches)) {
+  if (!featureCan(Features.Warehouses) && !featureCan(Features.Branches)) {
     return null;
   }
 
diff --git a/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormTopBar.js b/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormTopBar.js
index 970601856..1efba700c 100644
--- a/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormTopBar.js
+++ b/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormTopBar.js
@@ -39,7 +39,7 @@ export default function VendorCreditNoteFormTopBar() {
   useSetPrimaryBranchToForm();
 
   // Can't display the navigation bar if warehouses or branches feature is not enabled.
-  if (!featureCan(Features.Warehouses) || !featureCan(Features.Branches)) {
+  if (!featureCan(Features.Warehouses) && !featureCan(Features.Branches)) {
     return null;
   }
 
diff --git a/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormTopBar.js b/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormTopBar.js
index c73213f20..63a96f11e 100644
--- a/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormTopBar.js
+++ b/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormTopBar.js
@@ -38,7 +38,7 @@ export default function CreditNoteFormTopbar() {
   useSetPrimaryBranchToForm();
 
   // Can't display the navigation bar if warehouses or branches feature is not enabled.
-  if (!featureCan(Features.Warehouses) || !featureCan(Features.Branches)) {
+  if (!featureCan(Features.Warehouses) && !featureCan(Features.Branches)) {
     return null;
   }
 
diff --git a/src/containers/Sales/Estimates/EstimateForm/EstimtaeFormTopBar.js b/src/containers/Sales/Estimates/EstimateForm/EstimtaeFormTopBar.js
index 84f709979..497e22bdf 100644
--- a/src/containers/Sales/Estimates/EstimateForm/EstimtaeFormTopBar.js
+++ b/src/containers/Sales/Estimates/EstimateForm/EstimtaeFormTopBar.js
@@ -39,7 +39,7 @@ export default function EstimtaeFormTopBar() {
   useSetPrimaryBranchToForm();
 
   // Can't display the navigation bar if warehouses or branches feature is not enabled.
-  if (!featureCan(Features.Warehouses) || !featureCan(Features.Branches)) {
+  if (!featureCan(Features.Warehouses) && !featureCan(Features.Branches)) {
     return null;
   }
 
diff --git a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.js b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.js
index 0588c9449..a6be97255 100644
--- a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.js
+++ b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.js
@@ -40,7 +40,7 @@ export default function InvoiceFormTopBar() {
   useSetPrimaryBranchToForm();
 
   // Can't display the navigation bar if warehouses or branches feature is not enabled.
-  if (!featureCan(Features.Warehouses) || !featureCan(Features.Branches)) {
+  if (!featureCan(Features.Warehouses) && !featureCan(Features.Branches)) {
     return null;
   }
   return (
diff --git a/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormTopbar.js b/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormTopbar.js
index 2f83d0323..df0f5c3e1 100644
--- a/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormTopbar.js
+++ b/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormTopbar.js
@@ -40,7 +40,7 @@ export default function ReceiptFormTopBar() {
   useSetPrimaryBranchToForm();
 
   // Can't display the navigation bar if warehouses or branches feature is not enabled.
-  if (!featureCan(Features.Warehouses) || !featureCan(Features.Branches)) {
+  if (!featureCan(Features.Warehouses) && !featureCan(Features.Branches)) {
     return null;
   }