diff options
author | Sebastian <sebasjm@gmail.com> | 2024-03-22 13:56:16 -0300 |
---|---|---|
committer | Sebastian <sebasjm@gmail.com> | 2024-03-26 16:57:58 -0300 |
commit | e2bfbced7ab027c901913e83ff7dd82240661990 (patch) | |
tree | 33752605ccaf19498f8c2a64e0117db16f22ce26 /packages/merchant-backoffice-ui/src/Routing.tsx | |
parent | 0c265558c4b7b78a13272abf1c4c84e3cf93c987 (diff) | |
download | wallet-core-e2bfbced7ab027c901913e83ff7dd82240661990.tar.xz |
work in progress, new api being used. merchant now should move into using the full API
Diffstat (limited to 'packages/merchant-backoffice-ui/src/Routing.tsx')
-rw-r--r-- | packages/merchant-backoffice-ui/src/Routing.tsx | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/packages/merchant-backoffice-ui/src/Routing.tsx b/packages/merchant-backoffice-ui/src/Routing.tsx index 50a91c060..4ed5850e7 100644 --- a/packages/merchant-backoffice-ui/src/Routing.tsx +++ b/packages/merchant-backoffice-ui/src/Routing.tsx @@ -39,7 +39,10 @@ import { MerchantBackend } from "./declaration.js"; import { useInstanceBankAccounts } from "./hooks/bank.js"; import { useInstanceKYCDetails } from "./hooks/instance.js"; import { usePreference } from "./hooks/preference.js"; -import { DEFAULT_ADMIN_USERNAME, useSessionState } from "./hooks/session.js"; +import { + DEFAULT_ADMIN_USERNAME, + useSessionContext, +} from "./context/session.js"; import InstanceCreatePage from "./paths/admin/create/index.js"; import InstanceListPage from "./paths/admin/list/index.js"; import BankAccountCreatePage from "./paths/instance/accounts/create/index.js"; @@ -74,6 +77,7 @@ import { LoginPage } from "./paths/login/index.js"; import NotFoundPage from "./paths/notfound/index.js"; import { Settings } from "./paths/settings/index.js"; import { Notification } from "./utils/types.js"; +import { createHashHistory } from "history"; export enum InstancePaths { error = "/error", @@ -138,9 +142,10 @@ export const publicPages = { go: urlPattern(/\/home/, () => "#/home"), }; +const history = createHashHistory(); export function Routing(_p: Props): VNode { const { i18n } = useTranslationContext(); - const { state } = useSessionState(); + const { state } = useSessionContext(); type GlobalNotifState = | (Notification & { to: string | undefined }) @@ -152,8 +157,10 @@ export function Routing(_p: Props): VNode { const instance = useInstanceBankAccounts(); const accounts = !instance.ok ? undefined : instance.data.accounts; - const shouldWarnAboutMissingBankAccounts = !state.isAdmin && accounts !== undefined && accounts.length < 1 - const shouldLogin = state.status === "loggedOut" || state.status === "expired"; + const shouldWarnAboutMissingBankAccounts = + !state.isAdmin && accounts !== undefined && accounts.length < 1; + const shouldLogin = + state.status === "loggedOut" || state.status === "expired"; function ServerErrorRedirectTo(to: InstancePaths | AdminPaths) { return function ServerErrorRedirectToImpl( @@ -275,6 +282,7 @@ export function Routing(_p: Props): VNode { )} <Router + history={history} onChange={(e) => { const movingOutFromNotification = globalNotification && e.url !== globalNotification.to; |