diff --git a/.eslintrc.js b/.eslintrc.js
index a145425e1..d404313ec 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -23,6 +23,7 @@ module.exports = {
     ],
     'rules': {
         '@typescript-eslint/no-explicit-any': 0,
+        '@typescript-eslint/ban-ts-comment': 0,
         'indent': [
             'error',
             4
@@ -62,7 +63,7 @@ module.exports = {
     },
     'settings': {
         'react': {
-            'version': '16.2'
+            'version': '17.0'
         }
     }
 };
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 373881ab6..912c2314c 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -21,6 +21,9 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: '3.10'
+      - run: |
+             sudo apt-get update
+             sudo apt-get install pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl
       - run: pip install -Ur mypy-requirements.txt
       - run: mypy .
 
diff --git a/assets/agenda/actions.ts b/assets/agenda/actions.ts
index 441269d99..0840f23ca 100644
--- a/assets/agenda/actions.ts
+++ b/assets/agenda/actions.ts
@@ -1,6 +1,13 @@
 import {get, isEmpty, includes, cloneDeep} from 'lodash';
 import moment from 'moment';
 
+import {
+    IRestApiResponse,
+    IAgendaItem,
+    IAgendaListGroup,
+    IAgendaState,
+    AgendaThunkAction, ISearchState,
+} from 'interfaces';
 import server from 'server';
 import analytics from 'analytics';
 import {
@@ -19,6 +26,7 @@ import {renderModal, setSavedItemsCount} from 'actions';
 import {
     getDateInputDate,
     getMomentDate,
+    groupItems,
 } from './utils';
 
 import {
@@ -140,10 +148,25 @@ export function queryItems() {
 }
 
 export const RECIEVE_ITEMS = 'RECIEVE_ITEMS';
-export function recieveItems(data: any) {
+export function recieveItems(data: IRestApiResponse<IAgendaItem>) {
     return {type: RECIEVE_ITEMS, data};
 }
 
+export const SET_LIST_GROUPS_AND_ITEMS = 'SET_LIST_GROUPS_AND_ITEMS';
+function setListGroupsAndItems(groupItems: Array<IAgendaListGroup>) {
+    return {type: SET_LIST_GROUPS_AND_ITEMS, data: groupItems};
+}
+
+export const ADD_ITEMS_TO_LIST_GROUPS = 'ADD_ITEMS_TO_LIST_GROUPS';
+function addItemsToListGroups(groupItems: Array<IAgendaListGroup>) {
+    return {type: ADD_ITEMS_TO_LIST_GROUPS, data: groupItems};
+}
+
+export const TOGGLE_HIDDEN_GROUP_ITEMS = 'TOGGLE_HIDDEN_GROUP_ITEMS';
+export function toggleHiddenGroupItems(dateString: string) {
+    return {type: TOGGLE_HIDDEN_GROUP_ITEMS, data: dateString};
+}
+
 export const RECIEVE_ITEM = 'RECIEVE_ITEM';
 export function recieveItem(data: any) {
     return {type: RECIEVE_ITEM, data};
@@ -199,58 +222,26 @@ export function copyPreviewContents(item: any) {
     };
 }
 
-/**
- * Search server request
- *
- * @param {Object} state
- * @param {bool} next
- * @return {Promise}
- */
-function search(state: any, next?: any) {
-    const currentMoment = moment();
-    const searchParams: any = searchParamsSelector(state);
-    const createdFilter: any = get(searchParams, 'created') || {};
-    const itemTypeFilter: any = get(state, 'agenda.itemType');
-    const eventsOnlyFilter: any = !state.bookmarks && itemTypeFilter === 'events';
-
-    const featuredFilter = noNavigationSelected(searchParams.navigation) &&
-        !state.bookmarks &&
-        !eventsOnlyFilter &&
-        get(state, 'agenda.featuredOnly');
-
-    let fromDateFilter: any;
-
-    if (featuredFilter) {
-        fromDateFilter = getMomentDate(get(state, 'agenda.activeDate')).set({
-            hour: currentMoment.hour(),
-            minute: currentMoment.minute()
-        }).format('DD/MM/YYYY HH:mm'); // Server expects specific date/time format for FeaturedStories param
-    } else {
-        const agendaDate = getDateInputDate(get(state, 'agenda.activeDate'));
-        fromDateFilter = (
-            isEmpty(createdFilter.from) &&
-            isEmpty(createdFilter.to) &&
-            !(state.bookmarks && state.user)
-        ) ? agendaDate : createdFilter.from;
-    }
-
-    let dateTo = createdFilter.to;
-    if (createdFilter.from && createdFilter.from.indexOf('now') >= 0) {
-        dateTo = createdFilter.from;
-    }
+function search(state: IAgendaState, fetchFrom: number): Promise<IRestApiResponse<IAgendaItem>> {
+    const {
+        itemType,
+        searchParams,
+        featured,
+        fromDate,
+        toDate,
+    } = getAgendaSearchParamsFromState(state);
 
     const params: any = {
         q: searchParams.query,
-        id: state.queryId,
         bookmarks: state.bookmarks && state.user,
         navigation: getNavigationUrlParam(searchParams.navigation, true, false),
         filter: !isEmpty(searchParams.filter) && encodeURIComponent(JSON.stringify(searchParams.filter)),
-        from: next ? state.items.length : 0,
-        date_from: fromDateFilter,
-        date_to: dateTo,
+        from: fetchFrom,
+        date_from: fromDate,
+        date_to: toDate,
         timezone_offset: getTimezoneOffset(),
-        featured: featuredFilter,
-        itemType: itemTypeFilter,
+        featured: featured,
+        itemType: itemType,
         advanced: !searchParams.advanced ? null : encodeURIComponent(JSON.stringify(searchParams.advanced)),
         es_highlight: !searchParams.query && !searchParams.advanced ? null : 1,
     };
@@ -266,12 +257,15 @@ function search(state: any, next?: any) {
 /**
  * Fetch items for current query
  */
-export function fetchItems(): any {
-    return (dispatch: any, getState: any) => {
+export function fetchItems(): AgendaThunkAction {
+    return (dispatch, getState) => {
         const start = Date.now();
         dispatch(queryItems());
-        return search(getState())
-            .then((data: any) => dispatch(recieveItems(data)))
+        return search(getState(), 0)
+            .then((data) => {
+                dispatch(recieveItems(data));
+                return dispatch(setListGroupsAndLoadHiddenItems(data._items, false));
+            })
             .then(() => {
                 analytics.timingComplete('search', Date.now() - start);
             })
@@ -279,6 +273,94 @@ export function fetchItems(): any {
     };
 }
 
+interface AgendaSearchParams {
+    itemType: IAgendaState['agenda']['itemType'];
+    searchParams: any;
+    featured: boolean;
+    fromDate?: string;
+    toDate?: string;
+}
+
+function getAgendaSearchParamsFromState(state: IAgendaState): AgendaSearchParams {
+    const itemTypeFilter = state.agenda.itemType;
+    const eventsOnlyFilter = !state.bookmarks && itemTypeFilter === 'events';
+    const searchParams: any = searchParamsSelector(state);
+    const createdFilter: ISearchState['createdFilter'] = searchParams.created || {};
+    const currentMoment = moment();
+    const featuredFilter = noNavigationSelected(searchParams.navigation) &&
+        !state.bookmarks &&
+        !eventsOnlyFilter &&
+        state.agenda.featuredOnly === true;
+    let fromDate: string | undefined;
+
+    if (featuredFilter) {
+        fromDate = getMomentDate(state.agenda.activeDate).set({
+            hour: currentMoment.hour(),
+            minute: currentMoment.minute()
+        }).format('DD/MM/YYYY HH:mm'); // Server expects specific date/time format for FeaturedStories param
+    } else {
+        const agendaDate = getDateInputDate(state.agenda.activeDate);
+
+        fromDate = (
+            createdFilter.from == null &&
+            createdFilter.to == null &&
+            state.bookmarks !== true
+        ) ? agendaDate : createdFilter.from;
+    }
+
+    return {
+        itemType: itemTypeFilter,
+        searchParams: searchParams,
+        featured: featuredFilter,
+        fromDate: fromDate,
+        toDate: createdFilter.from?.startsWith('now/') ?
+            createdFilter.from :
+            createdFilter.to,
+    };
+}
+
+function setListGroupsAndLoadHiddenItems(items: Array<IAgendaItem>, next?: boolean): AgendaThunkAction {
+    return (dispatch, getState) => {
+        // If there are groups shown, then load the hidden items for those groups
+        const state = getState();
+        const {activeGrouping, featuredOnly} = state.agenda;
+        const {fromDate, toDate} = getAgendaSearchParamsFromState(state);
+        let minDate: moment.Moment;
+        let maxDate: moment.Moment | undefined;
+
+        if (toDate != null && fromDate?.startsWith('now/') != true) {
+            maxDate = moment(toDate);
+        }
+        if (fromDate?.startsWith('now/')) {
+            if (fromDate === 'now/w') {
+                minDate = moment().startOf('week');
+                maxDate = minDate.clone().add(1, 'week').subtract(1, 'day');
+            } else if (fromDate === 'now/M') {
+                minDate = moment().startOf('month');
+                maxDate = minDate.clone().add(1, 'month').subtract(1, 'day');
+            } else {
+                minDate = moment().startOf('day');
+                maxDate = minDate.clone();
+            }
+        } else {
+            minDate = moment(fromDate);
+        }
+        minDate.set({'h': 0, 'm': 0, 's': 0});
+
+        if (maxDate != null) {
+            maxDate.set({'h': 23, 'm': 59, 's': 59});
+        }
+
+        const groups = groupItems(items, minDate, maxDate, activeGrouping, featuredOnly);
+
+        next === true ?
+            dispatch(addItemsToListGroups(groups)) :
+            dispatch(setListGroupsAndItems(groups));
+
+        return;
+    };
+}
+
 export function fetchItem(id: any) {
     return (dispatch: any) => {
         return server.get(`/agenda/${id}?format=json`)
@@ -567,13 +649,13 @@ export function startLoading() {
 }
 
 export const RECIEVE_NEXT_ITEMS = 'RECIEVE_NEXT_ITEMS';
-export function recieveNextItems(data: any) {
-    return {type: RECIEVE_NEXT_ITEMS, data};
+export function recieveNextItems(data: IRestApiResponse<IAgendaItem>, setFetchFrom: boolean) {
+    return {type: RECIEVE_NEXT_ITEMS, data: {...data, setFetchFrom: setFetchFrom}};
 }
 
 const MAX_ITEMS = 1000; // server limit
-export function fetchMoreItems() {
-    return (dispatch: any, getState: any) => {
+export function fetchMoreItems(): AgendaThunkAction {
+    return (dispatch, getState) => {
         const state = getState();
         const limit = Math.min(MAX_ITEMS, state.totalItems);
 
@@ -582,8 +664,11 @@ export function fetchMoreItems() {
         }
 
         dispatch(startLoading());
-        return search(getState(), true)
-            .then((data: any) => dispatch(recieveNextItems(data)))
+        return search(getState(), state.fetchFrom)
+            .then((data) => {
+                dispatch(recieveNextItems(data, true));
+                return dispatch(setListGroupsAndLoadHiddenItems(data._items, true));
+            })
             .catch(errorHandler);
     };
 }
@@ -691,4 +776,4 @@ export function stopWatchingCoverage(coverage: any, item: any) {
                 }
             }, (error: any) => { errorHandler(error, dispatch);});
     };
-}
\ No newline at end of file
+}
diff --git a/assets/agenda/components/AgendaApp.tsx b/assets/agenda/components/AgendaApp.tsx
index 67e1fae84..682827a86 100644
--- a/assets/agenda/components/AgendaApp.tsx
+++ b/assets/agenda/components/AgendaApp.tsx
@@ -170,7 +170,7 @@ class AgendaApp extends BaseApp {
                     <SelectedItemsBar
                         actions={this.props.actions}
                     />
-                    <nav className="content-bar navbar justify-content-start flex-nowrap flex-sm-wrap">
+                    <nav className="content-bar navbar justify-content-start flex-nowrap">
                         {this.state.withSidebar && (
                             <button
                                 className="content-bar__menu content-bar__menu--nav--open"
diff --git a/assets/agenda/components/AgendaDateNavigation.tsx b/assets/agenda/components/AgendaDateNavigation.tsx
index 3796a1723..444f23aaf 100644
--- a/assets/agenda/components/AgendaDateNavigation.tsx
+++ b/assets/agenda/components/AgendaDateNavigation.tsx
@@ -5,7 +5,7 @@ import CalendarButton from '../../components/CalendarButton';
 
 
 function AgendaDateNavigation({selectDate, activeDate, activeGrouping, displayCalendar}: any) {
-    return (<div className='d-none d-lg-flex align-items-center me-3'>
+    return (<div className='d-none d-sm-flex align-items-center me-3'>
         {displayCalendar && <CalendarButton selectDate={selectDate} activeDate={activeDate} />}
 
         {!displayCalendar && <AgendaDateButtons
diff --git a/assets/agenda/components/AgendaList.tsx b/assets/agenda/components/AgendaList.tsx
index 91e2859de..66cf89f31 100644
--- a/assets/agenda/components/AgendaList.tsx
+++ b/assets/agenda/components/AgendaList.tsx
@@ -1,17 +1,31 @@
-import React, {Fragment} from 'react';
-import PropTypes from 'prop-types';
+import React from 'react';
 import {connect} from 'react-redux';
 import {createSelector} from 'reselect';
-import {get, isEqual, cloneDeep} from 'lodash';
+import {isEqual, cloneDeep} from 'lodash';
 import classNames from 'classnames';
 import moment from 'moment';
 
+import {
+    IAgendaItem,
+    IAgendaListGroup,
+    IAgendaListGroupItem,
+    ICompany,
+    IItemAction,
+    IListConfig,
+    IPreviewConfig,
+    IUser,
+    IUserType,
+    IAgendaState,
+} from 'interfaces';
 import {gettext, DATE_FORMAT, isDisplayed, shouldShowListShortcutActionIcons} from 'utils';
+
 import AgendaListItem from './AgendaListItem';
-import {setActive, previewItem, toggleSelected, openItem} from '../actions';
+import {AgendaListGroupHeader} from './AgendaListGroupHeader';
+
+import {setActive, previewItem, toggleSelected, openItem, toggleHiddenGroupItems} from '../actions';
 import {EXTENDED_VIEW} from 'wire/defaults';
 import {getIntVersion} from 'wire/utils';
-import {groupItems, getPlanningItemsByGroup, getListItems} from 'agenda/utils';
+import {getPlanningItemsByGroup, getListItems} from 'agenda/utils';
 import {searchNavigationSelector} from 'search/selectors';
 import {previewConfigSelector, listConfigSelector} from 'ui/selectors';
 import {AGENDA_DATE_FORMAT_LONG, AGENDA_DATE_FORMAT_SHORT} from '../../utils';
@@ -19,47 +33,90 @@ import {AGENDA_DATE_FORMAT_LONG, AGENDA_DATE_FORMAT_SHORT} from '../../utils';
 
 const PREVIEW_TIMEOUT = 500; // time to preview an item after selecting using kb
 const CLICK_TIMEOUT = 200; // time when we wait for double click after click
-const EMPTY_ARRAY: Array<any> = [];
 const EMPTY_OBJECT = {};
 
-const itemIdsSelector = (state: any) => state.items || EMPTY_ARRAY;
-const itemsByIdSelector = (state: any) => state.itemsById || EMPTY_OBJECT;
-
-
-const itemsSelector = createSelector(
-    [itemIdsSelector, itemsByIdSelector],
-    (ids, items) => ids.map((itemId: any) => items[itemId])
-);
+const itemsByIdSelector = (state: IAgendaState) => state.itemsById || EMPTY_OBJECT;
+const groupedItemsSelector = (state: IAgendaState) => state.listItems.groups;
 
-const activeDateSelector = (state: any) => get(state, 'agenda.activeDate');
-const activeGroupingSelector = (state: any) => get(state, 'agenda.activeGrouping');
-const featuredOnlySelector = (state: any) => get(state, 'agenda.featuredOnly', false);
-
-const groupedItemsSelector = createSelector(
-    [itemsSelector, activeDateSelector, activeGroupingSelector, featuredOnlySelector],
-    groupItems);
+const hiddenGroupsShownSelector = (state: IAgendaState) => state.listItems.hiddenGroupsShown;
 
 /**
  * Single event or planning item could be display multiple times.
  * Hence, the list items needs to tbe calculate so that keyboard scroll works.
  * This selector calculates list of items.
  */
-const listItemsSelector = createSelector(
-    [groupedItemsSelector, itemsByIdSelector],
+const listItemsSelector = createSelector<
+    IAgendaState,
+    Array<IAgendaListGroup>,
+    IAgendaState['itemsById'],
+    {[dateString: string]: boolean},
+    Array<IAgendaListGroupItem>
+>(
+    [groupedItemsSelector, itemsByIdSelector, hiddenGroupsShownSelector],
     getListItems
 );
 
+interface IStateProps {
+    itemsById: {[itemId: string]: IAgendaItem};
+    activeItem?: {_id: IAgendaItem['_id'], group: string, plan?: IAgendaItem['_id']};
+    previewItemId?: IAgendaItem['_id'];
+    previewGroup?: string;
+    previewPlan?: IAgendaItem['_id'];
+    selectedItems: Array<IAgendaItem['_id']>;
+    readItems: {[itemId: string]: number};
+    bookmarks: boolean;
+    user: IUser['_id'];
+    company?: ICompany['_id'];
+    groupedItems: Array<IAgendaListGroup>;
+    activeDate: number;
+    searchInitiated: boolean;
+    activeNavigation: Array<string>;
+    resultsFiltered: boolean;
+    listItems: Array<IAgendaListGroupItem>;
+    isLoading: boolean;
+    previewConfig: IPreviewConfig;
+    featuredOnly: boolean;
+    listConfig: IListConfig;
+    userType: IUserType;
+    hiddenGroupsShown: {[dateString: string]: boolean};
+}
 
-class AgendaList extends React.Component<any, any> {
-    static propTypes: any;
-    previewTimeout: any;
-    clickTimeout: any;
-    elem: any;
+interface IDispatchProps {
+    setActive(item?: IAgendaListGroupItem): void;
+    previewItem(item?: IAgendaItem, group?: string, planId?: IAgendaItem['_id']): void;
+    openItem(item: IAgendaItem, group: string, plan?: IAgendaItem['_id']): void;
+    toggleSelected(itemId: IAgendaItem['_id']): void;
+    toggleHiddenGroupItems(dateString: string): void;
+}
 
-    constructor(props: any) {
+interface IOwnProps {
+    actions: Array<IItemAction>;
+    activeView: string;
+    onScroll(event: React.MouseEvent<HTMLDivElement>): void;
+    refNode(element: HTMLDivElement): void;
+}
+
+type IProps = IStateProps & IDispatchProps & IOwnProps;
+
+interface IState {
+    actioningItem?: IAgendaItem;
+    activePlan?: IAgendaItem;
+    activeGroup?: string;
+}
+
+class AgendaList extends React.Component<IProps, IState> {
+    previewTimeout?: number;
+    clickTimeout?: number;
+    elem?: HTMLDivElement;
+
+    constructor(props: IProps) {
         super(props);
 
-        this.state = {actioningItem: null};
+        this.state = {
+            actioningItem: undefined,
+            activePlan: undefined,
+            activeGroup: undefined,
+        };
 
         this.onKeyDown = this.onKeyDown.bind(this);
         this.onItemClick = this.onItemClick.bind(this);
@@ -70,23 +127,23 @@ class AgendaList extends React.Component<any, any> {
         this.isActiveItem = this.isActiveItem.bind(this);
     }
 
-    onKeyDown(event: any) {
+    onKeyDown(event: React.KeyboardEvent) {
         let diff = 0;
         switch (event.key) {
         case 'ArrowDown':
-            this.setState({actioningItem: null});
+            this.setState({actioningItem: undefined});
             diff = 1;
             break;
 
         case 'ArrowUp':
-            this.setState({actioningItem: null});
+            this.setState({actioningItem: undefined});
             diff = -1;
             break;
 
         case 'Escape':
-            this.setState({actioningItem: null});
-            this.props.dispatch(setActive(null));
-            this.props.dispatch(previewItem(null));
+            this.setState({actioningItem: undefined});
+            this.props.setActive();
+            this.props.previewItem();
             return;
 
         default:
@@ -96,26 +153,32 @@ class AgendaList extends React.Component<any, any> {
         event.preventDefault();
         const activeItem = this.props.activeItem;
 
-        const activeIndex = this.props.activeItem ? this.props.listItems.findIndex((item: any) => {
-            return item._id === activeItem._id &&
+        const activeIndex = activeItem == null ?
+            -1 :
+            this.props.listItems.findIndex((item) => (
+                item._id === activeItem._id &&
                 item.group === activeItem.group &&
-                get(item, 'plan._id') === get(activeItem, 'plan._id');
-        }) : -1;
+                item.plan === activeItem.plan
+            ));
 
-        // keep it within <0, items.length) interval
+        // keep it within (0, items.length) interval
         const nextIndex = Math.max(0, Math.min(activeIndex + diff, this.props.listItems.length - 1));
         const nextItemInList = this.props.listItems[nextIndex];
         const nextItem = this.props.itemsById[nextItemInList._id];
 
-        this.props.dispatch(setActive(nextItemInList));
+        this.props.setActive({
+            _id: nextItemInList._id,
+            group: nextItemInList.group,
+            plan: nextItemInList.plan,
+        });
 
-        if (this.previewTimeout) {
+        if (this.previewTimeout != null) {
             clearTimeout(this.previewTimeout);
         }
 
-        this.previewTimeout = setTimeout(() => this.props.dispatch(
-            previewItem(nextItem, nextItemInList.group, get(nextItemInList, 'plan.guid'))
-        ), PREVIEW_TIMEOUT);
+        this.previewTimeout = window.setTimeout(() => {
+            this.props.previewItem(nextItem, nextItemInList.group, nextItemInList.plan);
+        }, PREVIEW_TIMEOUT);
 
         const activeElements = document.getElementsByClassName('wire-articles__item--open');
 
@@ -127,70 +190,74 @@ class AgendaList extends React.Component<any, any> {
     cancelPreviewTimeout() {
         if (this.previewTimeout) {
             clearTimeout(this.previewTimeout);
-            this.previewTimeout = null;
+            this.previewTimeout = undefined;
         }
     }
 
     cancelClickTimeout() {
-        if (this.clickTimeout) {
+        if (this.clickTimeout != null) {
             clearTimeout(this.clickTimeout);
-            this.clickTimeout = null;
+            this.clickTimeout = undefined;
         }
     }
 
-    onItemClick(item: any, group: any, plan: any) {
+    onItemClick(item: IAgendaItem, group: string, plan?: IAgendaItem['_id']) {
         const itemId = item._id;
-        this.setState({actioningItem: null});
+        this.setState({actioningItem: undefined});
         this.cancelPreviewTimeout();
         this.cancelClickTimeout();
 
-        this.clickTimeout = setTimeout(() => {
-            this.props.dispatch(setActive({_id: itemId, group: group, plan: plan}));
+        this.clickTimeout = window.setTimeout(() => {
+            this.props.setActive({_id: itemId, group: group, plan: plan});
 
-            if (this.props.previewItem !== itemId ||
+            if (this.props.previewItemId !== itemId ||
                 this.props.previewGroup !== group ||
                 this.props.previewPlan !== plan) {
-                this.props.dispatch(previewItem(item, group, plan));
+                this.props.previewItem(item, group, plan);
             } else {
-                this.props.dispatch(previewItem(null, null, null));
+                this.props.previewItem();
             }
         }, CLICK_TIMEOUT);
     }
 
     resetActioningItem() {
-        this.setState({actioningItem: null});
+        this.setState({actioningItem: undefined});
     }
 
-    onItemDoubleClick(item: any, group: any, plan: any) {
+    onItemDoubleClick(item: IAgendaItem, group: string, plan?: IAgendaItem['_id']) {
         this.cancelClickTimeout();
-        this.props.dispatch(setActive({_id: item._id, group: group, plan: plan}));
-        this.props.dispatch(openItem(item, group, plan));
+        this.props.setActive({_id: item._id, group: group, plan: plan});
+        this.props.openItem(item, group, plan);
     }
 
-    onActionList(event: any, item: any, group: any, plan: any) {
+    onActionList(event: React.MouseEvent, item: IAgendaItem, group: string, plan?: IAgendaItem) {
         event.stopPropagation();
         if (this.state.actioningItem && this.state.actioningItem._id === item._id &&
-            (!this.state.activePlan || (this.state.activePlan && this.state.activePlan.guid === get(plan, 'guid')))) {
-            this.setState({actioningItem: null, activeGroup: null, activePlan: null});
+            (!this.state.activePlan || (this.state.activePlan && this.state.activePlan.guid === plan?.guid))) {
+            this.setState({actioningItem: undefined, activeGroup: undefined, activePlan: undefined});
         } else {
             this.setState({actioningItem: item, activeGroup: group, activePlan: plan});
         }
     }
 
-    filterActions(item: any, config: any) {
-        return this.props.actions.filter((action: any) =>  (!config || isDisplayed(action.id, config)) &&
+    filterActions(item: IAgendaItem, config: IPreviewConfig) {
+        return this.props.actions.filter((action) =>  (!config || isDisplayed(action.id, config)) &&
           (!action.when || action.when(this.props, item)));
     }
 
-    isActiveItem(_id: any, group: any, plan: any) {
+    isActiveItem(_id: IAgendaItem['_id'], group: string, plan?: IAgendaItem) {
         const {activeItem} = this.props;
 
-        if (!activeItem || (!_id && !group && !plan)) {
+        if (activeItem == null || (!_id && !group && !plan)) {
             return false;
         }
 
         if (_id && group && plan) {
-            return _id === activeItem._id && group === activeItem.group && plan.guid === get(activeItem, 'plan.guid');
+            return (
+                _id === activeItem._id &&
+                group === activeItem.group &&
+                plan.guid === activeItem.plan
+            );
         }
 
         if (_id && group) {
@@ -200,16 +267,18 @@ class AgendaList extends React.Component<any, any> {
         return _id === activeItem._id;
     }
 
-    componentDidUpdate(nextProps: any) {
-        if (!isEqual(nextProps.activeDate, this.props.activeDate) ||
-          !isEqual(nextProps.activeNavigation, this.props.activeNavigation) ||
-          (!nextProps.searchInitiated && this.props.searchInitiated)) {
+    componentDidUpdate(prevProps: Readonly<IProps>) {
+        if (this.elem != null && (
+            prevProps.activeDate !== this.props.activeDate ||
+            !isEqual(prevProps.activeNavigation, this.props.activeNavigation) ||
+            (!prevProps.searchInitiated && this.props.searchInitiated)
+        )) {
             this.elem.scrollTop = 0;
         }
     }
 
-    getListGroupDate(group: any) {
-        if (get(group, 'date')) {
+    getListGroupDate(group: IAgendaListGroup) {
+        if (group.date != null) {
             const groupDate = moment(group.date, DATE_FORMAT);
             const today = moment();
             const tomorrow  = moment(today).add(1,'days');
@@ -225,107 +294,118 @@ class AgendaList extends React.Component<any, any> {
         }
     }
 
-    render() {
-        const {
-            groupedItems,
-            itemsById,
-            activeView,
-            selectedItems,
-            readItems,
-            refNode,
-            onScroll,
-            listConfig
-        } = this.props;
-
-        const isExtended = activeView === EXTENDED_VIEW;
+    renderGroupItems(group: IAgendaListGroup, forHiddenItems: boolean) {
+        const itemIds = forHiddenItems === true ? group.hiddenItems : group.items;
+        const isExtended = this.props.activeView === EXTENDED_VIEW;
         const showShortcutActionIcons = shouldShowListShortcutActionIcons(this.props.listConfig, isExtended);
-        const articleGroups = groupedItems.map((group: any) =>
-            [
-                <div className='wire-articles__header' key={`${group.date}header`}>
-                    {this.getListGroupDate(group)}
-                </div>,
-
-                <div className = 'wire-articles__group' key={`${group.date}group`}>
-                    {group.items.map((_id: any, groupIndex: any) => {
-
-                        const plans = getPlanningItemsByGroup(itemsById[_id], group.date);
-
-                        if (plans.length > 0) {
-                            return (<Fragment key={`${_id}--${groupIndex}`}>
-                                {
-                                    plans.map((plan: any) =>
-                                        <AgendaListItem
-                                            key={`${_id}--${plan._id}`}
-                                            group={group.date}
-                                            item={cloneDeep(itemsById[_id])}
-                                            isActive={this.isActiveItem(_id, group.date, plan)}
-                                            isSelected={selectedItems.indexOf(_id) !== -1}
-                                            isRead={readItems[_id] === getIntVersion(itemsById[_id])}
-                                            onClick={this.onItemClick}
-                                            onDoubleClick={this.onItemDoubleClick}
-                                            onActionList={this.onActionList}
-                                            showActions={!!this.state.actioningItem &&
-                                            this.state.actioningItem._id === _id &&
-                                            group.date === this.state.activeGroup &&
-                                            plan.guid === get(this.state.activePlan, 'guid')}
-                                            toggleSelected={() => this.props.dispatch(toggleSelected(_id))}
-                                            actions={this.filterActions(itemsById[_id], this.props.previewConfig)}
-                                            isExtended={isExtended}
-                                            user={this.props.user}
-                                            actioningItem={this.state.actioningItem}
-                                            planningId={plan.guid}
-                                            resetActioningItem={this.resetActioningItem}
-                                            showShortcutActionIcons={showShortcutActionIcons}
-                                            listConfig={listConfig}
-                                        />
-                                    )
-                                }
-                            </Fragment>);
-                        } else {
-                            return (<AgendaListItem
-                                key={_id}
-                                group={group.date}
-                                item={itemsById[_id]}
-                                isActive={this.isActiveItem(_id, group.date, null)}
-                                isSelected={selectedItems.indexOf(_id) !== -1}
-                                isRead={readItems[_id] === getIntVersion(itemsById[_id])}
-                                onClick={this.onItemClick}
-                                onDoubleClick={this.onItemDoubleClick}
-                                onActionList={this.onActionList}
-                                showActions={!!this.state.actioningItem &&
-                                this.state.actioningItem._id === _id && group.date === this.state.activeGroup}
-                                toggleSelected={() => this.props.dispatch(toggleSelected(_id))}
-                                actions={this.filterActions(itemsById[_id], this.props.previewConfig)}
-                                isExtended={isExtended}
-                                user={this.props.user}
-                                actioningItem={this.state.actioningItem}
-                                resetActioningItem={this.resetActioningItem}
-                                showShortcutActionIcons={showShortcutActionIcons}
-                                listConfig={listConfig}
-                            />);
-                        }
-                    })}
-                </div>
-            ]
-        );
-
 
-        const listClassName = classNames('wire-articles wire-articles--list', {
-            'wire-articles--list-compact': !isExtended,
-        });
+        return (
+            <div
+                className="wire-articles__group"
+                key={`${group.date}-${forHiddenItems ? 'hidden-items' : 'items'}-group`}
+            >
+                {itemIds.map((itemId) => {
+                    const plans = getPlanningItemsByGroup(this.props.itemsById[itemId], group.date);
+
+                    return plans.length > 0 ? (
+                        <React.Fragment key={`${itemId}--${group.date}`}>
+                            {plans.map((plan) => (
+                                <AgendaListItem
+                                    key={`${itemId}--${plan._id}`}
+                                    group={group.date}
+                                    item={cloneDeep(this.props.itemsById[itemId])}
+                                    isActive={this.isActiveItem(itemId, group.date, plan)}
+                                    isSelected={this.props.selectedItems.includes(itemId)}
+                                    isRead={this.props.readItems[itemId] === getIntVersion(this.props.itemsById[itemId])}
+                                    onClick={this.onItemClick}
+                                    onDoubleClick={this.onItemDoubleClick}
+                                    onActionList={this.onActionList}
+                                    showActions={this.state.actioningItem != null &&
+                                        this.state.actioningItem._id === itemId &&
+                                        group.date === this.state.activeGroup &&
+                                        plan.guid === this.state.activePlan?.guid
+                                    }
+                                    toggleSelected={() => this.props.toggleSelected(itemId)}
+                                    actions={this.filterActions(this.props.itemsById[itemId], this.props.previewConfig)}
+                                    isExtended={isExtended}
+                                    user={this.props.user}
+                                    actioningItem={this.state.actioningItem}
+                                    planningId={plan.guid}
+                                    resetActioningItem={this.resetActioningItem}
+                                    showShortcutActionIcons={showShortcutActionIcons}
+                                    listConfig={this.props.listConfig}
+                                />
+                            ))}
+                        </React.Fragment>
+                    ) : (
+                        <AgendaListItem
+                            key={itemId}
+                            group={group.date}
+                            item={this.props.itemsById[itemId]}
+                            isActive={this.isActiveItem(itemId, group.date, undefined)}
+                            isSelected={this.props.selectedItems.includes(itemId)}
+                            isRead={this.props.readItems[itemId] === getIntVersion(this.props.itemsById[itemId])}
+                            onClick={this.onItemClick}
+                            onDoubleClick={this.onItemDoubleClick}
+                            onActionList={this.onActionList}
+                            showActions={this.state.actioningItem != null &&
+                                this.state.actioningItem._id === itemId &&
+                                group.date === this.state.activeGroup
+                            }
+                            toggleSelected={() => this.props.toggleSelected(itemId)}
+                            actions={this.filterActions(this.props.itemsById[itemId], this.props.previewConfig)}
+                            isExtended={isExtended}
+                            user={this.props.user}
+                            actioningItem={this.state.actioningItem}
+                            resetActioningItem={this.resetActioningItem}
+                            showShortcutActionIcons={showShortcutActionIcons}
+                            listConfig={this.props.listConfig}
+                        />
+                    );
+                })}
+            </div>
+        );
+    }
 
+    render() {
         return (
-            <div className={listClassName}
+            <div
+                className={classNames('wire-articles wire-articles--list', {
+                    'wire-articles--list-compact': this.props.activeView !== EXTENDED_VIEW,
+                })}
                 onKeyDown={this.onKeyDown}
-                ref={(elem: any) => {
-                    if (elem) {
-                        refNode(elem);
+                ref={(elem) => {
+                    if (elem != null) {
+                        this.props.refNode(elem);
                         this.elem = elem;
                     }
                 }}
-                onScroll={onScroll} >
-                {articleGroups}
-                {!groupedItems.length &&
+                onScroll={this.props.onScroll}
+            >
+                {this.props.groupedItems.map((group) => (
+                    <React.Fragment key={group.date}>
+                        <div className='wire-articles__header' key={`${group.date}header`}>
+                            {this.getListGroupDate(group)}
+                        </div>
+
+                        {group.hiddenItems.length === 0 ? null : (
+                            <AgendaListGroupHeader
+                                group={group.date}
+                                itemIds={group.hiddenItems}
+                                itemsById={this.props.itemsById}
+                                itemsShown={this.props.hiddenGroupsShown[group.date] === true}
+                                toggleHideItems={this.props.toggleHiddenGroupItems}
+                            />
+                        )}
+
+                        {this.props.hiddenGroupsShown[group.date] !== true ?
+                            null :
+                            this.renderGroupItems(group, true)
+                        }
+                        {this.renderGroupItems(group, false)}
+                    </React.Fragment>
+                ))}
+                {!this.props.groupedItems.length &&
                     <div className="wire-articles__item-wrap col-12">
                         <div className="alert alert-secondary">{gettext('No items found.')}</div>
                     </div>
@@ -335,42 +415,10 @@ class AgendaList extends React.Component<any, any> {
     }
 }
 
-AgendaList.propTypes = {
-    itemsById: PropTypes.object,
-    activeItem: PropTypes.object,
-    previewItem: PropTypes.string,
-    previewGroup: PropTypes.string,
-    previewPlan: PropTypes.string,
-    dispatch: PropTypes.func.isRequired,
-    selectedItems: PropTypes.array,
-    readItems: PropTypes.object,
-    actions: PropTypes.arrayOf(PropTypes.shape({
-        name: PropTypes.string,
-        action: PropTypes.func,
-    })),
-    bookmarks: PropTypes.bool,
-    user: PropTypes.string,
-    company: PropTypes.string,
-    activeView: PropTypes.string,
-    groupedItems: PropTypes.array,
-    activeDate: PropTypes.number,
-    searchInitiated: PropTypes.bool,
-    activeNavigation: PropTypes.arrayOf(PropTypes.string),
-    resultsFiltered: PropTypes.bool,
-    listItems: PropTypes.array,
-    isLoading: PropTypes.bool,
-    onScroll: PropTypes.func,
-    refNode: PropTypes.func,
-    previewConfig: PropTypes.object,
-    featuredOnly: PropTypes.bool,
-    listConfig: PropTypes.object,
-    userType: PropTypes.string
-};
-
-const mapStateToProps = (state: any) => ({
+const mapStateToProps = (state: IAgendaState): IStateProps => ({
     itemsById: state.itemsById,
     activeItem: state.activeItem,
-    previewItem: state.previewItem,
+    previewItemId: state.previewItem,
     previewGroup: state.previewGroup,
     previewPlan: state.previewPlan,
     selectedItems: state.selectedItems,
@@ -379,18 +427,32 @@ const mapStateToProps = (state: any) => ({
     user: state.user,
     company: state.company,
     groupedItems: groupedItemsSelector(state),
-    activeDate: get(state, 'agenda.activeDate'),
+    activeDate: state.agenda.activeDate,
     searchInitiated: state.searchInitiated,
     activeNavigation: searchNavigationSelector(state),
     resultsFiltered: state.resultsFiltered,
     listItems: listItemsSelector(state),
     isLoading: state.isLoading,
     previewConfig: previewConfigSelector(state),
-    featuredOnly: get(state, 'agenda.featuredOnly'),
+    featuredOnly: state.agenda.featuredOnly,
     listConfig: listConfigSelector(state),
-    userType: state.user_type
+    userType: state.userType,
+    hiddenGroupsShown: hiddenGroupsShownSelector(state),
 });
 
-const component: React.ComponentType<any> = connect(mapStateToProps)(AgendaList);
+const mapDispatchToProps: IDispatchProps = {
+    setActive,
+    previewItem,
+    openItem,
+    toggleSelected,
+    toggleHiddenGroupItems,
+};
+
+const component = connect<
+    IStateProps,
+    IDispatchProps,
+    IOwnProps,
+    IAgendaState
+>(mapStateToProps, mapDispatchToProps)(AgendaList);
 
 export default component;
diff --git a/assets/agenda/components/AgendaListCoverageItem.tsx b/assets/agenda/components/AgendaListCoverageItem.tsx
index 9cb5a3d40..d4627e9de 100644
--- a/assets/agenda/components/AgendaListCoverageItem.tsx
+++ b/assets/agenda/components/AgendaListCoverageItem.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import {get, isEqual} from 'lodash';
+import {isEqual} from 'lodash';
 
+import {IAgendaItem, ICoverage, IUser} from 'interfaces';
 import {gettext} from '../../utils';
 import {
     getCoverageIcon,
@@ -14,48 +14,64 @@ import {
     COVERAGE_STATUS_COLORS
 } from '../utils';
 
-class AgendaListCoverageItem extends React.Component<any, any> {
-    static propTypes: any;
-    constructor(props: any) {
+interface IProps {
+    group: string;
+    planningItem: IAgendaItem;
+    user: IUser['_id'];
+    coverage: ICoverage;
+    showBorder?: boolean;
+}
+
+interface IState {
+    coverageClass: string;
+    beingUpdated: boolean;
+    isWatched: boolean;
+    watchText: string;
+    isCoverageForExtraDay: boolean;
+    tooltip: string;
+}
+
+class AgendaListCoverageItem extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
         super(props);
 
-        this.state = this.getUpdatedState(props);
+        this.state = this.getUpdatedState();
     }
 
-    shouldComponentUpdate(nextProps: any) {
+    shouldComponentUpdate(nextProps: IProps) {
         return !isEqual(this.props.coverage, nextProps.coverage);
     }
 
-    componentWillReceiveProps(nextProps: any) {
-        if (!isEqual(this.props.coverage, nextProps.coverage)) {
-            this.setState(this.getUpdatedState(nextProps));
+    componentDidUpdate(prevProps: Readonly<IProps>) {
+        if (!isEqual(prevProps.coverage, this.props.coverage)) {
+            this.setState(this.getUpdatedState());
         }
     }
 
-    getUpdatedState(props: any) {
-        const watched = isWatched(props.coverage, props.user);
+    getUpdatedState(): IState {
+        const watched = isWatched(this.props.coverage, this.props.user);
+        const watchText = watched ? gettext('(Watching)') : '';
+        const beingUpdated = isCoverageBeingUpdated(this.props.coverage);
 
-        const state: any = {
-            coverageClass: `icon--coverage-${getCoverageIcon(props.coverage.coverage_type)}`,
-            beingUpdated: isCoverageBeingUpdated(props.coverage),
+        return {
+            coverageClass: `icon--coverage-${getCoverageIcon(this.props.coverage.coverage_type)}`,
+            beingUpdated: beingUpdated,
             isWatched: watched,
-            watchText: watched ? gettext('(Watching)') : '',
-            isCoverageForExtraDay: isCoverageForExtraDay(props.coverage),
+            watchText: watchText,
+            isCoverageForExtraDay: isCoverageForExtraDay(this.props.coverage, this.props.group),
+            tooltip: `${watchText} ${getCoverageTooltip(this.props.coverage, beingUpdated)}`,
         };
-
-        state.tooltip = `${state.watchText} ${getCoverageTooltip(props.coverage, state.beingUpdated)}`;
-
-        return state;
     }
 
     render() {
         const props = this.props;
         const state = this.state;
-        const coverage_icon = get(COVERAGE_STATUS_COLORS, props.coverage.coverage_status) || WORKFLOW_COLORS[props.coverage.workflow_status];
+        const coverage_icon = COVERAGE_STATUS_COLORS[props.coverage.coverage_status] ||
+            WORKFLOW_COLORS[props.coverage.workflow_status];
         return (
             !props.group ||
             props.coverage.scheduled == null ||
-            (state.isCoverageForExtraDay && props.coverage.planning_id === get(props, 'planningItem.guid'))
+            (state.isCoverageForExtraDay && props.coverage.planning_id === props.planningItem.guid)
         ) && (
             <span
                 className={classNames('wire-articles__item__icon',`${coverage_icon}`, {'dashed-border': props.showBorder})}
@@ -71,12 +87,4 @@ class AgendaListCoverageItem extends React.Component<any, any> {
     }
 }
 
-AgendaListCoverageItem.propTypes = {
-    planningItem: PropTypes.object,
-    user: PropTypes.string,
-    coverage: PropTypes.object,
-    showBorder: PropTypes.bool,
-    group: PropTypes.string,
-};
-
 export default AgendaListCoverageItem;
diff --git a/assets/agenda/components/AgendaListGroupHeader.tsx b/assets/agenda/components/AgendaListGroupHeader.tsx
new file mode 100644
index 000000000..2ce320660
--- /dev/null
+++ b/assets/agenda/components/AgendaListGroupHeader.tsx
@@ -0,0 +1,99 @@
+import * as React from 'react';
+import moment from 'moment';
+
+import {IAgendaItem} from 'interfaces';
+import {formatDate, gettext} from 'utils';
+import {getCoverageIcon} from '../utils';
+
+import {Skeleton} from 'primereact/skeleton';
+
+interface IProps {
+    group: string;
+    itemIds: Array<IAgendaItem['_id']>;
+    itemsById: {[itemId: string]: IAgendaItem};
+    itemsShown: boolean;
+    toggleHideItems(group: string): void;
+}
+
+export function AgendaListGroupHeader({group, itemIds, itemsById, itemsShown, toggleHideItems}: IProps) {
+    const coverageTypeCount: {[coverageType: string]: number} = {};
+    let itemCount = 0;
+
+    // Filter out Events/Planning that meet the following criteria
+    // * Events with no planning items
+    // * Events or Planning, no coverages at all
+    // * Events or Planning, coverages fall on `group` date
+    for (let itemIndex = 0; itemIndex < itemIds.length; ++itemIndex) {
+        const item = itemsById[itemIds[itemIndex]];
+
+        if (item.coverages == null || item.coverages.length === 0) {
+            itemCount += 1;
+            continue;
+        }
+
+        let coverageAdded = false;
+        for (let coverageIndex = 0; coverageIndex < item.coverages.length; ++coverageIndex) {
+            const coverage = item.coverages[coverageIndex];
+
+            if (formatDate(moment(coverage.scheduled)) !== group) {
+                continue;
+            } else if (coverageTypeCount[coverage.coverage_type] == null) {
+                coverageTypeCount[coverage.coverage_type] = 0;
+                coverageAdded = true;
+            }
+
+            coverageTypeCount[coverage.coverage_type] += 1;
+        }
+
+        if (coverageAdded) {
+            itemCount += 1;
+        }
+    }
+
+    const coverageTypes = Object.keys(coverageTypeCount);
+
+    return (
+        <div className="list-group-header">
+            <span className="badge rounded-pill badge--neutral">{itemIds.length}</span>
+            {coverageTypes.length === 0 ? (
+                <div className="list-group-header__title">
+                    {gettext('More hidden')}
+                    <span className="list-group-header__title-info">
+                        ({gettext('{{ numberOfItems }} Event', {numberOfItems: itemIds.length})})
+                    </span>
+                </div>
+            ) : (
+                <React.Fragment>
+                    <div className="list-group-header__title">
+                        {gettext('More hidden')}
+                        <span className="list-group-header__title-info">
+                            ({gettext('{{ numberOfItems }} Event & Planning', {numberOfItems: itemCount})})
+                        </span>
+                    </div>
+                    <div className="list-group-header__coverage-group">
+                        {coverageTypes.map((coverageType) => (
+                            <div key={coverageType} className="list-group-header__coverage-item">
+                                <span className="wire-articles__item__icon" title="Some title">
+                                    <i className={`icon--coverage-${getCoverageIcon(coverageType)}`} />
+                                </span>
+                                <span className="list-group-header__coverage-number">
+                                    {coverageTypeCount[coverageType]}
+                                </span>
+                            </div>
+                        ))}
+                    </div>
+                </React.Fragment>
+            )}
+            <div className="list-group-header__actions">
+                <button
+                    className="nh-button nh-button--tertiary nh-button--small"
+                    onClick={() => {
+                        toggleHideItems(group);
+                    }}
+                >
+                    {itemsShown ? gettext('Hide') : gettext('Show all')}
+                </button>
+            </div>
+        </div>
+    );
+}
diff --git a/assets/agenda/components/AgendaListItem.tsx b/assets/agenda/components/AgendaListItem.tsx
index 15ebacf8d..d1514e1cb 100644
--- a/assets/agenda/components/AgendaListItem.tsx
+++ b/assets/agenda/components/AgendaListItem.tsx
@@ -1,14 +1,12 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import {get, isEqual} from 'lodash';
 
-import ActionButton from 'components/ActionButton';
+import {IAgendaItem, IItemAction, IListConfig, IUser} from 'interfaces';
 
+import ActionButton from 'components/ActionButton';
 import AgendaListItemIcons from './AgendaListItemIcons';
 import AgendaItemTimeUpdater from './AgendaItemTimeUpdater';
 import AgendaInternalNote from './AgendaInternalNote';
-import {PlainText} from 'ui/components/PlainText';
 
 import {
     hasCoverages,
@@ -17,7 +15,6 @@ import {
     isRescheduled,
     getName,
     isWatched,
-    getDescription,
     getHighlightedDescription,
     getHighlightedName,
     getInternalNote,
@@ -25,20 +22,34 @@ import {
 import ActionMenu from '../../components/ActionMenu';
 import {LIST_ANIMATIONS, isMobilePhone} from 'utils';
 
-class AgendaListItem extends React.Component<any, any> {
-    static propTypes: any;
+interface IProps {
+    item: IAgendaItem;
+    group: string;
+    isActive: boolean;
+    isSelected: boolean;
+    isRead: boolean;
+    showActions: boolean;
+    actions: Array<IItemAction>;
+    isExtended: boolean;
+    user: IUser['_id'];
+    actioningItem?: IAgendaItem;
+    planningId?: IAgendaItem['_id'];
+    showShortcutActionIcons: boolean;
+    listConfig: IListConfig;
+
+    onClick(item: IAgendaItem, group: string, planningId?: IAgendaItem['_id']): void;
+    onDoubleClick(item: IAgendaItem, group: string, planningId?: IAgendaItem['_id']): void;
+    onActionList(event: React.MouseEvent, item: IAgendaItem, group: string, plan?: IAgendaItem): void;
+    toggleSelected(): void;
+    resetActioningItem(): void;
+}
 
-    slugline: any;
-    state: any;
-    dom: any;
+class AgendaListItem extends React.Component<IProps> {
+    dom: {article: HTMLElement | null};
 
-    constructor(props: any) {
+    constructor(props: IProps) {
         super(props);
-        this.slugline = props.item.slugline && props.item.slugline.trim();
-
-        this.state = {previousVersions: false};
         this.dom = {article: null};
-
         this.onKeyDown = this.onKeyDown.bind(this);
         this.setArticleRef = this.setArticleRef.bind(this);
         this.onArticleClick = this.onArticleClick.bind(this);
@@ -46,7 +57,7 @@ class AgendaListItem extends React.Component<any, any> {
         this.onMouseEnter = this.onMouseEnter.bind(this);
     }
 
-    onKeyDown(event: any) {
+    onKeyDown(event: React.KeyboardEvent) {
         switch (event.key) {
         case ' ':  // on space toggle selected item
             this.props.toggleSelected();
@@ -59,7 +70,7 @@ class AgendaListItem extends React.Component<any, any> {
         event.preventDefault();
     }
 
-    setArticleRef(elem: any) {
+    setArticleRef(elem: HTMLElement) {
         this.dom.article = elem;
     }
 
@@ -77,32 +88,34 @@ class AgendaListItem extends React.Component<any, any> {
         }
     }
 
-    shouldComponentUpdate(nextProps: any, nextState: any) {
-        const {props, state} = this;
+    shouldComponentUpdate(nextProps: Readonly<IProps>) {
+        const {props} = this;
+        const currentBookmarked = (props.item.bookmarks || []).includes(props.user);
+        const nextBookmarked = (nextProps.item.bookmarks || []).includes(nextProps.user);
 
-        return props.item._etag !== nextProps.item._etag || state.hover !== nextState.hover ||
-            props.isActive !== nextProps.isActive || props.isSelected !== nextProps.isSelected ||
+        return props.item._etag !== nextProps.item._etag ||
+            props.isActive !== nextProps.isActive ||
+            props.isSelected !== nextProps.isSelected ||
             props.isExtended !== nextProps.isExtended ||
-            get(props.actioningItem, '_id') === props.item._id ||
-            get(nextProps.actioningItem, '_id') === props.item._id ||
+            props.actioningItem?._id === props.item._id ||
+            nextProps.actioningItem?._id === props.item._id ||
             props.isRead !== nextProps.isRead ||
-            (get(props, 'item.bookmarks') || []).includes(props.user) !==
-            (get(nextProps, 'item.bookmarks') || []).includes(nextProps.user) ||
-            isWatched(props.item, props.user) !== isWatched(nextProps.item, nextProps.user) ||
-            isEqual(get(nextProps, 'coverages'), get(this.props, 'coverages'));
+            currentBookmarked !== nextBookmarked ||
+            nextBookmarked ||
+            isWatched(props.item, props.user) !== isWatched(nextProps.item, nextProps.user);
     }
 
     componentDidMount() {
-        if (this.props.isActive && this.dom.article) {
+        if (this.props.isActive === true && this.dom.article != null) {
             this.dom.article.focus();
         }
     }
 
-    stopPropagation(event: any) {
+    stopPropagation(event: React.MouseEvent) {
         event.stopPropagation();
     }
 
-    getClassNames(isExtended: any) {
+    getClassNames(isExtended: boolean) {
         return {
             card: classNames('wire-articles__item-wrap col-12 agenda-item'),
             wrap: classNames('wire-articles__item wire-articles__item--agenda wire-articles__item--list', {
@@ -129,7 +142,6 @@ class AgendaListItem extends React.Component<any, any> {
     getSegments(description: string) {
         const dom = new DOMParser().parseFromString(description.replace(/\n/g, '<br />'), 'text/html');
         const arrayOfParagraphs = dom.body.querySelectorAll('p');
-        const body = dom.body;
 
         const getSegmentCount = (p: HTMLParagraphElement): number => {
             // adding one because if there are 2 <br> tags it means there are 3 segments
@@ -140,7 +152,7 @@ class AgendaListItem extends React.Component<any, any> {
         let segmentsRemainingToBeAdded = 3;
         let paragraphsInnerText = '';
 
-        [...arrayOfParagraphs].forEach(paragraph => {
+        arrayOfParagraphs.forEach(paragraph => {
             if (segmentsRemainingToBeAdded > 0) {
                 paragraphsInnerText += paragraph.innerText;
                 paragraph.innerHTML = paragraph.innerHTML.split('<br>').filter((p: string) => p.trim() !== '').slice(0, segmentsRemainingToBeAdded).join('<br>');
@@ -156,20 +168,17 @@ class AgendaListItem extends React.Component<any, any> {
              * keep in mind that first 3 segments might be 1-3 paragraphs
              */
             firstThreeSegments: descriptionHTMLArr,
-            hasMoreContent: body.innerText.length > paragraphsInnerText.length,
+            hasMoreContent: dom.body.innerText.length > paragraphsInnerText.length,
         };
     }
 
-    renderListItem(isMobile: any, children: any) {
+    renderListItem(isMobile: boolean, children: React.ReactNode) {
         const {item, isExtended, group, planningId, listConfig} = this.props;
         const classes = this.getClassNames(isExtended);
-        const planningItem = (get(item, 'planning_items') || []).find((p: any) => p.guid === planningId) || null;
-        const description: string = item.es_highlight
-            ? getHighlightedDescription(item, planningItem)
-            : getDescription(item,planningItem);
+        const planningItem = (item.planning_items || []).find((p) => p.guid === planningId);
+        const description = getHighlightedDescription(item, planningItem);
         // Show headline for adhoc planning items
-        const showHeadline = !item.event && get(item, 'headline.length', 0) > 0;
-
+        const showHeadline = item.event == null && (item.headline?.length ?? 0) > 0;
         const {firstThreeSegments, hasMoreContent} =  this.getSegments(description);
 
         const renderDescription = (() => {
@@ -264,7 +273,7 @@ class AgendaListItem extends React.Component<any, any> {
 
     renderNonMobile() {
         const {item, planningId} = this.props;
-        const planningItem = (get(item, 'planning_items') || []).find((p: any) => p.guid === planningId) || {};
+        const planningItem = (item.planning_items || []).find((p) => p.guid === planningId);
 
         return this.renderListItem(false, !this.props.actions.length ? null : (
             <div className='wire-articles__item-actions' onClick={this.stopPropagation}>
@@ -279,7 +288,7 @@ class AgendaListItem extends React.Component<any, any> {
                     showShortcutActions={!this.props.showShortcutActionIcons}
                 />
 
-                {!this.props.showShortcutActionIcons ? null : this.props.actions.map((action: any) => action.shortcut && (
+                {!this.props.showShortcutActionIcons ? null : this.props.actions.map((action) => action.shortcut && (
                     <ActionButton
                         key={action.name}
                         className="icon-button icon-button--primary"
@@ -294,7 +303,7 @@ class AgendaListItem extends React.Component<any, any> {
 
     renderMobile() {
         const {item, planningId} = this.props;
-        const planningItem = (get(item, 'planning_items') || []).find((p: any) => p.guid === planningId) || {};
+        const planningItem = (item.planning_items || []).find((p) => p.guid === planningId);
         const internalNote = getInternalNote(item, planningItem);
 
         return this.renderListItem(true, (
@@ -309,7 +318,7 @@ class AgendaListItem extends React.Component<any, any> {
                     noPaddingRight={true}
                 />
 
-                {!this.props.showShortcutActionIcons ? null : this.props.actions.map((action: any) => action.shortcut && (
+                {!this.props.showShortcutActionIcons ? null : this.props.actions.map((action) => action.shortcut && (
                     <ActionButton
                         key={action.name}
                         className="icon-button icon-button--primary"
@@ -341,28 +350,4 @@ class AgendaListItem extends React.Component<any, any> {
     }
 }
 
-AgendaListItem.propTypes = {
-    item: PropTypes.object.isRequired,
-    group: PropTypes.string,
-    isActive: PropTypes.bool.isRequired,
-    isSelected: PropTypes.bool.isRequired,
-    isRead: PropTypes.bool.isRequired,
-    onClick: PropTypes.func.isRequired,
-    onDoubleClick: PropTypes.func.isRequired,
-    onActionList: PropTypes.func.isRequired,
-    showActions: PropTypes.bool.isRequired,
-    toggleSelected: PropTypes.func.isRequired,
-    actions: PropTypes.arrayOf(PropTypes.shape({
-        name: PropTypes.string,
-        action: PropTypes.func,
-    })),
-    isExtended: PropTypes.bool.isRequired,
-    user: PropTypes.string,
-    actioningItem: PropTypes.object,
-    resetActioningItem: PropTypes.func,
-    planningId: PropTypes.string,
-    showShortcutActionIcons: PropTypes.bool,
-    listConfig: PropTypes.object,
-};
-
 export default AgendaListItem;
diff --git a/assets/agenda/components/AgendaListItemIcons.tsx b/assets/agenda/components/AgendaListItemIcons.tsx
index 84132b85b..c8e56b717 100644
--- a/assets/agenda/components/AgendaListItemIcons.tsx
+++ b/assets/agenda/components/AgendaListItemIcons.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
-import PropTypes from 'prop-types';
-import {get, isEqual} from 'lodash';
+import {isEqual} from 'lodash';
+
+import {IAgendaItem, IUser, ICoverage, IListConfig} from 'interfaces';
 import {bem} from 'ui/utils';
 import {
     hasCoverages,
@@ -20,50 +21,65 @@ import AgendaLocation from './AgendaLocation';
 import {gettext, isDisplayed} from 'utils';
 import {AgendaContacs} from './AgendaContacts';
 
-class AgendaListItemIcons extends React.Component {
-    static propTypes: any;
-    static defaultProps: any;
+interface IProps {
+    user: IUser['_id'];
+    group: string;
+    item: IAgendaItem;
+    planningItem?: IAgendaItem;
+    hideCoverages?: boolean;
+    row?: boolean;
+    isMobilePhone?: boolean;
+    listConfig: IListConfig;
+}
+
+interface IState {
+    internalNote: string;
+    coveragesToDisplay: Array<ICoverage>;
+    attachments: number;
+    isRecurring: boolean;
+}
 
-    constructor(props: any) {
+class AgendaListItemIcons extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
         super(props);
 
-        this.state = this.getUpdatedState(props);
+        this.state = this.getUpdatedState();
     }
 
-    itemChanged(nextProps: any) {
-        return get(this.props, 'item._id') !== get(nextProps, 'item._id') ||
-            get(this.props, 'item._etag') !== get(nextProps, 'item._etag') ||
-            !isEqual(get(this.props, 'item.coverages'), get(nextProps, 'item.coverages'));
+    itemChanged(nextProps: Readonly<IProps>) {
+        return this.props.item._id !== nextProps.item._id ||
+            this.props.item._etag !== nextProps.item._etag ||
+            !isEqual(this.props.item.coverages, nextProps.item.coverages);
     }
 
-    shouldComponentUpdate(nextProps: any) {
-        return this.itemChanged(nextProps);
+    shouldComponentUpdate(props: Readonly<IProps>) {
+        return this.itemChanged(props);
     }
 
-    componentWillReceiveProps(nextProps: any) {
-        if (this.itemChanged(nextProps)) {
-            this.setState(this.getUpdatedState(nextProps));
+    componentDidUpdate(prevProps: Readonly<IProps>) {
+        if (this.itemChanged(prevProps)) {
+            this.setState(this.getUpdatedState());
         }
     }
 
-    getUpdatedState(props: any) {
+    getUpdatedState(): IState {
         return {
-            internalNote: getInternalNote(props.item, props.planningItem),
-            coveragesToDisplay: !hasCoverages(props.item) || props.hideCoverages ?
+            internalNote: getInternalNote(this.props.item, this.props.planningItem),
+            coveragesToDisplay: !hasCoverages(this.props.item) || this.props.hideCoverages ?
                 [] :
-                (props.item.coverages || []).filter((c: any) => (
-                    !props.group ||
+                (this.props.item.coverages || []).filter((c) => (
+                    !this.props.group ||
                     c.scheduled == null ||
-                    (isCoverageForExtraDay(c) && c.planning_id === get(props, 'planningItem.guid'))
+                    (isCoverageForExtraDay(c, this.props.group) && c.planning_id === this.props.planningItem?.guid)
                 )),
-            attachments: (getAttachments(props.item)).length,
-            isRecurring: isRecurring(props.item),
+            attachments: (getAttachments(this.props.item)).length,
+            isRecurring: isRecurring(this.props.item),
         };
     }
 
-    getItemByschema(props: any) {
+    getItemByschema(props: IProps) {
         const {listConfig} = props;
-        if ((listConfig || {}).subject != null) {
+        if (listConfig.subject != null) {
             const scheme = listConfig.subject.scheme;
             const subjects = getSubjects(props.item);
             return scheme == null ?
@@ -77,8 +93,8 @@ class AgendaListItemIcons extends React.Component {
     }
 
     render() {
-        const props: any = this.props;
-        const state: any = this.state;
+        const props = this.props;
+        const state = this.state;
         const className = bem('wire-articles', 'item__meta', {row: props.row});
         const subject = this.getItemByschema(props);
 
@@ -86,22 +102,24 @@ class AgendaListItemIcons extends React.Component {
             <div className={className}>
                 <AgendaMetaTime
                     item={props.item}
-                    borderRight={!props.isMobilePhone}
+                    borderRight={props.isMobilePhone}
                     isRecurring={state.isRecurring}
                     group={props.group}
                     isMobilePhone={props.isMobilePhone}
                 />
 
-                {state.coveragesToDisplay.length > 0 && (
+                {props.planningItem != null && state.coveragesToDisplay.length > 0 && (
                     <div className='wire-articles__item__icons wire-articles__item__icons--dashed-border'>
-                        {state.coveragesToDisplay.map((coverage: any, index: any) => (
+                        {state.coveragesToDisplay.map((coverage, index) => (
                             <AgendaListCoverageItem
                                 key={index}
-                                planningItem={props.planningItem}
                                 user={props.user}
                                 coverage={coverage}
                                 showBorder={props.isMobilePhone && index === state.coveragesToDisplay.length - 1}
                                 group={props.group}
+                                // Using `ts-ignore` otherwise `tsc` complains planningItem may be undefined
+                                // @ts-ignore
+                                planningItem={props.planningItem}
                             />
                         ))}
                     </div>
@@ -146,17 +164,4 @@ class AgendaListItemIcons extends React.Component {
     }
 }
 
-AgendaListItemIcons.propTypes = {
-    item: PropTypes.object,
-    planningItem: PropTypes.object,
-    group: PropTypes.string,
-    hideCoverages: PropTypes.bool,
-    row: PropTypes.bool,
-    isMobilePhone: PropTypes.bool,
-    user: PropTypes.string,
-    listConfig : PropTypes.object,
-};
-
-AgendaListItemIcons.defaultProps = {isMobilePhone: false};
-
 export default AgendaListItemIcons;
diff --git a/assets/agenda/components/AgendaMetaTime.tsx b/assets/agenda/components/AgendaMetaTime.tsx
index 30295c8a2..2f93857de 100644
--- a/assets/agenda/components/AgendaMetaTime.tsx
+++ b/assets/agenda/components/AgendaMetaTime.tsx
@@ -1,13 +1,25 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
+import moment from 'moment';
 
+import {IAgendaItem} from 'interfaces';
 import {bem} from 'ui/utils';
-import {formatAgendaDate, hasCoverages} from '../utils';
+import {formatAgendaDate, getEndDate, getStartDate, hasCoverages} from '../utils';
+import {DATE_FORMAT, formatDate} from 'utils';
 
 import AgendaItemTimeUpdater from './AgendaItemTimeUpdater';
+import {MultiDayListLabel} from './MultiDayListLabel';
 
-function format(item: any, group: any, onlyDates: any) {
+interface IProps {
+    group?: string;
+    item: IAgendaItem;
+    borderRight?: boolean;
+    isRecurring?: boolean;
+    isMobilePhone?: boolean;
+    onlyDates?: boolean;
+}
+
+function format(item: IAgendaItem, group?: string, onlyDates = true) {
     return (
         <span key="date">
             {formatAgendaDate(item, group, {onlyDates})}
@@ -15,31 +27,38 @@ function format(item: any, group: any, onlyDates: any) {
     );
 }
 
-function getCalendarClass(item: any) {
+function getCalendarClass(item: IAgendaItem) {
     if (item.state === 'rescheduled') {
         return 'icon--orange';
-    }
-
-    if (item.state === 'cancelled') {
+    } else if (item.state === 'cancelled') {
         return 'icon--red';
-    }
-
-    if (hasCoverages(item)) {
+    } else if (hasCoverages(item)) {
         return 'icon--green';
-    } else {
-        return 'icon--default';
     }
+
+    return 'icon--default';
 }
 
-export default function AgendaMetaTime({item, borderRight, isRecurring, group, isMobilePhone, onlyDates}: any): any {
+export default function AgendaMetaTime({item, borderRight, isRecurring, group, isMobilePhone, onlyDates}: IProps) {
     const icon = item.item_type === 'planning' ? 'icon--planning' : 'icon--calendar';
-
+    const groupDate = moment(group, DATE_FORMAT);
+    const startDate = moment(formatDate(getStartDate(item)), DATE_FORMAT);
+    const endDate = moment(formatDate(getEndDate(item)), DATE_FORMAT);
+    const diffDays = groupDate.diff(startDate, 'days') + 1;
+    const itemDays = endDate.diff(startDate, 'days') + 1;
     const times = (
         <div key="times" className={classNames(
             bem('wire-articles__item', 'meta-time', {'border-right': borderRight}),
             {'w-100': isMobilePhone},
-            {'m-0': onlyDates})}>
-            {format(item, group, onlyDates)}
+            {'m-0': onlyDates})}
+        >
+            {format(item, group, onlyDates === true)}
+            {itemDays <= 1 ? null : (
+                <MultiDayListLabel
+                    current={diffDays}
+                    days={itemDays}
+                />
+            )}
         </div>
     );
 
@@ -59,23 +78,11 @@ export default function AgendaMetaTime({item, borderRight, isRecurring, group, i
         </div>
     );
 
-    return isMobilePhone ?
-        [times, icons] :
-        [icons, times, <AgendaItemTimeUpdater key="timeUpdate" item={item} borderRight={borderRight} />];
+    return (
+        <React.Fragment>
+            {isMobilePhone ?
+                [times, icons] :
+                [icons, times, <AgendaItemTimeUpdater key="timeUpdate" item={item} borderRight={borderRight} />]}
+        </React.Fragment>
+    );
 }
-
-AgendaMetaTime.propTypes = {
-    item: PropTypes.object,
-    borderRight: PropTypes.bool,
-    isRecurring: PropTypes.bool,
-    group: PropTypes.string,
-    isMobilePhone: PropTypes.bool,
-    onlyDates: PropTypes.bool,
-};
-
-AgendaMetaTime.defaultProps = {
-    isRecurring: false,
-    hasCoverage: false,
-    isMobilePhone: false,
-    borderRight: false,
-};
diff --git a/assets/agenda/components/AgendaTime.tsx b/assets/agenda/components/AgendaTime.tsx
index 870c3398e..c510cd825 100644
--- a/assets/agenda/components/AgendaTime.tsx
+++ b/assets/agenda/components/AgendaTime.tsx
@@ -39,14 +39,14 @@ export default function AgendaTime({item, children}: any) {
                     getClassNames(),
                     getClassNames('remote'),
                     {'p-0': isItemTBC})}>
-                    {formatAgendaDate(new_dates, null, {localTimeZone: false})}
+                    {formatAgendaDate(new_dates, undefined, {localTimeZone: false})}
                 </div>
             );
         }
 
         return (
             <div key='time' className={getClassNames('event')}>
-                {formatAgendaDate(item, null, {})}
+                {formatAgendaDate(item, undefined, {})}
             </div>
         );
     };
@@ -71,4 +71,4 @@ export default function AgendaTime({item, children}: any) {
 AgendaTime.propTypes = {
     item: PropTypes.object.isRequired,
     children: PropTypes.node,
-};
\ No newline at end of file
+};
diff --git a/assets/agenda/components/MultiDayListLabel.tsx b/assets/agenda/components/MultiDayListLabel.tsx
new file mode 100644
index 000000000..f29793155
--- /dev/null
+++ b/assets/agenda/components/MultiDayListLabel.tsx
@@ -0,0 +1,31 @@
+import * as React from 'react';
+
+import {gettext} from 'utils';
+
+interface IProps {
+    current: number;
+    days: number;
+}
+
+function getLabelSectionClass(current: number, days: number): string {
+    if (current === 1) {
+        return 'multiday-label--start';
+    } else if (current === days) {
+        return 'multiday-label--end';
+    }
+
+    return 'multiday-label--mid';
+}
+
+export const MultiDayListLabel = React.memo(({current, days}: IProps) => (
+    <span className="multiday-label__wrap ms-2">
+        <span className={`multiday-label ${getLabelSectionClass(current, days)}`}>
+            <span className="multiday-label__label">{gettext('Day:')}</span>
+            <span className="multiday-label__value">
+                <span>{current}</span>
+                <span className="multiday-label__value-divide">/</span>
+                <span>{days}</span>
+            </span>
+        </span>
+    </span>
+));
diff --git a/assets/agenda/index.ts b/assets/agenda/index.ts
index 96d27682b..0f6eb027d 100644
--- a/assets/agenda/index.ts
+++ b/assets/agenda/index.ts
@@ -1,3 +1,4 @@
+import {IAgendaState} from 'interfaces';
 import {createStore, render, getInitData, isMobilePhone, closeItemOnMobile} from 'utils';
 import {initWebSocket} from 'websocket';
 
@@ -7,7 +8,7 @@ import AgendaApp from './components/AgendaApp';
 import {fetchItems, setState, initData, initParams, pushNotification, openItemDetails, previewItem} from './actions';
 import {setView} from 'search/actions';
 
-const store = createStore(agendaReducer, 'Agenda');
+const store = createStore<IAgendaState>(agendaReducer, 'Agenda');
 
 // init data
 store.dispatch(initData(getInitData(window.agendaData), getReadItems(), getActiveDate(), getFeaturedOnlyParam()));
diff --git a/assets/agenda/reducers.ts b/assets/agenda/reducers.ts
index c2ceb1b3a..5c38887e8 100644
--- a/assets/agenda/reducers.ts
+++ b/assets/agenda/reducers.ts
@@ -1,5 +1,16 @@
+import {get, uniq} from 'lodash';
+
+import {
+    IAgendaItem,
+    IAgendaListGroup,
+    IRestApiResponse,
+    IAgendaState,
+} from 'interfaces';
 import {
     RECIEVE_ITEMS,
+    SET_LIST_GROUPS_AND_ITEMS,
+    ADD_ITEMS_TO_LIST_GROUPS,
+    TOGGLE_HIDDEN_GROUP_ITEMS,
     INIT_DATA,
     SELECT_DATE,
     WATCH_EVENTS,
@@ -11,32 +22,39 @@ import {
     WATCH_COVERAGE,
     STOP_WATCHING_COVERAGE,
     SET_ERROR,
+    RECIEVE_NEXT_ITEMS,
 } from './actions';
 
-import {get, uniq} from 'lodash';
 import {EXTENDED_VIEW} from 'wire/defaults';
 import {searchReducer} from 'search/reducers';
 import {defaultReducer} from '../reducers';
 import {EARLIEST_DATE} from './utils';
-import {ITopic} from 'interfaces/topic';
 
-const initialState = {
+const initialState: IAgendaState = {
     items: [],
+    fetchFrom: 0,
     itemsById: {},
-    aggregations: null,
-    activeItem: null,
-    previewItem: null,
-    previewGroup: null,
-    previewPlan: null,
-    openItem: null,
+    listItems: {
+        groups: [],
+        hiddenGroupsShown: {},
+    },
+    aggregations: undefined,
+    activeItem: undefined,
+    previewItem: undefined,
+    previewGroup: undefined,
+    previewPlan: undefined,
+    openItem: undefined,
     isLoading: false,
     resultsFiltered: false,
-    totalItems: null,
-    activeQuery: null,
-    user: null,
-    userObject: null,
+    totalItems: 0,
+    activeQuery: undefined,
+    // Use `window.agendaData` so these attributes always have a value
+    user: window.agendaData.user._id,
+    userObject: window.agendaData.user,
+    userType: window.agendaData.user.user_type ?? 'public',
+
     userFolders: [],
-    company: null,
+    company: undefined,
     companyFolders: [],
     topics: [],
     selectedItems: [],
@@ -51,7 +69,7 @@ const initialState = {
         activeDate: Date.now(),
         activeGrouping: 'day',
         eventsOnlyAccess: false,
-        itemType: null,
+        itemType: undefined,
         featuredOnly: false,
         agendaWireItems: [],
     },
@@ -59,18 +77,15 @@ const initialState = {
     detail: false,
     userSections: {},
     searchInitiated: false,
-    uiConfig: {},
+    uiConfig: {_id: 'agenda'},
     groups: [],
     hasAgendaFeaturedItems: false,
+    savedItemsCount: 0,
 };
 
-export interface IAgendaState {
-    topics: Array<ITopic>;
-}
-
-function recieveItems(state: any, data: any) {
+function recieveItems(state: IAgendaState, data: IRestApiResponse<IAgendaItem>): IAgendaState {
     const itemsById = Object.assign({}, state.itemsById);
-    const items = data._items.map((item: any) => {
+    const items = data._items.map((item) => {
         itemsById[item._id] = item;
         return item._id;
     });
@@ -78,46 +93,113 @@ function recieveItems(state: any, data: any) {
     return {
         ...state,
         items,
+        fetchFrom: items.length,
         itemsById,
+        listItems: {
+            ...state.listItems,
+            groups: [],
+        },
         isLoading: false,
         totalItems: data._meta.total,
-        aggregations: data._aggregations || null,
+        aggregations: data._aggregations || undefined,
         newItems: [],
         searchInitiated: false,
     };
 }
 
-function _agendaReducer(state: any, action: any) {
-    switch (action.type) {
+function updateListGroups(state: IAgendaState, updatedGroups: Array<IAgendaListGroup>): IAgendaState {
+    const updatedGroupsById = updatedGroups.reduce<{[date: string]: IAgendaListGroup}>((groups, group) => {
+        groups[group.date] = group;
 
-    case SELECT_DATE:
-        return {
-            ...state,
-            selectedItems: [],
-            activeDate: action.dateString,
-            activeGrouping: action.grouping || 'day',
-        };
+        return groups;
+    }, {});
+    const currentGroupsById = state.listItems.groups.reduce<{[date: string]: IAgendaListGroup}>((groups, group) => {
+        groups[group.date] = group;
 
-    default:
-        return state;
+        return groups;
+    }, {});
+
+    return {
+        ...state,
+        listItems: {
+            ...state.listItems,
+            groups: uniq([
+                ...Object.keys(currentGroupsById),
+                ...Object.keys(updatedGroupsById),
+            ]).sort().map((groupId) => ({
+                ...currentGroupsById[groupId] ?? {},
+                items: uniq([
+                    ...currentGroupsById[groupId]?.items ?? [],
+                    ...updatedGroupsById[groupId]?.items ?? [],
+                ]),
+                hiddenItems: uniq([
+                    ...currentGroupsById[groupId]?.hiddenItems ?? [],
+                    ...updatedGroupsById[groupId]?.hiddenItems ?? [],
+                ]),
+                date: groupId,
+            })),
+        },
+    };
+}
+
+function runDefaultReducer(state: IAgendaState, action: any): IAgendaState {
+    const newState: IAgendaState = defaultReducer(state || initialState, action);
+
+    if (action.type === RECIEVE_NEXT_ITEMS && action.data.setFromSearch) {
+        // increment the `fetchFrom` number with the length of the API response
+        newState.fetchFrom += (action.data as IRestApiResponse<IAgendaItem>)._items.length;
     }
+
+    return newState;
 }
 
-export default function agendaReducer(state: any = initialState, action: any): IAgendaState {
+export default function agendaReducer(state: IAgendaState = initialState, action: any): IAgendaState {
     switch (action.type) {
 
     case RECIEVE_ITEMS:
         return recieveItems(state, action.data);
 
+    case SET_LIST_GROUPS_AND_ITEMS:
+        return {
+            ...state,
+            listItems: {
+                ...state.listItems,
+                groups: action.data,
+            },
+        };
+
+    case ADD_ITEMS_TO_LIST_GROUPS:
+        return updateListGroups(state, action.data);
+
+    case TOGGLE_HIDDEN_GROUP_ITEMS:
+        return {
+            ...state,
+            listItems: {
+                ...state.listItems,
+                hiddenGroupsShown: {
+                    ...state.listItems.hiddenGroupsShown,
+                    [action.data]: !state.listItems.hiddenGroupsShown[action.data],
+                },
+            },
+        };
+
     case WATCH_EVENTS: {
         const itemsById = Object.assign({}, state.itemsById);
-        action.items.forEach((_id: any) => {
-            const watches = get(itemsById[_id], 'watches', []).concat(state.user);
-            itemsById[_id] = Object.assign({}, itemsById[_id], {watches});
-            (get(itemsById[_id], 'coverages') || []).forEach((c: any) => {
-                if (get(c, 'watches.length', 0) > 0) {
-                    c.watches = [];
-                }
+        action.items.forEach((itemId: string) => {
+            if (itemsById[itemId] == null) {
+                return;
+            }
+
+            itemsById[itemId] = {
+                ...itemsById[itemId],
+                watches: [
+                    ...itemsById[itemId].watches ?? [],
+                    state.user,
+                ],
+            };
+
+            (itemsById[itemId].coverages ?? []).forEach((coverage) => {
+                coverage.watches = [];
             });
         });
 
@@ -206,7 +288,7 @@ export default function agendaReducer(state: any = initialState, action: any): I
             openItem: openItem,
             detail: !!openItem,
             agenda,
-            savedItemsCount: action.agendaData.saved_items || null,
+            savedItemsCount: action.agendaData.saved_items || 0,
             userSections: action.agendaData.userSections || {},
             locators: action.agendaData.locators || null,
             uiConfig: action.agendaData.ui_config || {},
@@ -220,9 +302,14 @@ export default function agendaReducer(state: any = initialState, action: any): I
     case SELECT_DATE:
         return {
             ...state,
-            activeItem: null,
-            previewItem: null,
-            agenda: _agendaReducer(state.agenda, action)
+            activeItem: undefined,
+            previewItem: undefined,
+            selectedItems: [],
+            agenda: {
+                ...state.agenda,
+                activeDate: action.dateString,
+                activeGrouping: action.grouping || 'day',
+            },
         };
 
     case TOGGLE_FEATURED_FILTER:
@@ -257,6 +344,6 @@ export default function agendaReducer(state: any = initialState, action: any): I
             errors: action.errors};
     }
     default:
-        return defaultReducer(state || initialState, action);
+        return runDefaultReducer(state, action);
     }
 }
diff --git a/assets/agenda/tests/utils.spec.ts b/assets/agenda/tests/utils.spec.ts
index 67b9252ca..357613a41 100644
--- a/assets/agenda/tests/utils.spec.ts
+++ b/assets/agenda/tests/utils.spec.ts
@@ -1,25 +1,41 @@
 /* eslint-disable no-prototype-builtins */
 import {keyBy} from 'lodash';
+import moment from 'moment';
+import {IAgendaItem} from 'interfaces';
 import * as utils from '../utils';
 
 
 describe('utils', () => {
     describe('groupItems', () => {
         it('returns grouped items per day', () => {
-            const items = [
+            const items: Array<IAgendaItem> = [
                 {
                     _id: 'foo',
+                    guid: 'foo',
+                    type: 'agenda',
+                    item_type: 'event',
+                    state: 'scheduled',
+                    _created: '2023-11-16T04:00:00+0000',
+                    _updated: '2023-11-16T04:00:00+0000',
+                    _etag: 'etag123',
                     dates: {start: '2018-10-15T04:00:00+0000', end: '2018-10-15T05:00:00+0000', tz: 'Australia/Sydney'},
-                    event: {_id: 'foo'}
+                    event: {_id: 'foo'},
                 },
                 {
                     _id: 'bar',
+                    guid: 'bar',
+                    type: 'agenda',
+                    item_type: 'event',
+                    state: 'scheduled',
+                    _created: '2023-11-16T04:00:00+0000',
+                    _updated: '2023-11-16T04:00:00+0000',
+                    _etag: 'etag123',
                     dates: {start: '2018-10-18T06:00:00+0000', end: '2018-10-18T09:00:00+0000', tz: 'Australia/Sydney'},
-                    event: {_id: 'bar'}
+                    event: {_id: 'bar'},
                 },
             ];
 
-            const groupedItems: any = keyBy(utils.groupItems(items, '2018-10-13', 'day'), 'date');
+            const groupedItems = keyBy(utils.groupItems(items, moment('2018-10-13'), undefined, 'day'), 'date');
 
             expect(groupedItems.hasOwnProperty('13-10-2018')).toBe(false);
             expect(groupedItems.hasOwnProperty('14-10-2018')).toBe(false);
@@ -30,81 +46,117 @@ describe('utils', () => {
         });
 
         it('returns grouped multi day events per day', () => {
-            const items = [
+            const items: Array<IAgendaItem> = [
                 {
                     _id: 'foo',
+                    guid: 'foo',
+                    type: 'agenda',
+                    item_type: 'event',
+                    state: 'scheduled',
+                    _created: '2023-11-16T04:00:00+0000',
+                    _updated: '2023-11-16T04:00:00+0000',
+                    _etag: 'etag123',
                     dates: {start: '2018-10-15T04:00:00+0000', end: '2018-10-17T05:00:00+0000', tz: 'Australia/Sydney'},
                     event: {_id: 'foo'}
                 },
                 {
                     _id: 'bar',
+                    guid: 'bar',
+                    type: 'agenda',
+                    item_type: 'event',
+                    state: 'scheduled',
+                    _created: '2023-11-16T04:00:00+0000',
+                    _updated: '2023-11-16T04:00:00+0000',
+                    _etag: 'etag123',
                     dates: {start: '2018-10-17T06:00:00+0000', end: '2018-10-18T09:00:00+0000', tz: 'Australia/Sydney'},
                     event: {_id: 'bar'}
                 },
             ];
 
-            const groupedItems: any = keyBy(utils.groupItems(items, '2018-10-15', 'day'), 'date');
+            const groupedItems = keyBy(utils.groupItems(items, moment('2018-10-15'), undefined, 'day'), 'date');
 
             expect(groupedItems['15-10-2018']['items']).toEqual(['foo']);
-            expect(groupedItems['16-10-2018']['items']).toEqual(['foo']);
-            expect(groupedItems['17-10-2018']['items']).toEqual(['foo', 'bar']);
-            expect(groupedItems['18-10-2018']['items']).toEqual(['bar']);
+            expect(groupedItems['16-10-2018'].hiddenItems).toEqual(['foo']);
+            expect(groupedItems['17-10-2018'].items).toEqual(['bar']);
+            expect(groupedItems['17-10-2018'].hiddenItems).toEqual(['foo']);
+            expect(groupedItems['18-10-2018'].hiddenItems).toEqual(['bar']);
             expect(groupedItems.hasOwnProperty('19-10-2018')).toBe(false);
         });
 
         it('returns grouped events with extra days per day', () => {
-            const items = [
+            const items: Array<IAgendaItem> = [
                 {
                     _id: 'foo',
+                    guid: 'foo',
+                    type: 'agenda',
+                    item_type: 'event',
+                    state: 'scheduled',
+                    _created: '2023-11-16T04:00:00+0000',
+                    _updated: '2023-11-16T04:00:00+0000',
+                    _etag: 'etag123',
                     dates: {start: '2018-10-15T04:00:00+0000', end: '2018-10-17T05:00:00+0000', tz: 'Australia/Sydney'},
                     display_dates: [{date: '2018-10-13T10:00:00+0000'}],
                     event: {_id: 'foo'}
                 }];
 
-            const groupedItems: any = keyBy(utils.groupItems(items, '2018-10-11', 'day'), 'date');
+            const groupedItems = keyBy(utils.groupItems(items, moment('2018-10-11'), undefined, 'day'), 'date');
 
             expect(groupedItems.hasOwnProperty('11-10-2018')).toBe(false);
             expect(groupedItems.hasOwnProperty('12-10-2018')).toBe(false);
-            expect(groupedItems['13-10-2018']['items']).toEqual(['foo']);
+            expect(groupedItems['13-10-2018'].hiddenItems).toEqual(['foo']);
             expect(groupedItems.hasOwnProperty('14-10-2018')).toBe(false);
             expect(groupedItems['15-10-2018']['items']).toEqual(['foo']);
-            expect(groupedItems['16-10-2018']['items']).toEqual(['foo']);
-            expect(groupedItems['17-10-2018']['items']).toEqual(['foo']);
+            expect(groupedItems['16-10-2018'].hiddenItems).toEqual(['foo']);
+            expect(groupedItems['17-10-2018'].hiddenItems).toEqual(['foo']);
             expect(groupedItems.hasOwnProperty('18-10-2018')).toBe(false);
         });
 
         it('returns grouped ad-hoc plan based on extra days', () => {
-            const items = [
+            const items: Array<IAgendaItem> = [
                 {
                     _id: 'foo',
+                    guid: 'foo',
+                    type: 'agenda',
+                    item_type: 'event',
+                    state: 'scheduled',
+                    _created: '2023-11-16T04:00:00+0000',
+                    _updated: '2023-11-16T04:00:00+0000',
+                    _etag: 'etag123',
                     dates: {start: '2018-10-17T04:00:00+0000', end: '2018-10-17T04:00:00+0000'},
                     display_dates: [
                         {date: '2018-10-16T04:00:00+0000'},
                         {date: '2018-10-18T04:00:00+0000'}
                     ],
-                    event: null
                 }];
 
-            const groupedItems: any = keyBy(utils.groupItems(items, '2018-10-15', 'day'), 'date');
+            const groupedItems = keyBy(utils.groupItems(items, moment('2018-10-15'), undefined, 'day'), 'date');
 
             expect(groupedItems.hasOwnProperty('15-10-2018')).toBe(false);
             expect(groupedItems.hasOwnProperty('17-10-2018')).toBe(false);
             expect(groupedItems.hasOwnProperty('16-10-2018')).toBe(true);
             expect(groupedItems.hasOwnProperty('18-10-2018')).toBe(true);
-            expect(groupedItems['16-10-2018']['items']).toEqual(['foo']);
-            expect(groupedItems['18-10-2018']['items']).toEqual(['foo']);
+            expect(groupedItems['16-10-2018'].items).toEqual([]);
+            expect(groupedItems['16-10-2018'].hiddenItems).toEqual(['foo']);
+            expect(groupedItems['18-10-2018'].items).toEqual([]);
+            expect(groupedItems['18-10-2018'].hiddenItems).toEqual(['foo']);
         });
 
         it('returns grouped ad-hoc plan with no extra days', () => {
-            const items = [
+            const items: Array<IAgendaItem> = [
                 {
                     _id: 'foo',
+                    guid: 'foo',
+                    type: 'agenda',
+                    item_type: 'event',
+                    state: 'scheduled',
+                    _created: '2023-11-16T04:00:00+0000',
+                    _updated: '2023-11-16T04:00:00+0000',
+                    _etag: 'etag123',
                     dates: {start: '2018-10-17T04:00:00+0000', end: '2018-10-17T04:00:00+0000'},
                     display_dates: [{date: '2018-10-17T04:00:00+0000'}],
-                    event: null
                 }];
 
-            const groupedItems: any = keyBy(utils.groupItems(items, '2018-10-15', 'day'), 'date');
+            const groupedItems = keyBy(utils.groupItems(items, moment('2018-10-15'), undefined, 'day'), 'date');
 
             expect(groupedItems.hasOwnProperty('15-10-2018')).toBe(false);
             expect(groupedItems.hasOwnProperty('16-10-2018')).toBe(false);
@@ -116,9 +168,16 @@ describe('utils', () => {
 
     describe('listItems', () => {
         it('of event with planning items', () => {
-            const items = [
+            const items: Array<IAgendaItem> = [
                 {
                     _id: 'foo',
+                    guid: 'foo',
+                    type: 'agenda',
+                    item_type: 'event',
+                    state: 'scheduled',
+                    _created: '2023-11-16T04:00:00+0000',
+                    _updated: '2023-11-16T04:00:00+0000',
+                    _etag: 'etag123',
                     dates: {start: '2018-10-15T04:00:00+0000', end: '2018-10-15T05:00:00+0000', tz: 'Australia/Sydney'},
                     display_dates: [
                         {date: '2018-10-14T04:00:00+0000'},
@@ -129,54 +188,91 @@ describe('utils', () => {
                         {
                             'scheduled': '2018-10-15T04:00:00+0000',
                             'planning_id': 'plan1',
-                            'coverage_id': 'coverage1'
+                            'coverage_id': 'coverage1',
+                            coverage_type: 'text',
+                            coverage_status: 'coverage intended',
+                            workflow_status: 'assigned',
                         },
                         {
                             'scheduled': '2018-10-14T04:00:00+0000',
                             'planning_id': 'plan1',
-                            'coverage_id': 'coverage2'
+                            'coverage_id': 'coverage2',
+                            coverage_type: 'text',
+                            coverage_status: 'coverage intended',
+                            workflow_status: 'assigned',
                         },
                         {
                             'scheduled': '2018-10-16T04:00:00+0000',
                             'planning_id': 'plan2',
-                            'coverage_id': 'coverage3'
+                            'coverage_id': 'coverage3',
+                            coverage_type: 'text',
+                            coverage_status: 'coverage intended',
+                            workflow_status: 'assigned',
                         }
                     ],
                     planning_items: [
                         {
                             '_id': 'plan1',
                             'guid': 'plan1',
+                            type: 'agenda',
+                            item_type: 'planning',
+                            state: 'scheduled',
+                            _created: '2023-11-16T04:00:00+0000',
+                            _updated: '2023-11-16T04:00:00+0000',
+                            _etag: 'etag123',
                             'planning_date': '2018-10-15T04:30:00+0000',
+                            dates: {start: '2018-10-15T04:30:00+0000', end: '2018-10-15T04:30:00+0000'},
                             'coverages': [
                                 {
                                     'scheduled': '2018-10-15T04:00:00+0000',
                                     'planning_id': 'plan1',
-                                    'coverage_id': 'coverage1'
+                                    'coverage_id': 'coverage1',
+                                    coverage_type: 'text',
+                                    coverage_status: 'coverage intended',
+                                    workflow_status: 'assigned',
                                 },
                                 {
                                     'scheduled': '2018-10-14T04:00:00+0000',
                                     'planning_id': 'plan1',
-                                    'coverage_id': 'coverage2'
+                                    'coverage_id': 'coverage2',
+                                    coverage_type: 'text',
+                                    coverage_status: 'coverage intended',
+                                    workflow_status: 'assigned',
                                 }
                             ],
                         },
                         {
                             '_id': 'plan2',
                             'guid': 'plan2',
+                            type: 'agenda',
+                            item_type: 'planning',
+                            state: 'scheduled',
+                            _created: '2023-11-16T04:00:00+0000',
+                            _updated: '2023-11-16T04:00:00+0000',
+                            _etag: 'etag123',
                             'planning_date': '2018-10-15T04:30:00+0000',
+                            dates: {start: '2018-10-15T04:30:00+0000', end: '2018-10-15T04:30:00+0000'},
                             'coverages': [{
                                 'scheduled': '2018-10-16T04:00:00+0000',
                                 'planning_id': 'plan2',
-                                'coverage_id': 'coverage3'
+                                'coverage_id': 'coverage3',
+                                coverage_type: 'text',
+                                coverage_status: 'coverage intended',
+                                workflow_status: 'assigned',
                             }],
                         }
                     ]
                 }
             ];
 
-            const groupedItems = utils.groupItems(items, '2018-10-11', 'day');
+            const groupedItems = utils.groupItems(items, moment('2018-10-11'), undefined, 'day');
             const itemsById = keyBy(items, '_id');
-            const listItems = keyBy(utils.getListItems(groupedItems, itemsById), 'group');
+            const hiddenGroupsShown = {
+                '14-10-2018': true,
+                '15-10-2018': true,
+                '16-10-2018': true,
+            };
+            const listItems = keyBy(utils.getListItems(groupedItems, itemsById, hiddenGroupsShown), 'group');
 
             expect(groupedItems.hasOwnProperty('11-10-2018')).toBe(false);
             expect(groupedItems.hasOwnProperty('12-10-2018')).toBe(false);
@@ -185,17 +281,24 @@ describe('utils', () => {
             expect(listItems.hasOwnProperty('15-10-2018')).toBe(true);
             expect(listItems.hasOwnProperty('16-10-2018')).toBe(true);
             expect(listItems['14-10-2018']['_id']).toBe('foo');
-            expect(listItems['14-10-2018']['plan']['guid']).toBe('plan2');
-            expect(listItems['15-10-2018']['_id']).toBe('foo');
-            expect(listItems['15-10-2018']['plan']['guid']).toBe('plan2');
+            expect(listItems['14-10-2018']?.plan).toBe('plan1');
+            expect(listItems['15-10-2018']._id).toBe('foo');
+            expect(listItems['15-10-2018'].plan).toBe('plan1');
             expect(listItems['16-10-2018']['_id']).toBe('foo');
-            expect(listItems['16-10-2018']['plan']['guid']).toBe('plan2');
+            expect(listItems['16-10-2018']?.plan).toBe('plan2');
         });
 
         it('planning items without coverages associated with event are also displayed', () => {
-            const items = [
+            const items: Array<IAgendaItem> = [
                 {
                     _id: 'foo',
+                    guid: 'foo',
+                    type: 'agenda',
+                    item_type: 'event',
+                    state: 'scheduled',
+                    _created: '2023-11-16T04:00:00+0000',
+                    _updated: '2023-11-16T04:00:00+0000',
+                    _etag: 'etag123',
                     dates: {start: '2018-10-15T04:00:00+0000', end: '2018-10-15T05:00:00+0000', tz: 'Australia/Sydney'},
                     display_dates: [{date: '2018-10-14T04:00:00+0000'}],
                     event: {_id: 'foo'},
@@ -205,21 +308,97 @@ describe('utils', () => {
                             '_id': 'plan1',
                             'guid': 'plan1',
                             'planning_date': '2018-10-14T04:30:00+0000',
+                            dates: {start: '2018-10-14T04:30:00+0000', end: '2018-10-14T04:30:00+0000'},
+                            type: 'agenda',
+                            item_type: 'planning',
+                            state: 'scheduled',
+                            _created: '2023-11-16T04:00:00+0000',
+                            _updated: '2023-11-16T04:00:00+0000',
+                            _etag: 'etag123',
                         }
                     ]
                 }
             ];
 
-            const groupedItems = utils.groupItems(items, '2018-10-11', 'day');
+            const groupedItems = utils.groupItems(items, moment('2018-10-11'), undefined, 'day');
             const itemsById = keyBy(items, '_id');
-            const listItems = keyBy(utils.getListItems(groupedItems, itemsById), 'group');
+            const hiddenGroupsShown = {
+                '14-10-2018': true,
+                '15-10-2018': true,
+            };
+            const listItems = keyBy(utils.getListItems(groupedItems, itemsById, hiddenGroupsShown), 'group');
 
             expect(groupedItems.hasOwnProperty('11-10-2018')).toBe(false);
             expect(groupedItems.hasOwnProperty('12-10-2018')).toBe(false);
             expect(groupedItems.hasOwnProperty('13-10-2018')).toBe(false);
             expect(listItems.hasOwnProperty('14-10-2018')).toBe(true);
+            expect(listItems.hasOwnProperty('15-10-2018')).toBe(true);
             expect(listItems['14-10-2018']['_id']).toBe('foo');
-            expect(listItems['14-10-2018']['plan']['guid']).toBe('plan1');
+            expect(listItems['14-10-2018']?.plan).toBe('plan1');
+            expect(listItems['15-10-2018']['_id']).toBe('foo');
+            expect(listItems['15-10-2018']?.plan).toBe(undefined);
         });
     });
+
+    it('groupItems restricting groups to min and max dates', () => {
+        const items: Array<IAgendaItem> = [{
+            _id: 'event1',
+            guid: 'event1',
+            type: 'agenda',
+            item_type: 'event',
+            state: 'scheduled',
+            _created: '2023-11-16T04:00:00+0000',
+            _updated: '2023-11-16T04:00:00+0000',
+            _etag: 'etag123',
+            dates: {start: '2018-10-15T04:00:00+0000', end: '2018-10-15T05:00:00+0000', tz: 'Australia/Sydney'},
+            event: {_id: 'event1'},
+        }, {
+            _id: 'event2',
+            guid: 'event2',
+            type: 'agenda',
+            item_type: 'event',
+            state: 'scheduled',
+            _created: '2023-11-16T04:00:00+0000',
+            _updated: '2023-11-16T04:00:00+0000',
+            _etag: 'etag123',
+            dates: {start: '2018-10-16T04:00:00+0000', end: '2018-10-16T05:00:00+0000', tz: 'Australia/Sydney'},
+            event: {_id: 'event2'},
+        }, {
+            _id: 'event3',
+            guid: 'event3',
+            type: 'agenda',
+            item_type: 'event',
+            state: 'scheduled',
+            _created: '2023-11-16T04:00:00+0000',
+            _updated: '2023-11-16T04:00:00+0000',
+            _etag: 'etag123',
+            dates: {start: '2018-10-17T04:00:00+0000', end: '2018-10-17T05:00:00+0000', tz: 'Australia/Sydney'},
+            event: {_id: 'event3'},
+        }];
+
+        const getGroupedItems = (minDate: moment.Moment, maxDate?: moment.Moment) => keyBy(
+            utils.groupItems(items, minDate, maxDate, 'day', false),
+            'date'
+        );
+        let groupedItems = getGroupedItems(moment('2018-10-14'), moment('2018-10-18'));
+
+        expect(groupedItems['15-10-2018'].items).toEqual(['event1']);
+        expect(groupedItems['16-10-2018'].items).toEqual(['event2']);
+        expect(groupedItems['17-10-2018'].items).toEqual(['event3']);
+
+        groupedItems = getGroupedItems(moment('2018-10-14'), moment('2018-10-15'));
+        expect(groupedItems['15-10-2018'].items).toEqual(['event1']);
+        expect(groupedItems['16-10-2018']).toBeUndefined();
+        expect(groupedItems['17-10-2018']).toBeUndefined();
+
+        groupedItems = getGroupedItems(moment('2018-10-16'), moment('2018-10-18'));
+        expect(groupedItems['15-10-2018']).toBeUndefined();
+        expect(groupedItems['16-10-2018'].items).toEqual(['event2']);
+        expect(groupedItems['17-10-2018'].items).toEqual(['event3']);
+
+        groupedItems = getGroupedItems(moment('2018-10-16'));
+        expect(groupedItems['15-10-2018']).toBeUndefined();
+        expect(groupedItems['16-10-2018'].items).toEqual(['event2']);
+        expect(groupedItems['17-10-2018'].items).toEqual(['event3']);
+    });
 });
diff --git a/assets/agenda/utils.ts b/assets/agenda/utils.ts
index 535a5c8c8..fe2033aab 100644
--- a/assets/agenda/utils.ts
+++ b/assets/agenda/utils.ts
@@ -1,5 +1,7 @@
-import {get, isEmpty, includes, keyBy, sortBy, partition} from 'lodash';
+import {get, isEmpty, includes, keyBy, sortBy} from 'lodash';
 import moment from 'moment/moment';
+
+import {IAgendaItem, IAgendaListGroup, IAgendaListGroupItem, ICoverage, IUser} from 'interfaces';
 import {
     formatDate,
     formatMonth,
@@ -14,7 +16,6 @@ import {
     formatTime,
     DAY_IN_MINUTES,
 } from '../utils';
-import {IAgendaItem} from 'interfaces';
 
 export const STATUS_KILLED = 'killed';
 export const STATUS_CANCELED = 'cancelled';
@@ -156,8 +157,8 @@ export function isRescheduled(item: any) {
  * @param {Object} item
  * @return {Boolean}
  */
-export function hasCoverages(item: any) {
-    return !isEmpty(get(item, 'coverages'));
+export function hasCoverages(item: IAgendaItem): boolean {
+    return item.coverages?.[0]?.coverage_id != null;
 }
 
 /**
@@ -192,8 +193,8 @@ export function getCoverageDisplayName(coverageType: any) {
  * @param {String} userId
  * @return {Boolean}
  */
-export function isWatched(item: any, userId: any) {
-    return userId && includes(get(item, 'watches', []), userId);
+export function isWatched(item: IAgendaItem | ICoverage, userId?: IUser['_id']): boolean {
+    return userId != null && item.watches?.includes(userId) === true;
 }
 
 /**
@@ -203,8 +204,8 @@ export function isWatched(item: any, userId: any) {
  * @param {String} dateString
  * @return {Boolean}
  */
-export function isCoverageForExtraDay(coverage: any) {
-    return coverage.scheduled != null;
+export function isCoverageForExtraDay(coverage: ICoverage, dateString: string) {
+    return coverage.scheduled != null && formatDate(moment(coverage.scheduled)) === dateString;
 }
 
 /**
@@ -346,16 +347,13 @@ export function getDateInputDate(dateString: any) {
 
 /**
  * Return moment date
- *
- * @param {String} dateString
- * @return {String}
  */
-export function getMomentDate(dateString: any): any {
+export function getMomentDate(dateString?: number): moment.Moment {
     if (dateString) {
-        return moment(parseInt(dateString));
+        return moment(dateString);
     }
 
-    return '';
+    return moment();
 }
 
 /**
@@ -593,7 +591,7 @@ export function getHighlightedName(item: any) {
  * @param {Object} plan
  * @return {String}
  */
-export function getDescription(item: any, plan: any) {
+export function getDescription(item: IAgendaItem, plan?: IAgendaItem): string {
     return plan?.description_text || item?.definition_short || '';
 }
 
@@ -604,15 +602,14 @@ export function getDescription(item: any, plan: any) {
  * @param {Object} plan
  * @return {String}
  */
-export function getHighlightedDescription(item: any, plan: any) {
-
-    if (item.es_highlight.description_text) {
+export function getHighlightedDescription(item: IAgendaItem, plan?: IAgendaItem): string {
+    if (item.es_highlight?.description_text?.[0] != null) {
         return item.es_highlight.description_text[0];
     }
-    else if (item.es_highlight.definition_short) {
+    else if (item.es_highlight?.definition_short?.[0] != null) {
         return item.es_highlight.definition_short[0];
     }
-    else if (item.es_highlight.definition_long) {
+    else if (item.es_highlight?.definition_long?.[0] != null) {
         return item.es_highlight.definition_long[0];
     }
     else {
@@ -627,8 +624,8 @@ export function getHighlightedDescription(item: any, plan: any) {
  * @param {Object} item
  * @return {Array} list of dates
  */
-export function getExtraDates(item: any) {
-    return getDisplayDates(item).map((ed: any) => moment(ed.date));
+export function getExtraDates(item: IAgendaItem): Array<moment.Moment> {
+    return getDisplayDates(item).map((displayDate) => moment(displayDate.date));
 }
 
 /**
@@ -636,41 +633,43 @@ export function getExtraDates(item: any) {
  * @param item: Event or Planning item
  * @returns {Array.<{date: moment.Moment}>}
  */
-export function getDisplayDates(item: any) {
-    const matchedPlanning = get(item, '_hits.matched_planning_items');
-
-    if (matchedPlanning == null) {
-        return get(item, 'display_dates') || [];
+export function getDisplayDates(item: IAgendaItem): Array<{date: string}> {
+    if (item._hits == null || item._hits.matched_planning_items == null) {
+        return item.display_dates ?? [];
+    } else if (item.planning_items == null || item.planning_items.length === 0) {
+        return [];
     }
 
-    const dates: Array<any> = [];
-    const planningItems = get(item, 'planning_items') || [];
+    const dates: Array<{date: string}> = [];
     const planningIds = item._hits.matched_planning_items;
-    const coverageIds = get(item, '_hits.matched_coverages') != null ?
+    const coverageIds = item._hits.matched_coverages != null ?
         item._hits.matched_coverages :
-        (get(item, 'coverages') || []).map((coverage: any) => coverage.coverage_id);
+        (item.coverages ?? []).map((coverage) => coverage.coverage_id);
 
-    planningItems
-        .forEach((plan: any) => {
-            if (!planningIds.includes(plan._id)) {
-                return;
-            }
+    item.planning_items.forEach((plan) => {
+        if (!planningIds.includes(plan._id)) {
+            return;
+        }
 
-            const coverages = (get(plan, 'coverages') || []).filter((coverage: any) => coverage.scheduled);
+        const coverages = (plan.coverages ?? []).filter(
+            (coverage) => coverage.scheduled != null || coverage.planning?.scheduled != null
+        );
 
-            if (!coverages.length) {
+        if (!coverages.length) {
+            if (plan.planning_date != null) {
                 dates.push({date: plan.planning_date});
-                return;
             }
+            return;
+        }
 
-            coverages.forEach((coverage: any) => {
-                if (!coverageIds.includes(coverage.coverage_id)) {
-                    return;
-                }
+        coverages.forEach((coverage) => {
+            if (!coverageIds.includes(coverage.coverage_id)) {
+                return;
+            }
 
-                dates.push({date: coverage.planning.scheduled});
-            });
+            dates.push({date: coverage.scheduled ?? coverage.planning?.scheduled});
         });
+    });
 
     return dates;
 }
@@ -682,17 +681,25 @@ export function getDisplayDates(item: any) {
  * @param {Date} date to check (moment)
  * @return {Boolean}
  */
-export function containsExtraDate(item: any, dateToCheck: any) {
-    return getDisplayDates(item).map((ed: any) => moment(ed.date).format('YYYY-MM-DD')).includes(dateToCheck.format('YYYY-MM-DD'));
+export function containsExtraDate(item: IAgendaItem, dateToCheck: moment.Moment) {
+    return getDisplayDates(item)
+        .map((ed) => moment(ed.date).format('YYYY-MM-DD'))
+        .includes(dateToCheck.format('YYYY-MM-DD'));
 }
 
 // get start date in utc mode if there is no time info
-const getStartDate = (item: any) => item.dates.all_day ? moment.utc(item.dates.start) : moment(item.dates.start);
+export function getStartDate(item: IAgendaItem): moment.Moment {
+    return item.dates.all_day === true ?
+        moment.utc(item.dates.start) :
+        moment(item.dates.start);
+}
 
 // get end date in utc mode if there is no end time info
-const getEndDate = (item: any) => item.dates.no_end_time || item.dates.all_day ?
-    moment.utc(item.dates.end || item.dates.start) :
-    moment(item.dates.end || item.dates.start);
+export function getEndDate(item: IAgendaItem): moment.Moment {
+    return item.dates.no_end_time === true || item.dates.all_day === true ?
+        moment.utc(item.dates.end || item.dates.start) :
+        moment(item.dates.end || item.dates.start);
+}
 
 // compare days without being affected by timezone
 const isBetweenDay = (day: moment.Moment, start: moment.Moment, end: moment.Moment, allDay=false, noEndTime=false) => {
@@ -721,33 +728,47 @@ const isBetweenDay = (day: moment.Moment, start: moment.Moment, end: moment.Mome
  * @param activeDate: date that the grouping will start from
  * @param activeGrouping: type of grouping i.e. day, week, month
  */
-export function groupItems(items: any, activeDate: any, activeGrouping: any, featuredOnly?: any) {
-    const minStart = moment(activeDate).set({'h': 0, 'm': 0, 's': 0});
-    const groupedItems: any = {};
-    const grouper = Groupers[activeGrouping];
+export function groupItems(
+    items: Array<IAgendaItem>,
+    minDate: moment.Moment,
+    maxDate: moment.Moment | undefined,
+    activeGrouping: string,
+    featuredOnly?: boolean
+): Array<IAgendaListGroup> {
+    if (items.length === 0) {
+        return [];
+    }
+
+    const groupedItems: {[key: string]: Array<IAgendaItem>} = {};
+    const grouper: (dateString: moment.Moment) => string = Groupers[activeGrouping];
 
     items
         // Filter out items that didn't match any Planning items
-        .filter((item: any) => (
-            get(item, 'planning_items.length', 0) === 0 ||
-            get(item, '_hits.matched_planning_items') == null ||
-            get(item, '_hits.matched_planning_items.length', 0) > 0)
-        )
-        .forEach((item: any) => {
+        .filter((item) => (
+            (item.planning_items?.length ?? 0) === 0 ||
+            item._hits?.matched_planning_items == null ||
+            item._hits?.matched_planning_items.length > 0
+        ))
+        .forEach((item) => {
             const itemExtraDates = getExtraDates(item);
             const itemStartDate = getStartDate(item);
-            const start = item._display_from ? moment(item._display_from) :
-                moment.max(minStart, moment.min(itemExtraDates.concat([itemStartDate])));
+            const start = item._display_from != null ?
+                moment(item._display_from) :
+                moment.max(minDate, moment.min(itemExtraDates.concat([itemStartDate])));
             const itemEndDate = getEndDate(item);
+            const scheduleType = getScheduleType(item);
 
             // If item is an event and was actioned (postponed, rescheduled, cancelled only incase of multi-day event)
             // actioned_date is set. In this case, use that as the cut off date.
-            let end = get(item, 'event.actioned_date') ? moment(item.event.actioned_date) : null;
-            if (!end || !moment.isMoment(end)) {
-                end = item._display_to ? moment(item._display_to) :
+            let end = item.event?.actioned_date != null ?
+                moment(item.event.actioned_date) :
+                null;
+            if (end != null || !moment.isMoment(end)) {
+                end = item._display_to != null ?
+                    moment(item._display_to) :
                     moment.max(
                         itemExtraDates
-                            .concat([minStart])
+                            .concat([minDate])
                             // If event is all day the end timestamp is the same as
                             // start and depending on the local timezone offset it
                             // might not give enough room for the event to show up,
@@ -757,79 +778,111 @@ export function groupItems(items: any, activeDate: any, activeGrouping: any, fea
             }
 
             let key = null;
-            end = moment.min(end, start.clone().add(10, 'd')); // show each event for 10 days max not to destroy the UI
+            end = maxDate != null ?
+                moment.min(end, maxDate) :
+                moment.min(end, start.clone().add(10, 'd')); // show each event for 10 days max not to destroy the UI
 
             // use clone otherwise it would modify start and potentially also maxStart, moments are mutable
             for (const day = start.clone(); day.isSameOrBefore(end, 'day'); day.add(1, 'd')) {
                 const isBetween = isBetweenDay(day, itemStartDate, itemEndDate, item.dates.all_day, item.dates.no_end_time);
                 const containsExtra = containsExtraDate(item, day);
-                const addGroupItem = (item.event == null || get(item, '_hits.matched_planning_items') != null) ?
-                    containsExtra :
+                const addGroupItem: boolean = item.event == null || item._hits?.matched_planning_items != null ?
+                    containsExtra || (scheduleType === SCHEDULE_TYPE.MULTI_DAY && isBetween) :
                     isBetween || containsExtra;
 
                 if (grouper(day) !== key && addGroupItem) {
                     key = grouper(day);
-                    const groupList = groupedItems[key] || [];
-                    groupList.push(item);
-                    groupedItems[key] = groupList;
+                    if (groupedItems[key] == null) {
+                        groupedItems[key] = [];
+                    }
+                    groupedItems[key].push(item);
                 }
             }
         });
 
-    Object.keys(groupedItems).forEach((k: any) => {
-        if (featuredOnly) {
-            groupedItems[k] = groupedItems[k].map((i: any) => i._id);
-        } else {
-            const tbcPartitioned = partition(groupedItems[k], (i) => isItemTBC(i));
-            groupedItems[k] = [
-                ...tbcPartitioned[0],
-                ...tbcPartitioned[1],
-            ].map((i: any) => i._id);
-        }
-    });
+    const groupedItemIds: {[group: string]: {day: Array<IAgendaItem['_id']>, hiddenItems: Array<IAgendaItem['_id']>}} = {};
+    const sortDates: {[date: string]: moment.Moment} = {};
+
+    if (featuredOnly) {
+        Object.keys(groupedItems).forEach((dateString) => {
+            groupedItemIds[dateString] = {day: groupedItems[dateString].map((i) => i._id), hiddenItems: []};
+            sortDates[dateString] = moment(dateString, DATE_FORMAT);
+        });
+    } else {
+        Object.keys(groupedItems).forEach((dateString) => {
+            const itemsWithoutTime: Array<IAgendaItem['_id']> = [];
+            const itemsWithTime: Array<IAgendaItem['_id']> = [];
+            const hiddenItems: Array<IAgendaItem['_id']> = [];
+
+            groupedItems[dateString].forEach((groupItem) => {
+                const itemStartDateGroup: string = grouper(getStartDate(groupItem));
+
+                if (itemStartDateGroup !== dateString) {
+                    hiddenItems.push(groupItem._id);
+                } else if (isItemTBC(groupItem)) {
+                    itemsWithoutTime.push(groupItem._id);
+                } else {
+                    itemsWithTime.push(groupItem._id);
+                }
+            });
+
+            groupedItemIds[dateString] = {
+                day: [
+                    ...itemsWithoutTime,
+                    ...itemsWithTime,
+                ],
+                hiddenItems: hiddenItems,
+            };
+            sortDates[dateString] = moment(dateString, DATE_FORMAT);
+        });
+    }
 
     return sortBy(
-        Object.keys(groupedItems).map((k: any) => (
+        Object.keys(groupedItemIds).map((dateString) => (
             {
-                date: k,
-                items: groupedItems[k],
-                _sortDate: moment(k, DATE_FORMAT)
-            })),
-        (g: any) => g._sortDate);
+                date: dateString,
+                items: groupedItemIds[dateString].day,
+                hiddenItems: groupedItemIds[dateString].hiddenItems,
+            }
+        )),
+        (g) => sortDates[g.date]
+    );
 }
 
 /**
  * Get Planning Item for the day
- * @param item: Agenda item
- * @param group: Group Date
  */
-export function getPlanningItemsByGroup(item: any, group: any) {
-    const planningItems = get(item, 'planning_items') || [];
+export function getPlanningItemsByGroup(item: IAgendaItem, group: string): Array<IAgendaItem> {
+    const planningItems = item.planning_items || [];
 
     if (planningItems.length === 0) {
         return [];
     }
 
     // Planning item without coverages
-    const plansWithoutCoverages = planningItems.filter((p: any) =>
-        formatDate(p.planning_date) === group && get(p, 'coverages.length', 0) === 0);
+    const plansWithoutCoverages: Array<IAgendaItem> = planningItems.filter((planningItem) => (
+        formatDate(planningItem.planning_date) === group &&
+        (planningItem.coverages?.length ?? 0) === 0
+    ));
 
-    const allPlans = keyBy(planningItems, '_id');
-    const processed: any = {};
+    const allPlans: {[itemId: string]: IAgendaItem} = keyBy(planningItems, '_id');
+    const processed: {[itemId: string]: boolean} = {};
 
     // get unique plans for that group based on the coverage.
-    const plansWithCoverages = (item.coverages || [])
-        .map((coverage: any) => {
-            if (isCoverageForExtraDay(coverage)) {
-                if (!processed[coverage.planning_id]) {
-                    processed[coverage.planning_id] = 1;
-                    return allPlans[coverage.planning_id];
-                }
-                return null;
+    const plansWithCoverages: Array<IAgendaItem> = (item.coverages || [])
+        .filter((coverage) => {
+            if (isCoverageForExtraDay(coverage, group) === false) {
+                return false;
             }
-            return null;
+
+            if (processed[coverage.planning_id] !== true) {
+                processed[coverage.planning_id] = true;
+                return true;
+            }
+
+            return false;
         })
-        .filter((p: any) => p);
+        .map((coverage) => allPlans[coverage.planning_id]);
 
     return [...plansWithCoverages, ...plansWithoutCoverages];
 }
@@ -849,7 +902,7 @@ export function getCoveragesForDisplay(item: any, plan: any, group: any) {
     (get(item, 'coverages') || [])
         .forEach((coverage: any) => {
             if (!get(plan, 'guid') || coverage.planning_id === get(plan, 'guid')) {
-                if (isCoverageForExtraDay(coverage)) {
+                if (isCoverageForExtraDay(coverage, group)) {
                     currentCoverage.push(coverage);
                 } else if (isCoverageOnPreviousDay(coverage, group)) {
                     previousCoverage.push(coverage);
@@ -862,18 +915,26 @@ export function getCoveragesForDisplay(item: any, plan: any, group: any) {
     return {current: currentCoverage, previous: previousCoverage};
 }
 
-export function getListItems(groups: any, itemsById: any) {
-    const listItems: any = [];
+export function getListItems(
+    groups: Array<IAgendaListGroup>,
+    itemsById: {[itemId: string]: IAgendaItem},
+    hiddenGroupsShown: {[dateString: string]: boolean} = {}
+): Array<IAgendaListGroupItem> {
+    const listItems: Array<IAgendaListGroupItem> = [];
+
+    groups.forEach((group) => {
+        const items = hiddenGroupsShown[group.date] === true ?
+            [...group.hiddenItems, ...group.items] :
+            group.items;
+        items.forEach((itemId) => {
+            const plans = getPlanningItemsByGroup(itemsById[itemId], group.date);
 
-    groups.forEach((group: any) => {
-        group.items.forEach((_id: any) => {
-            const plans = getPlanningItemsByGroup(itemsById[_id], group.date);
             if (plans.length > 0) {
-                plans.forEach((plan: any) => {
-                    listItems.push({_id, group: group.date, plan});
+                plans.forEach((plan) => {
+                    listItems.push({_id: itemId, group: group.date, plan: plan._id});
                 });
             } else {
-                listItems.push({_id, group: group.date, plan: null});
+                listItems.push({_id: itemId, group: group.date, plan: undefined});
             }
         });
     });
@@ -906,9 +967,11 @@ export const groupRegions = (filter: any, aggregations: any, props: any) => {
 
 export const getRegionName = (key: any, locator: any) => locator.label || key;
 
-export const isItemTBC = (item: any) => (
-    !get(item, 'event') ? get(item, `planning_items[0].${TO_BE_CONFIRMED_FIELD}`) : get(item, `event.${TO_BE_CONFIRMED_FIELD}`)
-);
+export function isItemTBC(item: IAgendaItem): boolean {
+    return item.event != null ?
+        item.event._time_to_be_confirmed === true :
+        item.planning_items?.[0]?._time_to_be_confirmed === true;
+}
 
 
 /**
@@ -969,7 +1032,7 @@ export const getCoverageTooltip = (coverage: any, beingUpdated?: any) => {
     return gettext('{{ type }} coverage', {type: coverageType});
 };
 
-function getScheduleType(item: any) {
+function getScheduleType(item: IAgendaItem): string {
     const start = moment(item.dates.start);
     const end = moment(item.dates.end);
     const duration = end.diff(start, 'minutes');
@@ -1005,8 +1068,8 @@ function getScheduleType(item: any) {
  * @param {Object} options
  * @return {Array} [time string, date string]
  */
-export function formatAgendaDate(item: any, group: any, {localTimeZone = true, onlyDates = false}) {
-    const getFormattedTimezone = (date: any) => {
+export function formatAgendaDate(item: IAgendaItem, group?: string, {localTimeZone = true, onlyDates = false} = {}) {
+    function getFormattedTimezone(date: moment.Moment): string {
         const tzStr = date.format('z');
         if (tzStr.indexOf('+0') >= 0) {
             return tzStr.replace('+0', 'GMT+');
@@ -1017,7 +1080,7 @@ export function formatAgendaDate(item: any, group: any, {localTimeZone = true, o
         }
 
         return tzStr;
-    };
+    }
 
     const isTBCItem = isItemTBC(item);
     let start = parseDate(item.dates.start, item.dates.all_day);
@@ -1027,17 +1090,12 @@ export function formatAgendaDate(item: any, group: any, {localTimeZone = true, o
     const isGroupBetweenEventDates = dateGroup ?
         start.isSameOrBefore(dateGroup, 'day') && end.isSameOrAfter(dateGroup, 'day') : true;
 
-    if (!isGroupBetweenEventDates && hasCoverages(item)) {
+    if (group != null && !isGroupBetweenEventDates && hasCoverages(item)) {
         // we rendering for extra days
-        const scheduleDates = item.coverages
-            .map((coverage: any) => {
-                if (isCoverageForExtraDay(coverage)) {
-                    return coverage.scheduled;
-                }
-                return null;
-            })
-            .filter((d: any) => d)
-            .sort((a: any, b: any) => {
+        const scheduleDates = (item.coverages ?? [])
+            .filter((coverage) => isCoverageForExtraDay(coverage, group))
+            .map((coverage) => coverage.scheduled)
+            .sort((a, b) => {
                 if (a < b) return -1;
                 if (a > b) return 1;
                 return 0;
diff --git a/assets/am-news/components/AmNewsListItem.tsx b/assets/am-news/components/AmNewsListItem.tsx
index 50a1879a7..52faf3b26 100644
--- a/assets/am-news/components/AmNewsListItem.tsx
+++ b/assets/am-news/components/AmNewsListItem.tsx
@@ -92,7 +92,7 @@ class AmNewsListItem extends React.Component<any, any> {
             'time-label--stories': !isDataItem(item),
         });
         const picture = getPicture(item);
-        const thumbnailRendition = getThumbnailRendition(picture);
+        const thumbnailRendition = picture ? getThumbnailRendition(picture) : null;
 
 
         return (
diff --git a/assets/auth/firebase/change_password.ts b/assets/auth/firebase/change_password.ts
new file mode 100644
index 000000000..5e3ed01ce
--- /dev/null
+++ b/assets/auth/firebase/change_password.ts
@@ -0,0 +1,36 @@
+import {auth} from './init';
+import {signInWithEmailAndPassword, updatePassword, AuthError} from 'firebase/auth';
+
+declare const firebaseUserEmail : string;
+
+const form = document.getElementById('formChangePassword') as HTMLFormElement;
+const firebaseStatus = document.getElementById('firebase-status') as HTMLInputElement;
+
+if (form != null) {
+    form.onsubmit = (event) => {
+        event.preventDefault();
+
+        const data = new FormData(form);
+        const oldPassword = data.get('old_password') as string;
+        const newPassword = data.get('new_password') as string;
+        const newPassword2 = data.get('new_password2') as string;
+
+        if (newPassword !== newPassword2) {
+            form.submit();
+            return;
+        }
+
+        signInWithEmailAndPassword(auth, firebaseUserEmail, oldPassword).then((userCredential) => {
+            return updatePassword(userCredential.user, newPassword).then(() => {
+                firebaseStatus.value = 'OK';
+                form.submit();
+            });
+        }).catch((reason: AuthError) => {
+            firebaseStatus.value = reason.code;
+            form.submit();
+        });
+
+        return false;
+    };
+}
+
diff --git a/assets/auth/firebase/init.ts b/assets/auth/firebase/init.ts
new file mode 100644
index 000000000..00065cc49
--- /dev/null
+++ b/assets/auth/firebase/init.ts
@@ -0,0 +1,12 @@
+import {getAuth} from 'firebase/auth';
+import {initializeApp} from 'firebase/app';
+
+declare const firebaseConfig : {
+    apiKey: string;
+    authDomain: string;
+    projectId: string;
+    messagingSenderId: string;
+};
+
+export const app = initializeApp(firebaseConfig);
+export const auth = getAuth();
diff --git a/assets/auth/firebase/login.ts b/assets/auth/firebase/login.ts
new file mode 100644
index 000000000..04a672ebb
--- /dev/null
+++ b/assets/auth/firebase/login.ts
@@ -0,0 +1,52 @@
+import {auth} from './init';
+import {signInWithEmailAndPassword, signOut} from 'firebase/auth';
+
+const form = document.getElementById('formLogin') as HTMLFormElement;
+const params = new URLSearchParams(window.location.search);
+const firebaseStatus = document.getElementById('firebase-status') as HTMLInputElement;
+
+if (params.get('email')) {
+    form['email'].value = params.get('email');
+}
+
+const sendTokenToServer = (token: string) => {
+    window.location.replace(`/firebase_auth_token?token=${token}`);
+};
+
+// check firebase auth status
+auth.onAuthStateChanged((user) => {
+    if (user != null) { // there is a firebase user authenticated
+        if (params.get('user_error') === '1') { // but missing in newshub
+            return;
+        }
+
+        if (params.get('logout') === '1') { // force logout from firebase
+            signOut(auth);
+            return;
+        }
+
+        const tokenError = params.get('token_error');
+
+        user.getIdToken(tokenError === '1').then(sendTokenToServer);
+    }
+});
+
+// override submit form action to authenticate using firebase
+// and fallback to newshub when credentials are invalid
+form.onsubmit = (event) => {
+    event.preventDefault();
+
+    const data = new FormData(form);
+    const email = data.get('email') as string;
+    const password = data.get('password') as string;
+
+    signInWithEmailAndPassword(auth, email, password).then((userCredential) => {
+        userCredential.user.getIdToken().then(sendTokenToServer);
+    }, (reason) => {
+        // login via firebase didn't work out,
+        firebaseStatus.value = reason.code;
+        form.submit();
+    });
+
+    return false;
+};
diff --git a/assets/auth/firebase/reset_password.ts b/assets/auth/firebase/reset_password.ts
new file mode 100644
index 000000000..87d0bb01b
--- /dev/null
+++ b/assets/auth/firebase/reset_password.ts
@@ -0,0 +1,42 @@
+import {auth} from './init';
+import {sendPasswordResetEmail} from 'firebase/auth';
+
+declare const nextUrl: string;
+
+const form = document.getElementById('formToken') as HTMLFormElement;
+const url = new URL(nextUrl);
+const params = new URLSearchParams(url.search);
+const sendButton = document.getElementById('reset-password-btn') as HTMLButtonElement;
+
+if (sendButton != null) {
+    form.onsubmit = (event) => {
+        event.preventDefault();
+
+        if (sendButton.disabled) {
+            return false;
+        }
+
+        const data = new FormData(form);
+        const email = data.get('email') as string;
+
+        params.append('email', email);
+        url.search = params.toString();
+
+        sendButton.disabled = true;
+        sendPasswordResetEmail(auth, email, {url: url.toString()})
+            .then(() => {
+                form.submit();
+            })
+            .catch((reason) => {
+                if (reason.code === 'auth/user-not-found') {
+                    // User not registered with OAuth, try attempting normal password reset
+                    form.submit();
+                } else {
+                    console.error(reason);
+                    sendButton.disabled = false; // allow another request if there was an error
+                }
+            });
+
+        return false;
+    };
+}
\ No newline at end of file
diff --git a/assets/companies/components/EditCompany.tsx b/assets/companies/components/EditCompany.tsx
index dea3d04f9..f3fa4eb2d 100644
--- a/assets/companies/components/EditCompany.tsx
+++ b/assets/companies/components/EditCompany.tsx
@@ -200,7 +200,7 @@ class EditCompany extends React.Component<IProps, IState> {
                                 onChange={this.props.onChange}
                                 save={this.save}
                                 deleteCompany={this.deleteCompany}
-                                ssoEnabled={this.props.ssoEnabled && currentAuthProvider?.auth_type === 'saml'}
+                                ssoEnabled={this.props.ssoEnabled && currentAuthProvider?.auth_type !== 'password'}
                                 authProviders={this.props.authProviders}
                                 countries = {this.props.countries}
                             />
diff --git a/assets/components/CheckboxInput.tsx b/assets/components/CheckboxInput.tsx
index 859a53048..c1b25a7e5 100644
--- a/assets/components/CheckboxInput.tsx
+++ b/assets/components/CheckboxInput.tsx
@@ -2,8 +2,16 @@ import React from 'react';
 import classNames from 'classnames';
 import PropTypes from 'prop-types';
 
+interface IProps {
+    name?: string;
+    label: string;
+    readOnly?: boolean;
+    labelClass?: string;
+    value?: boolean;
+    onChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
+}
 
-function CheckboxInput({name, label, onChange, value, labelClass, readOnly}: any) {
+function CheckboxInput({name, label, onChange, value, labelClass, readOnly}: IProps) {
     if (!name) {
         name = `input-${label}`;
     }
diff --git a/assets/components/PersonalizeHomeModal.tsx b/assets/components/PersonalizeHomeModal.tsx
index 2e7a72ce8..214007c41 100644
--- a/assets/components/PersonalizeHomeModal.tsx
+++ b/assets/components/PersonalizeHomeModal.tsx
@@ -3,16 +3,15 @@ import React from 'react';
 import {connect} from 'react-redux';
 import {partition} from 'lodash';
 import {gettext} from 'utils';
+
+import {IUser, IUserDashboard, ITopic, IAgendaState} from 'interfaces';
 import Modal from 'components/Modal';
 import {Input} from 'reactstrap';
 import CheckboxInput from './CheckboxInput';
-import {IUser, IUserDashboard} from 'interfaces/user';
 import {RadioButtonGroup} from 'features/sections/SectionSwitch';
 import {modalFormInvalid, modalFormValid} from 'actions';
 import {updateUser} from 'users/actions';
 import {getCurrentUser} from 'company-admin/selectors';
-import {IAgendaState} from 'agenda/reducers';
-import {ITopic} from 'interfaces/topic';
 import {IPersonalizedDashboardsWithData} from 'home/reducers';
 import {searchIcon} from 'search/components/search-icon';
 
diff --git a/assets/components/TextInput.tsx b/assets/components/TextInput.tsx
index 96f510dd5..1517f9ca1 100644
--- a/assets/components/TextInput.tsx
+++ b/assets/components/TextInput.tsx
@@ -5,24 +5,45 @@ import InputWrapper from './InputWrapper';
 
 import {gettext} from 'utils';
 
+interface IProps {
+    type?: string;
+    name: string;
+    label?: string;
+    labelClasses? : string;
+    value?: string;
+    copyAction?: boolean;
+    error?: string[] | null;
+    required?: boolean;
+    maxLength?: number;
+    placeholder?: string;
+    description?: string;
+    min?: number;
+    autoFocus?: boolean;
+    readOnly?: boolean;
+    onChange?: React.ChangeEventHandler<HTMLInputElement>;
+    onKeyDown?: React.KeyboardEventHandler<HTMLInputElement>;
+    props?: {[key: string]: any};
+}
+
 function TextInput({
     type,
     name,
     label,
     labelClasses,
-    onChange,
     value,
     error,
     required,
     readOnly,
+    onChange,
     maxLength,
     placeholder,
     description,
     min,
     autoFocus,
     copyAction,
+    onKeyDown,
     ...props
-}: any) {
+}: IProps) {
     return (
         <InputWrapper error={error} name={name} testId={`field-${name}`}>
             {label && (
@@ -31,8 +52,11 @@ function TextInput({
             {copyAction &&
                 <button
                     className='icon-button'
-                    onClick={(e: any) => {e.preventDefault();navigator.clipboard.writeText(value);}}
                     title={gettext('Copy')}
+                    onClick={(e) => {
+                        e.preventDefault();
+                        navigator.clipboard.writeText(value || '');
+                    }}
                 >
                     <i className='icon--copy'></i>
                 </button>
@@ -45,13 +69,14 @@ function TextInput({
                     name={name}
                     className="form-control"
                     value={value}
-                    onChange={onChange}
+                    onChange={readOnly === true ? undefined : onChange}
                     required={required}
                     maxLength={maxLength}
                     disabled={readOnly}
                     placeholder={placeholder}
                     min={min}
                     autoFocus={autoFocus}
+                    onKeyDown={onKeyDown}
                     {...props}
                 />
                 {error && <div className="alert alert-danger">{error}</div>}
@@ -81,6 +106,4 @@ TextInput.propTypes = {
 
 TextInput.defaultProps = {autoFocus: false};
 
-const component: React.ComponentType<any> = TextInput;
-
-export default component;
+export default TextInput;
diff --git a/assets/components/TextListInput.tsx b/assets/components/TextListInput.tsx
index 9506ee77b..abf49536c 100644
--- a/assets/components/TextListInput.tsx
+++ b/assets/components/TextListInput.tsx
@@ -80,7 +80,7 @@ class TextListInput extends React.Component<any, any> {
                 {!readOnly && <TextInput
                     name={name}
                     onChange={this.inputChange}
-                    onKeyDown={(event: any) => {
+                    onKeyDown={(event) => {
                         if (event.keyCode === KEYCODES.ENTER ||
                             event.keyCode === KEYCODES.DOWN) {
                             event.preventDefault();
diff --git a/assets/components/cards/render/LargePictureTextCard.tsx b/assets/components/cards/render/LargePictureTextCard.tsx
index ba965ac4c..6603866c2 100644
--- a/assets/components/cards/render/LargePictureTextCard.tsx
+++ b/assets/components/cards/render/LargePictureTextCard.tsx
@@ -7,8 +7,8 @@ import CardBody from './CardBody';
 import CardRow from './CardRow';
 import {ICardProps} from '../utils';
 
-const getPictureTextPanel = (item: IArticle, picture: IArticle, openItem: any, cardId: string, listConfig: IListConfig) => {
-    const rendition = getThumbnailRendition(picture);
+const getPictureTextPanel = (item: IArticle, picture: IArticle | null, openItem: any, cardId: string, listConfig: IListConfig) => {
+    const rendition = picture ? getThumbnailRendition(picture) : null;
     const imageUrl = rendition && rendition.href;
     const caption = rendition && getCaption(picture);
 
diff --git a/assets/components/cards/render/MediaGalleryCard.tsx b/assets/components/cards/render/MediaGalleryCard.tsx
index b236b5e63..e6efd4dcc 100644
--- a/assets/components/cards/render/MediaGalleryCard.tsx
+++ b/assets/components/cards/render/MediaGalleryCard.tsx
@@ -7,8 +7,8 @@ import CardRow from './CardRow';
 import {Embargo} from '../../../wire/components/fields/Embargo';
 import {ICardProps} from '../utils';
 
-const getMediaPanel = (item: IArticle, picture: IArticle, openItem: any, cardId: string) => {
-    const rendition = getThumbnailRendition(picture);
+const getMediaPanel = (item: IArticle, picture: IArticle | null, openItem: any, cardId: string) => {
+    const rendition = picture ? getThumbnailRendition(picture) : null;
     const imageUrl = rendition && rendition.href;
     const caption = rendition && getCaption(picture);
 
diff --git a/assets/components/cards/render/PictureTextCard.tsx b/assets/components/cards/render/PictureTextCard.tsx
index 999c2278b..5c3752343 100644
--- a/assets/components/cards/render/PictureTextCard.tsx
+++ b/assets/components/cards/render/PictureTextCard.tsx
@@ -4,19 +4,27 @@ import CardBody from './CardBody';
 import CardFooter from './CardFooter';
 import CardRow from './CardRow';
 import {ICardProps} from '../utils';
+import {IArticle, IListConfig} from 'interfaces';
 
-const getPictureTextPanel = (item: any, picture: any, openItem: any, withPictures: any, cardId: any, listConfig: any) => {
-    const rendition = withPictures && getThumbnailRendition(picture);
+const getPictureTextPanel = (
+    item: IArticle,
+    picture: IArticle | null,
+    openItem: ICardProps['openItem'],
+    withPictures: boolean,
+    cardId: ICardProps['cardId'],
+    listConfig: IListConfig,
+) => {
+    const rendition = withPictures && picture != null && getThumbnailRendition(picture);
     const imageUrl = rendition && rendition.href;
     const caption = rendition && getCaption(picture);
 
     return (<div key={item._id} className="col-sm-6 col-lg-4 col-xl-3 d-flex mb-4">
         <div className="card card--home" onClick={() => openItem(item, cardId)}>
-            {rendition &&
+            {(rendition && imageUrl) ? (
                 <div className="card-img-top-wrapper card-img-top-wrapper--aspect-16-9">
                     <img className="card-img-top" src={imageUrl} alt={caption} />
                 </div>
-            }
+            ) : null}
             <CardBody item={item} displayMeta={false} listConfig={listConfig} />
             <CardFooter
                 item={item}
diff --git a/assets/components/cards/render/TopNewsOneByOneCard.tsx b/assets/components/cards/render/TopNewsOneByOneCard.tsx
index 6949800e9..e7a56396f 100644
--- a/assets/components/cards/render/TopNewsOneByOneCard.tsx
+++ b/assets/components/cards/render/TopNewsOneByOneCard.tsx
@@ -6,8 +6,8 @@ import CardMeta from './CardMeta';
 import {Embargo} from '../../../wire/components/fields/Embargo';
 import {ICardProps} from '../utils';
 
-const getTopNewsPanel = (item: IArticle, picture: IArticle, openItem: any, cardId: string, listConfig: IListConfig) => {
-    const rendition = getThumbnailRendition(picture, true);
+const getTopNewsPanel = (item: IArticle, picture: IArticle | null, openItem: any, cardId: string, listConfig: IListConfig) => {
+    const rendition = picture ? getThumbnailRendition(picture, true) : null;
     const imageUrl = rendition && rendition.href;
     const caption = rendition && getCaption(picture);
 
diff --git a/assets/components/cards/render/TopNewsTwoByTwoCard.tsx b/assets/components/cards/render/TopNewsTwoByTwoCard.tsx
index 51d24074b..27b93d0fd 100644
--- a/assets/components/cards/render/TopNewsTwoByTwoCard.tsx
+++ b/assets/components/cards/render/TopNewsTwoByTwoCard.tsx
@@ -11,8 +11,8 @@ import CardMeta from './CardMeta';
 import CardBody from './CardBody';
 import {Embargo} from '../../../wire/components/fields/Embargo';
 
-const getTopNewsLeftPanel = (item: IArticle, picture: IArticle, openItem: any, cardId: string, listConfig: IListConfig) => {
-    const rendition = getThumbnailRendition(picture, true);
+const getTopNewsLeftPanel = (item: IArticle, picture: IArticle | null, openItem: any, cardId: string, listConfig: IListConfig) => {
+    const rendition = picture ? getThumbnailRendition(picture, true) : null;
     const imageUrl = rendition && rendition.href;
     const caption = rendition && getCaption(picture);
 
@@ -39,8 +39,8 @@ const getTopNewsLeftPanel = (item: IArticle, picture: IArticle, openItem: any, c
     );
 };
 
-const getTopNewsRightPanel = (item: IArticle, picture: IArticle, openItem: any, cardId: string, listConfig?: IListConfig): any => {
-    const rendition = getThumbnailRendition(picture);
+const getTopNewsRightPanel = (item: IArticle, picture: IArticle | null, openItem: any, cardId: string, listConfig?: IListConfig): any => {
+    const rendition = picture ? getThumbnailRendition(picture) : null;
     const imageUrl = rendition && rendition.href;
     const caption = rendition && getCaption(picture);
 
diff --git a/assets/components/cards/utils.ts b/assets/components/cards/utils.ts
index 43f80034b..6789db0ed 100644
--- a/assets/components/cards/utils.ts
+++ b/assets/components/cards/utils.ts
@@ -1,6 +1,6 @@
 import {memoize} from 'lodash';
 
-import {IListConfig} from 'interfaces';
+import {IArticle, IListConfig} from 'interfaces';
 
 import ConfigEvent from 'components/cards/edit/ConfigEvent';
 import ConfigExternalMedia from 'components/cards/edit/ConfigExternalMedia';
@@ -41,7 +41,7 @@ export interface ICardProps {
     items: Array<any>;
     title: string;
     id: string;
-    openItem: any;
+    openItem: (item: IArticle, cardId: string) => void;
     isActive: boolean;
     cardId: string;
     listConfig: IListConfig;
diff --git a/assets/home/components/HomeApp.tsx b/assets/home/components/HomeApp.tsx
index 06fba82d2..d5e2f389f 100644
--- a/assets/home/components/HomeApp.tsx
+++ b/assets/home/components/HomeApp.tsx
@@ -1,7 +1,9 @@
 import React from 'react';
 import {connect} from 'react-redux';
-import {getConfig, gettext, isDisplayed, isMobilePhone} from 'utils';
 import {get} from 'lodash';
+
+import {ITopic, IItemAction} from 'interfaces';
+import {gettext, isDisplayed, isMobilePhone} from 'utils';
 import {getCard} from 'components/cards/utils';
 import getItemActions from 'wire/item-actions';
 import ItemDetails from 'wire/components/ItemDetails';
@@ -20,7 +22,6 @@ import {personalizeHome} from 'agenda/actions';
 import {RadioButtonGroup} from 'features/sections/SectionSwitch';
 import {getCurrentUser} from 'company-admin/selectors';
 import {IPersonalizedDashboardsWithData} from 'home/reducers';
-import {ITopic} from 'interfaces/topic';
 
 export const WIRE_SECTION = 'wire';
 
@@ -35,37 +36,40 @@ interface IState {
     activeOptionId: 'default' | 'my-home';
 }
 
-interface IProps {
+interface IStateProps {
     cards: Array<any>;
+    personalizedDashboards: Array<IPersonalizedDashboardsWithData>;
     itemsByCard: any;
     products: Array<any>;
     user: string;
     userType: string;
+    userSections: any;
     company: string;
-    format: Array<any>;
     itemToOpen: any;
-    personalizedDashboards: Array<IPersonalizedDashboardsWithData>;
     modal: any;
-    openItemDetails: () => void;
     activeCard: string;
-    actions: Array<{name: string; action: (action?: any) => void;}>;
-    fetchCardExternalItems: (cardId: string, cardLabel: string) => void;
-    personalizeHome: () => void;
-    fetchCompanyCardItems: () => void;
-    followStory: () => void;
     previewConfig: any;
     listConfig: any;
     detailsConfig: any;
-    downloadMedia: () => void;
     topics: Array<ITopic>;
-    isFollowing: boolean;
     isSearchEnabled: boolean;
     filterGroupLabels: any;
     currentUser: any;
+}
+
+interface IDispatchProps {
+    openItemDetails: (item: any, state: any) => void;
     fetchItems: () => any;
-    userSections: any;
+    personalizeHome: () => void;
+    actions: Array<IItemAction>;
+    fetchCardExternalItems: (cardId: string, cardLabel: string) => any;
+    fetchCompanyCardItems: () => any;
+    followStory: (item: any) => void;
+    downloadMedia: (href: any, id: any) => any;
 }
 
+type IProps = IStateProps & IDispatchProps;
+
 class HomeApp extends React.Component<IProps, IState> {
     static propTypes: any;
 
@@ -343,7 +347,7 @@ class HomeApp extends React.Component<IProps, IState> {
                         user={this.props.user}
                         topics={this.props.topics}
                         actions={this.filterActions(this.props.itemToOpen, this.props.previewConfig)}
-                        onClose={() => this.props.actions.filter((a: any) => a.id === 'open')[0].action(null)}
+                        onClose={() => this.props.actions.filter((a: any) => a.id === 'open')[0].action()}
                         followStory={this.props.followStory}
                         detailsConfig={this.props.detailsConfig}
                         filterGroupLabels={this.props.filterGroupLabels}
@@ -369,7 +373,7 @@ class HomeApp extends React.Component<IProps, IState> {
                         actions={this.filterActions(this.props.itemToOpen, this.props.previewConfig)}
                         followStory={this.props.followStory}
                         isFollowing={!!isFollowing}
-                        closePreview={() => this.props.actions.filter((a: any) => a.id === 'open')[0].action(null)}
+                        closePreview={() => this.props.actions.filter((a) => a.id === 'open')[0].action()}
                         previewConfig={this.props.previewConfig}
                         downloadMedia={this.props.downloadMedia}
                         listConfig={this.props.listConfig}
@@ -426,4 +430,9 @@ const mapDispatchToProps = (dispatch: any, state: any) => ({
 });
 
 
-export default connect(mapStateToProps, mapDispatchToProps)(HomeApp);
+export default connect<
+    IStateProps,
+    IDispatchProps,
+    {},
+    any
+>(mapStateToProps, mapDispatchToProps)(HomeApp);
diff --git a/assets/home/reducers.ts b/assets/home/reducers.ts
index 6d12a50ba..2020b591b 100644
--- a/assets/home/reducers.ts
+++ b/assets/home/reducers.ts
@@ -10,6 +10,7 @@ import {BOOKMARK_ITEMS, REMOVE_BOOKMARK} from '../wire/actions';
 import {CLOSE_MODAL, MODAL_FORM_VALID, RENDER_MODAL, SET_USER} from '../actions';
 import {modalReducer} from '../reducers';
 import {topicsReducer} from '../topics/reducer';
+import {IArticle} from 'interfaces';
 
 export interface IPersonalizedDashboardsWithData {
     dashboard_id?: string;
@@ -23,6 +24,7 @@ interface IState {
     topics: Array<any>;
     products: Array<any>;
     itemsByCard: any;
+    itemsById: {[_id: string]: IArticle};
     activeCard: any;
     uiConfig: any;
     userProducts: Array<any>;
@@ -34,6 +36,7 @@ const initialState: IState = {
     topics: [],
     products: [],
     itemsByCard: {},
+    itemsById: {},
     activeCard: null,
     uiConfig: {},
     userProducts: [],
@@ -106,8 +109,13 @@ export default function homeReducer(state: IState & any = initialState, action:
     }
 
     case SET_CARD_ITEMS: {
+        const itemsById = {...state.itemsById};
+
+        setItemsById(itemsById, action.payload.items);
+
         return {
             ...state,
+            itemsById,
             itemsByCard: {
                 ...state.itemsByCard,
                 [action.payload.card]: action.payload.items,
@@ -116,8 +124,15 @@ export default function homeReducer(state: IState & any = initialState, action:
     }
 
     case SET_MULTIPLE_CARD_ITEMS: {
+        const itemsById = {...state.itemsById};
+
+        for (const card in action.payload) {
+            setItemsById(itemsById, action.payload[card]);
+        }
+
         return {
             ...state,
+            itemsById,
             itemsByCard: {
                 ...state.itemsByCard,
                 ...action.payload,
@@ -134,3 +149,9 @@ export default function homeReducer(state: IState & any = initialState, action:
         return {...state, topics: topicsReducer(state.topics, action)};
     }
 }
+
+function setItemsById(itemsById: IState['itemsById'], items: Array<IArticle>) {
+    items.forEach((item: IArticle) => {
+        itemsById[item._id] = item;
+    });
+}
diff --git a/assets/interfaces/agenda.ts b/assets/interfaces/agenda.ts
index 997f6dda1..b9e3945ac 100644
--- a/assets/interfaces/agenda.ts
+++ b/assets/interfaces/agenda.ts
@@ -1,3 +1,13 @@
+import {AnyAction} from 'redux';
+import {ThunkAction, ThunkDispatch} from 'redux-thunk';
+import {IFilterGroup, IResourceItem, ISection} from './common';
+import {IAgendaUIConfig} from './configs';
+import {IUser, IUserType} from './user';
+import {ITopic, ITopicFolder} from './topic';
+import {ICompany} from './company';
+import {IArticle} from './content';
+import {ISearchState} from './search';
+
 interface IPhoneNumber {
     public: boolean;
     number: string;
@@ -36,12 +46,158 @@ export interface ILocation {
 }
 
 export interface IEvent {
+    _id: string;
     event_contact_info?: Array<IContact>;
     location?: Array<ILocation>;
+    actioned_date?: string;
+    _time_to_be_confirmed?: boolean;
+    files?: Array<string>;
+}
+
+export type ICoverageStatus = 'coverage intended' |
+    'coverage not planned' |
+    'coverage not intended' |
+    'coverage not decided' |
+    'coverage not decided yet' |
+    'coverage upon request';
+
+export type ICoverageWorkflowStatus = 'draft' |
+    'assigned' |
+    'active' |
+    'completed' |
+    'cancelled';
+
+export interface ICoverage {
+    planning_id: IAgendaItem['_id'];
+    coverage_id: IAgendaItem['_id'];
+    scheduled: string;
+    coverage_type: string;
+    planning?: {
+        scheduled: string;
+    };
+    watches?: Array<IUser['_id']>;
+    coverage_status: ICoverageStatus;
+    workflow_status: ICoverageWorkflowStatus;
 }
 
-export interface IAgendaItem {
-    type: 'event' | 'planning';
+export interface IAgendaItem extends IResourceItem {
+    guid: string;
+    type: 'agenda';
+    item_type: 'event' | 'planning';
     event?: IEvent;
     location?: IEvent['location'];
-}
\ No newline at end of file
+    version?: number | string;
+    plan?: IAgendaItem;
+    planning_items?: Array<IAgendaItem>;
+    _hits?: {
+        matched_planning_items?: Array<IAgendaItem['_id']>;
+        matched_coverages?: Array<ICoverage['coverage_id']>;
+    };
+    _display_from?: string;
+    _display_to?: string;
+    display_dates?: Array<{date: string}>;
+    dates: {
+        all_day?: boolean;
+        no_end_time?: boolean;
+        start: string;
+        end?: string;
+        tz?: string;
+    };
+    coverages?: Array<ICoverage>
+    planning_date?: string;
+    _time_to_be_confirmed?: boolean;
+    name?: string;
+    slugline?: string;
+    headline?: string;
+    description_text?: string;
+    definition_short?: string;
+    bookmarks?: Array<IUser['_id']>;
+    watches?: Array<IUser['_id']>;
+    es_highlight?: {[field: string]: Array<string>};
+    state: string;
+}
+
+export interface IAgendaListGroup {
+    date: string;
+    items: Array<IAgendaItem['_id']>;
+    hiddenItems: Array<IAgendaItem['_id']>;
+}
+
+export interface IAgendaListGroupItem {
+    _id: IAgendaItem['_id'];
+    group: IAgendaListGroup['date'];
+    plan?: IAgendaItem['_id'];
+}
+
+export interface IAgendaState {
+    items: Array<IAgendaItem['_id']>;
+    fetchFrom: number;
+    itemsById: {[itemId: string]: IAgendaItem};
+    listItems: {
+        groups: Array<IAgendaListGroup>;
+        hiddenGroupsShown: {[dateString: string]: boolean};
+    };
+    aggregations?: {[field: string]: any}; // Too complex to even bother
+    activeItem?: IAgendaListGroupItem;
+    previewItem?: IAgendaItem['_id'];
+    previewGroup?: string;
+    previewPlan?: IAgendaItem['_id'];
+    openItem?: IAgendaItem;
+    isLoading: boolean;
+    resultsFiltered: boolean;
+    totalItems: number;
+    activeQuery?: {[key: string]: any};
+    user: IUser['_id'];
+    userObject: IUser;
+    userFolders: Array<ITopicFolder>;
+    company?: ICompany['_id'];
+    companyFolders: Array<ITopicFolder>;
+    topics: Array<ITopic>;
+    selectedItems: Array<IAgendaItem['_id']>;
+    bookmarks: boolean;
+    context: 'agenda';
+    formats: Array<{
+        format: string;
+        name: string;
+    }>;
+    newItems: Array<IAgendaItem['_id']>;
+    newItemsByTopic: {[topidId: string]: Array<IAgendaItem>};
+    readItems: {[itemId: string]: number};
+    agenda: {
+        activeView: 'list-view' | 'list-view-compact';
+        activeDate: number;
+        activeGrouping: 'day'; // Week and month is partially supported in code, but never exposed in the UI
+        eventsOnlyAccess: boolean;
+        itemType?: 'events' | 'planning';
+        featuredOnly: boolean;
+        agendaWireItems: Array<IArticle>;
+    };
+    search: ISearchState;
+    detail: boolean;
+    userSections: {[sectionId: string]: ISection};
+    searchInitiated: boolean;
+    uiConfig: IAgendaUIConfig;
+    groups: Array<IFilterGroup>;
+    userType: IUserType;
+    hasAgendaFeaturedItems: boolean;
+    savedItemsCount: number;
+    locators?: {
+        _id: 'locators';
+        items: Array<{
+            name: string;
+            state?: string;
+            country?: string;
+            world_region?: string;
+        }>;
+    };
+    errors?: {[field: string]: Array<string>};
+}
+
+export type AgendaGetState = () => IAgendaState;
+export type AgendaThunkAction<ReturnType = void> = ThunkAction<
+    ReturnType,
+    IAgendaState,
+    unknown,
+    AnyAction
+>;
+export type AgendaThunkDispatch = ThunkDispatch<IAgendaState, unknown, AnyAction>;
diff --git a/assets/interfaces/common.ts b/assets/interfaces/common.ts
index 85e6858ff..c9d39ca95 100644
--- a/assets/interfaces/common.ts
+++ b/assets/interfaces/common.ts
@@ -1,3 +1,7 @@
+import {IUser} from './user';
+import {IArticle} from './content';
+import {IAgendaItem} from './agenda';
+
 export type TDatetime = string; // ISO8601 format
 
 export interface IFilterGroup {
@@ -24,4 +28,43 @@ export interface ICountry {
     text: string;
 }
 
-export type IListConfig = {[key: string]: string | number | boolean};
+interface IBaseAction {
+    _id?: string;
+    id: string;
+    name: string;
+    shortcut?: boolean;
+    icon?: string;
+    tooltip?: string;
+    visited?(user: IUser['_id'], item: IArticle | IAgendaItem): void;
+    when?(props: any, item: IArticle | IAgendaItem): boolean;
+}
+
+interface ISingleItemAction extends IBaseAction {
+    action(item?: IArticle | IAgendaItem, group?: string, plan?: IAgendaItem): void;
+}
+
+interface IMultiItemAction extends IBaseAction {
+    multi: true;
+    action(items?: Array<IArticle | IAgendaItem>): void;
+}
+
+export type IItemAction = ISingleItemAction | IMultiItemAction;
+
+export interface IResourceItem {
+    _id: string;
+    _created: string;
+    _updated: string;
+    _etag: string;
+    type: string;
+}
+
+export interface IRestApiResponse<T extends IResourceItem> {
+    _items: Array<T>;
+    _links: {};
+    _meta: {
+        max_results: number;
+        page: number;
+        total: number;
+    };
+    _aggregations: {[key: string]: any};
+}
diff --git a/assets/interfaces/configs.ts b/assets/interfaces/configs.ts
new file mode 100644
index 000000000..ac6fea118
--- /dev/null
+++ b/assets/interfaces/configs.ts
@@ -0,0 +1,81 @@
+
+export type IDisplayFieldsConfig = string |
+    '/' |
+    '//' |
+    {
+        field: string,
+        component?: string;
+        styles?: {[key: string]: string | number}
+    } |
+    Array<
+        string |
+        '/' |
+        '//' |
+        {
+            field: string,
+            component?: string;
+            styles?: {[key: string]: string | number}
+        }
+    >
+
+export interface IListConfig {
+    subject?: {
+        scheme?: Array<string> | string;
+    };
+    highlights?: {
+        urgency?: Array<string>;
+    };
+    metadata_fields?: Array<IDisplayFieldsConfig>;
+    compact_metadata_fields?: Array<IDisplayFieldsConfig>;
+    show_list_action_icons?: {
+        large?: boolean;
+        compact?: boolean;
+        mobile?: boolean;
+    };
+    abstract?: {displayed: boolean};
+    wordcount?: {displayed: boolean};
+    charcount?: {displayed: boolean};
+    slugline?: {displayed: boolean};
+    contacts?: {displayed: boolean};
+}
+
+export interface IPreviewConfig {
+    slugline?: {displayed: boolean};
+    abstract?: {displayed: boolean};
+    category?: {displayed: boolean};
+    subject?: {displayed: boolean};
+    authors?: {displayed: boolean};
+    byline?: {displayed: boolean};
+    located?: {displayed: boolean};
+    subjects?: {displayed: boolean};
+    metadata_fields?: Array<IDisplayFieldsConfig>;
+}
+
+interface IBaseUIConfig {
+    _id: string;
+    preview?: IPreviewConfig;
+    details?: IPreviewConfig;
+    list?: IListConfig;
+    advanced_search_tabs?: {[tabId: string]: boolean};
+    multi_select_topics?: boolean;
+    enable_global_topics?: boolean;
+}
+
+export interface IHomeUIConfig extends IBaseUIConfig {
+    _id: 'home';
+    search?: boolean;
+}
+
+export interface IWireUIConfig extends IBaseUIConfig {
+    _id: 'wire';
+}
+
+export interface IAgendaUIConfig extends IBaseUIConfig {
+    _id: 'agenda';
+    open_coverage_content_in_same_page?: boolean;
+    subnav?: {
+        filters?: Array<string>;
+    };
+}
+
+export type IUIConfig = IHomeUIConfig | IWireUIConfig | IAgendaUIConfig;
diff --git a/assets/interfaces/content.ts b/assets/interfaces/content.ts
index 15ff65a09..375568ae7 100644
--- a/assets/interfaces/content.ts
+++ b/assets/interfaces/content.ts
@@ -1,3 +1,4 @@
+import {IResourceItem} from './common';
 
 export type IContentType = 'text' | 'picture' | 'video' | 'audio';
 
@@ -9,15 +10,23 @@ export interface IRendition {
     height?: number;
 }
 
-export interface IArticle {
-    _id: string;
+export interface IArticle extends IResourceItem {
     guid: string;
     type: IContentType;
-    associations: {[key: string]: IArticle};
+    ancestors?: Array<IArticle['_id']>;
+    nextversion?: IArticle['_id'];
+    associations?: {[key: string]: IArticle | null};
     renditions?: {[key: string]: IRendition};
     slugline: string;
     headline: string;
     anpa_take_key?: string;
     source: string;
     versioncreated: string;
+    version?: number | string;
+    extra?: {
+        type?: 'transcript';
+        [key: string]: any;
+    };
+    es_highlight?: {[field: string]: Array<string>}
+    deleted?: boolean; // Used only in the front-end, populated by wire/reducer
 }
diff --git a/assets/interfaces/index.ts b/assets/interfaces/index.ts
index ecb07c9f8..a0be38c38 100644
--- a/assets/interfaces/index.ts
+++ b/assets/interfaces/index.ts
@@ -1,11 +1,25 @@
-export {TDatetime, IFilterGroup, ISection, ICountry, IListConfig} from './common';
+export {TDatetime, IFilterGroup, ISection, ICountry, IItemAction, IResourceItem, IRestApiResponse} from './common';
+export {IListConfig, IPreviewConfig, IDisplayFieldsConfig} from './configs';
 export {ICompany, ICompanyType, IAuthProvider, IService} from './company';
 export {IClientConfig} from './config';
 export {INavigation} from './navigation';
 export {ITopicNotificationScheduleType, ITopicFolder, ITopic, ISearchParams, ISearchFields} from './topic';
-export {IUserDashboard, IUser} from './user';
+export {IUserDashboard, IUser, IUserType} from './user';
 export {IDashboardCard} from './dashboard';
 export {IProduct} from './product';
 export {ISectionFilter} from './section_filter';
-export {IAgendaItem} from './agenda';
+export {
+    IAgendaItem,
+    IAgendaListGroup,
+    IAgendaListGroupItem,
+    IEvent,
+    ICoverage,
+    IAgendaState,
+    AgendaGetState,
+    AgendaThunkAction,
+    AgendaThunkDispatch,
+    ICoverageStatus,
+    ICoverageWorkflowStatus,
+} from './agenda';
 export {IArticle, IRendition, IContentType} from './content';
+export {ISearchState} from './search';
diff --git a/assets/interfaces/search.ts b/assets/interfaces/search.ts
new file mode 100644
index 000000000..1cba0a34d
--- /dev/null
+++ b/assets/interfaces/search.ts
@@ -0,0 +1,25 @@
+import {ITopic} from './topic';
+import {INavigation} from './navigation';
+import {IProduct} from './product';
+
+export interface ISearchState {
+    activeTopic?: ITopic['_id'];
+    activeNavigation?: Array<INavigation['_id']>;
+    activeQuery?: string;
+    activeSortQuery?: string;
+    activeFilter: {[key: string]: any};
+    createdFilter: {
+        from?: string;
+        to?: string;
+    };
+    productId?: IProduct['_id'];
+    navigations: Array<INavigation>;
+    products: Array<IProduct>;
+    activeView: 'list-view' | 'list-view-compact';
+    advanced: {
+        all: string;
+        any: string;
+        exclude: string;
+        fields: Array<string>;
+    };
+}
diff --git a/assets/interfaces/user.ts b/assets/interfaces/user.ts
index 232115fd9..092c4f31a 100644
--- a/assets/interfaces/user.ts
+++ b/assets/interfaces/user.ts
@@ -8,6 +8,8 @@ export interface IUserDashboard {
     topic_ids: Array<ITopic['_id']>;
 }
 
+export type IUserType = 'administrator' | 'internal' | 'public' | 'company_admin' | 'account_management';
+
 export interface IUser {
     _id: string;
     first_name: string;
@@ -19,7 +21,7 @@ export interface IUser {
     signup_details?: {[key: string]: any};
     country: string;
     company: ICompany['_id'];
-    user_type: 'administrator' | 'internal' | 'public' | 'company_admin' | 'account_management';
+    user_type: IUserType;
     is_validated?: boolean;
     is_enabled?: boolean;
     is_approved?: boolean;
@@ -44,3 +46,6 @@ export interface IUser {
         last_run_time?: TDatetime;
     };
 }
+
+type IUserProfileEditable = Pick<IUser, 'first_name' | 'last_name' | 'phone' | 'mobile' | 'role' | 'locale' | 'receive_email' | 'receive_app_notifications'>;
+export type IUserProfileUpdates = Partial<IUserProfileEditable>;
\ No newline at end of file
diff --git a/assets/item-actions.ts b/assets/item-actions.ts
index 941d875be..65a0679ff 100644
--- a/assets/item-actions.ts
+++ b/assets/item-actions.ts
@@ -1,6 +1,7 @@
+import {IItemAction} from 'interfaces';
 import {gettext, isActionEnabled} from './utils';
 
-export function getItemActions(dispatch: any, actions: any) {
+export function getItemActions(dispatch: any, actions: any): Array<IItemAction> {
     const {
         openItem,
         shareItems,
diff --git a/assets/layout/components/BaseApp.tsx b/assets/layout/components/BaseApp.tsx
index 296177717..71534519f 100644
--- a/assets/layout/components/BaseApp.tsx
+++ b/assets/layout/components/BaseApp.tsx
@@ -3,6 +3,8 @@ import PropTypes from 'prop-types';
 import {get} from 'lodash';
 import {createPortal} from 'react-dom';
 import {Tooltip} from 'bootstrap';
+
+import {IArticle, IAgendaItem, IListConfig, IPreviewConfig, IItemAction} from 'interfaces';
 import {isTouchDevice, gettext, isDisplayed, isMobilePhone} from 'utils';
 import {getSingleFilterValue} from 'search/utils';
 import {getFilterPanelOpenState, setFilterPanelOpenState} from 'local-store';
@@ -171,7 +173,15 @@ export default class BaseApp extends React.Component<any, any> {
         }
     }
 
-    filterActions(item: any, config?: any, includeCoverages: any = false) {
+    filterActions(
+        item?: IArticle | IAgendaItem,
+        config?: IListConfig | IPreviewConfig,
+        includeCoverages = false
+    ): Array<IItemAction> {
+        if (item == null) {
+            return [];
+        }
+
         return this.props.actions.filter((action: any) => (!config || isDisplayed(action.id, config)) &&
           (!action.when || action.when(this.props.state, item, includeCoverages)));
     }
diff --git a/assets/reducers.ts b/assets/reducers.ts
index 9d65bb4bc..06b5108b2 100644
--- a/assets/reducers.ts
+++ b/assets/reducers.ts
@@ -40,7 +40,14 @@ import {REMOVE_NEW_ITEMS, SET_NEW_ITEM} from './agenda/actions';
 import {SET_ERROR_MESSAGE, toggleValue} from 'utils';
 import {topicsReducer} from './topics/reducer';
 
-export function modalReducer(state?: any, action?: any): any {
+export interface IModalState {
+    modal: string;
+    data: any;
+    modalProps: any;
+    formValid?: boolean;
+}
+
+export function modalReducer(state?: IModalState, action?: any): IModalState | undefined {
     if (!action) {
         return state;
     }
@@ -54,19 +61,19 @@ export function modalReducer(state?: any, action?: any): any {
         };
 
     case CLOSE_MODAL:
-        return null;
+        return undefined;
 
     case MODAL_FORM_VALID:
-        return {
+        return state ? {
             ...state,
             formValid: true,
-        };
+        } : state;
 
     case MODAL_FORM_INVALID:
-        return {
+        return state ? {
             ...state,
             formValid: false,
-        };
+        } : state;
 
     default:
         return state;
@@ -354,7 +361,7 @@ export function defaultReducer(state: any = {}, action: any) {
     }
 
     case SET_NEW_ITEM: {
-        const item = state.data || {};
+        const item = action.data || {};
 
         if (!item.nextversion && !state.itemsById[item._id]) {
             return {
diff --git a/assets/search/components/SearchResultsBar/SearchResultTagList.tsx b/assets/search/components/SearchResultsBar/SearchResultTagList.tsx
index 30e9f177d..aeb102844 100644
--- a/assets/search/components/SearchResultsBar/SearchResultTagList.tsx
+++ b/assets/search/components/SearchResultsBar/SearchResultTagList.tsx
@@ -6,16 +6,18 @@ interface IProps {
     testId: string;
     title?: string;
     secondary?: boolean;
+    sticky?: boolean;
     tags?: React.ReactNode[];
     children?: React.ReactNode;
 }
 
-export function SearchResultTagList({testId, title, tags, children, secondary}: IProps) {
+export function SearchResultTagList({testId, title, tags, children, secondary, sticky}: IProps) {
     return (
         <li
             data-test-id={testId}
             className={classNames(
                 'search-result__tags-list-row',
+                {'search-result__tags-list-row--sticky': sticky},
                 {'search-result__tags-list-row--secondary': secondary}
             )}
         >
diff --git a/assets/search/components/SearchResultsBar/SearchResultsFiltersRow.tsx b/assets/search/components/SearchResultsBar/SearchResultsFiltersRow.tsx
index 6037e96be..9e91f1c8c 100644
--- a/assets/search/components/SearchResultsBar/SearchResultsFiltersRow.tsx
+++ b/assets/search/components/SearchResultsBar/SearchResultsFiltersRow.tsx
@@ -85,10 +85,15 @@ function SearchResultsFiltersRow({
                     <Tag
                         key={`tags-filters--${filter}`}
                         testId={`tags-filters--agenda-quick-filters-${filter}`}
-                        text={filter === 'coverage_status'
-                            ? getActiveFilterLabel(agendaCoverageStatusFilter, activeFilter)
-                            :  activeFilter?.[filter as IActiveFilterUnionType]
-                        }
+                        text={(() => {
+                            if (filter === 'coverage_status') {
+                                return getActiveFilterLabel(agendaCoverageStatusFilter, activeFilter);
+                            } else if (filter === 'location') {
+                                return  activeFilter?.[filter as IActiveFilterUnionType].name;
+                            } else {
+                                return activeFilter?.[filter as IActiveFilterUnionType];
+                            }
+                        })()}
                         readOnly={readonly}
                         onClick={(event) => {
                             event.preventDefault();
@@ -226,7 +231,7 @@ function SearchResultsFiltersRow({
 }
 
 const mapStateToProps = (state: any) => ({
-    itemTypeFilter: state.agenda.itemType,
+    itemTypeFilter: state.agenda?.itemType,
     activeFilter: searchFilterSelector(state),
 });
 
diff --git a/assets/search/components/SearchResultsBar/SearchResultsTopicRow.tsx b/assets/search/components/SearchResultsBar/SearchResultsTopicRow.tsx
index 862c4e937..2534b3c1a 100644
--- a/assets/search/components/SearchResultsBar/SearchResultsTopicRow.tsx
+++ b/assets/search/components/SearchResultsBar/SearchResultsTopicRow.tsx
@@ -85,6 +85,7 @@ export function SearchResultsTopicRow({
     return (
         <SearchResultTagList
             testId="search-results--topics"
+            sticky={true}
             title={tags.length ? gettext('Topic') : ''}
             tags={tags}
         >
diff --git a/assets/search/components/SearchResultsBar/index.tsx b/assets/search/components/SearchResultsBar/index.tsx
index 93c9bcccc..fc1ef087f 100644
--- a/assets/search/components/SearchResultsBar/index.tsx
+++ b/assets/search/components/SearchResultsBar/index.tsx
@@ -37,11 +37,11 @@ class SearchResultsBarComponent extends React.Component<any, any> {
         this.topicNotNull = new URLSearchParams(window.location.search).get('topic') != null;
         this.sortValues = [
             {
-                value: gettext('Date ↑'),
+                value: gettext('Newest first'),
                 sortFunction: () => this.setSortQuery('versioncreated:desc'),
             },
             {
-                value: gettext('Date ↓'),
+                value: gettext('Oldest first'),
                 sortFunction: () => this.setSortQuery('versioncreated:asc'),
             },
             {
diff --git a/assets/search/components/TopicsTab.tsx b/assets/search/components/TopicsTab.tsx
index 03356b121..a1c4cf84f 100644
--- a/assets/search/components/TopicsTab.tsx
+++ b/assets/search/components/TopicsTab.tsx
@@ -92,7 +92,7 @@ function TopicsTab({topics, loadMyTopic, newItemsByTopic, activeTopic, removeNew
 
     return (
         <div className="tab-pane__inner">
-            <div className="tab-content">
+            <div className="d-contents">
                 <CollapseBoxWithButton
                     id="my-topics"
                     buttonText={gettext('My Topics')}
diff --git a/assets/search/reducers.ts b/assets/search/reducers.ts
index 91b9bf85f..2700a5bc9 100644
--- a/assets/search/reducers.ts
+++ b/assets/search/reducers.ts
@@ -1,5 +1,6 @@
 import {get} from 'lodash';
 
+import {ISearchState} from 'interfaces';
 import {toggleValue} from 'utils';
 import {getAdvancedSearchFields} from './utils';
 
@@ -28,33 +29,14 @@ import {
 
 import {EXTENDED_VIEW} from 'wire/defaults';
 
-interface IInitialState {
-    activeTopic: any;
-    activeNavigation: any;
-    activeQuery: any;
-    activeSortQuery: any;
-    activeFilter: any;
-    createdFilter: any;
-    productId: any;
-    navigations: any;
-    products: any;
-    activeView: typeof EXTENDED_VIEW;
-    advanced: {
-        all: any;
-        any: any;
-        exclude: any;
-        fields: any;
-    };
-}
-
-const INITIAL_STATE: IInitialState = {
-    activeTopic: null,
+const INITIAL_STATE: ISearchState = {
+    activeTopic: undefined,
     activeNavigation: [],
     activeQuery: '',
     activeSortQuery: '',
     activeFilter: {},
     createdFilter: {},
-    productId: null,
+    productId: undefined,
 
     navigations: [],
     products: [],
@@ -69,7 +51,7 @@ const INITIAL_STATE: IInitialState = {
     },
 };
 
-export function searchReducer(state=INITIAL_STATE, action?: any, context?: any) : IInitialState {
+export function searchReducer(state=INITIAL_STATE, action?: any, context?: any) : ISearchState {
     if (!action) {
         state.advanced.fields = getAdvancedSearchFields(context);
 
diff --git a/assets/styles/agenda.scss b/assets/styles/agenda.scss
index 63065caf5..978b004a8 100644
--- a/assets/styles/agenda.scss
+++ b/assets/styles/agenda.scss
@@ -21,10 +21,40 @@
 .wire-column__main-header-container {
     position: relative;
     z-index: 1;
-    display: flex;
-    flex-direction: column;
     background-color: var(--main-header-color-bg);
     box-shadow: 0 3px 6px hsla(0, 0%, 0%, 0.1), 0 1px 0 hsla(0, 0%, 0%, 0.06);
-    gap: 1px;
+    gap: 0;
     flex-shrink: 0;
+    display: grid;
+    grid-template-rows: auto auto 1fr auto;
+    max-height: clamp(360px, 65svh, 65svh);
+    @include phone {
+        .search-result__tags-list {
+            border-bottom: 2px solid var(--main-header-color-bg);
+            padding-inline: var(--space--1);
+            .tags-list {
+                gap: var(--space--0-5);
+            }
+        }
+    }
+}
+
+// Grid Layout for the Search result elements inside the .wire-column__main-header-container
+
+.navbar--quick-filter {
+    grid-row: 1 / 2;
 }
+
+.navbar.navbar--search-results {
+    z-index: 1;
+    grid-row: 2 / 3;
+}
+
+.search-result__tags-list {
+    grid-row: 3 / 4;
+    overflow-y: auto;
+}
+
+.navbar--list-controls {
+    grid-row: 4 / 5;
+}
\ No newline at end of file
diff --git a/assets/styles/article-list.scss b/assets/styles/article-list.scss
index edff4e377..100ab558e 100644
--- a/assets/styles/article-list.scss
+++ b/assets/styles/article-list.scss
@@ -849,6 +849,10 @@ a.wire-articles__versions {
     gap: var(--space--1);
     .list-group-header__title-info {
         font-weight: 400;
+
+        @include phone {
+            display: none;
+        }
     }
 }
 
@@ -859,6 +863,9 @@ a.wire-articles__versions {
     padding-inline-end: var(--space--1);
     border-inline-end: 1px dotted var(--color-line--medium);
     margin-inline-start: var(--space--0-5);
+    @include phone {
+        display: none;
+    }
 }
 .list-group-header__coverage-item {
     display: flex;
@@ -884,7 +891,12 @@ a.wire-articles__versions {
         }
     }
 }
+.list-group-header__actions {
+    margin-inline-start: auto;
+}
+
 
+// MULTIDAY EVENT LABEL --------------------------- //
 .multiday-label {
     --colored-border-width: 10px;
     --multiday-label-height: 20px;
@@ -975,8 +987,4 @@ a.wire-articles__versions {
             border-block-end: calc(var(--multiday-label-height) / 2)  solid transparent;
         }
     }
-}
-
-.list-group-header__actions {
-    margin-inline-start: auto;
 }
\ No newline at end of file
diff --git a/assets/styles/custom-variables.scss b/assets/styles/custom-variables.scss
index 9267514be..5c5946010 100644
--- a/assets/styles/custom-variables.scss
+++ b/assets/styles/custom-variables.scss
@@ -2,6 +2,8 @@
 $gray-light: #c9c9c9;
 $gray-mid: #9a9a9a;
 $gray-dark: #747474;
+$cool-gray-dark: hsl(214, 13%, 34%);
+$cool-gray-mid: hsl(214, 13%, 48%);
 $background-color: var(--color-background);
 $main-blue: #007EAD;
 $mid-blue: #00658A;
@@ -194,8 +196,8 @@ $container-max-widths: (
     --color-line--x-strong:       var(--color-neutral-600);
 
     // CORE: SHADOW
-    --line-shadow-end--light: 0 1px 0 var(--color-line--light);
-    --line-shadow-start--light: 0 -1px 0 var(--color-line--light);
+    --line-shadow-end--light: 0 1px 0 var(--color-line--x-light);
+    --line-shadow-start--light: 0 -1px 0 var(--color-line--x-light);
     
     // CORE: SPACE
     --space--0:     0;
@@ -644,7 +646,7 @@ $container-max-widths: (
 
     // COMPONENT: SEARCH RESULT PANEL (Tags list)
     --search-result-tags-list-color-bg: var(--color-background--muted-2);
-    --search-result-tags-list-shadow-inner: inset 0 1px 2px hsla(0, 0%, 0%, 0.06), inset 0 -1px 2px hsla(0, 0%, 0%, 0.04);
+    --search-result-tags-list-shadow-inner: inset 0 1px 2px hsla(0, 0%, 0%, 0.08), inset 0 -1px 2px hsla(0, 0%, 0%, 0.06);
 
     // COMPONENT: MULTI-DAY LABEL
     --multiday-label-color-bg: hsl(89, 66%, 30%);
diff --git a/assets/styles/index.scss b/assets/styles/index.scss
index a41fffb76..7a96a8978 100644
--- a/assets/styles/index.scss
+++ b/assets/styles/index.scss
@@ -328,7 +328,7 @@ body.print {
 }
 
 .sidenav {
-    flex: 0 0 var(--sidenav-size-width);
+    flex: 0 0 var(--navbar-height--mobile);
     background-color: var(--sidenav-color-bg);
     position: relative;
     padding: 0 4px;
@@ -340,32 +340,28 @@ body.print {
     }
 
     @include phone {
-        padding: 0 2px;
-        flex: 0 0 var(--navbar-height--mobile);
+        padding: 0 2px;    
         overflow-y: hidden;
     }
+    @include md {
+        flex: 0 0 var(--sidenav-size-width);
+    }
 }
 
 .sidenav-icons {
-    padding: 0;
-    list-style-type: none;
-
-    // Default for tablet and pcs
     display: flex;
-    flex-direction: column;
+    flex-direction: row;
     margin: 0 auto;
-    overflow: visible;
+    gap: var(--space--0-5);
+    width: 100vw;
+    padding: 0;
+    list-style-type: none;
 
-    @include phone {
-        display: flex;
-        flex-direction: row;
-        overflow: auto;
-        gap: var(--space--0-5);
-        overflow-y: hidden;
-        width: 100vw;
-    }
     @include md {
         padding-block-start: var(--space--1);
+        flex-direction: column;
+        overflow: visible;
+        width: auto;
     }
 
 
@@ -393,17 +389,19 @@ body.print {
         a, span {
             border-radius: var(--sidenav-item-border-radius);
             text-decoration: none;
-            width: var(--sidenav-item-width);
-            min-height: var(--navbar-height);
+            width: 40px;
+            height: calc(var(--navbar-height--mobile) - var(--space--1));
+            min-height: auto;
             padding: 2px 0;
-            line-height: var(--navbar-height);
+            line-height: var(--navbar-height--mobile);
             text-align: center;
             background-color: var(--sidenav-color-item-bg);
-            @include phone {
-                width: 40px;
-                height: calc(var(--navbar-height--mobile) - var(--space--1));
-                line-height: var(--navbar-height--mobile);
-                min-height: auto;
+            
+            @include md {
+                width: var(--sidenav-item-width);
+                min-height: var(--navbar-height);
+                line-height: var(--navbar-height);
+                height: auto;
             }
             &:focus {
                 outline: none;
@@ -429,7 +427,7 @@ body.print {
             }
         }
         .sidenav-icons__item-title {
-            display: var(--sidenav-item-title-display);
+            display: none;
             color: var(--sidenav-color-item-fg);
             font-size: 10px;
             font-weight: 700;
@@ -438,8 +436,8 @@ body.print {
             text-transform: uppercase;
             overflow-wrap: break-word;
             align-self: stretch;
-            @include phone {
-                display: none;
+            @include md {
+                display: var(--sidenav-item-title-display);
             }
         }
         .badge {
@@ -559,10 +557,12 @@ body.print {
         display: flex;
         align-items: center;
         justify-content: center;
+        flex-direction: column;
         flex-grow: 0;
         flex-shrink: 0;
-        gap: calc(var(--separator-dot-size) * 1.5);
-        margin-block: var(--space--1-5);
+        gap: calc(var(--separator-dot-size) * 1);
+        margin-block: auto;
+        margin-inline: var(--space--0-5);
         .separator__dot {
             border-radius: var(--border-radius--full);
             display: block;
@@ -571,11 +571,10 @@ body.print {
             background-color: var(--separator-dot-color-bg);
             opacity: 0.4;
         }
-        @include phone {
-            flex-direction: column;
-            margin-block: auto;
-            margin-inline: var(--space--0-5);
-            gap: calc(var(--separator-dot-size) * 1);
+        @include md {
+            flex-direction: row;
+            margin-block: var(--space--1-5);
+            gap: calc(var(--separator-dot-size) * 1.5);
         }
 
     }
@@ -660,6 +659,10 @@ article.list {
     flex-grow: 1;
     overflow-y: auto;
     flex-direction: column;
+
+    @include md {
+        flex-direction: row;
+    }
 }
 .settings-inner {
     flex-direction: column;
@@ -1070,8 +1073,6 @@ article.list {
     }
 }
 
-
-
 .nh-collapsible-panel {
     padding: var(--space--1-5) 0;
     display: flex;
@@ -1124,16 +1125,18 @@ article.list {
     }
 
     .nh-collapsible-panel__content-wraper {
-        max-height: 800px;
-        transition: all 0.3s ease;
+        display: grid;
+        grid-template-rows: 0fr;
+        transition: grid-template-rows 0.2s ease;
     }
 
     .nh-collapsible-panel__content {
-        animation: fadeIn 0.3s ease-in 0s 1;
+        animation: fadeIn 0.5s ease-in 0s 1;
         display: flex;
         flex-direction: column;
         gap: var(--space--1);
         transition: all 0.3s ease;
+        overflow: hidden;
     }
 
     .nh-collapsible-panel__line {
@@ -1143,7 +1146,7 @@ article.list {
         background: var(--color-line--light);
     }
 
-    &--read-only {
+    &.nh-collapsible-panel--read-only {
         .nh-collapsible-panel__button {
             &:hover {
                 cursor: pointer;
@@ -1164,7 +1167,7 @@ article.list {
             }
         }
     }
-    &--small {
+    &.nh-collapsible-panel--small {
         .nh-collapsible-panel__header {
             .nh-collapsible-panel__title {
                 font-size: 1rem;
@@ -1181,19 +1184,21 @@ article.list {
             }
         }
     }
-    &--open {
+    &.nh-collapsible-panel--open {
+        
         .nh-collapsible-panel__caret {
             transform: rotate(90deg);
         }
         .nh-collapsible-panel__content {
-            animation: fadeIn 0.3s ease-in 0s 1;
+            animation: fadeIn 0.5s ease-in 0s 1;
             opacity: 1;
         }
         .nh-collapsible-panel__content-wraper {
             padding-block-start: var(--space--1-5);
+            grid-template-rows: 1fr;
         }
     }
-    &--closed {
+    &.nh-collapsible-panel--closed {
         .nh-collapsible-panel__header {
             margin-block-end: 0;
         }
@@ -1715,19 +1720,7 @@ article.list {
 .wire-column__nav--open {
     width: 100%;
     @include lg {
-        width: 240px;
-        .wire-column__nav__items .nav {
-            gap: var(--space--2);
-        }
-    }
-    @include xl {
-        width: 260px;
-    }
-    @include xxl {
         width: 320px;
-        .wire-column__nav__items .nav {
-            gap: var(--space--3);
-        }
     }
 }
 
@@ -2521,7 +2514,9 @@ article.list {
     inset-inline-start: 0;
     inset-inline-end: 0;
     z-index: 103;
-
+    @include sm {
+        inset-block-start: calc(var(--navbar-height--mobile) + var(--navbar-height));
+    }
     @include md {
         inset-block-start: var(--navbar-height);
         inset-inline-start: var(--sidenav-size-width);
@@ -3757,11 +3752,12 @@ article.list {
 .collapsible-box {
     display: grid;
     grid-template-columns: 1fr;
-    grid-template-rows: var(--collapsible-box-height) auto auto;
+    grid-template-rows: var(--collapsible-box-height) 0fr auto;
     border: 1px solid var(--collapsible-box-color-border);
     border-radius: var(--border-radius--s);
     overflow: hidden;
     background-color: var(--collapsible-box-color-bg);
+    transition: all var(--transition-base);
     &--active-within {
         border-color: var(--collapsible-box-color-border--active-within);
         box-shadow: var(--collapsible-box-shadow--active-within);
@@ -3798,8 +3794,6 @@ article.list {
 }
 .collapsible-box__content {
     grid-row: 2 / 3;
-    height: 0;
-    max-height: 0;
     overflow: hidden;
     opacity: 0;
     padding-block: 0;
@@ -3807,12 +3801,10 @@ article.list {
     transition: all var(--transition-base);
 }
 .collapsible-box--open {
+    grid-template-rows: var(--collapsible-box-height) 1fr auto;
     .collapsible-box__content {
-        height: auto;
-        overflow: auto;
         opacity: 1;
         padding-block: var(--space--1);
-        max-height: 800px;
     }
     .collapsible-box__header-caret {
         transform: rotate(-90deg);
diff --git a/assets/styles/labels.scss b/assets/styles/labels.scss
index 616d5436b..a35032085 100644
--- a/assets/styles/labels.scss
+++ b/assets/styles/labels.scss
@@ -9,7 +9,9 @@ $labels-palette: (
   red: $red,
   available: $green,
   restricted: var(--color-text--muted),
-  yellow: $yellow
+  yellow: $yellow,
+  gray-dark: $cool-gray-dark,
+  gray-mid: $cool-gray-mid,
 );
 
 /// Generates base styles for a label.
diff --git a/assets/styles/navbar.scss b/assets/styles/navbar.scss
index bc10dd937..007d8cf25 100644
--- a/assets/styles/navbar.scss
+++ b/assets/styles/navbar.scss
@@ -428,6 +428,9 @@
         padding-inline: 0;
         border-inline-start: none;
         opacity: 0.8;
+        .breadcrumb-sub-item {
+            display: none;
+        }
     }
     nav {
         display: flex;
diff --git a/assets/styles/search-results.scss b/assets/styles/search-results.scss
index ba366e57e..28f7ed6f0 100644
--- a/assets/styles/search-results.scss
+++ b/assets/styles/search-results.scss
@@ -73,6 +73,7 @@
     gap: var(--space--2);
     min-height: 56px;
     border-block-start: 1px dashed hsla(0, 0%, 20%, 0.2);
+    flex-shrink: 0;
     &:first-child {
         border: none;
     }
@@ -114,6 +115,13 @@
         flex-grow: 0;
         flex-shrink: 0;
     }
+    &.search-result__tags-list-row--sticky {
+        position: sticky;
+        inset-block-start: 0;
+        z-index: 1;
+        background-color: var(--search-result-tags-list-color-bg);
+        box-shadow: inset 0 1px 3px -2px hsla(0, 0%, 0%, 0.2);
+    }
 }
 .tags-list-row__button-group {
     display: flex;
diff --git a/assets/user-profile/actions.ts b/assets/user-profile/actions.ts
index 719735c04..7a6caadd5 100644
--- a/assets/user-profile/actions.ts
+++ b/assets/user-profile/actions.ts
@@ -7,6 +7,7 @@ import {store as userProfileStore} from './store';
 import {getLocale} from '../utils';
 import {reloadMyTopics as reloadMyAgendaTopics} from '../agenda/actions';
 import {reloadMyTopics as reloadMyWireTopics} from '../wire/actions';
+import {IUserProfileUpdates} from 'interfaces/user';
 
 export const GET_TOPICS = 'GET_TOPICS';
 export function getTopics(topics: any) {
@@ -19,8 +20,8 @@ export function getUser(user: any) {
 }
 
 export const EDIT_USER = 'EDIT_USER';
-export function editUser(event: any) {
-    return {type: EDIT_USER, event};
+export function editUser(payload: IUserProfileUpdates) {
+    return {type: EDIT_USER, payload};
 }
 
 export const INIT_DATA = 'INIT_DATA';
@@ -299,7 +300,7 @@ export function fetchFolders() {
         const userTopicsUrl = getFoldersUrl(state, false);
 
         return Promise.all([
-            state.company !== 'None' ? server.get(companyTopicsUrl).then(({_items}: {_items: Array<any>}) => _items) : Promise.resolve([]),
+            state.company ? server.get(companyTopicsUrl).then(({_items}: {_items: Array<any>}) => _items) : Promise.resolve([]),
             server.get(userTopicsUrl).then(({_items}: {_items: Array<any>}) => _items),
         ]).then(([companyFolders, userFolders]) => {
             dispatch({
diff --git a/assets/user-profile/components/profile/UserProfile.tsx b/assets/user-profile/components/profile/UserProfile.tsx
index d840bd56d..0bbe0dfa8 100644
--- a/assets/user-profile/components/profile/UserProfile.tsx
+++ b/assets/user-profile/components/profile/UserProfile.tsx
@@ -16,18 +16,21 @@ import {
     setError,
     openEditTopicNotificationsModal,
 } from '../../actions';
+import {IUserProfileState} from 'user-profile/reducers';
+import {IUserProfileUpdates} from 'interfaces/user';
 
 interface IProps {
     user: IUser;
-    errors: {[key: string]: string};
-    onChange(event: React.ChangeEvent): void;
+    errors: {[field in keyof IUserProfileUpdates]: string[]};
+    onChange(updates: IUserProfileUpdates): void;
     saveUser(): void;
     setError(errors: {[key: string]: string}): void;
     fetchUser(userId: IUser['_id']): void;
     openEditTopicNotificationsModal(): void;
+    authProviderFeatures: IUserProfileState['authProviderFeatures'];
 }
 
-class UserProfile extends React.Component<IProps, any> {
+class UserProfile extends React.PureComponent<IProps> {
     static propTypes: any;
     constructor(props: any) {
         super(props);
@@ -63,7 +66,7 @@ class UserProfile extends React.Component<IProps, any> {
     }
 
     render() {
-        const {user, onChange, errors} = this.props;
+        const {user, onChange, errors, authProviderFeatures} = this.props;
         const onCancel = () => this.props.fetchUser(this.props.user._id);
         const localeOptions = getLocaleInputOptions();
         return (
@@ -76,8 +79,8 @@ class UserProfile extends React.Component<IProps, any> {
                                     name='first_name'
                                     label={gettext('First Name')}
                                     value={user.first_name}
-                                    onChange={onChange}
-                                    error={errors ? errors.first_name : null} />
+                                    onChange={(event) => onChange({first_name: event.target.value})}
+                                    error={errors?.first_name} />
                             </div>
 
                             <div className="col-lg-6">
@@ -85,8 +88,8 @@ class UserProfile extends React.Component<IProps, any> {
                                     name='last_name'
                                     label={gettext('Last Name')}
                                     value={user.last_name}
-                                    onChange={onChange}
-                                    error={errors ? errors.last_name : null} />
+                                    onChange={(event) => onChange({last_name: event.target.value})}
+                                    error={errors?.last_name} />
                             </div>
 
                             <div className="col-lg-12">
@@ -98,13 +101,26 @@ class UserProfile extends React.Component<IProps, any> {
                                 />
                             </div>
 
+                            {authProviderFeatures?.change_password === true && (
+                                <div className="col-lg-12">
+                                    <div className="form-group">
+                                        <a
+                                            href="/change_password"
+                                            className="nh-button nh-button--small nh-button--tertiary"
+                                        >
+                                            {gettext('Change password')}
+                                        </a>
+                                    </div>
+                                </div>
+                            )}
+
                             <div className="col-lg-6">
                                 <TextInput
                                     name='phone'
                                     label={gettext('Phone')}
                                     value={user.phone}
-                                    onChange={onChange}
-                                    error={errors ? errors.phone : null} />
+                                    onChange={(event) => onChange({phone: event.target.value})}
+                                    error={errors?.phone} />
                             </div>
 
                             <div className="col-lg-6">
@@ -112,8 +128,8 @@ class UserProfile extends React.Component<IProps, any> {
                                     name='mobile'
                                     label={gettext('Mobile')}
                                     value={user.mobile}
-                                    onChange={onChange}
-                                    error={errors ? errors.mobile : null} />
+                                    onChange={(event) => onChange({mobile: event.target.value})}
+                                    error={errors?.mobile} />
                             </div>
 
                             <div className="col-lg-6">
@@ -121,8 +137,8 @@ class UserProfile extends React.Component<IProps, any> {
                                     name='role'
                                     label={gettext('Role')}
                                     value={user.role}
-                                    onChange={onChange}
-                                    error={errors ? errors.role : null} />
+                                    onChange={(event) => onChange({role: event.target.value})}
+                                    error={errors?.role} />
                             </div>
 
                             <div className="col-lg-12 mb-2">
@@ -130,7 +146,7 @@ class UserProfile extends React.Component<IProps, any> {
                                     name='receive_app_notifications'
                                     label={gettext('Receive App Notifications')}
                                     value={!!user.receive_app_notifications}
-                                    onChange={onChange}
+                                    onChange={(event) => onChange({receive_app_notifications: event.target.checked})}
                                 />
                             </div>
 
@@ -139,11 +155,10 @@ class UserProfile extends React.Component<IProps, any> {
                                     name='receive_email'
                                     label={gettext('Receive Email Notifications')}
                                     value={!!user.receive_email}
-                                    onChange={onChange}
+                                    onChange={(event) => onChange({receive_email: event.target.checked})}
                                 />
                             </div>
 
-
                             <div className="col-lg-6">
                                 <div className="nh-container nh-container--highlight mb-3 mt-3">
                                     <p className="nh-container__text--small">
@@ -174,7 +189,7 @@ class UserProfile extends React.Component<IProps, any> {
                                         name='locale'
                                         label={gettext('Language')}
                                         value={user.locale}
-                                        onChange={onChange}
+                                        onChange={(event) => onChange({locale: event.target.value})}
                                         options={localeOptions}
                                         defaultOption={getDefaultLocale()}
                                     />
@@ -202,15 +217,16 @@ class UserProfile extends React.Component<IProps, any> {
     }
 }
 
-const mapStateToProps = (state: any) => ({
+const mapStateToProps = (state: IUserProfileState) => ({
     user: state.editedUser,
     errors: state.errors ?? {},
+    authProviderFeatures: state.authProviderFeatures,
 });
 
 const mapDispatchToProps = (dispatch: any) => ({
     saveUser: () => dispatch(saveUser()),
     fetchUser: (userId: IUser['_id']) => dispatch(fetchUser(userId)),
-    onChange: (event: React.ChangeEvent) => dispatch(editUser(event)),
+    onChange: (updates: IUserProfileUpdates) => dispatch(editUser(updates)),
     setError: (errors: {[key: string]: string}) => dispatch(setError(errors)),
     openEditTopicNotificationsModal: () => dispatch(openEditTopicNotificationsModal()),
 });
diff --git a/assets/user-profile/reducers.ts b/assets/user-profile/reducers.ts
index ab449eda4..27afdad01 100644
--- a/assets/user-profile/reducers.ts
+++ b/assets/user-profile/reducers.ts
@@ -14,26 +14,48 @@ import {
     FOLDER_DELETED,
 } from './actions';
 
-import {RENDER_MODAL, CLOSE_MODAL, MODAL_FORM_VALID, MODAL_FORM_INVALID, ADD_EDIT_USERS} from 'actions';
-import {GET_COMPANY_USERS} from 'companies/actions';
-import {SET_USER_COMPANY_MONITORING_LIST} from 'monitoring/actions';
+import {RENDER_MODAL, CLOSE_MODAL, MODAL_FORM_VALID, MODAL_FORM_INVALID} from 'actions';
 
-import {modalReducer} from 'reducers';
+import {IModalState, modalReducer} from 'reducers';
 import {GET_NAVIGATIONS, QUERY_NAVIGATIONS} from 'navigations/actions';
 import {SET_TOPICS} from '../search/actions';
-import {ITopicFolder} from 'interfaces';
-
-export interface IUserProfileStore {
-    allSections?: Array<any>;
-    companySections?: any;
-    seats?: any;
+import {ISection, ITopic, ITopicFolder, IUser} from 'interfaces';
+
+export interface IUserProfileState {
+    user: IUser | null;
+    editedUser: Partial<IUser> | null;
+    company: string | null;
+    topics: ITopic[];
+    topicsById: {[_id: ITopic['_id']]: ITopic};
+    activeTopicId: ITopic['_id'] | null;
+    isLoading: boolean;
+    selectedMenu: 'profile' | 'topics' | 'events' | 'monitoring';
+    dropdown: boolean;
+    displayModal: boolean;
+    navigations: [];
+    selectedItem: ITopic | null;
+    editorFullscreen: boolean;
+    locators: [];
+    companyFolders: ITopicFolder[];
+    userFolders: ITopicFolder[];
+    authProviderFeatures?: {
+        change_password: boolean;
+        verify_password: boolean;
+    };
+    errors: {[key: string]: string[]} | null;
+    modal?: IModalState;
+    userSections?: ISection[];
+    monitoringList?: Array<any>;
+    monitoringAdministrator?: string;
+    uiConfigs?: any;
+    groups?: Array<any>;
 }
 
-const initialState: any = {
+const initialState: IUserProfileState = {
     user: null,
     editedUser: null,
     company: null,
-    topics: null,
+    topics: [],
     topicsById: {},
     activeTopicId: null,
     isLoading: false,
@@ -46,15 +68,15 @@ const initialState: any = {
     locators: [],
     companyFolders: [],
     userFolders: [],
+    errors: {},
 };
 
-export default function itemReducer(state: any = initialState, action: any): IUserProfileStore {
-    let newSelected, newState;
+export default function itemReducer(state: IUserProfileState = initialState, action: any): IUserProfileState {
     switch (action.type) {
 
     case GET_TOPICS: {
         const topicsById = Object.assign({}, state.topicsById);
-        const topics = action.topics.map((topic: any) => {
+        const topics = action.topics.map((topic: ITopic) => {
             topicsById[topic._id] = topic;
             return topic;
         });
@@ -98,11 +120,7 @@ export default function itemReducer(state: any = initialState, action: any): IUs
     }
 
     case EDIT_USER: {
-
-        const target = action.event.target;
-        const field = target.name;
-        const editedUser = Object.assign({}, state.editedUser);
-        editedUser[field] = target.type === 'checkbox' ? target.checked : target.value;
+        const editedUser = Object.assign({}, state.editedUser, action.payload);
         return {...state, editedUser, errors: null};
     }
 
@@ -119,6 +137,10 @@ export default function itemReducer(state: any = initialState, action: any): IUs
             monitoringAdministrator: action.data.monitoring_administrator,
             uiConfigs: action.data.ui_configs,
             groups: action.data.groups || [],
+            authProviderFeatures: {
+                verify_password: action.data.authProviderFeatures?.verify_password === true,
+                change_password: action.data.authProviderFeatures?.change_password === true,
+            },
         };
     }
 
@@ -176,33 +198,6 @@ export default function itemReducer(state: any = initialState, action: any): IUs
             editorFullscreen: action.payload,
         };
 
-    case GET_COMPANY_USERS:
-        return {...state, monitoringProfileUsers: action.data};
-
-    case SET_USER_COMPANY_MONITORING_LIST:
-        newSelected = state.selectedItem && (action.data || []).find((w: any) => w._id === state.selectedItem._id);
-        newState = {
-            ...state,
-            monitoringList: action.data,
-
-        };
-
-        if (newSelected) {
-            newState.selectedItem = newSelected;
-        }
-
-        return newState;
-
-    case ADD_EDIT_USERS: {
-        return {
-            ...state,
-            editUsers: [
-                ...(state.editUsers || []),
-                ...action.data,
-            ]
-        };
-    }
-
     case RECIEVE_FOLDERS:
         return {
             ...state,
diff --git a/assets/users/components/EditUser.tsx b/assets/users/components/EditUser.tsx
index d4db8549f..8bfc2d52c 100644
--- a/assets/users/components/EditUser.tsx
+++ b/assets/users/components/EditUser.tsx
@@ -29,7 +29,6 @@ import {getUserStateLabelDetails} from 'company-admin/components/CompanyUserList
 
 import {companyProductSeatsSelector, companySectionListSelector, sectionListSelector} from 'company-admin/selectors';
 import {IUser} from 'interfaces/user';
-import {IUserProfileStore} from 'user-profile/reducers';
 import ActionButton from 'components/ActionButton';
 
 const getCompanyOptions = (companies: Array<ICompany>) => companies.map((company) => ({value: company._id, text: company.name}));
@@ -40,7 +39,13 @@ interface IReduxStoreProps {
     seats: any;
 }
 
-interface IProps extends IReduxStoreProps {
+interface IUserProfileStore {
+    allSections?: Array<any>;
+    companySections?: any;
+    seats?: any;
+}
+
+interface IOwnProps {
     original: IUser;
     user: IUser;
 
@@ -62,6 +67,8 @@ interface IProps extends IReduxStoreProps {
     toolbar?: any;
 }
 
+type IProps = IReduxStoreProps & IOwnProps;
+
 const EditUserComponent: React.ComponentType<IProps> = (props: IProps) => {
     const {
         original,
@@ -303,7 +310,7 @@ const EditUserComponent: React.ComponentType<IProps> = (props: IProps) => {
                                     title={gettext('Products')}
                                     testId="toggle--products"
                                 >
-                                    {(() => {
+                                    {user.company != null ? (() => {
                                         if (productsFromSections.length < 1) {
                                             return (
                                                 <div>{gettext('No products available')}</div>
@@ -361,7 +368,11 @@ const EditUserComponent: React.ComponentType<IProps> = (props: IProps) => {
                                                 </>
                                             );
                                         }
-                                    })()}
+                                    })() : (
+                                        <div className='p-1'>
+                                            {gettext('If a company hasn\'t been selected, you can\'t select any products.')}
+                                        </div>
+                                    )}
                                 </FormToggle>
                             );
                         })()}
@@ -446,6 +457,6 @@ const mapStateToProps = (state: IUserProfileStore): IReduxStoreProps => ({
     seats: companyProductSeatsSelector(state),
 });
 
-const EditUser = connect<IReduxStoreProps>(mapStateToProps)(EditUserComponent);
+const EditUser = connect<IReduxStoreProps, {}, IOwnProps, IUserProfileStore>(mapStateToProps)(EditUserComponent);
 
 export default EditUser;
diff --git a/assets/utils.tsx b/assets/utils.tsx
index 7f6045498..0f6acd68f 100644
--- a/assets/utils.tsx
+++ b/assets/utils.tsx
@@ -3,9 +3,9 @@ import server from 'server';
 import analytics from 'analytics';
 import {get, isInteger, keyBy, isEmpty, cloneDeep, throttle, memoize} from 'lodash';
 import {Provider} from 'react-redux';
-import {createStore as _createStore, applyMiddleware, compose} from 'redux';
+import {createStore as _createStore, applyMiddleware, compose, Store, Middleware} from 'redux';
 import {createLogger} from 'redux-logger';
-import thunk from 'redux-thunk';
+import thunk, {ThunkAction} from 'redux-thunk';
 import {render as _render} from 'react-dom';
 import alertify from 'alertifyjs';
 import moment from 'moment-timezone';
@@ -90,10 +90,10 @@ export function assertNever(x: any): never {
  * @param {String} name
  * @return {Store}
  */
-export function createStore(reducer: any, name: any = 'default') {
+export function createStore<State = any>(reducer: any, name: any = 'default'): Store<State, any> {
     // https://redux.js.org/api-reference/compose
     let _compose = compose;
-    const middlewares = [
+    const middlewares: Array<Middleware> = [
         thunk
     ];
 
@@ -123,7 +123,7 @@ export function createStore(reducer: any, name: any = 'default') {
         }
     }
 
-    return _createStore(reducer, _compose(applyMiddleware(...middlewares)));
+    return _createStore<State, any, any, any>(reducer, _compose(applyMiddleware(...middlewares)));
 }
 
 /**
diff --git a/assets/wire/actions.ts b/assets/wire/actions.ts
index cffc1ce62..5a6a42e91 100644
--- a/assets/wire/actions.ts
+++ b/assets/wire/actions.ts
@@ -1,5 +1,6 @@
 import {get, isEmpty} from 'lodash';
 
+import {IArticle} from 'interfaces';
 import server from 'server';
 import analytics from 'analytics';
 
@@ -387,11 +388,9 @@ export function removeBookmarks(items: any) {
  * @param {Object} item
  * @return {Promise}
  */
-export function fetchVersions(item: any) {
-    return () => server.get(`/wire/${item._id}/versions`)
-        .then((data: any) => {
-            return data._items;
-        });
+export function fetchVersions(item: IArticle): Promise<Array<IArticle>> {
+    return server.get(`/wire/${item._id}/versions`)
+        .then((data: {_items: Array<IArticle>}) => (data._items));
 }
 
 /**
@@ -524,14 +523,12 @@ export function fetchNewItems() {
         .then((response: any) => dispatch(setNewItems(response)));
 }
 
-export function fetchNext(item: any) {
-    return () => {
-        if (!item.nextversion) {
-            return Promise.reject();
-        }
+export function fetchNext(item: IArticle): Promise<IArticle> {
+    if (item.nextversion == null) {
+        return Promise.reject();
+    }
 
-        return server.get(`/wire/${item.nextversion}?format=json`);
-    };
+    return server.get(`/wire/${item.nextversion}?format=json`);
 }
 
 export const TOGGLE_FILTER = 'TOGGLE_FILTER';
diff --git a/assets/wire/components/ListItemNextVersion.tsx b/assets/wire/components/ListItemNextVersion.tsx
index b4e3906be..6a7ef16bb 100644
--- a/assets/wire/components/ListItemNextVersion.tsx
+++ b/assets/wire/components/ListItemNextVersion.tsx
@@ -1,35 +1,59 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import {connect} from 'react-redux';
 
+import {IArticle} from 'interfaces';
 import {gettext} from 'utils';
+import {getVersionsLabelText} from 'wire/utils';
 import ItemVersion from './ItemVersion';
 import {fetchNext, openItem} from '../actions';
 
-class ListItemNextVersion extends React.Component<any, any> {
-    static propTypes: any;
-    constructor(props: any) {
+interface IOwnProps {
+    item: IArticle;
+    displayConfig: {[field: string]: boolean};
+}
+
+interface IState {
+    next: IArticle | null;
+}
+
+interface IDispatchProps {
+    openItem(item: IArticle): void;
+}
+
+type IProps = IDispatchProps & IOwnProps;
+
+const mapDispatchToProps = (dispatch: any) => ({
+    openItem: (item: IArticle) => dispatch(openItem(item)),
+});
+
+
+class ListItemNextVersion extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
         super(props);
         this.state = {next: null};
         this.open = this.open.bind(this);
-        this.fetch(props);
+        this.fetch();
     }
 
-    componentWillReceiveProps(nextProps: any) {
-        if (nextProps.item.nextversion !== this.props.item.nextversion) {
-            this.fetch(nextProps);
+    componentDidUpdate(prevProps: Readonly<IProps>) {
+        if (prevProps.item.nextversion !== this.props.item.nextversion) {
+            this.fetch();
         }
     }
 
-    fetch(props: any) {
-        props.dispatch(fetchNext(props.item))
-            .then((next: any) => this.setState({next}))
+    fetch() {
+        fetchNext(this.props.item)
+            .then((next) => this.setState({next}))
             .catch(() => this.setState({next: null}));
     }
 
-    open(version: any, event: any) {
+    open(version: IArticle, event: React.MouseEvent) {
+        if (this.state.next == null) {
+            return;
+        }
+
         event.stopPropagation();
-        this.props.dispatch(openItem(this.state.next));
+        this.props.openItem(this.state.next);
     }
 
     render() {
@@ -37,12 +61,13 @@ class ListItemNextVersion extends React.Component<any, any> {
             return null;
         }
 
+        const versionLabelText = getVersionsLabelText(this.props.item);
         const baseClass = 'wire-column__preview';
 
         return (
             <div className={`${baseClass}__versions`}>
                 <span className={`${baseClass}__versions__box-headline`}>
-                    {gettext('Next version')}
+                    {gettext('Next {{ versionsLabel }}', {versionsLabel: versionLabelText})}
                 </span>
 
                 <ItemVersion
@@ -56,12 +81,6 @@ class ListItemNextVersion extends React.Component<any, any> {
     }
 }
 
-ListItemNextVersion.propTypes = {
-    item: PropTypes.object.isRequired,
-    dispatch: PropTypes.func.isRequired,
-    displayConfig: PropTypes.object,
-};
-
-const component: React.ComponentType<any> = connect()(ListItemNextVersion);
+const component = connect(null, mapDispatchToProps)(ListItemNextVersion);
 
 export default component;
diff --git a/assets/wire/components/ListItemPreviousVersions.tsx b/assets/wire/components/ListItemPreviousVersions.tsx
index 55799e1f0..fd63eb5bc 100644
--- a/assets/wire/components/ListItemPreviousVersions.tsx
+++ b/assets/wire/components/ListItemPreviousVersions.tsx
@@ -1,40 +1,64 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import {connect} from 'react-redux';
 
+import {IArticle, IListConfig} from 'interfaces';
 import {gettext} from 'utils';
+import {getVersionsLabelText} from 'wire/utils';
 import {fetchVersions, openItem} from '../actions';
 
 import ItemVersion from './ItemVersion';
 
+interface IOwnProps {
+    item: IArticle;
+    isPreview: boolean;
+    inputId?: string;
+    displayConfig?: IListConfig;
+    matchedIds?: Array<IArticle['_id']>
+}
+
+interface IState {
+    versions: Array<IArticle>;
+    loading: boolean;
+    error: boolean;
+}
+
+interface IDispatchProps {
+    openItem(item: IArticle): void;
+}
+
+type IProps = IDispatchProps & IOwnProps;
+
+const mapDispatchToProps = (dispatch: any) => ({
+    openItem: (item: IArticle) => dispatch(openItem(item)),
+});
+
 
-class ListItemPreviousVersions extends React.Component<any, any> {
+class ListItemPreviousVersions extends React.Component<IProps, IState> {
     baseClass: string;
-    static propTypes: any;
-    static defaultProps: any;
+    static defaultProps = {matchedIds: []};
 
-    constructor(props: any) {
+    constructor(props: IProps) {
         super(props);
         this.state = {versions: [], loading: true, error: false};
         this.baseClass = this.props.isPreview ? 'wire-column__preview' : 'wire-articles';
         this.open = this.open.bind(this);
-        this.fetch(props);
+        this.fetch();
     }
 
-    componentWillReceiveProps(nextProps: any) {
-        if (nextProps.item._id !== this.props.item._id) {
-            this.fetch(nextProps);
+    componentDidUpdate(prevProps: Readonly<IProps>) {
+        if (prevProps.item._id !== this.props.item._id) {
+            this.fetch();
         }
     }
 
-    open(version: any, event: any) {
+    open(version: IArticle, event: React.MouseEvent) {
         event.stopPropagation();
-        this.props.dispatch(openItem(version));
+        this.props.openItem(version);
     }
 
-    fetch(props: any) {
-        props.dispatch(fetchVersions(props.item))
-            .then((versions: any) => this.setState({versions, loading: false}))
+    fetch() {
+        fetchVersions(this.props.item)
+            .then((versions) => this.setState({versions, loading: false}))
             .catch(() => this.setState({error: true}));
     }
 
@@ -47,6 +71,7 @@ class ListItemPreviousVersions extends React.Component<any, any> {
             );
         }
 
+        const versionLabelText = getVersionsLabelText(this.props.item, this.state.versions.length > 1);
         const versions = this.state.versions.map((version: any) => (
             <ItemVersion
                 key={version._id}
@@ -63,7 +88,9 @@ class ListItemPreviousVersions extends React.Component<any, any> {
             this.props.item.ancestors ?
                 <div className={this.baseClass + '__versions'} id={this.props.inputId}>
                     {this.props.isPreview && (
-                        <span className="wire-column__preview__versions__box-headline">{gettext('Previous versions')}</span>
+                        <span className="wire-column__preview__versions__box-headline">
+                            {gettext('Previous {{ versionsLabel }}', {versionsLabel: versionLabelText})}
+                        </span>
                     )}
                     {versions}
                 </div> : null
@@ -71,22 +98,6 @@ class ListItemPreviousVersions extends React.Component<any, any> {
     }
 }
 
-ListItemPreviousVersions.propTypes = {
-    item: PropTypes.shape({
-        _id: PropTypes.string,
-        ancestors: PropTypes.array,
-    }).isRequired,
-    isPreview: PropTypes.bool.isRequired,
-    dispatch: PropTypes.func,
-    inputId: PropTypes.string,
-    displayConfig: PropTypes.object,
-    matchedIds: PropTypes.array,
-};
-
-ListItemPreviousVersions.defaultProps = {
-    matchedIds: [],
-};
-
-const component: React.ComponentType<any> = connect()(ListItemPreviousVersions);
+const component = connect(null, mapDispatchToProps)(ListItemPreviousVersions);
 
 export default component;
diff --git a/assets/wire/components/WireListItem.tsx b/assets/wire/components/WireListItem.tsx
index eb055326f..53cb74688 100644
--- a/assets/wire/components/WireListItem.tsx
+++ b/assets/wire/components/WireListItem.tsx
@@ -1,24 +1,22 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import {get} from 'lodash';
 
+import {IArticle, IItemAction, IUser, IListConfig, IAgendaItem} from 'interfaces';
 import {
     gettext,
     wordCount,
     characterCount,
     LIST_ANIMATIONS,
     getSlugline,
-    getConfig,
 } from 'utils';
 import {
-    getFeatureMedia,
     getImageForList,
     showItemVersions,
     shortText,
     isKilled,
     getCaption,
     shortHighlightedtext,
+    getVersionsLabelText,
 } from 'wire/utils';
 
 import ActionButton from 'components/ActionButton';
@@ -31,49 +29,88 @@ import {Embargo} from './fields/Embargo';
 import {UrgencyItemBorder, UrgencyLabel} from './fields/UrgencyLabel';
 import {FieldComponents} from './fields';
 
-export const DISPLAY_WORD_COUNT = getConfig('display_word_count');
-export const DISPLAY_CHAR_COUNT = getConfig('display_char_count');
-
 const DEFAULT_META_FIELDS = ['source', 'charcount', 'versioncreated'];
 const DEFAULT_COMPACT_META_FIELDS = ['versioncreated'];
 
-function getShowVersionText(isExpanded: any, itemCount: any, matchCount: any, isExtended: any) {
+function getShowVersionText(
+    item: IArticle,
+    isExpanded: boolean,
+    itemCount: number,
+    matchCount: number,
+    isExtended: boolean
+): string {
+    const versionLabelText = getVersionsLabelText(item, itemCount > 1);
+
     if (isExpanded) {
         return (isExtended && matchCount) ?
             gettext(
-                'Hide previous versions ({{ count }}) - {{ matches }} matches',
+                'Hide previous {{ versionsLabel }} ({{ count }}) - {{ matches }} matches',
                 {
+                    versionsLabel: versionLabelText,
                     matches: matchCount,
                     count: itemCount,
                 }
             ) :
             gettext(
-                'Hide previous versions ({{ count }})',
-                {count: itemCount}
+                'Hide previous {{ versionsLabel }} ({{ count }})',
+                {
+                    versionsLabel: versionLabelText,
+                    count: itemCount,
+                }
             );
     } else {
         return (isExtended && matchCount) ?
             gettext(
-                'Show previous versions ({{ count }}) - {{ matches }} matches',
+                'Show previous {{ versionsLabel }} ({{ count }}) - {{ matches }} matches',
                 {
+                    versionsLabel: versionLabelText,
                     matches: matchCount,
                     count: itemCount,
                 }
             ) :
             gettext(
-                'Show previous versions ({{ count }})',
-                {count: itemCount}
+                'Show previous {{ versionsLabel }} ({{ count }})',
+                {
+                    versionsLabel: versionLabelText,
+                    count: itemCount,
+                }
             );
     }
 }
 
-class WireListItem extends React.Component<any, any> {
-    static propTypes: any;
-    static defaultProps: any;
-    wordCount: any;
-    characterCount: any;
-    dom: any;
-    constructor(props: any) {
+interface IProps {
+    item: IArticle;
+    isActive: boolean;
+    isSelected: boolean;
+    isRead: boolean;
+    showActions: boolean;
+    isExtended: boolean;
+    matchedIds: Array<IArticle['_id']>;
+    isSearchFiltered: boolean;
+    showShortcutActionIcons: boolean;
+    user: IUser['_id'];
+    context: string;
+    contextName: string;
+    listConfig: IListConfig;
+    filterGroupLabels: {[field: string]: string};
+    actions: Array<IItemAction>;
+    onClick(item: IArticle): void;
+    onDoubleClick(item: IArticle): void;
+    onActionList(event: React.MouseEvent, item: IArticle, group?: string, plan?: IAgendaItem): void;
+    toggleSelected(): void;
+}
+
+interface IState {
+    previousVersions: boolean;
+}
+
+class WireListItem extends React.Component<IProps, IState> {
+    static defaultProps = {matchedIds: []};
+    wordCount: number;
+    characterCount: number;
+    dom: {article: HTMLElement | null};
+
+    constructor(props: IProps) {
         super(props);
         this.wordCount = wordCount(props.item);
         this.characterCount = characterCount(props.item);
@@ -84,7 +121,7 @@ class WireListItem extends React.Component<any, any> {
         this.dom = {article: null};
     }
 
-    onKeyDown(event: any) {
+    onKeyDown(event: React.KeyboardEvent) {
         switch (event.key) {
         case ' ': // on space toggle selected item
             this.props.toggleSelected();
@@ -97,7 +134,7 @@ class WireListItem extends React.Component<any, any> {
         event.preventDefault();
     }
 
-    togglePreviousVersions(event: any) {
+    togglePreviousVersions(event: React.MouseEvent) {
         event.stopPropagation();
         this.setState({previousVersions: !this.state.previousVersions});
     }
@@ -108,7 +145,7 @@ class WireListItem extends React.Component<any, any> {
         }
     }
 
-    stopPropagation(event: any) {
+    stopPropagation(event: React.MouseEvent) {
         event.stopPropagation();
     }
 
@@ -121,7 +158,7 @@ class WireListItem extends React.Component<any, any> {
             listConfig,
         } = this.props;
 
-        if (get(this.props, 'item.deleted')) {
+        if (this.props.item.deleted === true) {
             return (
                 <WireListItemDeleted
                     item={this.props.item}
@@ -160,6 +197,8 @@ class WireListItem extends React.Component<any, any> {
                 onClick={() => onClick(item)}
                 onDoubleClick={() => onDoubleClick(item)}
                 onKeyDown={this.onKeyDown}
+                data-test-id="wire-item"
+                data-test-value={item._id}
             >
                 <UrgencyItemBorder item={item} listConfig={listConfig} />
                 <div className={wrapClassName} tabIndex={0}>
@@ -280,8 +319,9 @@ class WireListItem extends React.Component<any, any> {
                                     onClick={this.togglePreviousVersions}
                                 >
                                     {getShowVersionText(
+                                        this.props.item,
                                         this.state.previousVersions,
-                                        item.ancestors.length,
+                                        item.ancestors?.length ?? 0,
                                         matchedAncestors.length,
                                         isExtended
                                     )}
@@ -349,35 +389,4 @@ class WireListItem extends React.Component<any, any> {
     }
 }
 
-WireListItem.propTypes = {
-    item: PropTypes.object.isRequired,
-    isActive: PropTypes.bool.isRequired,
-    isSelected: PropTypes.bool.isRequired,
-    isRead: PropTypes.bool.isRequired,
-    onClick: PropTypes.func.isRequired,
-    onDoubleClick: PropTypes.func.isRequired,
-    onActionList: PropTypes.func.isRequired,
-    showActions: PropTypes.bool.isRequired,
-    toggleSelected: PropTypes.func.isRequired,
-    actions: PropTypes.arrayOf(
-        PropTypes.shape({
-            name: PropTypes.string,
-            action: PropTypes.func,
-        })
-    ),
-    isExtended: PropTypes.bool.isRequired,
-    user: PropTypes.string,
-    context: PropTypes.string,
-    contextName: PropTypes.string,
-    listConfig: PropTypes.object,
-    matchedIds: PropTypes.array,
-    isSearchFiltered: PropTypes.bool,
-    showShortcutActionIcons: PropTypes.bool,
-    filterGroupLabels: PropTypes.object,
-};
-
-WireListItem.defaultProps = {
-    matchedIds: [],
-};
-
 export default WireListItem;
diff --git a/assets/wire/components/fields/PreviousVersions.tsx b/assets/wire/components/fields/PreviousVersions.tsx
index f281fa9a9..e7064dca0 100644
--- a/assets/wire/components/fields/PreviousVersions.tsx
+++ b/assets/wire/components/fields/PreviousVersions.tsx
@@ -1,8 +1,16 @@
 import React from 'react';
-import PropTypes from 'prop-types';
+
+import {IArticle} from 'interfaces';
 import {gettext} from 'utils';
+import {getVersionsLabelText} from 'wire/utils';
+
+interface IProps {
+    item: IArticle;
+    isItemDetail: boolean;
+    inputRef: string;
+}
 
-export function PreviousVersions ({item, isItemDetail, inputRef}: any) {
+export function PreviousVersions({item, isItemDetail, inputRef}: IProps) {
     if (isItemDetail) {
         return null;
     }
@@ -11,23 +19,17 @@ export function PreviousVersions ({item, isItemDetail, inputRef}: any) {
         const previousVersions = document.getElementById(inputRef);
         previousVersions && previousVersions.scrollIntoView();
     };
+    const numVersions = item.ancestors?.length ?? 0;
+    const versionLabelText = getVersionsLabelText(item, numVersions === 0 || numVersions > 1);
 
     return (
         <span>
             <div className="versions-link" onClick={onClick}>
-                {gettext('{{ count }} previous versions', {
-                    count: item.ancestors
-                        ? item.ancestors.length
-                        : '0',
+                {gettext('{{ count }} previous {{ versionsLabel }}', {
+                    count: numVersions,
+                    versionsLabel: versionLabelText,
                 })}
             </div>
         </span>
     );
 }
-
-
-PreviousVersions.propTypes = {
-    isItemDetail: PropTypes.bool,
-    item: PropTypes.object,
-    inputRef: PropTypes.string,
-};
diff --git a/assets/wire/components/filters/FilterGroup.tsx b/assets/wire/components/filters/FilterGroup.tsx
index b0844171f..06b704d34 100644
--- a/assets/wire/components/filters/FilterGroup.tsx
+++ b/assets/wire/components/filters/FilterGroup.tsx
@@ -8,6 +8,11 @@ import FilterItem from './FilterItem';
 import {WithPagination} from 'components/pagination/WithPagination';
 import {searchIcon} from 'search/components/search-icon';
 
+/**
+ * If the filter count is less than 50 we
+ * shouldn't render the search.
+ */
+const SEARCHBAR_THRESHOLD = 50;
 const LIMIT = 5;
 type IBucket = {key: string, doc_count: string};
 
@@ -70,16 +75,17 @@ export default function FilterGroup({group, activeFilter, aggregations, toggleFi
     const activeBuckets: Array<any> = (get(activeFilter, group.field) || [])
         .map((filter: any) => ({key: filter}));
     const bucketPath: string = get(group, 'agg_path') || `${group.field}.buckets`;
-    const buckets = uniqBy(
+    const allBuckets = uniqBy(
         cloneDeep(get(aggregations, bucketPath) || group.buckets || []).concat(activeBuckets) as Array<IBucket>,
         'key',
-    )
+    );
+    const bucketsBySearchTerm = allBuckets
         .sort(compareFunction)
         .filter(({key}: any) => searchTerm.length > 0 ? key.toString().toLocaleLowerCase().includes(searchTerm) : true);
 
     return (
         <NavGroup key={group.field} label={group.label}>
-            {buckets.length > 50 && (
+            {allBuckets.length > SEARCHBAR_THRESHOLD && (
                 <div className="mb-2 search search--small search--with-icon search--bordered m-0">
                     <div className="search__form" role="search" aria-label="search">
                         <i className="icon--search icon--muted-2"></i>
@@ -110,8 +116,8 @@ export default function FilterGroup({group, activeFilter, aggregations, toggleFi
                     const step = pageNo === 1 ? 0 : (pageNo - 1) * pageSize;
 
                     return Promise.resolve({
-                        itemCount: buckets?.length ?? 0,
-                        items: (buckets ?? []).slice(step, pageSize + step),
+                        itemCount: bucketsBySearchTerm?.length ?? 0,
+                        items: (bucketsBySearchTerm ?? []).slice(step, pageSize + step),
                     });
                 }}
             >
diff --git a/assets/wire/components/filters/FilterItem.tsx b/assets/wire/components/filters/FilterItem.tsx
index 4d4310851..ec9802be4 100644
--- a/assets/wire/components/filters/FilterItem.tsx
+++ b/assets/wire/components/filters/FilterItem.tsx
@@ -5,7 +5,7 @@ export default function FilterItem({bucket, group, toggleFilter, groupFilter}: a
     const isActive = groupFilter.indexOf(bucket.key) !== -1;
 
     return (
-        <div className="form-check">
+        <div className="form-check" data-test-id="filter" data-test-value={bucket.key}>
             <input
                 type="checkbox"
                 className="form-check-input"
diff --git a/assets/wire/components/filters/FiltersTab.tsx b/assets/wire/components/filters/FiltersTab.tsx
index 4a5e45d61..e480b285c 100644
--- a/assets/wire/components/filters/FiltersTab.tsx
+++ b/assets/wire/components/filters/FiltersTab.tsx
@@ -141,8 +141,11 @@ class FiltersTab extends React.Component<any, any> {
                 {!isResetActive && !this.props.resultsFiltered ? null : ([
                     <div className='tab-pane__footer tab-pane__footer--inline' key='footer-buttons'>
 
-                        <button className='nh-button nh-button--secondary'
-                            onClick={this.reset}>
+                        <button
+                            className='nh-button nh-button--secondary'
+                            onClick={this.reset}
+                            data-test-id="filter-panel--clear-btn"
+                        >
                             {gettext('Clear')}
                         </button>
                         <button
diff --git a/assets/wire/tests/actions.spec.ts b/assets/wire/tests/actions.spec.ts
index 19c400acc..3ff3bc4cc 100644
--- a/assets/wire/tests/actions.spec.ts
+++ b/assets/wire/tests/actions.spec.ts
@@ -2,6 +2,7 @@ import thunk from 'redux-thunk';
 import fetchMock from 'fetch-mock';
 import {createStore, applyMiddleware} from 'redux';
 
+import {IArticle} from 'interfaces';
 import server from 'server';
 
 import wireApp from '../reducers';
@@ -16,6 +17,20 @@ import {
 } from 'search/actions';
 import {initData} from '../actions';
 
+const testArticle: IArticle = {
+    _id: 'foo',
+    guid: 'foo',
+    type: 'text',
+    _created: '2023-11-16T04:00:00+0000',
+    _updated: '2023-11-16T04:00:00+0000',
+    _etag: 'etag123',
+    associations: {},
+    slugline: 'test-article',
+    headline: 'My test article',
+    source: 'sofab',
+    versioncreated: '2023-06-27T11:07:17+0000',
+};
+
 describe('wire actions', () => {
     let store: any;
     const response: any = {
@@ -114,7 +129,7 @@ describe('wire actions', () => {
 
     it('can open item', () => {
         fetchMock.post('/history/new', {});
-        store.dispatch(actions.openItem({_id: 'foo'}));
+        store.dispatch(actions.openItem(testArticle));
         expect(store.getState().openItem._id).toBe('foo');
         expect(fetchMock.called('/history/new')).toBeTruthy();
         fetchMock.reset();
@@ -127,7 +142,7 @@ describe('wire actions', () => {
             expect(action).toEqual('open');
             expect(section).toEqual('wire');
         });
-        store.dispatch(actions.openItem({_id: 'foo'}));
+        store.dispatch(actions.openItem(testArticle));
         expect(store.getState().openItem._id).toBe('foo');
         fetchMock.reset();
     });
@@ -147,7 +162,7 @@ describe('wire actions', () => {
         const item: any = {_id: 'foo'};
         fetchMock.get(`/wire/${item._id}/versions`, {_items: [{_id: 'bar'}, {_id: 'baz'}]});
 
-        return store.dispatch(actions.fetchVersions(item))
+        return actions.fetchVersions(item)
             .then((versions: any) => {
                 expect(versions.length).toBe(2);
                 expect(versions[0]._id).toBe('bar');
@@ -155,18 +170,17 @@ describe('wire actions', () => {
     });
 
     it('can fetch next item version', () => {
-        const item: any = {nextversion: 'bar'};
         const next: any = {};
         fetchMock.get('/wire/bar?format=json', next);
 
-        return store.dispatch(actions.fetchNext(item))
-            .then((_next: any) => {
+        return actions.fetchNext({...testArticle, nextversion: 'bar'})
+            .then((_next) => {
                 expect(_next).toEqual(next);
             });
     });
 
     it('can reject if item has no next version', () => {
-        return store.dispatch(actions.fetchNext({})).then(() => {
+        return actions.fetchNext(testArticle).then(() => {
             expect(true).toBe(false); // this should not be called
         }, () => {
             expect(fetchMock.called()).toBeFalsy();
diff --git a/assets/wire/utils.ts b/assets/wire/utils.ts
index 41f748810..f2109ca11 100644
--- a/assets/wire/utils.ts
+++ b/assets/wire/utils.ts
@@ -1,7 +1,7 @@
 import {get, isEmpty, isEqual, pickBy} from 'lodash';
 
-import {IArticle, IContentType, IRendition} from '../interfaces';
-import {getTextFromHtml, getConfig, isDisplayed} from 'utils';
+import {IArticle, IAgendaItem, IContentType, IRendition} from 'interfaces';
+import {getTextFromHtml, getConfig, isDisplayed, gettext} from 'utils';
 
 export const DISPLAY_ABSTRACT = getConfig('display_abstract');
 
@@ -15,9 +15,11 @@ const STATUS_KILLED = 'canceled';
  * @param {Object} item
  * @returns {number}
  */
-export function getIntVersion(item: any) {
-    if (item) {
-        return parseInt(item.version, 10) || 0;
+export function getIntVersion(item: IArticle | IAgendaItem | undefined): number | undefined {
+    if (item != null && item.version != null) {
+        return typeof item.version === 'number' ?
+            item.version :
+            parseInt(item.version, 10) || 0;
     }
 }
 
@@ -33,22 +35,22 @@ export function getVideos(item: any) {
     return getRelatedItemsByType(item, 'video');
 }
 
-const isMedia = (item: any) => item.type === 'audio' || item.type === 'video';
+const isMedia = (item: IArticle) => item.type === 'audio' || item.type === 'video';
 
 /**
  *
  * @param {*} item
  */
-export function getItemMedia(item: any) {
+export function getItemMedia(item: IArticle) {
     if (isMedia(item)) {
         return [item];
     }
 
-    return Object.values(get(item, 'associations', {}) || {}).filter((assoc: any) => assoc != null && isMedia(assoc));
+    return Object.values(item.associations || {}).filter((assoc) => assoc != null && isMedia(assoc));
 }
 
-function getRelatedItemsByType(item: any, type: any) {
-    return item.type === type ? [item] : Object.values(get(item, 'associations', {}) || {}).filter((assoc: any) => get(assoc, 'type') === type);
+function getRelatedItemsByType(item: IArticle, type: string) {
+    return item.type === type ? [item] : Object.values(item.associations || {}).filter((assoc) => assoc?.type === type);
 }
 
 export function getFeatureMedia(item: IArticle): IArticle | null {
@@ -70,14 +72,14 @@ export function getOtherMedia(item: IArticle): Array<IArticle> | null {
         return null;
     }
 
-    return Object.keys(item.associations || {})
-        .filter((key) => (
+    return Object.entries(item.associations ?? {})
+        .filter(([key, mediaItem]) => (
             !key.startsWith('editor_') &&
             key !== 'featuremedia' &&
-            item.associations[key] != null &&
-            ['video', 'audio'].includes(item.associations[key].type)
+            mediaItem != null &&
+            ['video', 'audio'].includes(mediaItem.type)
         ))
-        .map((key) => item.associations[key]);
+        .map((args) => args[1]) as IArticle[]; // it's filtering out null values in .filter
 }
 
 /**
@@ -88,12 +90,12 @@ export function getOtherMedia(item: IArticle): Array<IArticle> | null {
  * @param {Object} item
  * @return {Object}
  */
-export function getPicture(item: any) {
+export function getPicture(item: IArticle) {
     if (item.type === 'picture') {
         return item;
     }
 
-    const featured = get(item, 'associations.featuremedia');
+    const featured = item.associations?.featuremedia;
 
     if (featured != null && featured.type === 'picture') {
         return featured;
@@ -104,13 +106,13 @@ export function getPicture(item: any) {
 
 function getBodyPicture(item: IArticle): IArticle | null {
     const pictures = Object.values(item.associations ?? {})
-        .filter((association) => association.type === 'picture');
+        .filter((association) => association?.type === 'picture');
     return pictures.length ? pictures[0] : null;
 }
 
 export function getPictureList(item: IArticle): Array<IArticle> {
     const pictures = Object.values(item.associations ?? {})
-        .filter((association) => association.type === 'picture');
+        .filter((association) => association?.type === 'picture') as IArticle[];
     return pictures.length ? pictures : [];
 }
 
@@ -122,8 +124,9 @@ export function getPictureList(item: IArticle): Array<IArticle> {
  * @return {Object}
  */
 export function getThumbnailRendition(picture: IArticle, large?: boolean): IRendition | undefined {
-    const rendition = large ? 'renditions._newsroom_thumbnail_large' : 'renditions._newsroom_thumbnail';
-    return get(picture, rendition, get(picture, 'renditions.thumbnail'));
+    const rendition = large ? picture.renditions?._newsroom_thumbnail_large : picture.renditions?._newsroom_thumbnail;
+
+    return rendition ?? picture.renditions?.thumbnail;
 }
 
 export function getImageForList(item: IArticle): {item: IArticle, href: string} | undefined {
@@ -331,7 +334,9 @@ export function getContentTypes(item: IArticle): Set<IContentType> {
     contentTypes.add(item.type);
     Object.values(item.associations ?? {})
         .forEach((item) => {
-            contentTypes.add(item.type);
+            if (item != null) {
+                contentTypes.add(item.type);
+            }
         });
 
     return contentTypes;
@@ -339,3 +344,11 @@ export function getContentTypes(item: IArticle): Set<IContentType> {
 
 export const hasAudio = (item: any) => hasMedia(item, 'audio');
 export const hasVideo = (item: any) => hasMedia(item, 'video');
+
+export function getVersionsLabelText(item: IArticle, plural?: boolean): string {
+    if (item.extra?.type === 'transcript') {
+        return plural ? gettext('segments') : gettext('segment');
+    }
+
+    return plural ? gettext('versions') : gettext('version');
+}
diff --git a/data_updates/00012_20231127-133756_topics.py b/data_updates/00012_20231127-133756_topics.py
new file mode 100644
index 000000000..64b7b7e1e
--- /dev/null
+++ b/data_updates/00012_20231127-133756_topics.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8; -*-
+# This file is part of Superdesk.
+# For the full copyright and license information, please see the
+# AUTHORS and LICENSE files distributed with this source code, or
+# at https://www.sourcefabric.org/superdesk/license
+#
+# Author  : Mark Pittaway
+# Creation: 2023-11-27 13:37
+
+from bson import ObjectId
+from superdesk.commands.data_updates import DataUpdate as _DataUpdate
+
+
+class DataUpdate(_DataUpdate):
+    resource = "topics"
+
+    def forwards(self, mongodb_collection, mongodb_database):
+        for topic in mongodb_collection.find({}):
+            if not len(topic.get("subscribers") or []):
+                continue
+
+            update_required = False
+            subscribers = []
+            for subscriber in topic["subscribers"]:
+                if isinstance(subscriber, dict):
+                    # Subscriber already in the correct format (after scheduled notifications)
+                    subscribers.append(subscriber)
+                elif isinstance(subscriber, str) or isinstance(subscriber, ObjectId):
+                    # Subscriber in previous format (before scheduled notifications)
+                    subscribers.append({"user_id": ObjectId(subscriber), "notification_type": "real-time"})
+                    update_required = True
+                else:
+                    print("Subscriber is in invalid format, skipping", subscriber)
+
+            if update_required:
+                mongodb_collection.update_one({"_id": topic["_id"]}, {"$set": {"subscribers": subscribers}})
+
+    def backwards(self, mongodb_collection, mongodb_database):
+        for topic in mongodb_collection.find({}):
+            if not len(topic.get("subscribers") or []):
+                continue
+
+            subscribers = []
+            for subscriber in topic["subscribers"]:
+                if isinstance(subscriber, dict):
+                    # Subscriber is in the correct format (after scheduled notifications)
+                    subscribers.append(ObjectId(subscriber.get("user_id")))
+                    # Subscriber in previous format (before scheduled notifications)
+                elif isinstance(subscriber, str) or isinstance(subscriber, ObjectId):
+                    subscribers.append(ObjectId(subscriber))
+                else:
+                    print("Subscriber is in invalid format, skipping", subscriber)
+
+            mongodb_collection.update_one({"_id": topic["_id"]}, {"$set": {"subscribers": subscribers}})
diff --git a/design_app/src/components/MainLayout.jsx b/design_app/src/components/MainLayout.jsx
index ebb2f5c8b..40e823477 100644
--- a/design_app/src/components/MainLayout.jsx
+++ b/design_app/src/components/MainLayout.jsx
@@ -8,7 +8,7 @@ function MainLayout() {
   return (
         <div className="newsroomWrap">
             <MainNavbar />
-            <div className="contentWrap flex-md-p-row flex-lg-l-row">
+            <div className="contentWrap">
                 <SideNav />
                 <Outlet />
             </div>
diff --git a/e2e/cypress/e2e/wire/wire_action.cy.js b/e2e/cypress/e2e/wire/wire_action.cy.js
new file mode 100644
index 000000000..88f6e0bbe
--- /dev/null
+++ b/e2e/cypress/e2e/wire/wire_action.cy.js
@@ -0,0 +1,76 @@
+import {setup, addDefaultResources, addResources} from '../../support/e2e';
+import {WirePage} from '../../support/pages/wire'
+import {FilterPanel} from '../../support/pages/filter_panel'
+import {NewshubLayout} from '../../support/pages/layout';
+import {WIRE_ITEMS} from '../../fixtures/wire'
+
+const WireItems = {
+    item_1: {
+        ...WIRE_ITEMS.syd_weather_1,
+        versioncreated: new Date(),
+    },
+    item_2: WIRE_ITEMS.bris_traffic_1,
+};
+
+describe('wire - filters', () => {
+    beforeEach(() => {
+        setup();
+        addDefaultResources();
+        addResources([{
+            resource: 'items',
+            use_resource_service: false,
+            items: [
+                WireItems.item_1,
+                WireItems.item_2,
+            ],
+        }]);
+        NewshubLayout.login('admin@example.com', 'admin');
+    });
+
+    it('can search using navigation & filters', () => {
+        /**
+            SEARCH
+        */
+        WirePage.openSideNav();
+        WirePage.search('Sydney');
+
+        cy.url().should('include', 'Sydney');
+
+        WirePage.item(WireItems.item_1._id).should('exist');
+        WirePage.item(WireItems.item_2._id).should('not.exist');
+
+        cy.get('[data-test-id="top-search-bar"] form input').clear().type("{enter}");
+        cy.url().should('not.include', 'Sydney');
+
+        WirePage.item(WireItems.item_1._id).should('exist');
+        WirePage.item(WireItems.item_2._id).should('exist');
+
+        /**
+            FILTERS
+        */
+        FilterPanel.openPanel();
+        FilterPanel.openFiltersTab();
+
+        /**
+            check filtering by checkboxes
+        */
+        FilterPanel.selectFilter(WireItems.item_1.service[0].name);
+        FilterPanel.button('search');
+
+        cy.url().should('include', `${WireItems.item_1.service[0].name}`);
+
+        WirePage.item(WireItems.item_1._id).should('exist');
+        WirePage.item(WireItems.item_2._id).should('not.exist');
+
+        FilterPanel.button('clear');
+
+        /**
+            check filtering by date input
+        */
+        FilterPanel.selectNowDate();
+        FilterPanel.button('search');
+
+        WirePage.item(WireItems.item_1._id).should('exist');
+        WirePage.item(WireItems.item_2._id).should('not.exist'); 
+    });
+});
diff --git a/e2e/cypress/support/pages/filter_panel.js b/e2e/cypress/support/pages/filter_panel.js
new file mode 100644
index 000000000..5b85b4718
--- /dev/null
+++ b/e2e/cypress/support/pages/filter_panel.js
@@ -0,0 +1,23 @@
+class FilterPanelWrapper {
+    openPanel() {
+        cy.get('[data-test-id="toggle-filter-panel"]').click();
+    }
+
+    openFiltersTab() {
+        cy.get('[data-test-id="filter-panel-tab--filters"]').click();
+    }
+
+    selectFilter(value) {
+        cy.get(`[data-test-id="filter"][data-test-value="${value}"] input`).check();
+    }
+
+    button(value) {
+        cy.get(`[data-test-id="filter-panel--${value}-btn"]`).click();
+    }
+
+    selectNowDate() {
+        cy.get('[data-test-id="nav-link--today"]').click();
+    }
+}
+
+export const FilterPanel = new FilterPanelWrapper();
diff --git a/e2e/cypress/support/pages/wire.js b/e2e/cypress/support/pages/wire.js
index 82bfc049a..8f34e22c0 100644
--- a/e2e/cypress/support/pages/wire.js
+++ b/e2e/cypress/support/pages/wire.js
@@ -7,6 +7,10 @@ class WirePageWrapper {
         this.filterPanel = new FilterPanelContainer();
     }
 
+    item(value) {
+        return cy.get(`[data-test-id="wire-item"][data-test-value="${value}"]`);
+    }
+
     showAdvancedSearchModal() {
         cy.get('[data-test-id="show-advanced-search-panel-btn"]').click();
     }
@@ -20,6 +24,15 @@ class WirePageWrapper {
     getTopSearchBarInput() {
         return cy.get('[data-test-id="top-search-bar"] input');
     }
+
+    openSideNav() {
+        cy.get('[data-test-id="sidenav-link-wire"]').click();
+    }
+
+    search(value) {
+        cy.get('[data-test-id="top-search-bar"]').click().type(value);
+        cy.get('[data-test-id="search-submit-button"]').click();
+    }
 }
 
 export const WirePage = new WirePageWrapper();
diff --git a/mypy-requirements.txt b/mypy-requirements.txt
index 256fe9421..565df631d 100644
--- a/mypy-requirements.txt
+++ b/mypy-requirements.txt
@@ -1,10 +1,13 @@
-mypy==0.901
-types-Flask==0.1.2
-types-Jinja2==0.1.3
-types-itsdangerous==1.1.3
-types-python-dateutil==0.1.2
-types-pytz==0.1.0
-types-requests==0.1.8
-types-tzlocal==0.1.0
-types-Werkzeug==0.1.8
-typing-extensions==3.10.0.0
\ No newline at end of file
+mypy
+types-Flask
+types-Jinja2
+types-itsdangerous
+types-python-dateutil
+types-pytz
+types-requests
+types-tzlocal
+types-Werkzeug
+types-protobuf
+typing-extensions
+
+-r requirements.txt
diff --git a/newsroom/agenda/__init__.py b/newsroom/agenda/__init__.py
index 8eddaaf99..bfe93942c 100644
--- a/newsroom/agenda/__init__.py
+++ b/newsroom/agenda/__init__.py
@@ -37,6 +37,7 @@ def init_app(app):
     )
 
     app.download_formatter("ical", formatters.iCalFormatter(), "iCalendar", ["agenda"])
+    app.download_formatter("Csv", formatters.CSVFormatter(), "CSV", ["agenda"])
     app.add_template_global(url_for_agenda)
     app.add_template_global(get_coverage_email_text)
     app.add_template_global(get_coverage_content_type_name, "get_coverage_content_type")
diff --git a/newsroom/agenda/agenda.py b/newsroom/agenda/agenda.py
index f5fe60bb5..253dddbe4 100644
--- a/newsroom/agenda/agenda.py
+++ b/newsroom/agenda/agenda.py
@@ -319,6 +319,25 @@ def get_date_filters(args):
     return date_range
 
 
+def gen_date_range_filter(field: str, operator: str, date_str: str, datetime_instance: datetime):
+    return [
+        {
+            "bool": {
+                "must_not": {"term": {"dates.all_day": True}},
+                "filter": {"range": {field: {operator: datetime_instance}}},
+            },
+        },
+        {
+            "bool": {
+                "filter": [
+                    {"term": {"dates.all_day": True}},
+                    {"range": {field: {operator: date_str}}},
+                ],
+            },
+        },
+    ]
+
+
 def _set_event_date_range(search):
     """Get events for selected date.
 
@@ -334,42 +353,11 @@ def _set_event_date_range(search):
     should = []
 
     if date_from and not date_to:
-        dates_field = "dates.start" if app.config.get("AGENDA_SHOW_MULTIDAY_ON_START_ONLY") else "dates.end"
         # Filter from a particular date onwards
-        should = [
-            {
-                "bool": {
-                    "must_not": {"term": {"dates.all_day": True}},
-                    "filter": {"range": {dates_field: {"gte": date_from}}},
-                },
-            },
-            {
-                "bool": {
-                    "filter": [
-                        {"term": {"dates.all_day": True}},
-                        {"range": {dates_field: {"gte": search.args["date_from"]}}},
-                    ],
-                },
-            },
-        ]
+        should = gen_date_range_filter("dates.end", "gte", search.args["date_from"], date_from)
     elif not date_from and date_to:
         # Filter up to a particular date
-        should = [
-            {
-                "bool": {
-                    "filter": {"range": {"dates.end": {"lte": date_to}}},
-                    "must_not": {"term": {"dates.all_day": True}},
-                },
-            },
-            {
-                "bool": {
-                    "filter": [
-                        {"range": {"dates.end": {"lte": search.args["date_to"]}}},
-                        {"term": {"dates.all_day": True}},
-                    ],
-                },
-            },
-        ]
+        should = gen_date_range_filter("dates.end", "lte", search.args["date_to"], date_to)
     elif date_from and date_to:
         # Filter based on the date range provided
         should = [
diff --git a/newsroom/agenda/formatters/__init__.py b/newsroom/agenda/formatters/__init__.py
index a34970432..86dedef27 100644
--- a/newsroom/agenda/formatters/__init__.py
+++ b/newsroom/agenda/formatters/__init__.py
@@ -1 +1,2 @@
 from .ical_formatter import iCalFormatter  # noqa
+from .csv_formatter import CSVFormatter  # noqa
diff --git a/newsroom/agenda/formatters/csv_formatter.py b/newsroom/agenda/formatters/csv_formatter.py
new file mode 100644
index 000000000..c0b483d5a
--- /dev/null
+++ b/newsroom/agenda/formatters/csv_formatter.py
@@ -0,0 +1,125 @@
+from newsroom.formatter import BaseFormatter
+import csv
+import io
+import arrow
+from werkzeug.utils import secure_filename
+from newsroom.utils import parse_dates
+from datetime import datetime
+from typing import List, Dict, Any, Union, Tuple
+
+
+class CSVFormatter(BaseFormatter):
+    VERSION = "1.0"
+    PRODID = "Newshub"
+    FILE_EXTENSION = "csv"
+    MIMETYPE = "text/csv"
+    MULTI = True
+
+    def format_item(self, item, item_type=None):
+        event_item = self.format_event(item)
+        return self.serialize_to_csv([event_item])
+
+    def format_events(self, items: List[Dict[str, Any]], item_type: Union[str, None] = None) -> Tuple[bytes, str]:
+        formatted_events = []
+        for item in items:
+            parse_dates(item)
+            formatted_events.append(self.format_event(item))
+        return self.serialize_to_csv(formatted_events), secure_filename(
+            f"{datetime.now().strftime('%Y-%m-%d-%H:%M:%S')}-{'multi'}.{self.FILE_EXTENSION}"
+        )
+
+    def serialize_to_csv(self, items: List[Dict[str, Any]]) -> bytes:
+        csv_string = io.StringIO()
+        fieldnames: List[str] = list(items[0].keys())
+        csv_writer: csv.DictWriter = csv.DictWriter(csv_string, delimiter=",", fieldnames=fieldnames)
+        csv_writer.writeheader()
+        for item in items:
+            csv_writer.writerow(item)
+
+        csv_string.seek(0)  # Reset the buffer position
+        return csv_string.getvalue().encode("utf-8")
+
+    def format_event(self, item: Dict[str, Any]) -> Dict[str, Any]:
+        event = item.get("event", {})
+        return {
+            "Event name": item.get("name", ""),
+            "Description": item.get("definition_long", item.get("definition_short", "")),
+            "Language": item.get("language", ""),
+            "Event start date": self.format_date(item, "start"),
+            "Event end date": self.format_date(item, "end"),
+            "Event time": self.format_time(item),
+            "Event timezone": item.get("dates", {}).get("tz", ""),
+            "Location": self.format_location(item, "name"),
+            "Country": self.format_location(item, "country"),
+            "Subject": self.format_list(event, "subject"),
+            "Website": event.get("links")[0] if event.get("links") else "",
+            "Category": self.format_list(event, "anpa_category"),
+            "Event type": item.get("item_type", ""),
+            "Organization name": event.get("event_contact_info")[0].get("organisation", " ")
+            if event.get("event_contact_info")
+            else "",
+            "Contact": self.format_contact_info(item),
+            "Coverage type": self.format_coverage(item, "coverage_type"),
+            "Coverage status": self.format_coverage(item, "coverage_status"),
+        }
+
+    def datetime(self, value: Any) -> datetime:
+        """Make sure dates are datetime instances."""
+        return arrow.get(value).datetime
+
+    def format_date(self, item: Dict[str, Any], date_type: str) -> str:
+        date_obj = self.datetime(item.get("dates", {}).get(date_type))
+        if date_obj:
+            return date_obj.strftime("%Y-%m-%d")
+        return ""
+
+    def format_time(self, item: Dict[str, Any]) -> str:
+        date_obj = item.get("dates", {})
+        if date_obj.get("all_day"):
+            return ""
+        elif date_obj.get("no_end_time"):
+            return f"{self.datetime(date_obj.get('start')).strftime('%H:%M:%S')}"
+        else:
+            return f"{self.datetime(date_obj.get('start')).strftime('%H:%M:%S')}-{self.datetime(date_obj.get('end')).strftime('%H:%M:%S')}"
+
+    def format_location(self, item: Dict[str, Any], field: str) -> str:
+        """
+        format location info
+        """
+        if item.get("location"):
+            for loc in item["location"]:
+                return loc.get(field, "") if not field == "country" else loc.get("address", {}).get(field)
+        return ""
+
+    def format_list(self, item: Dict[str, Any], key: str) -> str:
+        values = [v.get("name", "") for v in item.get(key, [])]
+        return ",".join(values)
+
+    def format_contact_info(self, item: Dict[str, Any]) -> str:
+        """
+        format contact information
+        """
+        event_contact_info = item.get("event", {}).get("event_contact_info", [])
+        if event_contact_info:
+            for contact in event_contact_info:
+                contact_values = [
+                    contact.get("honorific", ""),
+                    contact.get("first_name", ""),
+                    contact.get("last_name", ""),
+                    contact.get("organisation", ""),
+                    ",".join(contact.get("contact_email", [])),
+                    ",".join(contact.get("mobile", [])),
+                ]
+                return ",".join(contact_values)
+        return ""
+
+    def format_coverage(self, item: Dict[str, Any], field: str) -> str:
+        """
+        format coverage information
+        """
+        coverages = item.get("event", {}).get("coverages", {})
+        value = []
+        if coverages:
+            for coverage in coverages:
+                value.append(coverage.get(field, ""))
+        return ",".join(value)
diff --git a/newsroom/agenda/views.py b/newsroom/agenda/views.py
index 62be8604d..c07a4fe65 100644
--- a/newsroom/agenda/views.py
+++ b/newsroom/agenda/views.py
@@ -117,14 +117,14 @@ def search():
 def get_view_data() -> Dict:
     user = get_user_required()
     topics = get_user_topics(user["_id"]) if user else []
-    company = get_company(user) or {}
+    company = get_company(user)
     products = get_products_by_company(company, product_type="agenda") if company else []
 
     check_user_has_products(user, products)
 
     return {
         "user": user,
-        "company": str(user["company"]) if user and user.get("company") else None,
+        "company": str(user.get("company")) if user and user.get("company") else None,
         "topics": [t for t in topics if t.get("topic_type") == "agenda"],
         "formats": [
             {"format": f["format"], "name": f["name"]}
@@ -139,8 +139,8 @@ def get_view_data() -> Dict:
         if company
         else [],
         "saved_items": get_resource_service("agenda").get_saved_items_count(),
-        "events_only": company.get("events_only", False),
-        "restrict_coverage_info": company.get("restrict_coverage_info", False),
+        "events_only": company.get("events_only", False) if company else False,
+        "restrict_coverage_info": company.get("restrict_coverage_info", False) if company else False,
         "locators": get_vocabulary("locators"),
         "ui_config": get_resource_service("ui_config").get_section_config("agenda"),
         "groups": app.config.get("AGENDA_GROUPS", []),
diff --git a/newsroom/auth/firebase.py b/newsroom/auth/firebase.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/newsroom/auth/forms.py b/newsroom/auth/forms.py
index 93ae48c38..808d0240b 100644
--- a/newsroom/auth/forms.py
+++ b/newsroom/auth/forms.py
@@ -35,6 +35,7 @@ class LoginForm(FlaskForm):
     email = StringField(lazy_gettext("Email"), validators=[DataRequired(), Length(1, 64), Email()])
     password = PasswordField(lazy_gettext("Password"), validators=[DataRequired()])
     remember_me = BooleanField(lazy_gettext("Remember Me"), validators=[])
+    firebase_status = StringField("firebase_status", validators=[])  # for firebase status code
 
 
 class TokenForm(FlaskForm):
@@ -47,6 +48,12 @@ class ResetPasswordForm(FlaskForm):
         Length(min=8),
         EqualTo("new_password2", message=lazy_gettext("Passwords must match.")),
     ]
-    old_password = PasswordField(lazy_gettext("Old password"), validators=[])
+    old_password = PasswordField(
+        lazy_gettext("Current password"),
+        validators=[],
+    )
     new_password = PasswordField(lazy_gettext("New password"), validators=match_password2)
     new_password2 = PasswordField(lazy_gettext("Confirm new password"), validators=[DataRequired()])
+
+    email = StringField(lazy_gettext("Email"), validators=[])  # for autocomplete
+    firebase_status = StringField("firebase_status", validators=[])  # for firebase status code
diff --git a/newsroom/auth/oauth.py b/newsroom/auth/oauth.py
index 20f0ca1de..e46a0e15e 100644
--- a/newsroom/auth/oauth.py
+++ b/newsroom/auth/oauth.py
@@ -87,7 +87,7 @@ def redirect_with_error(error_str):
         return redirect_with_error(gettext("Account is disabled"))
 
     auth_provider = get_company_auth_provider(company)
-    if auth_provider["auth_type"] != AuthProviderType.GOOGLE_OAUTH.value:
+    if auth_provider.type != AuthProviderType.GOOGLE_OAUTH:
         return redirect_with_error(gettext("Invalid login type, Oauth not enabled for your user"))
 
     # If the user is not yet validated, then validate it now
diff --git a/newsroom/auth/providers.py b/newsroom/auth/providers.py
new file mode 100644
index 000000000..efebde00f
--- /dev/null
+++ b/newsroom/auth/providers.py
@@ -0,0 +1,62 @@
+import abc
+
+from newsroom.types import AuthProviderConfig, AuthProviderType
+
+
+class AuthProviderFeatures(object):
+    verify_email: bool
+    change_password: bool
+
+    def __init__(self, *, verify_email=False, change_password=False):
+        self.verify_email = verify_email
+        self.change_password = change_password
+
+    def __iter__(self):
+        """Needed for export to json for client."""
+        return iter(
+            [
+                ("verify_email", self.verify_email),
+                ("change_password", self.change_password),
+            ]
+        )
+
+
+class AuthProvider(abc.ABC):
+    type: AuthProviderType
+    config: AuthProviderConfig
+    features = AuthProviderFeatures()
+
+    def __init__(self, config: AuthProviderConfig):
+        self._id = config["_id"]
+        self.name = config["name"]
+        self.config = config
+
+    @classmethod
+    def get_provider(cls, data: AuthProviderConfig):
+        if data["auth_type"] == AuthProviderType.FIREBASE:
+            return FirebaseAuthProvider(data)
+        if data["auth_type"] == AuthProviderType.GOOGLE_OAUTH:
+            return GoogleOauthAuthProvider(data)
+        if data["auth_type"] == AuthProviderType.SAML:
+            return SAMLAuthProvider(data)
+        return PasswordAuthProvider(data)
+
+
+class PasswordAuthProvider(AuthProvider):
+    type = AuthProviderType.PASSWORD
+    features = AuthProviderFeatures(verify_email=True, change_password=True)
+
+
+class GoogleOauthAuthProvider(AuthProvider):
+    type = AuthProviderType.GOOGLE_OAUTH
+    features = AuthProviderFeatures()
+
+
+class SAMLAuthProvider(AuthProvider):
+    type = AuthProviderType.SAML
+    features = AuthProviderFeatures()
+
+
+class FirebaseAuthProvider(AuthProvider):
+    type = AuthProviderType.FIREBASE
+    features = AuthProviderFeatures(change_password=True)
diff --git a/newsroom/auth/utils.py b/newsroom/auth/utils.py
index 306d8449d..5135afead 100644
--- a/newsroom/auth/utils.py
+++ b/newsroom/auth/utils.py
@@ -7,11 +7,12 @@
 from typing import Dict, Optional
 from flask import current_app as app
 from flask_babel import _
+from newsroom.auth.providers import AuthProvider
 from newsroom.exceptions import AuthorizationError
 from newsroom.user_roles import UserRole
 from superdesk.utc import utcnow
 from newsroom.auth import get_user, get_company
-from newsroom.types import User, UserData, Company, AuthProvider, AuthProviderType
+from newsroom.types import User, UserData, Company, AuthProviderType
 from newsroom.utils import (
     get_random_string,
     is_valid_user,
@@ -71,7 +72,7 @@ def redirect_with_error(error_str):
             return redirect_with_error(_("Company has expired"))
         elif not is_account_enabled(user):
             return redirect_with_error(_("Account is disabled"))
-        elif company_auth_provider["auth_type"] != auth_type.value:
+        elif company_auth_provider.type != auth_type:
             return redirect_with_error(
                 _("Invalid login type, %(type)s not enabled for your user", type=auth_type.value)
             )
@@ -210,9 +211,14 @@ def user_can_manage_company(company_id) -> bool:
 
 
 def get_company_auth_provider(company: Optional[Company] = None) -> AuthProvider:
-    providers: Dict[str, AuthProvider] = {provider["_id"]: provider for provider in app.config["AUTH_PROVIDERS"]}
+    providers: Dict[str, AuthProvider] = {
+        provider["_id"]: AuthProvider.get_provider(provider) for provider in app.config["AUTH_PROVIDERS"]
+    }
+
+    provider_id = "newshub"
+    if company and company.get("auth_provider"):
+        provider_id = company.get("auth_provider", "newshub")
 
-    provider_id = (company or {}).get("auth_provider") or "newshub"
     return providers.get(provider_id) or providers["newshub"]
 
 
diff --git a/newsroom/auth/views.py b/newsroom/auth/views.py
index bcfa59bd5..d7bd07c03 100644
--- a/newsroom/auth/views.py
+++ b/newsroom/auth/views.py
@@ -1,19 +1,32 @@
+from typing import Literal
 import flask
 import bcrypt
+import logging
+import google.oauth2.id_token
 
 from bson import ObjectId
 from flask import current_app as app, abort
 from flask_babel import gettext
 from superdesk import get_resource_service
 from superdesk.utc import utcnow
+from google.auth.transport import requests
 
 from newsroom.types import AuthProviderType
 from newsroom.decorator import admin_only, login_required
-from newsroom.auth import blueprint, get_auth_user_by_email, get_user_by_email, get_company_from_user
+from newsroom.auth import (
+    blueprint,
+    get_auth_user_by_email,
+    get_company,
+    get_user,
+    get_user_by_email,
+    get_company_from_user,
+    get_user_required,
+)
 from newsroom.auth.forms import SignupForm, LoginForm, TokenForm, ResetPasswordForm
 from newsroom.auth.utils import (
     clear_user_session,
     redirect_to_next_url,
+    sign_user_by_email,
     start_user_session,
     send_token,
     get_company_auth_provider,
@@ -32,10 +45,14 @@
 from .token import generate_auth_token, verify_auth_token
 
 
+logger = logging.getLogger(__name__)
+
+
 @blueprint.route("/login", methods=["GET", "POST"])
 @limiter.limit("60/minute")
 def login():
     form = LoginForm()
+
     if form.validate_on_submit():
         if email_has_exceeded_max_login_attempts(form.email.data):
             return flask.render_template("account_locked.html", form=form)
@@ -45,10 +62,23 @@ def login():
 
         if is_valid_user(user, company):
             auth_provider = get_company_auth_provider(company)
-            if auth_provider["auth_type"] != AuthProviderType.PASSWORD.value and not is_admin(user):
+            firebase_status = form.firebase_status.data
+            if (
+                auth_provider.type == AuthProviderType.FIREBASE
+                and firebase_status
+                and firebase_status
+                in (
+                    "auth/user-disabled",
+                    "auth/user-not-found",
+                    "auth/wrong-password",
+                )
+            ):
+                flask.flash(gettext("Invalid username or password."), "danger")
+            elif auth_provider.type == AuthProviderType.FIREBASE and firebase_status:
+                log_firebase_unexpected_error(firebase_status)
+            elif auth_provider.type != AuthProviderType.PASSWORD and not is_admin(user):
                 # Password login is not enabled for this user's company, and the user is not an admin
-                provider_name = auth_provider["name"]
-                flask.flash(gettext(f"Invalid login type, please login using '{provider_name}'"), "danger")
+                flask.flash(gettext(f"Invalid login type, please login using '{auth_provider.name}'"), "danger")
             else:
                 user_auth = get_auth_user_by_email(user["email"])
                 if not _is_password_valid(form.password.data.encode("UTF-8"), user_auth):
@@ -58,7 +88,7 @@ def login():
                     update_user_last_active(user)
                     return redirect_to_next_url()
 
-    return flask.render_template("login.html", form=form)
+    return flask.render_template("login.html", form=form, firebase=app.config.get("FIREBASE_ENABLED"))
 
 
 def email_has_exceeded_max_login_attempts(email):
@@ -169,7 +199,7 @@ def login_with_token(token):
 @blueprint.route("/logout")
 def logout():
     clear_user_session()
-    return flask.redirect(flask.url_for("wire.index"))
+    return flask.redirect(flask.url_for("auth.login", logout=1))
 
 
 @blueprint.route("/signup", methods=["GET", "POST"])
@@ -230,6 +260,10 @@ def reset_password(token):
         }
         get_resource_service("users").patch(id=ObjectId(user["_id"]), updates=updates)
         flask.flash(gettext("Your password has been changed. Please login again."), "success")
+
+        if get_user() is not None:  # user is authenticated already
+            return redirect_to_next_url()
+
         return flask.redirect(flask.url_for("auth.login"))
 
     app.cache.delete(user.get("email"))
@@ -237,21 +271,32 @@ def reset_password(token):
 
 
 @blueprint.route("/token/<token_type>", methods=["GET", "POST"])
-def token(token_type):
+def token(token_type: Literal["reset_password", "validate"]):
+    """Get token to reset password or validate email."""
     form = TokenForm()
     if form.validate_on_submit():
         user = get_user_by_email(form.email.data)
         company = get_company_from_user(user) if user else None
         auth_provider = get_company_auth_provider(company)
-        if auth_provider.get("features", {}).get("verify_email"):
+
+        if auth_provider.features.verify_email:
             send_token(user, token_type)
+
         flask.flash(
             gettext("A reset password token has been sent to your email address."),
             "success",
         )
+
         return flask.redirect(flask.url_for("auth.login"))
 
-    return flask.render_template("request_token.html", form=form, token_type=token_type)
+    return flask.render_template(
+        "request_token.html", form=form, token_type=token_type, firebase=app.config.get("FIREBASE_ENABLED")
+    )
+
+
+@blueprint.route("/reset_password_done")
+def reset_password_confirmation():
+    return flask.render_template("request_token_confirm.html")
 
 
 @blueprint.route("/login_locale", methods=["POST"])
@@ -283,3 +328,64 @@ def impersonate_stop():
     start_user_session(user)
     flask.session.pop("auth_user")
     return flask.redirect(flask.url_for("settings.app", app_id="users"))
+
+
+@blueprint.route("/change_password", methods=["GET", "POST"])
+@login_required
+def change_password():
+    form = ResetPasswordForm()
+    user = get_user_required()
+    company = get_company(user)
+    auth_provider = get_company_auth_provider(company)
+    form.email.process_data(user["email"])
+
+    if form.validate_on_submit():
+        if auth_provider.type == AuthProviderType.FIREBASE:
+            if form.data.get("firebase_status"):
+                firebase_status = form.data["firebase_status"]
+                if firebase_status == "OK":
+                    flask.flash(gettext("Your password has been changed."), "success")
+                elif firebase_status == "auth/wrong-password":
+                    flask.flash(gettext("Wrong current password."), "error")
+                else:
+                    log_firebase_unexpected_error(firebase_status)
+        elif auth_provider.type == AuthProviderType.PASSWORD:
+            updates = {
+                "password": form.new_password.data,
+            }
+            get_resource_service("users").patch(id=ObjectId(user["_id"]), updates=updates)
+            flask.flash(gettext("Your password has been changed."), "success")
+        else:
+            flask.flash(gettext("Change password is not available."), "warning")
+        return flask.redirect(flask.url_for("auth.change_password"))
+
+    return flask.render_template(
+        "change_password.html", form=form, user=user, firebase=app.config.get("FIREBASE_ENABLED")
+    )
+
+
+@blueprint.route("/firebase_auth_token")
+def firebase_auth_token():
+    token = flask.request.args.get("token")
+    firebase_request_adapter = requests.Request()
+    if token:
+        try:
+            claims = google.oauth2.id_token.verify_firebase_token(
+                token,
+                audience=app.config["FIREBASE_CLIENT_CONFIG"]["projectId"],
+                request=firebase_request_adapter,
+            )
+        except ValueError as err:
+            logger.error(err)
+            flask.flash(gettext("User token is not valid"), "danger")
+            return flask.redirect(flask.url_for("auth.login", token_error=1))
+
+        email = claims["email"]
+        return sign_user_by_email(email, auth_type=AuthProviderType.FIREBASE, validate_login_attempt=True)
+
+    return flask.redirect(flask.url_for("auth.login"))
+
+
+def log_firebase_unexpected_error(firebase_status: str):
+    logger.warning("Unhandled firebase error %s", firebase_status)
+    flask.flash(gettext("Could not change your password. Please contact us for assistance."), "warning")
diff --git a/newsroom/companies/views.py b/newsroom/companies/views.py
index ab9dee5a7..2adf62ae9 100644
--- a/newsroom/companies/views.py
+++ b/newsroom/companies/views.py
@@ -14,6 +14,7 @@
 
 from newsroom.decorator import admin_only, account_manager_only, login_required
 from newsroom.companies import blueprint
+from newsroom.types import AuthProviderConfig
 from newsroom.utils import (
     query_resource,
     find_one,
@@ -28,6 +29,13 @@ def get_company_types_options(company_types):
 
 
 def get_settings_data():
+    def render_provider(provider: AuthProviderConfig) -> Dict[str, str]:
+        return {
+            "_id": provider["_id"],
+            "name": str(provider["name"]),
+            "auth_type": provider["auth_type"].value,
+        }
+
     return {
         "companies": list(query_resource("companies")),
         "services": app.config["SERVICES"],
@@ -38,7 +46,7 @@ def get_settings_data():
         "ui_config": get_resource_service("ui_config").get_section_config("companies"),
         "countries": app.countries,
         "sso_enabled": bool(app.config.get("SAML_CLIENTS") or app.config.get("SAML_PATH")),
-        "auth_providers": app.config.get("AUTH_PROVIDERS"),
+        "auth_providers": [render_provider(provider) for provider in app.config.get("AUTH_PROVIDERS") or []],
     }
 
 
diff --git a/newsroom/company_expiry_alerts.py b/newsroom/company_expiry_alerts.py
index 5ed287a04..a4d931e61 100644
--- a/newsroom/company_expiry_alerts.py
+++ b/newsroom/company_expiry_alerts.py
@@ -15,7 +15,7 @@
 from superdesk import get_resource_service
 from superdesk.utc import utcnow
 from superdesk.celery_task_utils import get_lock_id
-from superdesk.lock import lock, unlock, remove_locks
+from superdesk.lock import lock, unlock
 
 from newsroom.celery_app import celery
 from newsroom.settings import get_settings_collection, GENERAL_SETTINGS_LOOKUP
@@ -31,16 +31,15 @@ def send_alerts(self):
 
         lock_name = get_lock_id("newsroom", "company_expiry")
         if not lock(lock_name, expire=610):
-            logger.error("{} Job already running".format(self.log_msg))
+            logger.error("Company expiry alert task already running")
             return
 
         try:
             self.worker()
         except Exception as e:
             logger.exception(e)
-
-        unlock(lock_name)
-        remove_locks()
+        finally:
+            unlock(lock_name)
 
         logger.info("{} Completed sending alerts.".format(self.log_msg))
 
diff --git a/newsroom/formatter.py b/newsroom/formatter.py
index cfd076f84..d7ef872ad 100644
--- a/newsroom/formatter.py
+++ b/newsroom/formatter.py
@@ -17,6 +17,9 @@ class BaseFormatter:
     #: File extension to use for downloaded file.
     FILE_EXTENSION = None
 
+    #: Multi to use for download multiple file.
+    MULTI = False
+
     def format_item(self, item, item_type=None, items=[]):
         raise NotImplementedError
 
diff --git a/newsroom/monitoring/email_alerts.py b/newsroom/monitoring/email_alerts.py
index fbec0385e..d4490ef1e 100644
--- a/newsroom/monitoring/email_alerts.py
+++ b/newsroom/monitoring/email_alerts.py
@@ -19,7 +19,7 @@
 from superdesk import get_resource_service, Command
 from superdesk.utc import utcnow, utc_to_local, local_to_utc
 from superdesk.celery_task_utils import get_lock_id
-from superdesk.lock import lock, unlock, remove_locks
+from superdesk.lock import lock, unlock
 
 from newsroom.celery_app import celery
 from newsroom.settings import get_settings_collection, GENERAL_SETTINGS_LOOKUP
@@ -48,7 +48,7 @@ def run(self, immediate=False):
             "monitoring_{0}".format("scheduled" if not immediate else "immediate"),
         )
         if not lock(lock_name, expire=610):
-            logger.error("{} Job already running".format(self.log_msg))
+            logger.error("Monitoring email alerts task already running")
             return
 
         try:
@@ -64,9 +64,8 @@ def run(self, immediate=False):
                 self.scheduled_worker(now_to_minute)
         except Exception as e:
             logger.exception(e)
-
-        unlock(lock_name)
-        remove_locks()
+        finally:
+            unlock(lock_name)
 
         logger.info("{} Completed sending Monitoring Scheduled Alerts.".format(self.log_msg))
 
diff --git a/newsroom/notifications/send_scheduled_notifications.py b/newsroom/notifications/send_scheduled_notifications.py
index 10164200f..e21ee7713 100644
--- a/newsroom/notifications/send_scheduled_notifications.py
+++ b/newsroom/notifications/send_scheduled_notifications.py
@@ -8,7 +8,7 @@
 from superdesk import get_resource_service, Command
 from superdesk.utc import utcnow, utc_to_local
 from superdesk.celery_task_utils import get_lock_id
-from superdesk.lock import lock, unlock, remove_locks
+from superdesk.lock import lock, unlock
 
 from newsroom.types import User, NotificationSchedule, Company, NotificationQueue, NotificationQueueTopic, Topic
 from newsroom.utils import get_user_dict, get_company_dict
@@ -32,13 +32,13 @@ def run(self, force: bool = False):
 
         lock_name = get_lock_id("newsroom", "send_scheduled_notifications")
         if not lock(lock_name, expire=610):
-            logger.error(f"{self.log_msg} Job already running")
+            logger.error("Send scheduled notifications task already running")
             return
 
-        self.run_schedules(force)
-
-        unlock(lock_name)
-        remove_locks()
+        try:
+            self.run_schedules(force)
+        finally:
+            unlock(lock_name)
 
         logger.info(f"{self.log_msg} Completed sending scheduled notifications")
 
@@ -51,8 +51,8 @@ def run_schedules(self, force: bool):
 
             schedules: List[NotificationQueue] = get_resource_service("notification_queue").get(req=None, lookup={})
         except Exception as e:
-            logger.error(f"{self.log_msg} Failed to retrieve data to run schedules")
             logger.exception(e)
+            logger.error("Failed to retrieve data to run schedules")
             return
 
         for schedule in schedules:
@@ -76,7 +76,7 @@ def run_schedules(self, force: bool):
                 self.process_schedule(schedule, user, company, now_utc, user_topic_map.get(user["_id"]) or {}, force)
             except Exception as e:
                 logger.exception(e)
-                logger.error(f"{self.log_msg} Failed to run schedule for user {user_id}")
+                logger.error("Failed to run schedule for user %s", user_id)
 
     def process_schedule(
         self,
diff --git a/newsroom/templates/base_layout.html b/newsroom/templates/base_layout.html
index a17c1d0ca..885a62059 100644
--- a/newsroom/templates/base_layout.html
+++ b/newsroom/templates/base_layout.html
@@ -63,7 +63,7 @@ <h3 class="a11y-only">{{ gettext('Main Navigation Bar') }}</h3>
         </nav>
     {% endblock %}
 
-    <div class="contentWrap flex-md-p-row flex-lg-l-row {% block custom_content_style %}{% endblock %}">
+    <div class="contentWrap {% block custom_content_style %}{% endblock %}">
         {% if session.get('name') %}
         <nav class="sidenav">
             <h3 class="a11y-only">{{ gettext('Side Navigation') }}</h3>
diff --git a/newsroom/templates/change_password.html b/newsroom/templates/change_password.html
new file mode 100644
index 000000000..b67aa6590
--- /dev/null
+++ b/newsroom/templates/change_password.html
@@ -0,0 +1,65 @@
+{% extends "layout_wire.html" %}
+
+{% block contentMain %}
+
+<div class="container py-5">
+    <div class="row">
+        <div class="col-md-12">
+            {% include "login_messages.html" %}
+            <div class="row">
+                <div class="col-md-6 mx-auto">
+                    <div class="card">
+                        <div class="card-header">
+                            <h3 class="mb-0">{{ gettext("Change Password") }}</h3>
+                        </div>
+                        <div class="card-body">
+                            <form class="form" role="form" id="formChangePassword" method="post">
+                                {{ form.csrf_token }}
+
+                                <div style="display:none">
+                                    <!-- this is for password manager only -->
+                                    {{ form.email(autocomplete="username") }}
+                                    {{ form.firebase_status(type="hidden", id="firebase-status") }}
+                                </div>
+
+                                {% include "form_alerts.html" %}
+
+                                {% if not token %}
+                                    <div class="form-group">
+                                        <label for="old_password">{{ form.old_password.label.text }}</label>
+                                        {{ form.old_password(class="form-control", id="password", required="true", autocomplete="current-password") }}
+                                    </div>
+                                {% endif %}
+
+                                <div class="form-group">
+                                    <label for="new_password">{{ form.new_password.label.text }}</label>
+                                    {{ form.new_password(class="form-control", id="new_password", required="true", pattern=".{8,}", title=gettext("Please use 8 or more characters."), autocomplete="new-password") }}
+                                </div>
+
+                                <div class="form-group">
+                                    <label for="new_password2">{{ form.new_password2.label.text }}</label>
+                                    {{ form.new_password2(class="form-control", id="new_password2", required="true", autocomplete="new-password") }}
+                                </div>
+
+                                <button type="submit" class="btn btn-outline-primary ms-3 float-end">{{ gettext("Change Password") }}</button>
+                        </div>
+                        <div class="card-footer bg-white border-0 text-muted small">
+                            <p>{{ gettext('Forgot your password?') }} <a href="{{ url_for('auth.token', token_type='reset_password') }}">{{ gettext('Click here to reset.') }}</a></p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<pre>{{ user_email }}</pre>
+
+{% endblock %}
+
+{% block script %}
+    {% if firebase %}
+        {% include "firebase_config.html" %}
+        {{ javascript_tag('firebase_change_password_js') | safe }}
+    {% endif %}
+{% endblock %}
diff --git a/newsroom/templates/firebase_config.html b/newsroom/templates/firebase_config.html
new file mode 100644
index 000000000..67672b2d1
--- /dev/null
+++ b/newsroom/templates/firebase_config.html
@@ -0,0 +1,6 @@
+<script>
+    {% if user %}
+        window.firebaseUserEmail = "{{ user.email | tojson }}";
+    {% endif %}
+    window.firebaseConfig = {{ config.FIREBASE_CLIENT_CONFIG | tojson }};
+</script>
diff --git a/newsroom/templates/form_alerts.html b/newsroom/templates/form_alerts.html
index ebea07608..ca38d4d08 100644
--- a/newsroom/templates/form_alerts.html
+++ b/newsroom/templates/form_alerts.html
@@ -2,7 +2,7 @@
   <div class="alert alert-danger" role="alert">
     <ul>
       {% for field, errors in form.errors.items() %}
-        <li>{{ field }}: {{ gettext(errors[0]) }}</li>
+        <li>{{ field }}: {{ errors | join(" ") }}</li>
       {% endfor %}
     </ul>
   </div>
diff --git a/newsroom/templates/layout_wire.html b/newsroom/templates/layout_wire.html
index 4878c5e34..50695e932 100644
--- a/newsroom/templates/layout_wire.html
+++ b/newsroom/templates/layout_wire.html
@@ -11,8 +11,7 @@
         </section>
 
         <section class="content-main">
-
-                {% block contentMain %}{% endblock %}
+            {% block contentMain %}{% endblock %}
 
             {% block sidebar %}{% endblock %}
         </section>
diff --git a/newsroom/templates/login.html b/newsroom/templates/login.html
index 6ac57823a..8604f297d 100644
--- a/newsroom/templates/login.html
+++ b/newsroom/templates/login.html
@@ -1,52 +1 @@
-{% extends "layout_wire.html" %}
-
-{% block contentMain %}
-
-<div class="container-fluid py-5 overflow-auto nh-login-page__content">
-    <div class="row">
-        <div class="col-12 col-md-8 col-lg-6 col-xxl-4 mx-auto">
-            <div class="card border-0 bg-white box-shadow--z1 rounded--m">
-                <div class="card-header pt-4 border-0 bg-white rounded--m">
-                    <div class="login-logo">
-                        {% include 'login_logo.html' %}
-                    </div>
-                    <h5 class="mb-0">{{ gettext("Login") }}</h5>
-                </div>
-                <div class="card-body pt-1">
-                    {% include "login_form.html" %}
-                </div>
-
-                {% if config.SAML_PATH %}
-                <div class="card-body pt-1 pb-2">
-                    <a href="{{ url_for('auth.saml') }}" title="{{ gettext('Login using Single Sign On') }}" class="btn btn-primary w-100">{{ config.SAML_LABEL }}</a>
-                </div>
-                {% endif %}
-
-                <div class="card-footer bg-white border-0 text-muted small">
-                    <p>{{ gettext('Forgot your password?') }} <a href="{{ url_for('auth.token', token_type='reset_password') }}">{{ gettext('Click here to reset.') }}</a>
-                        {% if config.SHOW_USER_REGISTER %}{{ gettext("Or you can") }} <a href="{{ url_for('auth.signup') }}">{{ gettext('click here to register.') }}</a>{% endif %}
-                    </p>
-                </div>
-
-                {% if get_client_locales()|length is gt 1 %}
-                <div class="card-body pt-1">
-                    <form class="form" role="form" method="post" action="{{ url_for('auth.set_locale') }}">
-                        <div class="form-group">
-                            <label for="language">{{ gettext('Language') }}</label>
-                            <div class="field">
-                                <select name="locale" class="form-control" onchange="this.form.submit()">
-                                    {% for locale in get_client_locales() %}
-                                    <option value="{{ locale.locale }}" {% if locale.locale == get_locale() %}selected{% endif %}>{{ locale.name }}</option>
-                                    {% endfor %}
-                                </select>
-                            </div>
-                        </div>
-                    </form>
-                </div>
-                {% endif %}
-            </div>
-        </div>
-    </div>
-    {% include "login_messages.html" %}
-</div>
-{% endblock %}
+{% extends "login_layout.html" %}
diff --git a/newsroom/templates/login_form.html b/newsroom/templates/login_form.html
index 901146770..2a2d10419 100644
--- a/newsroom/templates/login_form.html
+++ b/newsroom/templates/login_form.html
@@ -1,15 +1,19 @@
 <form class="form" role="form" id="formLogin" method="post">
     {{ form.csrf_token }}
 
+    <div style="display:none">
+        {{ form.firebase_status(type="hidden", id="firebase-status") }}
+    </div>
+
     {% include "form_alerts.html" %}
 
     <div class="form-group">
         <label for="email">{{ form.email.label.text }}</label>
-        {{ form.email(class="form-control", id="email", required="true") }}
+        {{ form.email(class="form-control", id="email", required="true", autocomplete="username") }}
     </div>
     <div class="form-group">
         <label for="password">{{ form.password.label.text }}</label>
-        {{ form.password(class="form-control", id="password", required="true") }}
+        {{ form.password(class="form-control", id="password", required="true", autocomplete="current-password") }}
     </div>
     <div class="form-check mb-4 p-0">
         <div class="form-check">
diff --git a/newsroom/templates/login_layout.html b/newsroom/templates/login_layout.html
new file mode 100644
index 000000000..5fbf020cf
--- /dev/null
+++ b/newsroom/templates/login_layout.html
@@ -0,0 +1,73 @@
+{% extends "layout_wire.html" %}
+
+{% block contentMain %}
+
+<div class="container-fluid py-5 overflow-auto nh-login-page__content">
+
+    {% include "login_messages.html" %}
+
+    <div class="row">
+        <div class="col-12 col-md-8 col-lg-6 col-xxl-4 mx-auto">
+            <div class="card border-0 bg-white box-shadow--z1 rounded--m">
+                <div class="card-header pt-4 border-0 bg-white rounded--m">
+                    {% block login_header %}
+                    <div class="login-logo">
+                        {% include 'login_logo.html' %}
+                    </div>
+                    {% block login_title %}
+                    <h5 class="mb-0">
+                        {{ gettext("Login") }}
+                    </h5>
+                    {% endblock %}
+                    {% endblock %}
+                </div>
+                <div class="card-body pt-1">
+                    {% block login_body %}
+                    {% include "login_form.html" %}
+                    {% endblock %}
+                </div>
+
+                {% if config.SAML_AUTH_ENABLED and request.endpoint == "auth.login" %}
+                <div class="card-body pt-1 pb-2">
+                    <form action="{{ url_for('auth.saml') }}">
+                        <button type="submit" title="{{ gettext('Login using Single Sign On') }}" class="nh-button nh-button--primary w-100">{{ config.SAML_LABEL }}</button>
+                    </form>
+                </div>
+                {% endif %}
+
+                <div class="card-footer bg-white border-0 text-muted small">
+                    {% block login_footer %}
+                    <p>{{ gettext('Forgot your password?') }} <a href="{{ url_for('auth.token', token_type='reset_password') }}">{{ gettext('Click here to reset.') }}</a>
+                        {% if config.SHOW_USER_REGISTER %}{{ gettext("Or you can") }} <a href="{{ url_for('auth.signup') }}">{{ gettext('click here to register.') }}</a>{% endif %}
+                    </p>
+                    {% endblock %}
+                </div>
+
+                {% if get_client_locales()|length is gt 1 and request.endpoint == "auth.login" %}
+                <div class="card-body pt-1">
+                    <form class="form" role="form" method="post" action="{{ url_for('auth.set_locale') }}">
+                        <div class="form-group">
+                            <label for="language">{{ gettext('Language') }}</label>
+                            <div class="field">
+                                <select name="locale" class="form-control" onchange="this.form.submit()">
+                                    {% for locale in get_client_locales() %}
+                                    <option value="{{ locale.locale }}" {% if locale.locale == get_locale() %}selected{% endif %}>{{ locale.name }}</option>
+                                    {% endfor %}
+                                </select>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}
+
+{% block script %}
+    {% if firebase %}
+        {% include "firebase_config.html" %}
+        {{ javascript_tag('firebase_login_js') | safe }}
+    {% endif %}
+{% endblock %}
diff --git a/newsroom/templates/request_token.html b/newsroom/templates/request_token.html
index fbbf4090a..4cbe1ead8 100644
--- a/newsroom/templates/request_token.html
+++ b/newsroom/templates/request_token.html
@@ -1,40 +1,38 @@
-{% extends "layout_wire.html" %}
-
-{% block contentMain %}
-
-<div class="container py-5">
-    <div class="row">
-        <div class="col-md-12">
-            <div class="row">
-                <div class="col-md-6 mx-auto">
-                    <div class="card">
-                        <div class="card-header">
-                            <h3 class="mb-0">{{ gettext("Password Reset") }}</h3>
-                        </div>
-                        <div class="card-body">
-                            <form class="form" role="form" id="formToken" method="post">
-
-                                {{ form.csrf_token }}
-
-                                {% include "form_alerts.html" %}
-
-                                <div class="form-group">
-                                    <label for="email">{{ form.email.label.text }}</label>
-                                    {{ form.email(class="form-control", id="email", required="true") }}
-                                </div>
-
-                                {% if token_type=='validate' %}
-                                    <button type="submit" class="btn btn-outline-primary ms-3 float-end">{{ gettext("Validate") }}</button>
-                                {% else %}
-                                    <button type="submit" class="btn btn-outline-primary ms-3 float-end">{{ gettext("Reset Password") }}</button>
-                                {% endif %}
-                            </form>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
+{% extends "login_layout.html" %}
+
+{% block login_title %}
+    <h3 class="mb-0">{{ gettext("Password Reset") }}</h3>
+{% endblock %}
+
+{% block login_body %}
+<form class="form" role="form" id="formToken" method="post">
+
+    {{ form.csrf_token }}
+
+    {% include "form_alerts.html" %}
+
+    <div class="form-group">
+        <label for="email">{{ form.email.label.text }}</label>
+        {{ form.email(class="form-control", id="email", required="true", autocomplete="username") }}
     </div>
-    {% include "login_messages.html" %}
-</div>
+
+    {% if token_type=='validate' %}
+        <button type="submit" id="validate-btn" class="nh-button nh-button--primary float-end">{{ gettext("Validate") }}</button>
+    {% else %}
+        <button type="submit" id="reset-password-btn" class="nh-button nh-button--primary float-end">{{ gettext("Reset Password") }}</button>
+    {% endif %}
+</form>
+{% endblock %}
+
+{% block login_footer %}
+{% endblock %}
+
+{% block script %}
+    {% if firebase %}
+        {% include "firebase_config.html" %}
+        <script>
+            window.nextUrl = "{{ url_for("auth.login", _external=True) | tojson }}";
+        </script>
+        {{ javascript_tag('firebase_reset_password_js') | safe }}
+    {% endif %}
 {% endblock %}
diff --git a/newsroom/templates/request_token_done.html b/newsroom/templates/request_token_done.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/newsroom/templates/scripts.html b/newsroom/templates/scripts.html
index e718624c1..93395efa5 100644
--- a/newsroom/templates/scripts.html
+++ b/newsroom/templates/scripts.html
@@ -1,3 +1,4 @@
+{% if session.get("user") %}
 <script>
     window.newsroom = {{ get_client_config() | tojson | safe }};
     window.notificationData = {{ get_initial_notifications() | tojson | safe }};
@@ -17,6 +18,7 @@
         advanced: `{{ render_search_tips_html('advanced') | safe }}`,
     }
 </script>
+{% endif %}
 
 {{ javascript_tag('newsroom_js') | safe }}
 
diff --git a/newsroom/templates/search_tips_advanced.fi.html b/newsroom/templates/search_tips_advanced.fi.html
new file mode 100644
index 000000000..bf11ed84c
--- /dev/null
+++ b/newsroom/templates/search_tips_advanced.fi.html
@@ -0,0 +1,5 @@
+<div class="tips-content">
+    <div>
+        <p>Tarkennettu sanahaku ohjaa hakuasi. Hakusivulta näet tarkemmat ohjeet ja vinkit hakuun.</p>
+    </div>
+</div>
diff --git a/newsroom/templates/search_tips_regular.fi.html b/newsroom/templates/search_tips_regular.fi.html
new file mode 100644
index 000000000..8d60e4171
--- /dev/null
+++ b/newsroom/templates/search_tips_regular.fi.html
@@ -0,0 +1,25 @@
+<div class="tips-content">
+    <div>
+        <p><b>Yleistä Mediapankin hauista</b></p>
+        <p>Mediapankki käyttää boolean-hakua, jossa erilaisia komentoja ja hakutermejä yhdistelemällä voi hakea juttujen otsikoista, leipätekstistä ja metatiedoista.</p>
+
+        <p>Jos hakukenttään kirjoittaa useamman kuin yhden sanan tai hakutermin, hakutuloksina esitetään jutut, joissa ne kaikki esiintyvät.</p>
+
+        <p>Mediapankin haku on hyvin tarkka siitä, että merkit ovat oikeanlaisia, joten jos haku ei anna odotettuja tuloksia, kokeile uudestaan näiden ohjeiden avulla. Esimerkiksi lainausmerkkien pitää olla juuri oikeanlaiset eli kuten tässä ohjeessa.</p>
+    </div>
+    <hr />
+    <div>
+        <p><b>Tärkeimmät hakutermit</b></p>
+        <p>* = katkaisee sanan, jotta voidaan ottaa huomioon taivutusmuodot. Esimerkiksi älä hae korhonen vaan korho*. Voit käyttää myös tähteä sanan sisällä. Jos esimerkiksi et muista, oliko haettava henkilö Silvennoinen vai Silventoinen, voit hakea Silven*oi*</p>
+
+        <p>"" = lainausmerkkien avulla voit tehdä kahden tai useamman sanan yhdistelmästä täsmällisen termin jota haetaan. Esimerkiksi voit hakea "eduskunnan kahvila", ei eduskunnan kahvila. Huom! Tähtisymboli ei toimi sitaattimerkkien sisällä.</p>
+
+        <p>AND tarkoittaa, että kaikkien hakutermien pitää olla haussa mukana. Monesti AND on tarpeeton Mediapankissa, koska välilyönti vastaa AND-termiä, mutta pitkissä ja monimutkaisissa hakulausekkeissa AND voi auttaa hahmottamaan, mitä oikeastaan on hakemassa.</p>
+
+        <p>OR tarkoittaa, että hakutulokseksi päätymiseen riittää, että joku hakutermeistä osuu.</p>
+
+        <p>NOT tarkoittaa, että jutut joissa on tämä hakutermi, eivät tule mukaan hakutuloksiin.</p>
+
+        <p>Lisää hakuohjeita: <a href="https://stt.fi/ajankohtaista-tietoa-media-asiakkaille/stt-mediapankki/">stt.fi/ajankohtaista-tietoa-media-asiakkaille/stt-mediapankki/</a></p>
+    </div>
+</div>
diff --git a/newsroom/types.py b/newsroom/types.py
index 61818be88..1fdef5aca 100644
--- a/newsroom/types.py
+++ b/newsroom/types.py
@@ -1,7 +1,15 @@
 from bson import ObjectId
-from typing import Dict, List, TypedDict, Any
+from typing import Dict, List, TypedDict, Any, Union, NoReturn
 from datetime import datetime
 from enum import Enum
+from flask_babel import LazyString
+
+
+def assert_never(value: NoReturn) -> NoReturn:
+    assert False, f"Unhandled value {value}"
+
+
+NameString = Union[str, LazyString]
 
 
 class Product(TypedDict, total=False):
@@ -49,18 +57,20 @@ class UserDashboardEntry(TypedDict):
     topic_ids: List[ObjectId]
 
 
-class UserData(TypedDict, total=False):
-    _id: ObjectId
+class UserRequired(TypedDict):
+    email: str
+    user_type: str
+
+
+class UserData(UserRequired, total=False):
     first_name: str
     last_name: str
-    email: str
     phone: str
     mobile: str
     role: str
     signup_details: Dict[str, Any]
     country: str
     company: ObjectId
-    user_type: str
     is_validated: bool
     is_enabled: bool
     is_approved: bool
@@ -82,7 +92,7 @@ class UserData(TypedDict, total=False):
 
 
 class User(UserData):
-    pass
+    _id: ObjectId
 
 
 class UserAuth(TypedDict):
@@ -98,22 +108,21 @@ class AuthProviderType(Enum):
     PASSWORD = "password"
     GOOGLE_OAUTH = "google_oauth"
     SAML = "saml"
+    FIREBASE = "firebase"
 
 
-class AuthProviderFeatures(TypedDict, total=False):
-    verify_email: bool
-
-
-class AuthProvider(TypedDict):
+class AuthProviderConfig(TypedDict):
     _id: str
-    name: str
+    name: NameString
     auth_type: AuthProviderType
-    features: AuthProviderFeatures
 
 
-class Company(TypedDict, total=False):
+class CompanyRequired(TypedDict):
     _id: ObjectId
     name: str
+
+
+class Company(CompanyRequired, total=False):
     products: List[ProductRef]
     sections: Dict[str, bool]
     restrict_coverage_info: bool
diff --git a/newsroom/users/views.py b/newsroom/users/views.py
index c3b27a0d3..697eb6c51 100644
--- a/newsroom/users/views.py
+++ b/newsroom/users/views.py
@@ -9,7 +9,7 @@
 from werkzeug.exceptions import BadRequest, NotFound
 
 from newsroom.user_roles import UserRole
-from newsroom.auth import get_user, get_user_by_email, get_company
+from newsroom.auth import get_user_by_email, get_company, get_user_required
 from newsroom.auth.utils import (
     send_token,
     add_token_data,
@@ -48,17 +48,19 @@ def get_settings_data():
 
 
 def get_view_data():
-    user = get_user()
-    company = user["company"] if user and user.get("company") else None
+    user = get_user_required()
+    company = get_company(user)
+    auth_provider = get_company_auth_provider(company)
     rv = {
         "user": user if user else None,
-        "company": str(company),
+        "company": str(company["_id"]) if company else "",
         "topics": get_user_topics(user["_id"]) if user else [],
         "companyName": get_user_company_name(user),
         "locators": get_vocabulary("locators"),
         "monitoring_list": get_monitoring_for_company(user),
         "ui_configs": {config["_id"]: config for config in query_resource("ui_config")},
         "groups": app.config.get("WIRE_GROUPS", []),
+        "authProviderFeatures": dict(auth_provider.features),
     }
 
     if app.config.get("ENABLE_MONITORING"):
@@ -150,12 +152,12 @@ def create():
         company = get_company(new_user)
         auth_provider = get_company_auth_provider(company)
 
-        if auth_provider.get("features", {}).get("verify_email"):
+        if auth_provider.features.verify_email:
             add_token_data(new_user)
 
         ids = get_resource_service("users").post([new_user])
 
-        if auth_provider.get("features", {}).get("verify_email"):
+        if auth_provider.features.verify_email:
             send_token(new_user, token_type="new_account", update_token=False)
 
         return jsonify({"success": True, "_id": ids[0]}), 201
@@ -177,7 +179,7 @@ def resent_invite(_id):
     elif user_is_company_admin and (company is None or user["company"] != ObjectId(company["_id"])):
         # Company admins can only resent invites for members of their company only
         flask.abort(403)
-    elif not auth_provider.get("features", {}).get("verify_email"):
+    elif not auth_provider.features.verify_email:
         # Can only regenerate new token if ``verify_email`` is enabled in ``AuthProvider``
         flask.abort(403)
 
diff --git a/newsroom/web/default_settings.py b/newsroom/web/default_settings.py
index 6a5dbd8eb..b9f9bff5a 100644
--- a/newsroom/web/default_settings.py
+++ b/newsroom/web/default_settings.py
@@ -1,9 +1,9 @@
 import os
 import pathlib
-from typing import List
 import tzlocal
 import logging
 
+from typing import List
 from kombu import Queue, Exchange
 from celery.schedules import crontab
 from superdesk.default_settings import strtobool, env, local_to_utc_hour
@@ -54,6 +54,8 @@
     CACHE_URL,
 )
 
+from newsroom.types import AuthProviderConfig, AuthProviderType
+
 logger = logging.getLogger()
 
 DEBUG = strtobool(os.environ.get("NEWSROOM_DEBUG", "false"))
@@ -640,23 +642,24 @@
     "location.name",
 ]
 
+
 #: The available authentication providers
 #:
 #: .. versionadded:: 2.5.0
 #:
-AUTH_PROVIDERS = [
+AUTH_PROVIDERS: List[AuthProviderConfig] = [
     {
         "_id": "newshub",
         "name": lazy_gettext("Newshub"),
-        "auth_type": "password",
-        "features": {"verify_email": True},
+        "auth_type": AuthProviderType.PASSWORD,
     }
 ]
 
-#:
-#: If `True` it will show multi day events only on starting day,
-#  when `False` those will be visible on every day.
-#:
-#: .. versionadded: 2.5.0
-#:
-AGENDA_SHOW_MULTIDAY_ON_START_ONLY = True
+FIREBASE_CLIENT_CONFIG = {
+    "apiKey": env("FIREBASE_API_KEY"),
+    "authDomain": env("FIREBASE_AUTH_DOMAIN"),
+    "projectId": env("FIREBASE_PROJECT_ID"),
+    "messagingSenderId": env("FIREBASE_SENDER_ID"),
+}
+
+FIREBASE_ENABLED = bool(FIREBASE_CLIENT_CONFIG["apiKey"] and FIREBASE_CLIENT_CONFIG["authDomain"])
diff --git a/newsroom/wire/formatters/base.py b/newsroom/wire/formatters/base.py
index 904de3ed4..0c510d5d6 100644
--- a/newsroom/wire/formatters/base.py
+++ b/newsroom/wire/formatters/base.py
@@ -13,6 +13,7 @@ class BaseFormatter(metaclass=FormatterRegistry):
     MIMETYPE = None
     FILE_EXTENSION = None
     MEDIATYPE = "text"
+    MULTI = False
 
     def format_filename(self, item):
         assert self.FILE_EXTENSION
diff --git a/newsroom/wire/views.py b/newsroom/wire/views.py
index 204a44d39..a20a36aff 100644
--- a/newsroom/wire/views.py
+++ b/newsroom/wire/views.py
@@ -304,6 +304,11 @@ def download(_ids):
         _file.seek(0)
         mimetype = formatter.get_mimetype(item)
         attachment_filename = secure_filename(formatter.format_filename(item))
+    elif formatter.MULTI and len(items) != 1:
+        # if we have multiple items, so in this case we stored their data in one csv file.
+        csv_data, attachment_filename = formatter.format_events(items, item_type=item_type)
+        _file.write(csv_data)
+        _file.seek(0)
     else:
         with zipfile.ZipFile(_file, mode="w") as zf:
             for item in items:
diff --git a/package-lock.json b/package-lock.json
index f38c2692f..a41184516 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,40 +19,79 @@
       }
     },
     "@babel/code-frame": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
-      "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.4.tgz",
+      "integrity": "sha512-r1IONyb6Ia+jYR2vvIDhdWdlTGhqbBoFqLTQidzZ4kepUFH15ejXvFHxCVbtl7BOXIudsIubf4E81xeA3h3IXA==",
       "requires": {
-        "@babel/highlight": "^7.22.5"
+        "@babel/highlight": "^7.23.4",
+        "chalk": "^2.4.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "@babel/compat-data": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz",
-      "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ=="
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.3.tgz",
+      "integrity": "sha512-BmR4bWbDIoFJmJ9z2cZ8Gmm2MXgEDgjdWgpKmKWUt54UGFJdlj31ECtbaDvCG/qVdG3AQ1SfpZEs01lUFbzLOQ=="
     },
     "@babel/core": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz",
-      "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.3.tgz",
+      "integrity": "sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==",
       "requires": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.22.5",
-        "@babel/generator": "^7.22.9",
-        "@babel/helper-compilation-targets": "^7.22.9",
-        "@babel/helper-module-transforms": "^7.22.9",
-        "@babel/helpers": "^7.22.6",
-        "@babel/parser": "^7.22.7",
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.8",
-        "@babel/types": "^7.22.5",
-        "convert-source-map": "^1.7.0",
+        "@babel/code-frame": "^7.22.13",
+        "@babel/generator": "^7.23.3",
+        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/helper-module-transforms": "^7.23.3",
+        "@babel/helpers": "^7.23.2",
+        "@babel/parser": "^7.23.3",
+        "@babel/template": "^7.22.15",
+        "@babel/traverse": "^7.23.3",
+        "@babel/types": "^7.23.3",
+        "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.2",
+        "json5": "^2.2.3",
         "semver": "^6.3.1"
       },
       "dependencies": {
+        "convert-source-map": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+          "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
+        },
         "json5": {
           "version": "2.2.3",
           "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
@@ -66,11 +105,11 @@
       }
     },
     "@babel/generator": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz",
-      "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.4.tgz",
+      "integrity": "sha512-esuS49Cga3HcThFNebGhlgsrVLkvhqvYDTzgjfFFlHJcIfLe5jFmRRfCQ1KuBfc4Jrtn3ndLgKWAKjBE+IraYQ==",
       "requires": {
-        "@babel/types": "^7.22.5",
+        "@babel/types": "^7.23.4",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -84,26 +123,26 @@
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz",
-      "integrity": "sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz",
+      "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==",
       "requires": {
         "@babel/compat-data": "^7.22.9",
-        "@babel/helper-validator-option": "^7.22.5",
+        "@babel/helper-validator-option": "^7.22.15",
         "browserslist": "^4.21.9",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
       },
       "dependencies": {
         "browserslist": {
-          "version": "4.21.10",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
-          "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
+          "version": "4.22.1",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz",
+          "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==",
           "requires": {
-            "caniuse-lite": "^1.0.30001517",
-            "electron-to-chromium": "^1.4.477",
+            "caniuse-lite": "^1.0.30001541",
+            "electron-to-chromium": "^1.4.535",
             "node-releases": "^2.0.13",
-            "update-browserslist-db": "^1.0.11"
+            "update-browserslist-db": "^1.0.13"
           }
         },
         "lru-cache": {
@@ -127,17 +166,17 @@
       }
     },
     "@babel/helper-environment-visitor": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
-      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q=="
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
     },
     "@babel/helper-function-name": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
-      "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
       "requires": {
-        "@babel/template": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.23.0"
       }
     },
     "@babel/helper-hoist-variables": {
@@ -149,23 +188,23 @@
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
-      "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
+      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
       "requires": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.22.15"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
-      "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
+      "version": "7.23.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
+      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
       "requires": {
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-module-imports": "^7.22.15",
         "@babel/helper-simple-access": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.5"
+        "@babel/helper-validator-identifier": "^7.22.20"
       }
     },
     "@babel/helper-simple-access": {
@@ -185,37 +224,37 @@
       }
     },
     "@babel/helper-string-parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw=="
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
+      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ=="
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
-      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ=="
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="
     },
     "@babel/helper-validator-option": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
-      "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw=="
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz",
+      "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA=="
     },
     "@babel/helpers": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.6.tgz",
-      "integrity": "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.4.tgz",
+      "integrity": "sha512-HfcMizYz10cr3h29VqyfGL6ZWIjTwWfvYBMsBVGwpcbhNGe3wQ1ZXZRPzZoAHhd9OqHadHqjQ89iVKINXnbzuw==",
       "requires": {
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.6",
-        "@babel/types": "^7.22.5"
+        "@babel/template": "^7.22.15",
+        "@babel/traverse": "^7.23.4",
+        "@babel/types": "^7.23.4"
       }
     },
     "@babel/highlight": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz",
-      "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
+      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
       "requires": {
-        "@babel/helper-validator-identifier": "^7.22.5",
-        "chalk": "^2.0.0",
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       },
       "dependencies": {
@@ -253,41 +292,41 @@
       }
     },
     "@babel/parser": {
-      "version": "7.22.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz",
-      "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q=="
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.4.tgz",
+      "integrity": "sha512-vf3Xna6UEprW+7t6EtOmFpHNAuxw3xqPZghy+brsnusscJRW5BMUzzHZc5ICjULee81WeUV2jjakG09MDglJXQ=="
     },
     "@babel/runtime": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz",
-      "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.4.tgz",
+      "integrity": "sha512-2Yv65nlWnWlSpe3fXEyX5i7fx5kIKo4Qbcj+hMO0odwaneFjfXw5fdum+4yL20O0QiaHpia0cYQ9xpNMqrBwHg==",
       "requires": {
-        "regenerator-runtime": "^0.13.11"
+        "regenerator-runtime": "^0.14.0"
       }
     },
     "@babel/template": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
-      "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
       "requires": {
-        "@babel/code-frame": "^7.22.5",
-        "@babel/parser": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
       }
     },
     "@babel/traverse": {
-      "version": "7.22.8",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz",
-      "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==",
-      "requires": {
-        "@babel/code-frame": "^7.22.5",
-        "@babel/generator": "^7.22.7",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.4.tgz",
+      "integrity": "sha512-IYM8wSUwunWTB6tFC2dkKZhxbIjHoWemdK+3f8/wq8aKhbUscxD5MX72ubd90fxvFknaLPeGw5ycU84V1obHJg==",
+      "requires": {
+        "@babel/code-frame": "^7.23.4",
+        "@babel/generator": "^7.23.4",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.22.7",
-        "@babel/types": "^7.22.5",
+        "@babel/parser": "^7.23.4",
+        "@babel/types": "^7.23.4",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -300,12 +339,12 @@
       }
     },
     "@babel/types": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz",
-      "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.4.tgz",
+      "integrity": "sha512-7uIFwVYpoplT5jp/kVv6EF93VaJ8H+Yn5IczYiaAi98ajzjfoZfslet/e0sLh+wVBjb2qqIut1b0S26VSafsSQ==",
       "requires": {
-        "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/helper-string-parser": "^7.23.4",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       },
       "dependencies": {
@@ -317,35 +356,21 @@
       }
     },
     "@dnd-kit/accessibility": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@dnd-kit/accessibility/-/accessibility-3.0.1.tgz",
-      "integrity": "sha512-HXRrwS9YUYQO9lFRc/49uO/VICbM+O+ZRpFDe9Pd1rwVv2PCNkRiTZRdxrDgng/UkvdC3Re9r2vwPpXXrWeFzg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/accessibility/-/accessibility-3.1.0.tgz",
+      "integrity": "sha512-ea7IkhKvlJUv9iSHJOnxinBcoOI3ppGnnL+VDJ75O45Nss6HtZd8IdN8touXPDtASfeI2T2LImb8VOZcL47wjQ==",
       "requires": {
         "tslib": "^2.0.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.6.2",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-          "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
-        }
       }
     },
     "@dnd-kit/core": {
-      "version": "6.0.8",
-      "resolved": "https://registry.npmjs.org/@dnd-kit/core/-/core-6.0.8.tgz",
-      "integrity": "sha512-lYaoP8yHTQSLlZe6Rr9qogouGUz9oRUj4AHhDQGQzq/hqaJRpFo65X+JKsdHf8oUFBzx5A+SJPUvxAwTF2OabA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/core/-/core-6.1.0.tgz",
+      "integrity": "sha512-J3cQBClB4TVxwGo3KEjssGEXNJqGVWx17aRTZ1ob0FliR5IjYgTxl5YJbKTzA6IzrtelotH19v6y7uoIRUZPSg==",
       "requires": {
-        "@dnd-kit/accessibility": "^3.0.0",
-        "@dnd-kit/utilities": "^3.2.1",
+        "@dnd-kit/accessibility": "^3.1.0",
+        "@dnd-kit/utilities": "^3.2.2",
         "tslib": "^2.0.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.6.2",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-          "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
-        }
       }
     },
     "@dnd-kit/sortable": {
@@ -355,28 +380,14 @@
       "requires": {
         "@dnd-kit/utilities": "^3.2.0",
         "tslib": "^2.0.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.6.2",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-          "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
-        }
       }
     },
     "@dnd-kit/utilities": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/@dnd-kit/utilities/-/utilities-3.2.1.tgz",
-      "integrity": "sha512-OOXqISfvBw/1REtkSK2N3Fi2EQiLMlWUlqnOK/UpOISqBZPWpE6TqL+jcPtMOkE8TqYGiURvRdPSI9hltNUjEA==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/utilities/-/utilities-3.2.2.tgz",
+      "integrity": "sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg==",
       "requires": {
         "tslib": "^2.0.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.6.2",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-          "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
-        }
       }
     },
     "@eslint-community/eslint-utils": {
@@ -388,14 +399,14 @@
       }
     },
     "@eslint-community/regexpp": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
-      "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw=="
+      "version": "4.10.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
+      "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA=="
     },
     "@eslint/eslintrc": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.1.tgz",
-      "integrity": "sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz",
+      "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==",
       "requires": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
@@ -414,9 +425,9 @@
           "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
         },
         "globals": {
-          "version": "13.20.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-          "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+          "version": "13.23.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
+          "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
           "requires": {
             "type-fest": "^0.20.2"
           }
@@ -432,16 +443,531 @@
       }
     },
     "@eslint/js": {
-      "version": "8.46.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.46.0.tgz",
-      "integrity": "sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA=="
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz",
+      "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ=="
+    },
+    "@firebase/analytics": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.10.0.tgz",
+      "integrity": "sha512-Locv8gAqx0e+GX/0SI3dzmBY5e9kjVDtD+3zCFLJ0tH2hJwuCAiL+5WkHuxKj92rqQj/rvkBUCfA1ewlX2hehg==",
+      "requires": {
+        "@firebase/component": "0.6.4",
+        "@firebase/installations": "0.6.4",
+        "@firebase/logger": "0.4.0",
+        "@firebase/util": "1.9.3",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/analytics-compat": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/@firebase/analytics-compat/-/analytics-compat-0.2.6.tgz",
+      "integrity": "sha512-4MqpVLFkGK7NJf/5wPEEP7ePBJatwYpyjgJ+wQHQGHfzaCDgntOnl9rL2vbVGGKCnRqWtZDIWhctB86UWXaX2Q==",
+      "requires": {
+        "@firebase/analytics": "0.10.0",
+        "@firebase/analytics-types": "0.8.0",
+        "@firebase/component": "0.6.4",
+        "@firebase/util": "1.9.3",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/analytics-types": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/@firebase/analytics-types/-/analytics-types-0.8.0.tgz",
+      "integrity": "sha512-iRP+QKI2+oz3UAh4nPEq14CsEjrjD6a5+fuypjScisAh9kXKFvdJOZJDwk7kikLvWVLGEs9+kIUS4LPQV7VZVw=="
+    },
+    "@firebase/app": {
+      "version": "0.9.13",
+      "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.9.13.tgz",
+      "integrity": "sha512-GfiI1JxJ7ecluEmDjPzseRXk/PX31hS7+tjgBopL7XjB2hLUdR+0FTMXy2Q3/hXezypDvU6or7gVFizDESrkXw==",
+      "requires": {
+        "@firebase/component": "0.6.4",
+        "@firebase/logger": "0.4.0",
+        "@firebase/util": "1.9.3",
+        "idb": "7.1.1",
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "idb": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz",
+          "integrity": "sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ=="
+        }
+      }
+    },
+    "@firebase/app-check": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/@firebase/app-check/-/app-check-0.8.0.tgz",
+      "integrity": "sha512-dRDnhkcaC2FspMiRK/Vbp+PfsOAEP6ZElGm9iGFJ9fDqHoPs0HOPn7dwpJ51lCFi1+2/7n5pRPGhqF/F03I97g==",
+      "requires": {
+        "@firebase/component": "0.6.4",
+        "@firebase/logger": "0.4.0",
+        "@firebase/util": "1.9.3",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/app-check-compat": {
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/@firebase/app-check-compat/-/app-check-compat-0.3.7.tgz",
+      "integrity": "sha512-cW682AxsyP1G+Z0/P7pO/WT2CzYlNxoNe5QejVarW2o5ZxeWSSPAiVEwpEpQR/bUlUmdeWThYTMvBWaopdBsqw==",
+      "requires": {
+        "@firebase/app-check": "0.8.0",
+        "@firebase/app-check-types": "0.5.0",
+        "@firebase/component": "0.6.4",
+        "@firebase/logger": "0.4.0",
+        "@firebase/util": "1.9.3",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/app-check-interop-types": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@firebase/app-check-interop-types/-/app-check-interop-types-0.3.0.tgz",
+      "integrity": "sha512-xAxHPZPIgFXnI+vb4sbBjZcde7ZluzPPaSK7Lx3/nmuVk4TjZvnL8ONnkd4ERQKL8WePQySU+pRcWkh8rDf5Sg=="
+    },
+    "@firebase/app-check-types": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@firebase/app-check-types/-/app-check-types-0.5.0.tgz",
+      "integrity": "sha512-uwSUj32Mlubybw7tedRzR24RP8M8JUVR3NPiMk3/Z4bCmgEKTlQBwMXrehDAZ2wF+TsBq0SN1c6ema71U/JPyQ=="
+    },
+    "@firebase/app-compat": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.2.13.tgz",
+      "integrity": "sha512-j6ANZaWjeVy5zg6X7uiqh6lM6o3n3LD1+/SJFNs9V781xyryyZWXe+tmnWNWPkP086QfJoNkWN9pMQRqSG4vMg==",
+      "requires": {
+        "@firebase/app": "0.9.13",
+        "@firebase/component": "0.6.4",
+        "@firebase/logger": "0.4.0",
+        "@firebase/util": "1.9.3",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/app-types": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.9.0.tgz",
+      "integrity": "sha512-AeweANOIo0Mb8GiYm3xhTEBVCmPwTYAu9Hcd2qSkLuga/6+j9b1Jskl5bpiSQWy9eJ/j5pavxj6eYogmnuzm+Q=="
+    },
+    "@firebase/auth": {
+      "version": "0.23.2",
+      "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.23.2.tgz",
+      "integrity": "sha512-dM9iJ0R6tI1JczuGSxXmQbXAgtYie0K4WvKcuyuSTCu9V8eEDiz4tfa1sO3txsfvwg7nOY3AjoCyMYEdqZ8hdg==",
+      "requires": {
+        "@firebase/component": "0.6.4",
+        "@firebase/logger": "0.4.0",
+        "@firebase/util": "1.9.3",
+        "node-fetch": "2.6.7",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/auth-compat": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@firebase/auth-compat/-/auth-compat-0.4.2.tgz",
+      "integrity": "sha512-Q30e77DWXFmXEt5dg5JbqEDpjw9y3/PcP9LslDPR7fARmAOTIY9MM6HXzm9KC+dlrKH/+p6l8g9ifJiam9mc4A==",
+      "requires": {
+        "@firebase/auth": "0.23.2",
+        "@firebase/auth-types": "0.12.0",
+        "@firebase/component": "0.6.4",
+        "@firebase/util": "1.9.3",
+        "node-fetch": "2.6.7",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/auth-interop-types": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.2.1.tgz",
+      "integrity": "sha512-VOaGzKp65MY6P5FI84TfYKBXEPi6LmOCSMMzys6o2BN2LOsqy7pCuZCup7NYnfbk5OkkQKzvIfHOzTm0UDpkyg=="
+    },
+    "@firebase/auth-types": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@firebase/auth-types/-/auth-types-0.12.0.tgz",
+      "integrity": "sha512-pPwaZt+SPOshK8xNoiQlK5XIrS97kFYc3Rc7xmy373QsOJ9MmqXxLaYssP5Kcds4wd2qK//amx/c+A8O2fVeZA=="
+    },
+    "@firebase/component": {
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.4.tgz",
+      "integrity": "sha512-rLMyrXuO9jcAUCaQXCMjCMUsWrba5fzHlNK24xz5j2W6A/SRmK8mZJ/hn7V0fViLbxC0lPMtrK1eYzk6Fg03jA==",
+      "requires": {
+        "@firebase/util": "1.9.3",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/database": {
+      "version": "0.14.4",
+      "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.14.4.tgz",
+      "integrity": "sha512-+Ea/IKGwh42jwdjCyzTmeZeLM3oy1h0mFPsTy6OqCWzcu/KFqRAr5Tt1HRCOBlNOdbh84JPZC47WLU18n2VbxQ==",
+      "requires": {
+        "@firebase/auth-interop-types": "0.2.1",
+        "@firebase/component": "0.6.4",
+        "@firebase/logger": "0.4.0",
+        "@firebase/util": "1.9.3",
+        "faye-websocket": "0.11.4",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/database-compat": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-0.3.4.tgz",
+      "integrity": "sha512-kuAW+l+sLMUKBThnvxvUZ+Q1ZrF/vFJ58iUY9kAcbX48U03nVzIF6Tmkf0p3WVQwMqiXguSgtOPIB6ZCeF+5Gg==",
+      "requires": {
+        "@firebase/component": "0.6.4",
+        "@firebase/database": "0.14.4",
+        "@firebase/database-types": "0.10.4",
+        "@firebase/logger": "0.4.0",
+        "@firebase/util": "1.9.3",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/database-types": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.10.4.tgz",
+      "integrity": "sha512-dPySn0vJ/89ZeBac70T+2tWWPiJXWbmRygYv0smT5TfE3hDrQ09eKMF3Y+vMlTdrMWq7mUdYW5REWPSGH4kAZQ==",
+      "requires": {
+        "@firebase/app-types": "0.9.0",
+        "@firebase/util": "1.9.3"
+      }
+    },
+    "@firebase/firestore": {
+      "version": "3.13.0",
+      "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-3.13.0.tgz",
+      "integrity": "sha512-NwcnU+madJXQ4fbLkGx1bWvL612IJN/qO6bZ6dlPmyf7QRyu5azUosijdAN675r+bOOJxMtP1Bv981bHBXAbUg==",
+      "requires": {
+        "@firebase/component": "0.6.4",
+        "@firebase/logger": "0.4.0",
+        "@firebase/util": "1.9.3",
+        "@firebase/webchannel-wrapper": "0.10.1",
+        "@grpc/grpc-js": "~1.7.0",
+        "@grpc/proto-loader": "^0.6.13",
+        "node-fetch": "2.6.7",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/firestore-compat": {
+      "version": "0.3.12",
+      "resolved": "https://registry.npmjs.org/@firebase/firestore-compat/-/firestore-compat-0.3.12.tgz",
+      "integrity": "sha512-mazuNGAx5Kt9Nph0pm6ULJFp/+j7GSsx+Ncw1GrnKl+ft1CQ4q2LcUssXnjqkX2Ry0fNGqUzC1mfIUrk9bYtjQ==",
+      "requires": {
+        "@firebase/component": "0.6.4",
+        "@firebase/firestore": "3.13.0",
+        "@firebase/firestore-types": "2.5.1",
+        "@firebase/util": "1.9.3",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/firestore-types": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@firebase/firestore-types/-/firestore-types-2.5.1.tgz",
+      "integrity": "sha512-xG0CA6EMfYo8YeUxC8FeDzf6W3FX1cLlcAGBYV6Cku12sZRI81oWcu61RSKM66K6kUENP+78Qm8mvroBcm1whw=="
+    },
+    "@firebase/functions": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.10.0.tgz",
+      "integrity": "sha512-2U+fMNxTYhtwSpkkR6WbBcuNMOVaI7MaH3cZ6UAeNfj7AgEwHwMIFLPpC13YNZhno219F0lfxzTAA0N62ndWzA==",
+      "requires": {
+        "@firebase/app-check-interop-types": "0.3.0",
+        "@firebase/auth-interop-types": "0.2.1",
+        "@firebase/component": "0.6.4",
+        "@firebase/messaging-interop-types": "0.2.0",
+        "@firebase/util": "1.9.3",
+        "node-fetch": "2.6.7",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/functions-compat": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@firebase/functions-compat/-/functions-compat-0.3.5.tgz",
+      "integrity": "sha512-uD4jwgwVqdWf6uc3NRKF8cSZ0JwGqSlyhPgackyUPe+GAtnERpS4+Vr66g0b3Gge0ezG4iyHo/EXW/Hjx7QhHw==",
+      "requires": {
+        "@firebase/component": "0.6.4",
+        "@firebase/functions": "0.10.0",
+        "@firebase/functions-types": "0.6.0",
+        "@firebase/util": "1.9.3",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/functions-types": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/@firebase/functions-types/-/functions-types-0.6.0.tgz",
+      "integrity": "sha512-hfEw5VJtgWXIRf92ImLkgENqpL6IWpYaXVYiRkFY1jJ9+6tIhWM7IzzwbevwIIud/jaxKVdRzD7QBWfPmkwCYw=="
+    },
+    "@firebase/installations": {
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.6.4.tgz",
+      "integrity": "sha512-u5y88rtsp7NYkCHC3ElbFBrPtieUybZluXyzl7+4BsIz4sqb4vSAuwHEUgCgCeaQhvsnxDEU6icly8U9zsJigA==",
+      "requires": {
+        "@firebase/component": "0.6.4",
+        "@firebase/util": "1.9.3",
+        "idb": "7.0.1",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/installations-compat": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/@firebase/installations-compat/-/installations-compat-0.2.4.tgz",
+      "integrity": "sha512-LI9dYjp0aT9Njkn9U4JRrDqQ6KXeAmFbRC0E7jI7+hxl5YmRWysq5qgQl22hcWpTk+cm3es66d/apoDU/A9n6Q==",
+      "requires": {
+        "@firebase/component": "0.6.4",
+        "@firebase/installations": "0.6.4",
+        "@firebase/installations-types": "0.5.0",
+        "@firebase/util": "1.9.3",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/installations-types": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@firebase/installations-types/-/installations-types-0.5.0.tgz",
+      "integrity": "sha512-9DP+RGfzoI2jH7gY4SlzqvZ+hr7gYzPODrbzVD82Y12kScZ6ZpRg/i3j6rleto8vTFC8n6Len4560FnV1w2IRg=="
+    },
+    "@firebase/logger": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.4.0.tgz",
+      "integrity": "sha512-eRKSeykumZ5+cJPdxxJRgAC3G5NknY2GwEbKfymdnXtnT0Ucm4pspfR6GT4MUQEDuJwRVbVcSx85kgJulMoFFA==",
+      "requires": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/messaging": {
+      "version": "0.12.4",
+      "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.12.4.tgz",
+      "integrity": "sha512-6JLZct6zUaex4g7HI3QbzeUrg9xcnmDAPTWpkoMpd/GoSVWH98zDoWXMGrcvHeCAIsLpFMe4MPoZkJbrPhaASw==",
+      "requires": {
+        "@firebase/component": "0.6.4",
+        "@firebase/installations": "0.6.4",
+        "@firebase/messaging-interop-types": "0.2.0",
+        "@firebase/util": "1.9.3",
+        "idb": "7.0.1",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/messaging-compat": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/@firebase/messaging-compat/-/messaging-compat-0.2.4.tgz",
+      "integrity": "sha512-lyFjeUhIsPRYDPNIkYX1LcZMpoVbBWXX4rPl7c/rqc7G+EUea7IEtSt4MxTvh6fDfPuzLn7+FZADfscC+tNMfg==",
+      "requires": {
+        "@firebase/component": "0.6.4",
+        "@firebase/messaging": "0.12.4",
+        "@firebase/util": "1.9.3",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/messaging-interop-types": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@firebase/messaging-interop-types/-/messaging-interop-types-0.2.0.tgz",
+      "integrity": "sha512-ujA8dcRuVeBixGR9CtegfpU4YmZf3Lt7QYkcj693FFannwNuZgfAYaTmbJ40dtjB81SAu6tbFPL9YLNT15KmOQ=="
+    },
+    "@firebase/performance": {
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.6.4.tgz",
+      "integrity": "sha512-HfTn/bd8mfy/61vEqaBelNiNnvAbUtME2S25A67Nb34zVuCSCRIX4SseXY6zBnOFj3oLisaEqhVcJmVPAej67g==",
+      "requires": {
+        "@firebase/component": "0.6.4",
+        "@firebase/installations": "0.6.4",
+        "@firebase/logger": "0.4.0",
+        "@firebase/util": "1.9.3",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/performance-compat": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/@firebase/performance-compat/-/performance-compat-0.2.4.tgz",
+      "integrity": "sha512-nnHUb8uP9G8islzcld/k6Bg5RhX62VpbAb/Anj7IXs/hp32Eb2LqFPZK4sy3pKkBUO5wcrlRWQa6wKOxqlUqsg==",
+      "requires": {
+        "@firebase/component": "0.6.4",
+        "@firebase/logger": "0.4.0",
+        "@firebase/performance": "0.6.4",
+        "@firebase/performance-types": "0.2.0",
+        "@firebase/util": "1.9.3",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/performance-types": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@firebase/performance-types/-/performance-types-0.2.0.tgz",
+      "integrity": "sha512-kYrbr8e/CYr1KLrLYZZt2noNnf+pRwDq2KK9Au9jHrBMnb0/C9X9yWSXmZkFt4UIdsQknBq8uBB7fsybZdOBTA=="
+    },
+    "@firebase/remote-config": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.4.4.tgz",
+      "integrity": "sha512-x1ioTHGX8ZwDSTOVp8PBLv2/wfwKzb4pxi0gFezS5GCJwbLlloUH4YYZHHS83IPxnua8b6l0IXUaWd0RgbWwzQ==",
+      "requires": {
+        "@firebase/component": "0.6.4",
+        "@firebase/installations": "0.6.4",
+        "@firebase/logger": "0.4.0",
+        "@firebase/util": "1.9.3",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/remote-config-compat": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/@firebase/remote-config-compat/-/remote-config-compat-0.2.4.tgz",
+      "integrity": "sha512-FKiki53jZirrDFkBHglB3C07j5wBpitAaj8kLME6g8Mx+aq7u9P7qfmuSRytiOItADhWUj7O1JIv7n9q87SuwA==",
+      "requires": {
+        "@firebase/component": "0.6.4",
+        "@firebase/logger": "0.4.0",
+        "@firebase/remote-config": "0.4.4",
+        "@firebase/remote-config-types": "0.3.0",
+        "@firebase/util": "1.9.3",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/remote-config-types": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@firebase/remote-config-types/-/remote-config-types-0.3.0.tgz",
+      "integrity": "sha512-RtEH4vdcbXZuZWRZbIRmQVBNsE7VDQpet2qFvq6vwKLBIQRQR5Kh58M4ok3A3US8Sr3rubYnaGqZSurCwI8uMA=="
+    },
+    "@firebase/storage": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.11.2.tgz",
+      "integrity": "sha512-CtvoFaBI4hGXlXbaCHf8humajkbXhs39Nbh6MbNxtwJiCqxPy9iH3D3CCfXAvP0QvAAwmJUTK3+z9a++Kc4nkA==",
+      "requires": {
+        "@firebase/component": "0.6.4",
+        "@firebase/util": "1.9.3",
+        "node-fetch": "2.6.7",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/storage-compat": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@firebase/storage-compat/-/storage-compat-0.3.2.tgz",
+      "integrity": "sha512-wvsXlLa9DVOMQJckbDNhXKKxRNNewyUhhbXev3t8kSgoCotd1v3MmqhKKz93ePhDnhHnDs7bYHy+Qa8dRY6BXw==",
+      "requires": {
+        "@firebase/component": "0.6.4",
+        "@firebase/storage": "0.11.2",
+        "@firebase/storage-types": "0.8.0",
+        "@firebase/util": "1.9.3",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/storage-types": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/@firebase/storage-types/-/storage-types-0.8.0.tgz",
+      "integrity": "sha512-isRHcGrTs9kITJC0AVehHfpraWFui39MPaU7Eo8QfWlqW7YPymBmRgjDrlOgFdURh6Cdeg07zmkLP5tzTKRSpg=="
+    },
+    "@firebase/util": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
+      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "requires": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "@firebase/webchannel-wrapper": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.10.1.tgz",
+      "integrity": "sha512-Dq5rYfEpdeel0bLVN+nfD1VWmzCkK+pJbSjIawGE+RY4+NIJqhbUDDQjvV0NUK84fMfwxvtFoCtEe70HfZjFcw=="
+    },
+    "@grpc/grpc-js": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.7.3.tgz",
+      "integrity": "sha512-H9l79u4kJ2PVSxUNA08HMYAnUBLj9v6KjYQ7SQ71hOZcEXhShE/y5iQCesP8+6/Ik/7i2O0a10bPquIcYfufog==",
+      "requires": {
+        "@grpc/proto-loader": "^0.7.0",
+        "@types/node": ">=12.12.47"
+      },
+      "dependencies": {
+        "@grpc/proto-loader": {
+          "version": "0.7.10",
+          "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.10.tgz",
+          "integrity": "sha512-CAqDfoaQ8ykFd9zqBDn4k6iWT9loLAlc2ETmDFS9JCD70gDcnA4L3AFEo2iV7KyAtAAHFW9ftq1Fz+Vsgq80RQ==",
+          "requires": {
+            "lodash.camelcase": "^4.3.0",
+            "long": "^5.0.0",
+            "protobufjs": "^7.2.4",
+            "yargs": "^17.7.2"
+          }
+        }
+      }
+    },
+    "@grpc/proto-loader": {
+      "version": "0.6.13",
+      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.13.tgz",
+      "integrity": "sha512-FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g==",
+      "requires": {
+        "@types/long": "^4.0.1",
+        "lodash.camelcase": "^4.3.0",
+        "long": "^4.0.0",
+        "protobufjs": "^6.11.3",
+        "yargs": "^16.2.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+        },
+        "cliui": {
+          "version": "7.0.4",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+          "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+          "requires": {
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^7.0.0"
+          }
+        },
+        "long": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
+          "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
+        },
+        "protobufjs": {
+          "version": "6.11.4",
+          "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.4.tgz",
+          "integrity": "sha512-5kQWPaJHi1WoCpjTGszzQ32PG2F4+wRY6BmAT4Vfw56Q2FZ4YZzK20xUYQH4YkfehY1e6QSICrJquM6xXZNcrw==",
+          "requires": {
+            "@protobufjs/aspromise": "^1.1.2",
+            "@protobufjs/base64": "^1.1.2",
+            "@protobufjs/codegen": "^2.0.4",
+            "@protobufjs/eventemitter": "^1.1.0",
+            "@protobufjs/fetch": "^1.1.0",
+            "@protobufjs/float": "^1.0.2",
+            "@protobufjs/inquire": "^1.1.0",
+            "@protobufjs/path": "^1.1.2",
+            "@protobufjs/pool": "^1.1.0",
+            "@protobufjs/utf8": "^1.1.0",
+            "@types/long": "^4.0.1",
+            "@types/node": ">=13.7.0",
+            "long": "^4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "requires": {
+            "ansi-regex": "^5.0.1"
+          }
+        },
+        "y18n": {
+          "version": "5.0.8",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
+        },
+        "yargs": {
+          "version": "16.2.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+          "requires": {
+            "cliui": "^7.0.2",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
+            "require-directory": "^2.1.1",
+            "string-width": "^4.2.0",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^20.2.2"
+          }
+        },
+        "yargs-parser": {
+          "version": "20.2.9",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+          "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="
+        }
+      }
     },
     "@humanwhocodes/config-array": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
-      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
+      "version": "0.11.13",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz",
+      "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==",
       "requires": {
-        "@humanwhocodes/object-schema": "^1.2.1",
+        "@humanwhocodes/object-schema": "^2.0.1",
         "debug": "^4.1.1",
         "minimatch": "^3.0.5"
       }
@@ -452,9 +978,9 @@
       "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA=="
     },
     "@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz",
+      "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw=="
     },
     "@jridgewell/gen-mapping": {
       "version": "0.3.3",
@@ -467,9 +993,9 @@
       }
     },
     "@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA=="
     },
     "@jridgewell/set-array": {
       "version": "1.1.2",
@@ -482,19 +1008,12 @@
       "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
     },
     "@jridgewell/trace-mapping": {
-      "version": "0.3.18",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
-      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+      "version": "0.3.20",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
+      "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
       "requires": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
-      },
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": {
-          "version": "1.4.14",
-          "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-          "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
-        }
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
     "@nodelib/fs.scandir": {
@@ -525,10 +1044,64 @@
       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
       "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A=="
     },
+    "@protobufjs/aspromise": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+      "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ=="
+    },
+    "@protobufjs/base64": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
+      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="
+    },
+    "@protobufjs/codegen": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
+      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="
+    },
+    "@protobufjs/eventemitter": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
+      "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q=="
+    },
+    "@protobufjs/fetch": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
+      "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
+      "requires": {
+        "@protobufjs/aspromise": "^1.1.1",
+        "@protobufjs/inquire": "^1.1.0"
+      }
+    },
+    "@protobufjs/float": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
+      "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ=="
+    },
+    "@protobufjs/inquire": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
+      "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q=="
+    },
+    "@protobufjs/path": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
+      "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA=="
+    },
+    "@protobufjs/pool": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
+      "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw=="
+    },
+    "@protobufjs/utf8": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
+      "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="
+    },
     "@remix-run/router": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.7.2.tgz",
-      "integrity": "sha512-7Lcn7IqGMV+vizMPoEl5F0XDshcdDYtMI6uJLQdQz5CfZAwy3vvGKYSUk789qndt5dEC4HfSjviSYlSoHGL2+A=="
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.13.0.tgz",
+      "integrity": "sha512-5dMOnVnefRsl4uRnAdoWjtVTdh8e6aZqgM4puy9nmEADH72ck+uXwzpJLEKE9Q6F8ZljNewLgmTfkxUrBdv4WA=="
     },
     "@sinonjs/commons": {
       "version": "1.8.6",
@@ -569,52 +1142,37 @@
         "acorn": "^5.3.0",
         "acorn-dynamic-import": "^3.0.0",
         "acorn-object-rest-spread": "^1.1.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "5.7.4",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
-          "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg=="
-        },
-        "acorn-dynamic-import": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz",
-          "integrity": "sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==",
-          "requires": {
-            "acorn": "^5.0.0"
-          }
-        }
       }
     },
     "@types/bootstrap": {
-      "version": "5.2.6",
-      "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-5.2.6.tgz",
-      "integrity": "sha512-BlAc3YATdasbHoxMoBWODrSF6qwQO/E9X8wVxCCSa6rWjnaZfpkr2N6pUMCY6jj2+wf0muUtLySbvU9etX6YqA==",
+      "version": "5.2.10",
+      "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-5.2.10.tgz",
+      "integrity": "sha512-F2X+cd6551tep0MvVZ6nM8v7XgGN/twpdNDjqS1TUM7YFNEtQYWk+dKAnH+T1gr6QgCoGMPl487xw/9hXooa2g==",
       "requires": {
         "@popperjs/core": "^2.9.2"
       }
     },
     "@types/cheerio": {
-      "version": "0.22.31",
-      "resolved": "https://registry.npmjs.org/@types/cheerio/-/cheerio-0.22.31.tgz",
-      "integrity": "sha512-Kt7Cdjjdi2XWSfrZ53v4Of0wG3ZcmaegFXjMmz9tfNrZSkzzo36G0AL1YqSdcIA78Etjt6E609pt5h1xnQkPUw==",
+      "version": "0.22.35",
+      "resolved": "https://registry.npmjs.org/@types/cheerio/-/cheerio-0.22.35.tgz",
+      "integrity": "sha512-yD57BchKRvTV+JD53UZ6PD8KWY5g5rvvMLRnZR3EQBCZXiDT/HR+pKpMzFGlWNhFrXlo7VPZXtKvIEwZkAWOIA==",
       "requires": {
         "@types/node": "*"
       }
     },
     "@types/enzyme": {
-      "version": "3.10.13",
-      "resolved": "https://registry.npmjs.org/@types/enzyme/-/enzyme-3.10.13.tgz",
-      "integrity": "sha512-FCtoUhmFsud0Yx9fmZk179GkdZ4U9B0GFte64/Md+W/agx0L5SxsIIbhLBOxIb9y2UfBA4WQnaG1Od/UsUQs9Q==",
+      "version": "3.10.16",
+      "resolved": "https://registry.npmjs.org/@types/enzyme/-/enzyme-3.10.16.tgz",
+      "integrity": "sha512-17uMdJjSKjvdn/MhO/G2lRNPZGvJxFpvgONrsRoS1+khtJ6UcnCwC9v3gk2UqPyAkMZb6a1VYxScc/vOgkDl9w==",
       "requires": {
         "@types/cheerio": "*",
         "@types/react": "^16"
       },
       "dependencies": {
         "@types/react": {
-          "version": "16.14.43",
-          "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.43.tgz",
-          "integrity": "sha512-7zdjv7jvoLLQg1tTvpQsm+hyNUMT2mPlNV1+d0I8fbGhkJl82spopMyBlu4wb1dviZAxpGdk5eHu/muacknnfw==",
+          "version": "16.14.52",
+          "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.52.tgz",
+          "integrity": "sha512-4+ZN73hgRW3Gang3QMqWjrqPPkf+lWZYiyG4uXtUbpd+7eiBDw6Gemila6rXDd8DorADupTiIERL6Mb5BQTF2w==",
           "requires": {
             "@types/prop-types": "*",
             "@types/scheduler": "*",
@@ -623,61 +1181,78 @@
         }
       }
     },
+    "@types/hoist-non-react-statics": {
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz",
+      "integrity": "sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==",
+      "requires": {
+        "@types/react": "*",
+        "hoist-non-react-statics": "^3.3.0"
+      }
+    },
     "@types/jasmine": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-4.3.5.tgz",
-      "integrity": "sha512-9YHUdvuNDDRJYXZwHqSsO72Ok0vmqoJbNn73ttyITQp/VA60SarnZ+MPLD37rJAhVoKp+9BWOvJP5tHIRfZylQ=="
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-5.1.4.tgz",
+      "integrity": "sha512-px7OMFO/ncXxixDe1zR13V1iycqWae0MxTaw62RpFlksUi5QuNWgQJFkTQjIOvrmutJbI7Fp2Y2N1F6D2R4G6w=="
     },
     "@types/json-schema": {
-      "version": "7.0.12",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
-      "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA=="
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="
     },
     "@types/karma": {
-      "version": "6.3.4",
-      "resolved": "https://registry.npmjs.org/@types/karma/-/karma-6.3.4.tgz",
-      "integrity": "sha512-aefuFcs4e4NAOi1Ue4AP9fR2TQv45NFpdaLXdg+3FxDDndk/4T6LoHRTmKtRVqkwtQPh5Ntc3CxsoOgzldAAfg==",
+      "version": "6.3.8",
+      "resolved": "https://registry.npmjs.org/@types/karma/-/karma-6.3.8.tgz",
+      "integrity": "sha512-+QGoOPhb1f6Oli8pG+hxdnGDzVhIrpsHaFSJ4UJg15Xj+QBtluKELkJY+L4Li532HmT3l5K5o1FoUZHRQeOOaQ==",
       "requires": {
         "@types/node": "*",
         "log4js": "^6.4.1"
       }
     },
     "@types/karma-chrome-launcher": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@types/karma-chrome-launcher/-/karma-chrome-launcher-3.1.1.tgz",
-      "integrity": "sha512-Yh4CuoVjpcXh+p+TPKZC6AlodS4w9217Y+uWy1jNkhX/9+wuvSiyE0uD8SaZCkpWVoJUisuhC8eS4QpZ6EKCtQ==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@types/karma-chrome-launcher/-/karma-chrome-launcher-3.1.4.tgz",
+      "integrity": "sha512-DmZXMnOG1zcl/GqtWbfAePFqWLuDFOYdfa+TpvlNvGHiT8GxJjr5RKTptX8K8ZUokjX1pZGAf4KeC46iok3VcA==",
       "requires": {
         "@types/karma": "*"
       }
     },
     "@types/karma-jasmine": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@types/karma-jasmine/-/karma-jasmine-4.0.2.tgz",
-      "integrity": "sha512-eI7nm/IOPMMMYv9E0iVJVb90sp+mYSVCeWAEToyji37jOGEJKf8nfQZ7OwG9gMbymYuiaViEHY3l+fU7cmlI6w==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/@types/karma-jasmine/-/karma-jasmine-4.0.5.tgz",
+      "integrity": "sha512-BCkxhflM7N5oLOCV+Jdz2fBFa9Yev4wm5iA80k3EVDyh3rUXminuCSuX16jTT/fr2J1dKrOfp22/2WuvW4nyPg==",
       "requires": {
         "@types/jasmine": "*",
         "@types/karma": "*"
       }
     },
     "@types/lodash": {
-      "version": "4.14.196",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.196.tgz",
-      "integrity": "sha512-22y3o88f4a94mKljsZcanlNWPzO0uBsBdzLAngf2tp533LzZcQzb6+eZPJ+vCTt+bqF2XnvT9gejTLsAcJAJyQ=="
+      "version": "4.14.202",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.202.tgz",
+      "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ=="
+    },
+    "@types/long": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz",
+      "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA=="
     },
     "@types/node": {
-      "version": "20.4.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.8.tgz",
-      "integrity": "sha512-0mHckf6D2DiIAzh8fM8f3HQCvMKDpK94YQ0DSVkfWTG9BZleYIWudw9cJxX8oCk9bM+vAkDyujDV6dmKHbvQpg=="
+      "version": "20.9.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.5.tgz",
+      "integrity": "sha512-Uq2xbNq0chGg+/WQEU0LJTSs/1nKxz6u1iemLcGomkSnKokbW1fbLqc3HOqCf2JP7KjlL4QkS7oZZTrOQHQYgQ==",
+      "requires": {
+        "undici-types": "~5.26.4"
+      }
     },
     "@types/prop-types": {
-      "version": "15.7.5",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
-      "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
+      "version": "15.7.11",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz",
+      "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng=="
     },
     "@types/react": {
-      "version": "17.0.62",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.62.tgz",
-      "integrity": "sha512-eANCyz9DG8p/Vdhr0ZKST8JV12PhH2ACCDYlFw6DIO+D+ca+uP4jtEDEpVqXZrh/uZdXQGwk7whJa3ah5DtyLw==",
+      "version": "17.0.71",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.71.tgz",
+      "integrity": "sha512-lfqOu9mp16nmaGRrS8deS2Taqhd5Ih0o92Te5Ws6I1py4ytHBcXLqh0YIqVsViqwVI5f+haiFM6hju814BzcmA==",
       "requires": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -685,9 +1260,9 @@
       }
     },
     "@types/react-datepicker": {
-      "version": "4.15.0",
-      "resolved": "https://registry.npmjs.org/@types/react-datepicker/-/react-datepicker-4.15.0.tgz",
-      "integrity": "sha512-kr10s8ex4+MmCJmzdhA9kfmoMQBmsW5uDYDlH+8f/PgStrp7rRaz23Y/cvTiMgvESVq8ujDh4SOo6jlSwEw13g==",
+      "version": "4.19.3",
+      "resolved": "https://registry.npmjs.org/@types/react-datepicker/-/react-datepicker-4.19.3.tgz",
+      "integrity": "sha512-85F9eKWu9fGiD9r4KVVMPYAdkJJswR3Wci9PvqplmB6T+D+VbUqPeKtifg96NZ4nEhufjehW+SX4JLrEWVplWw==",
       "requires": {
         "@popperjs/core": "^2.9.2",
         "@types/react": "*",
@@ -696,88 +1271,74 @@
       }
     },
     "@types/react-dom": {
-      "version": "17.0.20",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.20.tgz",
-      "integrity": "sha512-4pzIjSxDueZZ90F52mU3aPoogkHIoSIDG+oQ+wQK7Cy2B9S+MvOqY0uEA/qawKz381qrEDkvpwyt8Bm31I8sbA==",
+      "version": "17.0.25",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.25.tgz",
+      "integrity": "sha512-urx7A7UxkZQmThYA4So0NelOVjx3V4rNFVJwp0WZlbIK5eM4rNJDiN3R/E9ix0MBh6kAEojk/9YL+Te6D9zHNA==",
       "requires": {
         "@types/react": "^17"
       }
     },
-    "@types/react-redux": {
-      "version": "5.0.24",
-      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-5.0.24.tgz",
-      "integrity": "sha512-EJfdjLtxceQmrVZrcwSZR6V97e6qyG/gaJ2MQrsVzGYiXO2cN+oHBSizB1/SnReTkorpEgQulhVdYcFee8abqQ==",
-      "requires": {
-        "@types/react": "*",
-        "redux": "^3.6.0"
-      }
-    },
     "@types/react-toggle": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@types/react-toggle/-/react-toggle-4.0.3.tgz",
-      "integrity": "sha512-57QdMWeeQdRjM2/p+udgYerxUbSkmeUIW18kwUttcci6GHkgxoqCsDZfRtsCsAHcvvM5VBQdtDUEgLWo2e87mA==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/@types/react-toggle/-/react-toggle-4.0.5.tgz",
+      "integrity": "sha512-MHHEDe7GnF/EhLtI5sT70Dqab8rwlgjRZtu/u6gmfbYd+HeYxWiUSRog16+1BCfkz7Wy2VU6+TPU2oCsDtqDzA==",
       "requires": {
         "@types/react": "*"
       }
     },
     "@types/react-transition-group": {
-      "version": "4.4.6",
-      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.6.tgz",
-      "integrity": "sha512-VnCdSxfcm08KjsJVQcfBmhEQAPnLB8G08hAxn39azX1qYBQ/5RVQuoHuKIcfKOdncuaUvEpFKFzEvbtIMsfVew==",
+      "version": "4.4.9",
+      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.9.tgz",
+      "integrity": "sha512-ZVNmWumUIh5NhH8aMD9CR2hdW0fNuYInlocZHaZ+dgk/1K49j1w/HoAuK1ki+pgscQrOFRTlXeoURtuzEkV3dg==",
       "requires": {
         "@types/react": "*"
       }
     },
     "@types/redux-logger": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@types/redux-logger/-/redux-logger-3.0.9.tgz",
-      "integrity": "sha512-cwYhVbYNgH01aepeMwhd0ABX6fhVB2rcQ9m80u8Fl50ZODhsZ8RhQArnLTkE7/Zrfq4Sz/taNoF7DQy9pCZSKg==",
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/@types/redux-logger/-/redux-logger-3.0.12.tgz",
+      "integrity": "sha512-5vAlwokZi/Unb1eGoZfVVzIBTPNDflwXiDzPLT1SynP6hdJfsOEf+w6ZOySOyboLWciCRYeE5DGYUnwVCq+Uyg==",
       "requires": {
         "redux": "^4.0.0"
-      },
-      "dependencies": {
-        "redux": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
-          "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
-          "requires": {
-            "@babel/runtime": "^7.9.2"
-          }
-        }
       }
     },
     "@types/scheduler": {
-      "version": "0.16.3",
-      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz",
-      "integrity": "sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ=="
+      "version": "0.16.8",
+      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz",
+      "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A=="
     },
     "@types/semver": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
-      "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw=="
+      "version": "7.5.6",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz",
+      "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A=="
     },
     "@types/sinon": {
-      "version": "10.0.16",
-      "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.16.tgz",
-      "integrity": "sha512-j2Du5SYpXZjJVJtXBokASpPRj+e2z+VUhCPHmM6WMfe3dpHu6iVKJMU6AiBcMp/XTAYnEj6Wc1trJUWwZ0QaAQ==",
+      "version": "10.0.20",
+      "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.20.tgz",
+      "integrity": "sha512-2APKKruFNCAZgx3daAyACGzWuJ028VVCUDk6o2rw/Z4PXT0ogwdV4KUegW0MwVs0Zu59auPXbbuBJHF12Sx1Eg==",
       "requires": {
         "@types/sinonjs__fake-timers": "*"
       }
     },
     "@types/sinonjs__fake-timers": {
-      "version": "8.1.2",
-      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.2.tgz",
-      "integrity": "sha512-9GcLXF0/v3t80caGs5p2rRfkB+a8VBGLJZVih6CNFkx8IZ994wiKKLSRs9nuFwk1HevWs/1mnUmkApGrSGsShA=="
+      "version": "8.1.5",
+      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.5.tgz",
+      "integrity": "sha512-mQkU2jY8jJEF7YHjHvsQO8+3ughTL1mcnn96igfhONmR+fUPSKIkefQYpSe8bsly2Ep7oQbn/6VG5/9/0qcArQ=="
     },
     "@types/store": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@types/store/-/store-2.0.2.tgz",
-      "integrity": "sha512-ZPHnXkzmGMfk+pHqAGzTSpA9CbsHmJLgkvOl5w52LZ0XTxB1ZIHWZzQ7lEtjTNWScBbsQekg8TjApMXkMe4nkw=="
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@types/store/-/store-2.0.5.tgz",
+      "integrity": "sha512-5NmTKe3GWdOaykzq7no+Ahf6mafJu0oLc9JNhJ3E26+0oFvd6GnksnZQpMXcH526mfG4xDYjFiKzyDL51PzeWQ=="
+    },
+    "@types/use-sync-external-store": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz",
+      "integrity": "sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA=="
     },
     "@types/webpack-env": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.18.1.tgz",
-      "integrity": "sha512-D0HJET2/UY6k9L6y3f5BL+IDxZmPkYmPT4+qBrRdmRLYRuV0qNKizMgTvYxXZYn+36zjPeoDZAEYBCM6XB+gww=="
+      "version": "1.18.4",
+      "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.18.4.tgz",
+      "integrity": "sha512-I6e+9+HtWADAWeeJWDFQtdk4EVSAbj6Rtz4q8fJ7mSr1M0jzlFcs8/HZ+Xb5SHzVm1dxH7aUiI+A8kA8Gcrm0A=="
     },
     "@typescript-eslint/eslint-plugin": {
       "version": "5.62.0",
@@ -870,6 +1431,11 @@
         "eslint-visitor-keys": "^3.3.0"
       }
     },
+    "@ungap/structured-clone": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ=="
+    },
     "@wojtekmaj/enzyme-adapter-react-17": {
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/@wojtekmaj/enzyme-adapter-react-17/-/enzyme-adapter-react-17-0.8.0.tgz",
@@ -922,23 +1488,16 @@
       }
     },
     "acorn": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="
+      "version": "5.7.4",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
+      "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg=="
     },
     "acorn-dynamic-import": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz",
-      "integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz",
+      "integrity": "sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==",
       "requires": {
-        "acorn": "^4.0.3"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "4.0.13",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-          "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c="
-        }
+        "acorn": "^5.0.0"
       }
     },
     "acorn-jsx": {
@@ -952,13 +1511,6 @@
       "integrity": "sha512-v/lolbMJxMB2tm66GjxhNSYEz2I+a8S99emxJu2mhqhDE348dJkxyliJ3pMV79tbTQEzGJA8pyRvC5qoSbjJAA==",
       "requires": {
         "acorn": "^5.0.3"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "5.7.4",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
-          "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg=="
-        }
       }
     },
     "after": {
@@ -1146,14 +1698,14 @@
       "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU="
     },
     "array-includes": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
-      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz",
+      "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==",
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "get-intrinsic": "^1.2.1",
         "is-string": "^1.0.7"
       }
     },
@@ -1178,71 +1730,72 @@
       "integrity": "sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg=="
     },
     "array.prototype.filter": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.2.tgz",
-      "integrity": "sha512-us+UrmGOilqttSOgoWZTpOvHu68vZT2YCjc/H4vhu56vzZpaDFBhB+Se2UwqWzMKbDv7Myq5M5pcZLAtUvTQdQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.3.tgz",
+      "integrity": "sha512-VizNcj/RGJiUyQBgzwxzE5oHdeuXY5hSbbmKMlphj1cy1Vl7Pn2asCGbSrru6hSQjmCzqTBPVWAF/whmEOVHbw==",
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
         "es-array-method-boxes-properly": "^1.0.0",
         "is-string": "^1.0.7"
       }
     },
     "array.prototype.flat": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
-      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
+      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
         "es-shim-unscopables": "^1.0.0"
       }
     },
     "array.prototype.flatmap": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
-      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
+      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
         "es-shim-unscopables": "^1.0.0"
       }
     },
     "array.prototype.reduce": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz",
-      "integrity": "sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.6.tgz",
+      "integrity": "sha512-UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg==",
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
         "es-array-method-boxes-properly": "^1.0.0",
         "is-string": "^1.0.7"
       }
     },
     "array.prototype.tosorted": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz",
-      "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.2.tgz",
+      "integrity": "sha512-HuQCHOlk1Weat5jzStICBCd83NxiIMwqDg/dHEsoefabn/hJRj5pVdWcPUSpRrwhwxZOsQassMpgN/xRYFBMIg==",
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
         "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.1.3"
+        "get-intrinsic": "^1.2.1"
       }
     },
     "arraybuffer.prototype.slice": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
-      "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz",
+      "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==",
       "requires": {
         "array-buffer-byte-length": "^1.0.0",
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
         "get-intrinsic": "^1.2.1",
         "is-array-buffer": "^3.0.2",
         "is-shared-array-buffer": "^1.0.2"
@@ -1280,25 +1833,25 @@
       }
     },
     "assert": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.1.tgz",
+      "integrity": "sha512-zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A==",
       "requires": {
-        "object-assign": "^4.1.1",
-        "util": "0.10.3"
+        "object.assign": "^4.1.4",
+        "util": "^0.10.4"
       },
       "dependencies": {
         "inherits": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
         },
         "util": {
-          "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "version": "0.10.4",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+          "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
           "requires": {
-            "inherits": "2.0.1"
+            "inherits": "2.0.3"
           }
         }
       }
@@ -1331,6 +1884,14 @@
       "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
       "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI="
     },
+    "asynciterator.prototype": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz",
+      "integrity": "sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg==",
+      "requires": {
+        "has-symbols": "^1.0.3"
+      }
+    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -2064,41 +2625,19 @@
             "is-descriptor": "^1.0.0"
           }
         },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
         "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
           }
         },
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
           "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         }
       }
     },
@@ -2311,19 +2850,19 @@
       }
     },
     "browserify-sign": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
+      "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
       "requires": {
-        "bn.js": "^5.1.1",
-        "browserify-rsa": "^4.0.1",
+        "bn.js": "^5.2.1",
+        "browserify-rsa": "^4.1.0",
         "create-hash": "^1.2.0",
         "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.3",
+        "elliptic": "^6.5.4",
         "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.5",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
+        "parse-asn1": "^5.1.6",
+        "readable-stream": "^3.6.2",
+        "safe-buffer": "^5.2.1"
       },
       "dependencies": {
         "readable-stream": {
@@ -2481,12 +3020,13 @@
       }
     },
     "call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
+      "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
       "requires": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.1",
+        "set-function-length": "^1.1.1"
       }
     },
     "callsite": {
@@ -2534,14 +3074,14 @@
       }
     },
     "caniuse-db": {
-      "version": "1.0.30001519",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001519.tgz",
-      "integrity": "sha512-nY0JTY0Po8r8bNBred32hc3QMr2+I/CsJCGmH6tZaVEFUzLSfv64i1E8VwTqP3Of6yyzu4MDKus2eoR0pHCZ2A=="
+      "version": "1.0.30001564",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001564.tgz",
+      "integrity": "sha512-nNf2MZGDyVVTiy8Hrzg3kaqlZ4JIaNLQi66C8zHA0QNfkMA1XJXq9FWDReiVqOts5fXIt3aCilsmyLlFPgTTJQ=="
     },
     "caniuse-lite": {
-      "version": "1.0.30001519",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz",
-      "integrity": "sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg=="
+      "version": "1.0.30001564",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001564.tgz",
+      "integrity": "sha512-DqAOf+rhof+6GVx1y+xzbFPeOumfQnhYzVnZD6LAXijR77yPtm9mfOcqOnT3mpnJiZVT+kwLAFnRlZcIz+c6bg=="
     },
     "caseless": {
       "version": "0.12.0",
@@ -2704,41 +3244,26 @@
       }
     },
     "cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
       "requires": {
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
         },
         "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
           "requires": {
-            "ansi-regex": "^4.1.0"
+            "ansi-regex": "^5.0.1"
           }
         }
       }
@@ -2879,9 +3404,9 @@
       "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E="
     },
     "component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
+      "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ=="
     },
     "component-inherit": {
       "version": "0.0.3",
@@ -3384,16 +3909,16 @@
       "integrity": "sha1-wB3mPvsO7JeYgB1Ax+Da4ltYLIQ="
     },
     "deep-equal": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
-      "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz",
+      "integrity": "sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==",
       "requires": {
-        "is-arguments": "^1.0.4",
-        "is-date-object": "^1.0.1",
-        "is-regex": "^1.0.4",
-        "object-is": "^1.0.1",
+        "is-arguments": "^1.1.1",
+        "is-date-object": "^1.0.5",
+        "is-regex": "^1.1.4",
+        "object-is": "^1.1.5",
         "object-keys": "^1.1.1",
-        "regexp.prototype.flags": "^1.2.0"
+        "regexp.prototype.flags": "^1.5.1"
       }
     },
     "deep-is": {
@@ -3401,11 +3926,22 @@
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
     },
+    "define-data-property": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
+      "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+      "requires": {
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      }
+    },
     "define-properties": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
-      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
       "requires": {
+        "define-data-property": "^1.0.1",
         "has-property-descriptors": "^1.0.0",
         "object-keys": "^1.1.1"
       }
@@ -3419,41 +3955,19 @@
         "isobject": "^3.0.1"
       },
       "dependencies": {
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
         "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
           }
         },
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
           "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         }
       }
     },
@@ -3673,9 +4187,9 @@
       }
     },
     "dompurify": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.5.tgz",
-      "integrity": "sha512-F9e6wPGtY+8KNMRAVfxeCOHU0/NPWMSENNq4pQctuXRqqdEPW7q3CrLbR5Nse044WwacyjHGOMlvNsBe1y6z9A=="
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.6.tgz",
+      "integrity": "sha512-ilkD8YEnnGh1zJ240uJsW7AzE+2qpbOUYjacomn3AvJ6J4JhKGSZ2nh4wUIXPZrEPppaCLx5jFe8T89Rk8tQ7w=="
     },
     "domutils": {
       "version": "3.1.0",
@@ -3713,9 +4227,9 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "electron-to-chromium": {
-      "version": "1.4.485",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.485.tgz",
-      "integrity": "sha512-1ndQ5IBNEnFirPwvyud69GHL+31FkE09gH/CJ6m3KCbkx3i0EVOrjwz4UNxRmN9H8OVHbC6vMRZGN1yCvjSs9w=="
+      "version": "1.4.593",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.593.tgz",
+      "integrity": "sha512-c7+Hhj87zWmdpmjDONbvNKNo24tvmD4mjal1+qqTYTrlF0/sNpAcDlU0Ki84ftA/5yj3BF2QhSGEC0Rky6larg=="
     },
     "elliptic": {
       "version": "6.5.4",
@@ -3739,9 +4253,9 @@
       }
     },
     "emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
     },
     "emojis-list": {
       "version": "3.0.0",
@@ -3932,25 +4446,25 @@
       }
     },
     "es-abstract": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
-      "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
+      "version": "1.22.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz",
+      "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==",
       "requires": {
         "array-buffer-byte-length": "^1.0.0",
-        "arraybuffer.prototype.slice": "^1.0.1",
+        "arraybuffer.prototype.slice": "^1.0.2",
         "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.5",
         "es-set-tostringtag": "^2.0.1",
         "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.2.1",
+        "function.prototype.name": "^1.1.6",
+        "get-intrinsic": "^1.2.2",
         "get-symbol-description": "^1.0.0",
         "globalthis": "^1.0.3",
         "gopd": "^1.0.1",
-        "has": "^1.0.3",
         "has-property-descriptors": "^1.0.0",
         "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0",
         "internal-slot": "^1.0.5",
         "is-array-buffer": "^3.0.2",
         "is-callable": "^1.2.7",
@@ -3958,23 +4472,23 @@
         "is-regex": "^1.1.4",
         "is-shared-array-buffer": "^1.0.2",
         "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.10",
+        "is-typed-array": "^1.1.12",
         "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.3",
+        "object-inspect": "^1.13.1",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.0",
-        "safe-array-concat": "^1.0.0",
+        "regexp.prototype.flags": "^1.5.1",
+        "safe-array-concat": "^1.0.1",
         "safe-regex-test": "^1.0.0",
-        "string.prototype.trim": "^1.2.7",
-        "string.prototype.trimend": "^1.0.6",
-        "string.prototype.trimstart": "^1.0.6",
+        "string.prototype.trim": "^1.2.8",
+        "string.prototype.trimend": "^1.0.7",
+        "string.prototype.trimstart": "^1.0.7",
         "typed-array-buffer": "^1.0.0",
         "typed-array-byte-length": "^1.0.0",
         "typed-array-byte-offset": "^1.0.0",
         "typed-array-length": "^1.0.4",
         "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.10"
+        "which-typed-array": "^1.1.13"
       }
     },
     "es-array-method-boxes-properly": {
@@ -3982,22 +4496,43 @@
       "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
       "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="
     },
+    "es-iterator-helpers": {
+      "version": "1.0.15",
+      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.15.tgz",
+      "integrity": "sha512-GhoY8uYqd6iwUl2kgjTm4CZAf6oo5mHK7BPqx3rKgx893YSsy0LGHV6gfqqQvZt/8xM8xeOnfXBCfqclMKkJ5g==",
+      "requires": {
+        "asynciterator.prototype": "^1.0.0",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.1",
+        "es-set-tostringtag": "^2.0.1",
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.2.1",
+        "globalthis": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.5",
+        "iterator.prototype": "^1.1.2",
+        "safe-array-concat": "^1.0.1"
+      }
+    },
     "es-set-tostringtag": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
-      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz",
+      "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==",
       "requires": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "has-tostringtag": "^1.0.0"
+        "get-intrinsic": "^1.2.2",
+        "has-tostringtag": "^1.0.0",
+        "hasown": "^2.0.0"
       }
     },
     "es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
+      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
       "requires": {
-        "has": "^1.0.3"
+        "hasown": "^2.0.0"
       }
     },
     "es-to-primitive": {
@@ -4110,17 +4645,18 @@
       }
     },
     "eslint": {
-      "version": "8.46.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.46.0.tgz",
-      "integrity": "sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz",
+      "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==",
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.1",
-        "@eslint/js": "^8.46.0",
-        "@humanwhocodes/config-array": "^0.11.10",
+        "@eslint/eslintrc": "^2.1.3",
+        "@eslint/js": "8.54.0",
+        "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
         "ajv": "^6.12.4",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
@@ -4128,7 +4664,7 @@
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.2",
+        "eslint-visitor-keys": "^3.4.3",
         "espree": "^9.6.1",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
@@ -4230,9 +4766,9 @@
           }
         },
         "globals": {
-          "version": "13.20.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-          "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+          "version": "13.23.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
+          "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
           "requires": {
             "type-fest": "^0.20.2"
           }
@@ -4298,14 +4834,15 @@
       }
     },
     "eslint-plugin-react": {
-      "version": "7.33.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.1.tgz",
-      "integrity": "sha512-L093k0WAMvr6VhNwReB8VgOq5s2LesZmrpPdKz/kZElQDzqS7G7+DnKoqT+w4JwuiGeAhAvHO0fvy0Eyk4ejDA==",
+      "version": "7.33.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz",
+      "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==",
       "requires": {
         "array-includes": "^3.1.6",
         "array.prototype.flatmap": "^1.3.1",
         "array.prototype.tosorted": "^1.1.1",
         "doctrine": "^2.1.0",
+        "es-iterator-helpers": "^1.0.12",
         "estraverse": "^5.3.0",
         "jsx-ast-utils": "^2.4.1 || ^3.0.0",
         "minimatch": "^3.1.2",
@@ -4349,9 +4886,9 @@
       }
     },
     "eslint-visitor-keys": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
-      "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw=="
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag=="
     },
     "espree": {
       "version": "9.6.1",
@@ -4361,6 +4898,13 @@
         "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
         "eslint-visitor-keys": "^3.4.1"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "8.11.2",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
+          "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w=="
+        }
       }
     },
     "esprima": {
@@ -4825,9 +5369,9 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "fast-glob": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
-      "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
@@ -4860,9 +5404,9 @@
       }
     },
     "faye-websocket": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
-      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
       "requires": {
         "websocket-driver": ">=0.5.1"
       }
@@ -4885,9 +5429,9 @@
       },
       "dependencies": {
         "core-js": {
-          "version": "3.32.0",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.32.0.tgz",
-          "integrity": "sha512-rd4rYZNlF3WuoYuRIDEmbR/ga9CeuWX9U05umAvgrrZoHY4Z++cp/xwPQMvUpBB4Ag6J8KfD80G0zwCyaSxDww=="
+          "version": "3.33.3",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.33.3.tgz",
+          "integrity": "sha512-lo0kOocUlLKmm6kv/FswQL8zbkH7mVsLJ/FULClOhv8WRVmKLVcs6XPNQAzstfeJTCHMyButEwG+z1kHxHoDZw=="
         }
       }
     },
@@ -5019,12 +5563,46 @@
         "locate-path": "^2.0.0"
       }
     },
+    "firebase": {
+      "version": "9.23.0",
+      "resolved": "https://registry.npmjs.org/firebase/-/firebase-9.23.0.tgz",
+      "integrity": "sha512-/4lUVY0lUvBDIaeY1q6dUYhS8Sd18Qb9CgWkPZICUo9IXpJNCEagfNZXBBFCkMTTN5L5gx2Hjr27y21a9NzUcA==",
+      "requires": {
+        "@firebase/analytics": "0.10.0",
+        "@firebase/analytics-compat": "0.2.6",
+        "@firebase/app": "0.9.13",
+        "@firebase/app-check": "0.8.0",
+        "@firebase/app-check-compat": "0.3.7",
+        "@firebase/app-compat": "0.2.13",
+        "@firebase/app-types": "0.9.0",
+        "@firebase/auth": "0.23.2",
+        "@firebase/auth-compat": "0.4.2",
+        "@firebase/database": "0.14.4",
+        "@firebase/database-compat": "0.3.4",
+        "@firebase/firestore": "3.13.0",
+        "@firebase/firestore-compat": "0.3.12",
+        "@firebase/functions": "0.10.0",
+        "@firebase/functions-compat": "0.3.5",
+        "@firebase/installations": "0.6.4",
+        "@firebase/installations-compat": "0.2.4",
+        "@firebase/messaging": "0.12.4",
+        "@firebase/messaging-compat": "0.2.4",
+        "@firebase/performance": "0.6.4",
+        "@firebase/performance-compat": "0.2.4",
+        "@firebase/remote-config": "0.4.4",
+        "@firebase/remote-config-compat": "0.2.4",
+        "@firebase/storage": "0.11.2",
+        "@firebase/storage-compat": "0.3.2",
+        "@firebase/util": "1.9.3"
+      }
+    },
     "flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
+      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
       "requires": {
-        "flatted": "^3.1.0",
+        "flatted": "^3.2.9",
+        "keyv": "^4.5.3",
         "rimraf": "^3.0.2"
       },
       "dependencies": {
@@ -5039,9 +5617,9 @@
       }
     },
     "flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
+      "version": "3.2.9",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
+      "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ=="
     },
     "flatten": {
       "version": "1.0.3",
@@ -5058,9 +5636,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
+      "version": "1.15.3",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
+      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q=="
     },
     "for-each": {
       "version": "0.3.3",
@@ -5181,19 +5759,19 @@
       }
     },
     "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
     },
     "function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "functions-have-names": "^1.2.3"
       }
     },
     "functions-have-names": {
@@ -5214,6 +5792,26 @@
         "string-width": "^1.0.1",
         "strip-ansi": "^3.0.1",
         "wide-align": "^1.1.0"
+      },
+      "dependencies": {
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        }
       }
     },
     "gaze": {
@@ -5235,14 +5833,14 @@
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
     },
     "get-intrinsic": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
+      "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
       "requires": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
+        "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3"
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
       }
     },
     "get-stdin": {
@@ -5384,11 +5982,6 @@
             "path-is-absolute": "^1.0.0"
           }
         },
-        "lodash": {
-          "version": "4.17.21",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-        },
         "minimatch": {
           "version": "3.0.8",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
@@ -5437,12 +6030,9 @@
       }
     },
     "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz",
+      "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ=="
     },
     "has-ansi": {
       "version": "2.0.0",
@@ -5483,11 +6073,11 @@
       "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
     },
     "has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
+      "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
       "requires": {
-        "get-intrinsic": "^1.1.1"
+        "get-intrinsic": "^1.2.2"
       }
     },
     "has-proto": {
@@ -5603,6 +6193,14 @@
         "minimalistic-assert": "^1.0.1"
       }
     },
+    "hasown": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
+      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+      "requires": {
+        "function-bind": "^1.1.2"
+      }
+    },
     "he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -5619,9 +6217,19 @@
       }
     },
     "hoist-non-react-statics": {
-      "version": "2.5.5",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
-      "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+      "requires": {
+        "react-is": "^16.7.0"
+      },
+      "dependencies": {
+        "react-is": {
+          "version": "16.13.1",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+        }
+      }
     },
     "home-or-tmp": {
       "version": "2.0.0",
@@ -5918,6 +6526,11 @@
         }
       }
     },
+    "idb": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/idb/-/idb-7.0.1.tgz",
+      "integrity": "sha512-UUxlE7vGWK5RfB/fDwEGgRf84DY/ieqNha6msMV99UsEMQhJ1RwbCd8AYBj3QMgnE3VZnfQvm4oKVCJTYlqIgg=="
+    },
     "ieee754": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
@@ -5929,9 +6542,9 @@
       "integrity": "sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA=="
     },
     "ignore": {
-      "version": "5.2.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
-      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ=="
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
+      "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg=="
     },
     "import-fresh": {
       "version": "3.3.0",
@@ -6002,12 +6615,12 @@
       }
     },
     "internal-slot": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
-      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz",
+      "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==",
       "requires": {
-        "get-intrinsic": "^1.2.0",
-        "has": "^1.0.3",
+        "get-intrinsic": "^1.2.2",
+        "hasown": "^2.0.0",
         "side-channel": "^1.0.4"
       }
     },
@@ -6045,11 +6658,11 @@
       "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY="
     },
     "is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz",
+      "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==",
       "requires": {
-        "kind-of": "^3.0.2"
+        "hasown": "^2.0.0"
       }
     },
     "is-arguments": {
@@ -6076,6 +6689,14 @@
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
       "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
     },
+    "is-async-function": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz",
+      "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==",
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
     "is-bigint": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
@@ -6112,19 +6733,19 @@
       "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
     },
     "is-core-module": {
-      "version": "2.13.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
-      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
       "requires": {
-        "has": "^1.0.3"
+        "hasown": "^2.0.0"
       }
     },
     "is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
+      "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
       "requires": {
-        "kind-of": "^3.0.2"
+        "hasown": "^2.0.0"
       }
     },
     "is-date-object": {
@@ -6136,20 +6757,12 @@
       }
     },
     "is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "requires": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
-        }
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
       }
     },
     "is-dotfile": {
@@ -6175,17 +6788,30 @@
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
     },
+    "is-finalizationregistry": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz",
+      "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==",
+      "requires": {
+        "call-bind": "^1.0.2"
+      }
+    },
     "is-finite": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
       "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w=="
     },
     "is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+    },
+    "is-generator-function": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
+      "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
       "requires": {
-        "number-is-nan": "^1.0.0"
+        "has-tostringtag": "^1.0.0"
       }
     },
     "is-glob": {
@@ -6196,6 +6822,11 @@
         "is-extglob": "^2.1.1"
       }
     },
+    "is-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
+      "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg=="
+    },
     "is-negative-zero": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
@@ -6281,6 +6912,11 @@
         "has-tostringtag": "^1.0.0"
       }
     },
+    "is-set": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
+      "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g=="
+    },
     "is-shared-array-buffer": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
@@ -6341,6 +6977,11 @@
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
       "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
     },
+    "is-weakmap": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
+      "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA=="
+    },
     "is-weakref": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
@@ -6349,6 +6990,15 @@
         "call-bind": "^1.0.2"
       }
     },
+    "is-weakset": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
+      "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      }
+    },
     "is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
@@ -6399,6 +7049,17 @@
       "requires": {
         "node-fetch": "^1.0.1",
         "whatwg-fetch": ">=0.10.0"
+      },
+      "dependencies": {
+        "node-fetch": {
+          "version": "1.7.3",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
+          "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
+          "requires": {
+            "encoding": "^0.1.11",
+            "is-stream": "^1.0.1"
+          }
+        }
       }
     },
     "isstream": {
@@ -6406,6 +7067,18 @@
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
+    "iterator.prototype": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz",
+      "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==",
+      "requires": {
+        "define-properties": "^1.2.1",
+        "get-intrinsic": "^1.2.1",
+        "has-symbols": "^1.0.3",
+        "reflect.getprototypeof": "^1.0.4",
+        "set-function-name": "^2.0.1"
+      }
+    },
     "jasmine-core": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.3.0.tgz",
@@ -6628,6 +7301,11 @@
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
       "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s="
     },
+    "json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="
+    },
     "json-loader": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz",
@@ -6819,6 +7497,14 @@
         "webpack-dev-middleware": "^1.12.0"
       }
     },
+    "keyv": {
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "requires": {
+        "json-buffer": "3.0.1"
+      }
+    },
     "killable": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
@@ -6916,14 +7602,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.19",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
-    },
-    "lodash-es": {
       "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
-      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "lodash.camelcase": {
       "version": "4.3.0",
@@ -6997,6 +7678,11 @@
       "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.5.tgz",
       "integrity": "sha512-l9x0+1offnKKIzYVjyXU2SiwhXDLekRzKyhnbyldPHvC7BvLPVpdNUNR2KeMAiCN2D/kLNttZgQD5WjSxuBx3Q=="
     },
+    "long": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
+      "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q=="
+    },
     "longest": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
@@ -7314,9 +8000,9 @@
       "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE="
     },
     "nan": {
-      "version": "2.17.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
-      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ=="
+      "version": "2.18.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz",
+      "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w=="
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -7442,12 +8128,32 @@
       }
     },
     "node-fetch": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
-      "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
       "requires": {
-        "encoding": "^0.1.11",
-        "is-stream": "^1.0.1"
+        "whatwg-url": "^5.0.0"
+      },
+      "dependencies": {
+        "tr46": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+          "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+        },
+        "webidl-conversions": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+          "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+        },
+        "whatwg-url": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+          "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+          "requires": {
+            "tr46": "~0.0.3",
+            "webidl-conversions": "^3.0.0"
+          }
+        }
       }
     },
     "node-forge": {
@@ -7608,9 +8314,9 @@
       },
       "dependencies": {
         "resolve": {
-          "version": "1.22.4",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
-          "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
+          "version": "1.22.8",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+          "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
           "requires": {
             "is-core-module": "^2.13.0",
             "path-parse": "^1.0.7",
@@ -7733,9 +8439,9 @@
       }
     },
     "object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ=="
     },
     "object-is": {
       "version": "1.1.5",
@@ -7778,44 +8484,44 @@
       }
     },
     "object.entries": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
-      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.7.tgz",
+      "integrity": "sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==",
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       }
     },
     "object.fromentries": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
-      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz",
+      "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==",
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       }
     },
     "object.getownpropertydescriptors": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz",
-      "integrity": "sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ==",
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.7.tgz",
+      "integrity": "sha512-PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g==",
       "requires": {
-        "array.prototype.reduce": "^1.0.5",
+        "array.prototype.reduce": "^1.0.6",
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
-        "es-abstract": "^1.21.2",
+        "es-abstract": "^1.22.1",
         "safe-array-concat": "^1.0.0"
       }
     },
     "object.hasown": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz",
-      "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.3.tgz",
+      "integrity": "sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==",
       "requires": {
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       }
     },
     "object.omit": {
@@ -7843,13 +8549,13 @@
       }
     },
     "object.values": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
-      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz",
+      "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==",
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       }
     },
     "obuf": {
@@ -8774,13 +9480,6 @@
       "requires": {
         "lodash": "^4.17.20",
         "renderkid": "^2.0.4"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.21",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-        }
       }
     },
     "pretty-format": {
@@ -8858,6 +9557,25 @@
         }
       }
     },
+    "protobufjs": {
+      "version": "7.2.5",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.5.tgz",
+      "integrity": "sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A==",
+      "requires": {
+        "@protobufjs/aspromise": "^1.1.2",
+        "@protobufjs/base64": "^1.1.2",
+        "@protobufjs/codegen": "^2.0.4",
+        "@protobufjs/eventemitter": "^1.1.0",
+        "@protobufjs/fetch": "^1.1.0",
+        "@protobufjs/float": "^1.0.2",
+        "@protobufjs/inquire": "^1.1.0",
+        "@protobufjs/path": "^1.1.2",
+        "@protobufjs/pool": "^1.1.0",
+        "@protobufjs/utf8": "^1.1.0",
+        "@types/node": ">=13.7.0",
+        "long": "^5.0.0"
+      }
+    },
     "proxy-addr": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -8922,9 +9640,9 @@
       }
     },
     "punycode": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="
     },
     "q": {
       "version": "1.5.1",
@@ -9117,33 +9835,40 @@
       }
     },
     "react-redux": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.0.7.tgz",
-      "integrity": "sha512-5VI8EV5hdgNgyjfmWzBbdrqUkrVRKlyTKk1sGH3jzM2M2Mhj/seQgPXaz6gVAj2lz/nz688AdTqMO18Lr24Zhg==",
-      "requires": {
-        "hoist-non-react-statics": "^2.5.0",
-        "invariant": "^2.0.0",
-        "lodash": "^4.17.5",
-        "lodash-es": "^4.17.5",
-        "loose-envify": "^1.1.0",
-        "prop-types": "^15.6.0"
+      "version": "8.1.3",
+      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-8.1.3.tgz",
+      "integrity": "sha512-n0ZrutD7DaX/j9VscF+uTALI3oUPa/pO4Z3soOBIjuRn/FzVu6aehhysxZCLi6y7duMf52WNZGMl7CtuK5EnRw==",
+      "requires": {
+        "@babel/runtime": "^7.12.1",
+        "@types/hoist-non-react-statics": "^3.3.1",
+        "@types/use-sync-external-store": "^0.0.3",
+        "hoist-non-react-statics": "^3.3.2",
+        "react-is": "^18.0.0",
+        "use-sync-external-store": "^1.0.0"
+      },
+      "dependencies": {
+        "react-is": {
+          "version": "18.2.0",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+        }
       }
     },
     "react-router": {
-      "version": "6.14.2",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.14.2.tgz",
-      "integrity": "sha512-09Zss2dE2z+T1D03IheqAFtK4UzQyX8nFPWx6jkwdYzGLXd5ie06A6ezS2fO6zJfEb/SpG6UocN2O1hfD+2urQ==",
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.20.0.tgz",
+      "integrity": "sha512-pVvzsSsgUxxtuNfTHC4IxjATs10UaAtvLGVSA1tbUE4GDaOSU1Esu2xF5nWLz7KPiMuW8BJWuPFdlGYJ7/rW0w==",
       "requires": {
-        "@remix-run/router": "1.7.2"
+        "@remix-run/router": "1.13.0"
       }
     },
     "react-router-dom": {
-      "version": "6.14.2",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.14.2.tgz",
-      "integrity": "sha512-5pWX0jdKR48XFZBuJqHosX3AAHjRAzygouMTyimnBPOLdY3WjzUSKhus2FVMihUFWzeLebDgr4r8UeQFAct7Bg==",
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.20.0.tgz",
+      "integrity": "sha512-CbcKjEyiSVpA6UtCHOIYLUYn/UJfwzp55va4yEfpk7JBN3GPqWfHrdLkAvNCcpXr8QoihcDMuk0dzWZxtlB/mQ==",
       "requires": {
-        "@remix-run/router": "1.7.2",
-        "react-router": "6.14.2"
+        "@remix-run/router": "1.13.0",
+        "react-router": "6.20.0"
       }
     },
     "react-shallow-renderer": {
@@ -9385,56 +10110,14 @@
                 "is-extendable": "^0.1.0"
               }
             },
-            "is-accessor-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-              "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-data-descriptor": {
-              "version": "0.1.4",
-              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-              "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
             "is-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+              "version": "0.1.7",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+              "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
               "requires": {
-                "is-accessor-descriptor": "^0.1.6",
-                "is-data-descriptor": "^0.1.4",
-                "kind-of": "^5.0.0"
+                "is-accessor-descriptor": "^1.0.1",
+                "is-data-descriptor": "^1.0.1"
               }
-            },
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
             }
           }
         },
@@ -9492,30 +10175,13 @@
             }
           }
         },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
         "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
           }
         },
         "is-number": {
@@ -9617,14 +10283,11 @@
       }
     },
     "redux": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz",
-      "integrity": "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
+      "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
       "requires": {
-        "lodash": "^4.2.1",
-        "lodash-es": "^4.2.1",
-        "loose-envify": "^1.1.0",
-        "symbol-observable": "^1.0.3"
+        "@babel/runtime": "^7.9.2"
       }
     },
     "redux-logger": {
@@ -9636,9 +10299,22 @@
       }
     },
     "redux-thunk": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.3.0.tgz",
-      "integrity": "sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw=="
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.2.tgz",
+      "integrity": "sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q=="
+    },
+    "reflect.getprototypeof": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.4.tgz",
+      "integrity": "sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "get-intrinsic": "^1.2.1",
+        "globalthis": "^1.0.3",
+        "which-builtin-type": "^1.1.3"
+      }
     },
     "regenerate": {
       "version": "1.4.2",
@@ -9646,9 +10322,9 @@
       "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
     },
     "regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
+      "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
     },
     "regenerator-transform": {
       "version": "0.10.1",
@@ -9678,13 +10354,13 @@
       }
     },
     "regexp.prototype.flags": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
-      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
+      "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
-        "functions-have-names": "^1.2.3"
+        "set-function-name": "^2.0.0"
       }
     },
     "regexpu-core": {
@@ -9794,11 +10470,6 @@
             "domutils": "^2.5.2",
             "entities": "^2.0.0"
           }
-        },
-        "lodash": {
-          "version": "4.17.21",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
         }
       }
     },
@@ -9875,11 +10546,11 @@
       "integrity": "sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc="
     },
     "resolve": {
-      "version": "2.0.0-next.4",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
-      "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
+      "version": "2.0.0-next.5",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
+      "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
       "requires": {
-        "is-core-module": "^2.9.0",
+        "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       }
@@ -9975,12 +10646,12 @@
       }
     },
     "safe-array-concat": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
-      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz",
+      "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==",
       "requires": {
         "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
+        "get-intrinsic": "^1.2.1",
         "has-symbols": "^1.0.3",
         "isarray": "^2.0.5"
       }
@@ -10027,6 +10698,138 @@
         "lodash": "^4.0.0",
         "scss-tokenizer": "^0.2.3",
         "yargs": "^13.3.2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+        },
+        "cliui": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+          "requires": {
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
+          }
+        },
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        },
+        "wrap-ansi": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+          "requires": {
+            "ansi-styles": "^3.2.0",
+            "string-width": "^3.0.0",
+            "strip-ansi": "^5.0.0"
+          }
+        },
+        "yargs": {
+          "version": "13.3.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+          "requires": {
+            "cliui": "^5.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.1.2"
+          }
+        },
+        "yargs-parser": {
+          "version": "13.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
       }
     },
     "sass-loader": {
@@ -10263,6 +11066,27 @@
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
       "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
     },
+    "set-function-length": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
+      "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
+      "requires": {
+        "define-data-property": "^1.1.1",
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      }
+    },
+    "set-function-name": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
+      "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+      "requires": {
+        "define-data-property": "^1.0.1",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.0"
+      }
+    },
     "set-value": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
@@ -10446,41 +11270,19 @@
             "is-descriptor": "^1.0.0"
           }
         },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
         "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
           }
         },
         "isobject": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
           "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         }
       }
     },
@@ -10631,6 +11433,16 @@
       "requires": {
         "faye-websocket": "^0.10.0",
         "uuid": "^3.0.1"
+      },
+      "dependencies": {
+        "faye-websocket": {
+          "version": "0.10.0",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+          "integrity": "sha512-Xhj93RXbMSq8urNCUq4p9l0P6hnySJ/7YNRhYNug0bLOuii7pKO7xQFb5mx9xZXWCar88pLPb805PvUkwrLZpQ==",
+          "requires": {
+            "websocket-driver": ">=0.5.1"
+          }
+        }
       }
     },
     "sockjs-client": {
@@ -10654,14 +11466,6 @@
             "ms": "2.0.0"
           }
         },
-        "faye-websocket": {
-          "version": "0.11.4",
-          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-          "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
-          "requires": {
-            "websocket-driver": ">=0.5.1"
-          }
-        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -10736,9 +11540,9 @@
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz",
-      "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w=="
+      "version": "3.0.16",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz",
+      "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw=="
     },
     "spdy": {
       "version": "3.4.7",
@@ -10811,9 +11615,9 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
     "sshpk": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
-      "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
+      "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
       "requires": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
@@ -10922,58 +11726,74 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
     },
     "string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "requires": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+        },
+        "strip-ansi": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "requires": {
+            "ansi-regex": "^5.0.1"
+          }
+        }
       }
     },
     "string.prototype.matchall": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
-      "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz",
+      "integrity": "sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==",
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "get-intrinsic": "^1.2.1",
         "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "regexp.prototype.flags": "^1.4.3",
+        "internal-slot": "^1.0.5",
+        "regexp.prototype.flags": "^1.5.0",
+        "set-function-name": "^2.0.0",
         "side-channel": "^1.0.4"
       }
     },
     "string.prototype.trim": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
-      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz",
+      "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==",
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       }
     },
     "string.prototype.trimend": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz",
+      "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==",
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       }
     },
     "string.prototype.trimstart": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz",
+      "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==",
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       }
     },
     "string_decoder": {
@@ -11051,11 +11871,6 @@
         "whet.extend": "~0.9.9"
       }
     },
-    "symbol-observable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
-      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
-    },
     "tapable": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
@@ -11513,56 +12328,14 @@
                 "is-extendable": "^0.1.0"
               }
             },
-            "is-accessor-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-              "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-data-descriptor": {
-              "version": "0.1.4",
-              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-              "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
             "is-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+              "version": "0.1.7",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+              "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
               "requires": {
-                "is-accessor-descriptor": "^0.1.6",
-                "is-data-descriptor": "^0.1.4",
-                "kind-of": "^5.0.0"
+                "is-accessor-descriptor": "^1.0.1",
+                "is-data-descriptor": "^1.0.1"
               }
-            },
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
             }
           }
         },
@@ -11625,30 +12398,13 @@
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
           "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
         },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
         "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
           }
         },
         "is-number": {
@@ -11729,9 +12485,9 @@
       }
     },
     "tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "tsutils": {
       "version": "3.21.0",
@@ -11739,6 +12495,13 @@
       "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
       "requires": {
         "tslib": "^1.8.1"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
       }
     },
     "tty-browserify": {
@@ -11940,6 +12703,11 @@
         "which-boxed-primitive": "^1.0.2"
       }
     },
+    "undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
+    },
     "union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
@@ -12039,9 +12807,9 @@
       "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="
     },
     "update-browserslist-db": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
-      "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
+      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
       "requires": {
         "escalade": "^3.1.1",
         "picocolors": "^1.0.0"
@@ -12066,18 +12834,26 @@
       "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
     },
     "url": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.1.tgz",
-      "integrity": "sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==",
+      "version": "0.11.3",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.3.tgz",
+      "integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==",
       "requires": {
         "punycode": "^1.4.1",
-        "qs": "^6.11.0"
+        "qs": "^6.11.2"
       },
       "dependencies": {
         "punycode": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
           "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="
+        },
+        "qs": {
+          "version": "6.11.2",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
+          "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
+          "requires": {
+            "side-channel": "^1.0.4"
+          }
         }
       }
     },
@@ -12100,6 +12876,11 @@
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
     },
+    "use-sync-external-store": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
+      "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA=="
+    },
     "useragent": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
@@ -12267,9 +13048,9 @@
           }
         },
         "fsevents": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-          "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+          "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
           "optional": true
         },
         "is-binary-path": {
@@ -12431,62 +13212,15 @@
                 "is-extendable": "^0.1.0"
               }
             },
-            "is-accessor-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-              "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-              "optional": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-                  "optional": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-data-descriptor": {
-              "version": "0.1.4",
-              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-              "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-              "optional": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-                  "optional": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
             "is-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+              "version": "0.1.7",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+              "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
               "optional": true,
               "requires": {
-                "is-accessor-descriptor": "^0.1.6",
-                "is-data-descriptor": "^0.1.4",
-                "kind-of": "^5.0.0"
+                "is-accessor-descriptor": "^1.0.1",
+                "is-data-descriptor": "^1.0.1"
               }
-            },
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-              "optional": true
             }
           }
         },
@@ -12570,33 +13304,14 @@
             }
           }
         },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "optional": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "optional": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
         "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
           "optional": true,
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
           }
         },
         "is-number": {
@@ -12718,10 +13433,20 @@
         "yargs": "^8.0.2"
       },
       "dependencies": {
-        "acorn": {
-          "version": "5.7.4",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
-          "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg=="
+        "acorn-dynamic-import": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz",
+          "integrity": "sha512-GKp5tQ8h0KMPWIYGRHHXI1s5tUpZixZ3IHF2jAu42wSCf6In/G873s6/y4DdKdhWvzhu1T6mE1JgvnhAKqyYYQ==",
+          "requires": {
+            "acorn": "^4.0.3"
+          },
+          "dependencies": {
+            "acorn": {
+              "version": "4.0.13",
+              "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
+              "integrity": "sha512-fu2ygVGuMmlzG8ZeRJ0bvR41nsAkxxhbyk8bZ1SS521Z7vmgJFTQQlfz/Mp/nJexGBz+v8sC9bM6+lNgskt4Ug=="
+            }
+          }
         },
         "ansi-regex": {
           "version": "3.0.1",
@@ -12765,6 +13490,14 @@
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
           "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE="
         },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
         "load-json-file": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
@@ -13053,6 +13786,13 @@
           "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "requires": {
             "ms": "^2.1.1"
+          },
+          "dependencies": {
+            "ms": {
+              "version": "2.1.3",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+              "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+            }
           }
         },
         "expand-brackets": {
@@ -13093,61 +13833,14 @@
                 "is-extendable": "^0.1.0"
               }
             },
-            "is-accessor-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-              "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-data-descriptor": {
-              "version": "0.1.4",
-              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-              "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
             "is-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+              "version": "0.1.7",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+              "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
               "requires": {
-                "is-accessor-descriptor": "^0.1.6",
-                "is-data-descriptor": "^0.1.4",
-                "kind-of": "^5.0.0"
+                "is-accessor-descriptor": "^1.0.1",
+                "is-data-descriptor": "^1.0.1"
               }
-            },
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
-            },
-            "ms": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
             }
           }
         },
@@ -13234,30 +13927,21 @@
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
           "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
         },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+        "is-descriptor": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+          "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
           "requires": {
-            "kind-of": "^6.0.0"
+            "is-accessor-descriptor": "^1.0.1",
+            "is-data-descriptor": "^1.0.1"
           }
         },
-        "is-data-descriptor": {
+        "is-fullwidth-code-point": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "number-is-nan": "^1.0.0"
           }
         },
         "is-number": {
@@ -13308,6 +13992,11 @@
             "to-regex": "^3.0.2"
           }
         },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        },
         "normalize-path": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -13326,6 +14015,16 @@
           "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
           "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
         },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
         "supports-color": {
           "version": "5.5.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -13494,18 +14193,48 @@
         "is-symbol": "^1.0.3"
       }
     },
+    "which-builtin-type": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz",
+      "integrity": "sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==",
+      "requires": {
+        "function.prototype.name": "^1.1.5",
+        "has-tostringtag": "^1.0.0",
+        "is-async-function": "^2.0.0",
+        "is-date-object": "^1.0.5",
+        "is-finalizationregistry": "^1.0.2",
+        "is-generator-function": "^1.0.10",
+        "is-regex": "^1.1.4",
+        "is-weakref": "^1.0.2",
+        "isarray": "^2.0.5",
+        "which-boxed-primitive": "^1.0.2",
+        "which-collection": "^1.0.1",
+        "which-typed-array": "^1.1.9"
+      }
+    },
+    "which-collection": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
+      "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
+      "requires": {
+        "is-map": "^2.0.1",
+        "is-set": "^2.0.1",
+        "is-weakmap": "^2.0.1",
+        "is-weakset": "^2.0.1"
+      }
+    },
     "which-module": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
       "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="
     },
     "which-typed-array": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
-      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz",
+      "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==",
       "requires": {
         "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.4",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
         "has-tostringtag": "^1.0.0"
@@ -13538,49 +14267,47 @@
       }
     },
     "wrap-ansi": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "requires": {
-        "ansi-styles": "^3.2.0",
-        "string-width": "^3.0.0",
-        "strip-ansi": "^5.0.0"
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
         },
         "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "requires": {
-            "color-convert": "^1.9.0"
+            "color-convert": "^2.0.1"
           }
         },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
+            "color-name": "~1.1.4"
           }
         },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+        },
         "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
           "requires": {
-            "ansi-regex": "^4.1.0"
+            "ansi-regex": "^5.0.1"
           }
         }
       }
@@ -13625,105 +14352,30 @@
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
     "yargs": {
-      "version": "13.3.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "requires": {
-        "cliui": "^5.0.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^2.0.1",
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^3.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^13.1.2"
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="
-        },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
+        "y18n": {
+          "version": "5.0.8",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
         }
       }
     },
     "yargs-parser": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-      "requires": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
-        }
-      }
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
     },
     "yeast": {
       "version": "0.1.2",
diff --git a/package.json b/package.json
index 0ade7f9ec..54901a7df 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,6 @@
     "@types/react": "^17.0.2",
     "@types/react-datepicker": "^4.11.2",
     "@types/react-dom": "^17.0.1",
-    "@types/react-redux": "^5.0.7",
     "@types/react-toggle": "^4.0.3",
     "@types/redux-logger": "^3.0.9",
     "@types/sinon": "^10.0.16",
@@ -57,6 +56,7 @@
     "extract-text-webpack-plugin": "3.0.2",
     "fetch-mock": "^9.11.0",
     "file-loader": "^6.2.0",
+    "firebase": "^9.6.11",
     "html-webpack-plugin": "^3.2.0",
     "isomorphic-fetch": "^2.2.1",
     "jasmine-core": "3.3.0",
@@ -76,15 +76,15 @@
     "react": "^17.0.2",
     "react-datepicker": "4.7.0",
     "react-dom": "^17.0.2",
-    "react-redux": "5.0.7",
+    "react-redux": "8.1.3",
     "react-router-dom": "^6.3.0",
     "react-sortable-hoc": "0.8.3",
     "react-test-renderer": "^16.14.0",
     "react-toggle": "4.0.2",
     "reactstrap": "9.0.1",
-    "redux": "3.7.2",
+    "redux": "4.2.1",
     "redux-logger": "3.0.6",
-    "redux-thunk": "2.3.0",
+    "redux-thunk": "2.4.2",
     "reselect": "3.0.1",
     "sass-loader": "^6.0.6",
     "sinon": "^4.0.0",
diff --git a/requirements.txt b/requirements.txt
index 4f8ff3f69..9abf093b0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,7 +14,7 @@ sentry-sdk[flask]>=1.5.7,<1.6
 eve-elastic>=7.3.1,<7.4
 MarkupSafe<2.1
 python3-saml>=1.15,<1.16
-
+google-auth>=2.6,<2.7
 
 # Fix an issue between xhtml2pdf v0.2.4 and reportlab v3.6.7
 # https://github.com/xhtml2pdf/xhtml2pdf/issues/589
diff --git a/tests/core/test_auth_providers.py b/tests/core/test_auth_providers.py
index ff73e4f51..a4bae146e 100644
--- a/tests/core/test_auth_providers.py
+++ b/tests/core/test_auth_providers.py
@@ -22,8 +22,8 @@
 def init(app):
     app.config["AUTH_PROVIDERS"].extend(
         [
-            {"_id": "gip", "name": "Google", "auth_type": AuthProviderType.GOOGLE_OAUTH.value},
-            {"_id": "saml", "name": "Azure", "auth_type": AuthProviderType.SAML.value},
+            {"_id": "gip", "name": "Google", "auth_type": AuthProviderType.GOOGLE_OAUTH},
+            {"_id": "saml", "name": "Azure", "auth_type": AuthProviderType.SAML},
         ]
     )
     app.data.insert(
@@ -38,7 +38,7 @@ def init(app):
                 "_id": companies["password_auth"],
                 "name": "Password based auth",
                 "is_enabled": True,
-                "auth_provider": "newshub",
+                "auth_provider": "newsroom",
             },
             {
                 "_id": companies["google_auth"],
diff --git a/tests/core/test_csv_formatter.py b/tests/core/test_csv_formatter.py
new file mode 100644
index 000000000..76684e5af
--- /dev/null
+++ b/tests/core/test_csv_formatter.py
@@ -0,0 +1,90 @@
+from .test_push_events import test_event
+from flask import json
+import copy
+from newsroom.utils import get_entity_or_404
+from newsroom.agenda.formatters import CSVFormatter
+import csv
+
+
+event = copy.deepcopy(test_event)
+event["coverages"] = [
+    {
+        "planning_id": "urn:newsml:stt.fi:20280911:631023",
+        "coverage_id": "ID_EVENT_286323",
+        "scheduled": "2028-09-11T00:00:00+0000",
+        "coverage_type": "text",
+        "workflow_status": "draft",
+        "coverage_status": "coverage intended",
+        "slugline": "Testi/Luotsi",
+    },
+    {
+        "planning_id": "urn:newsml:stt.fi:20280911:631025",
+        "coverage_id": "ID_WORKREQUEST_187845",
+        "scheduled": "2023-10-03T22:00:00+0000",
+        "coverage_type": "picture",
+        "workflow_status": "draft",
+        "coverage_status": "coverage intended",
+        "slugline": "Testi/Luotsi",
+        "genre": [{"qcode": "sttimage:20", "name": "Kuvaaja paikalla"}],
+    },
+]
+event["subject"] = [
+    {"name": "Statistics & Economic Indicators", "qcode": "150", "scheme": "event_types", "code": "150"},
+    {"name": "Economic Indicators", "qcode": "3", "scheme": "categories", "code": "3"},
+]
+event["anpa_category"].append({"name": "Economic News", "qcode": "b", "code": "b"})
+
+
+def test_csv_formatter_item(client, app):
+    client.post("/push", data=json.dumps(event), content_type="application/json")
+    parsed = get_entity_or_404(event["guid"], "agenda")
+    formatter = CSVFormatter()
+    assert formatter.format_filename(parsed).endswith("new-press-conference.csv")
+    csv_data = formatter.format_item(parsed, item_type="agenda")
+    csv_string = csv_data.decode("utf-8")
+    csv_lines = csv_string.split("\n")
+    csv_reader = csv.reader(csv_lines)
+
+    header = next(csv_reader)
+    expected_header_fields = [
+        "Event name",
+        "Description",
+        "Language",
+        "Event start date",
+        "Event end date",
+        "Event time",
+        "Event timezone",
+        "Location",
+        "Country",
+        "Subject",
+        "Website",
+        "Category",
+        "Event type",
+        "Organization name",
+        "Contact",
+        "Coverage type",
+        "Coverage status",
+    ]
+    assert header == expected_header_fields
+
+    data_fields = next(csv_reader)
+    expected_data_values = [
+        "Prime minister press conference",
+        "Ministers will check the environmental issues",
+        "en-CA",
+        "2018-05-28",
+        "2018-05-28",
+        "04:00:00-05:00:00",
+        "Australia/Sydney",
+        "Sydney",
+        "Australia",
+        "Statistics & Economic Indicators,Economic Indicators",
+        "www.earthhour.com",
+        "Australian General News,Economic News",
+        "event",
+        "AAP",
+        "Professor,Tom,Jones,AAP,jones@foo.com,",
+        "text,picture",
+        "coverage intended,coverage intended",
+    ]
+    assert data_fields == expected_data_values
diff --git a/webpack.config.js b/webpack.config.js
index 9e5ef8554..4b136b039 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -34,6 +34,9 @@ const config = {
         common: path.resolve(__dirname, 'assets/common.ts'),
         design_js: path.resolve(__dirname, 'assets/design_pages.ts'),
         company_admin_js: path.resolve(__dirname, 'assets/company-admin/index.ts'),
+        firebase_login_js: path.resolve(__dirname, 'assets/auth/firebase/login.ts'),
+        firebase_reset_password_js: path.resolve(__dirname, 'assets/auth/firebase/reset_password.ts'),
+        firebase_change_password_js: path.resolve(__dirname, 'assets/auth/firebase/change_password.ts'),
     },
     output: {
         path: path.resolve(process.cwd(), 'dist'),
diff --git a/webpack.design.js b/webpack.design.js
index 8b375ee3e..eca25f8ec 100644
--- a/webpack.design.js
+++ b/webpack.design.js
@@ -27,17 +27,16 @@ const config = {
     module: {
         rules: [
             {
-                test: /\.jsx?$/,
+                test: /\.(ts|tsx|js|jsx)$/,
                 include: [
                     path.resolve(__dirname, 'design_app/src'),
                     path.resolve(__dirname, 'assets'),
                     path.resolve(__dirname, 'node_modules/bootstrap'),
                     path.resolve(process.cwd(), 'node_modules/bootstrap'),
                 ],
-                loader: 'babel-loader',
+                loader: 'ts-loader',
                 options: {
-                    presets: ['es2015', 'react'],
-                    plugins: ['transform-object-rest-spread'],
+                    transpileOnly: true,
                 },
             },
             {
@@ -61,9 +60,6 @@ const config = {
                     'file-loader',
                 ],
             },
-            { 
-                test: /\.([cm]?ts|tsx)$/, loader: "ts-loader",
-            },
         ],
     },
     resolve: {