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

Add explorer link to Wallet Settings #12770

Merged
merged 4 commits into from
Jun 30, 2023
Merged

Add explorer link to Wallet Settings #12770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17a4937
add add explorer link to Wallet Settings and fix sui apps discription…
Jibz-Mysten Jun 29, 2023
d3cbd0e
nit
Jibz-Mysten Jun 29, 2023
a8cb9a0
nit
Jibz-Mysten Jun 29, 2023
6f55793
nit
Jibz-Mysten Jun 30, 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
34 changes: 28 additions & 6 deletions apps/wallet/src/ui/app/components/menu/content/MenuList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { useResolveSuiNSName } from '@mysten/core';
import {
Account24,
ArrowUpRight12,
ArrowUpRight16,
Domain24,
Version24,
CopyArchiveDoNotUse24,
Expand All @@ -23,8 +24,10 @@ import { lockWallet } from '_app/wallet/actions';
import { useNextMenuUrl } from '_components/menu/hooks';
import { useAppDispatch, useAppSelector } from '_hooks';
import { ToS_LINK, FAQ_LINK } from '_src/shared/constants';
import { ExplorerLinkType } from '_src/ui/app/components/explorer-link/ExplorerLinkType';
import { useActiveAddress } from '_src/ui/app/hooks/useActiveAddress';
import { useAutoLockInterval } from '_src/ui/app/hooks/useAutoLockInterval';
import { useExplorerLink } from '_src/ui/app/hooks/useExplorerLink';
import { logout } from '_src/ui/app/redux/slices/account';
import { ConfirmationModal } from '_src/ui/app/shared/ConfirmationModal';
import { Link } from '_src/ui/app/shared/Link';
Expand All @@ -45,16 +48,35 @@ function MenuList() {
const navigate = useNavigate();
const [logoutInProgress, setLogoutInProgress] = useState(false);
const [isLogoutDialogOpen, setIsLogoutDialogOpen] = useState(false);
const explorerAddress = useExplorerLink({
type: ExplorerLinkType.address,
address: address || '',
});
return (
<>
<MenuLayout title="Wallet Settings">
<div className="flex flex-col divide-y divide-x-0 divide-solid divide-gray-45">
<MenuListItem
to={accountUrl}
icon={<Account24 />}
title={'Accounts'}
subtitle={domainName ?? (address ? formatAddress(address) : '')}
/>
<div className="flex flex-col mb-3">
<MenuListItem
to={accountUrl}
icon={<Account24 />}
title={'Accounts'}
subtitle={domainName ?? (address ? formatAddress(address) : '')}
/>
{explorerAddress && (
<Button
variant="secondary"
size="narrow"
href={explorerAddress}
text={
<Text variant="bodySmall" weight="medium" color="steel-darker">
View account on Sui Explorer
</Text>
}
after={<ArrowUpRight16 className="text-steel w-4 h-4" />}
/>
)}
</div>
<MenuListItem
to={networkUrl}
icon={<Domain24 />}
Expand Down
4 changes: 2 additions & 2 deletions apps/wallet/src/ui/app/components/menu/content/MenuListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function MenuListItem({
href={href}
target="_blank"
rel="noreferrer noopener"
className="flex flex-nowrap items-center px-1 py-4.5 first:pt-3 last:pb-3 gap-5 no-underline overflow-hidden group cursor-pointer"
className="flex flex-nowrap items-center px-1 py-4.5 first:pt-3 first:pb-3 last:pb-3 gap-5 no-underline overflow-hidden group cursor-pointer"
>
{MenuItemContent}
</a>
Expand All @@ -61,7 +61,7 @@ function MenuListItem({
return (
<Component
data-testid={title}
className="flex flex-nowrap items-center px-1 py-4.5 first:pt-3 last:pb-3 gap-5 no-underline overflow-hidden group cursor-pointer"
className="flex flex-nowrap items-center px-1 py-5 first:pt-3 first:pb-3 last:pb-3 gap-5 no-underline overflow-hidden group cursor-pointer"
to={to}
onClick={onClick}
>
Expand Down
4 changes: 2 additions & 2 deletions apps/wallet/src/ui/app/components/sui-apps/SuiApp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ function ListView({ name, icon, description, tags }: ListViewProp) {
<Text variant="body" weight="semibold" color="sui-dark">
{name}
</Text>
<Text variant="subtitle" weight="normal" color="steel-darker">
<Text variant="pSubtitle" weight="normal" color="steel-darker">
{description}
</Text>
{tags?.length && (
<div className="flex flex-wrap gap-1">
<div className="flex flex-wrap gap-1 mt-0.5">
{tags?.map((tag) => (
<div
className="flex item-center justify-center px-1.5 py-0.5 border border-solid border-steel rounded"
Expand Down
3 changes: 2 additions & 1 deletion apps/wallet/src/ui/app/shared/ButtonUI.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ const styles = cva(
'disabled:bg-hero-darkest disabled:text-white disabled:opacity-40',
],
secondary: [
'bg-gray-45 text-steel-darker border-none',
'bg-gray-40 text-steel-darker border-none',
'hover:bg-gray-45 focus:bg-gray-45',
'visited:text-steel-darker',
'active:text-steel-dark/70',
'disabled:bg-gray-40 disabled:text-steel/50',
Expand Down