Merge pull request #794 from haqq-network/dev

release
haqq-network · Apr 26, 2024 · 7126704 · 7126704
2 parents e021c13 + d2ac297
commit 7126704
Show file tree

Hide file tree

Showing 18 changed files with 657 additions and 19 deletions.
diff --git a/apps/islamic-website/messages/en.json b/apps/islamic-website/messages/en.json
@@ -30,7 +30,9 @@
           "first": "Mainnet accounts created",
           "second": "Transactions in the last 24 hours",
           "third": "Seconds to consensus finality",
-          "fourth": "Average cost per transaction"
+          "fourth": "Average cost per transaction",
+          "fifth": "Total supply ISLM",
+          "sixth": "Circulating supply ISLM"
         }
       }
     },

diff --git a/apps/islamic-website/utils/get-chain-stats-data.ts b/apps/islamic-website/utils/get-chain-stats-data.ts
@@ -17,6 +17,8 @@ export const getChainStatsFromFalconer = cache(async () => {
       transactionsInLast24Hours: Number.parseFloat(stats.transactionsIn24Hour),
       secondsToConsensusFinality: Number.parseFloat(stats.consensusFinality),
       averageCostPerTransaction: Number.parseFloat(stats.transactionAvgCost),
+      supply: Number.parseFloat(stats.supply),
+      circulatingSupply: Number.parseFloat(stats.circulatingSupply),
     };
   } catch (error) {
     console.error(error);
@@ -27,5 +29,7 @@ export const getChainStatsFromFalconer = cache(async () => {
     transactionsInLast24Hours: 0,
     secondsToConsensusFinality: 0,
     averageCostPerTransaction: 0,
+    supply: 0,
+    circulatingSupply: 0,
   };
 });
diff --git a/libs/data-access/falconer/src/lib/haqq/get-haqq-chain-stats.ts b/libs/data-access/falconer/src/lib/haqq/get-haqq-chain-stats.ts
@@ -10,6 +10,7 @@ export interface HaqqChainStats {
   coinomicsEmissionRate: string;
   supply: string;
   coinomicsWillBeMinted: string;
+  circulatingSupply: string;
 }
 
 export async function getHaqqChainStatsData(

diff --git a/libs/haqq-website/wallet-page/src/lib/hero-block/hero-block.tsx b/libs/haqq-website/wallet-page/src/lib/hero-block/hero-block.tsx
@@ -116,7 +116,10 @@ export function HeroBlock() {
     const distinctId = posthog.get_distinct_id();
 
     if (!distinctId) {
-      return {};
+      return {
+        appStoreLink: null,
+        playMarketLink: null,
+      };
     }
 
     return {

diff --git a/libs/islamic-website/index-page/src/lib/portfolio-block/portfolio-block.tsx b/libs/islamic-website/index-page/src/lib/portfolio-block/portfolio-block.tsx
@@ -1,15 +1,20 @@
+'use client';
+import { useMemo } from 'react';
 import Image from 'next/image';
 import Link from 'next/link';
 import { useTranslations } from 'next-intl';
+import { usePostHog } from 'posthog-js/react';
 import {
   Container,
   GradientText,
   Text,
-  WalletDownloadButton,
   RatingBadge,
+  WalletDownloadWithQrButton,
+  WalletDownloadButton,
 } from '@haqq/islamic-website-ui-kit';
 import halfIphoneImgData from '../../assets/images/half-iphone.jpg';
 import iphoneImgData from '../../assets/images/iphone.jpg';
+import { getDynamicLink } from '../utils/get-dynamic-link';
 
 export function PortfolioBlock({
   storeRatings,
@@ -20,6 +25,31 @@ export function PortfolioBlock({
   };
 }) {
   const t = useTranslations('index-page');
+  const posthog = usePostHog();
+
+  const { appStoreLink, playMarketLink } = useMemo(() => {
+    const distinctId = posthog.get_distinct_id();
+
+    if (!distinctId) {
+      return {
+        appStoreLink: null,
+        playMarketLink: null,
+      };
+    }
+
+    return {
+      appStoreLink: getDynamicLink(
+        'https://haqq.network/wallet',
+        distinctId,
+        'https://apps.apple.com/app/haqq-wallet-by-bored-gen/id6443843352',
+      ),
+      playMarketLink: getDynamicLink(
+        'https://haqq.network/wallet',
+        distinctId,
+        'https://play.google.com/store/apps/details?id=com.haqq.wallet',
+      ),
+    };
+  }, [posthog]);
 
   return (
     <section>
@@ -73,12 +103,51 @@ export function PortfolioBlock({
                     <RatingBadge rating={storeRatings.googlePlay} />
                   </div>
                 </div>
-                <div className="mt-[20px] flex flex-col gap-x-[16px] gap-y-[20px] lg:mt-[24px] lg:flex-row">
+                <div className="hidden lg:mt-[24px] lg:flex lg:flex-row lg:gap-x-[16px]">
+                  <div className="w-fit">
+                    {appStoreLink && (
+                      <Link
+                        href={appStoreLink}
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        data-attr="download-ios"
+                      >
+                        <WalletDownloadWithQrButton
+                          type="apple"
+                          title={t(
+                            'portfolio-block.stores.download-button.title',
+                          )}
+                          link={appStoreLink}
+                        />
+                      </Link>
+                    )}
+                  </div>
                   <div className="w-fit">
+                    {playMarketLink && (
+                      <Link
+                        href={playMarketLink}
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        data-attr="download-android"
+                      >
+                        <WalletDownloadWithQrButton
+                          type="google"
+                          title={t(
+                            'portfolio-block.stores.download-button.title',
+                          )}
+                          link={playMarketLink}
+                        />
+                      </Link>
+                    )}
+                  </div>
+                </div>
+                <div className="mt-[20px] flex flex-col gap-y-[20px] lg:hidden">
+                  {appStoreLink && (
                     <Link
-                      href="https://apps.apple.com/app/haqq-wallet-by-bored-gen/id6443843352"
+                      href={appStoreLink}
                       target="_blank"
                       rel="noopener noreferrer"
+                      data-attr="download-ios"
                     >
                       <WalletDownloadButton
                         type="apple"
@@ -87,12 +156,13 @@ export function PortfolioBlock({
                         )}
                       />
                     </Link>
-                  </div>
-                  <div className="w-fit">
+                  )}
+                  {playMarketLink && (
                     <Link
-                      href="https://play.google.com/store/apps/details?id=com.haqq.wallet"
+                      href={playMarketLink}
                       target="_blank"
                       rel="noopener noreferrer"
+                      data-attr="download-android"
                     >
                       <WalletDownloadButton
                         type="google"
@@ -101,7 +171,7 @@ export function PortfolioBlock({
                         )}
                       />
                     </Link>
-                  </div>
+                  )}
                 </div>
               </div>
             </div>

diff --git a/libs/islamic-website/index-page/src/lib/utils/get-dynamic-link.ts b/libs/islamic-website/index-page/src/lib/utils/get-dynamic-link.ts
@@ -0,0 +1,18 @@
+export function getDynamicLink(
+  link: string,
+  distinctId: string,
+  forwardTo?: string,
+) {
+  const linkIrl = new URL(link);
+  linkIrl.searchParams.append('distinct_id', distinctId);
+
+  if (forwardTo) {
+    linkIrl.searchParams.append('go_to', forwardTo);
+  }
+
+  return (
+    'https://haqq.page.link/' +
+    `?link=${encodeURIComponent(linkIrl.toString())}` +
+    '&apn=com.haqq.wallet&isi=6443843352&ibi=com.haqq.wallet'
+  );
+}
diff --git a/libs/islamic-website/index-page/src/lib/why-block/why-block.tsx b/libs/islamic-website/index-page/src/lib/why-block/why-block.tsx
@@ -24,6 +24,8 @@ export interface ChainStats {
   transactionsInLast24Hours: number;
   secondsToConsensusFinality: number;
   averageCostPerTransaction: number;
+  supply: number;
+  circulatingSupply: number;
 }
 
 function IslamStar() {
@@ -169,6 +171,8 @@ export function WhyBlock({ stats }: { stats: ChainStats }) {
       transactionsInLast24Hours: stats.transactionsInLast24Hours,
       secondsToConsensusFinality: stats.secondsToConsensusFinality,
       averageCostPerTransaction: stats.averageCostPerTransaction,
+      supply: stats.supply,
+      circulatingSupply: stats.circulatingSupply,
     };
   }, [stats]);
 
@@ -237,7 +241,7 @@ export function WhyBlock({ stats }: { stats: ChainStats }) {
         </Text>
         <div
           ref={blockRef}
-          className="mt-[16px] grid w-full gap-[38px] sm:grid-cols-2 md:mt-[20px] lg:mt-[24px] lg:grid-cols-4"
+          className="mt-[16px] grid w-full gap-[38px] sm:grid-cols-2 md:mt-[20px] lg:mt-[24px] lg:grid-cols-3"
         >
           <StatisticsBlockStatCard
             value={memoizedStats.mainnetAccountsCreated}
@@ -256,6 +260,18 @@ export function WhyBlock({ stats }: { stats: ChainStats }) {
             startAnimation={startAnimation}
             prefix="~"
           />
+          <StatisticsBlockStatCard
+            value={memoizedStats.supply}
+            title={t('counters.statistic-card.fifth')}
+            startAnimation={startAnimation}
+            postfix="ISLM"
+          />
+          <StatisticsBlockStatCard
+            value={memoizedStats.circulatingSupply}
+            title={t('counters.statistic-card.sixth')}
+            startAnimation={startAnimation}
+            postfix="ISLM"
+          />
           <StatisticsBlockStatCard
             value={memoizedStats.averageCostPerTransaction}
             title={t('counters.statistic-card.fourth')}

diff --git a/libs/islamic-website/markets-page/src/assets/images/uniswap.svg b/libs/islamic-website/markets-page/src/assets/images/uniswap.svg
diff --git a/libs/islamic-website/markets-page/src/lib/markets-page/markets-page.tsx b/libs/islamic-website/markets-page/src/lib/markets-page/markets-page.tsx
@@ -8,6 +8,7 @@ import mexcLogoImageData from '../../assets/images/mexc.svg';
 import osmosisLogoImageData from '../../assets/images/osmosis.svg';
 import bgPageImageData from '../../assets/images/page-background.svg';
 import sushiLogoImageData from '../../assets/images/sushi.svg';
+import uniswapLogoImageData from '../../assets/images/uniswap.svg';
 import xtLogoImageData from '../../assets/images/xt.svg';
 import { CEXCard } from '../cex-card/cex-card';
 import { DEXBlock } from '../dex-block/dex-block';
@@ -19,6 +20,20 @@ const dexData: Array<{
   logo: string;
   pools: Array<{ pair: [string, string]; href: string }>;
 }> = [
+  {
+    name: 'UNISWAP',
+    logo: uniswapLogoImageData,
+    pools: [
+      {
+        pair: ['USDC', 'ISLM'],
+        href: 'https://app.uniswap.org/explore/pools/ethereum/0x2ed7B9F472bE4D0A5a0a3e6D2f8E7dECCF7dFC9D',
+      },
+      {
+        pair: ['ETH', 'ISLM'],
+        href: 'https://app.uniswap.org/explore/pools/ethereum/0x1DE43182992FE252674B5Aac9B5C884ca48D2812',
+      },
+    ],
+  },
   {
     name: 'SUSHI',
     logo: sushiLogoImageData,

diff --git a/libs/islamic-website/ui-kit/src/index.ts b/libs/islamic-website/ui-kit/src/index.ts
@@ -28,3 +28,4 @@ export * from './lib/blog-post-card/blog-post-card';
 export * from './lib/tab/tab';
 export * from './lib/breadcrumb/breadcrumb';
 export * from './lib/blog-article/blog-article';
+export * from './lib/popover/popover';