Index: src/stock-adjustment-mobile/program-select.jsx =================================================================== diff -u -N -r67ce4ab9a7cc026538468a91edbcccde91a35c71 -r14d88fc7e9bf0d7ea8a0020a2777c017abb3b427 --- src/stock-adjustment-mobile/program-select.jsx (.../program-select.jsx) (revision 67ce4ab9a7cc026538468a91edbcccde91a35c71) +++ src/stock-adjustment-mobile/program-select.jsx (.../program-select.jsx) (revision 14d88fc7e9bf0d7ea8a0020a2777c017abb3b427) @@ -18,6 +18,7 @@ import { useDispatch, useSelector } from "react-redux"; import ReadOnlyTable from './components/read-only-table.component'; import Toast from './components/toast.component'; +import { ADJUSTMENT, ISSUE, CREDIT, DEBIT } from './consts'; const ProgramSelect = ({ offlineService, stockReasonsFactory, @@ -34,13 +35,10 @@ const programs = facility.supportedPrograms.map(({ id, name }) => ({ value: id, name })); const menu = document.getElementsByClassName("header ng-scope")[0]; - + useEffect(() => menu.style.display = "", [menu]); - const ADJUSTMENT = "Adjustment"; - const ISSUE = "Issue"; - const CREDIT = "CREDIT"; - const DEBIT = "DEBIT"; + let toastList = useSelector(state => state[`toasts${adjustmentType}`][`toasts${adjustmentType}`]); const afterSelectProgram = (programId, programName) => { const programObject = { programName: programName, programId: programId }; @@ -85,10 +83,22 @@ dispatch(resetAdjustment(adjustment)); } dispatch(setProgram(programObject)); + removeToast(); history.push(`/make${adjustmentType}AddProducts`); }); }; + const removeToast = () => { + let listToRemove = toastList; + if (listToRemove.length) { + listToRemove = deleteToast(listToRemove[0].id, listToRemove); + toastList = listToRemove; + dispatch(setToastList(toastList)); + } + } + + const deleteToast = (id, listToRemove) => listToRemove.filter(element => element.id !== id); + const columns = useMemo( () => [ {