Keep merged items selected

recipes/src/components/Toast/index.tsx

@@ -11,7 +11,7 @@ const Toast: React.FunctionComponent<any> = (props) => (
     bodyClassName='cbk-toast-body'
     position='top-right'
     transition={Slide}
-    autoClose={false}
+    autoClose={3000}
     hideProgressBar
     newestOnTop
     closeOnClick

recipes/src/containers/ShoppingCart/View/index.tsx

@@ -96,21 +96,21 @@ class ShoppingCartView extends React.Component<ShoppingCartViewProps, ShoppingCa
     const { selected, selectedMeasure } = this.state;
     if (selectedMeasure && selected.every(item => selectedMeasure.values.includes(item.unit))) {
       try {
-        this.props.mergeItemsCart(this.state.selected, combineMultipleItems(this.state.selected));
-        this.clearSelection();
+        const result = this.props.mergeItemsCart(this.state.selected, combineMultipleItems(this.state.selected));
+        this.clearSelection(() => this.selectItem(result.payload.newItem));
       } catch(error) {
         toast.error("There was an error merging items:", error);
       }
     } else {
-      toast.error("There was an error merging items: one or more items have different measure types");
+      toast.error("Can't merge those items, check measurements and units");
     }
   }
 
-  clearSelection = () => {
+  clearSelection = (callback?: () => void) => {
     this.setState({
       selected: [],
-      selectedMeasure: undefined,
-    })
+      selectedMeasure: undefined
+    }, callback)
   }
 
   removeItems = () => {