diff --git a/src/components/popup/list/TokenListItem.tsx b/src/components/popup/list/TokenListItem.tsx index c59b3bf0d..9bbe9ab81 100644 --- a/src/components/popup/list/TokenListItem.tsx +++ b/src/components/popup/list/TokenListItem.tsx @@ -94,6 +94,7 @@ const DivDescriptionWrapper = styled.div` const DivTitleWrapper = styled.div` font-size: 1rem; font-weight: 600; + color: ${(props) => props.theme.primaryText}; `; const DivListItem = styled.div` @@ -122,7 +123,7 @@ const ImgTokenLogo = styled.img.attrs({ const SpanTokenType = styled.span` padding: 0.08rem 0.2rem; background-color: rgb(${(props) => props.theme.theme}); - color: #fff; + color: ${(props) => props.theme.primaryText}; font-weight: 500; font-size: 0.5rem; text-transform: uppercase; diff --git a/src/routes/popup/settings/tokens/[id]/index.tsx b/src/routes/popup/settings/tokens/[id]/index.tsx index c3c03346f..415511e81 100644 --- a/src/routes/popup/settings/tokens/[id]/index.tsx +++ b/src/routes/popup/settings/tokens/[id]/index.tsx @@ -1,11 +1,5 @@ -import { - ButtonV2, - SelectV2, - Spacer, - Text, - TooltipV2, - useToasts -} from "@arconnect/components"; +import { ButtonV2, Spacer, Text, TooltipV2 } from "@arconnect/components"; +import { Select as SelectV2, useToasts } from "@arconnect/components-rebrand"; import type { TokenType } from "~tokens/token"; import { useStorage } from "~utils/storage"; import { ExtensionStorage } from "~utils/storage"; @@ -13,7 +7,7 @@ import { TrashIcon } from "@iconicicons/react"; import { removeToken } from "~tokens"; import { useMemo } from "react"; import browser from "webextension-polyfill"; -import styled from "styled-components"; +import styled, { useTheme } from "styled-components"; import copy from "copy-to-clipboard"; import { formatAddress } from "~utils/format"; import { CopyButton } from "~components/dashboard/subsettings/WalletSettings"; @@ -21,7 +15,6 @@ import HeadV2 from "~components/popup/HeadV2"; import type { CommonRouteProps } from "~wallets/router/router.types"; import { useLocation } from "~wallets/router/router.utils"; import { LoadingView } from "~components/page/common/loading/loading.view"; - export interface TokenSettingsParams { id: string; } @@ -30,6 +23,7 @@ export type TokenSettingsProps = CommonRouteProps; export function TokenSettingsView({ params: { id } }: TokenSettingsProps) { const { navigate } = useLocation(); + const theme = useTheme(); // ao tokens const [aoTokens, setAoTokens] = useStorage( @@ -95,6 +89,7 @@ export function TokenSettingsView({ params: { id } }: TokenSettingsProps) { setToast({ type: "info", content: browser.i18n.getMessage("copied_address", [ + token.ticker, formatAddress(token.id, 8) ]), duration: 2200 @@ -105,6 +100,7 @@ export function TokenSettingsView({ params: { id } }: TokenSettingsProps) { { // @ts-expect-error @@ -166,8 +162,10 @@ const BasePropertyText = styled(Text).attrs({ font-weight: 500; `; -const PropertyName = styled(BasePropertyText)``; +const PropertyName = styled(BasePropertyText)` + color: ${(props) => props.theme.primaryText}; +`; const PropertyValue = styled(BasePropertyText)` - color: ${(props) => props.theme.primaryText}; + color: ${(props) => props.theme.secondaryText}; `;