diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json index e14ea1d297..a166d0ab46 100644 --- a/packages/neuron-ui/package.json +++ b/packages/neuron-ui/package.json @@ -50,10 +50,10 @@ "last 2 chrome versions" ], "dependencies": { + "@ckb-connect/walletconnect-wallet-sdk": "^0.0.1-alpha.1", "@nervosnetwork/ckb-sdk-core": "0.109.0", "@nervosnetwork/ckb-sdk-utils": "0.109.0", "canvg": "2.0.0", - "ckb-walletconnect-wallet-sdk": "0.0.2-alpha.0", "i18next": "21.10.0", "immer": "9.0.21", "jsqr": "1.4.0", diff --git a/packages/neuron-ui/src/components/WCSignTransactionDialog/index.tsx b/packages/neuron-ui/src/components/WCSignTransactionDialog/index.tsx index d550e9960a..b0c6b544a0 100644 --- a/packages/neuron-ui/src/components/WCSignTransactionDialog/index.tsx +++ b/packages/neuron-ui/src/components/WCSignTransactionDialog/index.tsx @@ -12,7 +12,7 @@ import { sendCreateSUDTAccountTransaction, sendSUDTTransaction, } from 'states' -import { SessionRequest } from 'ckb-walletconnect-wallet-sdk' +import { SessionRequest } from '@ckb-connect/walletconnect-wallet-sdk' import { OfflineSignType, OfflineSignStatus, signAndExportTransaction, signTransactionOnly } from 'services/remote' import { PasswordIncorrectException } from 'exceptions' import styles from './wcSignTransactionDialog.module.scss' diff --git a/packages/neuron-ui/src/components/WalletConnect/ItemComponents.tsx b/packages/neuron-ui/src/components/WalletConnect/ItemComponents.tsx index c4de6f3541..55cd78621d 100644 --- a/packages/neuron-ui/src/components/WalletConnect/ItemComponents.tsx +++ b/packages/neuron-ui/src/components/WalletConnect/ItemComponents.tsx @@ -5,7 +5,7 @@ import { clsx, CONSTANTS, shannonToCKBFormatter } from 'utils' import { SCRIPT_BASES } from 'utils/const' import { scriptToAddress } from '@nervosnetwork/ckb-sdk-utils' import { useState as useGlobalState } from 'states' -import { Proposal, Session, SessionRequest, SignTransactionParams } from 'ckb-walletconnect-wallet-sdk' +import { Proposal, Session, SessionRequest, SignTransactionParams } from '@ckb-connect/walletconnect-wallet-sdk' import { DetailIcon } from 'widgets/Icons/icon' import styles from './walletConnect.module.scss' diff --git a/packages/neuron-ui/src/components/WalletConnect/hooks.ts b/packages/neuron-ui/src/components/WalletConnect/hooks.ts index 464395b409..17b5857426 100644 --- a/packages/neuron-ui/src/components/WalletConnect/hooks.ts +++ b/packages/neuron-ui/src/components/WalletConnect/hooks.ts @@ -2,7 +2,7 @@ import { useCallback, useMemo } from 'react' import { useState as useGlobalState } from 'states' import { connect, disconnect, approveSession, rejectSession, approveRequest, rejectRequest } from 'services/remote' import { ControllerResponse } from 'services/remote/remoteApiWrapper' -import { SessionRequest } from 'ckb-walletconnect-wallet-sdk' +import { SessionRequest } from '@ckb-connect/walletconnect-wallet-sdk' export const useWalletConnect = () => { const { diff --git a/packages/neuron-ui/src/components/WalletConnect/index.tsx b/packages/neuron-ui/src/components/WalletConnect/index.tsx index b6de7403f3..3c89634b97 100644 --- a/packages/neuron-ui/src/components/WalletConnect/index.tsx +++ b/packages/neuron-ui/src/components/WalletConnect/index.tsx @@ -16,7 +16,7 @@ import { showErrorMessage, signMessage } from 'services/remote' import { ControllerResponse } from 'services/remote/remoteApiWrapper' import { clsx, ErrorCode, isSuccessResponse } from 'utils' import { Experiment, WalletConnect as WalletConnectIcon, Scan, ScanScreen, NumberScan } from 'widgets/Icons/icon' -import { SessionRequest } from 'ckb-walletconnect-wallet-sdk' +import { SessionRequest } from '@ckb-connect/walletconnect-wallet-sdk' import { useWalletConnect } from './hooks' import { SessionItem, PrososalItem, MessageItem, TransactionItem } from './ItemComponents' import styles from './walletConnect.module.scss' diff --git a/packages/neuron-ui/src/services/remote/offline.ts b/packages/neuron-ui/src/services/remote/offline.ts index fa51e07d18..543ed1c38d 100644 --- a/packages/neuron-ui/src/services/remote/offline.ts +++ b/packages/neuron-ui/src/services/remote/offline.ts @@ -1,5 +1,5 @@ /* eslint-disable camelcase */ -import { Transaction } from 'ckb-walletconnect-wallet-sdk' +import { Transaction } from '@ckb-connect/walletconnect-wallet-sdk' import { remoteApi } from './remoteApiWrapper' import { MultisigEntity } from './multisig' diff --git a/packages/neuron-ui/src/services/remote/walletConnect.ts b/packages/neuron-ui/src/services/remote/walletConnect.ts index 1b67e9d6bf..1c2979f01e 100644 --- a/packages/neuron-ui/src/services/remote/walletConnect.ts +++ b/packages/neuron-ui/src/services/remote/walletConnect.ts @@ -1,4 +1,4 @@ -import { ErrorResponse, SessionRequest } from 'ckb-walletconnect-wallet-sdk' +import { ErrorResponse, SessionRequest } from '@ckb-connect/walletconnect-wallet-sdk' import { remoteApi } from './remoteApiWrapper' export const connect = remoteApi('wc-connect') diff --git a/packages/neuron-ui/src/types/App/index.d.ts b/packages/neuron-ui/src/types/App/index.d.ts index 8460a59154..7fcde84c3b 100644 --- a/packages/neuron-ui/src/types/App/index.d.ts +++ b/packages/neuron-ui/src/types/App/index.d.ts @@ -1,4 +1,4 @@ -/// +/// declare namespace State { interface Transaction { diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json index ec47f40699..6ea0a1e8f7 100644 --- a/packages/neuron-wallet/package.json +++ b/packages/neuron-wallet/package.json @@ -42,6 +42,7 @@ ] }, "dependencies": { + "@ckb-connect/walletconnect-wallet-sdk": "^0.0.1-alpha.1", "@ckb-lumos/base": "^0.21.0-next.1", "@ckb-lumos/bi": "^0.21.0-next.1", "@ckb-lumos/ckb-indexer": "^0.21.0-next.1", @@ -57,7 +58,6 @@ "async": "3.2.4", "bn.js": "4.12.0", "chalk": "3.0.0", - "ckb-walletconnect-wallet-sdk": "0.0.2-alpha.0", "dotenv": "8.6.0", "electron-log": "4.4.8", "electron-updater": "4.6.5", diff --git a/packages/neuron-wallet/src/controllers/wallet-connect.ts b/packages/neuron-wallet/src/controllers/wallet-connect.ts index a1225fb1b3..8e1db04ad3 100644 --- a/packages/neuron-wallet/src/controllers/wallet-connect.ts +++ b/packages/neuron-wallet/src/controllers/wallet-connect.ts @@ -13,7 +13,7 @@ import { Session, SessionRequest, SignedTransaction, -} from 'ckb-walletconnect-wallet-sdk' +} from '@ckb-connect/walletconnect-wallet-sdk' import WalletConnectSubject from '../models/subjects/wallet-connect-subject' import { CurrentWalletSubject } from '../models/subjects/wallets' import { CurrentNetworkIDSubject } from '../models/subjects/networks' diff --git a/packages/neuron-wallet/src/types/controller.d.ts b/packages/neuron-wallet/src/types/controller.d.ts index 1a549b1510..beb5fa553d 100644 --- a/packages/neuron-wallet/src/types/controller.d.ts +++ b/packages/neuron-wallet/src/types/controller.d.ts @@ -1,4 +1,4 @@ -/// +/// declare namespace Controller { interface Response {