From 83aba3b1d8db73e8ff0a0091091901c9ecc4f81a Mon Sep 17 00:00:00 2001 From: nguyentiendung Date: Thu, 13 Jun 2024 18:12:02 +0700 Subject: [PATCH 1/3] [Issue-159] Update content for some message --- .../extension-koni-ui/src/Popup/Settings/Chains/ChainImport.tsx | 2 +- .../TransactionFee/BitcoinFeeSelector/BitcoinFeeEditorModal.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/extension-koni-ui/src/Popup/Settings/Chains/ChainImport.tsx b/packages/extension-koni-ui/src/Popup/Settings/Chains/ChainImport.tsx index eb67db1fe58..3a29d84f8e5 100644 --- a/packages/extension-koni-ui/src/Popup/Settings/Chains/ChainImport.tsx +++ b/packages/extension-koni-ui/src/Popup/Settings/Chains/ChainImport.tsx @@ -304,7 +304,7 @@ function Component ({ className = '' }: Props): React.ReactElement { >
- {t('Currently support WSS provider for Substrate networks and HTTP provider for EVM network')} + {t('Only HTTP providers for EVM networks are currently supported')}
Date: Fri, 14 Jun 2024 17:35:46 +0700 Subject: [PATCH 2/3] [Issue-159] Update content for some message --- .../balance-service/helpers/transfer/bitcoin.ts | 13 +++++++++++-- .../src/services/chain-service/constants.ts | 2 ++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/extension-base/src/services/balance-service/helpers/transfer/bitcoin.ts b/packages/extension-base/src/services/balance-service/helpers/transfer/bitcoin.ts index 26f7c3bd850..17a2259814f 100644 --- a/packages/extension-base/src/services/balance-service/helpers/transfer/bitcoin.ts +++ b/packages/extension-base/src/services/balance-service/helpers/transfer/bitcoin.ts @@ -2,6 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 import { getTransferableBitcoinUtxos } from '@subwallet/extension-base/services/balance-service/helpers/balance/bitcoin'; +import { _BITCOIN_CHAIN_SLUG, _BITCOIN_NAME, _BITCOIN_TESTNET_NAME } from '@subwallet/extension-base/services/chain-service/constants'; import { _BitcoinApi } from '@subwallet/extension-base/services/chain-service/types'; import { BitcoinFeeInfo, BitcoinFeeRate, GetFeeFunction, TransactionFee } from '@subwallet/extension-base/types'; import { combineBitcoinFee, determineUtxosForSpend, determineUtxosForSpendAll, getId } from '@subwallet/extension-base/utils'; @@ -100,8 +101,16 @@ export async function getBitcoinTransactionObject ({ bitcoinApi, return [tx, transferAmount.toString()]; } catch (e) { - const error = e as Error; + // const error = e as Error; - throw new Error(`Failed to get Bitcoin transaction object: ${error.message}`); + throw new Error(`You don’t have enough BTC (${convertChainToSymbol(chain)}) for the transaction. Lower your BTC amount and try again`); + } +} + +function convertChainToSymbol (chain: string) { + if (chain === _BITCOIN_CHAIN_SLUG) { + return _BITCOIN_NAME; + } else { + return _BITCOIN_TESTNET_NAME; } } diff --git a/packages/extension-base/src/services/chain-service/constants.ts b/packages/extension-base/src/services/chain-service/constants.ts index 19b16ed9323..29e73c3a5ac 100644 --- a/packages/extension-base/src/services/chain-service/constants.ts +++ b/packages/extension-base/src/services/chain-service/constants.ts @@ -278,5 +278,7 @@ export const _CHAIN_LOGO_MAP_SRC = `https://raw.githubusercontent.com/Koniverse/ export const _ASSET_LOGO_MAP_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetLogoMap.json`; export const _BITCOIN_CHAIN_SLUG = 'bitcoin'; +export const _BITCOIN_TESTNET_CHAIN_SLUG = 'bitcoinTestnet'; export const _BITCOIN_NAME = 'Bitcoin'; +export const _BITCOIN_TESTNET_NAME = 'Bitcoin Testnet'; export const _BEAR_TOKEN = 'aHR0cHM6Ly9xdWFuZ3RydW5nLXNvZnR3YXJlLnZuL2FwaS9tYXN0ZXIvYXBpLXB1YmxpYw=='; // Public for now. Change and hide later. From c04fd3471cf7a025e4d80eb36efe61857e08e496 Mon Sep 17 00:00:00 2001 From: nguyentiendung Date: Mon, 17 Jun 2024 12:22:09 +0700 Subject: [PATCH 3/3] [Issue-159] Update content for choosefee modal --- .../TransactionFee/BitcoinFeeSelector/BitcoinFeeEditorModal.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/extension-koni-ui/src/components/Field/TransactionFee/BitcoinFeeSelector/BitcoinFeeEditorModal.tsx b/packages/extension-koni-ui/src/components/Field/TransactionFee/BitcoinFeeSelector/BitcoinFeeEditorModal.tsx index a1d6ba2cdbb..e1a00b07ad0 100644 --- a/packages/extension-koni-ui/src/components/Field/TransactionFee/BitcoinFeeSelector/BitcoinFeeEditorModal.tsx +++ b/packages/extension-koni-ui/src/components/Field/TransactionFee/BitcoinFeeSelector/BitcoinFeeEditorModal.tsx @@ -349,7 +349,7 @@ const Component = ({ className, feeDetail, modalId, onSelectOption, selectedOpti disabled={!canSubmitCustom || invalidForm} onClick={form.submit} > - Use custom fee + Apply custom fee
)