diff --git a/src/components/ChangeEmail.tsx b/src/components/ChangeEmail.tsx
index 7c14bf4d6..7fae2aa7e 100644
--- a/src/components/ChangeEmail.tsx
+++ b/src/components/ChangeEmail.tsx
@@ -7,7 +7,7 @@ import SubmitButton from 'components/SubmitButton';
 import router from 'next/router';
 import { changeEmail, getOTTForEmailChange } from 'services/userService';
 import styled from 'styled-components';
-import { AppContext } from 'pages/_app';
+import { AppContext, FLASH_MESSAGE_TYPE } from 'pages/_app';
 import { getData, LS_KEYS, setData } from 'utils/storage/localStorage';
 
 interface formValues {
@@ -77,7 +77,7 @@ function ChangeEmailForm(props: Props) {
             setData(LS_KEYS.USER, { ...getData(LS_KEYS.USER), email });
             appContext.setDisappearingFlashMessage({
                 message: constants.EMAIL_UDPATE_SUCCESSFUL,
-                severity: 'success',
+                type: FLASH_MESSAGE_TYPE.SUCCESS,
             });
             router.push('/gallery');
         } catch (e) {
diff --git a/src/components/FlashMessageBar.tsx b/src/components/FlashMessageBar.tsx
index e8dd9c414..6838d2b94 100644
--- a/src/components/FlashMessageBar.tsx
+++ b/src/components/FlashMessageBar.tsx
@@ -12,7 +12,7 @@ export default function FlashMessageBar({
     return (
         <Alert
             className="flash-message text-center"
-            variant={flashMessage.severity}
+            variant={flashMessage.type}
             dismissible
             onClose={onClose}>
             <div style={{ maxWidth: '1024px', width: '80%', margin: 'auto' }}>
diff --git a/src/components/TwoFactorModal.tsx b/src/components/TwoFactorModal.tsx
index 1a3c795ba..95892bcc6 100644
--- a/src/components/TwoFactorModal.tsx
+++ b/src/components/TwoFactorModal.tsx
@@ -1,6 +1,6 @@
 import { useRouter } from 'next/router';
 import { DeadCenter, SetLoading } from 'pages/gallery';
-import { AppContext } from 'pages/_app';
+import { AppContext, FLASH_MESSAGE_TYPE } from 'pages/_app';
 import React, { useContext, useEffect, useState } from 'react';
 import { Button, Row } from 'react-bootstrap';
 import { disableTwoFactor, getTwoFactorStatus } from 'services/userService';
@@ -63,12 +63,12 @@ function TwoFactorModal(props: Props) {
             props.closeSidebar();
             appContext.setDisappearingFlashMessage({
                 message: constants.TWO_FACTOR_DISABLE_SUCCESS,
-                severity: 'info',
+                type: FLASH_MESSAGE_TYPE.INFO,
             });
         } catch (e) {
             appContext.setDisappearingFlashMessage({
                 message: constants.TWO_FACTOR_DISABLE_FAILED,
-                severity: 'danger',
+                type: FLASH_MESSAGE_TYPE.DANGER,
             });
         }
     };
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index f4df8c6b5..784376544 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -404,9 +404,15 @@ type AppContextType = {
     setDisappearingFlashMessage: (message: FlashMessage) => void;
 };
 
+export enum FLASH_MESSAGE_TYPE {
+    DANGER = 'danger',
+    INFO = 'info',
+    SUCCESS = 'success',
+    WARNING = 'warning',
+}
 export interface FlashMessage {
     message: string;
-    severity: string;
+    type: FLASH_MESSAGE_TYPE;
 }
 export const AppContext = createContext<AppContextType>(null);
 
diff --git a/src/pages/two-factor/setup/index.tsx b/src/pages/two-factor/setup/index.tsx
index db0476159..f9ee4d7cf 100644
--- a/src/pages/two-factor/setup/index.tsx
+++ b/src/pages/two-factor/setup/index.tsx
@@ -17,7 +17,7 @@ import VerifyTwoFactor from 'components/VerifyTwoFactor';
 import { B64EncryptionResult } from 'utils/crypto';
 import { encryptWithRecoveryKey } from 'utils/crypto';
 import { setData, LS_KEYS, getData } from 'utils/storage/localStorage';
-import { AppContext } from 'pages/_app';
+import { AppContext, FLASH_MESSAGE_TYPE } from 'pages/_app';
 
 enum SetupMode {
     QR_CODE,
@@ -56,7 +56,7 @@ export default function SetupTwoFactor() {
             } catch (e) {
                 appContext.setDisappearingFlashMessage({
                     message: constants.TWO_FACTOR_SETUP_FAILED,
-                    severity: 'danger',
+                    type: FLASH_MESSAGE_TYPE.DANGER,
                 });
                 router.push('/gallery');
             }
@@ -71,7 +71,7 @@ export default function SetupTwoFactor() {
         });
         appContext.setDisappearingFlashMessage({
             message: constants.TWO_FACTOR_SETUP_SUCCESS,
-            severity: 'info',
+            type: FLASH_MESSAGE_TYPE.SUCCESS,
         });
         router.push('/gallery');
     };