diff --git a/src/hooks/useNotifications.ts b/src/hooks/useNotifications.ts index 80e13dc6a..e0c12a6c7 100644 --- a/src/hooks/useNotifications.ts +++ b/src/hooks/useNotifications.ts @@ -18,12 +18,7 @@ import { } from '../utils/api/client'; import { determineFailureType } from '../utils/api/errors'; import Constants from '../utils/constants'; -import { - getEnterpriseAccountToken, - getTokenForHost, - isEnterpriseHost, - isGitHubLoggedIn, -} from '../utils/helpers'; +import { getTokenForHost, isGitHubLoggedIn } from '../utils/helpers'; import { setTrayIconColor, triggerNativeNotifications, @@ -187,10 +182,7 @@ export const useNotifications = (): NotificationsState => { async (accounts: AuthState, id: string, hostname: string) => { setStatus('loading'); - const isEnterprise = isEnterpriseHost(hostname); - const token = isEnterprise - ? getEnterpriseAccountToken(hostname, accounts.enterpriseAccounts) - : accounts.token; + const token = getTokenForHost(hostname, accounts); try { await markNotificationThreadAsRead(id, hostname, token); @@ -215,10 +207,7 @@ export const useNotifications = (): NotificationsState => { async (accounts: AuthState, id: string, hostname: string) => { setStatus('loading'); - const isEnterprise = isEnterpriseHost(hostname); - const token = isEnterprise - ? getEnterpriseAccountToken(hostname, accounts.enterpriseAccounts) - : accounts.token; + const token = getTokenForHost(hostname, accounts); try { await markNotificationThreadAsDone(id, hostname, token); @@ -243,10 +232,7 @@ export const useNotifications = (): NotificationsState => { async (accounts: AuthState, id: string, hostname: string) => { setStatus('loading'); - const isEnterprise = isEnterpriseHost(hostname); - const token = isEnterprise - ? getEnterpriseAccountToken(hostname, accounts.enterpriseAccounts) - : accounts.token; + const token = getTokenForHost(hostname, accounts); try { await ignoreNotificationThreadSubscription(id, hostname, token); @@ -263,10 +249,7 @@ export const useNotifications = (): NotificationsState => { async (accounts: AuthState, repoSlug: string, hostname: string) => { setStatus('loading'); - const isEnterprise = isEnterpriseHost(hostname); - const token = isEnterprise - ? getEnterpriseAccountToken(hostname, accounts.enterpriseAccounts) - : accounts.token; + const token = getTokenForHost(hostname, accounts); try { await markRepositoryNotificationsAsRead(repoSlug, hostname, token); diff --git a/src/utils/helpers.ts b/src/utils/helpers.ts index cc3029754..e84a78879 100644 --- a/src/utils/helpers.ts +++ b/src/utils/helpers.ts @@ -1,4 +1,4 @@ -import type { AuthState, EnterpriseAccount } from '../types'; +import type { AuthState } from '../types'; import type { Discussion, DiscussionComment, @@ -17,18 +17,13 @@ export function isGitHubLoggedIn(accounts: AuthState): boolean { export function getTokenForHost(hostname: string, accounts: AuthState): string { const isEnterprise = isEnterpriseHost(hostname); - const token = isEnterprise - ? getEnterpriseAccountToken(hostname, accounts.enterpriseAccounts) - : accounts.token; - return token; -} + if (isEnterprise) { + return accounts.enterpriseAccounts.find((obj) => obj.hostname === hostname) + .token; + } -export function getEnterpriseAccountToken( - hostname: string, - accounts: EnterpriseAccount[], -): string { - return accounts.find((obj) => obj.hostname === hostname).token; + return accounts.token; } export function isEnterpriseHost(hostname: string): boolean {