small misc improvements

CashScript · Jun 1, 2024 · 2643880 · 2643880
1 parent 3f97afb
commit 2643880
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/public/trash.svg b/public/trash.svg
diff --git a/src/components/ContractFunction.tsx b/src/components/ContractFunction.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import { Contract, AbiFunction, Argument, Network, Recipient, SignatureTemplate, ElectrumNetworkProvider, Utxo } from 'cashscript'
+import { Contract, AbiFunction, Argument, Network, Recipient, SignatureTemplate, Utxo } from 'cashscript'
 import { Form, InputGroup, Button, Card } from 'react-bootstrap'
 import { readAsType, ExplorerString, Wallet, NamedUtxo } from './shared'
 
@@ -229,7 +229,7 @@ const ContractFunction: React.FC<Props> = ({ contract, abi, network, wallets, co
         </InputGroup>
       </div>
       <Form style={{ marginTop: '5px', marginBottom: '5px', display: "inline-block" }}>
-        <Form.Check
+      <Form.Check
           type="switch"
           id={"outputHasFT" + abi?.name + "index" + index}
           label="add tokens to output"

diff --git a/src/components/Wallets.tsx b/src/components/Wallets.tsx
@@ -135,13 +135,7 @@ const WalletInfo: React.FC<Props> = ({network, wallets, setWallets}) => {
           className="inputName"
           placeholder="name"
         />
-        <Button
-          style={{padding: "0px 6px"}}
-          onClick={() => removeWallet(index)}
-          variant="danger"
-          size="sm">
-          x
-        </Button>
+        <img src='./trash.svg' onClick={() => removeWallet(index)} style={{padding: "0px 6px", width: "fit-content", cursor:"pointer"}}/>
       </Card.Header>
       <Card.Body>
         <Card.Text><strong>Pubkey hex:</strong></Card.Text>
@@ -166,12 +160,13 @@ const WalletInfo: React.FC<Props> = ({network, wallets, setWallets}) => {
           <Card.Text><strong>Hex:</strong></Card.Text>
           <CopyText>{wallet.privKeyHex}</CopyText>
         </details>
-        <details>
-          <summary>Show utxos</summary>
-          <div>
-            <InfoUtxos utxos={wallet.utxos}/>
-          </div>
-        </details>
+        {wallet.utxos.length ? 
+          (<details>
+            <summary>Show utxos</summary>
+            <div>
+              <InfoUtxos utxos={wallet.utxos}/>
+            </div>
+          </details>) : null}
       </Card.Body>
     </Card>
   ))

diff --git a/src/components/shared/CopyText.tsx b/src/components/shared/CopyText.tsx
@@ -23,7 +23,7 @@ const CopyText: React.FC<Props> = ({ children }) => {
         style={{ cursor: 'pointer' }}
       >
         {children}
-        { copied && <Badge style={{ marginLeft: '0.5rem', padding: "5px 10px" }} pill variant="success">Copied!</Badge> }        
+        { copied && <Badge style={{ marginLeft: '0.5rem', padding: "5px 10px" }} pill bg="success">Copied!</Badge> }        
       </Card.Text>
     </>
   );