15768: cleanup Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox@curii.com>

diff --git a/src/components/multiselectToolbar/MultiselectToolbar.tsx b/src/components/multiselectToolbar/MultiselectToolbar.tsx
index 085174dd142cf6193ddfcea41a1575af5d107764..22a9c7139c7abffde2d051c5140c4485573f1db1 100644 (file)
--- a/src/components/multiselectToolbar/MultiselectToolbar.tsx
+++ b/src/components/multiselectToolbar/MultiselectToolbar.tsx
@@ -68,7 +68,7 @@ export const MultiselectToolbar = connect(
                         btn.name === "ToggleTrashAction" ? (
                             <Tooltip
                                 className={classes.button}
-                                title={currentPathIsTrash ? "Restore All" : "Move to trash"}
+                                title={currentPathIsTrash ? "Restore selected" : "Move to trash"}
                                 key={i}
                                 disableFocusListener>
                                 <IconButton onClick={() => props.executeMulti(btn, checkedList, props.resources)}>
@@ -190,10 +190,7 @@ function mapDispatchToProps(dispatch: Dispatch) {
             switch (selectedAction.name) {
                 case contextMenuActionConsts.MOVE_TO:
                     const firstResource = getResource(selectedToArray(checkedList)[0])(resources) as Resource;
-
-                    const actionSet = kindToActionSet[firstResource.kind];
-                    const action = findActionByName(selectedAction.name as string, actionSet);
-
+                    const action = findActionByName(selectedAction.name as string, kindToActionSet[firstResource.kind]);
                     if (action) action.execute(dispatch, kindGroups[firstResource.kind]);
                     break;
                 case contextMenuActionConsts.COPY_TO_CLIPBOARD:
@@ -202,9 +199,7 @@ function mapDispatchToProps(dispatch: Dispatch) {
                     break;
                 default:
                     for (const kind in kindGroups) {
-                        const actionSet = kindToActionSet[kind];
-                        const action = findActionByName(selectedAction.name as string, actionSet);
-
+                        const action = findActionByName(selectedAction.name as string, kindToActionSet[kind]);
                         if (action) action.execute(dispatch, kindGroups[kind]);
                     }
                     break;