From 81ad51f74e0274b72531dba10450d316626b56b8 Mon Sep 17 00:00:00 2001 From: Arthur Dufour Date: Wed, 17 Apr 2024 17:20:11 +0200 Subject: [PATCH] refactor: create a `KBD_SHORTCUT_DEFAULT` constant --- src/__mocks__/mock-state.ts | 3 ++- src/context/App.test.tsx | 5 +++-- src/context/App.tsx | 2 +- src/utils/constants.ts | 2 ++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/__mocks__/mock-state.ts b/src/__mocks__/mock-state.ts index 43cddbbb2..918dbb06b 100644 --- a/src/__mocks__/mock-state.ts +++ b/src/__mocks__/mock-state.ts @@ -1,4 +1,5 @@ import { type AuthState, type SettingsState, Theme } from '../types'; +import Constants from '../utils/constants'; import { mockedEnterpriseAccounts, mockedUser } from './mockedData'; export const mockAccounts: AuthState = { @@ -18,6 +19,6 @@ export const mockSettings: SettingsState = { detailedNotifications: false, markAsDoneOnOpen: false, showAccountHostname: false, - kbdShortcut: 'CmdOrCtrl+Alt+G', + kbdShortcut: Constants.KBD_SHORTCUT_DEFAULT, kbdShortcutEnabled: false, }; diff --git a/src/context/App.test.tsx b/src/context/App.test.tsx index 9169f3561..85e40895b 100644 --- a/src/context/App.test.tsx +++ b/src/context/App.test.tsx @@ -6,6 +6,7 @@ import { useNotifications } from '../hooks/useNotifications'; import type { AuthState, SettingsState } from '../types'; import * as apiRequests from '../utils/api-requests'; import * as comms from '../utils/comms'; +import Constants from '../utils/constants'; import * as notifications from '../utils/notifications'; import * as storage from '../utils/storage'; import { AppContext, AppProvider } from './App'; @@ -291,7 +292,7 @@ describe('context/App.tsx', () => { detailedNotifications: false, markAsDoneOnOpen: false, showAccountHostname: false, - kbdShortcut: 'CmdOrCtrl+Alt+G', + kbdShortcut: Constants.KBD_SHORTCUT_DEFAULT, kbdShortcutEnabled: false, }, ); @@ -337,7 +338,7 @@ describe('context/App.tsx', () => { detailedNotifications: false, markAsDoneOnOpen: false, showAccountHostname: false, - kbdShortcut: 'CmdOrCtrl+Alt+G', + kbdShortcut: Constants.KBD_SHORTCUT_DEFAULT, kbdShortcutEnabled: false, }, ); diff --git a/src/context/App.tsx b/src/context/App.tsx index ec61c873a..089587b18 100644 --- a/src/context/App.tsx +++ b/src/context/App.tsx @@ -43,7 +43,7 @@ export const defaultSettings: SettingsState = { detailedNotifications: false, markAsDoneOnOpen: false, showAccountHostname: false, - kbdShortcut: 'CmdOrCtrl+Alt+G', + kbdShortcut: Constants.KBD_SHORTCUT_DEFAULT, kbdShortcutEnabled: false, }; diff --git a/src/utils/constants.ts b/src/utils/constants.ts index ded5e63c9..83b61116f 100644 --- a/src/utils/constants.ts +++ b/src/utils/constants.ts @@ -18,6 +18,8 @@ export const Constants = { ALLREAD_EMOJIS: ['😉', '🎉', '🐯', '🙈', '🎈', '🎊', '👏', '🎪', '🍝'], FETCH_INTERVAL: 60000, + + KBD_SHORTCUT_DEFAULT: 'CmdOrCtrl+Alt+G', }; export const Errors: Record = {