From ee8f021c9f88199bfbb6b9e611cf1900ab845c3f Mon Sep 17 00:00:00 2001 From: Jennie Alles Date: Tue, 2 May 2023 17:00:30 +0700 Subject: [PATCH 01/12] fix(components): refine button and spinner --- src/lib/app-fns/tx/common/sending.tsx | 2 +- src/lib/components/ContractSelectSection.tsx | 4 +-- src/lib/components/EstimatedFeeRender.tsx | 2 +- src/lib/components/Loading.tsx | 2 +- src/lib/components/LoadingOverlay.tsx | 2 +- .../components/ViewPermissionAddresses.tsx | 1 - src/lib/components/Wallet.tsx | 1 - src/lib/components/button/BackButton.tsx | 2 +- src/lib/components/button/ConnectWallet.tsx | 6 ++-- src/lib/components/button/FaucetButton.tsx | 8 ++---- .../components/button/NewProposalButton.tsx | 2 +- src/lib/components/copy/CopyButton.tsx | 10 +------ src/lib/components/forms/AssetInput.tsx | 5 +--- src/lib/components/icon/CustomIcon.tsx | 2 +- src/lib/components/modal/CodeSnippet.tsx | 5 +--- .../select-contract/SelectContractAdmin.tsx | 4 +-- .../SelectContractInstantiator.tsx | 4 +-- src/lib/components/state/ZeroState.tsx | 2 +- src/lib/components/tx/modal/ButtonSection.tsx | 16 ++++------- .../upload/components/UploadCard.tsx | 2 +- src/lib/components/wallet/WalletConnect.tsx | 6 +--- .../components/delegations/RadioCard.tsx | 2 +- .../components/delegations/TotalCard.tsx | 2 +- src/lib/pages/account-details/index.tsx | 4 +-- .../pages/codes/components/SaveCodeButton.tsx | 2 +- .../components/CommandSection.tsx | 2 +- .../components/ContractTop.tsx | 4 +-- .../contract-description/UserContractDesc.tsx | 2 +- src/lib/pages/contract-list/index.tsx | 4 +-- src/lib/pages/contract-list/slug.tsx | 8 +----- .../pages/execute/components/ExecuteArea.tsx | 11 +------- src/lib/pages/execute/index.tsx | 2 +- .../pages/instantiate/component/Footer.tsx | 2 +- src/lib/pages/network-overview/index.tsx | 4 +-- src/lib/pages/proposal/components/Footer.tsx | 2 +- src/lib/pages/proposal/whitelist/index.tsx | 7 ++--- .../components/BookmarkButton.tsx | 6 +--- src/lib/pages/query/components/QueryArea.tsx | 7 +---- src/lib/pages/query/index.tsx | 2 +- src/lib/styles/theme/components/button.ts | 28 +++++++++++++++---- src/lib/styles/theme/components/index.ts | 2 ++ src/lib/styles/theme/components/spinner.ts | 16 +++++++++++ 42 files changed, 89 insertions(+), 118 deletions(-) create mode 100644 src/lib/styles/theme/components/spinner.ts diff --git a/src/lib/app-fns/tx/common/sending.tsx b/src/lib/app-fns/tx/common/sending.tsx index c42cf02f0..be2052d89 100644 --- a/src/lib/app-fns/tx/common/sending.tsx +++ b/src/lib/app-fns/tx/common/sending.tsx @@ -19,7 +19,7 @@ export const sendingTx = (fee: StdFee) => { ], receiptInfo: { header: "Sending Transaction", - headerIcon: , + headerIcon: , }, actionVariant: "sending", } as TxResultRendering; diff --git a/src/lib/components/ContractSelectSection.tsx b/src/lib/components/ContractSelectSection.tsx index 3def8dcec..069d01b8e 100644 --- a/src/lib/components/ContractSelectSection.tsx +++ b/src/lib/components/ContractSelectSection.tsx @@ -120,9 +120,7 @@ const ContractDetailsButton = ({ variant="outline-gray" float="right" size="sm" - leftIcon={ - - } + leftIcon={} > Add To List diff --git a/src/lib/components/EstimatedFeeRender.tsx b/src/lib/components/EstimatedFeeRender.tsx index 715b445d4..69451afeb 100644 --- a/src/lib/components/EstimatedFeeRender.tsx +++ b/src/lib/components/EstimatedFeeRender.tsx @@ -13,7 +13,7 @@ export const EstimatedFeeRender = ({ if (loading) { return ( <> - Estimating ... + Estimating ... ); } diff --git a/src/lib/components/Loading.tsx b/src/lib/components/Loading.tsx index d7248cac8..961308b1e 100644 --- a/src/lib/components/Loading.tsx +++ b/src/lib/components/Loading.tsx @@ -10,7 +10,7 @@ export const Loading = () => ( flexDirection="column" alignItems="center" > - + Loading ... ); diff --git a/src/lib/components/LoadingOverlay.tsx b/src/lib/components/LoadingOverlay.tsx index 4e9c27bcd..7545efc2e 100644 --- a/src/lib/components/LoadingOverlay.tsx +++ b/src/lib/components/LoadingOverlay.tsx @@ -14,7 +14,7 @@ export const LoadingOverlay = () => ( left={0} zIndex="overlay" > - + Loading ... ); diff --git a/src/lib/components/ViewPermissionAddresses.tsx b/src/lib/components/ViewPermissionAddresses.tsx index 956e2dd5a..1f9eed56b 100644 --- a/src/lib/components/ViewPermissionAddresses.tsx +++ b/src/lib/components/ViewPermissionAddresses.tsx @@ -50,7 +50,6 @@ export const ViewPermissionAddresses = ({ rightIcon={ } diff --git a/src/lib/components/Wallet.tsx b/src/lib/components/Wallet.tsx index 8f7ca87c4..052ce5330 100644 --- a/src/lib/components/Wallet.tsx +++ b/src/lib/components/Wallet.tsx @@ -47,7 +47,6 @@ export const WalletSection = () => { icon="wallet" onClick={onClickOpenView} variant="outline-info" - iconColor="honeydew.main" /> } rejected={} diff --git a/src/lib/components/button/BackButton.tsx b/src/lib/components/button/BackButton.tsx index c1a36e9bf..2128c0c9a 100644 --- a/src/lib/components/button/BackButton.tsx +++ b/src/lib/components/button/BackButton.tsx @@ -21,7 +21,7 @@ export const BackButton = (props: ButtonProps) => { }} {...props} > - + BACK ); diff --git a/src/lib/components/button/ConnectWallet.tsx b/src/lib/components/button/ConnectWallet.tsx index a1db3a127..726484ecf 100644 --- a/src/lib/components/button/ConnectWallet.tsx +++ b/src/lib/components/button/ConnectWallet.tsx @@ -1,4 +1,4 @@ -import { Button, Text } from "@chakra-ui/react"; +import { Button } from "@chakra-ui/react"; import { useWallet } from "@cosmos-kit/react"; import type { MouseEventHandler } from "react"; @@ -16,8 +16,8 @@ export const ConnectWalletBtn = () => { return ( ); }; diff --git a/src/lib/components/button/FaucetButton.tsx b/src/lib/components/button/FaucetButton.tsx index b5c4ec7ab..40677c32a 100644 --- a/src/lib/components/button/FaucetButton.tsx +++ b/src/lib/components/button/FaucetButton.tsx @@ -1,4 +1,4 @@ -import { Button, Text } from "@chakra-ui/react"; +import { Button } from "@chakra-ui/react"; import type { MouseEventHandler } from "react"; import { CustomIcon } from "../icon"; @@ -18,12 +18,10 @@ export const FaucetBtn = () => { return isTestnet ? ( ) : null; }; diff --git a/src/lib/components/button/NewProposalButton.tsx b/src/lib/components/button/NewProposalButton.tsx index ff1a8b376..f3c757c40 100644 --- a/src/lib/components/button/NewProposalButton.tsx +++ b/src/lib/components/button/NewProposalButton.tsx @@ -27,7 +27,7 @@ export const NewProposalButton = () => { variant="primary" color="text.main" as={Button} - rightIcon={} + rightIcon={} > Create New Proposal diff --git a/src/lib/components/copy/CopyButton.tsx b/src/lib/components/copy/CopyButton.tsx index 44d198fd1..c22940fbe 100644 --- a/src/lib/components/copy/CopyButton.tsx +++ b/src/lib/components/copy/CopyButton.tsx @@ -38,15 +38,7 @@ export const CopyButton = ({ onClick={() => AmpTrack(AmpEvent.USE_COPY_BUTTON, { section: amptrackSection }) } - leftIcon={ - hasIcon ? ( - - ) : undefined - } + leftIcon={hasIcon ? : undefined} {...buttonProps} > {buttonText} diff --git a/src/lib/components/forms/AssetInput.tsx b/src/lib/components/forms/AssetInput.tsx index 073831114..6c003556e 100644 --- a/src/lib/components/forms/AssetInput.tsx +++ b/src/lib/components/forms/AssetInput.tsx @@ -44,10 +44,7 @@ export const AssetInput = ({ disabled={disableDelete} onClick={onDelete} > - + ); diff --git a/src/lib/components/icon/CustomIcon.tsx b/src/lib/components/icon/CustomIcon.tsx index d88740308..ec3cdbefd 100644 --- a/src/lib/components/icon/CustomIcon.tsx +++ b/src/lib/components/icon/CustomIcon.tsx @@ -1266,7 +1266,7 @@ interface CustomIconProps extends IconProps { } export const CustomIcon = ({ - color = "pebble.600", + color, boxSize = "16px", name, ...iconProps diff --git a/src/lib/components/modal/CodeSnippet.tsx b/src/lib/components/modal/CodeSnippet.tsx index bd890bf68..bf2d7f2d9 100644 --- a/src/lib/components/modal/CodeSnippet.tsx +++ b/src/lib/components/modal/CodeSnippet.tsx @@ -200,10 +200,7 @@ execute(); onOpen(); }} > - + Code Snippet diff --git a/src/lib/components/select-contract/SelectContractAdmin.tsx b/src/lib/components/select-contract/SelectContractAdmin.tsx index d4bbc9136..9cbcc5dcc 100644 --- a/src/lib/components/select-contract/SelectContractAdmin.tsx +++ b/src/lib/components/select-contract/SelectContractAdmin.tsx @@ -67,9 +67,7 @@ export const SelectContractAdmin = ({ onOpen(); }} leftIcon={ - !notSelected ? ( - - ) : undefined + !notSelected ? : undefined } disabled={!address} > diff --git a/src/lib/components/select-contract/SelectContractInstantiator.tsx b/src/lib/components/select-contract/SelectContractInstantiator.tsx index 0186ff05b..4c98f6f14 100644 --- a/src/lib/components/select-contract/SelectContractInstantiator.tsx +++ b/src/lib/components/select-contract/SelectContractInstantiator.tsx @@ -110,9 +110,7 @@ export const SelectContractInstantiator = ({ onOpen(); }} leftIcon={ - !notSelected ? ( - - ) : undefined + !notSelected ? : undefined } > {notSelected ? "Select Contract" : "Change Contract"} diff --git a/src/lib/components/state/ZeroState.tsx b/src/lib/components/state/ZeroState.tsx index 903328963..d585fb347 100644 --- a/src/lib/components/state/ZeroState.tsx +++ b/src/lib/components/state/ZeroState.tsx @@ -36,7 +36,7 @@ const ActionSection = ({ list, handleAction }: ActionSectionProps) => list={list} buttonProps={{ variant: "outline-primary", - leftIcon: , + leftIcon: , children: "Save Contract", ml: 2, }} diff --git a/src/lib/components/tx/modal/ButtonSection.tsx b/src/lib/components/tx/modal/ButtonSection.tsx index 3f7f53305..1fbffd02b 100644 --- a/src/lib/components/tx/modal/ButtonSection.tsx +++ b/src/lib/components/tx/modal/ButtonSection.tsx @@ -68,7 +68,7 @@ export const ButtonSection = ({ }} > Proceed to instantiate - + ); @@ -78,7 +78,6 @@ export const ButtonSection = ({ variant="primary" onClick={() => { const codeId = receipts.find((r) => r.title === "Code ID")?.value; - navigate({ pathname: "/migrate", query: { contract: router.query.contract, "code-id": codeId }, @@ -87,7 +86,7 @@ export const ButtonSection = ({ }} > Proceed to Migrate - + ); case "migrate": @@ -104,7 +103,7 @@ export const ButtonSection = ({ } > View Contract Details - + ); @@ -124,7 +123,7 @@ export const ButtonSection = ({ onClick={openProposalExplorer} > View Proposal - + ); diff --git a/src/lib/components/upload/components/UploadCard.tsx b/src/lib/components/upload/components/UploadCard.tsx index 95b678d51..d93a6db35 100644 --- a/src/lib/components/upload/components/UploadCard.tsx +++ b/src/lib/components/upload/components/UploadCard.tsx @@ -36,7 +36,7 @@ const getStatusDecorator = ( }; default: return { - icon: , + icon: , statusText: "Loading", }; } diff --git a/src/lib/components/wallet/WalletConnect.tsx b/src/lib/components/wallet/WalletConnect.tsx index fcd575764..4833b8bcb 100644 --- a/src/lib/components/wallet/WalletConnect.tsx +++ b/src/lib/components/wallet/WalletConnect.tsx @@ -11,7 +11,6 @@ export const ConnectWalletButton = ({ isLoading, isDisabled, onClickConnectBtn, - iconColor = "text.main", variant, }: ConnectWalletType) => ( ); @@ -32,19 +31,16 @@ export const Connected = ({ onClick, icon, variant, - iconColor, }: { buttonText: string; onClick: MouseEventHandler; icon?: IconKeys; variant?: string; - iconColor?: string; }) => ( ); diff --git a/src/lib/pages/account-details/components/delegations/RadioCard.tsx b/src/lib/pages/account-details/components/delegations/RadioCard.tsx index 24bd76de6..4c947f3ec 100644 --- a/src/lib/pages/account-details/components/delegations/RadioCard.tsx +++ b/src/lib/pages/account-details/components/delegations/RadioCard.tsx @@ -29,7 +29,7 @@ export const RadioCard = ({ {value} {isLoading ? ( - + ) : ( diff --git a/src/lib/pages/account-details/components/delegations/TotalCard.tsx b/src/lib/pages/account-details/components/delegations/TotalCard.tsx index ff0525292..aa1edf14d 100644 --- a/src/lib/pages/account-details/components/delegations/TotalCard.tsx +++ b/src/lib/pages/account-details/components/delegations/TotalCard.tsx @@ -24,7 +24,7 @@ export const TotalCard = ({ }: TotalCardProps) => ( {isLoading ? ( - + ) : ( <> diff --git a/src/lib/pages/account-details/index.tsx b/src/lib/pages/account-details/index.tsx index 49c217c49..f1ffcdd66 100644 --- a/src/lib/pages/account-details/index.tsx +++ b/src/lib/pages/account-details/index.tsx @@ -1,7 +1,6 @@ import { Flex, Heading, - Spinner, TabList, TabPanel, TabPanels, @@ -15,6 +14,7 @@ import { useValidateAddress } from "lib/app-provider"; import { BackButton } from "lib/components/button"; import { CopyLink } from "lib/components/CopyLink"; import { CustomTab } from "lib/components/CustomTab"; +import { Loading } from "lib/components/Loading"; import PageContainer from "lib/components/PageContainer"; import { InvalidState } from "lib/components/state"; import { useAccountDetailsTableCounts } from "lib/model/account"; @@ -158,7 +158,7 @@ const AccountDetailsBody = ({ accountAddress }: AccountDetailsBodyProps) => { Total Account Value {isLoading ? ( - + ) : ( ( , + leftIcon: , children: "Save New Code", }} /> diff --git a/src/lib/pages/contract-details/components/CommandSection.tsx b/src/lib/pages/contract-details/components/CommandSection.tsx index e24dcef23..2692fb389 100644 --- a/src/lib/pages/contract-details/components/CommandSection.tsx +++ b/src/lib/pages/contract-details/components/CommandSection.tsx @@ -26,7 +26,7 @@ export const CommandSection = () => { type: string ) => { if (isFetching) { - return ; + return ; } if (cmds.length) { return ( diff --git a/src/lib/pages/contract-details/components/ContractTop.tsx b/src/lib/pages/contract-details/components/ContractTop.tsx index c52d05e02..dbcfde148 100644 --- a/src/lib/pages/contract-details/components/ContractTop.tsx +++ b/src/lib/pages/contract-details/components/ContractTop.tsx @@ -154,14 +154,14 @@ export const ContractTop = ({ contractData }: ContractTopProps) => { /> diff --git a/src/lib/pages/contract-list/index.tsx b/src/lib/pages/contract-list/index.tsx index da5e7d6a1..563764bd9 100644 --- a/src/lib/pages/contract-list/index.tsx +++ b/src/lib/pages/contract-list/index.tsx @@ -36,9 +36,7 @@ const AllContractListsPage = observer(() => { - ), + leftIcon: , children: "Create new list", }} /> diff --git a/src/lib/pages/contract-list/slug.tsx b/src/lib/pages/contract-list/slug.tsx index a6ae43a94..a0378672a 100644 --- a/src/lib/pages/contract-list/slug.tsx +++ b/src/lib/pages/contract-list/slug.tsx @@ -134,13 +134,7 @@ const ContractsByList = observer(() => { }} buttonProps={{ variant: "outline-primary", - leftIcon: ( - - ), + leftIcon: , children: "Save Contract", }} /> diff --git a/src/lib/pages/execute/components/ExecuteArea.tsx b/src/lib/pages/execute/components/ExecuteArea.tsx index 4c2db3005..f94d7ed42 100644 --- a/src/lib/pages/execute/components/ExecuteArea.tsx +++ b/src/lib/pages/execute/components/ExecuteArea.tsx @@ -286,16 +286,7 @@ export const ExecuteArea = ({ p="6px 16px" onClick={proceed} isDisabled={!enableExecute || !fee || isFetching} - leftIcon={ - - } + leftIcon={} isLoading={processing} sx={{ pointerEvents: processing && "none" }} > diff --git a/src/lib/pages/execute/index.tsx b/src/lib/pages/execute/index.tsx index 91eee9227..312cae132 100644 --- a/src/lib/pages/execute/index.tsx +++ b/src/lib/pages/execute/index.tsx @@ -99,7 +99,7 @@ const Execute = () => { onClick={goToQuery} > Go To Query - + diff --git a/src/lib/pages/instantiate/component/Footer.tsx b/src/lib/pages/instantiate/component/Footer.tsx index 702b34bf3..d2b757ed7 100644 --- a/src/lib/pages/instantiate/component/Footer.tsx +++ b/src/lib/pages/instantiate/component/Footer.tsx @@ -35,7 +35,7 @@ export const Footer = ({ onInstantiate, disabled, loading }: FooterProps) => { disabled={disabled} w="128px" > - {loading ? : "Instantiate"} + {loading ? : "Instantiate"} diff --git a/src/lib/pages/network-overview/index.tsx b/src/lib/pages/network-overview/index.tsx index 762140f83..a8e1e8d28 100644 --- a/src/lib/pages/network-overview/index.tsx +++ b/src/lib/pages/network-overview/index.tsx @@ -71,7 +71,7 @@ const CardInfo = ({ {isLoading ? ( - + ) : ( {value} @@ -110,7 +110,7 @@ const NetworkOverview = () => { {isLoadingLatestBlockInfo ? ( - + Loading latest data for you ... diff --git a/src/lib/pages/proposal/components/Footer.tsx b/src/lib/pages/proposal/components/Footer.tsx index da64f3cb3..67689a4f6 100644 --- a/src/lib/pages/proposal/components/Footer.tsx +++ b/src/lib/pages/proposal/components/Footer.tsx @@ -37,7 +37,7 @@ export const Footer = ({ isDisabled={isLoading} > {isLoading ? ( - + ) : ( "Submit Proposal" )} diff --git a/src/lib/pages/proposal/whitelist/index.tsx b/src/lib/pages/proposal/whitelist/index.tsx index e2ea3c3e4..87018135c 100644 --- a/src/lib/pages/proposal/whitelist/index.tsx +++ b/src/lib/pages/proposal/whitelist/index.tsx @@ -326,10 +326,7 @@ const ProposalToWhitelist = () => { disabled={fields.length <= 1} onClick={() => remove(idx)} > - + ))} @@ -337,7 +334,7 @@ const ProposalToWhitelist = () => { variant="outline-primary" mt={3} onClick={() => append({ address: "" as Addr })} - leftIcon={} + leftIcon={} > Add More Address diff --git a/src/lib/pages/public-project/components/BookmarkButton.tsx b/src/lib/pages/public-project/components/BookmarkButton.tsx index aae1bc95f..18b820acc 100644 --- a/src/lib/pages/public-project/components/BookmarkButton.tsx +++ b/src/lib/pages/public-project/components/BookmarkButton.tsx @@ -35,7 +35,6 @@ interface StyledButtonProps { hasText: boolean; actionText: string; icon: IconKeys; - iconColor: string; action: (e: MouseEvent) => void; variant: string; } @@ -46,7 +45,6 @@ const StyledButton = ({ icon, action, variant, - iconColor, }: StyledButtonProps) => ( ); @@ -98,7 +96,6 @@ export const BookmarkButton = observer( variant="outline-primary" hasText={hasText} icon="bookmark-solid" - iconColor="violet.light" actionText="Bookmarked" action={(e) => { e.stopPropagation(); @@ -110,7 +107,6 @@ export const BookmarkButton = observer( variant="outline" hasText={hasText} icon="bookmark" - iconColor="pebble.600" actionText="Bookmark Project" action={(e) => { if (details) { diff --git a/src/lib/pages/query/components/QueryArea.tsx b/src/lib/pages/query/components/QueryArea.tsx index 95fdd4516..018b0ad06 100644 --- a/src/lib/pages/query/components/QueryArea.tsx +++ b/src/lib/pages/query/components/QueryArea.tsx @@ -155,12 +155,7 @@ export const QueryArea = ({ onClick={handleQuery} isDisabled={jsonValidate(msg) !== null} isLoading={isFetching || isRefetching} - leftIcon={ - - } + leftIcon={} > Query (Ctrl + Enter) diff --git a/src/lib/pages/query/index.tsx b/src/lib/pages/query/index.tsx index 14e5861c9..127d8c916 100644 --- a/src/lib/pages/query/index.tsx +++ b/src/lib/pages/query/index.tsx @@ -107,7 +107,7 @@ const Query = () => { onClick={goToExecute} > Go To Execute - + diff --git a/src/lib/styles/theme/components/button.ts b/src/lib/styles/theme/components/button.ts index 65731fc0f..fc8b6748c 100644 --- a/src/lib/styles/theme/components/button.ts +++ b/src/lib/styles/theme/components/button.ts @@ -6,9 +6,11 @@ const pebble600 = "pebble.600"; const pebble700 = "pebble.700"; const violetLight = "violet.light"; const honeydewBg = "honeydew.background"; +const honeydewMain = "honeydew.main"; const honeydewDarker = "honeydew.darker"; const borderDefualt = "1px solid"; const errorDark = "error.dark"; +const lilacBg = "lilac.background"; const generateStyle = ({ basic, @@ -66,10 +68,15 @@ export const Button: ComponentStyleConfig = { }, variants: { primary: generateStyle({ - basic: { background: "violet.main", color: "text.main" }, + basic: { + background: "violet.main", + color: "text.main", + "> svg": "text.main", + }, disabled: { background: "violet.background", color: pebble600, + "> svg": pebble600, }, hoverBg: "violet.dark", activeBg: violetLight, @@ -88,11 +95,14 @@ export const Button: ComponentStyleConfig = { border: borderDefualt, borderColor: violetLight, color: violetLight, + "> div": violetLight, + "> svg": violetLight, }, disabled: { border: borderDefualt, borderColor: pebble700, color: pebble600, + "> svg": pebble600, }, hoverBg: "violet.background", activeBg: "transparent", @@ -101,12 +111,14 @@ export const Button: ComponentStyleConfig = { basic: { border: borderDefualt, borderColor: pebble600, - color: "pebble.400", + color: "text.dark", + "> svg": "text.dark", }, disabled: { border: borderDefualt, borderColor: pebble700, color: pebble600, + "> svg": pebble600, }, hoverBg: pebble700, activeBg: "transparent", @@ -115,11 +127,13 @@ export const Button: ComponentStyleConfig = { basic: { border: borderDefualt, borderColor: honeydewBg, - color: "honeydew.main", + color: honeydewMain, + "> svg": honeydewMain, }, disabled: { border: honeydewDarker, color: honeydewDarker, + "> svg": honeydewDarker, }, hoverBg: honeydewBg, activeBg: "transparent", @@ -140,16 +154,18 @@ export const Button: ComponentStyleConfig = { "ghost-primary": generateStyle({ basic: { color: "lilac.main", + "> svg": "lilac.main", }, disabled: { - color: "lilac.background", + color: lilacBg, + "> svg": lilacBg, }, - hoverBg: "lilac.background", + hoverBg: lilacBg, activeBg: "transparent", }), "ghost-info": generateStyle({ basic: { - color: "honeydew.main", + color: honeydewMain, }, disabled: { color: honeydewBg, diff --git a/src/lib/styles/theme/components/index.ts b/src/lib/styles/theme/components/index.ts index 9e42ec3be..2576d596e 100644 --- a/src/lib/styles/theme/components/index.ts +++ b/src/lib/styles/theme/components/index.ts @@ -10,6 +10,7 @@ import { Menu } from "./menu"; import { Modal } from "./modal"; import { Radio } from "./radio"; import { Select } from "./select"; +import { Spinner } from "./spinner"; import { Switch } from "./switch"; import { Table } from "./table"; import { Text } from "./text"; @@ -34,4 +35,5 @@ export const components = { Textarea, Table, Switch, + Spinner, }; diff --git a/src/lib/styles/theme/components/spinner.ts b/src/lib/styles/theme/components/spinner.ts new file mode 100644 index 000000000..5e7987565 --- /dev/null +++ b/src/lib/styles/theme/components/spinner.ts @@ -0,0 +1,16 @@ +import type { ComponentStyleConfig } from "@chakra-ui/react"; + +export const Spinner: ComponentStyleConfig = { + baseStyle: { + color: "pebble.600", + speed: "0.65s", + }, + variants: { + primary: { + color: "violet.light", + }, + light: { + color: "text.main", + }, + }, +}; From 8412e47dc25cbd4e84cd51313b131a4c3e1159e7 Mon Sep 17 00:00:00 2001 From: Jennie Alles Date: Tue, 2 May 2023 17:25:03 +0700 Subject: [PATCH 02/12] fix(components): refine button --- src/lib/components/ConnectWalletAlert.tsx | 6 ++--- src/lib/components/ContractSelectSection.tsx | 2 +- src/lib/components/CustomTab.tsx | 1 - .../components/ViewPermissionAddresses.tsx | 2 +- src/lib/components/button/BackButton.tsx | 2 +- src/lib/components/modal/RedoModal.tsx | 6 +---- .../modal/UnsupportedTokensModal.tsx | 9 +------ src/lib/components/modal/code/RemoveCode.tsx | 1 - .../modal/code/SaveOrRemoveCode.tsx | 4 +-- .../components/modal/contract/ClearAdmin.tsx | 2 +- src/lib/components/table/ViewMore.tsx | 3 +-- .../table/contracts/ContractsTableRowCTA.tsx | 6 ++--- src/lib/components/tx/modal/ButtonSection.tsx | 6 ++--- src/lib/layout/navbar/Collapse.tsx | 7 +----- src/lib/layout/navbar/Expand.tsx | 12 ++------- .../delegations/RedelegationsSection.tsx | 2 +- .../components/delegations/index.tsx | 4 +-- .../components/BlockDetailsTop.tsx | 2 +- .../contract-description/UserContractDesc.tsx | 2 +- src/lib/pages/execute/index.tsx | 2 +- .../contract/PublicProjectContractRow.tsx | 6 ++--- src/lib/pages/query/index.tsx | 2 +- .../pages/tx-details/components/TxHeader.tsx | 4 +-- .../tx-message/msg-receipts/index.tsx | 2 +- src/lib/styles/theme/components/button.ts | 25 ++++++++++++++++--- 25 files changed, 52 insertions(+), 68 deletions(-) diff --git a/src/lib/components/ConnectWalletAlert.tsx b/src/lib/components/ConnectWalletAlert.tsx index a52ac6d89..57eacf0a5 100644 --- a/src/lib/components/ConnectWalletAlert.tsx +++ b/src/lib/components/ConnectWalletAlert.tsx @@ -5,7 +5,6 @@ import { Flex, Box, Button, - Text, } from "@chakra-ui/react"; import type { AlertProps } from "@chakra-ui/react"; import { useWallet } from "@cosmos-kit/react"; @@ -42,15 +41,14 @@ export const ConnectWalletAlert = ({ py="12px" > - + {title} {subtitle} ) : null; diff --git a/src/lib/components/ContractSelectSection.tsx b/src/lib/components/ContractSelectSection.tsx index 069d01b8e..58766bfef 100644 --- a/src/lib/components/ContractSelectSection.tsx +++ b/src/lib/components/ContractSelectSection.tsx @@ -101,7 +101,7 @@ const ContractDetailsButton = ({ variant="ghost-gray" float="right" size="sm" - leftIcon={} + leftIcon={} > Edit diff --git a/src/lib/components/CustomTab.tsx b/src/lib/components/CustomTab.tsx index 701ac5c87..9362a211e 100644 --- a/src/lib/components/CustomTab.tsx +++ b/src/lib/components/CustomTab.tsx @@ -20,7 +20,6 @@ export const CustomTab = ({ count, ...restProps }: CustomTabProps) => { lineHeight="24px" letterSpacing="0.4px" variant="ghost-gray" - color="text.dark" mb={0} sx={{ "&[aria-selected=true]": { diff --git a/src/lib/components/ViewPermissionAddresses.tsx b/src/lib/components/ViewPermissionAddresses.tsx index 1f9eed56b..96ff89e09 100644 --- a/src/lib/components/ViewPermissionAddresses.tsx +++ b/src/lib/components/ViewPermissionAddresses.tsx @@ -35,7 +35,7 @@ export const ViewPermissionAddresses = ({ ))} {permissionAddresses.length > 1 && ( diff --git a/src/lib/components/modal/code/RemoveCode.tsx b/src/lib/components/modal/code/RemoveCode.tsx index 89fda08b6..5f93095f4 100644 --- a/src/lib/components/modal/code/RemoveCode.tsx +++ b/src/lib/components/modal/code/RemoveCode.tsx @@ -29,7 +29,6 @@ export function RemoveCodeModal({ } variant="ghost-gray" - color="pebble.600" /> ), }: RemoveCodeModalProps) { diff --git a/src/lib/components/modal/code/SaveOrRemoveCode.tsx b/src/lib/components/modal/code/SaveOrRemoveCode.tsx index 21d6ca02f..8c9b8a5d5 100644 --- a/src/lib/components/modal/code/SaveOrRemoveCode.tsx +++ b/src/lib/components/modal/code/SaveOrRemoveCode.tsx @@ -28,8 +28,8 @@ export const SaveOrRemoveCodeModal = ({ name={codeInfo.name} trigger={ } - variant="ghost-gray" + icon={} + variant="ghost-primary" /> } /> diff --git a/src/lib/components/modal/contract/ClearAdmin.tsx b/src/lib/components/modal/contract/ClearAdmin.tsx index adfef7132..04e10d228 100644 --- a/src/lib/components/modal/contract/ClearAdmin.tsx +++ b/src/lib/components/modal/contract/ClearAdmin.tsx @@ -35,7 +35,7 @@ export const ClearAdminModal = ({ mainAction={proceed} mainVariant="error" otherBtnTitle="No, keep it" - otherVariant="ghost-primary" + otherVariant="ghost-lilac" > Clearing the admin is a permanent action. You'll not be able to diff --git a/src/lib/components/table/ViewMore.tsx b/src/lib/components/table/ViewMore.tsx index 2134d15af..0e297387c 100644 --- a/src/lib/components/table/ViewMore.tsx +++ b/src/lib/components/table/ViewMore.tsx @@ -15,7 +15,6 @@ export const ViewMore = ({ onClick }: ViewMoreProps) => ( borderRadius="0" minH="64px" variant="ghost-gray" - color="text.dark" gap={2} onClick={() => { AmpTrack(AmpEvent.USE_VIEW_MORE); @@ -23,7 +22,7 @@ export const ViewMore = ({ onClick }: ViewMoreProps) => ( }} > View More - + ); diff --git a/src/lib/components/table/contracts/ContractsTableRowCTA.tsx b/src/lib/components/table/contracts/ContractsTableRowCTA.tsx index aef7eb2a9..ebf803e9a 100644 --- a/src/lib/components/table/contracts/ContractsTableRowCTA.tsx +++ b/src/lib/components/table/contracts/ContractsTableRowCTA.tsx @@ -184,10 +184,8 @@ export const ContractsTableRowCTA = ({ contractLocalInfo={contractInfo} triggerElement={ - } - variant="ghost-gray" + icon={} + variant="ghost-primary" /> } /> diff --git a/src/lib/components/tx/modal/ButtonSection.tsx b/src/lib/components/tx/modal/ButtonSection.tsx index 1fbffd02b..f68082569 100644 --- a/src/lib/components/tx/modal/ButtonSection.tsx +++ b/src/lib/components/tx/modal/ButtonSection.tsx @@ -48,7 +48,7 @@ export const ButtonSection = ({ return ( <> } - rightIcon={} + leftIcon={} + rightIcon={} isDisabled={!redelegationCount} onClick={() => { AmpTrack(AmpEvent.USE_SEE_REDELEGATIONS); diff --git a/src/lib/pages/block-details/components/BlockDetailsTop.tsx b/src/lib/pages/block-details/components/BlockDetailsTop.tsx index f2e6df006..e1dbbe24d 100644 --- a/src/lib/pages/block-details/components/BlockDetailsTop.tsx +++ b/src/lib/pages/block-details/components/BlockDetailsTop.tsx @@ -88,7 +88,7 @@ export const BlockDetailsTop = ({ blockData }: BlockDetailsTopProps) => { ); diff --git a/src/lib/components/button/NewProposalButton.tsx b/src/lib/components/button/NewProposalButton.tsx index dc45d7593..e36f8fea6 100644 --- a/src/lib/components/button/NewProposalButton.tsx +++ b/src/lib/components/button/NewProposalButton.tsx @@ -19,7 +19,7 @@ export const NewProposalButton = () => { {/* } + icon={} // TODO - Change navigation path onClick={() => { navigate({ @@ -30,7 +30,7 @@ export const NewProposalButton = () => { To Store Code */} {/* } + icon={} onClick={() => { // TODO - Change navigation path navigate({ @@ -46,7 +46,7 @@ export const NewProposalButton = () => { > } + icon={} onClick={() => { navigate({ pathname: "/proposal/whitelist", diff --git a/src/lib/components/copy/Copier.tsx b/src/lib/components/copy/Copier.tsx index d9e8c385b..773e32d50 100644 --- a/src/lib/components/copy/Copier.tsx +++ b/src/lib/components/copy/Copier.tsx @@ -35,6 +35,7 @@ export const Copier = ({ onClick={() => AmpTrackCopier(amptrackSection, type)} name="copy" boxSize="12px" + color="pebble.600" /> } /> diff --git a/src/lib/components/filter/FilterDropdownItem.tsx b/src/lib/components/filter/FilterDropdownItem.tsx index b396cbf69..977a61e17 100644 --- a/src/lib/components/filter/FilterDropdownItem.tsx +++ b/src/lib/components/filter/FilterDropdownItem.tsx @@ -29,7 +29,7 @@ export const FilterDropdownItem = ({ > {filterDropdownComponent} - {isOptionSelected && } + {isOptionSelected && } ); diff --git a/src/lib/components/filter/FilterInput.tsx b/src/lib/components/filter/FilterInput.tsx index 5d1118d65..dcbd6a29d 100644 --- a/src/lib/components/filter/FilterInput.tsx +++ b/src/lib/components/filter/FilterInput.tsx @@ -62,6 +62,7 @@ export const FilterInput = ({ boxSize="40px" right="0px" minH="full" + color="pebble.600" backgroundColor="background.main" onClick={() => setIsDropdown(!isDropdown)} /> diff --git a/src/lib/components/links/GitHubLink.tsx b/src/lib/components/links/GitHubLink.tsx index d0e56c414..08f720e13 100644 --- a/src/lib/components/links/GitHubLink.tsx +++ b/src/lib/components/links/GitHubLink.tsx @@ -24,7 +24,12 @@ export const GitHubLink = ({ github }: GitHubLinkProps) => { {org}/{repo} - + ); diff --git a/src/lib/components/modal/RedoModal.tsx b/src/lib/components/modal/RedoModal.tsx index b63afa6ca..ee35d5ba9 100644 --- a/src/lib/components/modal/RedoModal.tsx +++ b/src/lib/components/modal/RedoModal.tsx @@ -44,7 +44,7 @@ export const RedoModal = ({ message }: RedoModalProps) => { - + Redo Instantiate diff --git a/src/lib/components/modal/UnsupportedTokensModal.tsx b/src/lib/components/modal/UnsupportedTokensModal.tsx index e5008d0a9..b1c9fdd9b 100644 --- a/src/lib/components/modal/UnsupportedTokensModal.tsx +++ b/src/lib/components/modal/UnsupportedTokensModal.tsx @@ -89,7 +89,7 @@ const UnsupportedToken = ({ balance }: UnsupportedTokenProps) => { - + - + Unsupported Assets diff --git a/src/lib/components/pagination/index.tsx b/src/lib/components/pagination/index.tsx index 21590a7f3..93aa80143 100644 --- a/src/lib/components/pagination/index.tsx +++ b/src/lib/components/pagination/index.tsx @@ -71,16 +71,16 @@ export const Pagination = ({ - + {`${offsetData.toLocaleString()} - ${lastDataInPage.toLocaleString()} of ${totalData.toLocaleString()}`} - + - + diff --git a/src/lib/components/select-code/CodeSelectDrawerButton.tsx b/src/lib/components/select-code/CodeSelectDrawerButton.tsx index 0a107dd68..431c2c439 100644 --- a/src/lib/components/select-code/CodeSelectDrawerButton.tsx +++ b/src/lib/components/select-code/CodeSelectDrawerButton.tsx @@ -90,7 +90,7 @@ export const CodeSelectDrawerButton = ({ - + Select Code ID @@ -116,7 +116,7 @@ export const CodeSelectDrawerButton = ({ /> - + My Stored Codes My Saved Codes diff --git a/src/lib/components/select-contract/ContractListCard.tsx b/src/lib/components/select-contract/ContractListCard.tsx index 16f833b2a..fb5eb163a 100644 --- a/src/lib/components/select-contract/ContractListCard.tsx +++ b/src/lib/components/select-contract/ContractListCard.tsx @@ -73,13 +73,13 @@ export const ContractListCard = ({ as={Button} onClick={(e) => e.stopPropagation()} > - + , + icon: , children: "Edit list name", }} /> diff --git a/src/lib/components/select-contract/SelectContractAdmin.tsx b/src/lib/components/select-contract/SelectContractAdmin.tsx index 9cbcc5dcc..a9b3f3ac4 100644 --- a/src/lib/components/select-contract/SelectContractAdmin.tsx +++ b/src/lib/components/select-contract/SelectContractAdmin.tsx @@ -78,7 +78,11 @@ export const SelectContractAdmin = ({ - + Select contract which you have permission diff --git a/src/lib/components/select-contract/SelectContractInstantiator.tsx b/src/lib/components/select-contract/SelectContractInstantiator.tsx index f2519254e..8ce1ec735 100644 --- a/src/lib/components/select-contract/SelectContractInstantiator.tsx +++ b/src/lib/components/select-contract/SelectContractInstantiator.tsx @@ -121,7 +121,11 @@ export const SelectContractInstantiator = ({ {listSlug.length === 0 || !contractList ? ( <> - + Select Contract @@ -188,6 +192,7 @@ export const SelectContractInstantiator = ({ boxSize="5" onClick={() => setListSlug("")} cursor="pointer" + color="pebble.600" /> {contractList.name} diff --git a/src/lib/components/state/ZeroState.tsx b/src/lib/components/state/ZeroState.tsx index d585fb347..403f42824 100644 --- a/src/lib/components/state/ZeroState.tsx +++ b/src/lib/components/state/ZeroState.tsx @@ -36,7 +36,7 @@ const ActionSection = ({ list, handleAction }: ActionSectionProps) => list={list} buttonProps={{ variant: "outline-primary", - leftIcon: , + leftIcon: , children: "Save Contract", ml: 2, }} diff --git a/src/lib/components/table/contracts/ContractsTableRowCTA.tsx b/src/lib/components/table/contracts/ContractsTableRowCTA.tsx index ee1d25d2a..e0aa0f51b 100644 --- a/src/lib/components/table/contracts/ContractsTableRowCTA.tsx +++ b/src/lib/components/table/contracts/ContractsTableRowCTA.tsx @@ -87,13 +87,17 @@ export const ContractsTableRowCTA = ({ as={Button} onClick={(e) => e.stopPropagation()} > - + e.stopPropagation()}> }> + + } + > Edit details } @@ -101,13 +105,23 @@ export const ContractsTableRowCTA = ({ }> + + } + > Add or remove from other lists } /> } + icon={ + + } onClick={() => { navigate({ pathname: "/admin", @@ -122,7 +136,13 @@ export const ContractsTableRowCTA = ({ contractAddress={contractInfo.contractAddress} triggerElement={ } + icon={ + + } isDisabled={!isAdmin} > Clear Admin diff --git a/src/lib/components/table/transactions/TransactionsTableRow.tsx b/src/lib/components/table/transactions/TransactionsTableRow.tsx index 0a8466ed2..e1a574ac6 100644 --- a/src/lib/components/table/transactions/TransactionsTableRow.tsx +++ b/src/lib/components/table/transactions/TransactionsTableRow.tsx @@ -93,7 +93,10 @@ export const TransactionsTableRow = ({ {isAccordion && ( - + )} diff --git a/src/lib/layout/Footer.tsx b/src/lib/layout/Footer.tsx index 6ceee8e59..55aaaf573 100644 --- a/src/lib/layout/Footer.tsx +++ b/src/lib/layout/Footer.tsx @@ -53,7 +53,7 @@ const Footer = () => ( onClick={() => AmpTrackCelatone(item.url)} > ))} @@ -65,7 +65,7 @@ const Footer = () => ( > diff --git a/src/lib/pages/contract-details/components/ContractTop.tsx b/src/lib/pages/contract-details/components/ContractTop.tsx index dbcfde148..b95ac36b0 100644 --- a/src/lib/pages/contract-details/components/ContractTop.tsx +++ b/src/lib/pages/contract-details/components/ContractTop.tsx @@ -62,7 +62,7 @@ export const ContractTop = ({ contractData }: ContractTopProps) => { contractLocalInfo.lists ? ( ) : ( - + ) } /> diff --git a/src/lib/pages/contract-details/components/JsonInfo.tsx b/src/lib/pages/contract-details/components/JsonInfo.tsx index e9ff3a0aa..df2987f27 100644 --- a/src/lib/pages/contract-details/components/JsonInfo.tsx +++ b/src/lib/pages/contract-details/components/JsonInfo.tsx @@ -36,6 +36,7 @@ export const JsonInfo = ({
( title="Public Contract Description" description={contractData.publicProject.publicInfo.description} textLine={contractData.contractLocalInfo?.description ? 4 : 2} - icon={} + icon={} /> )} diff --git a/src/lib/pages/contract-list/slug.tsx b/src/lib/pages/contract-list/slug.tsx index a0378672a..1c8eef603 100644 --- a/src/lib/pages/contract-list/slug.tsx +++ b/src/lib/pages/contract-list/slug.tsx @@ -83,7 +83,9 @@ const ContractsByList = observer(() => { } + separator={ + + } > { {contractListInfo.isInfoEditable && ( - + { value: contractListInfo.slug, }} menuItemProps={{ - icon: , + icon: , children: "Edit list name", }} reroute diff --git a/src/lib/pages/deploy/index.tsx b/src/lib/pages/deploy/index.tsx index ac7055f09..320e6f49d 100644 --- a/src/lib/pages/deploy/index.tsx +++ b/src/lib/pages/deploy/index.tsx @@ -42,11 +42,7 @@ const Deploy = () => { {isMainnet && ( - + Uploading new Wasm files on permissioned chains is coming soon to Celatone. Currently, you can upload codes and instantiate contracts diff --git a/src/lib/pages/home/components/QuickMenu.tsx b/src/lib/pages/home/components/QuickMenu.tsx index f71065843..641525027 100644 --- a/src/lib/pages/home/components/QuickMenu.tsx +++ b/src/lib/pages/home/components/QuickMenu.tsx @@ -89,7 +89,11 @@ export const QuickMenu = () => ( alignItems="center" > - + {item.title} @@ -99,7 +103,11 @@ export const QuickMenu = () => ( - + ))} diff --git a/src/lib/pages/network-overview/index.tsx b/src/lib/pages/network-overview/index.tsx index b6e4fec79..977f3b2b8 100644 --- a/src/lib/pages/network-overview/index.tsx +++ b/src/lib/pages/network-overview/index.tsx @@ -64,7 +64,11 @@ const CardInfo = ({ - + @@ -76,7 +80,7 @@ const CardInfo = ({ )} - + ); diff --git a/src/lib/pages/past-txs/index.tsx b/src/lib/pages/past-txs/index.tsx index cdf7fa25f..872b07a02 100644 --- a/src/lib/pages/past-txs/index.tsx +++ b/src/lib/pages/past-txs/index.tsx @@ -140,7 +140,7 @@ const PastTxs = () => { h="full" /> - + diff --git a/src/lib/pages/proposal/whitelist/index.tsx b/src/lib/pages/proposal/whitelist/index.tsx index 87018135c..5cedc8d36 100644 --- a/src/lib/pages/proposal/whitelist/index.tsx +++ b/src/lib/pages/proposal/whitelist/index.tsx @@ -236,7 +236,7 @@ const ProposalToWhitelist = () => { borderRadius="8px" > - + Fill in Proposal Details diff --git a/src/lib/pages/proposals/table/ProposalTable.tsx b/src/lib/pages/proposals/table/ProposalTable.tsx index 22eb0fb64..483aff84d 100644 --- a/src/lib/pages/proposals/table/ProposalTable.tsx +++ b/src/lib/pages/proposals/table/ProposalTable.tsx @@ -13,7 +13,7 @@ interface ProposalTableProps { const TEMPLATE_COLUMNS = "100px minmax(360px, 2fr) minmax(150px, 1fr) 330px 180px 160px"; -const BOX_SHADOW = "16px 0 32px -7px #272734"; +const BOX_SHADOW = "16px 0 32px -10px"; export const ProposalTable = ({ proposals, isLoading }: ProposalTableProps) => { if (isLoading) return ; diff --git a/src/lib/pages/proposals/table/ProposalTableHeader.tsx b/src/lib/pages/proposals/table/ProposalTableHeader.tsx index 8d3c57e77..db4a94c30 100644 --- a/src/lib/pages/proposals/table/ProposalTableHeader.tsx +++ b/src/lib/pages/proposals/table/ProposalTableHeader.tsx @@ -1,5 +1,5 @@ import type { DividerProps, GridProps } from "@chakra-ui/react"; -import { Grid } from "@chakra-ui/react"; +import { Grid, Text } from "@chakra-ui/react"; import { TableHeader, TableHeaderFreeze } from "lib/components/table"; @@ -18,8 +18,9 @@ export const ProposalTableHeader = ({ - Proposal Title/Type + Proposal Title/Type Status Voting ends diff --git a/src/lib/pages/proposals/table/ProposalTableRow.tsx b/src/lib/pages/proposals/table/ProposalTableRow.tsx index d8b775578..dd5db08de 100644 --- a/src/lib/pages/proposals/table/ProposalTableRow.tsx +++ b/src/lib/pages/proposals/table/ProposalTableRow.tsx @@ -66,6 +66,7 @@ export const ProposalTableRow = ({ { rel="noopener noreferrer" onClick={() => AmpTrack(AmpEvent.USE_SUBMIT_PROJECT)} > - diff --git a/src/lib/pages/public-project/components/DetailHeader.tsx b/src/lib/pages/public-project/components/DetailHeader.tsx index 82313745b..e5c25d4ad 100644 --- a/src/lib/pages/public-project/components/DetailHeader.tsx +++ b/src/lib/pages/public-project/components/DetailHeader.tsx @@ -25,7 +25,9 @@ export const DetailHeader = ({ details, slug }: DetailHeaderProps) => ( } + separator={ + + } > - + )} diff --git a/src/lib/styles/theme/components/button.ts b/src/lib/styles/theme/components/button.ts index 7a34283f4..ce3c834c2 100644 --- a/src/lib/styles/theme/components/button.ts +++ b/src/lib/styles/theme/components/button.ts @@ -2,8 +2,10 @@ import type { ComponentStyleConfig } from "@chakra-ui/react"; type Dict = Record; +const pebble500 = "pebble.500"; const pebble600 = "pebble.600"; const pebble700 = "pebble.700"; +const pebble800 = "pebble.800"; const violetLight = "violet.light"; const violetDark = "violet.dark"; const violetBg = "violet.background"; @@ -85,12 +87,12 @@ export const Button: ComponentStyleConfig = { }), "gray-solid": generateStyle({ basic: { - background: "pebble.800", + background: pebble800, color: "text.main", }, disabled: { - background: "pebble.900", - color: "pebble.900", + background: pebble800, + color: pebble500, }, hoverBg: pebble700, activeBg: pebble700, @@ -207,10 +209,10 @@ export const Button: ComponentStyleConfig = { "> svg": "pebble.400", }, disabled: { - color: "pebble.500", - "> svg": "pebble.500", + color: pebble500, + "> svg": pebble500, }, - hoverBg: "pebble.800", + hoverBg: pebble800, activeBg: "transparent", }), "ghost-error": generateStyle({ From b3ab8264ea09ce3e67be2c6906a17473286c9996 Mon Sep 17 00:00:00 2001 From: Jennie Alles Date: Tue, 9 May 2023 14:55:08 +0700 Subject: [PATCH 09/12] fix(components): fix misalign heading --- src/lib/components/forms/FilterByPermission.tsx | 4 ---- src/lib/components/forms/SelectInput.tsx | 12 ++++-------- .../select-code/CodeSelectDrawerButton.tsx | 1 - .../select-contract/AllContractLists.tsx | 2 +- .../select-contract/ContractListDetail.tsx | 2 +- .../SelectContractInstantiator.tsx | 5 +++-- src/lib/components/table/ViewMore.tsx | 1 - src/lib/components/upload/UploadSection.tsx | 2 -- src/lib/pages/codes/index.tsx | 12 +++++++++--- src/lib/pages/contract-list/index.tsx | 2 +- src/lib/pages/deploy/index.tsx | 1 - .../pages/migrate/components/MigrateContract.tsx | 2 -- src/lib/pages/past-txs/index.tsx | 14 +++++++++----- src/lib/pages/proposals/index.tsx | 4 ++-- .../public-project/components/AllProject.tsx | 2 +- .../public-project/components/BookmarkButton.tsx | 15 +++++++++++---- .../table/account/PublicProjectAccountTable.tsx | 2 +- .../table/code/PublicProjectCodeTable.tsx | 2 +- .../table/contract/PublicProjectContractTable.tsx | 2 +- src/lib/pages/public-project/index.tsx | 8 +++++++- src/lib/pages/recent-codes/index.tsx | 10 ++++++++-- 21 files changed, 60 insertions(+), 45 deletions(-) diff --git a/src/lib/components/forms/FilterByPermission.tsx b/src/lib/components/forms/FilterByPermission.tsx index e130c879f..0c776f205 100644 --- a/src/lib/components/forms/FilterByPermission.tsx +++ b/src/lib/components/forms/FilterByPermission.tsx @@ -10,7 +10,6 @@ interface PermissionOption { value: PermissionFilterValue; disabled: boolean; icon?: IconKeys; - iconColor: string; } interface FilterByPermissionProps { @@ -25,21 +24,18 @@ const options: PermissionOption[] = [ value: "all", disabled: false, icon: "check", - iconColor: "text.dark", }, { label: "Can Instantiate without proposal", value: "without-proposal", disabled: false, icon: "instantiate", - iconColor: "text.dark", }, { label: "Instantiate through proposal only", value: "with-proposal", disabled: false, icon: "vote", - iconColor: "text.dark", }, ]; diff --git a/src/lib/components/forms/SelectInput.tsx b/src/lib/components/forms/SelectInput.tsx index e46229a7f..c6c9fd184 100644 --- a/src/lib/components/forms/SelectInput.tsx +++ b/src/lib/components/forms/SelectInput.tsx @@ -25,7 +25,6 @@ interface SelectInputProps { value: T; disabled: boolean; icon?: IconKeys; - iconColor?: string; }[]; onChange: (newVal: T) => void; placeholder?: string; @@ -117,10 +116,7 @@ export const SelectInput = ({
{formLabel}
{selectedOption?.icon && ( - + )} ({ pl={selectedOption?.icon ? 9 : 4} /> - + @@ -156,7 +152,7 @@ export const SelectInput = ({ }, }} > - {options.map(({ label, value, disabled, icon, iconColor }) => ( + {options.map(({ label, value, disabled, icon }) => ( { @@ -166,7 +162,7 @@ export const SelectInput = ({ }} disabled={disabled} > - {icon && } + {icon && } {label} ))} diff --git a/src/lib/components/select-code/CodeSelectDrawerButton.tsx b/src/lib/components/select-code/CodeSelectDrawerButton.tsx index 431c2c439..541056bf1 100644 --- a/src/lib/components/select-code/CodeSelectDrawerButton.tsx +++ b/src/lib/components/select-code/CodeSelectDrawerButton.tsx @@ -75,7 +75,6 @@ export const CodeSelectDrawerButton = ({ <>
- + { setInputState={setSearchKeyword} labelBgColor="background" placeholder="Search for existing public projects by project name" - size="md" + size="lg" mb={12} /> {!filteredPublicProjects.length ? ( diff --git a/src/lib/pages/public-project/components/BookmarkButton.tsx b/src/lib/pages/public-project/components/BookmarkButton.tsx index 18b820acc..a1799696b 100644 --- a/src/lib/pages/public-project/components/BookmarkButton.tsx +++ b/src/lib/pages/public-project/components/BookmarkButton.tsx @@ -47,13 +47,20 @@ const StyledButton = ({ variant, }: StyledButtonProps) => ( ); @@ -104,7 +111,7 @@ export const BookmarkButton = observer( /> ) : ( )} diff --git a/src/lib/pages/public-project/components/table/code/PublicProjectCodeTable.tsx b/src/lib/pages/public-project/components/table/code/PublicProjectCodeTable.tsx index 31f96a4d4..7ae190a57 100644 --- a/src/lib/pages/public-project/components/table/code/PublicProjectCodeTable.tsx +++ b/src/lib/pages/public-project/components/table/code/PublicProjectCodeTable.tsx @@ -78,7 +78,7 @@ export const PublicProjectCodeTable = observer( value={searchKeyword} setInputState={setSearchKeyword} placeholder="Search with code ID or code name" - size="md" + size="lg" mb={6} /> )} diff --git a/src/lib/pages/public-project/components/table/contract/PublicProjectContractTable.tsx b/src/lib/pages/public-project/components/table/contract/PublicProjectContractTable.tsx index 6ae578a71..4765b6346 100644 --- a/src/lib/pages/public-project/components/table/contract/PublicProjectContractTable.tsx +++ b/src/lib/pages/public-project/components/table/contract/PublicProjectContractTable.tsx @@ -68,7 +68,7 @@ export const PublicProjectContractTable = observer( value={searchKeyword} setInputState={setSearchKeyword} placeholder="Search with contract address or contract name" - size="md" + size="lg" mb={6} /> )} diff --git a/src/lib/pages/public-project/index.tsx b/src/lib/pages/public-project/index.tsx index 2c805b657..e1d07fd20 100644 --- a/src/lib/pages/public-project/index.tsx +++ b/src/lib/pages/public-project/index.tsx @@ -18,7 +18,13 @@ export const AllPublicProjectsPage = () => { - + Public Projects diff --git a/src/lib/pages/recent-codes/index.tsx b/src/lib/pages/recent-codes/index.tsx index e4eff6c83..56c4b450c 100644 --- a/src/lib/pages/recent-codes/index.tsx +++ b/src/lib/pages/recent-codes/index.tsx @@ -51,10 +51,16 @@ const RecentCodes = observer(() => { return ( - + Recent Codes - + Date: Fri, 12 May 2023 14:53:10 +0700 Subject: [PATCH 10/12] fix: use define styles --- src/lib/styles/theme/components/button.ts | 79 ++++++++++++++++------- 1 file changed, 56 insertions(+), 23 deletions(-) diff --git a/src/lib/styles/theme/components/button.ts b/src/lib/styles/theme/components/button.ts index ce3c834c2..844e618ea 100644 --- a/src/lib/styles/theme/components/button.ts +++ b/src/lib/styles/theme/components/button.ts @@ -1,6 +1,5 @@ import type { ComponentStyleConfig } from "@chakra-ui/react"; - -type Dict = Record; +import { defineStyle } from "@chakra-ui/react"; const pebble500 = "pebble.500"; const pebble600 = "pebble.600"; @@ -22,12 +21,12 @@ const generateStyle = ({ hoverBg, activeBg, }: { - basic: Dict; - disabled: Dict; + basic: object; + disabled: object; hoverBg: string; activeBg: string; }) => { - return { + return defineStyle({ ...basic, _hover: { background: hoverBg, @@ -39,7 +38,7 @@ const generateStyle = ({ _active: { background: activeBg, }, - }; + }); }; export const Button: ComponentStyleConfig = { @@ -75,12 +74,16 @@ export const Button: ComponentStyleConfig = { basic: { background: "violet.main", color: "text.main", - "> svg": "text.main", + "& span": { + color: "text.main", + }, }, disabled: { background: violetBg, color: pebble600, - "> svg": pebble600, + "& span": { + color: pebble600, + }, }, hoverBg: violetDark, activeBg: violetLight, @@ -111,14 +114,20 @@ export const Button: ComponentStyleConfig = { border: borderDefualt, borderColor: violetLight, color: violetLight, - "> div": violetLight, - "> svg": violetLight, + "> div": { + color: violetLight, + }, + "> svg": { + color: violetLight, + }, }, disabled: { border: borderDefualt, borderColor: pebble700, color: pebble600, - "> svg": pebble600, + "> svg": { + color: pebble600, + }, }, hoverBg: violetBg, activeBg: "transparent", @@ -128,13 +137,17 @@ export const Button: ComponentStyleConfig = { border: borderDefualt, borderColor: pebble600, color: "text.dark", - "> svg": "text.dark", + "> svg": { + color: "text.dark", + }, }, disabled: { border: borderDefualt, borderColor: pebble700, color: pebble600, - "> svg": pebble600, + "> svg": { + color: pebble600, + }, }, hoverBg: pebble700, activeBg: "transparent", @@ -144,12 +157,16 @@ export const Button: ComponentStyleConfig = { border: borderDefualt, borderColor: honeydewBg, color: honeydewMain, - "> svg": honeydewMain, + "> svg": { + color: honeydewMain, + }, }, disabled: { border: honeydewDarker, color: honeydewDarker, - "> svg": honeydewDarker, + "> svg": { + color: honeydewDarker, + }, }, hoverBg: honeydewBg, activeBg: "transparent", @@ -170,11 +187,15 @@ export const Button: ComponentStyleConfig = { "ghost-primary": generateStyle({ basic: { color: violetLight, - "> svg": violetLight, + "> svg": { + color: "violetLight", + }, }, disabled: { color: violetDark, - "> svg": violetDark, + "> svg": { + color: violetDark, + }, }, hoverBg: violetBg, activeBg: "transparent", @@ -182,11 +203,15 @@ export const Button: ComponentStyleConfig = { "ghost-lilac": generateStyle({ basic: { color: "lilac.main", - "> svg": "lilac.main", + "> svg": { + color: "lilac.main", + }, }, disabled: { color: lilacBg, - "> svg": lilacBg, + "> svg": { + color: lilacBg, + }, }, hoverBg: lilacBg, activeBg: "transparent", @@ -194,11 +219,15 @@ export const Button: ComponentStyleConfig = { "ghost-info": generateStyle({ basic: { color: honeydewMain, - "> svg": honeydewMain, + "> svg": { + color: honeydewMain, + }, }, disabled: { color: honeydewBg, - "> svg": honeydewBg, + "> svg": { + color: honeydewBg, + }, }, hoverBg: honeydewBg, activeBg: "transparent", @@ -206,11 +235,15 @@ export const Button: ComponentStyleConfig = { "ghost-gray": generateStyle({ basic: { color: "pebble.400", - "> svg": "pebble.400", + "> svg": { + color: "pebble.400", + }, }, disabled: { color: pebble500, - "> svg": pebble500, + "> svg": { + color: pebble500, + }, }, hoverBg: pebble800, activeBg: "transparent", From a78f10a989305a68b38dd114657f6004ca5dd863 Mon Sep 17 00:00:00 2001 From: Jennie Alles Date: Fri, 12 May 2023 15:15:42 +0700 Subject: [PATCH 11/12] fix(components): rename tooltip component --- src/lib/components/CopyLink.tsx | 2 +- src/lib/components/Expedited.tsx | 2 +- src/lib/components/PermissionChip.tsx | 2 +- src/lib/components/TokenCard.tsx | 2 +- src/lib/components/{TooltipComponent.tsx => Tooltip.tsx} | 0 src/lib/components/action-msg/SingleMsg.tsx | 4 ++-- src/lib/components/button/AdminButton.tsx | 2 +- src/lib/components/button/InstantiateButton.tsx | 2 +- src/lib/components/button/NewProposalButton.tsx | 2 +- src/lib/components/copy/CopyTemplate.tsx | 2 +- src/lib/components/modal/UnsupportedTokensModal.tsx | 2 +- src/lib/components/table/EditableCell.tsx | 2 +- src/lib/components/table/transactions/RelationChip.tsx | 2 +- src/lib/layout/navbar/Collapse.tsx | 2 +- .../account-details/components/delegations/TotalCard.tsx | 2 +- src/lib/pages/network-overview/index.tsx | 2 +- src/lib/pages/proposals/index.tsx | 2 +- .../components/table/contract/PublicProjectContractRow.tsx | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) rename src/lib/components/{TooltipComponent.tsx => Tooltip.tsx} (100%) diff --git a/src/lib/components/CopyLink.tsx b/src/lib/components/CopyLink.tsx index 2e4ee50a4..d2195c9fe 100644 --- a/src/lib/components/CopyLink.tsx +++ b/src/lib/components/CopyLink.tsx @@ -5,7 +5,7 @@ import { useState } from "react"; import { AmpTrackCopier } from "lib/services/amplitude"; import { CustomIcon } from "./icon"; -import { Tooltip } from "./TooltipComponent"; +import { Tooltip } from "./Tooltip"; interface CopyLinkProps { value: string; diff --git a/src/lib/components/Expedited.tsx b/src/lib/components/Expedited.tsx index b3c89ad79..9dac00cd2 100644 --- a/src/lib/components/Expedited.tsx +++ b/src/lib/components/Expedited.tsx @@ -1,7 +1,7 @@ import { Flex, Text, Highlight } from "@chakra-ui/react"; import { CustomIcon } from "./icon"; -import { Tooltip } from "./TooltipComponent"; +import { Tooltip } from "./Tooltip"; const ExpeditedText = ( diff --git a/src/lib/components/PermissionChip.tsx b/src/lib/components/PermissionChip.tsx index 233b7339a..740b37bb8 100644 --- a/src/lib/components/PermissionChip.tsx +++ b/src/lib/components/PermissionChip.tsx @@ -5,7 +5,7 @@ import type { HumanAddr, PermissionAddresses } from "lib/types"; import { AccessConfigPermission } from "lib/types"; import { getPermissionHelper } from "lib/utils"; -import { Tooltip } from "./TooltipComponent"; +import { Tooltip } from "./Tooltip"; interface PermissionChipProps { instantiatePermission: AccessConfigPermission; diff --git a/src/lib/components/TokenCard.tsx b/src/lib/components/TokenCard.tsx index 492e00f56..671e72a47 100644 --- a/src/lib/components/TokenCard.tsx +++ b/src/lib/components/TokenCard.tsx @@ -10,7 +10,7 @@ import { } from "lib/utils"; import { Copier } from "./copy"; -import { Tooltip } from "./TooltipComponent"; +import { Tooltip } from "./Tooltip"; interface TokenCardProps extends FlexProps { userBalance: BalanceWithAssetInfo; diff --git a/src/lib/components/TooltipComponent.tsx b/src/lib/components/Tooltip.tsx similarity index 100% rename from src/lib/components/TooltipComponent.tsx rename to src/lib/components/Tooltip.tsx diff --git a/src/lib/components/action-msg/SingleMsg.tsx b/src/lib/components/action-msg/SingleMsg.tsx index 8bb92e232..9f64d38c5 100644 --- a/src/lib/components/action-msg/SingleMsg.tsx +++ b/src/lib/components/action-msg/SingleMsg.tsx @@ -4,7 +4,7 @@ import { snakeCase } from "snake-case"; import { Copier } from "../copy"; import { CustomIcon } from "../icon"; -import { Tooltip } from "../TooltipComponent"; +import { Tooltip } from "../Tooltip"; import type { LinkType } from "lib/components/ExplorerLink"; import { ExplorerLink } from "lib/components/ExplorerLink"; import type { Option } from "lib/types"; @@ -89,7 +89,7 @@ export const SingleMsg = ({ {/* Tag left over */} {tags && length && length - tags.length > 0 && ( - +{length - tags.length}{" "} + +{length - tags.length} )} {/* Length */} diff --git a/src/lib/components/button/AdminButton.tsx b/src/lib/components/button/AdminButton.tsx index e9b4f0c9b..4393fdeb1 100644 --- a/src/lib/components/button/AdminButton.tsx +++ b/src/lib/components/button/AdminButton.tsx @@ -3,7 +3,7 @@ import { useWallet } from "@cosmos-kit/react"; import { CustomIcon } from "../icon"; import { ClearAdminModal } from "../modal/contract/ClearAdmin"; -import { Tooltip } from "../TooltipComponent"; +import { Tooltip } from "../Tooltip"; import { useInternalNavigate } from "lib/app-provider"; import type { Addr, ContractAddr, Option } from "lib/types"; diff --git a/src/lib/components/button/InstantiateButton.tsx b/src/lib/components/button/InstantiateButton.tsx index 3b02226cc..ca534ae9f 100644 --- a/src/lib/components/button/InstantiateButton.tsx +++ b/src/lib/components/button/InstantiateButton.tsx @@ -3,7 +3,7 @@ import { Button } from "@chakra-ui/react"; import { useWallet } from "@cosmos-kit/react"; import { CustomIcon } from "../icon"; -import { Tooltip } from "../TooltipComponent"; +import { Tooltip } from "../Tooltip"; import { useInternalNavigate } from "lib/app-provider"; import type { HumanAddr, PermissionAddresses } from "lib/types"; import { AccessConfigPermission } from "lib/types"; diff --git a/src/lib/components/button/NewProposalButton.tsx b/src/lib/components/button/NewProposalButton.tsx index e36f8fea6..7e53e6f4a 100644 --- a/src/lib/components/button/NewProposalButton.tsx +++ b/src/lib/components/button/NewProposalButton.tsx @@ -1,6 +1,6 @@ import { Button, Menu, MenuButton, MenuItem, MenuList } from "@chakra-ui/react"; -import { Tooltip } from "../TooltipComponent"; +import { Tooltip } from "../Tooltip"; import { useCurrentNetwork, useInternalNavigate } from "lib/app-provider"; import { CustomIcon } from "lib/components/icon"; diff --git a/src/lib/components/copy/CopyTemplate.tsx b/src/lib/components/copy/CopyTemplate.tsx index 3bded17a9..8eb7ae387 100644 --- a/src/lib/components/copy/CopyTemplate.tsx +++ b/src/lib/components/copy/CopyTemplate.tsx @@ -1,7 +1,7 @@ import { Box, useClipboard } from "@chakra-ui/react"; import { useEffect } from "react"; -import { Tooltip } from "../TooltipComponent"; +import { Tooltip } from "../Tooltip"; interface CopyTemplateProps { value: string; diff --git a/src/lib/components/modal/UnsupportedTokensModal.tsx b/src/lib/components/modal/UnsupportedTokensModal.tsx index b1c9fdd9b..95da42bbd 100644 --- a/src/lib/components/modal/UnsupportedTokensModal.tsx +++ b/src/lib/components/modal/UnsupportedTokensModal.tsx @@ -18,7 +18,7 @@ import { useMemo } from "react"; import { ExplorerLink } from "../ExplorerLink"; import type { IconKeys } from "../icon"; import { CustomIcon } from "../icon"; -import { Tooltip } from "../TooltipComponent"; +import { Tooltip } from "../Tooltip"; import { useGetAddressType, getAddressTypeByLength } from "lib/app-provider"; import type { AddressReturnType } from "lib/app-provider"; import { Copier } from "lib/components/copy"; diff --git a/src/lib/components/table/EditableCell.tsx b/src/lib/components/table/EditableCell.tsx index 42ec44a4e..2c3c1474f 100644 --- a/src/lib/components/table/EditableCell.tsx +++ b/src/lib/components/table/EditableCell.tsx @@ -4,7 +4,7 @@ import type { ChangeEvent } from "react"; import { useRef, useState, useEffect } from "react"; import { CustomIcon } from "../icon"; -import { Tooltip } from "../TooltipComponent"; +import { Tooltip } from "../Tooltip"; interface EditableCellProps { initialValue?: string; diff --git a/src/lib/components/table/transactions/RelationChip.tsx b/src/lib/components/table/transactions/RelationChip.tsx index 58cc9ca08..f601402e5 100644 --- a/src/lib/components/table/transactions/RelationChip.tsx +++ b/src/lib/components/table/transactions/RelationChip.tsx @@ -1,7 +1,7 @@ import { Tag } from "@chakra-ui/react"; import type { CSSProperties } from "react"; -import { Tooltip } from "lib/components/TooltipComponent"; +import { Tooltip } from "lib/components/Tooltip"; interface RelationChipProps { isSigner: boolean; diff --git a/src/lib/layout/navbar/Collapse.tsx b/src/lib/layout/navbar/Collapse.tsx index 361534c3e..204e823b7 100644 --- a/src/lib/layout/navbar/Collapse.tsx +++ b/src/lib/layout/navbar/Collapse.tsx @@ -3,7 +3,7 @@ import { Box, Flex, IconButton, Image } from "@chakra-ui/react"; import { useMobile } from "lib/app-provider"; import { AppLink } from "lib/components/AppLink"; import { CustomIcon } from "lib/components/icon"; -import { Tooltip } from "lib/components/TooltipComponent"; +import { Tooltip } from "lib/components/Tooltip"; import { AmpEvent, AmpTrack } from "lib/services/amplitude"; import type { NavMenuProps } from "./type"; diff --git a/src/lib/pages/account-details/components/delegations/TotalCard.tsx b/src/lib/pages/account-details/components/delegations/TotalCard.tsx index 6cb8722fa..e43ce0968 100644 --- a/src/lib/pages/account-details/components/delegations/TotalCard.tsx +++ b/src/lib/pages/account-details/components/delegations/TotalCard.tsx @@ -1,7 +1,7 @@ import { InfoIcon } from "@chakra-ui/icons"; import { Flex, Heading, Image, Spinner, Text } from "@chakra-ui/react"; -import { Tooltip } from "lib/components/TooltipComponent"; +import { Tooltip } from "lib/components/Tooltip"; import { NAToken } from "lib/icon"; import type { Option, TokenWithValue } from "lib/types"; import { diff --git a/src/lib/pages/network-overview/index.tsx b/src/lib/pages/network-overview/index.tsx index 977f3b2b8..15cc56105 100644 --- a/src/lib/pages/network-overview/index.tsx +++ b/src/lib/pages/network-overview/index.tsx @@ -6,7 +6,7 @@ import { useInternalNavigate } from "lib/app-provider"; import { CustomIcon } from "lib/components/icon"; import PageContainer from "lib/components/PageContainer"; import { ViewMore } from "lib/components/table"; -import { Tooltip } from "lib/components/TooltipComponent"; +import { Tooltip } from "lib/components/Tooltip"; import { BlocksTable } from "lib/pages/blocks/components/BlocksTable"; import { TxsTable } from "lib/pages/txs/components/TxsTable"; import { AmpEvent, AmpTrack } from "lib/services/amplitude"; diff --git a/src/lib/pages/proposals/index.tsx b/src/lib/pages/proposals/index.tsx index 1b33e8a69..f233dc04b 100644 --- a/src/lib/pages/proposals/index.tsx +++ b/src/lib/pages/proposals/index.tsx @@ -10,7 +10,7 @@ import InputWithIcon from "lib/components/InputWithIcon"; import PageContainer from "lib/components/PageContainer"; import { Pagination } from "lib/components/pagination"; import { usePaginator } from "lib/components/pagination/usePaginator"; -import { Tooltip } from "lib/components/TooltipComponent"; +import { Tooltip } from "lib/components/Tooltip"; import { AmpEvent, AmpTrack } from "lib/services/amplitude"; import { useProposalList, diff --git a/src/lib/pages/public-project/components/table/contract/PublicProjectContractRow.tsx b/src/lib/pages/public-project/components/table/contract/PublicProjectContractRow.tsx index d75bb6719..204cecff0 100644 --- a/src/lib/pages/public-project/components/table/contract/PublicProjectContractRow.tsx +++ b/src/lib/pages/public-project/components/table/contract/PublicProjectContractRow.tsx @@ -18,7 +18,7 @@ import { SaveContractDetailsModal, } from "lib/components/modal"; import { TableRow } from "lib/components/table"; -import { Tooltip } from "lib/components/TooltipComponent"; +import { Tooltip } from "lib/components/Tooltip"; import type { PublicContractInfo } from "./PublicProjectContractTable"; From 12b71f721e08248ce2c59507a641fe2597d0d1fd Mon Sep 17 00:00:00 2001 From: Jennie Alles Date: Fri, 12 May 2023 15:52:15 +0700 Subject: [PATCH 12/12] fix(components): clean up tooltip --- src/lib/components/button/InstantiateButton.tsx | 2 +- src/lib/components/table/EditableCell.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/components/button/InstantiateButton.tsx b/src/lib/components/button/InstantiateButton.tsx index ca534ae9f..cc6de6f10 100644 --- a/src/lib/components/button/InstantiateButton.tsx +++ b/src/lib/components/button/InstantiateButton.tsx @@ -82,7 +82,7 @@ export const InstantiateButton = ({ ); return ( - +