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.

Sign up for GitHub

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

Jump to bottom

fix: show no admin and correctly handle explorer link by address type #115

Merged
merged 7 commits into from
Jan 24, 2023
Merged

fix: show no admin and correctly handle explorer link by address type #115

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c69af9a
fix: show no admin and correctly handle explorer link by address type
poomthiti Jan 20, 2023
9fcbb08
feat: show address type helpertext for admin
poomthiti Jan 23, 2023
5924dea
fix: remove address type on no admin case
poomthiti Jan 23, 2023
dff51de
refactor: refactor instantiate info
poomthiti Jan 24, 2023
e149c6c
chore: add todos in useAddress
poomthiti Jan 24, 2023
4f3614b
fix: conflict
poomthiti Jan 24, 2023
fd8882f
fix: flex direction
poomthiti Jan 24, 2023
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Improvements

- [#115](https://github.com/alleslabs/celatone-frontend/pull/115) (Contract Details Page) Show no admin and correctly handle explorer link by address type
- [#64](https://github.com/alleslabs/celatone-frontend/pull/64) Add address validation functions for contract and user addresses
- [#52](https://github.com/alleslabs/celatone-frontend/pull/52) Create a component for disconnected State and apply to contract, code, past tx
- [#56](https://github.com/alleslabs/celatone-frontend/pull/56) Refactor offchain form component by not receiving nameField and descriptionField
Expand Down
217 changes: 114 additions & 103 deletions src/lib/pages/contract-details/components/InstantiateInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Divider, Flex, Text } from "@chakra-ui/react";
import { chakra, Divider, Flex, Text } from "@chakra-ui/react";

import { ExplorerLink } from "lib/components/ExplorerLink";
import { LabelText } from "lib/components/LabelText";
Expand All @@ -11,123 +11,134 @@ interface InstantiateInfoProps {
contractData: ContractData;
}

export const InstantiateInfo = ({ contractData }: InstantiateInfoProps) => {
const Container = chakra(Flex, {
baseStyle: {
direction: "column",
gap: 6,
w: "250px",
},
});

export const InstantiateInfo = ({
contractData: {
instantiateInfo,
chainId,
codeInfo,
initTxHash,
initProposalId,
initProposalTitle,
},
}: InstantiateInfoProps) => {
const getAddressType = useGetAddressType();

// TODO: fix eslint
// eslint-disable-next-line sonarjs/cognitive-complexity
const renderDataFound = () => {
if (contractData.instantiateInfo) {
const instantiatorType = getAddressType(
contractData.instantiateInfo.instantiator
);
return (
<>
<LabelText label="Network">{contractData.chainId}</LabelText>
if (!instantiateInfo) {
return (
<Container>
<Text variant="body2" color="text.dark">
Error fetching data
</Text>
</Container>
);
}

<LabelText
label="From Code"
helperText1={contractData.codeInfo?.description}
>
<ExplorerLink
type="code_id"
value={contractData.instantiateInfo.codeId}
canCopyWithHover
/>
</LabelText>
const instantiatorType = getAddressType(instantiateInfo.instantiator);
const adminTypeOpt = instantiateInfo.admin
? getAddressType(instantiateInfo.admin)
: undefined;

return (
<Container>
<LabelText label="Network">{chainId}</LabelText>

{contractData.instantiateInfo.admin && (
<LabelText label="Admin Address">
<ExplorerLink
type="user_address"
value={contractData.instantiateInfo.admin}
canCopyWithHover
/>
</LabelText>
)}
<LabelText label="From Code" helperText1={codeInfo?.description}>
<ExplorerLink
type="code_id"
value={instantiateInfo.codeId}
canCopyWithHover
/>
</LabelText>

<Divider border="1px solid" borderColor="divider.main" />
<LabelText
label="Admin Address"
helperText1={
adminTypeOpt ? getAddressTypeText(adminTypeOpt) : undefined
}
>
{instantiateInfo.admin ? (
<ExplorerLink
type={adminTypeOpt}
value={instantiateInfo.admin}
canCopyWithHover
/>
) : (
<Text variant="body2" color="text.dark">
No Admin
</Text>
)}
</LabelText>

{contractData.instantiateInfo &&
(contractData.instantiateInfo.createdHeight !== -1 ? (
<LabelText
label="Instantiated Block Height"
helperText1={
contractData.instantiateInfo.createdTime
? formatUTC(contractData.instantiateInfo.createdTime)
: undefined
}
helperText2={
contractData.instantiateInfo.createdTime
? dateFromNow(contractData.instantiateInfo.createdTime)
: undefined
}
>
<ExplorerLink
type="block_height"
value={contractData.instantiateInfo.createdHeight.toString()}
canCopyWithHover
/>
</LabelText>
) : (
<LabelText label="Instantiated Block Height">N/A</LabelText>
))}
<Divider border="1px solid" borderColor="divider.main" />

{instantiateInfo &&
(instantiateInfo.createdHeight !== -1 ? (
<LabelText
label="Instantiated by"
helperText1={getAddressTypeText(instantiatorType)}
label="Instantiated Block Height"
helperText1={
instantiateInfo.createdTime
? formatUTC(instantiateInfo.createdTime)
: undefined
}
helperText2={
instantiateInfo.createdTime
? dateFromNow(instantiateInfo.createdTime)
: undefined
}
>
<ExplorerLink
type="user_address"
value={contractData.instantiateInfo.instantiator}
type="block_height"
value={instantiateInfo.createdHeight.toString()}
canCopyWithHover
/>
</LabelText>
) : (
<LabelText label="Instantiated Block Height">N/A</LabelText>
))}

{contractData.initTxHash ? (
<LabelText label="Instantiate Transaction">
<ExplorerLink
type="tx_hash"
value={contractData.initTxHash.toUpperCase()}
canCopyWithHover
/>
</LabelText>
) : (
<LabelText
label="Instantiate Proposal ID"
helperText1={contractData.initProposalTitle}
>
<ExplorerLink
value={
contractData.initProposalId
? `#${contractData.initProposalId}`
: "Genesis"
}
canCopyWithHover
isReadOnly={!contractData.initProposalId}
/>
</LabelText>
)}
<LabelText
label="Instantiated by"
helperText1={getAddressTypeText(instantiatorType)}
>
<ExplorerLink
type={instantiatorType}
value={instantiateInfo.instantiator}
canCopyWithHover
/>
</LabelText>

{contractData.instantiateInfo.ibcPortId && (
<LabelText label="IBC Port ID">
{contractData.instantiateInfo.ibcPortId}
</LabelText>
)}
</>
);
}
{initTxHash ? (
<LabelText label="Instantiate Transaction">
<ExplorerLink
type="tx_hash"
value={initTxHash.toUpperCase()}
canCopyWithHover
/>
</LabelText>
) : (
<LabelText
label="Instantiate Proposal ID"
helperText1={initProposalTitle}
>
<ExplorerLink
value={initProposalId ? `#${initProposalId}` : "Genesis"}
canCopyWithHover
isReadOnly={!initProposalId}
/>
</LabelText>
)}

return (
<Text variant="body2" color="text.dark">
Error fetching data
</Text>
);
};

return (
<Flex direction="column" gap={6} w="250px">
{renderDataFound()}
</Flex>
{instantiateInfo.ibcPortId && (
<LabelText label="IBC Port ID">{instantiateInfo.ibcPortId}</LabelText>
)}
</Container>
);
};