fix(conflicts) fix merge conflicts from feature branch

Author: p2arthur

src/features/accounts/components/transaction-sender-link.tsx

@@ -1,9 +1,7 @@
 import { AddressOrNfdLink, AddressOrNfdLinkProps } from './address-or-nfd-link'
 import { cn } from '@/features/common/utils'
 
-export type Props = AddressOrNfdLinkProps & {
-  autoPopulated?: boolean
-}
+export type Props = AddressOrNfdLinkProps & { autoPopulated?: boolean }
 
 export default function TransactionSenderLink(props: Props) {
   const { autoPopulated, className, ...rest } = props

src/features/forms/components/address-form-item.tsx

@@ -11,7 +11,6 @@ import { z } from 'zod'
 
 export type AddressOrNfdFieldSchema = z.infer<typeof addressFieldSchema>
 export type OptionalAddressOrNfdFieldSchema = z.infer<typeof optionalAddressFieldSchema>
-export type OptionalSenderFieldSchema = z.infer<typeof optionalAddressFieldSchema>
 
 export interface AddressFieldProps<TSchema extends Record<string, unknown> = Record<string, unknown>>
   extends Omit<FormItemProps<TSchema>, 'children'> {
@@ -42,14 +41,9 @@ function ResolveNfdAddress({ nfd, onNfdResolved }: ResolveNfdAddressProps) {
 }
 
 export function AddressFormItem({ field, resolvedAddressField, label, ...props }: AddressFormItemProps) {
-  const { watch, setValue } = useFormContext<OptionalAddressOrNfdFieldSchema>()
-  const rawValue = watch(field)
-
-  //type guard
-  const value = typeof rawValue === 'string' ? rawValue : ''
-
-  const rawResolved = watch(resolvedAddressField)
-  const resolvedAddress = typeof rawResolved === 'string' ? rawResolved : ''
+  const { watch, setValue } = useFormContext<AddressOrNfdFieldSchema | OptionalAddressOrNfdFieldSchema>()
+  const value = watch(field) as string
+  const resolvedAddress = watch(resolvedAddressField) as string
 
   const setAddress = useCallback((address: string) => setValue(resolvedAddressField, address), [resolvedAddressField, setValue])
   useEffect(() => {

src/features/forms/components/form.tsx

@@ -16,7 +16,7 @@ export interface FormProps<TData, TSchema extends Record<string, unknown>> {
   children:
     | ReactNode
     | ((helper: FormFieldHelper<TSchema>, handleSubmit: (e?: React.FormEvent<HTMLFormElement>) => Promise<void>) => ReactNode)
-  formAction: ReactNode | ((ctx: UseFormReturn<TSchema, any, TSchema>, resetLocalState: () => void) => ReactNode)
+  formAction: ReactNode | ((ctx: UseFormReturn<TSchema, any, any>, resetLocalState: () => void) => ReactNode)
   onSuccess?: (data: TData) => void
   onSubmit: (values: z.infer<z.ZodEffects<any, TSchema, unknown>>) => Promise<TData> | TData
   resetOnSuccess?: boolean

src/features/transaction-wizard/components/app-call-transaction-builder.tsx

@@ -53,7 +53,7 @@ export function AppCallTransactionBuilder({ mode, transaction, activeAccount, de
         id: transaction?.id ?? randomGuid(),
         type: BuildableTransactionType.AppCall,
         applicationId: BigInt(values.applicationId),
-        sender: await resolveSenderAddress(values.sender!),
+        sender: await resolveSenderAddress(values.sender),
         onComplete: Number(values.onComplete),
         extraProgramPages: values.extraProgramPages,
         fee: values.fee,

src/features/transaction-wizard/components/application-create-transaction-builder.tsx

@@ -58,7 +58,7 @@ export function ApplicationCreateTransactionBuilder({ mode, transaction, activeA
         type: BuildableTransactionType.ApplicationCreate,
         approvalProgram: values.approvalProgram,
         clearStateProgram: values.clearStateProgram,
-        sender: await resolveSenderAddress(values.sender!),
+        sender: await resolveSenderAddress(values.sender),
         onComplete: Number(values.onComplete),
         extraProgramPages: values.extraProgramPages,
         globalInts: values.globalInts,

src/features/transaction-wizard/components/method-call-transaction-builder.tsx

@@ -157,7 +157,7 @@ export function MethodCallTransactionBuilder({
         applicationId: BigInt(values.applicationId),
         methodDefinition: methodDefinition,
         onComplete: Number(values.onComplete),
-        sender: await resolveSenderAddress(values.sender!),
+        sender: await resolveSenderAddress(values.sender),
         extraProgramPages: values.extraProgramPages,
         appSpec: appSpec!,
         methodArgs: methodArgs,

src/features/transaction-wizard/components/transactions-table.tsx

@@ -216,7 +216,6 @@ const getTableColumns = ({
       return transactionPositions.get(transaction.id)!
     },
   },
-
   {
     header: 'Type',
     accessorFn: (item) => asTransactionLabelFromBuildableTransactionType(item.type),

src/features/transaction-wizard/data/common.ts

@@ -49,7 +49,6 @@ export const optionalAddressFieldSchema = z
   })
 
 export const senderFieldSchema = { sender: addressFieldSchema }
-
 export const receiverFieldSchema = { receiver: addressFieldSchema }
 
 export const noteFieldSchema = { note: zfd.text(z.string().optional()) }

src/features/transaction-wizard/mappers/as-address-or-nfd.ts

@@ -16,13 +16,10 @@ export const asAddressOrNfd = (addressOrAccount: Address | ActiveWalletAccount):
   } satisfies AddressOrNfd
 }
 
-export const asOptionalAddressOrNfd = (addressOrNfdSchema?: Partial<AddressOrNfd>): AddressOrNfd | undefined => {
-  if (!addressOrNfdSchema) return undefined
-  if (!addressOrNfdSchema.value || !addressOrNfdSchema.resolvedAddress) return undefined
-  return {
-    value: addressOrNfdSchema.value,
-    resolvedAddress: addressOrNfdSchema.resolvedAddress,
-  } satisfies AddressOrNfd
+export const asOptionalAddressOrNfd = (addressOrNfdSchema: Partial<AddressOrNfd>) => {
+  return addressOrNfdSchema.value && addressOrNfdSchema.resolvedAddress
+    ? ({ value: addressOrNfdSchema.value, resolvedAddress: addressOrNfdSchema.resolvedAddress } satisfies AddressOrNfd)
+    : undefined
 }
 
 export const asOptionalAddressOrNfdSchema = (address?: Address) => {

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

@@ -391,10 +391,10 @@ const asKeyRegistrationTransaction = async (transaction: BuildKeyRegistrationTra
     : algorandClient.createTransaction.offlineKeyRegistration(params))
 }
 
-export const asFee = (fee: BuildAssetCreateTransactionResult['fee']) =>
+const asFee = (fee: BuildAssetCreateTransactionResult['fee']) =>
   !fee.setAutomatically && fee.value != null ? { staticFee: algos(fee.value) } : undefined
 
-export const asValidRounds = (validRounds: BuildAssetCreateTransactionResult['validRounds']) =>
+const asValidRounds = (validRounds: BuildAssetCreateTransactionResult['validRounds']) =>
   !validRounds.setAutomatically && validRounds.firstValid && validRounds.lastValid
     ? {
         firstValidRound: validRounds.firstValid,