Merge pull request #372 from aura-nw/dev

fix disabled tx memo
aura-nw · Dec 20, 2023 · e86b1ed · e86b1ed
2 parents 0cf45e2 + eb2ba4f
commit e86b1ed
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 11 deletions.
diff --git a/src/components/Input/TxMemo/index.tsx b/src/components/Input/TxMemo/index.tsx
@@ -7,7 +7,13 @@ type Props = {
 }
 const TxMemo = ({ txMemo, setTxMemo, disabled }: Props) => {
   return (
-    <TextField disabled={disabled} placeholder="Transaction memo (optional)" label="Transaction memo" value={txMemo} onChange={setTxMemo} />
+    <TextField
+      disabled={disabled}
+      placeholder="Transaction memo (optional)"
+      label="Transaction memo"
+      value={txMemo}
+      onChange={setTxMemo}
+    />
   )
 }
 

diff --git a/src/pages/Transactions/TxActionModal/ClaimReward/index.tsx b/src/pages/Transactions/TxActionModal/ClaimReward/index.tsx
@@ -116,7 +116,7 @@ export default function Execute({ open, onClose, data, sendTx, rejectTx, disable
                   <Gap height={24} />
                 </>
               )}
-              <TxMemo txMemo={txMemo} setTxMemo={setTxMemo} disabled={action === 'execute'} />
+              <TxMemo txMemo={txMemo} setTxMemo={setTxMemo} disabled />
               <Gap height={24} />
               <Amount label="Total Allocation Amount" amount={formatNativeToken(+data.txDetails?.fee || 0)} />
             </>

diff --git a/src/pages/Transactions/TxActionModal/ContractInteraction/index.tsx b/src/pages/Transactions/TxActionModal/ContractInteraction/index.tsx
@@ -125,7 +125,7 @@ export default function Execute({ open, onClose, data, sendTx, rejectTx, disable
                   <Gap height={24} />
                 </>
               )}
-              <TxMemo txMemo={txMemo} setTxMemo={setTxMemo} disabled={action === 'execute'} />
+              <TxMemo txMemo={txMemo} setTxMemo={setTxMemo} disabled />
               <Gap height={24} />
               <Divider />
               <Amount label="Total Allocation Amount" amount={formatNativeToken(+data.txDetails?.fee || 0)} />

diff --git a/src/pages/Transactions/TxActionModal/CustomTransaction/index.tsx b/src/pages/Transactions/TxActionModal/CustomTransaction/index.tsx
@@ -110,7 +110,7 @@ export default function Execute({ open, onClose, data, sendTx, rejectTx, disable
           </div>
           <Divider />
           <div className="msgs">
-            {JSON.parse(data.txDetails?.rawMessage).map((message, index) => {
+            {JSON.parse(data.txDetails?.rawMessage ?? []).map((message, index) => {
               return <Message key={index} index={index} msgData={message} />
             })}
           </div>
@@ -147,7 +147,7 @@ export default function Execute({ open, onClose, data, sendTx, rejectTx, disable
                   <Gap height={16} />
                 </>
               )}
-              <TxMemo txMemo={txMemo} setTxMemo={setTxMemo} disabled={action === 'execute'} />
+              <TxMemo txMemo={txMemo} setTxMemo={setTxMemo} disabled />
               <Gap height={16} />
               <Divider />
               <Amount

diff --git a/src/pages/Transactions/TxActionModal/Delegate/index.tsx b/src/pages/Transactions/TxActionModal/Delegate/index.tsx
@@ -128,7 +128,7 @@ export default function Execute({ open, onClose, data, sendTx, rejectTx, disable
                   <Gap height={24} />
                 </>
               )}
-              <TxMemo txMemo={txMemo} setTxMemo={setTxMemo} disabled={action === 'execute'} />
+              <TxMemo txMemo={txMemo} setTxMemo={setTxMemo} disabled />
               <Gap height={24} />
               <Amount amount={formatNativeToken(data?.txDetails?.txMessage[0]?.amount)} />
               <Divider />

diff --git a/src/pages/Transactions/TxActionModal/MultiSend/index.tsx b/src/pages/Transactions/TxActionModal/MultiSend/index.tsx
@@ -133,7 +133,7 @@ export default function Execute({ open, onClose, data, sendTx, rejectTx, disable
                   <Gap height={16} />
                 </>
               )}
-              <TxMemo txMemo={txMemo} setTxMemo={setTxMemo} disabled={action === 'execute'} />
+              <TxMemo txMemo={txMemo} setTxMemo={setTxMemo} disabled />
               <Gap height={16} />
               <Amount label="Total Amount" amount={formatNativeToken(totalAmount)} />
               <Divider />

diff --git a/src/pages/Transactions/TxActionModal/Redelegate/index.tsx b/src/pages/Transactions/TxActionModal/Redelegate/index.tsx
@@ -135,7 +135,7 @@ export default function Execute({ open, onClose, data, sendTx, rejectTx, disable
                   <Gap height={24} />
                 </>
               )}
-              <TxMemo txMemo={txMemo} setTxMemo={setTxMemo} disabled={action === 'execute'} />
+              <TxMemo txMemo={txMemo} setTxMemo={setTxMemo} disabled />
               <Gap height={24} />
               <Amount amount={formatNativeToken(data?.txDetails?.txMessage[0]?.amount)} />
               <Divider />

diff --git a/src/pages/Transactions/TxActionModal/Send/index.tsx b/src/pages/Transactions/TxActionModal/Send/index.tsx
@@ -123,7 +123,7 @@ export default function Execute({ open, onClose, data, sendTx, rejectTx, disable
                 </>
               )}
               <Gap height={16} />
-              <TxMemo txMemo={txMemo} setTxMemo={setTxMemo} disabled={action === 'execute'} />
+              <TxMemo txMemo={txMemo} setTxMemo={setTxMemo} disabled />
               <Divider />
               <Amount label="Total Allocation Amount" amount={totalAllocationAmount} />
               <Divider />

diff --git a/src/pages/Transactions/TxActionModal/Undelegate/index.tsx b/src/pages/Transactions/TxActionModal/Undelegate/index.tsx
@@ -131,7 +131,7 @@ export default function Execute({ open, onClose, data, sendTx, rejectTx, disable
                   <Gap height={24} />
                 </>
               )}
-              <TxMemo txMemo={txMemo} setTxMemo={setTxMemo} disabled={action === 'execute'} />
+              <TxMemo txMemo={txMemo} setTxMemo={setTxMemo} disabled />
               <Gap height={24} />
               <Amount amount={formatNativeToken(data?.txDetails?.txMessage[0]?.amount)} />
               <Divider />

diff --git a/src/pages/Transactions/TxActionModal/Vote/index.tsx b/src/pages/Transactions/TxActionModal/Vote/index.tsx
@@ -130,7 +130,7 @@ export default function Execute({ open, onClose, data, sendTx, rejectTx, disable
                   <Gap height={16} />
                 </>
               )}
-              <TxMemo txMemo={txMemo} setTxMemo={setTxMemo} disabled={action === 'execute'} />
+              <TxMemo txMemo={txMemo} setTxMemo={setTxMemo} disabled />
               <Gap height={16} />
               <Amount label="Total Allocation Amount" amount={formatNativeToken(+data.txDetails?.fee || 0)} />
             </>