chore: rebase to develop changes

IntersectMBO · Feb 2, 2024 · edfe186 · edfe186
1 parent 4e32046
commit edfe186
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/govtool/frontend/src/context/wallet.tsx b/govtool/frontend/src/context/wallet.tsx
@@ -515,7 +515,7 @@ function CardanoProvider(props: Props) {
 
   const enable = useCallback(
     async (walletName: string) => {
-      await checkIsMaintenanceOn();
+      // await checkIsMaintenanceOn();
 
       // todo: use .getSupportedExtensions() to check if wallet supports CIP-95
       if (!isEnabled && walletName) {

diff --git a/src/vva-fe/src/translations/i18n.ts → govtool/frontend/src/i18n/index.ts b/src/vva-fe/src/translations/i18n.ts → govtool/frontend/src/i18n/index.ts
@@ -1,5 +1,6 @@
 import i18n from "i18next";
 import { initReactI18next } from "react-i18next";
+
 import { en } from "./locales/en";
 
 i18n.use(initReactI18next).init({

diff --git a/src/vva-fe/src/translations/locales/en.ts → govtool/frontend/src/i18n/locales/en.ts b/src/vva-fe/src/translations/locales/en.ts → govtool/frontend/src/i18n/locales/en.ts
diff --git a/govtool/frontend/src/main.tsx b/govtool/frontend/src/main.tsx
@@ -1,9 +1,5 @@
 import React from "react";
 import ReactDOM from "react-dom/client";
-import App from "./App.tsx";
-import { ThemeProvider } from "@emotion/react";
-import { ContextProviders } from "@context";
-import { theme } from "./theme.ts";
 import {
   BrowserRouter,
   createRoutesFromChildren,
@@ -12,9 +8,15 @@ import {
   useNavigationType,
 } from "react-router-dom";
 import { QueryClient, QueryClientProvider } from "react-query";
-import * as Sentry from "@sentry/react";
 import TagManager from "react-gtm-module";
-import "./translations/i18n";
+import { ThemeProvider } from "@emotion/react";
+import * as Sentry from "@sentry/react";
+
+import { ContextProviders } from "@context";
+
+import App from "./App.tsx";
+import { theme } from "./theme.ts";
+import "./i18n";
 
 const queryClient = new QueryClient();
 

diff --git a/govtool/frontend/src/types/i18next.d.ts b/govtool/frontend/src/types/i18next.d.ts
@@ -1,4 +1,4 @@
-import { en } from "@/translations/locales/en";
+import { en } from "@/i18n/locales/en";
 
 declare module "i18next" {
   interface CustomTypeOptions {