fix: merge conflicts

packages/dapp-kit-react/src/DAppKitProvider/hooks/useConnex.ts

@@ -0,0 +1,16 @@
+import { useContext } from 'react';
+import { type DAppKitContext } from '../../types';
+import { Context } from '../context';
+
+/**
+ * Hook to get the connex object from the DAppKitProvider
+ */
+export const useConnex = (): DAppKitContext['connex'] => {
+    const context = useContext(Context);
+
+    if (!context) {
+        throw new Error('"useConnex" must be used within a ConnexProvider');
+    }
+
+    return context.connex;
+};

packages/dapp-kit-react/src/hooks/useVechainDomain/constants.ts

@@ -0,0 +1,7 @@
+/**
+ * The VNS resolver addresses
+ */
+export const VNS_RESOLVER = {
+    main: '0xA11413086e163e41901bb81fdc5617c975Fa5a1A',
+    test: '0xc403b8EA53F707d7d4de095f0A20bC491Cf2bc94',
+};