Merge pull request #784 from haqq-network/dev

release
haqq-network · Apr 23, 2024 · bad0369 · bad0369 · vercel · Apr 24, 2024
2 parents ac42d0e + a133574
commit bad0369
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 23 deletions.
diff --git a/apps/shell/src/app/governance/page.tsx b/apps/shell/src/app/governance/page.tsx
@@ -7,6 +7,9 @@ import {
 import { createCosmosService, getChainParams } from '@haqq/data-access-cosmos';
 import { ProposalListPage } from '@haqq/shell-governance';
 
+export const dynamic = 'force-dynamic';
+export const fetchCache = 'force-no-store';
+
 export default async function ProposalList() {
   // FIXME: Think how to get chain id on server side
   const chainId = 11235;

diff --git a/apps/shell/src/app/governance/proposal/[id]/page.tsx b/apps/shell/src/app/governance/proposal/[id]/page.tsx
@@ -7,6 +7,9 @@ import { notFound } from 'next/navigation';
 import { createCosmosService, getChainParams } from '@haqq/data-access-cosmos';
 import { ProposalDetailsPage } from '@haqq/shell-governance';
 
+export const dynamic = 'force-dynamic';
+export const fetchCache = 'force-no-store';
+
 export default async function ProposalDetails({
   params,
 }: {

diff --git a/apps/shell/src/app/staking/page.tsx b/apps/shell/src/app/staking/page.tsx
@@ -6,6 +6,9 @@ import {
 import { createCosmosService, getChainParams } from '@haqq/data-access-cosmos';
 import { ValidatorListPage } from '@haqq/shell-staking';
 
+export const dynamic = 'force-dynamic';
+export const fetchCache = 'force-no-store';
+
 export default async function ValidatorList() {
   // FIXME: Think how to get chain id on server side
   const chainId = 11235;

diff --git a/apps/shell/src/app/staking/validator/[address]/layout.tsx b/apps/shell/src/app/staking/validator/[address]/layout.tsx
@@ -1,5 +1,8 @@
 import { ReactNode } from 'react';
 
+export const dynamic = 'force-dynamic';
+export const fetchCache = 'force-no-store';
+
 export default function Layout({
   modals,
   children,

diff --git a/apps/shell/src/app/loading.tsx → apps/shell/src/components/loading.tsx b/apps/shell/src/app/loading.tsx → apps/shell/src/components/loading.tsx
diff --git a/libs/data-access/cosmos/src/lib/data-access-cosmos.ts b/libs/data-access/cosmos/src/lib/data-access-cosmos.ts
@@ -283,6 +283,7 @@ export function createCosmosService(cosmosRestEndpoint: string): CosmosService {
   }
 
   async function getProposalDetails(id: string) {
+    console.log('getProposalDetails', { id });
     const getProposalDetailsUrl = `${cosmosRestEndpoint}${generateEndpointProposal(id)}`;
 
     const response = await fetch(getProposalDetailsUrl);
@@ -481,6 +482,7 @@ export function createCosmosService(cosmosRestEndpoint: string): CosmosService {
   }
 
   async function getProposalTally(id: string) {
+    console.log('getProposalTally', { id });
     const getProposalTallyUrl = new URL(
       `${cosmosRestEndpoint}${generateEndpointProposalTally(id)}`,
     );

diff --git a/libs/islamic-website/alerts-pages/src/lib/contact-us-page/contact-us-page.tsx b/libs/islamic-website/alerts-pages/src/lib/contact-us-page/contact-us-page.tsx
@@ -42,10 +42,10 @@ export function ContactUsPage() {
                     <p>
                       In case of an emergency, please contact us by phone{' '}
                       <Link
-                        href="tel:+971585474242"
+                        href="tel:+971045546687"
                         className="text-islamic-primary-green hover:text-islamic-primary-green-hover cursor-pointer transition-colors duration-300"
                       >
-                        +971585474242
+                        +971045546687
                       </Link>
                     </p>
                   </div>

diff --git a/libs/islamic-website/team-page/src/lib/team-page/team-page.tsx b/libs/islamic-website/team-page/src/lib/team-page/team-page.tsx
@@ -1,6 +1,7 @@
 import clsx from 'clsx';
 import Image from 'next/image';
 import { useTranslations } from 'next-intl';
+import { Fragment } from 'react/jsx-runtime';
 import {
   Container,
   Member,
@@ -46,14 +47,17 @@ export function TeamPage({
             />
           )}
 
-          <h1 className="text-[46px] font-[600] leading-[52px] md:text-[60px] md:leading-none lg:text-[80px]">
-            {t('title.team')}
-          </h1>
-          {team && (
-            <MembersContainer
-              members={team}
-              className="mt-[32px] lg:mt-[100px]"
-            />
+          {team && team.length && (
+            <Fragment>
+              <h1 className="text-[46px] font-[600] leading-[52px] md:text-[60px] md:leading-none lg:text-[80px]">
+                {t('title.team')}
+              </h1>
+
+              <MembersContainer
+                members={team}
+                className="mt-[32px] lg:mt-[100px]"
+              />
+            </Fragment>
           )}
 
           <TeamPageBg />

diff --git a/libs/islamic-website/ui-kit/src/lib/download-pdf-button/download-pdf-button.tsx b/libs/islamic-website/ui-kit/src/lib/download-pdf-button/download-pdf-button.tsx
@@ -13,15 +13,16 @@ export function DownloadPDFButton({
   type = 'fatwa',
 }: DownloadPDFButtonProps) {
   const t = useTranslations('ui-kit.download-pdf-button');
+
   return (
-    <div className="hover:text-islamic-primary-green-hover hover:border-islamic-primary-green-hover w-[164px] cursor-pointer rounded-[8px] border border-white px-[10px] py-[6px] text-white transition-colors duration-300 md:w-[180px]">
-      <Link
-        href={url}
-        target="_blank"
-        rel="noopener noreferrer"
-        className="flex items-center justify-between"
-        download
-      >
+    <Link
+      href={url}
+      target="_blank"
+      rel="noopener noreferrer"
+      className="hover:text-islamic-primary-green-hover hover:border-islamic-primary-green-hover w-[164px] cursor-pointer rounded-[8px] border border-white px-[10px] py-[6px] text-white transition-colors duration-300 md:w-[180px]"
+      download
+    >
+      <div className="flex items-center justify-between">
         <div className="flex gap-x-[8px]">
           <svg
             width="36"
@@ -61,7 +62,7 @@ export function DownloadPDFButton({
             fill="currentColor"
           />
         </svg>
-      </Link>
-    </div>
+      </div>
+    </Link>
   );
 }
diff --git a/libs/islamic-website/ui-kit/src/lib/markdown-text/markdown-text.tsx b/libs/islamic-website/ui-kit/src/lib/markdown-text/markdown-text.tsx
@@ -52,6 +52,7 @@ export function MarkdownTextProseWrapper({
         'first:prose-td:pl-[16px] first:prose-td:pr-0 rtl:first:prose-td:pl-0 rtl:first:prose-td:pr-[16px] even:prose-td:px-[24px] last:prose-td:pr-[16px] last:prose-td:pl-0 rtl:last:prose-td:pl-[16px] rtl:last:prose-td:pr-0',
         'prose-tr:border-none prose-thead:border-none even:prose-tr:bg-[#2f2f2f]',
         'rtl:prose-ul:pr-[26px] rtl:prose-ul:pl-0 rtl:prose-ol:pr-[26px] rtl:prose-ol:pl-0',
+        'prose-code:text-current',
         className,
       )}
     >

diff --git a/libs/islamic-website/whitepaper-page/src/lib/whitepaper-page/whitepaper-page.tsx b/libs/islamic-website/whitepaper-page/src/lib/whitepaper-page/whitepaper-page.tsx
@@ -25,7 +25,7 @@ export function WhitepaperPage({ whitepaper }: { whitepaper?: string }) {
         <h1 className="text-[46px] font-[600] leading-[52px] md:text-[60px] md:leading-none lg:text-[80px]">
           {t('title')}
         </h1>
-        <div className="mt-[18px] flex flex-row flex-wrap gap-[16px] lg:mt-[32px]">
+        <div className="z-20 mt-[18px] flex flex-row flex-wrap gap-[16px] lg:mt-[32px]">
           <DownloadPDFButton
             language="en"
             url="/assets/haqq-whitepaper.pdf"

diff --git a/libs/shell/governance/src/lib/proposal-list-page.tsx b/libs/shell/governance/src/lib/proposal-list-page.tsx
@@ -15,7 +15,7 @@ import { ProposalListCard } from './components/proposal-list-card';
 
 export function ProposalListPage() {
   const { data: govParams } = useGovernanceParamsQuery();
-  const { data: proposalsData, isFetching } = useProposalListQuery();
+  const { data: proposalsData } = useProposalListQuery();
   const symbol = 'ISLM';
   const { haqqAddress } = useAddress();
   const { isHaqqWallet } = useWallet();
@@ -106,7 +106,7 @@ export function ProposalListPage() {
 
       <div className="pt-[32px] lg:pt-[68px]">
         <Container>
-          {!govParams || isFetching ? (
+          {!govParams ? (
             <div className="pointer-events-none mx-auto flex min-h-[320px] w-full flex-1 select-none">
               <div className="flex min-h-full flex-1 flex-col items-center justify-center space-y-8">
                 <SpinnerLoader />