diff --git a/extension/e2e-tests/integration-tests/sendIntegration.test.ts b/extension/e2e-tests/integration-tests/sendIntegration.test.ts index 7508ad38cc..86e228b059 100644 --- a/extension/e2e-tests/integration-tests/sendIntegration.test.ts +++ b/extension/e2e-tests/integration-tests/sendIntegration.test.ts @@ -421,7 +421,7 @@ test("Send token payment to C address", async ({ await page .locator(".Send__step:not(.Send__step--hidden)") - .getByText("E2E") + .getByTestId(`SendRow-E2E:${TEST_TOKEN_ADDRESS}`) .click(); await expect(page.getByTestId("send-amount-amount-input")).toBeVisible(); diff --git a/extension/src/popup/components/InternalTransaction/TokenList/index.tsx b/extension/src/popup/components/InternalTransaction/TokenList/index.tsx index 079685ac25..f8a3eb0e45 100644 --- a/extension/src/popup/components/InternalTransaction/TokenList/index.tsx +++ b/extension/src/popup/components/InternalTransaction/TokenList/index.tsx @@ -1,5 +1,6 @@ import React, { useMemo } from "react"; import { useTranslation } from "react-i18next"; +import { Icon } from "@stellar/design-system"; import BigNumber from "bignumber.js"; import classnames from "classnames"; @@ -53,7 +54,10 @@ export const TokenList = ({ ) : ( <> {isShowingHeader && ( -
{t("Your Tokens")}
+
+ + {t("Tokens")} +
)} {sortedTokens .filter( @@ -78,6 +82,8 @@ export const TokenList = ({ ? balance.token.issuer.key : undefined; const isContract = "contractId" in balance; + const isNative = + "type" in balance.token && balance.token.type === "native"; const canonical = getCanonicalFromAsset(code, issuerKey); const icon = icons[canonical]; const availableBalance = getAvailableBalance({ @@ -107,13 +113,13 @@ export const TokenList = ({ />
- {title(balance)} + {isNative ? t("Stellar Lumens") : title(balance)}
- {displayTotal} + {displayTotal} {code}
diff --git a/extension/src/popup/components/InternalTransaction/TokenList/styles.scss b/extension/src/popup/components/InternalTransaction/TokenList/styles.scss index a730b81ac3..6a0d2b1e2d 100644 --- a/extension/src/popup/components/InternalTransaction/TokenList/styles.scss +++ b/extension/src/popup/components/InternalTransaction/TokenList/styles.scss @@ -37,6 +37,10 @@ display: flex; align-items: center; margin-bottom: pxToRem(12px); + font-size: pxToRem(14); + line-height: pxToRem(20); + font-weight: 600; + color: var(--sds-clr-gray-11); svg { margin-right: pxToRem(4px); diff --git a/extension/src/popup/components/send/SendDestinationAsset/index.tsx b/extension/src/popup/components/send/SendDestinationAsset/index.tsx index e530dc0b70..53207e3f19 100644 --- a/extension/src/popup/components/send/SendDestinationAsset/index.tsx +++ b/extension/src/popup/components/send/SendDestinationAsset/index.tsx @@ -1,7 +1,7 @@ import React, { useEffect } from "react"; import { useDispatch } from "react-redux"; import { Navigate, useLocation } from "react-router-dom"; -import { Loader, Notification } from "@stellar/design-system"; +import { Icon, Loader, Notification } from "@stellar/design-system"; import { useTranslation } from "react-i18next"; import { AppDispatch } from "popup/App"; @@ -131,11 +131,12 @@ export const SendDestinationAsset = ({ resetAmountForm(); goToNext(); }} - isShowingHeader={false} + isShowingHeader={true} /> {destAssetDataState.data.collectibles.collections.length > 0 && (
+ {t("Collectibles")}