diff --git a/src/containers/Dialogs/BranchActivateDialog/BranchActivateFormContent.js b/src/containers/Dialogs/BranchActivateDialog/BranchActivateFormContent.js
index e6b7d0169..ed31bb290 100644
--- a/src/containers/Dialogs/BranchActivateDialog/BranchActivateFormContent.js
+++ b/src/containers/Dialogs/BranchActivateDialog/BranchActivateFormContent.js
@@ -1,6 +1,6 @@
import React from 'react';
import { Form } from 'formik';
-import { Intent, Callout, Classes } from '@blueprintjs/core';
+import { Classes } from '@blueprintjs/core';
import BranchActivateFormFloatingActions from './BranchActivateFormFloatingActions';
/**
@@ -10,10 +10,20 @@ export default function BranchActivateFormContent() {
return (
diff --git a/src/containers/Dialogs/BranchActivateDialog/BranchActivateFormFloatingActions.js b/src/containers/Dialogs/BranchActivateDialog/BranchActivateFormFloatingActions.js
index 395758d44..3d7f222c6 100644
--- a/src/containers/Dialogs/BranchActivateDialog/BranchActivateFormFloatingActions.js
+++ b/src/containers/Dialogs/BranchActivateDialog/BranchActivateFormFloatingActions.js
@@ -37,7 +37,8 @@ function BranchActivateFormFloatingActions({
style={{ minWidth: '95px' }}
type="submit"
>
- {}
+ {}
+
diff --git a/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormContent.js b/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormContent.js
index 137142a05..d83710cd3 100644
--- a/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormContent.js
+++ b/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormContent.js
@@ -1,20 +1,29 @@
import React from 'react';
import { Form } from 'formik';
-import { Intent, Callout, Classes } from '@blueprintjs/core';
+import { Classes } from '@blueprintjs/core';
import WarehouseActivateFormFloatingActions from './WarehouseActivateFormFloatingActions';
/**
- * warehouse activate form content.
+ * Warehouse activate form content.
*/
export default function WarehouseActivateFormContent() {
return (
diff --git a/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormFloatingActions.js b/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormFloatingActions.js
index ab6444268..07071347c 100644
--- a/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormFloatingActions.js
+++ b/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormFloatingActions.js
@@ -37,7 +37,7 @@ function WarehouseActivateFormFloatingActions({
style={{ minWidth: '95px' }}
type="submit"
>
- {}
+ {}
diff --git a/src/containers/Dialogs/WarehouseActivateDialog/index.js b/src/containers/Dialogs/WarehouseActivateDialog/index.js
index d53555beb..bf5e15e4f 100644
--- a/src/containers/Dialogs/WarehouseActivateDialog/index.js
+++ b/src/containers/Dialogs/WarehouseActivateDialog/index.js
@@ -16,7 +16,7 @@ function WarehouseActivateDialog({ dialogName, payload: {}, isOpen }) {
return (
}
+ title={}
isOpen={isOpen}
canEscapeJeyClose={true}
autoFocus={true}
diff --git a/src/containers/Preferences/Branches/BranchesEmptyStatus.js b/src/containers/Preferences/Branches/BranchesEmptyStatus.js
index 2665f5b95..57c6fbe66 100644
--- a/src/containers/Preferences/Branches/BranchesEmptyStatus.js
+++ b/src/containers/Preferences/Branches/BranchesEmptyStatus.js
@@ -29,11 +29,7 @@ function BranchesEmptyStatus({
large={true}
onClick={handleActivateBranch}
>
-
-
-
-
}
diff --git a/src/containers/Preferences/Warehouses/WarehousesEmptyStatus.js b/src/containers/Preferences/Warehouses/WarehousesEmptyStatus.js
index 811c6a1ba..548f7a343 100644
--- a/src/containers/Preferences/Warehouses/WarehousesEmptyStatus.js
+++ b/src/containers/Preferences/Warehouses/WarehousesEmptyStatus.js
@@ -29,11 +29,7 @@ function WarehousesEmptyStatus({
large={true}
onClick={handleActivateWarehouse}
>
-
-
-
-
}
diff --git a/src/lang/en/index.json b/src/lang/en/index.json
index da9ed80df..477c6277b 100644
--- a/src/lang/en/index.json
+++ b/src/lang/en/index.json
@@ -1802,8 +1802,9 @@
"warehouses.action.edit_warehouse": "Edit Warehouse",
"warehouses.action.delete_warehouse": "Delete Warehouse",
"warehouses.action.make_as_parimary": "Mark as Primary",
- "warehouses.empty_status.title": "Create and manage your organization's Warehouses.",
- "warehouses.empty_status.description": "",
+ "warehouses.empty_status.title": "Manage your organization's warehouses.",
+ "warehouses.empty_status.description": "Manage and track your organization's inventory across multiple warehouses.",
+ "warehouses.activate_button": "Activate Warehouses",
"warehouse.alert.delete_message": "The warehouse has been deleted successfully",
"warehouse.once_delete_this_warehouse": "Once you delete this warehouse, you won't be able to restore it later. Are you sure you want to delete this warehouse?",
"warehouse.error.could_not_delete_only_waerhouse": "You could not delete the only warehouse.",
@@ -1851,8 +1852,9 @@
"branches.column.address": "Address",
"branches.column.phone_number": "Phone number",
"branches.column.code": "Code",
- "branches.empty_status.title": "Create and manage your organization's Branches.",
- "branches.empty_status.description": "",
+ "branches.empty_status.title": "Manage you organization's branches.",
+ "branches.empty_status.description": "Manage and track business transactions to evaluate branches performance.",
+ "branches.activate_button": "Activate Branches",
"select_branch": "Select branch",
"branch": "Branch",
"warehouse": "Warehouse",
@@ -1872,12 +1874,12 @@
"branch.once_delete_this_branch": "Once you delete this branch, you won't be able to restore it later. Are you sure you want to delete this branch?",
"realized_gain_or_loss.label": "Realized Gain or Loss",
"unrealized_gain_or_loss.label": "Unrealized Gain or Loss",
- "branch_activate.dialog.label": "Branches Activate",
+ "branch_activate.dialog.label": "Branches Activation",
"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?",
"branch.error.could_not_delete_only_branch": "You could not delete the only branch.",
- "warehouse_actviate.dialog.label": "Warehouses Activate",
+ "warehouse_actviate.dialog.label": "Warehouses Activation",
"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?",
diff --git a/src/style/objects/typography.scss b/src/style/objects/typography.scss
index 28c25d375..9bd78c5f2 100644
--- a/src/style/objects/typography.scss
+++ b/src/style/objects/typography.scss
@@ -20,4 +20,17 @@ body{
.paragraph{
line-height: 1.5;
font-size: 14px;
+}
+
+ul.list{
+ margin-bottom: 10px;
+ padding-left: 25px;
+
+ li{
+ margin-bottom: 10px;
+
+ &::marker{
+ color: #666;
+ }
+ }
}
\ No newline at end of file