diff --git a/lib/redux/ui/ui_state.dart b/lib/redux/ui/ui_state.dart index 7a4747d0e..e76f6a5a8 100644 --- a/lib/redux/ui/ui_state.dart +++ b/lib/redux/ui/ui_state.dart @@ -198,6 +198,15 @@ abstract class UIState implements Built { return parts.length > 1 ? parts[1] : ''; } + String get baseRoute { + String route = currentRoute; + route = route.replaceAll('/edit', ''); + route = route.replaceAll('/view', ''); + route = route.replaceAll('/pdf', ''); + route = route.replaceAll('/email', ''); + return route; + } + String get baseSubRoute { String route = subRoute; route = route.replaceAll('/edit', ''); diff --git a/lib/ui/app/menu_drawer_vm.dart b/lib/ui/app/menu_drawer_vm.dart index bb7f84449..323e4a245 100644 --- a/lib/ui/app/menu_drawer_vm.dart +++ b/lib/ui/app/menu_drawer_vm.dart @@ -112,9 +112,7 @@ class MenuDrawerVM { } if (uiState.isEditing || uiState.isViewing) { - store.dispatch(UpdateCurrentRoute(uiState.currentRoute - .replaceFirst('/edit', '') - .replaceFirst('/view', ''))); + store.dispatch(UpdateCurrentRoute(uiState.baseRoute)); } }); },