Release/5.34.1

extension/e2e-tests/sendPayment.test.ts

@@ -221,6 +221,31 @@ test("Send doesn't throw error when creating muxed account", async ({
   });
 });
 
+test("Send can review formatted inputs", async ({ page, extensionId }) => {
+  test.slow();
+  await loginAndFund({ page, extensionId });
+  await page.getByTestId("nav-link-send").click({ force: true });
+
+  await expect(page.getByText("Send")).toBeVisible();
+  await page
+    .getByTestId("send-to-input")
+    .fill(
+      "MAUPPMNJUS76SG5NA6UXVCSO5HYVAJT422LBISV6LMCX37OIEPDJGAAAAAAAAAAAAF54C",
+    );
+  await expect(
+    page.getByText("The destination account doesn’t exist."),
+  ).toBeVisible();
+  await page.getByText("Continue").click();
+
+  await expect(page.getByTestId("AppHeaderPageTitle")).toContainText("Send");
+  await page.getByTestId(`SendRow-native`).click({ force: true });
+  await page.getByTestId("send-amount-amount-input").fill("1000");
+  await page.getByText("Review Send").click({ force: true });
+  await expect(page.getByText("You are sending")).toBeVisible({
+    timeout: 200000,
+  });
+});
+
 test("Send XLM payments to recent federated addresses", async ({
   page,
   extensionId,

extension/src/popup/components/manageAssets/ManageAssetRowButton/index.tsx

@@ -14,6 +14,7 @@ interface ManageAssetRowButtonProps {
   code: string;
   issuer: string;
   isTrustlineActive: boolean;
+  isSac: boolean;
   isLoading: boolean;
   onClick: () => void;
 }
@@ -22,6 +23,7 @@ export const ManageAssetRowButton = ({
   code,
   issuer,
   isTrustlineActive,
+  isSac,
   isLoading,
   onClick,
 }: ManageAssetRowButtonProps) => {
@@ -69,28 +71,30 @@ export const ManageAssetRowButton = ({
                   </>
                 </CopyText>
               </div>
-              <div className="ManageAssetRowButton__dropdown__row">
-                <Button
-                  className="ManageAssetRowButton__remove"
-                  size="md"
-                  variant="secondary"
-                  disabled={isLoading}
-                  isLoading={isLoading}
-                  onClick={() => {
-                    setRowButtonShowing("");
-                    onClick();
-                  }}
-                  type="button"
-                  data-testid="ManageAssetRowButton"
-                >
-                  <div className="ManageAssetRowButton__label">
-                    {t("Remove asset")}
-                  </div>
-                  {isLoading ? null : (
-                    <img src={IconRemove} alt="icon remove" />
-                  )}
-                </Button>
-              </div>
+              {!isSac && (
+                <div className="ManageAssetRowButton__dropdown__row">
+                  <Button
+                    className="ManageAssetRowButton__remove"
+                    size="md"
+                    variant="secondary"
+                    disabled={isLoading}
+                    isLoading={isLoading}
+                    onClick={() => {
+                      setRowButtonShowing("");
+                      onClick();
+                    }}
+                    type="button"
+                    data-testid="ManageAssetRowButton"
+                  >
+                    <div className="ManageAssetRowButton__label">
+                      {t("Remove asset")}
+                    </div>
+                    {isLoading ? null : (
+                      <img src={IconRemove} alt="icon remove" />
+                    )}
+                  </Button>
+                </div>
+              )}
               {createPortal(
                 <div
                   className="ManageAssetRowButton__dropdown__background"

extension/src/popup/components/manageAssets/ManageAssetRows/ChangeTrustInternal/SubmitTx/index.tsx

@@ -208,7 +208,7 @@ export const SubmitTransaction = ({
               )}
               {isFail && (
                 <>
-                  <Icon.CheckCircle className="SubmitTransaction__Title__Fail" />
+                  <Icon.XCircle className="SubmitTransaction__Title__Fail" />
                   <span>Failed!</span>
                 </>
               )}

extension/src/popup/components/manageAssets/ManageAssetRows/ToggleTokenInternal/index.tsx

@@ -13,6 +13,8 @@ import { navigateTo } from "popup/helpers/navigate";
 import { ROUTES } from "popup/constants/routes";
 
 import "./styles.scss";
+import { isSacContract } from "popup/helpers/soroban";
+import { truncateString } from "helpers/stellar";
 
 interface ToggleTokenInternalProps {
   asset: {
@@ -57,6 +59,10 @@ export const ToggleTokenInternal = ({
     }
     navigateTo(ROUTES.account, nav);
   };
+  const isSac =
+    !!asset.name &&
+    !!asset.contract &&
+    isSacContract(asset.name, asset.contract, networkDetails.networkPassphrase);
   return (
     <div className="ToggleToken__wrapper">
       <div className="ToggleToken__wrapper__body">
@@ -88,7 +94,7 @@ export const ToggleTokenInternal = ({
           )}
 
           <Text as="div" size="sm" weight="medium">
-            {asset.name || asset.code}
+            {isSac ? asset.code : asset.name || truncateString(asset.contract!)}
           </Text>
           <div className="ToggleToken__wrapper__badge">
             <Badge

extension/src/popup/components/manageAssets/ManageAssetRows/index.tsx

@@ -22,6 +22,8 @@ import { ManageAssetRowButton } from "../ManageAssetRowButton";
 import { ToggleTokenInternal } from "./ToggleTokenInternal";
 
 import "./styles.scss";
+import { NetworkDetails } from "@shared/constants/stellar";
+import { getNativeContractDetails } from "popup/helpers/searchAsset";
 
 export type ManageAssetCurrency = {
   code?: string;
@@ -86,6 +88,7 @@ export const ManageAssetRows = ({
             accountBalances={balances}
             verifiedAssetRows={verifiedAssetRows}
             unverifiedAssetRows={unverifiedAssetRows}
+            networkDetails={networkDetails}
             shouldSplitAssetsByVerificationStatus={
               shouldSplitAssetsByVerificationStatus
             }
@@ -96,6 +99,7 @@ export const ManageAssetRows = ({
               image,
               issuer,
               isSuspicious,
+              isSac,
               isTrustlineActive,
               name,
             }) => (
@@ -112,6 +116,7 @@ export const ManageAssetRows = ({
                   code={code}
                   issuer={issuer}
                   isTrustlineActive={!!isTrustlineActive}
+                  isSac={isSac}
                   isLoading={false}
                   onClick={async () => {
                     setSelectedAsset({
@@ -178,11 +183,13 @@ const AssetRows = ({
   shouldSplitAssetsByVerificationStatus,
   unverifiedAssetRows,
   verifiedAssetRows,
+  networkDetails,
 }: {
   accountBalances: AccountBalances;
   shouldSplitAssetsByVerificationStatus?: boolean;
   unverifiedAssetRows: ManageAssetCurrency[];
   verifiedAssetRows: ManageAssetCurrency[];
+  networkDetails: NetworkDetails;
   renderAssetRow: ({
     code,
     domain,
@@ -193,6 +200,7 @@ const AssetRows = ({
     isContract,
     isTrustlineActive,
     isSuspicious,
+    isSac,
   }: {
     code: string;
     domain: string;
@@ -203,6 +211,7 @@ const AssetRows = ({
     isContract: boolean;
     isTrustlineActive: boolean;
     isSuspicious?: boolean;
+    isSac: boolean;
   }) => React.ReactNode;
 }) => {
   const { t } = useTranslation();
@@ -242,12 +251,22 @@ const AssetRows = ({
             if (!accountBalances.balances) {
               return null;
             }
+            const nativeContract = getNativeContractDetails(networkDetails);
             const isContract = isContractId(contract);
             const canonicalAsset = getCanonicalFromAsset(code, issuer);
             const isTrustlineActive = findAssetBalance(
               accountBalances.balances,
               { code, issuer },
             );
+            const isSac =
+              contract === nativeContract.contract ||
+              (!!name &&
+                !!contract &&
+                isSacContract(
+                  name,
+                  contract,
+                  networkDetails.networkPassphrase,
+                ));
             return (
               <div
                 className="ManageAssetRows__row"
@@ -262,7 +281,10 @@ const AssetRows = ({
                   isContract,
                   issuer,
                   isSuspicious,
-                  isTrustlineActive: isTrustlineActive !== undefined,
+                  isSac,
+                  isTrustlineActive:
+                    isTrustlineActive !== undefined ||
+                    contract === nativeContract.contract,
                   name,
                 })}
               </div>
@@ -301,12 +323,23 @@ const AssetRows = ({
             if (!accountBalances.balances) {
               return null;
             }
+            const nativeContract = getNativeContractDetails(networkDetails);
             const isContract = isContractId(contract);
             const canonicalAsset = getCanonicalFromAsset(code, issuer);
             const isTrustlineActive = findAssetBalance(
               accountBalances.balances,
               { code, issuer },
             );
+            const isSac =
+              contract === nativeContract.contract ||
+              (!!name &&
+                !!contract &&
+                isSacContract(
+                  name,
+                  contract,
+                  networkDetails.networkPassphrase,
+                ));
+
             return (
               <div
                 className="ManageAssetRows__row"
@@ -321,7 +354,10 @@ const AssetRows = ({
                   isContract,
                   issuer,
                   isSuspicious,
-                  isTrustlineActive: isTrustlineActive !== undefined,
+                  isSac,
+                  isTrustlineActive:
+                    isTrustlineActive !== undefined ||
+                    contract === nativeContract.contract,
                   name,
                 })}
               </div>
@@ -347,12 +383,18 @@ const AssetRows = ({
           if (!accountBalances.balances) {
             return null;
           }
+          const nativeContract = getNativeContractDetails(networkDetails);
           const isContract = isContractId(contract);
           const canonicalAsset = getCanonicalFromAsset(code, issuer);
           const isTrustlineActive = findAssetBalance(accountBalances.balances, {
             code,
             issuer,
           });
+          const isSac =
+            contract === nativeContract.contract ||
+            (!!name &&
+              !!contract &&
+              isSacContract(name, contract, networkDetails.networkPassphrase));
           return (
             <div
               className="ManageAssetRows__row"
@@ -367,7 +409,10 @@ const AssetRows = ({
                 isContract,
                 issuer,
                 isSuspicious,
-                isTrustlineActive: isTrustlineActive !== undefined,
+                isSac,
+                isTrustlineActive:
+                  isTrustlineActive !== undefined ||
+                  contract === nativeContract.contract,
                 name,
               })}
             </div>

extension/src/popup/components/manageAssets/SearchAsset/hooks/useAssetLookup.ts

@@ -150,8 +150,10 @@ const useAssetLookup = () => {
       assetRows = [
         {
           code: nativeContractDetails.code,
-          issuer: contractId,
+          issuer: nativeContractDetails.issuer,
+          contract: contractId,
           domain: nativeContractDetails.domain,
+          name: `${nativeContractDetails.code}:${nativeContractDetails.issuer}`,
         },
       ];
 
@@ -325,12 +327,6 @@ const useAssetLookup = () => {
         dispatch({ type: "FETCH_DATA_ERROR", payload: DEFAULT_PAYLOAD });
         return;
       }
-
-      // Only show records that have a domain and domains that don't have just whitespace
-      // We omit these results as a safety precaution and to encourage asset issuers to add a domain to their asset
-      assetRows = assetRows.filter(
-        (record) => record.domain && /\S/.test(record.domain),
-      );
     }
 
     const assetsListsData = await getCombinedAssetListData({

extension/src/popup/components/sendPayment/SendAmount/hooks/useSimulateTxData.tsx

@@ -42,6 +42,7 @@ import {
 import { findAddressBalance } from "popup/helpers/balance";
 import { AppDispatch } from "popup/App";
 import { useScanTx } from "popup/helpers/blockaid";
+import { cleanAmount } from "popup/helpers/formatters";
 
 interface SimClassic {
   type: "classic";
@@ -375,7 +376,7 @@ function useSimulateTxData({
           ? Asset.native().contractId(networkDetails.networkPassphrase)
           : assetAddress;
       const parsedAmount = parseTokenAmount(
-        amount,
+        cleanAmount(amount),
         Number("decimals" in assetBalance ? assetBalance.decimals : 7),
       );
 
@@ -426,7 +427,7 @@ function useSimulateTxData({
           {
             sourceAsset,
             destAsset,
-            amount,
+            amount: cleanAmount(amount),
             destinationAmount,
             destination,
             allowedSlippage,

extension/src/popup/components/swap/SwapAmount/index.tsx

@@ -147,8 +147,12 @@ export const SwapAmount = ({
 
   const handleContinue = async (values: { amount: string }) => {
     const amount = inputType === "crypto" ? values.amount : priceValue!;
-    dispatch(saveAmount(cleanAmount(amount)));
-    await fetchSimulationData({ amount, destinationRate: dstAssetPrice });
+    const cleanedAmount = cleanAmount(amount);
+    dispatch(saveAmount(cleanedAmount));
+    await fetchSimulationData({
+      amount: cleanedAmount,
+      destinationRate: dstAssetPrice,
+    });
     setIsReviewingTx(true);
   };