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

Fix - Add xNFT icon to Applications tab and link to xnft.gg #3492 #3628

Closed
wants to merge 2 commits into from
Closed

Fix - Add xNFT icon to Applications tab and link to xnft.gg #3492 #3628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2396679
fix allow notifications screen doesn't display on account recovery #3619
venkateshzoft Apr 6, 2023
3b5b762
Fix - Add xNFT icon to Applications tab and link to xnft.gg #3492
venkateshzoft Apr 6, 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
2 changes: 2 additions & 0 deletions packages/app-extension/src/components/Onboarding/pages/RecoverAccount.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { AlreadyOnboarded } from "./AlreadyOnboarded";
import { Finish } from "./Finish";
import { KeyringTypeSelector } from "./KeyringTypeSelector";
import { MnemonicSearch } from "./MnemonicSearch";
import { NotificationsPermission } from "./NotificationsPermission";
import { RecoverAccountUsernameForm } from "./RecoverAccountUsernameForm";
import { TwitterConnect } from "./TwitterConnect";

Expand Down Expand Up @@ -151,6 +152,7 @@ export const RecoverAccount = ({
/>,
]
: []),
<NotificationsPermission key="NotificationsPermission" onNext={nextStep} />,
<Finish key="Finish" isAddingAccount={isAddingAccount} />,
];

Expand Down
105 changes: 82 additions & 23 deletions packages/app-extension/src/components/Unlocked/Apps/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,17 @@ import {
} from "@coral-xyz/recoil";
import { HOVER_OPACITY, styles, useCustomTheme } from "@coral-xyz/themes";
import { Block as BlockIcon } from "@mui/icons-material";
import { Button, Grid, Skeleton, Typography } from "@mui/material";
import type {
TooltipProps} from "@mui/material";
import {
Button,
Grid,
Skeleton,
Tooltip,
tooltipClasses,
Typography,
} from "@mui/material";
import { styled } from "@mui/system";
import { getSvgPath } from "figma-squircle";
import { useRecoilValue, waitForAll } from "recoil";

Expand Down Expand Up @@ -170,7 +180,7 @@ function WalletXnftGrid({
);

return !isLoading && plugins.length === 0 ? (
<></>
<span />
) : (
<div
style={{
Expand Down Expand Up @@ -209,12 +219,21 @@ function _WalletXnftGrid({
const onClickPlugin = (p: any) => {
openPlugin(p.install.account.xnft.toString());
};
const xNFTPlugin: { title: string; icon: string; url: string } = {
title: "xNFT.gg \u2197",
icon: "https://www.xnft.gg/logo.svg",
url: "https://xnft.gg",
};
const onClickXnftPlugin = (url: string) => {
window.open(url, "_blank");
};
const iconsPerRow = isXs ? 4 : 6;
return (
<>
<BalancesTableHead wallet={wallet} />
{showContent ? <div
style={{
{showContent ? (
<div
style={{
paddingTop: "8px",
paddingBottom: "18px",
paddingLeft: "10px",
Expand All @@ -224,23 +243,40 @@ function _WalletXnftGrid({
borderBottomRightRadius: "10px",
}}
>
<Grid container>
{isLoading
? Array.from(Array(iconsPerRow).keys()).map((_, idx) => {
return (
<Grid
item
key={idx}
xs={isXs ? 3 : 2}
style={{
marginTop: idx >= iconsPerRow ? "24px" : 0,
}}
>
<SkeletonAppIcon />
</Grid>
);
})
: plugins.map((p: any, idx: number) => {
<Grid container>
{isLoading ? (
Array.from(Array(iconsPerRow).keys()).map((_, idx) => {
return (
<Grid
item
key={idx}
xs={isXs ? 3 : 2}
style={{
marginTop: idx >= iconsPerRow ? "24px" : 0,
}}
>
<SkeletonAppIcon />
</Grid>
);
})
) : (
<>
<BootstrapTooltipStyled title="Browse xNFTs" placement="top">
<Grid
item
key="xnft.gg"
xs={isXs ? 3 : 2}
style={{
marginTop: plugins.length >= iconsPerRow ? "24px" : 0,
}}
>
<PluginIconCustom
plugin={xNFTPlugin}
onClick={() => onClickXnftPlugin(xNFTPlugin.url)}
/>
</Grid>
</BootstrapTooltipStyled>
{plugins.map((p: any, idx: number) => {
return (
<Grid
item
Expand All @@ -254,18 +290,41 @@ function _WalletXnftGrid({
</Grid>
);
})}
</Grid>
</div> : null}
</>
)}
</Grid>
</div>
) : null}
</>
);
}

function BootstrapTooltip(props: TooltipProps) {
const { className, ...other } = props;
return <Tooltip {...other} arrow classes={{ popper: className }} />;
}

const BootstrapTooltipStyled = styled(BootstrapTooltip)(({ theme }) => ({
[`& .${tooltipClasses.arrow}`]: {
color: theme.palette.common.black,
},
[`& .${tooltipClasses.tooltip}`]: {
backgroundColor: theme.palette.common.black,
},
}));

function PluginIcon({ plugin, onClick }: any) {
return (
<AppIcon title={plugin.title} iconUrl={plugin.iconUrl} onClick={onClick} />
);
}

function PluginIconCustom({ plugin, onClick }: any) {
return (
<AppIcon title={plugin.title} iconUrl={plugin.icon} onClick={onClick} />
);
}

function AppIcon({
title,
iconUrl,
Expand Down