Skip to content

Commit

Permalink
search not found result & network select fix
Browse files Browse the repository at this point in the history
uiii committed Nov 10, 2023
1 parent 112beca commit 94404af
Showing 2 changed files with 56 additions and 62 deletions.
78 changes: 38 additions & 40 deletions src/components/NetworkSelect.tsx
Original file line number Diff line number Diff line change
@@ -208,47 +208,45 @@ export const NetworkSelect = (props: NetworkSelectProps) => {
{networkGroups.map((group, index) => {
const allSelected = group.networks.every(it => value.includes(it));

return (
<>
<Divider />
<ListSubheader css={headerStyle} key={index}>
<div>
{group.relayChainNetwork?.displayName || "Other"}{" "}
{group.relayChainNetwork && <><br /><span style={{fontSize: 12}}>and parachains</span></>}
</div>
<Link
onClick={() => allSelected
? removeSelection(group.networks)
: addSelection(group.networks)
}
>
{allSelected ? "deselect" : "select"} all
</Link>
</ListSubheader>
{group.networks.map((network) => (
<MenuItem
css={menuItemStyle}
selected={value.includes(network)}
onClick={() => setSelection([network])}
>
<ListItemIcon>
<img
src={network.icon}
css={iconStyle}
/>
</ListItemIcon>
<ListItemText>{network.displayName}</ListItemText>
<Checkbox
css={checkboxStyle}
checked={value.includes(network)}
onChange={(ev, checked) => checked ? addSelection([network]) : removeSelection([network])}
onClick={(ev) => ev.stopPropagation()}
disableRipple
return [
<Divider />,
<ListSubheader css={headerStyle} key={index}>
<div>
{group.relayChainNetwork?.displayName || "Other"}{" "}
{group.relayChainNetwork && <><br /><span style={{fontSize: 12}}>and parachains</span></>}
</div>
<Link
onClick={() => allSelected
? removeSelection(group.networks)
: addSelection(group.networks)
}
>
{allSelected ? "deselect" : "select"} all
</Link>
</ListSubheader>,
group.networks.map((network) => (
<MenuItem
css={menuItemStyle}
selected={value.includes(network)}
onClick={() => setSelection([network])}
>
<ListItemIcon>
<img
src={network.icon}
css={iconStyle}
/>
</MenuItem>
))}
</>
);
</ListItemIcon>
<ListItemText>{network.displayName}</ListItemText>
<Checkbox
css={checkboxStyle}
checked={value.includes(network)}
onChange={(ev, checked) => checked ? addSelection([network]) : removeSelection([network])}
onClick={(ev) => ev.stopPropagation()}
disableRipple
/>
</MenuItem>
))
];
})}
</Menu>
</>
40 changes: 18 additions & 22 deletions src/screens/search.tsx
Original file line number Diff line number Diff line change
@@ -82,6 +82,10 @@ const errorStyle = css`
margin-top: 32px;
`;

const notFoundStyle = css`
margin-top: 48px;
`;

const loadingStyle = css`
text-align: center;
word-break: break-all;
@@ -183,26 +187,6 @@ export const SearchPage = () => {
);
}

if (searchResult.notFound) {
return (
<Card>
<NotFound>Nothing was found for query <span css={queryStyle}>{query}</span></NotFound>
</Card>
);
}

if (searchResult.error) {
return (
<Card>
<ErrorMessage
message={<>Unexpected error occured while searching for <span css={queryStyle}>{query}</span></>}
details={searchResult.error}
report
/>
</Card>
);
}

return (
<>
<Card>
@@ -226,6 +210,15 @@ export const SearchPage = () => {
</>
)}
</div>
{searchResult.error && (
<Card>
<ErrorMessage
message={<>Unexpected error occured</>}
details={searchResult.error}
report
/>
</Card>
)}
{searchResult.data?.errors && searchResult.data?.errors.length > 0 && (
<ErrorMessage
css={errorStyle}
@@ -234,7 +227,10 @@ export const SearchPage = () => {
report
/>
)}
{searchResult.data &&
{searchResult.data && searchResult.data.totalCount === 0 && (
<NotFound css={notFoundStyle}>Nothing was found</NotFound>
)}
{searchResult.data && searchResult.data.totalCount > 0 && (
<TabbedContent css={resultsStyle} currentTab={tab} onTabChange={setTab}>
<TabPane
value="accounts"
@@ -293,7 +289,7 @@ export const SearchPage = () => {
/>
</TabPane>
</TabbedContent>
}
)}
</Card>
</>
);

0 comments on commit 94404af

Please sign in to comment.