Merge branch 'feature/multi-dimensions' of https://github.com/bigcapitalhq/client into feature/multi-dimensions

src/components/Preferences/PreferencesTopbar.js

@@ -42,7 +42,11 @@ function PreferencesTopbar({ preferencesPageTitle }) {
               path={'/preferences/warehouses'}
               component={WarehousesActions}
             />
-            <Route path={'/preferences/branches'} component={BranchesActions} />
+            <Route
+              exact
+              path={'/preferences/branches'}
+              component={BranchesActions}
+            />
           </Switch>
         </Route>
       </div>

src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLoss.js

@@ -5,11 +5,11 @@ import DashboardPageContent from 'components/Dashboard/DashboardPageContent';
 
 import RealizedGainOrLossHeader from './RealizedGainOrLossHeader';
 import RealizedGainOrLossActionsBar from './RealizedGainOrLossActionsBar';
+import { RealizedGainOrLossLoadingBar } from './components';
+import { RealizedGainOrLossProvider } from './RealizedGainOrLossProvider';
 
 import withCurrentOrganization from '../../Organization/withCurrentOrganization';
 import withRealizedGainOrLossActions from './withRealizedGainOrLossActions';
-import { RealizedGainOrLossProvider } from './RealizedGainOrLossProvider';
-import { RealizedGainOrLossLoadingBar } from './components';
 
 import { compose } from 'utils';
 

src/lang/en/index.json

@@ -1768,6 +1768,8 @@
   "customer.alert.inactivated_message": "The customer has been inactivated successfully.",
   "customer.alert.are_you_sure_want_to_inactivate_this_customer": "Are you sure want to inactivate this customer? You will to able to activate it later.",
 
+  "credit_note_preview.dialog.title": "Credit Note PDF Preview",
+  "payment_receive_preview.dialog.title": "Payment Receive PDF Preview",
   "warehouses.label": "Warehouses",
   "warehouses.label.new_warehouse": "New Warehouse",
   "warehouse.dialog.label.new_warehouse": "New Warehouse",
@@ -1823,8 +1825,6 @@
   "warehouse_transfer.once_delete_this_warehouse_transfer": "Once you delete this warehouse transfer, you won't be able to restore it later. Are you sure you want to delete this warehouse transfer?",
   "warehouse_transfer.error.could_not_transfer_item_from_source_to_destination": "Could not transfer item from source to destination on the same warehouse",
 
-  "credit_note_preview.dialog.title": "Credit Note PDF Preview",
-  "payment_receive_preview.dialog.title": "Payment Receive PDF Preview",
   "branches.label": "Branches",
   "branches.label.new_branch": "New Branch",
   "branches.action.edit_branch": "Edit Branch",
@@ -1852,9 +1852,10 @@
   "unrealized_gain_or_loss.label": "Unrealized Gain or Loss",
   "branch_activate.dialog_success_message": "Multi-branches feature has been activated successfully.",
   "branch.alert.mark_primary_message": "The branch has been marked as primary.",
+
   "branch.alert.are_you_sure_you_want_to_make": "Are you sure you want to make a primary branch?",
   "warehouse_activate.dialog_success_message": "Multi-branches feature has been activated successfully.",
   "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 Primary"
+  "make_primary": "Make as Primary"
 }

src/routes/preferences.js

@@ -40,6 +40,7 @@ export default [
   {
     path: `${BASE_URL}/warehouses`,
     component: Warehouses,
+    exact: true,
   },
   {
     path: `${BASE_URL}/branches`,