update text

bensideone · bensideone · commit 99dbbb9696f9 · 2025-07-22T09:20:37.000+08:00
diff --git a/build/_raw/js/remove_console.js b/build/_raw/js/remove_console.js
@@ -1,8 +1,8 @@
 var fn = function () {
   // do nothing
 };
-// window.console = {
-//   log: fn,
-//   dir: fn,
-//   error: fn
-// };
+window.console = {
+  log: fn,
+  dir: fn,
+  error: fn
+};
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "side-wallet",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "private": true,
   "scripts": {
     "clean": "mkdir -p dist && rm -rf dist/* && cp -r build/_raw/* dist",
diff --git a/src/background/controller/wallet.ts b/src/background/controller/wallet.ts
@@ -436,7 +436,6 @@ export class WalletController extends BaseController {
       ADDRESS_TYPES.filter((v) => v.displayIndex >= 0).forEach((v) => {
         let pubkey = pathPubkey[v.hdPath];
         if (!pubkey && _keyring.getAccountByHdPath) {
-          console.log(1111);
           pubkey = _keyring.getAccountByHdPath(v.hdPath, index);
         }
         const address = publicKeyToAddress(pubkey, v.value, networkType);
diff --git a/src/ui/hooks/lending/useCreateLoan.tsx b/src/ui/hooks/lending/useCreateLoan.tsx
@@ -2,12 +2,14 @@ import { useState } from 'react';
 import toast from 'react-hot-toast';
 
 import { sideLendingMessageComposer } from '@/codegen/src';
+import { NetworkType } from '@/shared/types';
 import ToastView from '@/ui/components/ToastView';
 import { useNavigate } from '@/ui/pages/MainRoute';
 import services from '@/ui/services';
 import { GetTxByHashResponse } from '@/ui/services/tx/types';
 import { useCurrentAccount } from '@/ui/state/accounts/hooks';
 import { useEnvironment } from '@/ui/state/environment/hooks';
+import { useNetworkType } from '@/ui/state/settings/hooks';
 import { useSignAndBroadcastTxRaw } from '@/ui/state/transactions/hooks/cosmos';
 import { toXOnly } from '@/ui/wallet-sdk/utils';
 import { Coin } from '@cosmjs/amino';
@@ -16,6 +18,7 @@ import { Box } from '@mui/material';
 
 export function useCreateLoan() {
   const { sideChain, SERVICE_BASE_URL } = useEnvironment();
+  const networkType = useNetworkType();
 
   const [loading, setLoading] = useState(false);
 
@@ -27,6 +30,8 @@ export function useCreateLoan() {
 
   const navigate = useNavigate();
 
+  const referralCode = networkType === NetworkType.TESTNET ? 'SIDE1234' : '';
+
   const createLoan = async ({
     borrowAmount,
     maturityTime,
@@ -53,7 +58,7 @@ export function useCreateLoan() {
         borrowerPubkey: toXOnly(Buffer.from(fromHex(currentAccount.pubkey))).toString('hex'),
         maturity: BigInt(maturityTime),
         poolId: poolId,
-        referralCode: '',
+        referralCode,
         borrowerAuthPubkey: toXOnly(Buffer.from(fromHex(currentAccount.pubkey))).toString('hex')
       });
       const result = await signAndBroadcastTxRaw({
@@ -145,6 +150,7 @@ export function useCreateLoan() {
     createLoan,
     loading,
     visible,
-    setVisible
+    setVisible,
+    referralCode
   };
 }
diff --git a/src/ui/hooks/useSend.ts b/src/ui/hooks/useSend.ts
@@ -62,7 +62,7 @@ export function useSend() {
     });
   }
 
-  const handleSubmit = async (successText?: string) => {
+  const handleSubmit = async (options?: { text?: string; title?: string }) => {
     try {
       if (!curToken) {
         throw new Error('Token not found');
@@ -88,7 +88,12 @@ export function useSend() {
         feeDenom: feeDenom,
         memo
       });
-      navigate('TxSuccessScreen', { txid: result.tx_response.txhash, chain: CHAINS_ENUM.SIDE, text: successText });
+      navigate('TxSuccessScreen', {
+        txid: result.tx_response.txhash,
+        chain: CHAINS_ENUM.SIDE,
+        text: options?.text,
+        title: options?.title
+      });
     } catch (err) {
       const errorString = err instanceof Error ? err.message : typeof err == 'string' ? err : '';
 
diff --git a/src/ui/pages/Account/CreateHDWalletScreen/index.tsx b/src/ui/pages/Account/CreateHDWalletScreen/index.tsx
@@ -3,7 +3,6 @@ import { useLocation } from 'react-router-dom';
 
 import { AddressType, RestoreWalletType } from '@/shared/types';
 import { Column, Header, Layout, StepBar } from '@/ui/components';
-import { useExtensionIsInTab } from '@/ui/features/browser/tabs';
 
 import { useNavigate } from '../../MainRoute';
 import Step1_Create from './Step1_Create';
@@ -14,7 +13,6 @@ import { ContextData, TabType, UpdateContextDataParams, WordsType } from './type
 
 export default function CreateHDWalletScreen() {
   const navigate = useNavigate();
-  const isInTab = useExtensionIsInTab();
 
   const { state } = useLocation();
   const { isImport, fromUnlock } = state as {
@@ -26,7 +24,7 @@ export default function CreateHDWalletScreen() {
     mnemonics: '',
     hdPath: '',
     passphrase: '',
-    addressType: AddressType.P2WPKH,
+    addressType: AddressType.P2TR,
     step1Completed: false,
     tabType: TabType.STEP1,
     restoreWalletType: RestoreWalletType.UNISAT,
diff --git a/src/ui/pages/Lending/EarnTabScreen.tsx b/src/ui/pages/Lending/EarnTabScreen.tsx
@@ -346,7 +346,7 @@ export default function EarnTabScreen() {
                 }}
                 onClick={(event) => {
                   event.stopPropagation();
-                  window.open(`${SIDE_STATION_URL}/lendingPool/${item.baseData.id}`, '_blank');
+                  window.open(`${SIDE_STATION_URL}/markets/pool/${item.baseData.id}`, '_blank');
                 }}>
                 Details
               </Typography>
diff --git a/src/ui/pages/Lending/LendingTabScreen.tsx b/src/ui/pages/Lending/LendingTabScreen.tsx
@@ -135,10 +135,12 @@ export default function LendingTanScreen() {
     [borrowAmount, collateralAmount, dlcPrice]
   );
 
+  const { loading, createLoan, referralCode } = useCreateLoan();
+
   const data = [
     {
       label: 'Referral Code',
-      value: '-',
+      value: referralCode,
       tips: ''
     },
     {
@@ -306,8 +308,6 @@ export default function LendingTanScreen() {
     }
   ];
 
-  const { loading, createLoan } = useCreateLoan();
-
   const [isChecked, setIsChecked] = useState(false);
   const [isHoverMaturity, setIsHoverMaturity] = useState(false);
 
@@ -343,7 +343,7 @@ export default function LendingTanScreen() {
       )}`;
     } else if (+(requestFeeToken?.amount || '0') < +(poolData?.baseData.config.request_fee.amount || '0')) {
       isDisabled = true;
-      buttonText = 'No enough balance';
+      buttonText = 'Insufficient SIDE Balance';
     }
     return {
       isDisabled,
diff --git a/src/ui/pages/Lending/LoanClaimScreen.tsx b/src/ui/pages/Lending/LoanClaimScreen.tsx
@@ -82,7 +82,7 @@ export default function LoanClaimScreen() {
   return (
     <Layout>
       <Header
-        title="Claim BTC"
+        title="Claim & Cancel"
         onBack={() => {
           window.history.go(-1);
         }}
diff --git a/src/ui/pages/Main/RegisterEvmAddress.tsx b/src/ui/pages/Main/RegisterEvmAddress.tsx
@@ -2,19 +2,19 @@ import BigNumber from 'bignumber.js';
 import { ethers } from 'ethers';
 import { useEffect, useMemo } from 'react';
 
-import { Button, Column, Content, Footer, Header, Icon, Input, Layout, Row, Text } from '@/ui/components';
+import { Button, Column, Content, Footer, Header, Icon, Input, Layout, LightTooltip, Row, Text } from '@/ui/components';
 import ImageIcon from '@/ui/components/ImageIcon';
 import { useSend } from '@/ui/hooks/useSend';
-import { useCurrentAccount } from '@/ui/state/accounts/hooks';
 import { useEnvironment } from '@/ui/state/environment/hooks';
 import { useResetUiTxCreateScreen, useUpdateUiTxCreateSendSideScreen } from '@/ui/state/ui/hooks';
+import { colors } from '@/ui/theme/colors';
 import { isValidAddress } from '@/ui/utils';
+import { Stack, Typography } from '@mui/material';
 
 export default function RegisterEvmAddress() {
-  const currentAccount = useCurrentAccount();
   const setUiState = useUpdateUiTxCreateSendSideScreen();
   const reset = useResetUiTxCreateScreen();
-  const { EVM_COLLECTOR } = useEnvironment();
+  const { EVM_COLLECTOR, sideChain } = useEnvironment();
 
   useEffect(() => {
     setUiState({ base: 'uside', toInfo: { address: EVM_COLLECTOR, domain: '' } });
@@ -62,16 +62,48 @@ export default function RegisterEvmAddress() {
               borderRadius: '10px',
               padding: '16px'
             }}>
-            <Text text="Burn Address" color="white" size="xs" />
-            <Text
-              text={currentAccount.address}
-              color="white"
-              size="sm"
-              style={{
-                fontWeight: 500,
-                overflowWrap: 'break-word'
+            <Stack direction="row">
+              <LightTooltip
+                title={
+                  'Any SIDE sent to this address will be reserved for future token burns and cannot be recovered. This is a permanent and irreversible action. '
+                }
+                arrow
+                placement="top">
+                <Typography
+                  sx={{
+                    fontSize: '12px',
+                    color: colors.grey12,
+                    textDecoration: 'dotted underline',
+                    textUnderlineOffset: '2px',
+                    cursor: 'pointer',
+                    transition: '.4s',
+                    ':hover': {
+                      color: colors.white
+                    }
+                  }}>
+                  Burn Address
+                </Typography>
+              </LightTooltip>
+            </Stack>
+            <Typography
+              sx={{
+                fontSize: '12px',
+                fontWeight: 400,
+                color: colors.white,
+                overflowWrap: 'break-word',
+                textDecoration: 'dotted underline',
+                textUnderlineOffset: '2px',
+                cursor: 'pointer',
+                transition: '.4s',
+                ':hover': {
+                  color: colors.main
+                }
               }}
-            />
+              onClick={() => {
+                window.open(`${sideChain.explorerUrl}/address/${toInfo.address}`, '_blank');
+              }}>
+              {toInfo.address}
+            </Typography>
           </Column>
 
           <Row
@@ -152,10 +184,13 @@ export default function RegisterEvmAddress() {
       <Footer px="zero" py="zero">
         <Button
           preset="primary"
-          text={+inputAmount > +available ? 'Insufficient Balance' : 'Next'}
+          text={+inputAmount > +available ? 'Insufficient Balance' : 'Confirm'}
           disabled={disabled}
           onClick={() => {
-            handleSubmit('Please follow us on X and stay tuned for further announcements regarding the TGE.');
+            handleSubmit({
+              text: 'Please follow us on X and stay tuned for further announcements regarding the TGE.',
+              title: 'Registration completed!'
+            });
           }}
         />
       </Footer>
diff --git a/src/ui/pages/Main/WalletTabScreen/index.tsx b/src/ui/pages/Main/WalletTabScreen/index.tsx
@@ -1,17 +1,17 @@
 import { useEffect, useState } from 'react';
 
 import { AddressFlagType } from '@/shared/constant';
+import { NetworkType } from '@/shared/types';
 import { checkAddressFlag } from '@/shared/utils';
 import { Column, Footer, Image, Layout, Row, Text } from '@/ui/components';
 import ImageIcon from '@/ui/components/ImageIcon';
 import { NavTabBar } from '@/ui/components/NavTabBar';
-import { getCurrentTab } from '@/ui/features/browser/tabs';
 import useGetAccountBalanceByUSD from '@/ui/hooks/useGetAccountBalanceByUSD';
 import { useAddressSummary, useCurrentAccount } from '@/ui/state/accounts/hooks';
 import { accountActions } from '@/ui/state/accounts/reducer';
 import { useEnvironment } from '@/ui/state/environment/hooks';
 import { useAppDispatch } from '@/ui/state/hooks';
-import { useBlockstreamUrl } from '@/ui/state/settings/hooks';
+import { useBlockstreamUrl, useNetworkType } from '@/ui/state/settings/hooks';
 import { colors } from '@/ui/theme/colors';
 import { getTruncate, useWallet } from '@/ui/utils';
 import { Stack } from '@mui/material';
@@ -25,16 +25,12 @@ export default function WalletTabScreen() {
   const navigate = useNavigate();
   const [balanceVisible, setBalanceVisible] = useState(true);
   const currentAccount = useCurrentAccount();
+  const networkType = useNetworkType();
 
   const wallet = useWallet();
-  const [connected, setConnected] = useState(false);
   const dispatch = useAppDispatch();
   const { sideChain } = useEnvironment();
   const accountBalanceByUSD = useGetAccountBalanceByUSD();
-
-  const [showSafeNotice, setShowSafeNotice] = useState(false);
-  const [showDisableUnconfirmedUtxoNotice, setShowDisableUnconfirmedUtxoNotice] = useState(false);
-
   const addressSummary = useAddressSummary();
 
   const blockStreamUrl = useBlockstreamUrl();
@@ -47,28 +43,12 @@ export default function WalletTabScreen() {
             wallet.addAddressFlag(currentAccount, AddressFlagType.CONFIRMED_UTXO_MODE).then((account) => {
               dispatch(accountActions.setCurrent(account));
             });
-            setShowDisableUnconfirmedUtxoNotice(true);
           }
         }
       }
     }
   }, [addressSummary, currentAccount]);
 
-  useEffect(() => {
-    const run = async () => {
-      const show = await wallet.getShowSafeNotice();
-      setShowSafeNotice(show);
-
-      const activeTab = await getCurrentTab();
-      if (!activeTab) return;
-      const site = await wallet.getCurrentConnectedSite(activeTab.id);
-      if (site) {
-        setConnected(site.isConnected);
-      }
-    };
-    run();
-  }, []);
-
   const [buyBtcModalVisible, setBuyBtcModalVisible] = useState(false);
   const [isHoveredMoney, setIsHoveredMoney] = useState(false);
   const handleMouseOver = () => {
@@ -259,29 +239,31 @@ export default function WalletTabScreen() {
           </div>
         </Row>
 
-        <Stack
-          direction="row"
-          justifyContent="center"
-          sx={{
-            m: '12px',
-            py: '4px',
-            fontSize: '12px',
-            fontWeight: 500,
-            color: colors.grey12,
-            bgcolor: colors.card_bgColor,
-            borderRadius: '10px',
-            transition: '.4s',
-            ':hover': {
-              bgcolor: colors.grey_dark
-            }
-          }}
-          onClick={() => {
-            navigate('RegisterEvmAddress');
-          }}>
-          Register for TGE
-        </Stack>
+        {networkType === NetworkType.MAINNET && (
+          <Stack
+            direction="row"
+            justifyContent="center"
+            sx={{
+              margin: '12px 12px 0',
+              py: '4px',
+              fontSize: '12px',
+              fontWeight: 500,
+              color: colors.grey12,
+              bgcolor: colors.card_bgColor,
+              borderRadius: '10px',
+              transition: '.4s',
+              ':hover': {
+                bgcolor: colors.grey_dark
+              }
+            }}
+            onClick={() => {
+              navigate('RegisterEvmAddress');
+            }}>
+            Register for TGE
+          </Stack>
+        )}
 
-        <Column mb="xl" px="lg">
+        <Column my="lg" px="lg">
           <SideTokenList balanceVisible={balanceVisible} />
         </Column>
       </Column>
diff --git a/src/ui/pages/Settings/AddressTypeScreen.tsx b/src/ui/pages/Settings/AddressTypeScreen.tsx
diff --git a/src/ui/pages/Wallet/TxSuccessScreen.tsx b/src/ui/pages/Wallet/TxSuccessScreen.tsx

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "side-wallet",`
`3`		`- "version": "1.1.1",`
	`3`	`+ "version": "1.1.2",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
`6`	`6`	`"clean": "mkdir -p dist && rm -rf dist/* && cp -r build/_raw/* dist",`
Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,6 @@ export class WalletController extends BaseController {`
`436`	`436`	`ADDRESS_TYPES.filter((v) => v.displayIndex >= 0).forEach((v) => {`
`437`	`437`	`let pubkey = pathPubkey[v.hdPath];`
`438`	`438`	`if (!pubkey && _keyring.getAccountByHdPath) {`
`439`		`- console.log(1111);`
`440`	`439`	`pubkey = _keyring.getAccountByHdPath(v.hdPath, index);`
`441`	`440`	`}`
`442`	`441`	`const address = publicKeyToAddress(pubkey, v.value, networkType);`