From 0bbd31dcce7b4d11486efc96ff417c68cfa5fc21 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Sun, 13 Mar 2022 14:30:52 +0200 Subject: [PATCH] feat(branches & warehouses): fix Context menu. --- src/containers/Preferences/Branches/components.js | 14 ++++++++------ .../Preferences/Warehouses/WarehousesGridItems.js | 1 + .../Preferences/Warehouses/components.js | 15 +++++++++------ .../WarehouseTransfersLanding/components.js | 2 +- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/containers/Preferences/Branches/components.js b/src/containers/Preferences/Branches/components.js index defa408d6..142becf56 100644 --- a/src/containers/Preferences/Branches/components.js +++ b/src/containers/Preferences/Branches/components.js @@ -3,7 +3,7 @@ import intl from 'react-intl-universal'; import { Intent, Menu, MenuDivider, MenuItem } from '@blueprintjs/core'; import { safeCallback } from 'utils'; -import { Icon } from 'components'; +import { Icon, If } from 'components'; /** * Context menu of Branches. @@ -19,11 +19,13 @@ export function ActionsMenu({ text={intl.get('branches.action.edit_branch')} onClick={safeCallback(onEdit, original)} /> - } - text={intl.get('branches.action.mark_as_primary')} - onClick={safeCallback(onMarkPrimary, original)} - /> + + } + text={intl.get('branches.action.mark_as_primary')} + onClick={safeCallback(onMarkPrimary, original)} + /> + } diff --git a/src/containers/Preferences/Warehouses/WarehousesGridItems.js b/src/containers/Preferences/Warehouses/WarehousesGridItems.js index d6e9a1b6b..432281521 100644 --- a/src/containers/Preferences/Warehouses/WarehousesGridItems.js +++ b/src/containers/Preferences/Warehouses/WarehousesGridItems.js @@ -48,6 +48,7 @@ function WarehouseGridItem({ @@ -30,11 +31,13 @@ export function WarehouseContextMenu({ text={intl.get('warehouses.action.edit_warehouse')} onClick={safeCallback(onEditClick)} /> - } - text={intl.get('warehouses.action.make_as_parimary')} - onClick={safeCallback(onMarkPrimary)} - /> + + } + text={intl.get('warehouses.action.make_as_parimary')} + onClick={safeCallback(onMarkPrimary)} + /> + } + icon={} text={intl.get('warehouse_transfer.action.initiate_transfer')} onClick={safeCallback(onInitate, original)} />