diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index 1f561e68ef..760ea52855 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -54,6 +54,7 @@ import LeftPanel from "./LeftPanel";
 import CallContainer from '../views/voip/CallContainer';
 import { ViewRoomDeltaPayload } from "../../dispatcher/payloads/ViewRoomDeltaPayload";
 import RoomListStore from "../../stores/room-list/RoomListStore";
+import { ToggleRightPanelPayload } from "../../dispatcher/payloads/ToggleRightPanelPayload";
 
 // We need to fetch each pinned message individually (if we don't already have it)
 // so each pinned message may trigger a request. Limit the number per room for sanity.
@@ -472,8 +473,8 @@ class LoggedInView extends React.Component<IProps, IState> {
 
             case Key.PERIOD:
                 if (ctrlCmdOnly && (this.props.page_type === "room_view" || this.props.page_type === "group_view")) {
-                    dis.dispatch({
-                        action: 'toggle_right_panel',
+                    dis.dispatch<ToggleRightPanelPayload>({
+                        action: Action.ToggleRightPanel,
                         type: this.props.page_type === "room_view" ? "room" : "group",
                     });
                     handled = true;
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 776130e709..a4e3254e4c 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -26,7 +26,7 @@ import dis from '../../dispatcher/dispatcher';
 import RateLimitedFunc from '../../ratelimitedfunc';
 import { showGroupInviteDialog, showGroupAddRoomDialog } from '../../GroupAddressPicker';
 import GroupStore from '../../stores/GroupStore';
-import {RIGHT_PANEL_PHASES, RIGHT_PANEL_PHASES_NO_ARGS} from "../../stores/RightPanelStorePhases";
+import {RightPanelPhases, RIGHT_PANEL_PHASES_NO_ARGS} from "../../stores/RightPanelStorePhases";
 import RightPanelStore from "../../stores/RightPanelStore";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import {Action} from "../../dispatcher/actions";
@@ -75,8 +75,8 @@ export default class RightPanel extends React.Component {
         const userForPanel = this._getUserForPanel();
         if (this.props.groupId) {
             if (!RIGHT_PANEL_PHASES_NO_ARGS.includes(rps.groupPanelPhase)) {
-                dis.dispatch({action: "set_right_panel_phase", phase: RIGHT_PANEL_PHASES.GroupMemberList});
-                return RIGHT_PANEL_PHASES.GroupMemberList;
+                dis.dispatch({action: Action.SetRightPanelPhase, phase: RightPanelPhases.GroupMemberList});
+                return RightPanelPhases.GroupMemberList;
             }
             return rps.groupPanelPhase;
         } else if (userForPanel) {
@@ -98,11 +98,11 @@ export default class RightPanel extends React.Component {
             ) {
                 return rps.roomPanelPhase;
             }
-            return RIGHT_PANEL_PHASES.RoomMemberInfo;
+            return RightPanelPhases.RoomMemberInfo;
         } else {
             if (!RIGHT_PANEL_PHASES_NO_ARGS.includes(rps.roomPanelPhase)) {
-                dis.dispatch({action: "set_right_panel_phase", phase: RIGHT_PANEL_PHASES.RoomMemberList});
-                return RIGHT_PANEL_PHASES.RoomMemberList;
+                dis.dispatch({action: Action.SetRightPanelPhase, phase: RightPanelPhases.RoomMemberList});
+                return RightPanelPhases.RoomMemberList;
             }
             return rps.roomPanelPhase;
         }
@@ -149,7 +149,7 @@ export default class RightPanel extends React.Component {
     onInviteToGroupButtonClick() {
         showGroupInviteDialog(this.props.groupId).then(() => {
             this.setState({
-                phase: RIGHT_PANEL_PHASES.GroupMemberList,
+                phase: RightPanelPhases.GroupMemberList,
             });
         });
     }
@@ -165,9 +165,9 @@ export default class RightPanel extends React.Component {
             return;
         }
         // redraw the badge on the membership list
-        if (this.state.phase === RIGHT_PANEL_PHASES.RoomMemberList && member.roomId === this.props.roomId) {
+        if (this.state.phase === RightPanelPhases.RoomMemberList && member.roomId === this.props.roomId) {
             this._delayedUpdate();
-        } else if (this.state.phase === RIGHT_PANEL_PHASES.RoomMemberInfo && member.roomId === this.props.roomId &&
+        } else if (this.state.phase === RightPanelPhases.RoomMemberInfo && member.roomId === this.props.roomId &&
                 member.userId === this.state.member.userId) {
             // refresh the member info (e.g. new power level)
             this._delayedUpdate();
@@ -175,7 +175,7 @@ export default class RightPanel extends React.Component {
     }
 
     onAction(payload) {
-        if (payload.action === "after_right_panel_phase_change") {
+        if (payload.action === Action.AfterRightPanelPhaseChange) {
             this.setState({
                 phase: payload.phase,
                 groupRoomId: payload.groupRoomId,
@@ -206,7 +206,7 @@ export default class RightPanel extends React.Component {
             // or the member list if we were in the member panel... phew.
             dis.dispatch({
                 action: Action.ViewUser,
-                member: this.state.phase === RIGHT_PANEL_PHASES.EncryptionPanel ? this.state.member : null,
+                member: this.state.phase === RightPanelPhases.EncryptionPanel ? this.state.member : null,
             });
         }
     };
@@ -225,21 +225,21 @@ export default class RightPanel extends React.Component {
         let panel = <div />;
 
         switch (this.state.phase) {
-            case RIGHT_PANEL_PHASES.RoomMemberList:
+            case RightPanelPhases.RoomMemberList:
                 if (this.props.roomId) {
                     panel = <MemberList roomId={this.props.roomId} key={this.props.roomId} />;
                 }
                 break;
-            case RIGHT_PANEL_PHASES.GroupMemberList:
+            case RightPanelPhases.GroupMemberList:
                 if (this.props.groupId) {
                     panel = <GroupMemberList groupId={this.props.groupId} key={this.props.groupId} />;
                 }
                 break;
-            case RIGHT_PANEL_PHASES.GroupRoomList:
+            case RightPanelPhases.GroupRoomList:
                 panel = <GroupRoomList groupId={this.props.groupId} key={this.props.groupId} />;
                 break;
-            case RIGHT_PANEL_PHASES.RoomMemberInfo:
-            case RIGHT_PANEL_PHASES.EncryptionPanel:
+            case RightPanelPhases.RoomMemberInfo:
+            case RightPanelPhases.EncryptionPanel:
                 panel = <UserInfo
                     user={this.state.member}
                     roomId={this.props.roomId}
@@ -250,26 +250,26 @@ export default class RightPanel extends React.Component {
                     verificationRequestPromise={this.state.verificationRequestPromise}
                 />;
                 break;
-            case RIGHT_PANEL_PHASES.Room3pidMemberInfo:
+            case RightPanelPhases.Room3pidMemberInfo:
                 panel = <ThirdPartyMemberInfo event={this.state.event} key={this.props.roomId} />;
                 break;
-            case RIGHT_PANEL_PHASES.GroupMemberInfo:
+            case RightPanelPhases.GroupMemberInfo:
                 panel = <UserInfo
                     user={this.state.member}
                     groupId={this.props.groupId}
                     key={this.state.member.userId}
                     onClose={this.onCloseUserInfo} />;
                 break;
-            case RIGHT_PANEL_PHASES.GroupRoomInfo:
+            case RightPanelPhases.GroupRoomInfo:
                 panel = <GroupRoomInfo
                     groupRoomId={this.state.groupRoomId}
                     groupId={this.props.groupId}
                     key={this.state.groupRoomId} />;
                 break;
-            case RIGHT_PANEL_PHASES.NotificationPanel:
+            case RightPanelPhases.NotificationPanel:
                 panel = <NotificationPanel />;
                 break;
-            case RIGHT_PANEL_PHASES.FilePanel:
+            case RightPanelPhases.FilePanel:
                 panel = <FilePanel roomId={this.props.roomId} resizeNotifier={this.props.resizeNotifier} />;
                 break;
         }
diff --git a/src/components/views/messages/MKeyVerificationRequest.js b/src/components/views/messages/MKeyVerificationRequest.js
index a5b1ae26bb..01a5c2663e 100644
--- a/src/components/views/messages/MKeyVerificationRequest.js
+++ b/src/components/views/messages/MKeyVerificationRequest.js
@@ -22,7 +22,8 @@ import { _t } from '../../../languageHandler';
 import {getNameForEventRoom, userLabelForEventRoom}
     from '../../../utils/KeyVerificationStateObserver';
 import dis from "../../../dispatcher/dispatcher";
-import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
+import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
+import {Action} from "../../../dispatcher/actions";
 
 export default class MKeyVerificationRequest extends React.Component {
     constructor(props) {
@@ -48,8 +49,8 @@ export default class MKeyVerificationRequest extends React.Component {
         const {verificationRequest} = this.props.mxEvent;
         const member = MatrixClientPeg.get().getUser(verificationRequest.otherUserId);
         dis.dispatch({
-            action: "set_right_panel_phase",
-            phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+            action: Action.SetRightPanelPhase,
+            phase: RightPanelPhases.EncryptionPanel,
             refireParams: {verificationRequest, member},
         });
     };
diff --git a/src/components/views/right_panel/GroupHeaderButtons.js b/src/components/views/right_panel/GroupHeaderButtons.js
index 33d9325433..fb589b1a0f 100644
--- a/src/components/views/right_panel/GroupHeaderButtons.js
+++ b/src/components/views/right_panel/GroupHeaderButtons.js
@@ -21,23 +21,23 @@ limitations under the License.
 import React from 'react';
 import { _t } from '../../../languageHandler';
 import HeaderButton from './HeaderButton';
-import HeaderButtons, {HEADER_KIND_GROUP} from './HeaderButtons';
-import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
+import HeaderButtons, {HeaderKind} from './HeaderButtons';
+import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
 import {Action} from "../../../dispatcher/actions";
 import {ActionPayload} from "../../../dispatcher/payloads";
 
 const GROUP_PHASES = [
-    RIGHT_PANEL_PHASES.GroupMemberInfo,
-    RIGHT_PANEL_PHASES.GroupMemberList,
+    RightPanelPhases.GroupMemberInfo,
+    RightPanelPhases.GroupMemberList,
 ];
 const ROOM_PHASES = [
-    RIGHT_PANEL_PHASES.GroupRoomList,
-    RIGHT_PANEL_PHASES.GroupRoomInfo,
+    RightPanelPhases.GroupRoomList,
+    RightPanelPhases.GroupRoomInfo,
 ];
 
 export default class GroupHeaderButtons extends HeaderButtons {
     constructor(props) {
-        super(props, HEADER_KIND_GROUP);
+        super(props, HeaderKind.Group);
         this._onMembersClicked = this._onMembersClicked.bind(this);
         this._onRoomsClicked = this._onRoomsClicked.bind(this);
     }
@@ -47,39 +47,39 @@ export default class GroupHeaderButtons extends HeaderButtons {
 
         if (payload.action === Action.ViewUser) {
             if (payload.member) {
-                this.setPhase(RIGHT_PANEL_PHASES.RoomMemberInfo, {member: payload.member});
+                this.setPhase(RightPanelPhases.RoomMemberInfo, {member: payload.member});
             } else {
-                this.setPhase(RIGHT_PANEL_PHASES.GroupMemberList);
+                this.setPhase(RightPanelPhases.GroupMemberList);
             }
         } else if (payload.action === "view_group") {
-            this.setPhase(RIGHT_PANEL_PHASES.GroupMemberList);
+            this.setPhase(RightPanelPhases.GroupMemberList);
         } else if (payload.action === "view_group_room") {
             this.setPhase(
-                RIGHT_PANEL_PHASES.GroupRoomInfo,
+                RightPanelPhases.GroupRoomInfo,
                 {groupRoomId: payload.groupRoomId, groupId: payload.groupId},
             );
         } else if (payload.action === "view_group_room_list") {
-            this.setPhase(RIGHT_PANEL_PHASES.GroupRoomList);
+            this.setPhase(RightPanelPhases.GroupRoomList);
         } else if (payload.action === "view_group_member_list") {
-            this.setPhase(RIGHT_PANEL_PHASES.GroupMemberList);
+            this.setPhase(RightPanelPhases.GroupMemberList);
         } else if (payload.action === "view_group_user") {
-            this.setPhase(RIGHT_PANEL_PHASES.GroupMemberInfo, {member: payload.member});
+            this.setPhase(RightPanelPhases.GroupMemberInfo, {member: payload.member});
         }
     }
 
     _onMembersClicked() {
-        if (this.state.phase === RIGHT_PANEL_PHASES.GroupMemberInfo) {
+        if (this.state.phase === RightPanelPhases.GroupMemberInfo) {
             // send the active phase to trigger a toggle
-            this.setPhase(RIGHT_PANEL_PHASES.GroupMemberInfo);
+            this.setPhase(RightPanelPhases.GroupMemberInfo);
         } else {
             // This toggles for us, if needed
-            this.setPhase(RIGHT_PANEL_PHASES.GroupMemberList);
+            this.setPhase(RightPanelPhases.GroupMemberList);
         }
     }
 
     _onRoomsClicked() {
         // This toggles for us, if needed
-        this.setPhase(RIGHT_PANEL_PHASES.GroupRoomList);
+        this.setPhase(RightPanelPhases.GroupRoomList);
     }
 
     renderButtons() {
diff --git a/src/components/views/right_panel/HeaderButtons.tsx b/src/components/views/right_panel/HeaderButtons.tsx
index 099e785ada..9e57eab5eb 100644
--- a/src/components/views/right_panel/HeaderButtons.tsx
+++ b/src/components/views/right_panel/HeaderButtons.tsx
@@ -23,6 +23,7 @@ import dis from '../../../dispatcher/dispatcher';
 import RightPanelStore from "../../../stores/RightPanelStore";
 import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
 import {Action} from '../../../dispatcher/actions';
+import {SetRightPanelPhasePayload} from '../../../dispatcher/payloads/SetRightPanelPhasePayload';
 
 export enum HeaderKind {
   Room = "room",
@@ -65,7 +66,7 @@ export default class HeaderButtons extends React.Component<IProps, IState> {
     }
 
     setPhase(phase: RightPanelPhases, extras) {
-        dis.dispatch({
+        dis.dispatch<SetRightPanelPhasePayload>({
             action: Action.SetRightPanelPhase,
             phase: phase,
             refireParams: extras,
diff --git a/src/components/views/right_panel/RoomHeaderButtons.js b/src/components/views/right_panel/RoomHeaderButtons.js
index 838727981d..8620d5b485 100644
--- a/src/components/views/right_panel/RoomHeaderButtons.js
+++ b/src/components/views/right_panel/RoomHeaderButtons.js
@@ -21,21 +21,21 @@ limitations under the License.
 import React from 'react';
 import { _t } from '../../../languageHandler';
 import HeaderButton from './HeaderButton';
-import HeaderButtons, {HEADER_KIND_ROOM} from './HeaderButtons';
-import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
+import HeaderButtons, {HeaderKind} from './HeaderButtons';
+import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
 import {Action} from "../../../dispatcher/actions";
 import {ActionPayload} from "../../../dispatcher/payloads";
 
 const MEMBER_PHASES = [
-    RIGHT_PANEL_PHASES.RoomMemberList,
-    RIGHT_PANEL_PHASES.RoomMemberInfo,
-    RIGHT_PANEL_PHASES.EncryptionPanel,
-    RIGHT_PANEL_PHASES.Room3pidMemberInfo,
+    RightPanelPhases.RoomMemberList,
+    RightPanelPhases.RoomMemberInfo,
+    RightPanelPhases.EncryptionPanel,
+    RightPanelPhases.Room3pidMemberInfo,
 ];
 
 export default class RoomHeaderButtons extends HeaderButtons {
     constructor(props) {
-        super(props, HEADER_KIND_ROOM);
+        super(props, HeaderKind.Room);
         this._onMembersClicked = this._onMembersClicked.bind(this);
         this._onFilesClicked = this._onFilesClicked.bind(this);
         this._onNotificationsClicked = this._onNotificationsClicked.bind(this);
@@ -45,38 +45,38 @@ export default class RoomHeaderButtons extends HeaderButtons {
         super.onAction(payload);
         if (payload.action === Action.ViewUser) {
             if (payload.member) {
-                this.setPhase(RIGHT_PANEL_PHASES.RoomMemberInfo, {member: payload.member});
+                this.setPhase(RightPanelPhases.RoomMemberInfo, {member: payload.member});
             } else {
-                this.setPhase(RIGHT_PANEL_PHASES.RoomMemberList);
+                this.setPhase(RightPanelPhases.RoomMemberList);
             }
         } else if (payload.action === "view_3pid_invite") {
             if (payload.event) {
-                this.setPhase(RIGHT_PANEL_PHASES.Room3pidMemberInfo, {event: payload.event});
+                this.setPhase(RightPanelPhases.Room3pidMemberInfo, {event: payload.event});
             } else {
-                this.setPhase(RIGHT_PANEL_PHASES.RoomMemberList);
+                this.setPhase(RightPanelPhases.RoomMemberList);
             }
         }
     }
 
     _onMembersClicked() {
-        if (this.state.phase === RIGHT_PANEL_PHASES.RoomMemberInfo) {
+        if (this.state.phase === RightPanelPhases.RoomMemberInfo) {
             // send the active phase to trigger a toggle
             // XXX: we should pass refireParams here but then it won't collapse as we desire it to
-            this.setPhase(RIGHT_PANEL_PHASES.RoomMemberInfo);
+            this.setPhase(RightPanelPhases.RoomMemberInfo);
         } else {
             // This toggles for us, if needed
-            this.setPhase(RIGHT_PANEL_PHASES.RoomMemberList);
+            this.setPhase(RightPanelPhases.RoomMemberList);
         }
     }
 
     _onFilesClicked() {
         // This toggles for us, if needed
-        this.setPhase(RIGHT_PANEL_PHASES.FilePanel);
+        this.setPhase(RightPanelPhases.FilePanel);
     }
 
     _onNotificationsClicked() {
         // This toggles for us, if needed
-        this.setPhase(RIGHT_PANEL_PHASES.NotificationPanel);
+        this.setPhase(RightPanelPhases.NotificationPanel);
     }
 
     renderButtons() {
@@ -89,13 +89,13 @@ export default class RoomHeaderButtons extends HeaderButtons {
             />,
             <HeaderButton key="filesButton" name="filesButton"
                 title={_t('Files')}
-                isHighlighted={this.isPhase(RIGHT_PANEL_PHASES.FilePanel)}
+                isHighlighted={this.isPhase(RightPanelPhases.FilePanel)}
                 onClick={this._onFilesClicked}
                 analytics={['Right Panel', 'File List Button', 'click']}
             />,
             <HeaderButton key="notifsButton" name="notifsButton"
                 title={_t('Notifications')}
-                isHighlighted={this.isPhase(RIGHT_PANEL_PHASES.NotificationPanel)}
+                isHighlighted={this.isPhase(RightPanelPhases.NotificationPanel)}
                 onClick={this._onNotificationsClicked}
                 analytics={['Right Panel', 'Notification List Button', 'click']}
             />,
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 719a64063d..20168faede 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -40,7 +40,7 @@ import E2EIcon from "../rooms/E2EIcon";
 import {useEventEmitter} from "../../../hooks/useEventEmitter";
 import {textualPowerLevel} from '../../../Roles';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
+import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
 import EncryptionPanel from "./EncryptionPanel";
 import { useAsyncMemo } from '../../../hooks/useAsyncMemo';
 import { verifyUser, legacyVerifyUser, verifyDevice } from '../../../verification';
@@ -1480,7 +1480,7 @@ const UserInfoHeader = ({onClose, member, e2eStatus}) => {
     </React.Fragment>;
 };
 
-const UserInfo = ({user, groupId, roomId, onClose, phase=RIGHT_PANEL_PHASES.RoomMemberInfo, ...props}) => {
+const UserInfo = ({user, groupId, roomId, onClose, phase=RightPanelPhases.RoomMemberInfo, ...props}) => {
     const cli = useContext(MatrixClientContext);
 
     // Load room if we are given a room id and memoize it
@@ -1500,8 +1500,8 @@ const UserInfo = ({user, groupId, roomId, onClose, phase=RIGHT_PANEL_PHASES.Room
 
     let content;
     switch (phase) {
-        case RIGHT_PANEL_PHASES.RoomMemberInfo:
-        case RIGHT_PANEL_PHASES.GroupMemberInfo:
+        case RightPanelPhases.RoomMemberInfo:
+        case RightPanelPhases.GroupMemberInfo:
             content = (
                 <BasicUserInfo
                     room={room}
@@ -1511,7 +1511,7 @@ const UserInfo = ({user, groupId, roomId, onClose, phase=RIGHT_PANEL_PHASES.Room
                     isRoomEncrypted={isRoomEncrypted} />
             );
             break;
-        case RIGHT_PANEL_PHASES.EncryptionPanel:
+        case RightPanelPhases.EncryptionPanel:
             classes.push("mx_UserInfo_smallAvatar");
             content = (
                 <EncryptionPanel {...props} member={member} onClose={onClose} isRoomEncrypted={isRoomEncrypted} />
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 2e56e49be1..b73f03a9c5 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -28,6 +28,7 @@ import SettingsStore from "../../../settings/SettingsStore";
 import {ContextMenu} from "../../structures/ContextMenu";
 import {WidgetType} from "../../../widgets/WidgetType";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
+import {Action} from "../../../dispatcher/actions";
 
 // This should be below the dialog level (4000), but above the rest of the UI (1000-2000).
 // We sit in a context menu, so this should be given to the context menu.
@@ -181,7 +182,7 @@ export default class Stickerpicker extends React.Component {
             case "stickerpicker_close":
                 this.setState({showStickers: false});
                 break;
-            case "after_right_panel_phase_change":
+            case Action.AfterRightPanelPhaseChange:
             case "show_left_panel":
             case "hide_left_panel":
                 this.setState({showStickers: false});
diff --git a/src/components/views/toasts/VerificationRequestToast.tsx b/src/components/views/toasts/VerificationRequestToast.tsx
index cc41e81b33..89c826eac4 100644
--- a/src/components/views/toasts/VerificationRequestToast.tsx
+++ b/src/components/views/toasts/VerificationRequestToast.tsx
@@ -19,7 +19,7 @@ import React from "react";
 import * as sdk from "../../../index";
 import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
+import {RightPanelPhases} from "../../../stores/RightPanelStorePhases";
 import {userLabelForEventRoom} from "../../../utils/KeyVerificationStateObserver";
 import dis from "../../../dispatcher/dispatcher";
 import ToastStore from "../../../stores/ToastStore";
@@ -27,6 +27,7 @@ import Modal from "../../../Modal";
 import GenericToast from "./GenericToast";
 import {VerificationRequest} from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 import {DeviceInfo} from "matrix-js-sdk/src/crypto/deviceinfo";
+import {Action} from "../../../dispatcher/actions";
 
 interface IProps {
     toastKey: string;
@@ -105,8 +106,8 @@ export default class VerificationRequestToast extends React.PureComponent<IProps
                     should_peek: false,
                 });
                 dis.dispatch({
-                    action: "set_right_panel_phase",
-                    phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+                    action: Action.SetRightPanelPhase,
+                    phase: RightPanelPhases.EncryptionPanel,
                     refireParams: {
                         verificationRequest: request,
                         member: cli.getUser(request.otherUserId),
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 50d6ffc09e..d5866c9064 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -28,7 +28,7 @@ import CustomStatusController from "./controllers/CustomStatusController";
 import ThemeController from './controllers/ThemeController';
 import PushToMatrixClientController from './controllers/PushToMatrixClientController';
 import ReloadOnChangeController from "./controllers/ReloadOnChangeController";
-import {RIGHT_PANEL_PHASES} from "../stores/RightPanelStorePhases";
+import {RightPanelPhases} from "../stores/RightPanelStorePhases";
 import FontSizeController from './controllers/FontSizeController';
 import SystemFontController from './controllers/SystemFontController';
 import UseSystemFontController from './controllers/UseSystemFontController';
@@ -534,11 +534,11 @@ export const SETTINGS = {
     },
     "lastRightPanelPhaseForRoom": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
-        default: RIGHT_PANEL_PHASES.RoomMemberInfo,
+        default: RightPanelPhases.RoomMemberInfo,
     },
     "lastRightPanelPhaseForGroup": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
-        default: RIGHT_PANEL_PHASES.GroupMemberList,
+        default: RightPanelPhases.GroupMemberList,
     },
     "enableEventIndexing": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
diff --git a/src/stores/RightPanelStore.ts b/src/stores/RightPanelStore.ts
index 6ed5d7fe9a..dc5eb99a36 100644
--- a/src/stores/RightPanelStore.ts
+++ b/src/stores/RightPanelStore.ts
@@ -15,11 +15,12 @@ limitations under the License.
 */
 
 import dis from '../dispatcher/dispatcher';
-import {Action} from '../dispatcher/actions';
 import {pendingVerificationRequestForUser} from '../verification';
 import {Store} from 'flux/utils';
 import SettingsStore, {SettingLevel} from "../settings/SettingsStore";
 import {RightPanelPhases, RIGHT_PANEL_PHASES_NO_ARGS} from "./RightPanelStorePhases";
+import {ActionPayload} from "../dispatcher/payloads";
+import {Action} from '../dispatcher/actions';
 
 interface RightPanelStoreState {
     // Whether or not to show the right panel at all. We split out rooms and groups
@@ -60,7 +61,7 @@ const MEMBER_INFO_PHASES = [
  * A class for tracking the state of the right panel between layouts and
  * sessions.
  */
-export default class RightPanelStore extends Store {
+export default class RightPanelStore extends Store<ActionPayload> {
     private static instance: RightPanelStore;
     private state: RightPanelStoreState;
 
diff --git a/src/verification.js b/src/verification.js
index 1dccb7dc28..36fb8b0e4f 100644
--- a/src/verification.js
+++ b/src/verification.js
@@ -19,10 +19,11 @@ import dis from "./dispatcher/dispatcher";
 import Modal from './Modal';
 import * as sdk from './index';
 import { _t } from './languageHandler';
-import {RIGHT_PANEL_PHASES} from "./stores/RightPanelStorePhases";
+import {RightPanelPhases} from "./stores/RightPanelStorePhases";
 import {findDMForUser} from './createRoom';
 import {accessSecretStorage} from './CrossSigningManager';
 import {verificationMethods} from 'matrix-js-sdk/src/crypto';
+import {Action} from './dispatcher/actions';
 
 async function enable4SIfNeeded() {
     const cli = MatrixClientPeg.get();
@@ -91,8 +92,8 @@ export async function verifyDevice(user, device) {
                     verificationMethods.SAS,
                 );
                 dis.dispatch({
-                    action: "set_right_panel_phase",
-                    phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+                    action: Action.SetRightPanelPhase,
+                    phase: RightPanelPhases.EncryptionPanel,
                     refireParams: {member: user, verificationRequestPromise},
                 });
             } else if (action === "legacy") {
@@ -120,8 +121,8 @@ export async function legacyVerifyUser(user) {
     }
     const verificationRequestPromise = cli.requestVerification(user.userId);
     dis.dispatch({
-        action: "set_right_panel_phase",
-        phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+        action: Action.SetRightPanelPhase,
+        phase: RightPanelPhases.EncryptionPanel,
         refireParams: {member: user, verificationRequestPromise},
     });
 }
@@ -132,8 +133,8 @@ export async function verifyUser(user) {
     }
     const existingRequest = pendingVerificationRequestForUser(user);
     dis.dispatch({
-        action: "set_right_panel_phase",
-        phase: RIGHT_PANEL_PHASES.EncryptionPanel,
+        action: Action.SetRightPanelPhase,
+        phase: RightPanelPhases.EncryptionPanel,
         refireParams: {
             member: user,
             verificationRequest: existingRequest,