fix: Fix some issues

fix: Fix some issues

Author: slient-coder

package.json

@@ -55,7 +55,7 @@
     "@types/react": "^18.0.9",
     "@types/react-cache": "^2.0.1",
     "@types/react-dom": "^18.0.4",
-    "@unisat/wallet-sdk": "1.8.0-beta.2",
+    "@unisat/wallet-sdk": "1.8.0",
     "antd": "^4.20.4",
     "antd-dayjs-webpack-plugin": "1.0.6",
     "assert": "^2.0.0",

patches/bitcoinjs-lib+6.1.6.patch

@@ -1,7 +1,25 @@
 diff --git a/node_modules/bitcoinjs-lib/src/psbt.js b/node_modules/bitcoinjs-lib/src/psbt.js
-index b071f37..1eded75 100644
+index b071f37..14b235a 100644
 --- a/node_modules/bitcoinjs-lib/src/psbt.js
 +++ b/node_modules/bitcoinjs-lib/src/psbt.js
+@@ -444,7 +444,7 @@ class Psbt {
+       sighashCache = sig.hashType;
+       hashCache = hash;
+       scriptCache = script;
+-      checkScriptForPubkey(pSig.pubkey, script, 'verify');
++      // checkScriptForPubkey(pSig.pubkey, script, 'verify');
+       results.push(validator(pSig.pubkey, hash, sig.signature));
+     }
+     return results.every(res => res === true);
+@@ -1194,7 +1194,7 @@ function getHashAndSighashType(
+     false,
+     sighashTypes,
+   );
+-  checkScriptForPubkey(pubkey, script, 'sign');
++  // checkScriptForPubkey(pubkey, script, 'sign');
+   return {
+     hash,
+     sighashType,
 @@ -1342,7 +1342,7 @@ function getTaprootHashesForSig(
      }
    }

src/ui/components/Input/index.tsx

@@ -192,10 +192,10 @@ export const AddressInput = (props: InputProps) => {
   const chain = useChain();
 
   let SUPPORTED_DOMAINS = ['sats', 'unisat', 'x', 'btc'];
-  let addressPlaceholder = 'Address or name (sats, unisat, ...) ';
+  let addressPlaceholder = 'Address or name (.sats, .unisat, ...) ';
   if (chain.isFractal) {
     SUPPORTED_DOMAINS = ['fb'];
-    addressPlaceholder = 'Address or name (fb) ';
+    addressPlaceholder = 'Address or name (.fb) ';
   }
 
   const tools = useTools();
@@ -210,6 +210,8 @@ export const AddressInput = (props: InputProps) => {
     const addressTips = getAddressTips(validAddress, chain.enum);
     if (addressTips.sendTip) {
       setAddressTip(addressTips.sendTip);
+    } else {
+      setAddressTip('');
     }
   }, [validAddress]);
 

src/ui/pages/Account/SwitchAccountScreen.tsx

@@ -11,14 +11,7 @@ import { useAppDispatch } from '@/ui/state/hooks';
 import { useCurrentKeyring } from '@/ui/state/keyrings/hooks';
 import { colors } from '@/ui/theme/colors';
 import { copyToClipboard, shortAddress, useWallet } from '@/ui/utils';
-import {
-  CheckCircleFilled,
-  CopyOutlined,
-  EditOutlined,
-  EllipsisOutlined,
-  KeyOutlined,
-  PlusCircleOutlined
-} from '@ant-design/icons';
+import { CopyOutlined, EditOutlined, EllipsisOutlined, KeyOutlined, PlusCircleOutlined } from '@ant-design/icons';
 
 import { useNavigate } from '../MainRoute';
 
@@ -52,14 +45,20 @@ export function MyItem({ account, autoNav }: MyItemProps, ref) {
   const tools = useTools();
 
   return (
-    <Card justifyBetween style={{ height: ITEM_HEIGHT - 8, marginTop: 8 }}>
+    <Card
+      justifyBetween
+      style={{
+        height: ITEM_HEIGHT - 8,
+        marginTop: 8,
+        borderColor: 'rgba(244,182,44,0.5)',
+        borderWidth: selected ? 1 : 0,
+        backgroundColor: selected ? 'rgba(244,182,44,0.1)' : colors.black_dark,
+        marginLeft: 10,
+        marginRight: 10
+      }}>
       <Row>
         <Column style={{ width: 20 }} selfItemsCenter>
-          {selected && (
-            <Icon>
-              <CheckCircleFilled />
-            </Icon>
-          )}
+          {selected ? <Icon icon="circle-check" color="gold" /> : <Icon icon="circle-check" color="white_muted2" />}
         </Column>
         <Column
           onClick={async (e) => {
@@ -198,7 +197,7 @@ export default function SwitchAccountScreen() {
           )
         }
       />
-      <Content style={{ height: layoutHeight }}>
+      <Content style={{ padding: 5 }}>
         <VirtualList
           data={items}
           data-id="list"

src/ui/pages/Account/SwitchKeyringScreen.tsx

@@ -12,14 +12,7 @@ import { useCurrentKeyring, useKeyrings } from '@/ui/state/keyrings/hooks';
 import { keyringsActions } from '@/ui/state/keyrings/reducer';
 import { colors } from '@/ui/theme/colors';
 import { shortAddress, useWallet } from '@/ui/utils';
-import {
-  CheckCircleFilled,
-  DeleteOutlined,
-  EditOutlined,
-  KeyOutlined,
-  PlusCircleOutlined,
-  SettingOutlined
-} from '@ant-design/icons';
+import { DeleteOutlined, EditOutlined, KeyOutlined, PlusCircleOutlined, SettingOutlined } from '@ant-design/icons';
 
 import { useNavigate } from '../MainRoute';
 
@@ -63,7 +56,17 @@ export function MyItem({ keyring, autoNav }: MyItemProps, ref) {
   const [removeVisible, setRemoveVisible] = useState(false);
 
   return (
-    <Card justifyBetween style={{ height: ITEM_HEIGHT - 8, marginTop: 8 }}>
+    <Card
+      justifyBetween
+      style={{
+        height: ITEM_HEIGHT - 8,
+        marginTop: 8,
+        borderColor: 'rgba(244,182,44,0.5)',
+        borderWidth: selected ? 1 : 0,
+        backgroundColor: selected ? 'rgba(244,182,44,0.1)' : colors.black_dark,
+        marginLeft: 10,
+        marginRight: 10
+      }}>
       <Row
         full
         onClick={async (e) => {
@@ -80,11 +83,7 @@ export function MyItem({ keyring, autoNav }: MyItemProps, ref) {
           if (autoNav) navigate('MainScreen');
         }}>
         <Column style={{ width: 20 }} selfItemsCenter>
-          {selected && (
-            <Icon>
-              <CheckCircleFilled />
-            </Icon>
-          )}
+          {selected ? <Icon icon="circle-check" color="gold" /> : <Icon icon="circle-check" color="white_muted2" />}
         </Column>
 
         <Column justifyCenter>
@@ -244,7 +243,7 @@ export default function SwitchKeyringScreen() {
           </Icon>
         }
       />
-      <Content>
+      <Content style={{ padding: 5 }}>
         <VirtualList
           ref={refList}
           data={items}

src/ui/pages/Approval/components/MultiSignPsbt/MultiSignDisclaimerModal.tsx

@@ -1,16 +1,19 @@
-import { Checkbox } from 'antd';
-import { useState } from 'react';
-
 import { Button, Column, Row, Text } from '@/ui/components';
 import { BottomModal } from '@/ui/components/BottomModal';
 import { colors } from '@/ui/theme/colors';
 import { fontSizes } from '@/ui/theme/font';
 import { CloseOutlined } from '@ant-design/icons';
 
-const disclaimStr = `You can sign all transactions at once, but please be aware that UniSat Wallet will skip checking these transactions during when signing at once. Please only use this feature on familiar and trusted websites.`;
-export default function MultiSignDisclaimerModal({ onClose, onContinue }: { onClose: any; onContinue: any }) {
-  const [understand, setUnderstand] = useState(false);
-
+const disclaimStr = `You have the option to sign all transactions at once, but please note that UniSat Wallet will not verify each transaction individually. We strongly recommend using it only on trusted and familiar websites to minimize the risk of potential losses.`;
+export default function MultiSignDisclaimerModal({
+  txCount,
+  onClose,
+  onContinue
+}: {
+  txCount: number;
+  onClose: any;
+  onContinue: any;
+}) {
   return (
     <BottomModal onClose={onClose}>
       <Column>
@@ -33,24 +36,12 @@ export default function MultiSignDisclaimerModal({ onClose, onContinue }: { onCl
           <Text
             mt="lg"
             style={{ fontSize: fontSizes.sm, lineHeight: 2 }}
-            text={'Before proceeding, please carefully read and accept the disclaimer.'}></Text>
+            text={`By proceeding, you confirm that you’ve read and accepted this disclaimer.`}></Text>
         </Column>
 
-        <Row justifyCenter>
-          <Checkbox
-            onChange={() => {
-              setUnderstand(!understand);
-            }}
-            checked={understand}
-            style={{ fontSize: fontSizes.sm }}>
-            <Text text="" />
-          </Checkbox>
-        </Row>
-
         <Button
-          text={`Continue to sign all at once`}
+          text={`Sign all ${txCount} transactions at once`}
           preset="primaryV2"
-          disabled={!understand}
           onClick={() => {
             onContinue();
           }}

src/ui/pages/Approval/components/MultiSignPsbt/index.tsx

@@ -312,6 +312,7 @@ export default function MultiSignPsbt({
       </Footer>
       {disclaimerVisible && (
         <MultiSignDisclaimerModal
+          txCount={txInfo.psbtHexs.length}
           onContinue={() => {
             handleConfirm();
           }}

src/ui/pages/Cat20/Cat20TokenScreen.tsx

@@ -1,11 +1,13 @@
 import { useEffect, useMemo, useState } from 'react';
 
+import { KEYRING_TYPE } from '@/shared/constant';
 import { runesUtils } from '@/shared/lib/runes-utils';
 import { AddressCAT20TokenSummary } from '@/shared/types';
 import { Button, Column, Content, Header, Icon, Layout, Row, Text } from '@/ui/components';
 import { useTools } from '@/ui/components/ActionComponent';
 import { BRC20Ticker } from '@/ui/components/BRC20Ticker';
 import { useCurrentAccount } from '@/ui/state/accounts/hooks';
+import { useCurrentKeyring } from '@/ui/state/keyrings/hooks';
 import { useCAT20TokenInfoExplorerUrl } from '@/ui/state/settings/hooks';
 import { colors } from '@/ui/theme/colors';
 import { fontSizes } from '@/ui/theme/font';
@@ -42,6 +44,9 @@ export default function CAT20TokenScreen() {
 
   const account = useCurrentAccount();
 
+  const keyring = useCurrentKeyring();
+  const tools = useTools();
+
   const [loading, setLoading] = useState(true);
 
   useEffect(() => {
@@ -122,6 +127,10 @@ export default function CAT20TokenScreen() {
                 preset="defaultV2"
                 icon="merge"
                 onClick={(e) => {
+                  if (keyring.type === KEYRING_TYPE.KeystoneKeyring) {
+                    tools.toastError('Merge UTXOs is not supported for Keystone yet');
+                    return;
+                  }
                   navigate('MergeCAT20Screen', {
                     cat20Balance: tokenSummary.cat20Balance,
                     cat20Info: tokenSummary.cat20Info
@@ -137,6 +146,10 @@ export default function CAT20TokenScreen() {
                 style={!enableTransfer ? { backgroundColor: 'grey' } : {}}
                 disabled={!enableTransfer}
                 onClick={(e) => {
+                  if (keyring.type === KEYRING_TYPE.KeystoneKeyring) {
+                    tools.toastError('Send CAT20 is not supported for Keystone yet');
+                    return;
+                  }
                   navigate('SendCAT20Screen', {
                     cat20Balance: tokenSummary.cat20Balance,
                     cat20Info: tokenSummary.cat20Info

src/ui/pages/Cat20/MergeCAT20Screen/MergeProgressLayout.tsx

@@ -60,7 +60,7 @@ export function MergeProgressLayout({
             preset="defaultV2"
             text="Quit Merging Process"
             onClick={(e) => {
-              onContinue();
+              window.history.go(-1);
             }}></Button>
         )}
 

src/ui/pages/Main/WalletTabScreen/Cat20List.tsx

@@ -3,7 +3,7 @@ import { useEffect, useState } from 'react';
 import { CAT20Balance } from '@/shared/types';
 import { Column, Row } from '@/ui/components';
 import { useTools } from '@/ui/components/ActionComponent';
-import { CAT20BalanceCard } from '@/ui/components/Cat20BalanceCard';
+import { CAT20BalanceCard } from '@/ui/components/CAT20BalanceCard';
 import { Empty } from '@/ui/components/Empty';
 import { Pagination } from '@/ui/components/Pagination';
 import { useCurrentAccount } from '@/ui/state/accounts/hooks';

src/ui/pages/Runes/SendRunesScreen.tsx

@@ -113,15 +113,6 @@ export default function SendRunesScreen() {
       return;
     }
 
-    let dustUtxo = 546;
-    try {
-      dustUtxo = getAddressUtxoDust(toInfo.address);
-    } catch (e) {
-      // console.log(e);
-    }
-
-    const minOutputValue = dustUtxo;
-
     if (outputValue < minOutputValue) {
       setError(`OutputValue must be at least ${minOutputValue}`);
       return;
@@ -163,7 +154,7 @@ export default function SendRunesScreen() {
         console.log(e);
         setError(e.message);
       });
-  }, [toInfo, inputAmount, feeRate, enableRBF, outputValue]);
+  }, [toInfo, inputAmount, feeRate, enableRBF, outputValue, minOutputValue]);
   return (
     <Layout>
       <Header

src/ui/styles/global.less

@@ -53,6 +53,11 @@ div {
   border: 0px solid;
 }
 
+::-webkit-scrollbar {
+  width: 0px;
+  height: 2px;
+}
+
 // For scrollbar
 ::-webkit-scrollbar-thumb {
   border-radius: 3px;
@@ -68,6 +73,15 @@ div {
   background: transparent;
 }
 
+.rc-virtual-list-scrollbar {
+  width: 6px !important;
+}
+.rc-virtual-list-scrollbar-thumb {
+  border-radius: 3px;
+  box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.1);
+  background: #4f4d4d !important;
+}
+
 .ant-tooltip {
   max-width: 300px !important;
 }

src/ui/theme/colors.ts

@@ -3,6 +3,7 @@
 const palette = {
   white: '#ffffff',
   white_muted: 'rgba(255, 255, 255, 0.5)',
+  white_muted2: 'rgba(255, 255, 255, 0.2)',
   black: '#000000',
   black_muted: 'rgba(0, 0, 0, 0.5)',
   black_muted2: 'rgba(0, 0, 0, 0.)',

yarn.lock

@@ -3023,10 +3023,10 @@
     "@typescript-eslint/types" "5.53.0"
     eslint-visitor-keys "^3.3.0"
 
-"@unisat/wallet-sdk@1.8.0-beta.2":
-  version "1.8.0-beta.2"
-  resolved "https://registry.yarnpkg.com/@unisat/wallet-sdk/-/wallet-sdk-1.8.0-beta.2.tgz#385b497d1923bc87351f06800724d1e42a6e814f"
-  integrity sha512-houBR5XQ41AiBZp0Zg02DRzgq3KLOzXE5WSdpkV1JB7tahVfFPlKEdDwvZ91Md1VY0JMZzX6I5hCKKeTPQ4/jw==
+"@unisat/wallet-sdk@1.8.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@unisat/wallet-sdk/-/wallet-sdk-1.8.0.tgz#b53ffcf8f66c1f03d3bb2eb3930c72e3b2c83332"
+  integrity sha512-qt2pR8lXqQln/FFNunFlnm55ucejyr3JGbyJvA3s/Qz13+MSjrH41WtyzzHUWfZbcSbEVHTzVb2MYwLNJYbDOA==
   dependencies:
     "@bitcoinerlab/secp256k1" "^1.0.5"
     "@keystonehq/keystone-sdk" "^0.3.0"