Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: disable wasm on account detail #395

Merged
merged 4 commits into from
Jun 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Bug fixes

- [#395](https://github.com/alleslabs/celatone-frontend/pull/395) Disable wasm related tabs on the account detail page
- [#392](https://github.com/alleslabs/celatone-frontend/pull/392) Fix format denom function
- [#390](https://github.com/alleslabs/celatone-frontend/pull/390) Fix minor styling
- [#391](https://github.com/alleslabs/celatone-frontend/pull/391) Fix incorrect empty state for past txs table
Expand Down
55 changes: 32 additions & 23 deletions src/lib/pages/account-details/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
import { useRouter } from "next/router";
import { useEffect, useState } from "react";

import { useValidateAddress } from "lib/app-provider";
import { useValidateAddress, useWasmConfig } from "lib/app-provider";
import { Breadcrumb } from "lib/components/Breadcrumb";
import { CopyLink } from "lib/components/CopyLink";
import { CustomTab } from "lib/components/CustomTab";
Expand Down Expand Up @@ -63,6 +63,8 @@ interface AccountDetailsBodyProps {
const InvalidAccount = () => <InvalidState title="Account does not exist" />;

const AccountDetailsBody = ({ accountAddress }: AccountDetailsBodyProps) => {
const wasm = useWasmConfig({ shouldRedirect: false });

const [tabIndex, setTabIndex] = useState(TabIndex.Overview);
const tableHeaderId = "accountDetailsTab";
const { data: publicInfo } = usePublicProjectByAccountAddress(accountAddress);
Expand Down Expand Up @@ -156,7 +158,7 @@ const AccountDetailsBody = ({ accountAddress }: AccountDetailsBodyProps) => {
</Flex>
)}

<Tabs index={tabIndex}>
<Tabs index={tabIndex} isLazy lazyBehavior="keepMounted">
<TabList
borderBottom="1px solid"
borderColor="gray.700"
Expand Down Expand Up @@ -187,20 +189,23 @@ const AccountDetailsBody = ({ accountAddress }: AccountDetailsBodyProps) => {
count={tableCounts.codesCount}
isDisabled={!tableCounts.codesCount}
onClick={() => handleTabChange(TabIndex.Codes)}
hidden={!wasm.enabled}
>
Codes
</CustomTab>
<CustomTab
count={tableCounts.contractsCount}
isDisabled={!tableCounts.contractsCount}
onClick={() => handleTabChange(TabIndex.Contracts)}
hidden={!wasm.enabled}
>
Contracts
</CustomTab>
<CustomTab
count={tableCounts.contractsAdminCount}
isDisabled={!tableCounts.contractsAdminCount}
onClick={() => handleTabChange(TabIndex.Admins)}
hidden={!wasm.enabled}
>
Admins
</CustomTab>
Expand Down Expand Up @@ -258,27 +263,31 @@ const AccountDetailsBody = ({ accountAddress }: AccountDetailsBodyProps) => {
scrollComponentId={tableHeaderId}
onViewMore={() => handleTabChange(TabIndex.Txs)}
/>
<StoredCodesTable
walletAddress={accountAddress}
scrollComponentId={tableHeaderId}
totalData={tableCounts.codesCount}
refetchCount={refetchCodesCount}
onViewMore={() => handleTabChange(TabIndex.Codes)}
/>
<InstantiatedContractsTable
walletAddress={accountAddress}
scrollComponentId={tableHeaderId}
totalData={tableCounts.contractsCount}
refetchCount={refetchContractsCount}
onViewMore={() => handleTabChange(TabIndex.Contracts)}
/>
<AdminContractsTable
walletAddress={accountAddress}
scrollComponentId={tableHeaderId}
totalData={tableCounts.contractsAdminCount}
refetchCount={refetchContractsAdminCount}
onViewMore={() => handleTabChange(TabIndex.Admins)}
/>
{wasm.enabled && (
<>
<StoredCodesTable
walletAddress={accountAddress}
scrollComponentId={tableHeaderId}
totalData={tableCounts.codesCount}
refetchCount={refetchCodesCount}
onViewMore={() => handleTabChange(TabIndex.Codes)}
/>
<InstantiatedContractsTable
walletAddress={accountAddress}
scrollComponentId={tableHeaderId}
totalData={tableCounts.contractsCount}
refetchCount={refetchContractsCount}
onViewMore={() => handleTabChange(TabIndex.Contracts)}
/>
<AdminContractsTable
walletAddress={accountAddress}
scrollComponentId={tableHeaderId}
totalData={tableCounts.contractsAdminCount}
refetchCount={refetchContractsAdminCount}
onViewMore={() => handleTabChange(TabIndex.Admins)}
/>
</>
)}
<OpenedProposalsTable
walletAddress={accountAddress}
scrollComponentId={tableHeaderId}
Expand Down
14 changes: 11 additions & 3 deletions src/lib/services/codeService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { UseQueryResult } from "@tanstack/react-query";
import { useQuery } from "@tanstack/react-query";
import { useCallback } from "react";

import { useCelatoneApp } from "lib/app-provider";
import { useCelatoneApp, useWasmConfig } from "lib/app-provider";
import {
getCodeDataByCodeId,
getCodeListByIDsQueryDocument,
Expand Down Expand Up @@ -167,6 +167,8 @@ export const useCodeListByWalletAddressPagination = (
pageSize: number
): UseQueryResult<CodeInfo[]> => {
const { indexerGraphClient } = useCelatoneApp();
const wasm = useWasmConfig({ shouldRedirect: false });

const queryFn = useCallback(async () => {
if (!walletAddress)
throw new Error(
Expand Down Expand Up @@ -202,14 +204,20 @@ export const useCodeListByWalletAddressPagination = (
walletAddress,
],
createQueryFnWithTimeout(queryFn),
{ enabled: !!walletAddress, retry: 1, refetchOnWindowFocus: false }
{
enabled: wasm.enabled && !!walletAddress,
retry: 1,
refetchOnWindowFocus: false,
}
);
};

export const useCodeListCountByWalletAddress = (
walletAddress: Option<HumanAddr>
): UseQueryResult<Option<number>> => {
const { indexerGraphClient } = useCelatoneApp();
const wasm = useWasmConfig({ shouldRedirect: false });

const queryFn = useCallback(async () => {
if (!walletAddress)
throw new Error(
Expand All @@ -228,7 +236,7 @@ export const useCodeListCountByWalletAddress = (
queryFn,
{
keepPreviousData: true,
enabled: !!walletAddress,
enabled: wasm.enabled && !!walletAddress,
}
);
};
25 changes: 20 additions & 5 deletions src/lib/services/contractService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { UseQueryResult } from "@tanstack/react-query";
import { useQuery } from "@tanstack/react-query";
import { useCallback } from "react";

import { useCelatoneApp } from "lib/app-provider";
import { useCelatoneApp, useWasmConfig } from "lib/app-provider";
import {
getAdminByContractAddressesQueryDocument,
getContractListByAdmin,
Expand Down Expand Up @@ -70,6 +70,7 @@ export const useInstantiatedCountByUserQuery = (
walletAddr: Option<HumanAddr>
): UseQueryResult<Option<number>> => {
const { indexerGraphClient } = useCelatoneApp();
const wasm = useWasmConfig({ shouldRedirect: false });

const queryFn = useCallback(async () => {
if (!walletAddr)
Expand All @@ -89,7 +90,7 @@ export const useInstantiatedCountByUserQuery = (
queryFn,
{
keepPreviousData: true,
enabled: !!walletAddr,
enabled: wasm.enabled && !!walletAddr,
}
);
};
Expand Down Expand Up @@ -369,6 +370,8 @@ export const useContractListByWalletAddressPagination = (
pageSize: number
): UseQueryResult<ContractInfo[]> => {
const { indexerGraphClient } = useCelatoneApp();
const wasm = useWasmConfig({ shouldRedirect: false });

const queryFn = useCallback(async () => {
if (!walletAddress)
throw new Error(
Expand Down Expand Up @@ -406,7 +409,11 @@ export const useContractListByWalletAddressPagination = (
walletAddress,
],
createQueryFnWithTimeout(queryFn),
{ enabled: !!walletAddress, retry: 1, refetchOnWindowFocus: false }
{
enabled: wasm.enabled && !!walletAddress,
retry: 1,
refetchOnWindowFocus: false,
}
);
};

Expand All @@ -416,6 +423,8 @@ export const useContractListByAdminPagination = (
pageSize: number
): UseQueryResult<ContractInfo[]> => {
const { indexerGraphClient } = useCelatoneApp();
const wasm = useWasmConfig({ shouldRedirect: false });

const queryFn = useCallback(async () => {
if (!walletAddress)
throw new Error(
Expand Down Expand Up @@ -452,14 +461,20 @@ export const useContractListByAdminPagination = (
walletAddress,
],
createQueryFnWithTimeout(queryFn),
{ enabled: !!walletAddress, retry: 1, refetchOnWindowFocus: false }
{
enabled: wasm.enabled && !!walletAddress,
retry: 1,
refetchOnWindowFocus: false,
}
);
};

export const useContractListCountByAdmin = (
walletAddress: Option<HumanAddr>
): UseQueryResult<Option<number>> => {
const { indexerGraphClient } = useCelatoneApp();
const wasm = useWasmConfig({ shouldRedirect: false });

const queryFn = useCallback(async () => {
if (!walletAddress)
throw new Error("Wallet address not found (useContractListCountByAdmin)");
Expand All @@ -476,7 +491,7 @@ export const useContractListCountByAdmin = (
createQueryFnWithTimeout(queryFn),
{
keepPreviousData: true,
enabled: !!walletAddress,
enabled: wasm.enabled && !!walletAddress,
}
);
};