From ba65c0de1f267cd71a9566b07931ad2ea2652ff4 Mon Sep 17 00:00:00 2001
From: madalinaraicu <madalina@vegaprotocol.io>
Date: Thu, 7 Jul 2022 08:16:33 +0300
Subject: [PATCH] fix: #657 rename set dialog open and awaiting confirmation
 dialog update

---
 .../lib/components/order-list/order-list.tsx    |  6 +++---
 .../vega-order-transaction-dialog.tsx           | 17 +++++++----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/libs/orders/src/lib/components/order-list/order-list.tsx b/libs/orders/src/lib/components/order-list/order-list.tsx
index 4826a6cb1..6e55d0d48 100644
--- a/libs/orders/src/lib/components/order-list/order-list.tsx
+++ b/libs/orders/src/lib/components/order-list/order-list.tsx
@@ -22,15 +22,15 @@ interface OrderListProps {
 
 export const OrderList = forwardRef<AgGridReact, OrderListProps>(
   ({ data }, ref) => {
-    const [orderDialogOpen, setOrderDialogOpen] = useState(false);
+    const [cancelOrderDialogOpen, setCancelOrderDialogOpen] = useState(false);
     const { transaction, finalizedOrder, reset, cancel } = useOrderCancel();
     return (
       <>
         <OrderListTable data={data} cancel={cancel} ref={ref} />
         <VegaTransactionDialog
           key={`cancel-order-dialog-${transaction.txHash}`}
-          orderDialogOpen={orderDialogOpen}
-          setOrderDialogOpen={setOrderDialogOpen}
+          orderDialogOpen={cancelOrderDialogOpen}
+          setOrderDialogOpen={setCancelOrderDialogOpen}
           finalizedOrder={finalizedOrder}
           transaction={transaction}
           reset={reset}
diff --git a/libs/wallet/src/vega-order-transaction-dialog/vega-order-transaction-dialog.tsx b/libs/wallet/src/vega-order-transaction-dialog/vega-order-transaction-dialog.tsx
index d546a28b4..8ec4fa294 100644
--- a/libs/wallet/src/vega-order-transaction-dialog/vega-order-transaction-dialog.tsx
+++ b/libs/wallet/src/vega-order-transaction-dialog/vega-order-transaction-dialog.tsx
@@ -22,6 +22,7 @@ export interface Order {
   price: string;
   market: Market | null;
   type: string | null;
+  side?: string;
 }
 
 interface VegaOrderTransactionDialogProps {
@@ -77,7 +78,7 @@ export const VegaOrderTransactionDialog = ({
       >
         {transaction.txHash && (
           <p className="break-all">
-            Tx hash: &nbsp;
+            Waiting for few more blocks - &nbsp;
             <a
               className="underline"
               data-testid="tx-hash"
@@ -85,7 +86,7 @@ export const VegaOrderTransactionDialog = ({
               target="_blank"
               rel="noreferrer"
             >
-              {transaction.txHash}
+              View in block explorer
             </a>
           </p>
         )}
@@ -109,11 +110,7 @@ export const VegaOrderTransactionDialog = ({
 
   return (
     <OrderDialogWrapper title={title} icon={<Icon name="tick" size={20} />}>
-      <div className="grid grid-cols-2 md:grid-cols-3 gap-8">
-        <div>
-          <p className={headerClassName}>{t(`Status`)}</p>
-          <p>{t(`${finalizedOrder.status}`)}</p>
-        </div>
+      <div className="grid grid-cols-1 md:grid-cols-2 gap-8">
         {finalizedOrder.market && (
           <div>
             <p className={headerClassName}>{t(`Market`)}</p>
@@ -121,12 +118,12 @@ export const VegaOrderTransactionDialog = ({
           </div>
         )}
         <div>
-          <p className={headerClassName}>{t(`Type`)}</p>
-          <p>{t(`${finalizedOrder.type}`)}</p>
+          <p className={headerClassName}>{t(`Status`)}</p>
+          <p>{t(`${finalizedOrder.status}`)}</p>
         </div>
         <div>
           <p className={headerClassName}>{t(`Amount`)}</p>
-          <p>
+          <p className={finalizedOrder.side}>
             {t(
               `${addDecimal(
                 finalizedOrder.size,