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(website): CAN-609 #1506

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
+70 −52
Open

fix(website): CAN-609 #1506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions packages/website/src/features/Packages/Function.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,8 +587,8 @@ export const Function: FC<{
</Flex>
)}
<FunctionOutput
result={methodCallOrQueuedResult?.value || null}
output={f.outputs}
methodResult={methodCallOrQueuedResult?.value || null}
abiParameters={f.outputs}
/>
</Box>
)}
Expand Down
118 changes: 68 additions & 50 deletions packages/website/src/features/Packages/FunctionOutput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,76 +6,86 @@ import { InfoOutlineIcon } from '@chakra-ui/icons';
import { Tooltip } from '@chakra-ui/react';
import { formatEther } from 'viem';

export const FunctionOutput: FC<{
output: AbiParameter | readonly AbiParameter[];
result: any;
}> = ({ output, result }) => {
const isArrayOutput = (
value: AbiParameter | readonly AbiParameter[]
): value is readonly AbiParameter[] => isArray(value);
const isArrayOutput = (
value: AbiParameter | readonly AbiParameter[]
): value is readonly AbiParameter[] => isArray(value);

const hasComponents = (
item: AbiParameter
): item is AbiParameter & { components: readonly AbiParameter[] } => {
return 'components' in item && isArray(item.components);
};
const hasComponentsKey = (
item: AbiParameter
): item is AbiParameter & { components: readonly AbiParameter[] } => {
return 'components' in item && isArray(item.components);
};

const ItemLabel: FC<{ name: string; type: string }> = ({ name, type }) => (
<Box alignItems={'center'} gap={1} fontSize="sm" mb={0}>
{name?.length ? (
<Text pr={1} fontWeight="semibold" as="span">
{name}
</Text>
) : (
''
)}
<Text as="span" fontSize="xs" color="whiteAlpha.700">
{type}
const ItemLabel: FC<{ name: string; type: string }> = ({ name, type }) => (
<Box alignItems={'center'} gap={1} fontSize="sm" mb={0}>
{name?.length ? (
<Text pr={1} fontWeight="semibold" as="span">
{name}
</Text>
</Box>
);
) : (
''
)}
<Text as="span" fontSize="xs" color="whiteAlpha.700">
{type}
</Text>
</Box>
);

export const FunctionOutput: FC<{
abiParameters: AbiParameter | readonly AbiParameter[];
methodResult: any;
}> = ({ abiParameters, methodResult }) => {
const renderOutput = (
item: AbiParameter,
abiParameter: AbiParameter,
value: { [key: string]: any },
index?: number
) => {
if (item.type === 'tuple' && hasComponents(item) && value) {
if (
abiParameter.type === 'tuple' &&
hasComponentsKey(abiParameter) &&
value
) {
return (
<Box pl="4">
{Object.values(value).map((component: any, resIdx: number) => {
return (
<FunctionOutput
output={item.components[resIdx]}
result={component}
abiParameters={abiParameter.components[resIdx]}
methodResult={component}
key={resIdx}
/>
);
})}
</Box>
);
} else if (item.type === 'tuple[]' && hasComponents(item) && value) {
} else if (
abiParameter.type === 'tuple[]' &&
hasComponentsKey(abiParameter) &&
value
) {
return isArray(value)
? value.map((tupleItem, tupleIndex) => (
<Box key={tupleIndex} pl="4">
<Text as="span" fontSize="xs" color="whiteAlpha.700">
tuple[{tupleIndex}]
</Text>
{item.components.map(
{abiParameter.components.map(
(component: AbiParameter, compIdx: number) => (
<FunctionOutput
key={compIdx}
output={component}
result={isArray(tupleItem) ? tupleItem[compIdx] : tupleItem}
abiParameters={component}
methodResult={
isArray(tupleItem) ? tupleItem[compIdx] : tupleItem
}
/>
)
)}
</Box>
))
: null;
} else {
if (isObject(value) && item.name && item.name in value) {
const outputValue = value[item.name];
if (isObject(value) && abiParameter.name && abiParameter.name in value) {
const outputValue = value[abiParameter.name];
return (
<Text
display="block"
Expand All @@ -88,7 +98,7 @@ export const FunctionOutput: FC<{
</Text>
);
} else if (isArray(value)) {
if (item.type === 'address[]') {
if (abiParameter.type === 'address[]') {
return (
<Box>
{value.map((val, idx) => (
Expand Down Expand Up @@ -118,14 +128,15 @@ export const FunctionOutput: FC<{
gap={2}
justifyItems="center"
py={2}
data-tooltip-id={`${item.name}${item.type}`}
data-tooltip-id={`${abiParameter.name}${abiParameter.type}`}
data-tooltip-float
>
{(item.type.includes('int128') || item.type.includes('int256')) &&
result ? (
{(abiParameter.type.includes('int128') ||
abiParameter.type.includes('int256')) &&
methodResult ? (
<>
<Tooltip
label={`${formatEther(result).toString()} wei`}
label={`${formatEther(methodResult).toString()} wei`}
aria-label="Decimal Representation"
>
<Flex gap={2} alignItems="center">
Expand All @@ -134,14 +145,18 @@ export const FunctionOutput: FC<{
color="whiteAlpha.900"
verticalAlign="center"
>
{result !== null || undefined ? String(result) : '---'}
{methodResult !== null || undefined
? String(methodResult)
: '---'}
</Text>
</Flex>
</Tooltip>
</>
) : (
<Text fontSize="xs" color="whiteAlpha.900" verticalAlign="center">
{result !== null || undefined ? String(result) : '---'}
{methodResult !== null || undefined
? String(methodResult)
: '---'}
</Text>
)}
</Flex>
Expand All @@ -152,28 +167,31 @@ export const FunctionOutput: FC<{

return (
<>
{(output as Array<any>).length == 0 && (
{(abiParameters as Array<any>).length == 0 && (
<Flex flex="1">
<Text fontSize="sm" m="auto" color="gray.500">
<InfoOutlineIcon mt={-0.5} mr={0.5} /> This function does not return
any values
</Text>
</Flex>
)}
{isArrayOutput(output) ? (
output.map((item, index) => (
{isArrayOutput(abiParameters) ? (
abiParameters.map((abiParameter, index) => (
<Box overflowX={'scroll'} p={2} key={index}>
<ItemLabel name={item.name || ''} type={item.internalType || ''} />
{renderOutput(item, result, index)}
<ItemLabel
name={abiParameter.name || ''}
type={abiParameter.internalType || ''}
/>
{renderOutput(abiParameter, methodResult[index], index)}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

methodResult[index] is what fixes this issue.

</Box>
))
) : (
<Box overflowX={'scroll'} p={2}>
<ItemLabel
name={output.name || ''}
type={output.internalType || ''}
name={abiParameters.name || ''}
type={abiParameters.internalType || ''}
/>
{renderOutput(output, result)}
{renderOutput(abiParameters, methodResult)}
</Box>
)}
</>
Expand Down
Loading