chore: release

.husky/commit-msg

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 pnpm exec commitlint --edit $1

.husky/pre-commit

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 pnpm exec lint-staged

.husky/pre-push

@@ -1,6 +1,3 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 pnpm exec nx affected:lint --base=dev
 pnpm exec nx affected:test --base=dev
 # pnpm exec nx affected:e2e

README.md

@@ -17,12 +17,10 @@
 
 ## Applications and websites
 
-| Description         | Domain                       | Source code                  |
-| ------------------- | ---------------------------- | ---------------------------- |
-| Shell app           | https://shell.haqq.network   | [Open](apps/shell)           |
-| Vesting app         | https://vesting.haqq.network | [Open](apps/vesting)         |
-| HAQQ Website        | https://haqq.hetwork         | [Open](apps/haqq-website)    |
-| IslamicCoin Website | https://islamiccoin.net      | [Open](apps/islamic-website) |
+| Description | Domain                       | Source code          |
+| ----------- | ---------------------------- | -------------------- |
+| Shell app   | https://shell.haqq.network   | [Open](apps/shell)   |
+| Vesting app | https://vesting.haqq.network | [Open](apps/vesting) |
 
 ## Development guide
 

apps/shell/src/app/dao/page.tsx

@@ -0,0 +1,46 @@
+import {
+  dehydrate,
+  HydrationBoundary,
+  QueryClient,
+} from '@tanstack/react-query';
+import { headers } from 'next/headers';
+import { haqqMainnet } from 'wagmi/chains';
+import { createCosmosService, getChainParams } from '@haqq/data-access-cosmos';
+import { DaoPage } from '@haqq/shell-dao';
+import {
+  ethToHaqq,
+  indexerBalancesFetcher,
+  parseWagmiCookies,
+} from '@haqq/shell-shared';
+
+export default async function Authz() {
+  const cookies = headers().get('cookie');
+  const { chainId, walletAddress } = parseWagmiCookies(cookies);
+  const chainIdToUse = chainId ?? haqqMainnet.id;
+  const queryClient = new QueryClient();
+  const { cosmosRestEndpoint } = getChainParams(chainIdToUse);
+  const { getErc20TokenPairs } = createCosmosService(cosmosRestEndpoint);
+
+  if (walletAddress) {
+    const haqqAddress = ethToHaqq(walletAddress);
+
+    await queryClient.prefetchQuery({
+      queryKey: [chainIdToUse, 'indexer-balance', haqqAddress],
+      queryFn: async () => {
+        return await indexerBalancesFetcher(chainIdToUse, haqqAddress);
+      },
+    });
+
+    await queryClient.prefetchQuery({
+      queryKey: [chainIdToUse, 'token-pairs'],
+      queryFn: getErc20TokenPairs,
+    });
+  }
+  const dehydratedState = dehydrate(queryClient);
+
+  return (
+    <HydrationBoundary state={dehydratedState}>
+      <DaoPage />
+    </HydrationBoundary>
+  );
+}

apps/shell/src/components/paralax-background.tsx

@@ -79,6 +79,7 @@ export function ParalaxBackground() {
             setLoaded(true);
           }}
           className="scale-[1.5] md:scale-[1]"
+          priority
         />
       </animated.div>
     </animated.div>

apps/shell/src/components/posthog-identify-users.tsx

@@ -16,6 +16,7 @@ export function PostHogIdentifyWalletUsers() {
   useEffect(() => {
     if (isHaqqWallet) {
       const walletDistinctId = window.__HAQQWALLET__?.POSTHOG_DISTINCT_ID;
+      console.log('PostHogIdentifyWalletUsers', { walletDistinctId });
       posthog.identify(walletDistinctId ?? posthog.get_distinct_id());
     }
   }, [isHaqqWallet]);

apps/shell/src/components/posthog-page-view.tsx

@@ -9,37 +9,21 @@ export function PostHogPageView() {
   const posthog = usePostHog();
 
   useEffect(() => {
-    const trackPageView = () => {
-      if (pathname && posthog) {
-        let url = window.origin + pathname;
-        if (searchParams.toString()) {
-          url += `?${searchParams.toString()}`;
-        }
-        posthog.capture('$pageview', {
-          $current_url: url,
-          $set: {
-            $browser_language: window.navigator.language,
-          },
-        });
-      }
-    };
-
-    const trackPageLeave = () => {
-      if (posthog) {
-        posthog.capture('$pageleave', {});
-      }
-    };
-
     // Track pageviews
-    trackPageView();
+    if (pathname && posthog) {
+      let url = window.origin + pathname;
 
-    // Add event listener to track page leave
-    window.addEventListener('beforeunload', trackPageLeave);
+      if (searchParams.toString()) {
+        url = url + `?${searchParams.toString()}`;
+      }
 
-    // Cleanup the event listener when the component unmounts
-    return () => {
-      window.removeEventListener('beforeunload', trackPageLeave);
-    };
+      posthog.capture('$pageview', {
+        $current_url: url,
+        $set: {
+          $browser_language: window.navigator.language,
+        },
+      });
+    }
   }, [pathname, searchParams, posthog]);
 
   return null;

apps/shell/src/config/header-links.ts

@@ -6,6 +6,7 @@ export const headerLinks: {
   chains: number[];
 }[] = [
   // { href: '/', label: 'Home', chains: [haqqMainnet.id, haqqTestedge2.id] },
+  { href: '/dao', label: 'DAO', chains: [haqqMainnet.id, haqqTestedge2.id] },
   {
     href: '/staking',
     label: 'Staking',

apps/shell/src/providers/posthog-provider.tsx

@@ -18,7 +18,7 @@ export function PHProvider({ children }: PropsWithChildren) {
       api_host: '/api/ingest',
       ui_host: env.NEXT_PUBLIC_POSTHOG_HOST,
       capture_pageview: false,
-      capture_pageleave: false,
+      capture_pageleave: true,
       persistence: 'localStorage+cookie',
     });
 

apps/vesting/src/app/app.tsx

@@ -3,6 +3,10 @@ import { Navigate, Route, Routes } from 'react-router-dom';
 import { Footer } from '../components/footer';
 import { Header } from '../components/header';
 import { Page } from '../components/Layout/Layout';
+import {
+  usePosthogIdentifyWalletUsers,
+  usePosthogPageTracking,
+} from '../hooks/posthog-track-hooks';
 import { NotFoundPage } from '../pages/not-found-page';
 import { PendingPage } from '../pages/pending-page';
 
@@ -20,6 +24,9 @@ const SwitchChainPage = lazy(() => {
 });
 
 export function App() {
+  usePosthogPageTracking();
+  usePosthogIdentifyWalletUsers();
+
   return (
     <Page header={<Header />} footer={<Footer />}>
       <Suspense fallback={<PendingPage />}>

apps/vesting/src/components/liquid-vesting/liquid-vesting.tsx

@@ -221,7 +221,7 @@ export function LiquidVestingHooked({
               <ToastLoading>Redeem liquid token in progress</ToastLoading>
             ),
             success: (tx) => {
-              console.log('Convert to liquid successful', { tx });
+              console.log('Redeem successful', { tx });
               const txHash = tx?.txhash;
 
               return (

apps/vesting/src/components/wallet-modals.tsx

@@ -0,0 +1,38 @@
+import { lazy } from 'react';
+import { useWallet } from '@haqq/shell-shared';
+
+const SelectWalletModal = lazy(async () => {
+  const { SelectWalletModal } = await import(
+    '../components/select-wallet-modal'
+  );
+  return { default: SelectWalletModal };
+});
+
+export function WalletModals() {
+  const {
+    connectors,
+    connect,
+    availableConnectors,
+    closeSelectWallet,
+    connectError,
+    setConnectError,
+    isSelectWalletOpen,
+  } = useWallet();
+
+  return (
+    <SelectWalletModal
+      connectors={connectors}
+      onConnectClick={async (connectorId: number) => {
+        try {
+          await connect({ connector: availableConnectors[connectorId] });
+          closeSelectWallet();
+        } catch (error: unknown) {
+          setConnectError((error as Error).message);
+        }
+      }}
+      isOpen={isSelectWalletOpen}
+      onClose={closeSelectWallet}
+      error={connectError ?? ''}
+    />
+  );
+}

apps/vesting/src/constants.ts

@@ -1,3 +1,5 @@
 export const INDEXER_ENDPOINT = 'https://jsonrpc.indexer.haqq.network';
 export const WALLETCONNECT_PROJECT_ID = process.env['WALLETCONNECT_PROJECT_ID'];
 export const GIT_COMMIT_SHA = process.env['GIT_COMMIT_SHA'];
+export const POSTHOG_KEY = process.env['POSTHOG_KEY'];
+export const POSTHOG_HOST = process.env['POSTHOG_HOST'];

apps/vesting/src/hooks/posthog-track-hooks.tsx

@@ -0,0 +1,49 @@
+import { useEffect } from 'react';
+import { nanoid } from 'nanoid';
+import { usePostHog } from 'posthog-js/react';
+import { useLocation } from 'react-router-dom';
+import { useWallet } from '@haqq/shell-shared';
+
+declare const window: Window &
+  typeof globalThis & {
+    __HAQQWALLET__?: {
+      POSTHOG_DISTINCT_ID?: string;
+    };
+  };
+
+export function usePosthogIdentifyWalletUsers() {
+  const { isHaqqWallet } = useWallet();
+  const posthog = usePostHog();
+
+  useEffect(() => {
+    if (isHaqqWallet) {
+      const walletDistinctId = window.__HAQQWALLET__?.POSTHOG_DISTINCT_ID;
+      console.log('usePosthogIdentifyWalletUsers', { walletDistinctId });
+
+      posthog.identify(
+        walletDistinctId ?? posthog.get_distinct_id() ?? nanoid(),
+      );
+    }
+  }, [isHaqqWallet, posthog]);
+}
+
+export function usePosthogPageTracking() {
+  const location = useLocation();
+  const posthog = usePostHog();
+
+  useEffect(() => {
+    posthog.capture('$pageview');
+  }, [location, posthog]);
+
+  useEffect(() => {
+    const handlePageLeave = () => {
+      posthog.capture('pageleave', { path: location.pathname });
+    };
+
+    window.addEventListener('beforeunload', handlePageLeave);
+
+    return () => {
+      window.removeEventListener('beforeunload', handlePageLeave);
+    };
+  }, [location, posthog]);
+}

apps/vesting/src/providers/app-providers.tsx

@@ -1,4 +1,5 @@
-import { lazy, PropsWithChildren } from 'react';
+import { PropsWithChildren } from 'react';
+import { PostHogProvider } from 'posthog-js/react';
 import { BrowserRouter } from 'react-router-dom';
 import { createConfig, http, WagmiProvider } from 'wagmi';
 import { haqqMainnet } from 'wagmi/chains';
@@ -7,10 +8,14 @@ import {
   CosmosProvider,
   ReactQueryProvider,
   Toaster,
-  useWallet,
   WalletProvider,
 } from '@haqq/shell-shared';
-import { WALLETCONNECT_PROJECT_ID } from '../constants';
+import { WalletModals } from '../components/wallet-modals';
+import {
+  WALLETCONNECT_PROJECT_ID,
+  POSTHOG_HOST,
+  POSTHOG_KEY,
+} from '../constants';
 
 export const wagmiConfig = createConfig({
   chains: [haqqMainnet],
@@ -33,54 +38,28 @@ export const wagmiConfig = createConfig({
 
 export function AppProviders({ children }: PropsWithChildren) {
   return (
-    <BrowserRouter>
-      <WagmiProvider config={wagmiConfig}>
-        <ReactQueryProvider>
-          <CosmosProvider>
-            <WalletProvider>
-              {children}
-              <Toaster />
-              <WalletModals />
-            </WalletProvider>
-          </CosmosProvider>
-        </ReactQueryProvider>
-      </WagmiProvider>
-    </BrowserRouter>
-  );
-}
-
-const SelectWalletModal = lazy(async () => {
-  const { SelectWalletModal } = await import(
-    '../components/select-wallet-modal'
-  );
-  return { default: SelectWalletModal };
-});
-
-function WalletModals() {
-  const {
-    connectors,
-    connect,
-    availableConnectors,
-    closeSelectWallet,
-    connectError,
-    setConnectError,
-    isSelectWalletOpen,
-  } = useWallet();
-
-  return (
-    <SelectWalletModal
-      connectors={connectors}
-      onConnectClick={async (connectorId: number) => {
-        try {
-          await connect({ connector: availableConnectors[connectorId] });
-          closeSelectWallet();
-        } catch (error: unknown) {
-          setConnectError((error as Error).message);
-        }
+    <PostHogProvider
+      apiKey={POSTHOG_KEY}
+      options={{
+        api_host: POSTHOG_HOST,
+        capture_pageview: false,
+        capture_pageleave: true,
+        persistence: 'localStorage+cookie',
       }}
-      isOpen={isSelectWalletOpen}
-      onClose={closeSelectWallet}
-      error={connectError ?? ''}
-    />
+    >
+      <BrowserRouter>
+        <WagmiProvider config={wagmiConfig}>
+          <ReactQueryProvider>
+            <CosmosProvider>
+              <WalletProvider>
+                {children}
+                <Toaster />
+                <WalletModals />
+              </WalletProvider>
+            </CosmosProvider>
+          </ReactQueryProvider>
+        </WagmiProvider>
+      </BrowserRouter>
+    </PostHogProvider>
   );
 }