Skip to content

Commit

Permalink
Merge pull request #783 from haqq-network/dev
Browse files Browse the repository at this point in the history 
release
  • Loading branch information
@olegshilov
olegshilov authored Apr 19, 2024
2 parents fa25950 + 61256ce commit ac42d0e
Show file tree
Hide file tree
Showing 25 changed files with 1,887 additions and 870 deletions.
5 changes: 4 additions & 1 deletion apps/islamic-website/app/[locale]/layout.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ import '../../styles/global.css';
import '../../styles/consent-cookie.css';

const { Link } = createSharedPathnamesNavigation({
locales: ['en', 'ar', 'id'],
locales: [
'en',
// 'ar', 'id'
],
});

export const metadata: Metadata = {
Expand Down
213 changes: 108 additions & 105 deletions apps/islamic-website/components/burger-menu/burger-menu.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ import {
import { LanguageLink } from '../header/header';

const { Link, usePathname } = createSharedPathnamesNavigation({
locales: ['en', 'ar', 'id'],
locales: [
'en',
// 'ar', 'id'
],
});

function BurgerMenuDropdownLink({
Expand Down Expand Up @@ -82,130 +85,130 @@ export function BurgerMenu({

return (
<div className={clsx('px-[16px] md:px-[48px]', className)}>
{!isLocaleSwitcherOpened ? (
<div className="flex flex-col gap-y-[12px]">
<Link
href="/shariah"
className="hover:text-islamic-primary-green z-50 py-[12px] text-base uppercase text-white transition-colors duration-200"
onClick={onClick}
>
{t('single-links.shariah')}
</Link>
<MobileMenuDropdownLink title={t('dropdown-links.about.about')}>
<div className="flex flex-col">
<BurgerMenuDropdownLink
title={t('dropdown-links.about.mission')}
icon={<MissionIcon />}
href="/mission"
onClick={onClick}
/>
<BurgerMenuDropdownLink
title={t('dropdown-links.about.whitepaper')}
icon={<HalfMoonAndStarIcon />}
href="/whitepaper"
onClick={onClick}
/>
<BurgerMenuDropdownLink
title={t('dropdown-links.about.roadmap')}
icon={<RoadmapIcon />}
href="/roadmap"
onClick={onClick}
/>
<BurgerMenuDropdownLink
title={t('dropdown-links.about.news')}
icon={<NewsIcon />}
href="/news"
onClick={onClick}
/>
<BurgerMenuDropdownLink
title={t('dropdown-links.about.ecosystem')}
icon={<EcosystemIcon />}
href="https://haqq.network/ecosystem"
isOutLink
onClick={onClick}
/>
<BurgerMenuDropdownLink
title={t('dropdown-links.about.build-on-haqq')}
icon={<BuildIcon />}
href="/build"
onClick={onClick}
/>
<BurgerMenuDropdownLink
title={t('dropdown-links.about.validator-program')}
icon={<CubeIcon />}
href="/validators"
onClick={onClick}
/>
</div>
</MobileMenuDropdownLink>
<Link
href="/wallet"
className="hover:text-islamic-primary-green z-50 py-[12px] text-base uppercase text-white transition-colors duration-200"
onClick={onClick}
>
{t('single-links.wallet')}
</Link>
<MobileMenuDropdownLink title={t('dropdown-links.learn.learn')}>
<BurgerMenuDropdownLink
title={t('dropdown-links.learn.academy')}
icon={<AcademyIcon />}
href="/academy"
onClick={onClick}
/>
<BurgerMenuDropdownLink
onClick={onClick}
title="Privacy Policy"
icon={<QuestionMarkIcon />}
href="/privacy-policy"
/>
{/* {!isLocaleSwitcherOpened ? ( */}
<div className="flex flex-col gap-y-[12px]">
<Link
href="/shariah"
className="hover:text-islamic-primary-green z-50 py-[12px] text-base uppercase text-white transition-colors duration-200"
onClick={onClick}
>
{t('single-links.shariah')}
</Link>
<MobileMenuDropdownLink title={t('dropdown-links.about.about')}>
<div className="flex flex-col">
<BurgerMenuDropdownLink
title={t('dropdown-links.learn.blog')}
icon={<BlogIcon />}
href="/blog"
title={t('dropdown-links.about.mission')}
icon={<MissionIcon />}
href="/mission"
onClick={onClick}
/>
<BurgerMenuDropdownLink
title={t('dropdown-links.learn.fraud-alert')}
icon={<AlertIcon />}
href="/fraud-alert"
title={t('dropdown-links.about.whitepaper')}
icon={<HalfMoonAndStarIcon />}
href="/whitepaper"
onClick={onClick}
/>
<BurgerMenuDropdownLink
title={t('dropdown-links.learn.scam-alert')}
icon={<AlertIcon />}
href="/scam-alert"
title={t('dropdown-links.about.roadmap')}
icon={<RoadmapIcon />}
href="/roadmap"
onClick={onClick}
/>
</MobileMenuDropdownLink>
<MobileMenuDropdownLink title={t('dropdown-links.team.team')}>
<BurgerMenuDropdownLink
title={t('dropdown-links.team.career')}
icon={<CaseIcon />}
href="/career"
title={t('dropdown-links.about.news')}
icon={<NewsIcon />}
href="/news"
onClick={onClick}
/>
<BurgerMenuDropdownLink
title={t('dropdown-links.team.our-values')}
icon={<ValuesIcon />}
href="/values"
title={t('dropdown-links.about.ecosystem')}
icon={<EcosystemIcon />}
href="https://haqq.network/ecosystem"
isOutLink
onClick={onClick}
/>
<BurgerMenuDropdownLink
title={t('dropdown-links.team.community')}
icon={<CommunityIcon />}
href="/community-hub"
title={t('dropdown-links.about.build-on-haqq')}
icon={<BuildIcon />}
href="/build"
onClick={onClick}
/>
<BurgerMenuDropdownLink
title={t('dropdown-links.team.meet-our-team')}
icon={<StarIcon />}
href="/team"
title={t('dropdown-links.about.validator-program')}
icon={<CubeIcon />}
href="/validators"
onClick={onClick}
/>
</MobileMenuDropdownLink>
<MobileMenuLangButton onClick={toggleLocaleMenu} locale={locale} />
</div>
) : (
</div>
</MobileMenuDropdownLink>
<Link
href="/wallet"
className="hover:text-islamic-primary-green z-50 py-[12px] text-base uppercase text-white transition-colors duration-200"
onClick={onClick}
>
{t('single-links.wallet')}
</Link>
<MobileMenuDropdownLink title={t('dropdown-links.learn.learn')}>
<BurgerMenuDropdownLink
title={t('dropdown-links.learn.academy')}
icon={<AcademyIcon />}
href="/academy"
onClick={onClick}
/>
<BurgerMenuDropdownLink
onClick={onClick}
title="Privacy Policy"
icon={<QuestionMarkIcon />}
href="/privacy-policy"
/>
<BurgerMenuDropdownLink
title={t('dropdown-links.learn.blog')}
icon={<BlogIcon />}
href="/blog"
onClick={onClick}
/>
<BurgerMenuDropdownLink
title={t('dropdown-links.learn.fraud-alert')}
icon={<AlertIcon />}
href="/fraud-alert"
onClick={onClick}
/>
<BurgerMenuDropdownLink
title={t('dropdown-links.learn.scam-alert')}
icon={<AlertIcon />}
href="/scam-alert"
onClick={onClick}
/>
</MobileMenuDropdownLink>
<MobileMenuDropdownLink title={t('dropdown-links.team.team')}>
<BurgerMenuDropdownLink
title={t('dropdown-links.team.career')}
icon={<CaseIcon />}
href="/career"
onClick={onClick}
/>
<BurgerMenuDropdownLink
title={t('dropdown-links.team.our-values')}
icon={<ValuesIcon />}
href="/values"
onClick={onClick}
/>
<BurgerMenuDropdownLink
title={t('dropdown-links.team.community')}
icon={<CommunityIcon />}
href="/community-hub"
onClick={onClick}
/>
<BurgerMenuDropdownLink
title={t('dropdown-links.team.meet-our-team')}
icon={<StarIcon />}
href="/team"
onClick={onClick}
/>
</MobileMenuDropdownLink>
{/* <MobileMenuLangButton onClick={toggleLocaleMenu} locale={locale} /> */}
</div>
{/* ) : (
<div className="flex flex-col gap-y-[12px]">
<MobileMenuLangButton onClick={toggleLocaleMenu} isBackButton />
<LanguageLink
Expand All @@ -224,7 +227,7 @@ export function BurgerMenu({
href={pathname}
/>
</div>
)}
)} */}
</div>
);
}
Expand Down
5 changes: 4 additions & 1 deletion apps/islamic-website/components/footer/footer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ import {
} from '@haqq/islamic-website-ui-kit';

const { Link } = createSharedPathnamesNavigation({
locales: ['en', 'ar', 'id'],
locales: [
'en',
// 'ar', 'id'
],
});

interface FooterNavLink {
Expand Down
9 changes: 6 additions & 3 deletions apps/islamic-website/components/header/header.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ import {
import { BurgerMenu } from '../burger-menu/burger-menu';

const { Link, usePathname } = createSharedPathnamesNavigation({
locales: ['en', 'ar', 'id'],
locales: [
'en',
// 'ar', 'id'
],
});

interface HeaderLinkProps {
Expand Down Expand Up @@ -488,7 +491,7 @@ export function DesktopHeader({
</div>
</HeaderDropdown>

<HeaderDropdown title={localeDisplayNames[locale]}>
{/* <HeaderDropdown title={localeDisplayNames[locale]}>
<div className="flex flex-col">
<LanguageLink
href={pathname}
Expand All @@ -508,7 +511,7 @@ export function DesktopHeader({
locale="id"
/>
</div>
</HeaderDropdown>
</HeaderDropdown> */}

{isBuyButtonVisible && (
<Link href="/markets" className="ml-[8px]" data-attr="buy-islm">
Expand Down
5 changes: 4 additions & 1 deletion apps/islamic-website/constants.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ export const VERCEL_ENV = process.env['VERCEL_ENV'];
export const REVALIDATE_TIME = 300;
export const FALCONER_ENDPOINT = process.env['FALCONER_ENDPOINT'];
export const TURNSTILE_SITEKEY = process.env['TURNSTILE_SITEKEY'];
export const SUPPORTED_LOCALES: Readonly<string[]> = ['en', 'ar', 'id'];
export const SUPPORTED_LOCALES: Readonly<string[]> = [
'en',
// , 'ar', 'id'
];
export const SITE_URL = 'https://islamiccoin.net';
export const BLOCKED_COUNTRY = 'AE';
16 changes: 6 additions & 10 deletions apps/shell/src/app/staking/validator/[address]/@modals/delegate/page.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useParams, useRouter } from 'next/navigation';
import { Hex, formatUnits } from 'viem';
import {
useAddress,
useIndexerBalances,
useIndexerBalanceQuery,
useStakingDelegationQuery,
useStakingParamsQuery,
useStakingValidatorInfoQuery,
Expand All @@ -17,7 +17,7 @@ export default function DelegateModalSegment() {
const { push, back } = useRouter();
const { data: validatorInfo } = useStakingValidatorInfoQuery(address);
const { data: stakingParams } = useStakingParamsQuery();
const { getBalances } = useIndexerBalances();
const { data: balances } = useIndexerBalanceQuery(haqqAddress);
const { data: delegationInfo } = useStakingDelegationQuery(haqqAddress);
const [balance, setBalance] = useState(0);

Expand All @@ -38,15 +38,11 @@ export default function DelegateModalSegment() {
}, [stakingParams]);

useEffect(() => {
if (haqqAddress) {
getBalances(haqqAddress as Hex).then((balances) => {
if (balances) {
const { availableForStake } = balances;
setBalance(availableForStake);
}
});
if (balances) {
const { availableForStake } = balances;
setBalance(availableForStake);
}
}, [getBalances, haqqAddress]);
}, [balances]);

const myDelegation = useMemo(() => {
const delegation = delegationInfo?.delegation_responses?.find(
Expand Down
17 changes: 6 additions & 11 deletions apps/shell/src/app/staking/validator/[address]/@modals/redelegate/page.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useParams, useRouter } from 'next/navigation';
import { Hex, formatUnits } from 'viem';
import {
useAddress,
useIndexerBalances,
useIndexerBalanceQuery,
useStakingDelegationQuery,
useStakingValidatorListQuery,
} from '@haqq/shell-shared';
Expand All @@ -14,22 +14,17 @@ export default function RedelegateModal() {
const { haqqAddress } = useAddress();
const { address } = useParams<{ address: string }>();
const { push, back } = useRouter();

const { data: validatorsList } = useStakingValidatorListQuery(1000);
const { getBalances } = useIndexerBalances();
const { data: balances } = useIndexerBalanceQuery(haqqAddress);
const { data: delegationInfo } = useStakingDelegationQuery(haqqAddress);
const [balance, setBalance] = useState(0);

useEffect(() => {
if (haqqAddress) {
getBalances(haqqAddress as Hex).then((balances) => {
if (balances) {
const { availableForStake } = balances;
setBalance(availableForStake);
}
});
if (balances) {
const { availableForStake } = balances;
setBalance(availableForStake);
}
}, [getBalances, haqqAddress]);
}, [balances]);

const myDelegation = useMemo(() => {
const delegation = delegationInfo?.delegation_responses?.find(
Expand Down
Loading

1 comment on commit ac42d0e

@vercel
Copy link

@vercel vercel bot commented on ac42d0e Apr 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

haqq-website – ./

haqq-website-git-prod-haqq-network.vercel.app
haqq.network
haqq-website.vercel.app
www.haqq.network
haqq-website-haqq-network.vercel.app

Please sign in to comment.