fix: cleanup

Author: neocybereth

apps/namadillo/src/App/Transactions/LocalStorageTransactionCard.tsx

@@ -35,17 +35,9 @@ export const LocalStorageTransactionCard = ({
 }: TransactionCardProps): JSX.Element => {
   const namadaAssetsMap = useAtomValue(namadaRegistryChainAssetsMapAtom);
   const namadaAsset =
-    namadaAssetsMap.data ?
-      Object.values(namadaAssetsMap.data).find((namadaAsset) => {
-        // If the transaction asset has an address, try to match it directly
-        if (
-          transaction.asset.symbol &&
-          namadaAsset.symbol === transaction.asset.symbol
-        ) {
-          return true;
-        }
-      })
-    : undefined;
+    namadaAssetsMap.data &&
+      Object.values(namadaAssetsMap.data).find((namadaAsset) => transaction.asset.symbol &&
+          namadaAsset.symbol === transaction.asset.symbol);
 
   // Use the Namada asset address if available, otherwise try the original asset address
   const assetAddress = namadaAsset?.address || transaction.asset.address;
@@ -54,12 +46,12 @@ export const LocalStorageTransactionCard = ({
     tokenPricesFamily(assetAddress ? [assetAddress] : [])
   );
   const tokenPrice =
-    assetAddress ? tokenPrices.data?.[assetAddress] : undefined;
+    assetAddress  && tokenPrices.data?.[assetAddress];
 
   // Ensure displayAmount is a BigNumber before performing calculations
   const displayAmount = BigNumber(transaction.displayAmount);
   const dollarAmount =
-    tokenPrice ? displayAmount.multipliedBy(tokenPrice) : undefined;
+    tokenPrice && displayAmount.multipliedBy(tokenPrice);
 
   const renderKeplrIcon = (address: string): JSX.Element | null => {
     if (isShieldedAddress(address)) return null;

apps/namadillo/src/App/Transactions/TransactionCard.tsx

@@ -18,6 +18,8 @@ import { allValidatorsAtom } from "atoms/validators";
 import BigNumber from "bignumber.js";
 import clsx from "clsx";
 import { useAtomValue } from "jotai";
+import { AtomWithQueryResult } from "jotai-tanstack-query";
+import { useCallback } from "react";
 import { FaLock } from "react-icons/fa6";
 import {
   IoCheckmarkCircleOutline,
@@ -85,14 +87,23 @@ export function getToken(
   return undefined;
 }
 
-const getVoteTransactionInfo = (
-  tx: Tx["tx"]
-): VoteTransactionInfo | undefined => {
-  if (!tx?.data) return undefined;
-  const parsed = typeof tx.data === "string" ? JSON.parse(tx.data) : tx.data;
+const getVoteTransactionInfo = (tx: Tx["tx"]): VoteTransactionInfo => {
+  if (!tx?.data)
+    return {
+      proposalId: "",
+      vote: "",
+    };
+
+  let parsed;
+  try {
+    parsed = JSON.parse(tx.data);
+  } catch (error) {
+    parsed = tx.data;
+  }
+
   return {
-    proposalId: parsed.id,
-    vote: parsed.vote,
+    proposalId: parsed.id || "",
+    vote: parsed.vote || "",
   };
 };
 
@@ -103,7 +114,7 @@ const getBondOrUnbondTransactionInfo = (
 
   let parsed: BondData;
   try {
-    parsed = typeof tx.data === "string" ? JSON.parse(tx.data) : tx.data;
+    parsed = JSON.parse(tx.data);
   } catch {
     return undefined;
   }
@@ -165,7 +176,7 @@ const useTransactionCardData = (
   asset: NamadaAsset | undefined;
   transparentAddress: string;
   transactionFailed: boolean;
-  validators: ReturnType<typeof useAtomValue<typeof allValidatorsAtom>>;
+  validators: AtomWithQueryResult<Validator[], Error>;
 } => {
   const transaction = tx.tx;
   const nativeToken = useAtomValue(nativeTokenAddressAtom).data;
@@ -434,9 +445,8 @@ const TransactionAmount = ({
   const tokenPrices = useAtomValue(
     tokenPricesFamily(asset?.address ? [asset.address] : [])
   );
-  const tokenPrice =
-    asset?.address ? tokenPrices.data?.[asset.address] : undefined;
-  const dollarAmount = tokenPrice ? amount.multipliedBy(tokenPrice) : undefined;
+  const tokenPrice = asset?.address && tokenPrices.data?.[asset.address];
+  const dollarAmount = tokenPrice && amount.multipliedBy(tokenPrice);
 
   return (
     <div className="flex items-center">
@@ -469,11 +479,11 @@ const BondUnbondTransactionCard = ({ tx }: Props): JSX.Element => {
     (v) => v.address === txnInfo?.receiver
   );
 
-  const getTitle = (): string => {
+  const getTitle = useCallback((): string => {
     if (transaction?.kind === "bond") return "Stake";
     if (transaction?.kind === "unbond") return "Unstake";
     return "Bond/Unbond";
-  };
+  }, [transaction?.kind]);
 
   return (
     <TransactionCardContainer
@@ -581,8 +591,7 @@ const RedelegationTransactionCard = ({ tx }: Props): JSX.Element => {
 const VoteTransactionCard = ({ tx }: Props): JSX.Element => {
   const { transaction, transactionFailed } = useTransactionCardData(tx);
   const voteInfo = getVoteTransactionInfo(transaction);
-  const proposalId =
-    voteInfo?.proposalId ? BigInt(voteInfo.proposalId) : undefined;
+  const proposalId = voteInfo?.proposalId && BigInt(voteInfo.proposalId);
   const proposal = useAtomValue(proposalFamily(proposalId || BigInt(0)));
   const navigate = useNavigate();
 

package.json

@@ -27,7 +27,7 @@
     "git-commit-msg-linter": "^5.0.6",
     "husky": "^8.0.3",
     "lint-staged": "^15.2.0",
-    "prettier": "^3.3.3",
+    "prettier": "^3.6.2",
     "prettier-plugin-organize-imports": "^3.2.4",
     "stream-browserify": "^3.0.0",
     "typescript": "5.5.4",

yarn.lock

@@ -21736,4 +21736,4 @@ __metadata:
   resolution: "zxcvbn@npm:4.4.2"
   checksum: 10c0/862f101cc95247b30290bad67ade333e430a16763bb771ce4e4c5414396d987f9a64288225675c96bd6f8d3eba65da0dee119b2a4eaa2e249da3f540b036942e
   languageName: node
-  linkType: hard
+  linkType: hard