Merge pull request #75 from anyone-protocol/leggo/phase-1/dev

warp block
anyone-protocol · Sep 15, 2024 · 4e475d2 · 4e475d2
2 parents cfbbc38 + 8761ee8
commit 4e475d2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -53,13 +53,13 @@ export default defineNuxtConfig({
   runtimeConfig: {
     public: {
       walletConnectProjectId: 'f5e29d36441ccd0e2f5e3473d5a2021b',
-      relayRegistryAddress: 'DJgqT4QkuRQjtdDtWO6ofYBJI9nzTvphI-DTDyfJ7so',
-      facilitatorContract: '0x45F6b9757B36697EFd37e98883894e98025E58a6',
+      relayRegistryAddress: 'soNHpTqa2LCXjt-TQ1owmaTMeEJqa3cTyvJtsGyXqv8',
+      facilitatorContract: '0xEe65e4C21a9339CDaBC90F52e1e802371001bBd5',
       sepoliaAtorTokenContract: '0x3F7D7e1161B4CbC172517a2957A13814f4a657A2',
       tokenContractMain: '0x0f7b3f5a8fed821c5eb60049538a548db2d479ce',
-      distributionContract: 'vjw3_Oj2DC6cFf-G6UXNm0Er99hIwA39BvOfv3SjRbs',
+      distributionContract: '3a4pE8sSmmp2MdkOzVS6cc-PgYnwgSSEmFN8MW7_w50',
       metricsDeployer: 'x0cuVieEDTFjtxI5m5i22u2IMr-WpBiTS-Vir8U3dbw',
-      registratorContract: '0xa7325b28ED397AC0391529425bB7d5C34dD4FD74',
+      registratorContract: '0xc148c615b87e63Dcc90e55d53B44172503cCe889',
       distributionDeployer: 'G5tXjZS4SaMJNwOENZYgymvc6Zxp2Wws4Qf8wB0b',
       warpGateway: 'https://gw.warp.cc/gateway/v2',
       githubNewIssueUrl:
@@ -68,7 +68,7 @@ export default defineNuxtConfig({
       supportWalletPublicKeyBase64:
         'K3jnSGVyHj4kSzgce3+k8gJsfHvUoQeJMNPO8CcsO2s=',
       commitHash: process.env.NUXT_PUBLIC_COMMIT_HASH || 'dev',
-      version: '1.1.8',
+      version: '1.1.9',
     },
   },
   plugins: [{ src: '~/plugins/vue-query.client.ts', mode: 'client' }],

diff --git a/pages/index.vue b/pages/index.vue
@@ -228,16 +228,21 @@ const fetchInitialData = async (
   }
 };
 
+const initializeWarpContracts = async (newAddress: string | undefined) => {
+  if (!isConnected || !newAddress || !address) return;
+
+  initRelayRegistry();
+
+  initDistribution();
+};
 onMounted(async () => {
   isLoading.value = true;
 
   try {
-    initRelayRegistry();
     initFacilitator();
     initRegistrator();
     initToken();
-    initDistribution();
-
+    await initializeWarpContracts(userStore.userData.address);
     await fetchInitialData(userStore.userData.address);
   } catch (error) {
     console.error('Error during onMounted execution', error);

diff --git a/pages/relays.vue b/pages/relays.vue
@@ -107,16 +107,21 @@ import { initToken } from '@/composables/token';
 import { type RelayTabType } from '@/types/relay';
 import Card from '~/components/ui-kit/Card.vue';
 import { useMetricsStore } from '@/stores/useMetricsStore';
+import { useAccount } from '@wagmi/vue';
+import { config } from '@/config/wagmi.config';
 
 const userStore = useUserStore();
 const registrator = useRegistrator();
 const registerModalOpen = ref(false);
 const currentTab = ref<RelayTabType>('all');
 const metricsStore = useMetricsStore();
 const isLoading = ref(true);
+const { isConnected, address } = useAccount({ config } as any);
 
-const initializeAndFetchData = async () => {
+const initializeAndFetchData = async (newAddress: string | undefined) => {
   try {
+    if (!isConnected || !newAddress || !address) return;
+
     isLoading.value = true;
 
     initRelayRegistry();
@@ -143,7 +148,7 @@ const initializeAndFetchData = async () => {
 // };
 
 onMounted(() => {
-  initializeAndFetchData();
+  initializeAndFetchData(userStore.userData.address);
 });
 
 watch(