Resolve conflict (#1514)

* chore: bump version

* chore: fix firefox build not match

* chore: bump version

Author: iosh

.yarn/versions/01a87f4a.yml

@@ -0,0 +1,168 @@
+declined:
+  - helios
+  - helios-background
+  - "@fluent-wallet/rpc-engine"
+  - "@fluent-wallet/cfx_accounts"
+  - "@fluent-wallet/cfx_call"
+  - "@fluent-wallet/cfx_chain-id"
+  - "@fluent-wallet/cfx_check-balance-against-transaction"
+  - "@fluent-wallet/cfx_client-version"
+  - "@fluent-wallet/cfx_epoch-number"
+  - "@fluent-wallet/cfx_estimate-gas-and-collateral"
+  - "@fluent-wallet/cfx_gas-price"
+  - "@fluent-wallet/cfx_get-account"
+  - "@fluent-wallet/cfx_get-account-pending-info"
+  - "@fluent-wallet/cfx_get-account-pending-transactions"
+  - "@fluent-wallet/cfx_get-accumulate-interest-rate"
+  - "@fluent-wallet/cfx_get-admin"
+  - "@fluent-wallet/cfx_get-balance"
+  - "@fluent-wallet/cfx_get-best-block-hash"
+  - "@fluent-wallet/cfx_get-block-by-block-number"
+  - "@fluent-wallet/cfx_get-block-by-epoch-number"
+  - "@fluent-wallet/cfx_get-block-by-hash"
+  - "@fluent-wallet/cfx_get-block-by-hash-with-pivot-assumption"
+  - "@fluent-wallet/cfx_get-block-reward-info"
+  - "@fluent-wallet/cfx_get-blocks-by-epoch"
+  - "@fluent-wallet/cfx_get-code"
+  - "@fluent-wallet/cfx_get-collateral-for-storage"
+  - "@fluent-wallet/cfx_get-confirmation-risk-by-hash"
+  - "@fluent-wallet/cfx_get-deposit-list"
+  - "@fluent-wallet/cfx_get-interest-rate"
+  - "@fluent-wallet/cfx_get-logs"
+  - "@fluent-wallet/cfx_get-max-gas-limit"
+  - "@fluent-wallet/cfx_get-next-nonce"
+  - "@fluent-wallet/cfx_get-next-usable-nonce"
+  - "@fluent-wallet/cfx_get-pos-economics"
+  - "@fluent-wallet/cfx_get-pos-reward-by-epoch"
+  - "@fluent-wallet/cfx_get-skipped-blocks-by-epoch"
+  - "@fluent-wallet/cfx_get-sponsor-info"
+  - "@fluent-wallet/cfx_get-staking-balance"
+  - "@fluent-wallet/cfx_get-status"
+  - "@fluent-wallet/cfx_get-storage-at"
+  - "@fluent-wallet/cfx_get-storage-root"
+  - "@fluent-wallet/cfx_get-supply-info"
+  - "@fluent-wallet/cfx_get-transaction-by-hash"
+  - "@fluent-wallet/cfx_get-transaction-receipt"
+  - "@fluent-wallet/cfx_get-vote-list"
+  - "@fluent-wallet/cfx_net-version"
+  - "@fluent-wallet/cfx_opened-method-groups"
+  - "@fluent-wallet/cfx_request-accounts"
+  - "@fluent-wallet/cfx_send-raw-transaction"
+  - "@fluent-wallet/cfx_send-transaction"
+  - "@fluent-wallet/cfx_sign-tx-with-ledger-nano-s"
+  - "@fluent-wallet/cfx_sign-typed-data_v4"
+  - "@fluent-wallet/eth_accounts"
+  - "@fluent-wallet/eth_block-number"
+  - "@fluent-wallet/eth_call"
+  - "@fluent-wallet/eth_chain-id"
+  - "@fluent-wallet/eth_estimate-1559-fee"
+  - "@fluent-wallet/eth_estimate-gas"
+  - "@fluent-wallet/eth_fee-history"
+  - "@fluent-wallet/eth_gas-price"
+  - "@fluent-wallet/eth_get-balance"
+  - "@fluent-wallet/eth_get-block-by-hash"
+  - "@fluent-wallet/eth_get-block-by-number"
+  - "@fluent-wallet/eth_get-code"
+  - "@fluent-wallet/eth_get-logs"
+  - "@fluent-wallet/eth_get-transaction-by-hash"
+  - "@fluent-wallet/eth_get-transaction-count"
+  - "@fluent-wallet/eth_get-transaction-receipt"
+  - "@fluent-wallet/eth_max-priority-fee-per-gas"
+  - "@fluent-wallet/eth_request-accounts"
+  - "@fluent-wallet/eth_send-raw-transaction"
+  - "@fluent-wallet/eth_send-transaction"
+  - "@fluent-wallet/eth_sign-transaction"
+  - "@fluent-wallet/eth_sign-tx-with-ledger-nano-s"
+  - "@fluent-wallet/net_version"
+  - "@fluent-wallet/personal_sign"
+  - "@fluent-wallet/txpool_next-nonce"
+  - "@fluent-wallet/wallet_accounts"
+  - "@fluent-wallet/wallet_add-ethereum-chain"
+  - "@fluent-wallet/wallet_add-hd-path"
+  - "@fluent-wallet/wallet_add-network"
+  - "@fluent-wallet/wallet_add-pending-user-auth-request"
+  - "@fluent-wallet/wallet_add-vault"
+  - "@fluent-wallet/wallet_after-unlock"
+  - "@fluent-wallet/wallet_chain-id"
+  - "@fluent-wallet/wallet_cleanup-tx"
+  - "@fluent-wallet/wallet_create-account"
+  - "@fluent-wallet/wallet_create-address"
+  - "@fluent-wallet/wallet_db-query"
+  - "@fluent-wallet/wallet_delete-account"
+  - "@fluent-wallet/wallet_delete-account-group"
+  - "@fluent-wallet/wallet_delete-app"
+  - "@fluent-wallet/wallet_delete-memo"
+  - "@fluent-wallet/wallet_delete-network"
+  - "@fluent-wallet/wallet_detect-address-type"
+  - "@fluent-wallet/wallet_detect-network-type"
+  - "@fluent-wallet/wallet_discover-accounts"
+  - "@fluent-wallet/wallet_enrich-conflux-tx"
+  - "@fluent-wallet/wallet_enrich-ethereum-tx"
+  - "@fluent-wallet/wallet_enrich-txs"
+  - "@fluent-wallet/wallet_export-account"
+  - "@fluent-wallet/wallet_export-account-group"
+  - "@fluent-wallet/wallet_export-all"
+  - "@fluent-wallet/wallet_generate-address"
+  - "@fluent-wallet/wallet_generate-private-key"
+  - "@fluent-wallet/wallet_get-account-address-by-network"
+  - "@fluent-wallet/wallet_get-account-group"
+  - "@fluent-wallet/wallet_get-account-group-vault-value"
+  - "@fluent-wallet/wallet_get-address-private-key"
+  - "@fluent-wallet/wallet_get-balance"
+  - "@fluent-wallet/wallet_get-block-or-epoch-number"
+  - "@fluent-wallet/wallet_get-block-time"
+  - "@fluent-wallet/wallet_get-blockchain-explorer-url"
+  - "@fluent-wallet/wallet_get-current-account"
+  - "@fluent-wallet/wallet_get-current-network"
+  - "@fluent-wallet/wallet_get-current-viewing-app"
+  - "@fluent-wallet/wallet_get-fluent-metadata"
+  - "@fluent-wallet/wallet_get-import-hardware-wallet-info"
+  - "@fluent-wallet/wallet_get-network"
+  - "@fluent-wallet/wallet_get-next-nonce"
+  - "@fluent-wallet/wallet_get-next-usable-nonce"
+  - "@fluent-wallet/wallet_get-pending-auth-request"
+  - "@fluent-wallet/wallet_get-permissions"
+  - "@fluent-wallet/wallet_get-preferences"
+  - "@fluent-wallet/wallet_handle-unfinished-cfx-tx"
+  - "@fluent-wallet/wallet_handle-unfinished-eth-tx"
+  - "@fluent-wallet/wallet_handle-unfinished-txs"
+  - "@fluent-wallet/wallet_import-address"
+  - "@fluent-wallet/wallet_import-all"
+  - "@fluent-wallet/wallet_import-hardware-wallet-account-group-or-account"
+  - "@fluent-wallet/wallet_import-mnemonic"
+  - "@fluent-wallet/wallet_import-private-key"
+  - "@fluent-wallet/wallet_metadata-for-popup"
+  - "@fluent-wallet/wallet_network1559compatible"
+  - "@fluent-wallet/wallet_refetch-balance"
+  - "@fluent-wallet/wallet_refetch-token-list"
+  - "@fluent-wallet/wallet_refetch-tx-list"
+  - "@fluent-wallet/wallet_register-site-metadata"
+  - "@fluent-wallet/wallet_request-accounts"
+  - "@fluent-wallet/wallet_request-permissions"
+  - "@fluent-wallet/wallet_request-unlock-ui"
+  - "@fluent-wallet/wallet_send-transaction"
+  - "@fluent-wallet/wallet_send-transaction-with-action"
+  - "@fluent-wallet/wallet_set-app-current-account"
+  - "@fluent-wallet/wallet_set-app-current-network"
+  - "@fluent-wallet/wallet_set-current-account"
+  - "@fluent-wallet/wallet_set-current-network"
+  - "@fluent-wallet/wallet_set-preferences"
+  - "@fluent-wallet/wallet_switch-ethereum-chain"
+  - "@fluent-wallet/wallet_unlock"
+  - "@fluent-wallet/wallet_unwatch-asset"
+  - "@fluent-wallet/wallet_update-account"
+  - "@fluent-wallet/wallet_update-account-group"
+  - "@fluent-wallet/wallet_update-network"
+  - "@fluent-wallet/wallet_update-token-list"
+  - "@fluent-wallet/wallet_upsert-memo"
+  - "@fluent-wallet/wallet_user-approved-auth-request"
+  - "@fluent-wallet/wallet_user-rejected-auth-request"
+  - "@fluent-wallet/wallet_validate20token"
+  - "@fluent-wallet/wallet_validate-app-permissions"
+  - "@fluent-wallet/wallet_validate-mnemonic"
+  - "@fluent-wallet/wallet_validate-password"
+  - "@fluent-wallet/wallet_validate-private-key"
+  - "@fluent-wallet/wallet_watch-asset"
+  - "@fluent-wallet/wallet_zero-account-group"
+  - "@fluent-wallet/inner-utils"
+  - workspace-tools

package.json

@@ -1,7 +1,7 @@
 {
   "name": "helios",
   "private": true,
-  "version": "2.8.1",
+  "version": "2.8.0",
   "workspaces": [
     "websites/*",
     "packages/doc-ui/*",