From a38c879ff623d7bb87e977481326a6db5f8d6900 Mon Sep 17 00:00:00 2001 From: Baba Drape Date: Sat, 14 May 2022 10:52:23 +0100 Subject: [PATCH 1/9] add torus wallet --- src/__tests__/widgets/menu.test.tsx | 7 +- src/__tests__/widgets/walletmodal.test.tsx | 132 ++++++++++++++++-- src/components/Button/IconButton.tsx | 2 + src/components/Footer/Footer.tsx | 5 +- src/components/Footer/index.stories.tsx | 1 + src/components/Footer/styles.tsx | 4 +- src/components/Footer/types.ts | 1 + .../RunFiatButton/RunFiatButton.tsx | 44 ++++++ .../RunFiatButton/index.stories.tsx | 22 +++ src/components/RunFiatButton/index.tsx | 2 + src/components/RunFiatButton/types.ts | 5 + src/components/Svg/_Icons/CardIcon.tsx | 14 ++ src/components/Svg/index.ts | 1 + src/components/Svg/types.ts | 1 + src/components/Tabs/Tabs.tsx | 1 + src/index.ts | 1 + src/widgets/Navbar/Navbar.tsx | 6 + src/widgets/Navbar/SubNavbar.tsx | 68 +++++---- src/widgets/Navbar/index.stories.tsx | 4 + src/widgets/Navbar/types.ts | 1 + src/widgets/WalletModal/WalletCard.tsx | 2 +- src/widgets/WalletModal/config.tsx | 6 + src/widgets/WalletModal/icons/SocialLogin.tsx | 45 ++++++ src/widgets/WalletModal/icons/TorusWallet.tsx | 20 +++ src/widgets/WalletModal/types.ts | 1 + 25 files changed, 355 insertions(+), 41 deletions(-) create mode 100644 src/components/RunFiatButton/RunFiatButton.tsx create mode 100644 src/components/RunFiatButton/index.stories.tsx create mode 100644 src/components/RunFiatButton/index.tsx create mode 100644 src/components/RunFiatButton/types.ts create mode 100644 src/components/Svg/_Icons/CardIcon.tsx create mode 100644 src/widgets/WalletModal/icons/SocialLogin.tsx create mode 100644 src/widgets/WalletModal/icons/TorusWallet.tsx diff --git a/src/__tests__/widgets/menu.test.tsx b/src/__tests__/widgets/menu.test.tsx index 15f5df05..4af015de 100644 --- a/src/__tests__/widgets/menu.test.tsx +++ b/src/__tests__/widgets/menu.test.tsx @@ -40,6 +40,7 @@ it("renders correctly", () => { switchNetwork={noop} t={() => ""} links={menuConfig} + runFiat={noop} > body @@ -949,9 +950,11 @@ it("renders correctly", () => {
-
+
{ > + + ); +}; + +export default RunFiatButton; diff --git a/src/components/RunFiatButton/index.stories.tsx b/src/components/RunFiatButton/index.stories.tsx new file mode 100644 index 00000000..d63d8b36 --- /dev/null +++ b/src/components/RunFiatButton/index.stories.tsx @@ -0,0 +1,22 @@ +import React from "react"; +import StorybookLayout from "../StorybookLayout/StorybookLayout"; +import { Flex } from "../Flex"; +import RunFiatButton from "./RunFiatButton"; + +export default { + title: "Components/RunFiatButton", + component: RunFiatButton, + argTypes: {}, +}; + +export const Variants = (args: any) => { + const clickedFiat = () => console.info("Fiat Clicked!!!"); + return ( + + + + + + + ); +}; diff --git a/src/components/RunFiatButton/index.tsx b/src/components/RunFiatButton/index.tsx new file mode 100644 index 00000000..0be1be22 --- /dev/null +++ b/src/components/RunFiatButton/index.tsx @@ -0,0 +1,2 @@ +export { default as RunFiatButton } from "./RunFiatButton"; +export type { RFBProps } from "./types"; diff --git a/src/components/RunFiatButton/types.ts b/src/components/RunFiatButton/types.ts new file mode 100644 index 00000000..ad5ba805 --- /dev/null +++ b/src/components/RunFiatButton/types.ts @@ -0,0 +1,5 @@ +export interface RFBProps { + mini?: boolean; + runFiat: () => void; + t: (text: string) => string; +} diff --git a/src/components/Svg/_Icons/CardIcon.tsx b/src/components/Svg/_Icons/CardIcon.tsx new file mode 100644 index 00000000..940e1b78 --- /dev/null +++ b/src/components/Svg/_Icons/CardIcon.tsx @@ -0,0 +1,14 @@ +import * as React from "react"; +import LegacySvg from "../LegacySvg"; +import { LegacySvgProps } from "../types"; + +const Icon: React.FC = ({ fill, ...props }) => ( + + + +); + +export default Icon; diff --git a/src/components/Svg/index.ts b/src/components/Svg/index.ts index cd2a7353..d610d84d 100644 --- a/src/components/Svg/index.ts +++ b/src/components/Svg/index.ts @@ -87,3 +87,4 @@ export { default as PoolsM1Icon } from "./_Icons/PoolsM1"; export { default as PoolsM2Icon } from "./_Icons/PoolsM2"; export { default as PoolsM3Icon } from "./_Icons/PoolsM3"; export { default as PoolsM4Icon } from "./_Icons/PoolsM4"; +export { default as CardIcon } from "./_Icons/CardIcon"; diff --git a/src/components/Svg/types.ts b/src/components/Svg/types.ts index 7e792d00..a27f4d11 100644 --- a/src/components/Svg/types.ts +++ b/src/components/Svg/types.ts @@ -69,5 +69,6 @@ export interface SvgProps { direction?: directionTypes; color?: colorProps; width?: string | number; + height?: string | number; spin?: boolean; } diff --git a/src/components/Tabs/Tabs.tsx b/src/components/Tabs/Tabs.tsx index 4a281925..f6f100e2 100644 --- a/src/components/Tabs/Tabs.tsx +++ b/src/components/Tabs/Tabs.tsx @@ -42,6 +42,7 @@ const Tabs: React.FC = ({ activeTab = 0, children, variant = variants sx={{ ...styles.tabUnderlay, width: variant === variants.FULLWIDTH ? "100%" : undefined, + justifyContent: variant === variants.FULLWIDTH ? "space-between" : "center", }} > {React.Children.map(children, (child) => { diff --git a/src/index.ts b/src/index.ts index ceb70b77..6a897f5c 100644 --- a/src/index.ts +++ b/src/index.ts @@ -28,6 +28,7 @@ export * from "./components/GlowCircle"; export * from "./components/ThemeSwitcher"; export * from "./components/Tabs"; export * from "./components/ScrollToTop"; +export * from "./components/RunFiatButton"; // Hooks export * from "./hooks"; diff --git a/src/widgets/Navbar/Navbar.tsx b/src/widgets/Navbar/Navbar.tsx index 0860b86e..ed179f86 100644 --- a/src/widgets/Navbar/Navbar.tsx +++ b/src/widgets/Navbar/Navbar.tsx @@ -18,6 +18,7 @@ import { HamburgerCloseIcon, HamburgerIcon } from "./icons"; import MenuButton from "./MenuButton"; import MobileNavMenu from "./MobileNavMenu"; import { GlowCircle } from "../../components/GlowCircle"; +import { RunFiatButton } from "../../components/RunFiatButton"; import styles from "./styles"; @@ -106,6 +107,7 @@ const Navbar: React.FC = ({ chainId, track, liveResult, + runFiat, }) => { const { isXxl } = useMatchBreakpoints(); const isMobile = isXxl === false; @@ -211,6 +213,8 @@ const Navbar: React.FC = ({ chainId={chainId} track={track} subMenu={found?.settings} + runFiat={runFiat} + t={t} />
)} @@ -228,6 +232,7 @@ const Navbar: React.FC = ({ > {!isMobile && ( + {/* */} )} @@ -280,6 +285,7 @@ const Navbar: React.FC = ({ setLang={setLang} currentLang={currentLang} t={t} + runFiat={runFiat} /> ); diff --git a/src/widgets/Navbar/SubNavbar.tsx b/src/widgets/Navbar/SubNavbar.tsx index 4dbe74d9..a28b5bc7 100644 --- a/src/widgets/Navbar/SubNavbar.tsx +++ b/src/widgets/Navbar/SubNavbar.tsx @@ -10,6 +10,7 @@ import { MenuSubEntry } from "./types"; import darkTheme from "../../theme/dark"; import lightTheme from "../../theme/light"; import trackSocialClick, { TrackHandler } from "../../util/trackSocialClick"; +import { RunFiatButton } from "../../components/RunFiatButton"; import { Tag } from "../../components/Tag"; import styles from "./styles"; @@ -27,6 +28,8 @@ interface SubNavbarProps { tag: string; navItem: string; }[]; + runFiat: () => void; + t: (text: string) => string; } const StyledLink = styled.a` :hover { @@ -49,7 +52,17 @@ const StyledTag = styled(Tag)` height: auto; `; -const SubNavbar: React.FC = ({ items, image, label, isDark, chainId, track, subMenu }) => { +const SubNavbar: React.FC = ({ + items, + image, + label, + isDark, + chainId, + track, + subMenu, + runFiat, + t, +}) => { const iconFillColor = isDark ? darkTheme.colors.text : lightTheme.colors.text; const Image = Icons[image || ""]; const imageElement = ; @@ -97,32 +110,39 @@ const SubNavbar: React.FC = ({ items, image, label, isDark, chai sx={{ justifyContent: "space-between", position: "absolute", - bottom: "5px", + bottom: "10px", right: "20px", - width: "150px", + width: "35%", + marginLeft: "30px", + alignItems: "flex-end", }} > - - trackSocialClick(track, "twitter", label, "https://twitter.com/ape_swap", chainId)} - /> - - - trackSocialClick(track, "telegram", label, "https://t.me/ape_swap", chainId)} - /> - - - trackSocialClick(track, "discord", label, "https://discord.com/invite/ApeSwap", chainId)} - /> - + {/* + + */} + + + trackSocialClick(track, "twitter", label, "https://twitter.com/ape_swap", chainId)} + /> + + + trackSocialClick(track, "telegram", label, "https://t.me/ape_swap", chainId)} + /> + + + trackSocialClick(track, "discord", label, "https://discord.com/invite/ApeSwap", chainId)} + /> + + )} diff --git a/src/widgets/Navbar/index.stories.tsx b/src/widgets/Navbar/index.stories.tsx index 6807279e..b5506aa7 100644 --- a/src/widgets/Navbar/index.stories.tsx +++ b/src/widgets/Navbar/index.stories.tsx @@ -67,6 +67,7 @@ export const Connected: React.FC = (args: any) => { switchNetwork={noop} track={track} liveResult={navbarApiResult} + runFiat={noop} >
@@ -120,6 +121,7 @@ export const NotConnected: React.FC = () => { chainId={56} switchNetwork={noop} liveResult={navbarApiResult} + runFiat={noop} t={translate} >
@@ -213,6 +215,7 @@ export const WithNoProfile: React.FC = () => { noProfileLink: "/no-profile", }} liveResult={navbarApiResult} + runFiat={noop} t={translate} >
@@ -273,6 +276,7 @@ export const WithProfile: React.FC = () => { noProfileLink: "/no-profile", }} liveResult={navbarApiResult} + runFiat={noop} t={translate} >
diff --git a/src/widgets/Navbar/types.ts b/src/widgets/Navbar/types.ts index e0cb9ea9..39e1b997 100644 --- a/src/widgets/Navbar/types.ts +++ b/src/widgets/Navbar/types.ts @@ -75,4 +75,5 @@ export interface NavProps extends PanelProps { track?: TrackHandler | undefined; liveResult?: LiveResultProps["apiResult"] | undefined; t: (text: string) => string; + runFiat: () => void; } diff --git a/src/widgets/WalletModal/WalletCard.tsx b/src/widgets/WalletModal/WalletCard.tsx index b00baf40..3c55335a 100644 --- a/src/widgets/WalletModal/WalletCard.tsx +++ b/src/widgets/WalletModal/WalletCard.tsx @@ -38,7 +38,7 @@ const WalletCard: React.FC = ({ login, walletConfig, mb, t }) => { "&:hover": {}, }} mb={mb} - id={`wallet-connect-${title.toLocaleLowerCase()}`} + id={`wallet-connect-${t(title)?.toLocaleLowerCase()}`} > {t(title)} diff --git a/src/widgets/WalletModal/config.tsx b/src/widgets/WalletModal/config.tsx index 91575d67..4f833572 100644 --- a/src/widgets/WalletModal/config.tsx +++ b/src/widgets/WalletModal/config.tsx @@ -7,6 +7,7 @@ import BinanceChain from "./icons/BinanceChain"; import OntoWallet from "./icons/OntoWallet"; import Nabox from "./icons/Nabox"; import SafePalWallet from "./icons/SafePalWallet"; +import TorusWallet from "./icons/SocialLogin"; import Coinbase from "./icons/Coinbase"; import { Config, ConnectorNames } from "./types"; @@ -21,6 +22,11 @@ const connectors: Config[] = [ icon: TrustWallet, connectorId: ConnectorNames.Injected, }, + { + title: "Social Login", + icon: TorusWallet, + connectorId: ConnectorNames.Torus, + }, { title: "WalletConnect", icon: WalletConnect, diff --git a/src/widgets/WalletModal/icons/SocialLogin.tsx b/src/widgets/WalletModal/icons/SocialLogin.tsx new file mode 100644 index 00000000..dec6cddd --- /dev/null +++ b/src/widgets/WalletModal/icons/SocialLogin.tsx @@ -0,0 +1,45 @@ +import React from "react"; +import LegacySvg from "../../../components/Svg/LegacySvg"; +import { LegacySvgProps } from "../../../components/Svg/types"; +import TorusWallet from "./TorusWallet"; + +const Icon: React.FC = ({ fill, ...props}) => { + return ( + <> + + + + + + + + + + + + + + + + + + + + ); +}; + +export default Icon; diff --git a/src/widgets/WalletModal/icons/TorusWallet.tsx b/src/widgets/WalletModal/icons/TorusWallet.tsx new file mode 100644 index 00000000..4d085d24 --- /dev/null +++ b/src/widgets/WalletModal/icons/TorusWallet.tsx @@ -0,0 +1,20 @@ +import React from "react"; +import LegacySvg from "../../../components/Svg/LegacySvg"; +import { LegacySvgProps } from "../../../components/Svg/types"; + +const Icon: React.FC = (props) => { + return ( + + + + + + ); +}; + +export default Icon; diff --git a/src/widgets/WalletModal/types.ts b/src/widgets/WalletModal/types.ts index d057090a..43e82d76 100644 --- a/src/widgets/WalletModal/types.ts +++ b/src/widgets/WalletModal/types.ts @@ -6,6 +6,7 @@ export enum ConnectorNames { WalletConnect = "walletconnect", BSC = "bsc", Walletlink = "Walletlink", + Torus = "Torus", } export type Login = (connectorId: ConnectorNames) => void; From 488ae74c226ac2a9ce4602429e5e517abe2cdf61 Mon Sep 17 00:00:00 2001 From: Baba Drape Date: Sat, 14 May 2022 10:52:41 +0100 Subject: [PATCH 2/9] modify buttons --- src/components/RunFiatButton/RunFiatButton.tsx | 2 +- src/widgets/Navbar/SubNavbar.tsx | 12 +----------- src/widgets/WalletModal/icons/SocialLogin.tsx | 2 +- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/components/RunFiatButton/RunFiatButton.tsx b/src/components/RunFiatButton/RunFiatButton.tsx index c1eabf9c..153b78b7 100644 --- a/src/components/RunFiatButton/RunFiatButton.tsx +++ b/src/components/RunFiatButton/RunFiatButton.tsx @@ -19,7 +19,7 @@ const RunFiatButton: React.FC = ({ runFiat, mini, t, ...props }) => { fontSize: "16px", "&&": { borderRadius: (mini && "50%") || "10px", - + "&:hover": { background: mini && "white4", filter: (!mini && "brightness(115%)") || "unset", diff --git a/src/widgets/Navbar/SubNavbar.tsx b/src/widgets/Navbar/SubNavbar.tsx index a28b5bc7..02199def 100644 --- a/src/widgets/Navbar/SubNavbar.tsx +++ b/src/widgets/Navbar/SubNavbar.tsx @@ -52,17 +52,7 @@ const StyledTag = styled(Tag)` height: auto; `; -const SubNavbar: React.FC = ({ - items, - image, - label, - isDark, - chainId, - track, - subMenu, - runFiat, - t, -}) => { +const SubNavbar: React.FC = ({ items, image, label, isDark, chainId, track, subMenu, runFiat, t }) => { const iconFillColor = isDark ? darkTheme.colors.text : lightTheme.colors.text; const Image = Icons[image || ""]; const imageElement = ; diff --git a/src/widgets/WalletModal/icons/SocialLogin.tsx b/src/widgets/WalletModal/icons/SocialLogin.tsx index dec6cddd..081733a6 100644 --- a/src/widgets/WalletModal/icons/SocialLogin.tsx +++ b/src/widgets/WalletModal/icons/SocialLogin.tsx @@ -3,7 +3,7 @@ import LegacySvg from "../../../components/Svg/LegacySvg"; import { LegacySvgProps } from "../../../components/Svg/types"; import TorusWallet from "./TorusWallet"; -const Icon: React.FC = ({ fill, ...props}) => { +const Icon: React.FC = ({ fill, ...props }) => { return ( <> From 1221d3951b34777a03700b3e852ff7a482ed4a62 Mon Sep 17 00:00:00 2001 From: Baba Drape Date: Sat, 14 May 2022 11:11:46 +0100 Subject: [PATCH 3/9] v1.0.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 71f4a082..9ad4c8e4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ape.swap/uikit", - "version": "1.0.6", + "version": "1.0.7", "description": "Set of UI components for apeswap projects", "main": "dist/index.cjs.js", "resolutions": { From bac60cda42b31aaceb0c19962721340a5b5f0097 Mon Sep 17 00:00:00 2001 From: Baba Drape Date: Mon, 16 May 2022 19:07:55 +0100 Subject: [PATCH 4/9] change chain name to BNB --- src/__tests__/widgets/menu.test.tsx | 4 ++-- src/components/Tag/types.ts | 6 +++--- src/widgets/NetworkModal/config.tsx | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/__tests__/widgets/menu.test.tsx b/src/__tests__/widgets/menu.test.tsx index 4af015de..c4611fa6 100644 --- a/src/__tests__/widgets/menu.test.tsx +++ b/src/__tests__/widgets/menu.test.tsx @@ -494,7 +494,7 @@ it("renders correctly", () => { - BSC + BNB { - BSC + BNB Date: Mon, 16 May 2022 19:28:35 +0100 Subject: [PATCH 5/9] v1.0.8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9ad4c8e4..01770aee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ape.swap/uikit", - "version": "1.0.7", + "version": "1.0.8", "description": "Set of UI components for apeswap projects", "main": "dist/index.cjs.js", "resolutions": { From 8dec6376c68f32aa474c84e1b838752464c7079d Mon Sep 17 00:00:00 2001 From: Baba Drape Date: Tue, 17 May 2022 09:04:34 +0100 Subject: [PATCH 6/9] resolve external link issue --- src/__tests__/widgets/menu.test.tsx | 102 ++++++++++----------- src/__tests__/widgets/walletmodal.test.tsx | 9 +- src/components/Link/Link.tsx | 2 +- src/components/Link/index.stories.tsx | 16 ++-- src/widgets/WalletModal/AccountModal.tsx | 7 +- src/widgets/WalletModal/ConnectModal.tsx | 22 +++-- 6 files changed, 82 insertions(+), 76 deletions(-) diff --git a/src/__tests__/widgets/menu.test.tsx b/src/__tests__/widgets/menu.test.tsx index c4611fa6..56e37a5e 100644 --- a/src/__tests__/widgets/menu.test.tsx +++ b/src/__tests__/widgets/menu.test.tsx @@ -49,10 +49,10 @@ it("renders correctly", () => { expect(asFragment()).toMatchInlineSnapshot(`
{ target="_parent" >
Exchange
Stake
@@ -246,21 +246,21 @@ it("renders correctly", () => {
Raise
@@ -278,21 +278,21 @@ it("renders correctly", () => {
Collect
@@ -310,11 +310,11 @@ it("renders correctly", () => {
{ target="_blank" >
Lend
More
@@ -357,7 +357,7 @@ it("renders correctly", () => {
{ style="display: flex; align-items: center; justify-content: space-evenly; width: 200px;" > { { {
body
{ class="css-1rzh7ej" />
{ { { { { {
@@ -1074,7 +1074,7 @@ it("renders correctly", () => { class="css-gzcqlw" >
{
{
{
{ class="css-1gksbu2" > { class="css-1ne87w5" > { />
Copied
diff --git a/src/components/Link/Link.tsx b/src/components/Link/Link.tsx index a912d55e..b3327399 100644 --- a/src/components/Link/Link.tsx +++ b/src/components/Link/Link.tsx @@ -18,7 +18,7 @@ const StyledLink = styled(Text)` const Link: React.FC = ({ external, children, ...props }) => { const internalProps = external ? getExternalLinkProps() : {}; if (external) { - return {children}; + return {children}; } return ( diff --git a/src/components/Link/index.stories.tsx b/src/components/Link/index.stories.tsx index 9db5cf97..6d21c68e 100644 --- a/src/components/Link/index.stories.tsx +++ b/src/components/Link/index.stories.tsx @@ -24,19 +24,14 @@ export default { }, }; -export const Default = (args) => { +export const Default = (args: any) => { return (
Default
- - Titan One - -
-
- + Custom color
@@ -55,9 +50,12 @@ export const Default = (args) => { ); }; -export const External = (args) => ( +export const External = (args: any) => ( - + Link External diff --git a/src/widgets/WalletModal/AccountModal.tsx b/src/widgets/WalletModal/AccountModal.tsx index f8404f74..80f781dc 100644 --- a/src/widgets/WalletModal/AccountModal.tsx +++ b/src/widgets/WalletModal/AccountModal.tsx @@ -1,7 +1,7 @@ import React, { useContext } from "react"; import Button from "../../components/Button/Button"; import Text from "../../components/Text/Text"; -import LinkExternal from "../../components/Link/LinkExternal"; +import { Link } from "../../components/Link"; import Flex from "../../components/Flex/Flex"; import { Modal } from "../Modal"; import CopyToClipboard from "./CopyToClipboard"; @@ -27,13 +27,14 @@ const AccountModal: React.FC = ({ account, logout, t }) => { {account} - {t("View on BscScan")} - + {t("Copy Address")} diff --git a/src/widgets/WalletModal/ConnectModal.tsx b/src/widgets/WalletModal/ConnectModal.tsx index 1cf7a11c..f21d923b 100644 --- a/src/widgets/WalletModal/ConnectModal.tsx +++ b/src/widgets/WalletModal/ConnectModal.tsx @@ -1,5 +1,4 @@ import React from "react"; -import styled from "styled-components"; import { Link } from "../../components/Link"; import { HelpIcon } from "../../components/Svg"; import { Modal } from "../Modal"; @@ -13,12 +12,6 @@ interface Props { t: (key: string) => string; } -const HelpLink = styled(Link)` - display: flex; - align-self: center; - align-items: center; - margin-top: 24px; -`; const ConnectModal: React.FC = ({ login, t }) => ( @@ -32,10 +25,21 @@ const ConnectModal: React.FC = ({ login, t }) => ( /> ))} - + {t("Learn how to connect")} - + ); From 5acf4ecb10c5e810b35afee66041dbc15ccb5f32 Mon Sep 17 00:00:00 2001 From: Baba Drape Date: Tue, 17 May 2022 09:05:02 +0100 Subject: [PATCH 7/9] resolve external link issues --- src/components/Link/Link.tsx | 6 +++++- src/components/Link/index.stories.tsx | 5 +---- src/widgets/WalletModal/ConnectModal.tsx | 1 - 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/Link/Link.tsx b/src/components/Link/Link.tsx index b3327399..9e0741ee 100644 --- a/src/components/Link/Link.tsx +++ b/src/components/Link/Link.tsx @@ -18,7 +18,11 @@ const StyledLink = styled(Text)` const Link: React.FC = ({ external, children, ...props }) => { const internalProps = external ? getExternalLinkProps() : {}; if (external) { - return {children}; + return ( + + {children} + + ); } return ( diff --git a/src/components/Link/index.stories.tsx b/src/components/Link/index.stories.tsx index 6d21c68e..ced406f9 100644 --- a/src/components/Link/index.stories.tsx +++ b/src/components/Link/index.stories.tsx @@ -52,10 +52,7 @@ export const Default = (args: any) => { export const External = (args: any) => ( - + Link External diff --git a/src/widgets/WalletModal/ConnectModal.tsx b/src/widgets/WalletModal/ConnectModal.tsx index f21d923b..d0cc740b 100644 --- a/src/widgets/WalletModal/ConnectModal.tsx +++ b/src/widgets/WalletModal/ConnectModal.tsx @@ -12,7 +12,6 @@ interface Props { t: (key: string) => string; } - const ConnectModal: React.FC = ({ login, t }) => ( {config.map((entry, index) => ( From 9e08e135a61d2025f59ee1f058291ba22445a122 Mon Sep 17 00:00:00 2001 From: Baba Drape Date: Tue, 17 May 2022 09:13:59 +0100 Subject: [PATCH 8/9] v1.0.9-alpha.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 01770aee..3fa40a32 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ape.swap/uikit", - "version": "1.0.8", + "version": "1.0.9-alpha.0", "description": "Set of UI components for apeswap projects", "main": "dist/index.cjs.js", "resolutions": { From fdab29aa91e886ccc0d7e3ad59c72bf0afdf4822 Mon Sep 17 00:00:00 2001 From: Baba Drape Date: Tue, 17 May 2022 19:51:42 +0100 Subject: [PATCH 9/9] v1.0.9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3fa40a32..e325d728 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ape.swap/uikit", - "version": "1.0.9-alpha.0", + "version": "1.0.9", "description": "Set of UI components for apeswap projects", "main": "dist/index.cjs.js", "resolutions": {