@unisat/wallet-state 1.1.0 → 1.2.0

package/src/context/WalletContext.tsx

@@ -17,11 +17,12 @@ import {
   AlkanesInfo,
   Announcement,
   AppInfo,
+  AppExtra,
   AppSummary,
+  BRC20HistoryItem,
   BabylonAddressSummary,
   BitcoinBalance,
   BitcoinBalanceV2,
-  BRC20HistoryItem,
   BtcChannelItem,
   CAT20Balance,
   CAT20MergeOrder,
@@ -32,27 +33,27 @@ import {
   CosmosSignDataType,
   DecodedPsbt,
   DummyTxType,
-  LocalPsbtSummary,
   FeeSummary,
   InscribeOrder,
   Inscription,
   InscriptionSummary,
+  LocalPsbtSummary,
   RateUsStatus,
   RuneBalance,
+  SignPsbtOptions,
   SignedData,
   SignedMessage,
-  SignPsbtOptions,
   StoredNotification,
   TickPriceItem,
-  TokenBalance,
-  TokenTransfer,
   ToSignData,
   ToSignInput,
   ToSignMessage,
+  TokenBalance,
+  TokenTransfer,
   TxHistoryItem,
-  UnspentOutput,
   UTXO,
   UTXO_Detail,
+  UnspentOutput,
   VersionDetail,
   WalletConfig,
   WalletKeyring,
@@ -243,6 +244,7 @@ export interface WalletController {
     amount: number
     btcUtxos: UnspentOutput[]
     feeRate: number
+    enableRBF?: boolean
     memo?: string
     memos?: string[]
   }): Promise<ToSignData>
@@ -251,6 +253,7 @@ export interface WalletController {
     to: string
     btcUtxos: UnspentOutput[]
     feeRate: number
+    enableRBF?: boolean
   }): Promise<ToSignData>
 
   createSendInscriptionPsbt(data: {
@@ -259,6 +262,7 @@ export interface WalletController {
     feeRate: number
     outputValue?: number
     btcUtxos: UnspentOutput[]
+    enableRBF?: boolean
   }): Promise<ToSignData>
 
   createSendMultipleInscriptionsPsbt(data: {
@@ -266,6 +270,7 @@ export interface WalletController {
     inscriptionIds: string[]
     feeRate: number
     btcUtxos: UnspentOutput[]
+    enableRBF?: boolean
   }): Promise<ToSignData>
 
   createSplitInscriptionPsbt(data: {
@@ -273,6 +278,7 @@ export interface WalletController {
     feeRate: number
     outputValue: number
     btcUtxos: UnspentOutput[]
+    enableRBF?: boolean
   }): Promise<ToSignData>
 
   pushTx(rawtx: string): Promise<string>
@@ -339,24 +345,39 @@ export interface WalletController {
     pageSize: number
   ): Promise<{ currentPage: number; pageSize: number; total: number; list: Inscription[] }>
 
-  getBRC20List(
-    address: string,
-    currentPage: number,
+  getBRC20List({
+    address,
+    currentPage,
+    pageSize,
+  }: {
+    address: string
+    currentPage: number
     pageSize: number
-  ): Promise<{ currentPage: number; pageSize: number; total: number; list: TokenBalance[] }>
+  }): Promise<{ currentPage: number; pageSize: number; total: number; list: TokenBalance[] }>
 
-  getBRC20ProgList(
-    address: string,
-    currentPage: number,
+  getBRC20ProgList({
+    address,
+    currentPage,
+    pageSize,
+  }: {
+    address: string
+    currentPage: number
     pageSize: number
-  ): Promise<{ currentPage: number; pageSize: number; total: number; list: TokenBalance[] }>
-
-  getBRC20TransferableList(
-    address: string,
-    ticker: string,
-    currentPage: number,
+  }): Promise<{ currentPage: number; pageSize: number; total: number; list: TokenBalance[] }>
+
+  getBRC20TransferableList({
+    address,
+    ticker,
+    tickerHex,
+    currentPage,
+    pageSize,
+  }: {
+    address: string
+    ticker: string
+    tickerHex: string
+    currentPage: number
     pageSize: number
-  ): Promise<{ currentPage: number; pageSize: number; total: number; list: TokenTransfer[] }>
+  }): Promise<{ currentPage: number; pageSize: number; total: number; list: TokenTransfer[] }>
 
   getOrdinalsInscriptions(
     address: string,
@@ -364,7 +385,13 @@ export interface WalletController {
     pageSize: number
   ): Promise<{ currentPage: number; pageSize: number; total: number; list: Inscription[] }>
 
-  getBRC20Summary(address: string, ticker: string): Promise<AddressTokenSummary>
+  getBRC20Summary({
+    address,
+    ticker,
+  }: {
+    address: string
+    ticker: string
+  }): Promise<AddressTokenSummary>
 
   expireUICachedData(address: string): Promise<void>
 
@@ -447,6 +474,7 @@ export interface WalletController {
     btcUtxos?: UnspentOutput[]
     assetUtxos?: UnspentOutput[]
     outputValue?: number
+    enableRBF?: boolean
   }): Promise<ToSignData>
 
   setAutoLockTimeId(timeId: number): Promise<void>
@@ -505,6 +533,7 @@ export interface WalletController {
   getMergeCAT20Status(version: 'v1' | 'v2', mergeId: string): Promise<any>
 
   getAppList(): Promise<{ tab: string; items: AppInfo[] }[]>
+  getAppExtra(id: string | number, locale?: string): Promise<AppExtra>
   getBannerList(): Promise<{ id: string; img: string; link: string }[]>
   getBlockActiveInfo(): Promise<{ allTransactions: number; allAddrs: number }>
 
@@ -613,7 +642,8 @@ export interface WalletController {
 
   createSendBTCOffsetPsbt(
     tos: { address: string; satoshis: number }[],
-    feeRate: number
+    feeRate: number,
+    enableRBF?: boolean
   ): Promise<ToSignData>
 
   getAlkanesList(
@@ -636,6 +666,7 @@ export interface WalletController {
     amount: string
     feeRate: number
     type: 'ft' | 'nft'
+    enableRBF?: boolean
   }): Promise<ToSignData>
 
   getAlkanesCollectionList(
@@ -679,6 +710,8 @@ export interface WalletController {
 
   getAcceptLowFeeMode(): Promise<boolean>
   setAcceptLowFeeMode(accept: boolean): Promise<void>
+  getEnableRBF(): Promise<boolean>
+  setEnableRBF(enableRBF: boolean): Promise<void>
 
   createTmpKeyringWithPublicKey(publicKey: string, addressType: AddressType): Promise<WalletKeyring>
 
@@ -711,4 +744,4 @@ const useWallet = () => {
   return wallet
 }
 
-export { useWallet, WalletProvider }
+export { WalletProvider, useWallet }

package/src/hooks/settings.ts

@@ -162,6 +162,16 @@ export function useBRC20TokenInfoExplorerUrl(ticker: string) {
   return `${chain.unisatExplorerUrl}/brc20/${encodeURIComponent(ticker)}`
 }
 
+export function useRunesTokenInfoExplorerUrl(runeId: string) {
+  const chain = useChain()!
+  return `${chain.unisatExplorerUrl}/runes/detail/${encodeURIComponent(runeId)}`
+}
+
+export function useAlkanesTokenInfoExplorerUrl(alkaneId: string) {
+  const chain = useChain()!
+  return `${chain.unisatExplorerUrl}/alkanes/detail/${encodeURIComponent(alkaneId)}`
+}
+
 export function useUnisatWebsite() {
   const chainType = useChainType()
   return CHAINS_MAP[chainType]!.unisatUrl

package/src/hooks/transactions.ts

@@ -35,6 +35,7 @@ export function usePrepareSendBTCCallback() {
       memo,
       memos,
       disableAutoAdjust,
+      enableRBF,
     }: {
       toAddressInfo: ToAddressInfo
       toAmount: number
@@ -42,6 +43,7 @@ export function usePrepareSendBTCCallback() {
       memo?: string
       memos?: string[]
       disableAutoAdjust?: boolean
+      enableRBF?: boolean
     }) => {
       let _utxos: UnspentOutput[] = utxos
       if (_utxos.length === 0) {
@@ -65,6 +67,7 @@ export function usePrepareSendBTCCallback() {
           to: toAddressInfo.address,
           btcUtxos: _utxos,
           feeRate,
+          enableRBF,
         })
       } else {
         res = await wallet.createSendBTCPsbt({
@@ -72,6 +75,7 @@ export function usePrepareSendBTCCallback() {
           amount: toAmount,
           btcUtxos: _utxos,
           feeRate,
+          enableRBF,
           memo: memo!,
           memos: memos!,
         })
@@ -91,10 +95,12 @@ export function usePrepareSendBypassHeadOffsetsCallback() {
       toAddressInfo,
       toAmount,
       feeRate,
+      enableRBF,
     }: {
       toAddressInfo: ToAddressInfo
       toAmount: number
       feeRate: number
+      enableRBF?: boolean
     }) => {
       const res = await wallet.createSendBTCOffsetPsbt(
         [
@@ -103,7 +109,8 @@ export function usePrepareSendBypassHeadOffsetsCallback() {
             satoshis: toAmount,
           },
         ],
-        feeRate
+        feeRate,
+        enableRBF
       )
       return res
     },
@@ -166,11 +173,13 @@ export function usePrepareSendOrdinalsInscriptionCallback() {
       inscriptionId,
       feeRate,
       outputValue,
+      enableRBF,
     }: {
       toAddressInfo: ToAddressInfo
       inscriptionId: string
       feeRate?: number
       outputValue?: number
+      enableRBF?: boolean
     }) => {
       if (!feeRate) {
         const summary = await wallet.getFeeSummary()
@@ -188,6 +197,7 @@ export function usePrepareSendOrdinalsInscriptionCallback() {
         feeRate,
         outputValue: outputValue!,
         btcUtxos,
+        enableRBF,
       })
 
       return toSignData
@@ -207,10 +217,12 @@ export function usePrepareSendOrdinalsInscriptionsCallback() {
       toAddressInfo,
       inscriptionIds,
       feeRate,
+      enableRBF,
     }: {
       toAddressInfo: ToAddressInfo
       inscriptionIds: string[]
       feeRate?: number
+      enableRBF?: boolean
     }) => {
       if (!feeRate) {
         const summary = await wallet.getFeeSummary()
@@ -226,6 +238,7 @@ export function usePrepareSendOrdinalsInscriptionsCallback() {
         inscriptionIds,
         feeRate,
         btcUtxos,
+        enableRBF,
       })
 
       return res
@@ -246,10 +259,12 @@ export function useCreateSplitTxCallback() {
       inscriptionId,
       feeRate,
       outputValue,
+      enableRBF,
     }: {
       inscriptionId: string
       feeRate: number
       outputValue: number
+      enableRBF?: boolean
     }) => {
       let btcUtxos = utxos
       if (btcUtxos.length === 0) {
@@ -261,6 +276,7 @@ export function useCreateSplitTxCallback() {
         feeRate,
         outputValue,
         btcUtxos,
+        enableRBF,
       })
 
       return res
@@ -385,12 +401,14 @@ export function usePrepareSendRunesCallback() {
       runeAmount,
       outputValue,
       feeRate,
+      enableRBF,
     }: {
       toAddressInfo: ToAddressInfo
       runeid: string
       runeAmount: string
       outputValue?: number
       feeRate: number
+      enableRBF?: boolean
     }) => {
       if (!feeRate) {
         const summary = await wallet.getFeeSummary()
@@ -415,6 +433,7 @@ export function usePrepareSendRunesCallback() {
         feeRate,
         btcUtxos,
         assetUtxos,
+        enableRBF,
       })
 
       return toSignData
@@ -437,7 +456,8 @@ export function usePrepareSendAlkanesCallback() {
       alkaneid: string,
       amount: string,
       feeRate: number,
-      type: 'ft' | 'nft'
+      type: 'ft' | 'nft',
+      enableRBF?: boolean
     ) => {
       return await wallet.createSendAlkanesPsbt({
         to: toAddressInfo.address,
@@ -445,6 +465,7 @@ export function usePrepareSendAlkanesCallback() {
         amount,
         feeRate,
         type,
+        enableRBF,
       })
     },
     [wallet, account]

package/src/hooks/ui.ts

@@ -33,6 +33,11 @@ export function useAlkanesAssetTabKey() {
   return uiState.alkanesAssetTabKey
 }
 
+export function useMoreAssetTabKey() {
+  const uiState = useUIState()
+  return uiState.moreAssetTabKey
+}
+
 export function useUiTxCreateScreen() {
   const uiState = useUIState()
   return uiState.uiTxCreateScreen
@@ -43,14 +48,17 @@ export function useUpdateUiTxCreateScreen() {
   return ({
     toInfo,
     inputAmount,
+    enableRBF,
   }: {
     toInfo?: { address: string; domain: string; inscription?: Inscription }
     inputAmount?: string
+    enableRBF?: boolean
   }) => {
     dispatch(
       (uiActions as any).updateTxCreateScreen({
         toInfo,
         inputAmount,
+        enableRBF,
       })
     )
   }
@@ -202,7 +210,7 @@ export function getSupportedAssets(chainType: ChainType, address: string) {
 
   if (chainType === ChainType.BITCOIN_MAINNET || chainType === ChainType.BITCOIN_SIGNET) {
     assets.alkanes = true
-    assetTabKeys.push(AssetTabKey.ALKANES)
+    assetTabKeys.push(AssetTabKey.MORE)
   }
 
   if (chainType === ChainType.BITCOIN_MAINNET || chainType === ChainType.BITCOIN_SIGNET) {

package/src/reducers/accounts.ts

@@ -183,6 +183,9 @@ const slice: Slice<AccountsState> = createSlice({
     setAddressSummary(state, action: { payload: any }) {
       state.addressSummary = action.payload
     },
+    setModelPopover(state, action: { payload: MolelsPopover }) {
+      state.molelsPopover = action.payload
+    },
     expireBalance(state) {
       const balance = state.balanceMap[state.current.address]
       if (balance) {

package/src/reducers/ui.ts

@@ -6,6 +6,7 @@ import {
   AlkanesAssetTabKey,
   AssetTabKey,
   CATAssetTabKey,
+  MoreAssetTabKey,
   NavigationSource,
   OrdinalsAssetTabKey,
 } from '../types'
@@ -23,6 +24,7 @@ export interface UIState {
   ordinalsAssetTabKey: OrdinalsAssetTabKey
   catAssetTabKey: CATAssetTabKey
   alkanesAssetTabKey: AlkanesAssetTabKey
+  moreAssetTabKey: MoreAssetTabKey
   uiTxCreateScreen: {
     toInfo: {
       address: string
@@ -30,6 +32,7 @@ export interface UIState {
       inscription?: Inscription
     }
     inputAmount: string
+    enableRBF: boolean
   }
   addressInput: {
     address: string
@@ -64,12 +67,14 @@ export const initialState: UIState = {
   ordinalsAssetTabKey: OrdinalsAssetTabKey.ALL,
   catAssetTabKey: CATAssetTabKey.CAT20,
   alkanesAssetTabKey: AlkanesAssetTabKey.TOKEN,
+  moreAssetTabKey: MoreAssetTabKey.ALKANES_TOKEN,
   uiTxCreateScreen: {
     toInfo: {
       address: '',
       domain: '',
     },
     inputAmount: '',
+    enableRBF: true,
   },
   addressInput: {
     address: '',
@@ -113,6 +118,7 @@ const slice: Slice<UIState> = createSlice({
           ordinalsAssetTabKey?: OrdinalsAssetTabKey
           catAssetTabKey?: CATAssetTabKey
           alkanesAssetTabKey?: AlkanesAssetTabKey
+          moreAssetTabKey?: MoreAssetTabKey
         }
       }
     ) {
@@ -130,6 +136,9 @@ const slice: Slice<UIState> = createSlice({
       if (payload.alkanesAssetTabKey !== undefined) {
         state.alkanesAssetTabKey = payload.alkanesAssetTabKey
       }
+      if (payload.moreAssetTabKey !== undefined) {
+        state.moreAssetTabKey = payload.moreAssetTabKey
+      }
       return state
     },
     updateTxCreateScreen(
@@ -142,6 +151,7 @@ const slice: Slice<UIState> = createSlice({
             inscription?: Inscription
           }
           inputAmount?: string
+          enableRBF?: boolean
         }
       }
     ) {
@@ -151,6 +161,9 @@ const slice: Slice<UIState> = createSlice({
       if (action.payload.inputAmount !== undefined) {
         state.uiTxCreateScreen.inputAmount = action.payload.inputAmount
       }
+      if (action.payload.enableRBF !== undefined) {
+        state.uiTxCreateScreen.enableRBF = action.payload.enableRBF
+      }
 
       state.uiTxCreateScreen = { ...state.uiTxCreateScreen }
     },
@@ -274,8 +287,16 @@ const slice: Slice<UIState> = createSlice({
       if (!state.alkanesAssetTabKey) {
         state.alkanesAssetTabKey = AlkanesAssetTabKey.TOKEN
       }
+      if (state.moreAssetTabKey === undefined) {
+        state.moreAssetTabKey = MoreAssetTabKey.ALKANES_TOKEN
+      }
+      if (state.assetTabKey === (4 as AssetTabKey)) {
+        state.assetTabKey = AssetTabKey.MORE
+      }
       if (!state.uiTxCreateScreen) {
         state.uiTxCreateScreen = initialState.uiTxCreateScreen
+      } else if (state.uiTxCreateScreen.enableRBF === undefined) {
+        state.uiTxCreateScreen.enableRBF = true
       }
       if (!state.feeRateBar) {
         state.feeRateBar = initialState.feeRateBar

package/src/types/ui.ts

@@ -3,7 +3,7 @@ export enum AssetTabKey {
   ATOMICALS = 1, // IGNORED
   RUNES = 2,
   CAT = 3,
-  ALKANES = 4,
+  MORE = 4,
 }
 
 export enum OrdinalsAssetTabKey {
@@ -24,6 +24,11 @@ export enum AlkanesAssetTabKey {
   COLLECTION,
 }
 
+export enum MoreAssetTabKey {
+  ALKANES_TOKEN,
+  ALKANES_COLLECTION,
+}
+
 export enum NavigationSource {
   BACK,
   NORMAL,

package/src/ui-hooks/useAlkanesTokenScreenLogic.ts

@@ -3,6 +3,7 @@ import { useEffect, useMemo, useState } from 'react'
 import { AddressAlkanesTokenSummary } from '@unisat/wallet-shared'
 import {
   useAlkanesIconInfo,
+  useAlkanesTokenInfoExplorerUrl,
   useCurrentAccount,
   useI18n,
   useNavigation,
@@ -112,6 +113,12 @@ export function useAlkanesTokenScreenLogic() {
     tokenSummary.tokenBalance.alkaneid
   )
 
+  const alkanesExplorerUrl = useAlkanesTokenInfoExplorerUrl(tokenSummary.tokenInfo.alkaneid)
+
+  const onClickViewOnExplorer = () => {
+    nav.navToUrl(alkanesExplorerUrl)
+  }
+
   return {
     tokenSummary,
     loading,
@@ -125,6 +132,7 @@ export function useAlkanesTokenScreenLogic() {
     onClickMint,
     onClickSend,
     onClickTrade,
+    onClickViewOnExplorer,
     iconInfo,
   }
 }

package/src/ui-hooks/useBRC20InscribeTransferLogic.ts

@@ -39,6 +39,7 @@ interface ContextData {
   isApproval: boolean
   tokenInfo?: TokenInfo
   amountEditable?: boolean
+  enableRBF: boolean
 }
 
 interface UpdateContextDataParams {
@@ -51,6 +52,7 @@ interface UpdateContextDataParams {
   amount?: string
   tokenInfo?: TokenInfo
   amountEditable?: boolean
+  enableRBF?: boolean
 }
 
 export interface BRC20InscribeTransferParams {
@@ -66,13 +68,11 @@ export function useBRC20InscribeTransferLogic() {
     step: Step.STEP1,
     ticker: ticker,
     isApproval: false,
+    enableRBF: true,
   })
-  const updateContextData = useCallback(
-    (params: UpdateContextDataParams) => {
-      setContextData(Object.assign({}, contextData, params))
-    },
-    [contextData, setContextData]
-  )
+  const updateContextData = useCallback((params: UpdateContextDataParams) => {
+    setContextData(prev => Object.assign({}, prev, params))
+  }, [])
   return {
     contextData,
     updateContextData,
@@ -122,6 +122,12 @@ export function useBRC20InscribeTransferLogicStep1(params: BRC20InscribeTransfer
     }
   }, [])
 
+  useEffect(() => {
+    wallet.getEnableRBF().then(enableRBF => {
+      updateContextData({ enableRBF })
+    })
+  }, [])
+
   useEffect(() => {
     setInputError('')
     setInputErrorAvailable('')
@@ -180,7 +186,10 @@ export function useBRC20InscribeTransferLogicStep1(params: BRC20InscribeTransfer
     fetchUtxos()
 
     wallet
-      .getBRC20Summary(account.address, contextData.ticker)
+      .getBRC20Summary({
+        address: account.address,
+        ticker: contextData.ticker,
+      })
       .then(v => {
         updateContextData({ tokenBalance: v.tokenBalance, tokenInfo: v.tokenInfo })
         setTimeout(() => {
@@ -208,6 +217,7 @@ export function useBRC20InscribeTransferLogicStep1(params: BRC20InscribeTransfer
         toAddressInfo: { address: order.payAddress, domain: '' },
         toAmount: order.totalFee,
         feeRate: feeRateBarState.feeRate,
+        enableRBF: contextData.enableRBF,
       })
       updateContextData({ order, amount, toSignData, step: Step.STEP2 })
     } catch (e) {
@@ -230,6 +240,11 @@ export function useBRC20InscribeTransferLogicStep1(params: BRC20InscribeTransfer
     defaultOutputValue,
     setOutputValue,
     disabled,
+    enableRBF: contextData.enableRBF,
+    setEnableRBF: (value: boolean) => {
+      updateContextData({ enableRBF: value })
+      wallet.setEnableRBF(value)
+    },
     loadingOnly,
     handleCancel,
   }
@@ -316,9 +331,11 @@ export function useBRC20InscribeTransferLogicStep3(params: BRC20InscribeTransfer
   const onSignPsbtHandleConfirm = async (signedDatas: SignedData[]) => {
     tools.showLoading(true)
     try {
-      const { success, txid, error } = await pushBitcoinTx(signedDatas[0].psbtHex)
+      const { success, error } = await pushBitcoinTx(signedDatas[0].psbtHex)
       if (success) {
-        nav.navigate('TxSuccessScreen', { txid })
+        updateContextData({
+          step: Step.STEP4,
+        })
       } else {
         throw new Error(error)
       }
@@ -367,7 +384,10 @@ export function useBRC20InscribeTransferLogicStep4(params: BRC20InscribeTransfer
   const onClickConfirm = () => {
     tools.showLoading(true)
     wallet
-      .getBRC20Summary(currentAccount.address, tokenBalance.ticker)
+      .getBRC20Summary({
+        address: currentAccount.address,
+        ticker: tokenBalance.ticker,
+      })
       .then(v => {
         if (contextData.isApproval) {
           resolveApproval({

package/src/ui-hooks/useBRC20ListLogic.ts

@@ -6,8 +6,8 @@ import {
   useCurrentAccount,
   useNavigation,
   useOrdinalsAssetTabKey,
-  useWallet,
   useWallTabFocusRefresh,
+  useWallet,
 } from '..'
 import { useInfiniteList } from './useInfiniteList'
 
@@ -41,7 +41,11 @@ export function useBRC20ListLogic() {
       if (currentAccount.address === '') {
         return { list: [], total: 0 }
       }
-      const { list, total } = await wallet.getBRC20List(currentAccount.address, page, pageSize)
+      const { list, total } = await wallet.getBRC20List({
+        address: currentAccount.address,
+        currentPage: page,
+        pageSize,
+      })
       if (list.length > 0) {
         wallet.getBrc20sPrice(list.map(item => item.ticker)).then(updatePrices)
       }