diff --git a/modules/stonks/ui/StonksOrderCard/StonksOrderCard.tsx b/modules/stonks/ui/StonksOrderCard/StonksOrderCard.tsx
index 539f9d8f..8143fee2 100644
--- a/modules/stonks/ui/StonksOrderCard/StonksOrderCard.tsx
+++ b/modules/stonks/ui/StonksOrderCard/StonksOrderCard.tsx
@@ -107,7 +107,7 @@ export function StonksOrderCard({
         </div>
       </Row>
 
-      {order.transactions ? (
+      {order.transactions?.length ? (
         <>
           {order.transactions.length > 1 ? (
             <>
diff --git a/modules/stonks/ui/StonksOrderResolverForm/StonksOrderResolverForm.tsx b/modules/stonks/ui/StonksOrderResolverForm/StonksOrderResolverForm.tsx
index 200e04ca..2a3c4da8 100644
--- a/modules/stonks/ui/StonksOrderResolverForm/StonksOrderResolverForm.tsx
+++ b/modules/stonks/ui/StonksOrderResolverForm/StonksOrderResolverForm.tsx
@@ -41,8 +41,7 @@ export function StonksOrderResolverForm() {
 
   const handleSubmit = async (values: FormData) => {
     try {
-      const isAddress = utils.isAddress(values.txHashOrAddress)
-      if (isAddress) {
+      if (utils.isAddress(values.txHashOrAddress)) {
         const orderContract = connectContractRpc(
           StonksOrderAbi__factory,
           values.txHashOrAddress,