fix: rebase conflicts

Author: mateuszjasiuk

apps/namadillo/src/App/Common/SelectAssetModal.tsx

@@ -10,15 +10,14 @@ import clsx from "clsx";
 import { useAtomValue } from "jotai";
 import { useMemo, useState } from "react";
 import { twMerge } from "tailwind-merge";
-import { Address, Asset, NamadaAsset, WalletProvider } from "types";
+import { Address, Asset, NamadaAsset } from "types";
 
 type DisplayAmount = BigNumber;
 type FiatAmount = BigNumber;
 type SelectWalletModalProps = {
   onClose: () => void;
   onSelect: (address: Address) => void;
   assets: Asset[];
-  wallet: WalletProvider;
   walletAddress: string;
   ibcTransfer?: "deposit" | "withdraw";
   balances?: Record<Address, [DisplayAmount, FiatAmount?]>;
@@ -28,7 +27,6 @@ export const SelectAssetModal = ({
   onClose,
   onSelect,
   assets,
-  wallet,
   walletAddress,
   ibcTransfer,
   balances,
@@ -48,7 +46,7 @@ export const SelectAssetModal = ({
 
   return (
     <SelectModal title="Select Asset" onClose={onClose}>
-      <ConnectedWalletInfo wallet={wallet} walletAddress={walletAddress} />
+      <ConnectedWalletInfo walletAddress={walletAddress} />
       <div className="my-4">
         <Search placeholder="Search asset" onChange={setFilter} />
       </div>

apps/namadillo/src/App/Common/TransactionFee.tsx

@@ -1,19 +1,28 @@
 import BigNumber from "bignumber.js";
+import clsx from "clsx";
 import { TokenCurrency } from "./TokenCurrency";
 
 type TransactionFeeProps = {
   displayAmount: BigNumber;
   symbol: string;
+  compact?: boolean;
 };
 
 export const TransactionFee = ({
   displayAmount,
   symbol,
+  compact = false,
 }: TransactionFeeProps): JSX.Element => {
   return (
     <div className="flex w-full gap-2">
-      <span className="text-sm mt-[3px] ml-1 underline leading-none text-neutral-300">
-        Transaction Fee
+      <span
+        className={clsx(
+          "text-sm mt-[3px] ml-1 leading-none text-neutral-300",
+          { underline: !compact },
+          { "text-neutral-400": compact }
+        )}
+      >
+        {compact ? "Fee:" : "Transaction Fee"}
       </span>
       <TokenCurrency
         symbol={symbol}

apps/namadillo/src/App/Common/TransactionFeeButton.tsx

@@ -42,6 +42,7 @@ export const TransactionFeeButton = ({
         )}
       >
         <TransactionFee
+          compact={compact}
           displayAmount={gasDisplayAmount?.totalDisplayAmount || BigNumber(0)}
           symbol={(!compact && gasDisplayAmount?.asset.symbol) || ""}
         />

apps/namadillo/src/App/Common/__tests__/SelectAssetModal.test.tsx

@@ -1,6 +1,5 @@
 import { fireEvent, render, screen, waitFor } from "@testing-library/react";
 import { assetMockList } from "../__mocks__/assets";
-import { walletMock } from "../__mocks__/providers";
 import { SelectAssetModal } from "../SelectAssetModal";
 
 jest.mock("hooks/useIsChannelInactive", () => ({
@@ -21,7 +20,6 @@ describe("SelectAssetModal", () => {
         onClose={onCloseMock}
         onSelect={onSelectMock}
         assets={assetMockList}
-        wallet={walletMock}
         walletAddress={mockAddress}
       />
     );
@@ -34,7 +32,6 @@ describe("SelectAssetModal", () => {
         onClose={onCloseMock}
         onSelect={onSelectMock}
         assets={assetMockList}
-        wallet={walletMock}
         walletAddress={mockAddress}
       />
     );
@@ -48,7 +45,6 @@ describe("SelectAssetModal", () => {
         onClose={onCloseMock}
         onSelect={onSelectMock}
         assets={assetMockList}
-        wallet={walletMock}
         walletAddress={mockAddress}
       />
     );
@@ -69,7 +65,6 @@ describe("SelectAssetModal", () => {
         onClose={onCloseMock}
         onSelect={onSelectMock}
         assets={assetMockList}
-        wallet={walletMock}
         walletAddress={mockAddress}
       />
     );

apps/namadillo/src/App/Swap/SwapCalculations.tsx

@@ -265,7 +265,6 @@ export const SwapCalculations = (): JSX.Element => {
           balances={balances}
           onSelect={onChangeSellSelectedAsset}
           walletAddress={shieldedAccountAddress}
-          wallet={wallets.namada}
         />
       )}
       {buyAssetSelectorModalOpen && shieldedAccountAddress && (
@@ -275,7 +274,6 @@ export const SwapCalculations = (): JSX.Element => {
           balances={balances}
           onSelect={onChangeBuySelectedAsset}
           walletAddress={shieldedAccountAddress}
-          wallet={wallets.namada}
         />
       )}
       {walletSelectorModalOpen && (

apps/namadillo/src/App/Swap/hooks/usePerformOsmosisSwapTx.tsx

@@ -127,8 +127,10 @@ export function usePerformOsmosisSwapTx(): UsePerformOsmosisSwapResult {
         invariant(buyAmount, "No buy amount");
         invariant(sellAsset && buyAsset, "Missing swap assets");
 
-        const toTrace = buyAsset.traces?.find((t) => t.type === "ibc")?.chain
-          .path;
+        const toTrace =
+          buyAsset.traces?.find((t) => t.type === "ibc")?.chain.path ||
+          // For NAM token, we want to use address directly
+          buyAsset.address;
         invariant(toTrace, "No IBC trace found");
 
         const route = quote.routes[0]?.pools;

apps/namadillo/src/App/Transfer/TransferDestination.tsx

@@ -2,6 +2,8 @@ import { Asset } from "@chain-registry/types";
 import { Stack } from "@namada/components";
 import { AccountType } from "@namada/types";
 import { shortenAddress } from "@namada/utils";
+import { ConnectProviderButton } from "App/Common/ConnectProviderButton";
+import { TokenAmountCard } from "App/Common/TokenAmountCard";
 import { TransactionFee } from "App/Common/TransactionFee";
 import { TransactionFeeButton } from "App/Common/TransactionFeeButton";
 import { routes } from "App/routes";
@@ -28,12 +30,10 @@ import { Address } from "types";
 import namadaShieldedIcon from "./assets/namada-shielded.svg";
 import namadaTransparentIcon from "./assets/namada-transparent.svg";
 import shieldedEye from "./assets/shielded-eye.svg";
-import { ConnectProviderButton } from "./ConnectProviderButton";
 import { CustomAddressForm } from "./CustomAddressForm";
 import { DestinationAddressModal } from "./DestinationAddressModal";
 import { SelectedWallet } from "./SelectedWallet";
 import { ShieldedPropertiesTooltip } from "./ShieldedPropertiesTooltip";
-import { TokenAmountCard } from "./TokenAmountCard";
 
 type TransferDestinationProps = {
   isShieldedAddress?: boolean;

apps/namadillo/src/App/Transfer/TransferModule.tsx

@@ -1,4 +1,5 @@
 import { ActionButton, Stack } from "@namada/components";
+import { CurrentStatus } from "App/Common/CurrentStatus";
 import { IconTooltip } from "App/Common/IconTooltip";
 import { InlineError } from "App/Common/InlineError";
 import { params, routes } from "App/routes";
@@ -24,7 +25,6 @@ import { AssetWithAmountAndChain } from "types";
 import { filterAvailableAssetsWithBalance } from "utils/assets";
 import { getDisplayGasFee } from "utils/gas";
 import { isIbcAddress, isShieldedAddress } from "./common";
-import { CurrentStatus } from "./CurrentStatus";
 import { IbcChannels } from "./IbcChannels";
 import { SelectToken } from "./SelectToken";
 import { SuccessAnimation } from "./SuccessAnimation";

apps/namadillo/src/App/Transfer/TransferSource.tsx

@@ -1,15 +1,15 @@
 import { Asset } from "@chain-registry/types";
 import { AmountInput, Tooltip } from "@namada/components";
+import { AvailableAmountFooter } from "App/Common/AvailableAmountFooter";
+import { SelectedAsset } from "App/Common/SelectedAsset";
+import { TokenAmountCard } from "App/Common/TokenAmountCard";
 import BigNumber from "bignumber.js";
 import clsx from "clsx";
 import { wallets } from "integrations";
 import { Address } from "types";
 import namadaShieldedIcon from "./assets/namada-shielded.svg";
 import namadaTransparentIcon from "./assets/namada-transparent.svg";
-import { AvailableAmountFooter } from "./AvailableAmountFooter";
 import { isShieldedAddress, isTransparentAddress } from "./common";
-import { SelectedAsset } from "./SelectedAsset";
-import { TokenAmountCard } from "./TokenAmountCard";
 
 export type TransferSourceProps = {
   isLoadingAssets?: boolean;