fix: strict mode issue (#288)

vechain · Oct 21, 2024 · 7bae639 · 7bae639
1 parent d866b5b
commit 7bae639
Showing 1 changed file with 65 additions and 50 deletions.
diff --git a/packages/dapp-kit-react/src/DAppKitProvider.tsx b/packages/dapp-kit-react/src/DAppKitProvider.tsx
@@ -6,67 +6,24 @@ import React, {
     useMemo,
     useState,
 } from 'react';
-import type { WalletSource } from '@vechain/dapp-kit';
+import type { DAppKit, WalletSource } from '@vechain/dapp-kit';
 import { DAppKitUI } from '@vechain/dapp-kit-ui';
 import { subscribeKey } from 'valtio/vanilla/utils';
-import type { DAppKitProviderOptions, DAppKitContext } from './types';
 import { type Certificate } from '@vechain/sdk-core';
+import type { DAppKitProviderOptions, DAppKitContext } from './types';
 
 /**
  * Context
  */
 const Context = createContext<DAppKitContext | undefined>(undefined);
 
-export const DAppKitProvider: React.FC<DAppKitProviderOptions> = ({
+export const DAppKitDataProvider = ({
     children,
-    nodeUrl,
-    genesis,
-    walletConnectOptions,
-    usePersistence = false,
-    logLevel,
-    requireCertificate,
-    themeMode,
-    themeVariables,
-    i18n,
-    language,
-    modalParent,
-    onSourceClick,
-    connectionCertificate: connectionCertificateData,
+    connex,
+}: {
+    children: React.ReactNode;
+    connex: DAppKit;
 }): React.ReactElement => {
-    const connex = useMemo(
-        () =>
-            DAppKitUI.configure({
-                nodeUrl,
-                genesis,
-                walletConnectOptions,
-                usePersistence,
-                logLevel,
-                requireCertificate,
-                themeVariables,
-                themeMode,
-                i18n,
-                language,
-                modalParent,
-                onSourceClick,
-                connectionCertificate: connectionCertificateData,
-            }),
-        [
-            nodeUrl,
-            genesis,
-            walletConnectOptions,
-            usePersistence,
-            logLevel,
-            requireCertificate,
-            themeVariables,
-            themeMode,
-            i18n,
-            language,
-            modalParent,
-            onSourceClick,
-            connectionCertificateData,
-        ],
-    );
-
     const [account, setAccount] = useState<string | null>(
         connex.wallet.state.address,
     );
@@ -146,6 +103,64 @@ export const DAppKitProvider: React.FC<DAppKitProviderOptions> = ({
     return <Context.Provider value={context}>{children}</Context.Provider>;
 };
 
+export const DAppKitProvider = ({
+    children,
+    nodeUrl,
+    genesis,
+    walletConnectOptions,
+    usePersistence = false,
+    logLevel,
+    requireCertificate,
+    themeMode,
+    themeVariables,
+    i18n,
+    language,
+    modalParent,
+    onSourceClick,
+    connectionCertificate: connectionCertificateData,
+}: DAppKitProviderOptions): React.ReactElement | null => {
+    const [connex, setConnex] = useState<DAppKit | null>(null);
+    useEffect(() => {
+        setConnex(
+            DAppKitUI.configure({
+                nodeUrl,
+                genesis,
+                walletConnectOptions,
+                usePersistence,
+                logLevel,
+                requireCertificate,
+                themeVariables,
+                themeMode,
+                i18n,
+                language,
+                modalParent,
+                onSourceClick,
+                connectionCertificate: connectionCertificateData,
+            }),
+        );
+    }, [
+        nodeUrl,
+        genesis,
+        walletConnectOptions,
+        usePersistence,
+        logLevel,
+        requireCertificate,
+        themeVariables,
+        themeMode,
+        i18n,
+        language,
+        modalParent,
+        onSourceClick,
+        connectionCertificateData,
+    ]);
+    if (!connex) {
+        return null;
+    }
+    return (
+        <DAppKitDataProvider connex={connex}>{children}</DAppKitDataProvider>
+    );
+};
+
 export const useConnex = (): DAppKitContext['connex'] => {
     const context = useContext(Context);