Merge pull request #776 from haqq-network/dev

release
haqq-network · Apr 17, 2024 · fa25950 · fa25950
2 parents 9b3ef54 + 7552a62
commit fa25950
Show file tree

Hide file tree

Showing 26 changed files with 212 additions and 51 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
   test-and-lint:
     name: Test and Lint
     runs-on:
-      - ubuntu
+      - frontend
       - self-hosted
     if: (github.event_name == 'pull_request' && !github.event.pull_request.draft) || (github.event_name == 'push' && github.ref == 'refs/heads/dev')
     timeout-minutes: 15
@@ -42,7 +42,7 @@ jobs:
   # build:
   #   name: Build
   #   runs-on:
-  #     - ubuntu
+  #     - frontend
   #     - self-hosted
   #   if: (github.event_name == 'pull_request' && !github.event.pull_request.draft) || (github.event_name == 'push' && github.ref == 'refs/heads/dev')
   #   needs: test-and-lint

diff --git a/.github/workflows/preview-vercel-haqq-website.yml b/.github/workflows/preview-vercel-haqq-website.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   Preview:
     runs-on:
-      - ubuntu
+      - frontend
       - self-hosted
     if: (github.event_name == 'pull_request' && !github.event.pull_request.draft) || (github.event_name == 'push' && github.ref == 'refs/heads/dev')
     env:

diff --git a/.github/workflows/preview-vercel-islamic-website.yml b/.github/workflows/preview-vercel-islamic-website.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   Preview:
     runs-on:
-      - ubuntu
+      - frontend
       - self-hosted
     if: (github.event_name == 'pull_request' && !github.event.pull_request.draft) || (github.event_name == 'push' && github.ref == 'refs/heads/dev')
     env:

diff --git a/.github/workflows/preview-vercel-shell.yml b/.github/workflows/preview-vercel-shell.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   Preview:
     runs-on:
-      - ubuntu
+      - frontend
       - self-hosted
     if: (github.event_name == 'pull_request' && !github.event.pull_request.draft) || (github.event_name == 'push' && github.ref == 'refs/heads/dev')
     env:

diff --git a/.github/workflows/preview-vercel-storybook.yml b/.github/workflows/preview-vercel-storybook.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   Preview:
     runs-on:
-      - ubuntu
+      - frontend
       - self-hosted
     if: (github.event_name == 'pull_request' && !github.event.pull_request.draft) || (github.event_name == 'push' && github.ref == 'refs/heads/dev')
     env:

diff --git a/.github/workflows/preview-vercel-vesting.yml b/.github/workflows/preview-vercel-vesting.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   Preview:
     runs-on:
-      - ubuntu
+      - frontend
       - self-hosted
     if: (github.event_name == 'pull_request' && !github.event.pull_request.draft) || (github.event_name == 'push' && github.ref == 'refs/heads/dev')
     env:

diff --git a/.github/workflows/production-vercel-haqq-website.yml b/.github/workflows/production-vercel-haqq-website.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   Production:
     runs-on:
-      - ubuntu
+      - frontend
       - self-hosted
     env:
       VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}

diff --git a/.github/workflows/production-vercel-islamic-website.yml b/.github/workflows/production-vercel-islamic-website.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   Production:
     runs-on:
-      - ubuntu
+      - frontend
       - self-hosted
     env:
       VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}

diff --git a/.github/workflows/production-vercel-shell.yml b/.github/workflows/production-vercel-shell.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   Production:
     runs-on:
-      - ubuntu
+      - frontend
       - self-hosted
     env:
       VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}

diff --git a/.github/workflows/production-vercel-storybook.yml b/.github/workflows/production-vercel-storybook.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   Production:
     runs-on:
-      - ubuntu
+      - frontend
       - self-hosted
     env:
       VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}

diff --git a/.github/workflows/production-vercel-vesting.yml b/.github/workflows/production-vercel-vesting.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   Production:
     runs-on:
-      - ubuntu
+      - frontend
       - self-hosted
     env:
       VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}

diff --git a/apps/haqq-website/app/layout.tsx b/apps/haqq-website/app/layout.tsx
@@ -1,5 +1,4 @@
 import type { PropsWithChildren } from 'react';
-import { Analytics } from '@vercel/analytics/react';
 import { SpeedInsights } from '@vercel/speed-insights/next';
 import type { Metadata, Viewport } from 'next';
 import dynamic from 'next/dynamic';
@@ -85,7 +84,6 @@ export default function RootLayout({ children }: PropsWithChildren) {
                   `,
                 }}
               />
-              <Analytics mode="auto" />
               <SpeedInsights />
             </>
           )}

diff --git a/apps/islamic-website/app/[locale]/layout.tsx b/apps/islamic-website/app/[locale]/layout.tsx
@@ -1,5 +1,4 @@
 import { PropsWithChildren } from 'react';
-import { Analytics } from '@vercel/analytics/react';
 import { SpeedInsights } from '@vercel/speed-insights/next';
 import clsx from 'clsx';
 import type { Metadata, Viewport } from 'next';
@@ -195,7 +194,6 @@ export default async function LocaleLayout({
                 />
 
                 <CookieConsentModal />
-                <Analytics mode="auto" />
                 <SpeedInsights />
               </>
             )}

diff --git a/apps/shell/src/app/layout.tsx b/apps/shell/src/app/layout.tsx
@@ -1,5 +1,4 @@
 import type { PropsWithChildren } from 'react';
-import { Analytics } from '@vercel/analytics/react';
 import { SpeedInsights } from '@vercel/speed-insights/next';
 import clsx from 'clsx';
 import type { Metadata, Viewport } from 'next';
@@ -62,7 +61,6 @@ export default function RootLayout({ children }: PropsWithChildren) {
       <PHProvider>
         <body>
           <PostHogPageView />
-          <Analytics mode="auto" />
           <SpeedInsights />
 
           <Providers config={shellConfig}>

diff --git a/libs/islamic-website/markets-page/src/assets/images/coin-logos/btc.svg b/libs/islamic-website/markets-page/src/assets/images/coin-logos/btc.svg
diff --git a/libs/islamic-website/markets-page/src/assets/images/coin-logos/dym.svg b/libs/islamic-website/markets-page/src/assets/images/coin-logos/dym.svg
diff --git a/libs/islamic-website/markets-page/src/assets/images/coin-logos/evmos.svg b/libs/islamic-website/markets-page/src/assets/images/coin-logos/evmos.svg
diff --git a/libs/islamic-website/markets-page/src/assets/images/coin-logos/strd.svg b/libs/islamic-website/markets-page/src/assets/images/coin-logos/strd.svg
diff --git a/libs/islamic-website/markets-page/src/assets/images/coin-logos/tia.svg b/libs/islamic-website/markets-page/src/assets/images/coin-logos/tia.svg