reafactor(non-null): remove non-null assertion from the transaction mappers

Author: p2arthur

src/features/transaction-wizard/mappers/as-algosdk-transactions.ts

@@ -123,7 +123,7 @@ export const asMethodCallParams = async (transaction: BuildMethodCallTransaction
   )
 
   return {
-    sender: transaction.sender.resolvedAddress!,
+    sender: transaction.sender.resolvedAddress,
     appId: BigInt(transaction.applicationId),
     method: transaction.methodDefinition.abiMethod,
     args: args,
@@ -158,7 +158,7 @@ const asMethodCallTransactions = async (transaction: BuildMethodCallTransactionR
 
 export const asAppCallTransactionParams = (transaction: BuildAppCallTransactionResult): AppCallParams => {
   return {
-    sender: transaction.sender.resolvedAddress!,
+    sender: transaction.sender.resolvedAddress,
     appId: BigInt(transaction.applicationId),
     args: transaction.args.map((arg) => base64ToBytes(arg)),
     onComplete: transaction.onComplete,
@@ -181,7 +181,7 @@ const asAppCallTransaction = async (transaction: BuildAppCallTransactionResult):
 
 export const asApplicationCreateTransactionParams = (transaction: BuildApplicationCreateTransactionResult): AppCreateParams => {
   return {
-    sender: transaction.sender.resolvedAddress!,
+    sender: transaction.sender.resolvedAddress,
     args: transaction.args.map((arg) => base64ToBytes(arg)),
     onComplete: transaction.onComplete,
     approvalProgram: base64ToBytes(transaction.approvalProgram),
@@ -206,7 +206,7 @@ const asApplicationCreateTransaction = async (transaction: BuildApplicationCreat
 
 export const asApplicationUpdateTransactionParams = (transaction: BuildApplicationUpdateTransactionResult): AppUpdateParams => {
   return {
-    sender: transaction.sender.resolvedAddress!,
+    sender: transaction.sender.resolvedAddress,
     appId: BigInt(transaction.applicationId),
     args: transaction.args.map((arg) => base64ToBytes(arg)),
     approvalProgram: base64ToBytes(transaction.approvalProgram),
@@ -239,8 +239,8 @@ export const asAssetTransferTransactionParams = (
     amount = BigInt(convertedAmount.toString())
   }
   return {
-    sender: transaction.sender.resolvedAddress!,
-    receiver: 'receiver' in transaction ? transaction.receiver.resolvedAddress : transaction.sender.resolvedAddress!,
+    sender: transaction.sender.resolvedAddress,
+    receiver: 'receiver' in transaction ? transaction.receiver.resolvedAddress : transaction.sender.resolvedAddress,
     clawbackTarget: 'clawbackTarget' in transaction ? transaction.clawbackTarget.resolvedAddress : undefined,
     closeAssetTo: 'closeRemainderTo' in transaction ? transaction.closeRemainderTo.resolvedAddress : undefined,
     assetId: BigInt(transaction.asset.id),
@@ -259,7 +259,7 @@ const asAssetTransferTransaction = async (
 ): Promise<algosdk.Transaction> => {
   if (
     transaction.type === BuildableTransactionType.AssetClawback &&
-    (!transaction.asset.clawback || transaction.sender.resolvedAddress! !== transaction.asset.clawback)
+    (!transaction.asset.clawback || transaction.sender.resolvedAddress !== transaction.asset.clawback)
   ) {
     throw new Error('Invalid clawback transaction')
   }
@@ -270,7 +270,7 @@ const asAssetTransferTransaction = async (
 
 export const asAssetCreateTransactionParams = (transaction: BuildAssetCreateTransactionResult): AssetCreateParams => {
   return {
-    sender: transaction.sender.resolvedAddress!,
+    sender: transaction.sender.resolvedAddress,
     total: transaction.total,
     decimals: transaction.decimals,
     assetName: transaction.assetName,
@@ -294,7 +294,7 @@ const asAssetCreateTransaction = async (transaction: BuildAssetCreateTransaction
 
 const asAssetReconfigureTransactionParams = (transaction: BuildAssetReconfigureTransactionResult): AssetConfigParams => {
   return {
-    sender: transaction.sender.resolvedAddress!,
+    sender: transaction.sender.resolvedAddress,
     assetId: BigInt(transaction.asset.id),
     manager: transaction.manager ? transaction.manager.resolvedAddress : undefined,
     reserve: transaction.reserve ? transaction.reserve.resolvedAddress : undefined,
@@ -312,7 +312,7 @@ const asAssetReconfigureTransaction = async (transaction: BuildAssetReconfigureT
 
 const asAssetDestroyTransactionParams = (transaction: BuildAssetDestroyTransactionResult): AssetDestroyParams => {
   return {
-    sender: transaction.sender.resolvedAddress!,
+    sender: transaction.sender.resolvedAddress,
     assetId: BigInt(transaction.asset.id),
   }
 }
@@ -338,7 +338,7 @@ export const asAssetConfigTransactionParams = (
 
 export const asAssetFreezeTransactionParams = (transaction: BuildAssetFreezeTransactionResult): AssetFreezeParams => {
   return {
-    sender: transaction.sender.resolvedAddress!,
+    sender: transaction.sender.resolvedAddress,
     assetId: BigInt(transaction.asset.id),
     account: transaction.freezeTarget.resolvedAddress,
     frozen: transaction.frozen,
@@ -348,7 +348,7 @@ export const asAssetFreezeTransactionParams = (transaction: BuildAssetFreezeTran
   }
 }
 const asAssetFreezeTransaction = async (transaction: BuildAssetFreezeTransactionResult): Promise<algosdk.Transaction> => {
-  if (!transaction.asset.freeze || transaction.sender.resolvedAddress! !== transaction.asset.freeze) {
+  if (!transaction.asset.freeze || transaction.sender.resolvedAddress !== transaction.asset.freeze) {
     throw new Error('Invalid freeze transaction')
   }
 
@@ -365,7 +365,7 @@ export const asKeyRegistrationTransactionParams = (
     invariant(transaction.stateProofKey, 'State proof key is required')
 
     return {
-      sender: transaction.sender.resolvedAddress!,
+      sender: transaction.sender.resolvedAddress,
       voteKey: Uint8Array.from(Buffer.from(transaction.voteKey, 'base64')),
       selectionKey: Uint8Array.from(Buffer.from(transaction.selectionKey, 'base64')),
       stateProofKey: Uint8Array.from(Buffer.from(transaction.stateProofKey, 'base64')),
@@ -379,7 +379,7 @@ export const asKeyRegistrationTransactionParams = (
   }
 
   return {
-    sender: transaction.sender.resolvedAddress!,
+    sender: transaction.sender.resolvedAddress,
   }
 }
 

src/features/transaction-wizard/mappers/as-description-list-items.tsx

@@ -142,7 +142,7 @@ const asAssetTransferTransaction = (
     },
     {
       dt: 'Sender',
-      dd: <TransactionSenderLink autoPopulated={transaction.sender.autoPopulated} address={String(params.sender)} />,
+      dd: <TransactionSenderLink autoPopulated={transaction.sender.autoPopulated} address={params.sender} />,
     },
     {
       dt: 'Receiver',
@@ -194,7 +194,7 @@ const asAssetConfigTransaction = (
     ...('decimals' in params && params.decimals !== undefined ? [{ dt: 'Decimals', dd: params.decimals }] : []),
     {
       dt: transaction.type === BuildableTransactionType.AssetCreate ? 'Creator' : 'Sender',
-      dd: <TransactionSenderLink autoPopulated={transaction.sender.autoPopulated} address={String(params.sender)} />,
+      dd: <TransactionSenderLink autoPopulated={transaction.sender.autoPopulated} address={params.sender} />,
     },
     ...('manager' in params && params.manager
       ? [
@@ -249,7 +249,7 @@ const asAssetFreezeTransaction = (transaction: BuildAssetFreezeTransactionResult
     },
     {
       dt: 'Sender',
-      dd: <TransactionSenderLink autoPopulated={transaction.sender.autoPopulated} address={String(params.sender)} />,
+      dd: <TransactionSenderLink autoPopulated={transaction.sender.autoPopulated} address={params.sender} />,
     },
     ...('account' in params && params.account
       ? [
@@ -275,7 +275,7 @@ const asKeyRegistrationTransaction = (transaction: BuildKeyRegistrationTransacti
   return [
     {
       dt: 'Sender',
-      dd: <TransactionSenderLink autoPopulated={transaction.sender.autoPopulated} address={String(params.sender)} />,
+      dd: <TransactionSenderLink autoPopulated={transaction.sender.autoPopulated} address={params.sender} />,
     },
     {
       dt: 'Registration',
@@ -387,7 +387,7 @@ const asAppCallTransaction = (transaction: BuildAppCallTransactionResult): Descr
     },
     {
       dt: 'Sender',
-      dd: <TransactionSenderLink autoPopulated={transaction.sender.autoPopulated} address={String(params.sender)} />,
+      dd: <TransactionSenderLink autoPopulated={transaction.sender.autoPopulated} address={params.sender} />,
     },
     ...(transaction.extraProgramPages !== undefined
       ? [
@@ -440,7 +440,7 @@ const asMethodCallTransaction = (
     },
     {
       dt: 'Sender',
-      dd: <TransactionSenderLink autoPopulated={transaction.sender.autoPopulated} address={String(params.sender)} />,
+      dd: <TransactionSenderLink autoPopulated={transaction.sender.autoPopulated} address={params.sender} />,
     },
     ...(transaction.extraProgramPages !== undefined
       ? [
@@ -700,7 +700,7 @@ const asApplicationCreateTransaction = (transaction: BuildApplicationCreateTrans
     },
     {
       dt: 'Sender',
-      dd: <TransactionSenderLink autoPopulated={transaction.sender.autoPopulated} address={String(params.sender)} />,
+      dd: <TransactionSenderLink autoPopulated={transaction.sender.autoPopulated} address={params.sender} />,
     },
     {
       dt: 'Approval program',
@@ -763,7 +763,7 @@ const asApplicationUpdateTransaction = (transaction: BuildApplicationUpdateTrans
     },
     {
       dt: 'Sender',
-      dd: <TransactionSenderLink autoPopulated={transaction.sender.autoPopulated} address={String(params.sender)} />,
+      dd: <TransactionSenderLink autoPopulated={transaction.sender.autoPopulated} address={params.sender} />,
     },
     {
       dt: 'Approval program',

src/features/transaction-wizard/utils/resolve-sender-address.ts

@@ -1,4 +1,3 @@
-import { OptionalSenderFieldSchema } from '@/features/forms/components/address-form-item'
 import {
   TESTNET_FEE_SINK_ADDRESS,
   MAINNET_FEE_SINK_ADDRESS,
@@ -11,7 +10,7 @@ import { settingsStore } from '@/features/settings/data'
 import { betanetId, mainnetId, testnetId, fnetId, localnetId } from '@/features/network/data'
 import { algorandClient } from '@/features/common/data/algo-client'
 
-export default async function resolveSenderAddress(data: OptionalSenderFieldSchema): Promise<TransactionSender> {
+export default async function resolveSenderAddress(data?: { value?: string; resolvedAddress?: string }): Promise<TransactionSender> {
   const { id: networkId } = settingsStore.get(networkConfigAtom)
 
   const val = data?.value ?? ''