(
'sign-and-export-transaction'
)
diff --git a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
index 7935f86df0..5be98553fc 100644
--- a/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
+++ b/packages/neuron-ui/src/services/remote/remoteApiWrapper.ts
@@ -50,6 +50,8 @@ type Action =
| 'set-theme'
| 'verify-external-ckb-node'
| 'start-node-ignore-external'
+ | 'get-first-sync-info'
+ | 'start-sync'
// Wallets
| 'get-all-wallets'
| 'get-current-wallet'
@@ -59,7 +61,9 @@ type Action =
| 'create-wallet'
| 'update-wallet'
| 'delete-wallet'
+ | 'replace-wallet'
| 'backup-wallet'
+ | 'update-wallet-start-block-number'
| 'get-all-addresses'
| 'update-address-description'
| 'request-password'
@@ -81,6 +85,7 @@ type Action =
| 'generate-dao-deposit-all-tx'
| 'start-withdraw-from-dao'
| 'withdraw-from-dao'
+ | 'calculate-unlock-dao-maximum-withdraw'
// Special Assets
| 'get-customized-asset-cells'
| 'generate-withdraw-customized-cell-tx'
@@ -133,6 +138,8 @@ type Action =
| 'export-transaction-as-json'
| 'sign-transaction-only'
| 'broadcast-transaction-only'
+ | 'broadcast-signed-transaction'
+ | 'get-transaction-size'
| 'sign-and-export-transaction'
| 'sign-and-broadcast-transaction'
// nft
@@ -153,6 +160,11 @@ type Action =
| 'get-sync-progress-by-addresses'
// spore
| 'generate-transfer-spore-tx'
+ // cell-manage
+ | 'get-live-cells'
+ | 'update-live-cell-local-info'
+ | 'get-locked-balance'
+ | 'update-live-cells-lock-status'
export const remoteApi =
(action: Action) =>
diff --git a/packages/neuron-ui/src/services/remote/transactions.ts b/packages/neuron-ui/src/services/remote/transactions.ts
index 73a6f81249..0877418a24 100644
--- a/packages/neuron-ui/src/services/remote/transactions.ts
+++ b/packages/neuron-ui/src/services/remote/transactions.ts
@@ -5,6 +5,8 @@ export interface GetTransactionListParams {
pageSize: number
keywords?: string
walletID: string
+ sort?: string
+ direction?: string
}
export const getTransactionList = remoteApi('get-transaction-list')
diff --git a/packages/neuron-ui/src/services/remote/wallets.ts b/packages/neuron-ui/src/services/remote/wallets.ts
index 89da4ef168..3f97e5b4ea 100644
--- a/packages/neuron-ui/src/services/remote/wallets.ts
+++ b/packages/neuron-ui/src/services/remote/wallets.ts
@@ -8,7 +8,11 @@ export const importKeystore = remoteApi('import
export const createWallet = remoteApi('create-wallet')
export const updateWallet = remoteApi('update-wallet')
export const deleteWallet = remoteApi('delete-wallet')
+export const replaceWallet = remoteApi('replace-wallet')
export const backupWallet = remoteApi('backup-wallet')
+export const updateWalletStartBlockNumber = remoteApi(
+ 'update-wallet-start-block-number'
+)
export const getAddressesByWalletID = remoteApi('get-all-addresses')
export const updateAddressDescription =
remoteApi('update-address-description')
@@ -27,6 +31,7 @@ export const generateDaoDepositAllTx = remoteApi('start-withdraw-from-dao')
export const generateDaoClaimTx = remoteApi('withdraw-from-dao')
+export const calculateUnlockDaoMaximumWithdraw = remoteApi('calculate-unlock-dao-maximum-withdraw')
// Sign and Verify
export const signMessage = remoteApi('sign-message')
diff --git a/packages/neuron-ui/src/services/subjects.ts b/packages/neuron-ui/src/services/subjects.ts
index b78aebf9d2..2fb4037ccb 100644
--- a/packages/neuron-ui/src/services/subjects.ts
+++ b/packages/neuron-ui/src/services/subjects.ts
@@ -1,5 +1,5 @@
import { CONSTANTS } from 'utils'
-import { ipcRenderer } from 'electron'
+import { ipcRenderer, type IpcRendererEvent } from 'electron'
const { LOCALES } = CONSTANTS
@@ -31,13 +31,14 @@ const SubjectConstructor = (
| 'device-sign-index'
| 'multisig-output-update'
| 'migrate'
- | 'show-global-dialog',
+ | 'show-global-dialog'
+ | 'no-disk-space',
isMulti?: boolean
) => {
return ipcRenderer
? {
subscribe: (handler: (data: T) => void) => {
- const handlerWrap = (_e: Event, data: T) => {
+ const handlerWrap = (_e: IpcRendererEvent, data: T) => {
handler(data)
}
ipcRenderer.on(channel, handlerWrap)
@@ -69,6 +70,7 @@ export const SetLocale = SubjectConstructor<(typeof LOCALES)[number]>('set-local
export const DeviceSignIndex = SubjectConstructor('device-sign-index')
export const MultisigOutputUpdate = SubjectConstructor('multisig-output-update')
export const Migrate = SubjectConstructor<'need-migrate' | 'migrating' | 'failed' | 'finish'>('migrate', true)
+export const NoDiskSpace = SubjectConstructor('no-disk-space')
export default {
DataUpdate,
diff --git a/packages/neuron-ui/src/states/init/wallet.ts b/packages/neuron-ui/src/states/init/wallet.ts
index 0de42e6d8e..617f6276c7 100644
--- a/packages/neuron-ui/src/states/init/wallet.ts
+++ b/packages/neuron-ui/src/states/init/wallet.ts
@@ -5,6 +5,7 @@ export const emptyWallet: State.Wallet = {
id: '',
balance: '0',
addresses: [],
+ extendedKey: '',
}
const wallet = currentWallet.load()
@@ -17,6 +18,7 @@ export const walletState: State.Wallet = {
device: wallet?.device,
isHD: wallet?.isHD,
isWatchOnly: wallet?.isWatchOnly,
+ extendedKey: '',
}
export default walletState
diff --git a/packages/neuron-ui/src/states/stateProvider/reducer.ts b/packages/neuron-ui/src/states/stateProvider/reducer.ts
index 082db564b8..5579dcd438 100644
--- a/packages/neuron-ui/src/states/stateProvider/reducer.ts
+++ b/packages/neuron-ui/src/states/stateProvider/reducer.ts
@@ -1,3 +1,4 @@
+import type { OutPoint } from '@ckb-lumos/base'
import produce, { Draft } from 'immer'
import { OfflineSignJSON } from 'services/remote'
import initStates from 'states/init'
@@ -65,6 +66,9 @@ export enum AppActions {
GetFeeRateStats = 'getFeeRateStats',
UpdateCountDown = 'updateCountDown',
SignVerify = 'signVerify',
+
+ // Cell manage
+ UpdateConsumeCells = 'UpdateConsumeCells',
}
export type StateAction =
@@ -116,6 +120,7 @@ export type StateAction =
| { type: NeuronWalletActions.UpdateAppUpdaterStatus; payload: State.AppUpdater }
| { type: NeuronWalletActions.GetSUDTAccountList; payload: Controller.GetSUDTAccountList.Response }
| { type: AppActions.SignVerify; payload: string }
+ | { type: AppActions.UpdateConsumeCells; payload?: { outPoint: OutPoint; capacity: string }[] }
export type StateDispatch = React.Dispatch // TODO: add type of payload
@@ -410,6 +415,11 @@ export const reducer = produce((state: Draft, action:
break
}
+ case AppActions.UpdateConsumeCells: {
+ state.consumeCells = action.payload
+ break
+ }
+
default: {
break
}
diff --git a/packages/neuron-ui/src/stories/Navbar.stories.tsx b/packages/neuron-ui/src/stories/Navbar.stories.tsx
index f4d5b24c27..0e75b2d797 100644
--- a/packages/neuron-ui/src/stories/Navbar.stories.tsx
+++ b/packages/neuron-ui/src/stories/Navbar.stories.tsx
@@ -3,7 +3,7 @@ import Navbar from 'containers/Navbar'
import { withRouter } from 'storybook-addon-react-router-v6'
import { initStates } from 'states'
-const wallets: State.WalletIdentity[] = [{ id: 'wallet id', name: 'wallet name' }]
+const wallets: State.WalletIdentity[] = [{ id: 'wallet id', name: 'wallet name', extendedKey: '' }]
const meta: Meta = {
component: Navbar,
diff --git a/packages/neuron-ui/src/stories/PasswordRequest.stories.tsx b/packages/neuron-ui/src/stories/PasswordRequest.stories.tsx
index 0b28b821f6..1bf2f6f8ed 100644
--- a/packages/neuron-ui/src/stories/PasswordRequest.stories.tsx
+++ b/packages/neuron-ui/src/stories/PasswordRequest.stories.tsx
@@ -22,7 +22,7 @@ const states: { [title: string]: State.AppWithNeuronWallet } = {
...initStates,
settings: {
...initStates.settings,
- wallets: [{ id: '1', name: 'test wallet' }],
+ wallets: [{ id: '1', name: 'test wallet', extendedKey: '' }],
},
app: {
...initStates.app,
@@ -36,7 +36,7 @@ const states: { [title: string]: State.AppWithNeuronWallet } = {
...initStates,
settings: {
...initStates.settings,
- wallets: [{ id: '1', name: 'test wallet' }],
+ wallets: [{ id: '1', name: 'test wallet', extendedKey: '' }],
},
app: {
...initStates.app,
@@ -50,7 +50,7 @@ const states: { [title: string]: State.AppWithNeuronWallet } = {
...initStates,
settings: {
...initStates.settings,
- wallets: [{ id: '1', name: 'test wallet' }],
+ wallets: [{ id: '1', name: 'test wallet', extendedKey: '' }],
},
app: {
...initStates.app,
@@ -64,7 +64,7 @@ const states: { [title: string]: State.AppWithNeuronWallet } = {
...initStates,
settings: {
...initStates.settings,
- wallets: [{ id: '1', name: 'test wallet' }],
+ wallets: [{ id: '1', name: 'test wallet', extendedKey: '' }],
},
app: {
...initStates.app,
@@ -78,7 +78,7 @@ const states: { [title: string]: State.AppWithNeuronWallet } = {
...initStates,
settings: {
...initStates.settings,
- wallets: [{ id: '1', name: 'test wallet' }],
+ wallets: [{ id: '1', name: 'test wallet', extendedKey: '' }],
},
app: {
...initStates.app,
@@ -92,7 +92,7 @@ const states: { [title: string]: State.AppWithNeuronWallet } = {
...initStates,
settings: {
...initStates.settings,
- wallets: [{ id: '1', name: 'test wallet' }],
+ wallets: [{ id: '1', name: 'test wallet', extendedKey: '' }],
},
app: {
...initStates.app,
diff --git a/packages/neuron-ui/src/stories/WalletSetting.stories.tsx b/packages/neuron-ui/src/stories/WalletSetting.stories.tsx
index 219204eb88..208a16bc7c 100644
--- a/packages/neuron-ui/src/stories/WalletSetting.stories.tsx
+++ b/packages/neuron-ui/src/stories/WalletSetting.stories.tsx
@@ -9,10 +9,12 @@ const states: { [title: string]: State.WalletIdentity[] } = {
{
id: '1',
name: 'Wallet 1',
+ extendedKey: '',
},
{
id: '2',
name: 'Wallet 2',
+ extendedKey: '',
},
],
}
diff --git a/packages/neuron-ui/src/styles/mixin.scss b/packages/neuron-ui/src/styles/mixin.scss
index 1d8ea27ba7..9dfa2f6de3 100644
--- a/packages/neuron-ui/src/styles/mixin.scss
+++ b/packages/neuron-ui/src/styles/mixin.scss
@@ -161,6 +161,7 @@
color: $normalColor !important;
font-weight: 500;
font-size: 14px;
+ line-height: 20px;
cursor: pointer;
display: flex;
align-items: center;
diff --git a/packages/neuron-ui/src/styles/theme.scss b/packages/neuron-ui/src/styles/theme.scss
index 59a1de24ea..1421495687 100644
--- a/packages/neuron-ui/src/styles/theme.scss
+++ b/packages/neuron-ui/src/styles/theme.scss
@@ -34,7 +34,6 @@ body {
--main-pagination-text-color: #666666;
--warn-text-color: #f68c2a;
--warn-background-color: #fff6eb;
- --warn-background-color: #fff6eb;
--svg-fill-color: #ffffff;
--lock-info-title-border: #e5e5e5;
--script-tag-background-color: #eafbf6;
diff --git a/packages/neuron-ui/src/tests/calculation/calculateAPC/index.test.ts b/packages/neuron-ui/src/tests/calculation/calculateAPC/index.test.ts
index 8066d4badd..4e94d828a0 100644
--- a/packages/neuron-ui/src/tests/calculation/calculateAPC/index.test.ts
+++ b/packages/neuron-ui/src/tests/calculation/calculateAPC/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import calculateAPC from 'utils/calculateAPC'
import fixtures from './fixtures.json'
diff --git a/packages/neuron-ui/src/tests/calculation/calculateClaimEpochValue/index.test.ts b/packages/neuron-ui/src/tests/calculation/calculateClaimEpochValue/index.test.ts
index 93d10f0887..4917a70ece 100644
--- a/packages/neuron-ui/src/tests/calculation/calculateClaimEpochValue/index.test.ts
+++ b/packages/neuron-ui/src/tests/calculation/calculateClaimEpochValue/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import calculateClaimEpochValue from 'utils/calculateClaimEpochValue'
import fixtures from './fixtures.json'
diff --git a/packages/neuron-ui/src/tests/calendar/index.test.ts b/packages/neuron-ui/src/tests/calendar/index.test.ts
index 04315b7ec2..bfac169ca6 100644
--- a/packages/neuron-ui/src/tests/calendar/index.test.ts
+++ b/packages/neuron-ui/src/tests/calendar/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from '@jest/globals'
import {
isDayInRange,
isMonthInRange,
@@ -104,14 +105,22 @@ describe('Get Local Month Short Names', () => {
const names = ['Jan.', 'Feb.', 'Mar.', 'Apr.', 'May.', 'Jun.', 'Jul.', 'Aug.', 'Sep.', 'Oct.', 'Nov.', 'Dec.']
expect(getLocalMonthShortNames('en')).toEqual(names)
})
-})
+ it('French', () => {
+ const names = ['janv.', 'fÊvr.', 'mars', 'avr.', 'mai', 'juin', 'juil.', 'aoÃģt', 'sept.', 'oct.', 'nov.', 'dÊc.']
+ expect(getLocalMonthShortNames('fr')).toEqual(names)
+ })
+
+ it('Spanish', () => {
+ const names = ['ene', 'feb', 'mar', 'abr', 'may', 'jun', 'jul', 'ago', 'sept', 'oct', 'nov', 'dic']
+ expect(getLocalMonthShortNames('es')).toEqual(names)
+ })
+})
describe('Get Local Month Names', () => {
it('Chinese', () => {
const names = ['ä¸æ', 'äēæ', 'ä¸æ', 'åæ', 'äēæ', 'å
æ', 'ä¸æ', 'å
Ģæ', 'äšæ', 'åæ', 'åä¸æ', 'åäēæ']
expect(getLocalMonthNames('zh')).toEqual(names)
})
-
it('English', () => {
const names = [
'January',
@@ -129,6 +138,42 @@ describe('Get Local Month Names', () => {
]
expect(getLocalMonthNames('en')).toEqual(names)
})
+
+ it('French', () => {
+ const names = [
+ 'janvier',
+ 'fÊvrier',
+ 'mars',
+ 'avril',
+ 'mai',
+ 'juin',
+ 'juillet',
+ 'aoÃģt',
+ 'septembre',
+ 'octobre',
+ 'novembre',
+ 'dÊcembre',
+ ]
+ expect(getLocalMonthNames('fr')).toEqual(names)
+ })
+
+ it('Spanish', () => {
+ const names = [
+ 'enero',
+ 'febrero',
+ 'marzo',
+ 'abril',
+ 'mayo',
+ 'junio',
+ 'julio',
+ 'agosto',
+ 'septiembre',
+ 'octubre',
+ 'noviembre',
+ 'diciembre',
+ ]
+ expect(getLocalMonthNames('es')).toEqual(names)
+ })
})
describe('Get Local Week Names', () => {
@@ -142,6 +187,16 @@ describe('Get Local Week Names', () => {
expect(getLocalWeekNames('en')).toEqual(names)
})
+ it('Spanish', () => {
+ const names = ['D', 'L', 'M', 'X', 'J', 'V', 'S']
+ expect(getLocalWeekNames('es')).toEqual(names)
+ })
+
+ it('French', () => {
+ const names = ['D', 'L', 'M', 'M', 'J', 'V', 'S']
+ expect(getLocalWeekNames('fr')).toEqual(names)
+ })
+
it('Traditional Chinese', () => {
const names = ['æĨ', 'ä¸', 'äē', 'ä¸', 'å', 'äē', 'å
']
expect(getLocalWeekNames('zh-TW')).toEqual(names)
diff --git a/packages/neuron-ui/src/tests/formatters/CKBToShannonFormatter/index.test.ts b/packages/neuron-ui/src/tests/formatters/CKBToShannonFormatter/index.test.ts
index ba6cd25116..6c74afa6a3 100644
--- a/packages/neuron-ui/src/tests/formatters/CKBToShannonFormatter/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/CKBToShannonFormatter/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { CKBToShannonFormatter } from 'utils/formatters'
import { CapacityUnit } from 'utils'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/formatters/addressesToBalance/index.test.ts b/packages/neuron-ui/src/tests/formatters/addressesToBalance/index.test.ts
index 07202c711e..e9bc9009c5 100644
--- a/packages/neuron-ui/src/tests/formatters/addressesToBalance/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/addressesToBalance/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { addressesToBalance } from 'utils/formatters'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/formatters/bytesFormatter/index.test.ts b/packages/neuron-ui/src/tests/formatters/bytesFormatter/index.test.ts
index 4a80409b17..a98c5cdd46 100644
--- a/packages/neuron-ui/src/tests/formatters/bytesFormatter/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/bytesFormatter/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { bytesFormatter } from 'utils/formatters'
import fixtures from './fixtures.json'
diff --git a/packages/neuron-ui/src/tests/formatters/complexNumberToPureNumber/index.test.ts b/packages/neuron-ui/src/tests/formatters/complexNumberToPureNumber/index.test.ts
index bb7a538196..319208a831 100644
--- a/packages/neuron-ui/src/tests/formatters/complexNumberToPureNumber/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/complexNumberToPureNumber/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { complexNumberToPureNumber } from 'utils/formatters'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/formatters/currencyFormatter/index.test.ts b/packages/neuron-ui/src/tests/formatters/currencyFormatter/index.test.ts
index 63959adc41..ac84e21567 100644
--- a/packages/neuron-ui/src/tests/formatters/currencyFormatter/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/currencyFormatter/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { currencyFormatter } from 'utils/formatters'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/formatters/difficultyFormatter/index.test.ts b/packages/neuron-ui/src/tests/formatters/difficultyFormatter/index.test.ts
index e5cfc335db..f3c245189b 100644
--- a/packages/neuron-ui/src/tests/formatters/difficultyFormatter/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/difficultyFormatter/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { difficultyFormatter } from 'utils/formatters'
import fixtures from './fixtures.json'
diff --git a/packages/neuron-ui/src/tests/formatters/outputsToTotalAmount/index.test.ts b/packages/neuron-ui/src/tests/formatters/outputsToTotalAmount/index.test.ts
index 7a7cd78082..ed095c0c1e 100644
--- a/packages/neuron-ui/src/tests/formatters/outputsToTotalAmount/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/outputsToTotalAmount/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { outputsToTotalAmount } from 'utils/formatters'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/formatters/padFractionDigitsIfDecimal/index.test.ts b/packages/neuron-ui/src/tests/formatters/padFractionDigitsIfDecimal/index.test.ts
index 4b2881b8e2..76c5563d17 100644
--- a/packages/neuron-ui/src/tests/formatters/padFractionDigitsIfDecimal/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/padFractionDigitsIfDecimal/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from '@jest/globals'
import { padFractionDigitsIfDecimal } from 'utils/formatters'
describe('padFractionDigitsIfDecimal', () => {
diff --git a/packages/neuron-ui/src/tests/formatters/sUDTAmountFormatter/index.test.ts b/packages/neuron-ui/src/tests/formatters/sUDTAmountFormatter/index.test.ts
index d7ffed2f0f..842be431c9 100644
--- a/packages/neuron-ui/src/tests/formatters/sUDTAmountFormatter/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/sUDTAmountFormatter/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { sUDTAmountFormatter } from 'utils/formatters'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/formatters/shannonToCKBFormatter/index.test.ts b/packages/neuron-ui/src/tests/formatters/shannonToCKBFormatter/index.test.ts
index 3787ca813a..adc889334b 100644
--- a/packages/neuron-ui/src/tests/formatters/shannonToCKBFormatter/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/shannonToCKBFormatter/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { shannonToCKBFormatter } from 'utils/formatters'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/formatters/sporeFormatter/index.test.ts b/packages/neuron-ui/src/tests/formatters/sporeFormatter/index.test.ts
index 78c54b209e..17ad3f202c 100644
--- a/packages/neuron-ui/src/tests/formatters/sporeFormatter/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/sporeFormatter/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from '@jest/globals'
import { sporeFormatter, truncateMiddle } from 'utils/formatters'
describe('sporeFormatter', () => {
diff --git a/packages/neuron-ui/src/tests/formatters/sudtAmountToValue/index.test.ts b/packages/neuron-ui/src/tests/formatters/sudtAmountToValue/index.test.ts
index 679a3d7a63..ea749c7102 100644
--- a/packages/neuron-ui/src/tests/formatters/sudtAmountToValue/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/sudtAmountToValue/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { sudtAmountToValue } from 'utils/formatters'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/formatters/sudtValueToAmount/index.test.ts b/packages/neuron-ui/src/tests/formatters/sudtValueToAmount/index.test.ts
index b1c64e60ab..7470b6e775 100644
--- a/packages/neuron-ui/src/tests/formatters/sudtValueToAmount/index.test.ts
+++ b/packages/neuron-ui/src/tests/formatters/sudtValueToAmount/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { sudtValueToAmount } from 'utils/formatters'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/getCompensatedTime/index.test.ts b/packages/neuron-ui/src/tests/getCompensatedTime/index.test.ts
index 97ddaf2a63..df3dd6f19f 100644
--- a/packages/neuron-ui/src/tests/getCompensatedTime/index.test.ts
+++ b/packages/neuron-ui/src/tests/getCompensatedTime/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import getCompensatedTime from 'utils/getCompensatedTime'
import fixtures from './fixtures.json'
diff --git a/packages/neuron-ui/src/tests/getCompensationPeriod/index.test.ts b/packages/neuron-ui/src/tests/getCompensationPeriod/index.test.ts
index ff02cc41b3..26d74e4765 100644
--- a/packages/neuron-ui/src/tests/getCompensationPeriod/index.test.ts
+++ b/packages/neuron-ui/src/tests/getCompensationPeriod/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import getCompensationPeriod from 'utils/getCompensationPeriod'
import fixtures from './fixtures.json'
diff --git a/packages/neuron-ui/src/tests/getConnectionStatus/index.test.ts b/packages/neuron-ui/src/tests/getConnectionStatus/index.test.ts
index d318491cb3..66b098fd39 100644
--- a/packages/neuron-ui/src/tests/getConnectionStatus/index.test.ts
+++ b/packages/neuron-ui/src/tests/getConnectionStatus/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { ConnectionStatus } from 'utils'
import getConnectionStatus from 'utils/getConnectionStatus'
import fixtures from './fixtures.json'
@@ -9,6 +10,6 @@ describe('Test getConnectionStatus', () => {
test.each(fixtureTable)(`%s`, (_title, params, expected) => {
expect.assertions(1)
- expect(getConnectionStatus(...params)).toBe(expected)
+ expect(getConnectionStatus(params[0])).toBe(expected)
})
})
diff --git a/packages/neuron-ui/src/tests/getDAOCellStatus/index.test.ts b/packages/neuron-ui/src/tests/getDAOCellStatus/index.test.ts
index 5897390565..8023967548 100644
--- a/packages/neuron-ui/src/tests/getDAOCellStatus/index.test.ts
+++ b/packages/neuron-ui/src/tests/getDAOCellStatus/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import getDAOCellStatus, { CellStatus } from 'utils/getDAOCellStatus'
import fixtures from './fixtures.json'
diff --git a/packages/neuron-ui/src/tests/getMultisigSignStatus/index.test.ts b/packages/neuron-ui/src/tests/getMultisigSignStatus/index.test.ts
index 8385cde682..4820f0fe7f 100644
--- a/packages/neuron-ui/src/tests/getMultisigSignStatus/index.test.ts
+++ b/packages/neuron-ui/src/tests/getMultisigSignStatus/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from '@jest/globals'
import { MultisigConfig } from 'services/remote'
import getMultisigSignStatus from 'utils/getMultisigSignStatus'
import { addressToScript, scriptToHash } from '@nervosnetwork/ckb-sdk-utils'
diff --git a/packages/neuron-ui/src/tests/getPageNoList/index.test.ts b/packages/neuron-ui/src/tests/getPageNoList/index.test.ts
index e8336515d5..0947dfbda2 100644
--- a/packages/neuron-ui/src/tests/getPageNoList/index.test.ts
+++ b/packages/neuron-ui/src/tests/getPageNoList/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import getPageNoList from 'utils/getPageNoList'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/getSyncLeftTime/fixtures.json b/packages/neuron-ui/src/tests/getSyncLeftTime/fixtures.json
index b677363a57..85cc88cb20 100644
--- a/packages/neuron-ui/src/tests/getSyncLeftTime/fixtures.json
+++ b/packages/neuron-ui/src/tests/getSyncLeftTime/fixtures.json
@@ -3,20 +3,32 @@
"estimate": null,
"expected": "-"
},
- "should return 00:01 when estimate is 60_000": {
+ "should return 00:00:00 when estimate is less than 1_000": {
+ "estimate": 999,
+ "expected": "00:00:00"
+ },
+ "should return 00:00:01 when estimate is 1_000": {
+ "estimate": 1000,
+ "expected": "00:00:01"
+ },
+ "should return 00:01:00 when estimate is 60_000": {
"estimate": 60000,
- "expected": "00:01"
+ "expected": "00:01:00"
+ },
+ "should return 00:01:59 when estimate is 119_999": {
+ "estimate": 119999,
+ "expected": "00:01:59"
},
"should return 01:00 when estimate is 60 * 60_000": {
"estimate": 3600000,
- "expected": "01:00"
+ "expected": "01:00:00"
},
- "should return 00:00 when estimate is less than 30_000": {
- "estimate": 29999,
- "expected": "00:00"
+ "should return 01:59:59 when estimate is 60 * 60_000 + 59 * 60_000 + 59 * 1_000": {
+ "estimate": 7199000,
+ "expected": "01:59:59"
},
"should return 00:01 when estimate is less than 60_000 but greater than 30_000": {
"estimate": 30001,
- "expected": "00:01"
+ "expected": "00:00:30"
}
}
diff --git a/packages/neuron-ui/src/tests/getSyncLeftTime/index.test.ts b/packages/neuron-ui/src/tests/getSyncLeftTime/index.test.ts
index 4447e320e4..25988887dd 100644
--- a/packages/neuron-ui/src/tests/getSyncLeftTime/index.test.ts
+++ b/packages/neuron-ui/src/tests/getSyncLeftTime/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import getSyncLeftTime from 'utils/getSyncLeftTime'
import fixtures from './fixtures.json'
diff --git a/packages/neuron-ui/src/tests/is/isMainnet/index.test.ts b/packages/neuron-ui/src/tests/is/isMainnet/index.test.ts
index 10d8af1da9..18cf7a8085 100644
--- a/packages/neuron-ui/src/tests/is/isMainnet/index.test.ts
+++ b/packages/neuron-ui/src/tests/is/isMainnet/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { isMainnet } from 'utils/is'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/is/isReadyByVersion/index.test.ts b/packages/neuron-ui/src/tests/is/isReadyByVersion/index.test.ts
index c37977d95c..6f9a113bad 100644
--- a/packages/neuron-ui/src/tests/is/isReadyByVersion/index.test.ts
+++ b/packages/neuron-ui/src/tests/is/isReadyByVersion/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { isReadyByVersion } from 'utils/is'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/is/isSuccessResponse/index.test.ts b/packages/neuron-ui/src/tests/is/isSuccessResponse/index.test.ts
index 1d0a50f7dc..efaafded4a 100644
--- a/packages/neuron-ui/src/tests/is/isSuccessResponse/index.test.ts
+++ b/packages/neuron-ui/src/tests/is/isSuccessResponse/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { isSuccessResponse } from 'utils/is'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/parsers/index.test.ts b/packages/neuron-ui/src/tests/parsers/index.test.ts
index d9dc7e31db..a7a240565b 100644
--- a/packages/neuron-ui/src/tests/parsers/index.test.ts
+++ b/packages/neuron-ui/src/tests/parsers/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect } from '@jest/globals'
import { listParams, epochParser, toUint128Le } from 'utils/parsers'
describe('listParams', () => {
@@ -8,6 +9,8 @@ describe('listParams', () => {
pageNo: 1,
pageSize: 15,
keywords: 'foo',
+ sort: '',
+ direction: '',
},
}
expect(listParams(fixture.params)).toEqual(fixture.expected)
@@ -20,6 +23,22 @@ describe('listParams', () => {
pageNo: 2,
pageSize: 30,
keywords: 'foo',
+ sort: '',
+ direction: '',
+ },
+ }
+ expect(listParams(fixture.params)).toEqual(fixture.expected)
+ })
+
+ it('should use passed sort and direction', () => {
+ const fixture = {
+ params: '?sort=foo&direction=asc',
+ expected: {
+ pageNo: 1,
+ pageSize: 15,
+ keywords: '',
+ sort: 'foo',
+ direction: 'asc',
},
}
expect(listParams(fixture.params)).toEqual(fixture.expected)
diff --git a/packages/neuron-ui/src/tests/sortAccounts/index.test.ts b/packages/neuron-ui/src/tests/sortAccounts/index.test.ts
index 53249f3579..27b52a56d6 100644
--- a/packages/neuron-ui/src/tests/sortAccounts/index.test.ts
+++ b/packages/neuron-ui/src/tests/sortAccounts/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import sortAccounts, { Account } from 'utils/sortAccounts'
import fixtures from './fixtures.json'
diff --git a/packages/neuron-ui/src/tests/validators/address/index.test.ts b/packages/neuron-ui/src/tests/validators/address/index.test.ts
index 59a8c1a58e..402c40b82c 100644
--- a/packages/neuron-ui/src/tests/validators/address/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/address/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { isErrorWithI18n } from 'exceptions'
import { validateAddress } from 'utils/validators'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/validators/amount/index.test.ts b/packages/neuron-ui/src/tests/validators/amount/index.test.ts
index 9c1ac74e69..2048ab2e54 100644
--- a/packages/neuron-ui/src/tests/validators/amount/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/amount/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { isErrorWithI18n } from 'exceptions'
import { validateAmount } from 'utils/validators'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/validators/amountRange/index.test.ts b/packages/neuron-ui/src/tests/validators/amountRange/index.test.ts
index 2061364ab8..ce3cc24472 100644
--- a/packages/neuron-ui/src/tests/validators/amountRange/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/amountRange/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { isErrorWithI18n } from 'exceptions'
import { validateAmountRange } from 'utils/validators'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/validators/assetAccountAddress/index.test.ts b/packages/neuron-ui/src/tests/validators/assetAccountAddress/index.test.ts
index b09b6775f9..40c36b65cf 100644
--- a/packages/neuron-ui/src/tests/validators/assetAccountAddress/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/assetAccountAddress/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { isErrorWithI18n } from 'exceptions'
import { validateAssetAccountAddress } from 'utils/validators'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/validators/assetAccountName/index.test.ts b/packages/neuron-ui/src/tests/validators/assetAccountName/index.test.ts
index 4bbe8169f4..2ea6305086 100644
--- a/packages/neuron-ui/src/tests/validators/assetAccountName/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/assetAccountName/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { isErrorWithI18n } from 'exceptions'
import { validateAssetAccountName } from 'utils/validators'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/validators/capacity/fixtures.ts b/packages/neuron-ui/src/tests/validators/capacity/fixtures.ts
new file mode 100644
index 0000000000..002fcad53b
--- /dev/null
+++ b/packages/neuron-ui/src/tests/validators/capacity/fixtures.ts
@@ -0,0 +1,20 @@
+import { ErrorCode } from 'utils/enums'
+
+export default {
+ 'Should throw an error when address is not a string': {
+ params: {
+ address: 'ckb1qrgqep8saj8agswr30pls73hra28ry8jlnlc3ejzh3dl2ju7xxpjxqgqqy28n5m69va267nv0wvsudngtxz8t9jwss3xkhpk',
+ amount: '62',
+ unit: 'ckb',
+ },
+ exception: ErrorCode.CapacityTooSmall,
+ },
+ 'Should throw an error when address is required but not provided': {
+ params: {
+ address: 'ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsq2n0egquval9ljqm2ga6t9509kwcex5ejq3hy6dk',
+ amount: '62',
+ unit: 'ckb',
+ },
+ exception: null,
+ },
+}
diff --git a/packages/neuron-ui/src/tests/validators/capacity/index.test.ts b/packages/neuron-ui/src/tests/validators/capacity/index.test.ts
new file mode 100644
index 0000000000..d750f0b52f
--- /dev/null
+++ b/packages/neuron-ui/src/tests/validators/capacity/index.test.ts
@@ -0,0 +1,25 @@
+import { describe, test, expect } from '@jest/globals'
+import { isErrorWithI18n } from 'exceptions'
+import { validateCapacity } from 'utils/validators'
+import fixtures from './fixtures'
+
+const fixtureTable: Fixture.Validator[] = Object.entries(fixtures).map(
+ ([title, { params, exception }]) => [title, [params], exception]
+)
+
+describe(`Test capacity validator`, () => {
+ test.each(fixtureTable)(`%s`, (_title, [params], exception) => {
+ if (exception) {
+ expect.assertions(2)
+ try {
+ validateCapacity(params)
+ } catch (err) {
+ expect(isErrorWithI18n(err)).toBeTruthy()
+ expect((err as { code: number }).code).toBe(exception)
+ }
+ } else {
+ expect.assertions(1)
+ expect(validateCapacity(params)).toBeTruthy()
+ }
+ })
+})
diff --git a/packages/neuron-ui/src/tests/validators/decimal/index.test.ts b/packages/neuron-ui/src/tests/validators/decimal/index.test.ts
index a579546928..0d0fad954f 100644
--- a/packages/neuron-ui/src/tests/validators/decimal/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/decimal/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { isErrorWithI18n } from 'exceptions'
import { validateDecimal } from 'utils/validators'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/validators/networkName/index.test.ts b/packages/neuron-ui/src/tests/validators/networkName/index.test.ts
index ad39dd7cb2..bdbe78ed2f 100644
--- a/packages/neuron-ui/src/tests/validators/networkName/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/networkName/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { isErrorWithI18n } from 'exceptions'
import { validateNetworkName } from 'utils/validators'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/validators/outputs/index.test.ts b/packages/neuron-ui/src/tests/validators/outputs/index.test.ts
index 8c9827c364..dc7af3472e 100644
--- a/packages/neuron-ui/src/tests/validators/outputs/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/outputs/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { validateOutputs } from 'utils/validators'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/validators/passwordComplexity/index.test.ts b/packages/neuron-ui/src/tests/validators/passwordComplexity/index.test.ts
index 85c7fc4b78..ab23aa929f 100644
--- a/packages/neuron-ui/src/tests/validators/passwordComplexity/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/passwordComplexity/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { isErrorWithI18n } from 'exceptions'
import { validatePasswordComplexity } from 'utils/validators'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/validators/sudtAmount/index.test.ts b/packages/neuron-ui/src/tests/validators/sudtAmount/index.test.ts
index e04f191a21..5143476937 100644
--- a/packages/neuron-ui/src/tests/validators/sudtAmount/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/sudtAmount/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { isErrorWithI18n } from 'exceptions'
import { validateAssetAccountAmount } from 'utils/validators'
diff --git a/packages/neuron-ui/src/tests/validators/symbol/index.test.ts b/packages/neuron-ui/src/tests/validators/symbol/index.test.ts
index f20fcf651c..4a533748d5 100644
--- a/packages/neuron-ui/src/tests/validators/symbol/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/symbol/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { isErrorWithI18n } from 'exceptions'
import { validateSymbol } from 'utils/validators'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/validators/tokenId/index.test.ts b/packages/neuron-ui/src/tests/validators/tokenId/index.test.ts
index 4110535426..b19545793b 100644
--- a/packages/neuron-ui/src/tests/validators/tokenId/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/tokenId/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { isErrorWithI18n } from 'exceptions'
import { validateTokenId } from 'utils/validators'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/validators/tokenName/index.test.ts b/packages/neuron-ui/src/tests/validators/tokenName/index.test.ts
index c981928028..8716536a5e 100644
--- a/packages/neuron-ui/src/tests/validators/tokenName/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/tokenName/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { isErrorWithI18n } from 'exceptions'
import { validateTokenName } from 'utils/validators'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/tests/validators/totalAmount/index.test.ts b/packages/neuron-ui/src/tests/validators/totalAmount/index.test.ts
index f31ec17fbe..f2cee32d6a 100644
--- a/packages/neuron-ui/src/tests/validators/totalAmount/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/totalAmount/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { isErrorWithI18n } from 'exceptions'
import { validateTotalAmount } from 'utils/validators'
diff --git a/packages/neuron-ui/src/tests/validators/url/index.test.ts b/packages/neuron-ui/src/tests/validators/url/index.test.ts
index be3af6e4a4..2dcecac6f8 100644
--- a/packages/neuron-ui/src/tests/validators/url/index.test.ts
+++ b/packages/neuron-ui/src/tests/validators/url/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from '@jest/globals'
import { isErrorWithI18n } from 'exceptions'
import { validateURL } from 'utils/validators'
import fixtures from './fixtures'
diff --git a/packages/neuron-ui/src/types/App/index.d.ts b/packages/neuron-ui/src/types/App/index.d.ts
index 043f51e3d1..4ba289b716 100644
--- a/packages/neuron-ui/src/types/App/index.d.ts
+++ b/packages/neuron-ui/src/types/App/index.d.ts
@@ -31,6 +31,7 @@ declare namespace State {
lock: CKBComponents.Script | null
type?: CKBComponents.Script
data?: string
+ status?: string
}
interface DetailedOutput {
@@ -40,6 +41,7 @@ declare namespace State {
outPoint: CKBComponents.OutPoint
type?: CKBComponents.Script
data?: string
+ isChangeCell?: boolean
}
interface DetailedTransaction extends Transaction {
blockHash: string
@@ -50,6 +52,9 @@ declare namespace State {
outputs: DetailedOutput[]
outputsCount: string
witnesses: string[]
+ size?: number
+ isLastChange?: boolean
+ cycles?: string
}
interface Output {
address: string | undefined
@@ -121,6 +126,8 @@ declare namespace State {
blake160s: string[]
}
onSuccess?: () => void
+ showType?: 'Global' | ''
+ amendHash?: string
}
interface SUDTAccount {
@@ -137,7 +144,7 @@ declare namespace State {
type GlobalAlertDialog = {
show?: boolean
title?: string
- message?: string
+ message?: React.ReactNode
type: 'success' | 'failed' | 'warning'
action?: 'ok' | 'cancel' | 'all'
onClose?: () => void
@@ -201,6 +208,8 @@ declare namespace State {
device?: DeviceInfo
isHD?: boolean
isWatchOnly?: boolean
+ startBlockNumber?: string
+ extendedKey: string
}
interface DeviceInfo {
@@ -331,6 +340,56 @@ declare namespace State {
updater: AppUpdater
sUDTAccounts: SUDTAccount[]
experimental: Experimental | null
+ consumeCells?: { outPoint: OutPoint; capacity: string }[]
+ }
+
+ enum LockScriptCategory {
+ SECP256K1 = 'SECP256K1',
+ ANYONE_CAN_PAY = 'ANYONE_CAN_PAY',
+ MULTI_LOCK_TIME = 'MULTI_LOCK_TIME',
+ MULTISIG = 'MULTISIG',
+ Cheque = 'Cheque',
+ Unknown = 'Unknown',
+ }
+
+ enum TypeScriptCategory {
+ DAO = 'DAO',
+ NFT = 'NFT',
+ NFTClass = 'NFTClass',
+ NFTIssuer = 'NFTIssuer',
+ SUDT = 'SUDT',
+ Spore = 'Spore',
+ Unknown = 'Unknown',
+ }
+
+ interface LiveCellWithLocalInfoAPI {
+ capacity: CKBComponents.Capacity
+ outPoint: CKBComponents.OutPoint
+ lock: CKBComponents.Script
+ type?: CKBComponents.Script
+ data?: CKBComponents.Bytes
+ timestamp: string
+ description?: string
+ lockScriptType: LockScriptCategory
+ typeScriptType?: TypeScriptCategory
+ locked?: boolean
+ }
+ interface LiveCellWithLocalInfo extends LiveCellWithLocalInfoAPI {
+ lockedReason?: { key: string; params?: Record }
+ cellType?: 'CKB' | 'SUDT' | 'NFT' | 'Spore' | 'Unknown'
+ }
+
+ interface UpdateLiveCellLocalInfo {
+ outPoint: CKBComponents.OutPoint
+ description?: string
+ locked?: boolean
+ }
+
+ interface UpdateLiveCellsLockStatus {
+ outPoints: CKBComponents.OutPoint[]
+ lockScripts: CKBComponents.Script[]
+ locked: boolean
+ password: string
}
}
diff --git a/packages/neuron-ui/src/types/Controller/index.d.ts b/packages/neuron-ui/src/types/Controller/index.d.ts
index 31ee5e7d11..c308f2b88b 100644
--- a/packages/neuron-ui/src/types/Controller/index.d.ts
+++ b/packages/neuron-ui/src/types/Controller/index.d.ts
@@ -35,7 +35,11 @@ declare namespace Controller {
newPassword?: string
name?: string
device?: any
- startBlockNumber?: string
+ }
+
+ interface UpdateWalletStartBlockNumberParams {
+ id: string
+ startBlockNumber: string
}
interface RequestPasswordParams {
@@ -48,6 +52,11 @@ declare namespace Controller {
password: string
}
+ interface ReplaceWalletParams {
+ existingWalletId: string
+ importedWalletId: string
+ }
+
interface BackupWalletParams {
id: string
password: string
@@ -60,6 +69,7 @@ declare namespace Controller {
tx: any
password?: string
description?: string
+ amendHash?: string
multisigConfig?: {
id: number
walletId: string
@@ -78,6 +88,8 @@ declare namespace Controller {
capacity: string
}[]
feeRate: string
+ consumeOutPoints?: CKBComponents.OutPoint[]
+ enableUseSentCell?: boolean
}
type GenerateSendingAllTransactionParams = GenerateTransactionParams
@@ -278,6 +290,7 @@ declare namespace Controller {
tx: any
password?: string
skipLastInputs?: boolean
+ amendHash?: string
}
type Response = Hash
}
@@ -309,14 +322,6 @@ declare namespace Controller {
}
type Response = TokenInfo[]
}
-
- namespace ClearCache {
- interface Params {
- resetIndexerData: boolean
- }
- type Response = boolean
- }
-
namespace GetSUDTTokenInfo {
interface Params {
tokenID: string
diff --git a/packages/neuron-ui/src/utils/calculateUsedCapacity.ts b/packages/neuron-ui/src/utils/calculateUsedCapacity.ts
new file mode 100644
index 0000000000..ba91cf77f6
--- /dev/null
+++ b/packages/neuron-ui/src/utils/calculateUsedCapacity.ts
@@ -0,0 +1,12 @@
+const CODE_HASH_LENGTH = 32
+const HASH_TYPE_LENGTH = 1
+const CAPACITY_LENGTH = 8
+
+export const calculateUsedCapacity = (cell: CKBComponents.Cell & { data?: CKBComponents.Bytes }) => {
+ const lockUsed = CODE_HASH_LENGTH + HASH_TYPE_LENGTH + cell.lock.args.slice(2).length / 2
+ const typeUsed = cell?.type ? CODE_HASH_LENGTH + HASH_TYPE_LENGTH + cell.type.args.slice(2).length / 2 : 0
+ const dataUsed = cell.data ? cell.data.slice(2).length / 2 : 0
+ return lockUsed + typeUsed + dataUsed + CAPACITY_LENGTH
+}
+
+export default calculateUsedCapacity
diff --git a/packages/neuron-ui/src/utils/const.ts b/packages/neuron-ui/src/utils/const.ts
index 95db79fe67..7442b63012 100644
--- a/packages/neuron-ui/src/utils/const.ts
+++ b/packages/neuron-ui/src/utils/const.ts
@@ -49,7 +49,7 @@ export const DEFAULT_SUDT_FIELDS = {
CKBSymbol: 'CKB',
CKBDecimal: '8',
}
-export const LOCALES = ['zh', 'zh-TW', 'en', 'en-US'] as const
+export const LOCALES = ['zh', 'zh-TW', 'en', 'en-US', 'fr', 'es'] as const
// address property
export const SHORT_ADDR_LENGTH = 46
diff --git a/packages/neuron-ui/src/utils/enums.ts b/packages/neuron-ui/src/utils/enums.ts
index c94cb77f7b..647f421446 100644
--- a/packages/neuron-ui/src/utils/enums.ts
+++ b/packages/neuron-ui/src/utils/enums.ts
@@ -7,6 +7,7 @@ export enum ConnectionStatus {
export enum RoutePath {
Launch = '/',
Overview = '/overview',
+ CellManage = 'cellManage',
WalletWizard = '/wizard/',
Wallet = '/wallet',
Send = '/send',
@@ -24,9 +25,11 @@ export enum RoutePath {
SUDTAccountList = '/s-udt/accounts',
SUDTSend = '/s-udt/send',
ImportHardware = '/import-hardware',
+ SendTxDetail = '/send-tx-detail',
OfflineSign = 'offline-sign',
SignVerify = 'sign-verify',
MultisigAddress = 'multisig-address',
+ BroadcastTransaction = 'broadcast-transaction',
}
export enum CapacityUnit {
@@ -106,6 +109,7 @@ export enum ErrorCode {
DeviceInSleep = 501,
// active warning
WaitForFullySynced = 600,
+ DuplicateImportWallet = 118,
}
export enum SyncStatus {
@@ -218,3 +222,22 @@ export enum SendType {
unknowNewCell = 'unknowNewCell',
sendCKB = 'sendCKB',
}
+
+export enum LockScriptCategory {
+ SECP256K1 = 'SECP256K1',
+ ANYONE_CAN_PAY = 'ANYONE_CAN_PAY',
+ MULTI_LOCK_TIME = 'MULTI_LOCK_TIME',
+ MULTISIG = 'MULTISIG',
+ Cheque = 'Cheque',
+ Unknown = 'Unknown',
+}
+
+export enum TypeScriptCategory {
+ DAO = 'DAO',
+ NFT = 'NFT',
+ NFTClass = 'NFTClass',
+ NFTIssuer = 'NFTIssuer',
+ SUDT = 'SUDT',
+ Spore = 'Spore',
+ Unknown = 'Unknown',
+}
diff --git a/packages/neuron-ui/src/utils/getSyncLeftTime.ts b/packages/neuron-ui/src/utils/getSyncLeftTime.ts
index c717f0a300..9b45a9f274 100644
--- a/packages/neuron-ui/src/utils/getSyncLeftTime.ts
+++ b/packages/neuron-ui/src/utils/getSyncLeftTime.ts
@@ -1,4 +1,5 @@
-const MINS_PER_HOUR = 60
+const MILLISECS_PER_SEC = 1_000
+const MILLISECS_PER_MIN = 60_000
const MILLISECS_PER_HOUR = 3600_000
export const getSyncLeftTime = (estimate: number | undefined) => {
@@ -6,8 +7,9 @@ export const getSyncLeftTime = (estimate: number | undefined) => {
if (typeof estimate === 'number') {
const time = estimate / MILLISECS_PER_HOUR
const hrs = Math.floor(time)
- const mins = Math.round((time - hrs) * MINS_PER_HOUR)
- leftTime = `${hrs.toString().padStart(2, '0')}:${mins.toString().padStart(2, '0')}`
+ const mins = Math.floor((estimate - hrs * MILLISECS_PER_HOUR) / MILLISECS_PER_MIN)
+ const secs = Math.floor((estimate - hrs * MILLISECS_PER_HOUR - mins * MILLISECS_PER_MIN) / MILLISECS_PER_SEC)
+ leftTime = [hrs, mins, secs].map(v => v.toString().padStart(2, '0')).join(':')
}
return leftTime
}
diff --git a/packages/neuron-ui/src/utils/hooks/index.ts b/packages/neuron-ui/src/utils/hooks/index.ts
index 8de2d6897d..9496c06422 100644
--- a/packages/neuron-ui/src/utils/hooks/index.ts
+++ b/packages/neuron-ui/src/utils/hooks/index.ts
@@ -23,6 +23,7 @@ import {
validateAmount,
validateAddress,
validateAmountRange,
+ validateCapacity,
} from 'utils/validators'
import { MenuItemConstructorOptions, shell } from 'electron'
import { ErrorWithI18n, isErrorWithI18n } from 'exceptions'
@@ -37,10 +38,9 @@ export const useGoBack = () => {
}, [navigate])
}
-export const useLocalDescription = (
- type: 'address' | 'transaction',
- walletID: string,
- dispatch: StateDispatch,
+export const useDescription = (
+ onSubmitDescription: (param: { key: string; description: string }) => void,
+ onChangeEditStatus?: (isEditing: boolean) => void,
inputType = 'input'
) => {
const [localDescription, setLocalDescription] = useState<{ description: string; key: string }>({
@@ -50,37 +50,16 @@ export const useLocalDescription = (
const submitDescription = useCallback(
(key: string, originDesc: string) => {
+ onChangeEditStatus?.(false)
if ((key && key !== localDescription.key) || localDescription.description === originDesc) {
- dispatch({
- type: AppActions.ToggleIsAllowedToFetchList,
- payload: true,
- })
setLocalDescription({ key: '', description: '' })
} else {
- dispatch({
- type: AppActions.ToggleIsAllowedToFetchList,
- payload: true,
- })
- if (localDescription.key && type === 'transaction') {
- updateTransactionDescription({
- walletID,
- hash: localDescription.key,
- description: localDescription.description,
- })(dispatch)
- }
- if (localDescription.key && type === 'address') {
- updateAddressDescription({
- walletID,
- address: localDescription.key,
- description: localDescription.description,
- })(dispatch)
- }
+ onSubmitDescription(localDescription)
setLocalDescription({ key: '', description: '' })
}
},
- [type, walletID, localDescription, dispatch]
+ [localDescription, onChangeEditStatus]
)
-
const onDescriptionFieldBlur = useCallback(
(e: any) => {
const { descriptionKey: key, descriptionValue: originDesc } = e.target.dataset
@@ -121,11 +100,9 @@ export const useLocalDescription = (
const {
dataset: { descriptionKey: key, descriptionValue: originDesc = '' },
} = e.currentTarget
+ e.stopPropagation()
if (key) {
- dispatch({
- type: AppActions.ToggleIsAllowedToFetchList,
- payload: false,
- })
+ onChangeEditStatus?.(true)
setLocalDescription({ key, description: originDesc })
try {
const input = document.querySelector(`${inputType}[data-description-key="${key}"]`)
@@ -138,7 +115,7 @@ export const useLocalDescription = (
}
}
},
- [setLocalDescription, dispatch]
+ [setLocalDescription]
)
return {
localDescription,
@@ -149,6 +126,48 @@ export const useLocalDescription = (
}
}
+export const useLocalDescription = (type: 'address' | 'transaction', walletID: string, dispatch: StateDispatch) => {
+ const onSubmitDescription = useCallback(
+ (localDescription: { key: string; description: string }) => {
+ if (!localDescription.key) {
+ return
+ }
+ switch (type) {
+ case 'transaction':
+ updateTransactionDescription({
+ walletID,
+ hash: localDescription.key,
+ description: localDescription.description,
+ })(dispatch)
+ break
+ case 'address':
+ updateAddressDescription({
+ walletID,
+ address: localDescription.key,
+ description: localDescription.description,
+ })(dispatch)
+ break
+ default:
+ break
+ }
+ },
+ [type, walletID, dispatch]
+ )
+ const onChangeEditStatus = useCallback(
+ (isEditing: boolean) => {
+ dispatch({
+ type: AppActions.ToggleIsAllowedToFetchList,
+ payload: !isEditing,
+ })
+ },
+ [dispatch]
+ )
+ return {
+ onSubmitDescription,
+ onChangeEditStatus,
+ }
+}
+
export const useCalculateEpochs = ({ depositEpoch, currentEpoch }: { depositEpoch: string; currentEpoch: string }) =>
useMemo(() => {
const depositEpochInfo = epochParser(depositEpoch)
@@ -481,18 +500,22 @@ export const useForceUpdate = void>(cb: T) => {
}
export const useOutputErrors = (
- outputs: Partial>[],
- isMainnet: boolean
+ outputs: Partial>[],
+ isMainnet: boolean,
+ isSendMax?: boolean
) => {
return useMemo(
() =>
- outputs.map(({ address, amount, date }) => {
+ outputs.map(({ address, amount, date, unit }, index) => {
let amountError: ErrorWithI18n | undefined
if (amount !== undefined) {
try {
const extraSize = date ? CONSTANTS.SINCE_FIELD_SIZE : 0
validateAmount(amount)
validateAmountRange(amount, extraSize)
+ if (!(isSendMax && index === outputs.length - 1)) {
+ validateCapacity({ address, amount, unit })
+ }
} catch (err) {
if (isErrorWithI18n(err)) {
amountError = err
@@ -561,3 +584,20 @@ export const useCopy = () => {
copyTimes,
}
}
+
+export const usePagination = (pagination?: { pageSize?: number; onPageChange?: (pageNo: number) => void }) => {
+ const [pageNo, setPageNo] = useState(1)
+ const pageSize = useMemo(() => pagination?.pageSize ?? 10, [pagination])
+ const onPageChange = useCallback(
+ (page: number) => {
+ setPageNo(page)
+ pagination?.onPageChange?.(page)
+ },
+ [pagination]
+ )
+ return {
+ pageNo,
+ pageSize,
+ onPageChange,
+ }
+}
diff --git a/packages/neuron-ui/src/utils/i18n.ts b/packages/neuron-ui/src/utils/i18n.ts
index 28ebef475d..7202152a5e 100644
--- a/packages/neuron-ui/src/utils/i18n.ts
+++ b/packages/neuron-ui/src/utils/i18n.ts
@@ -5,10 +5,14 @@ import { getLocale } from 'services/remote'
import zh from 'locales/zh.json'
import en from 'locales/en.json'
import zhTW from 'locales/zh-tw.json'
+import fr from 'locales/fr.json'
+import es from 'locales/es.json'
i18n.use(initReactI18next).init({
resources: {
en,
+ fr,
+ es,
zh,
'zh-TW': zhTW,
},
diff --git a/packages/neuron-ui/src/utils/index.ts b/packages/neuron-ui/src/utils/index.ts
index 07219b0443..eb762f388d 100644
--- a/packages/neuron-ui/src/utils/index.ts
+++ b/packages/neuron-ui/src/utils/index.ts
@@ -26,5 +26,7 @@ export * from './baseActions'
export * from './getSUDTAmount'
export * from './multisig'
export * from './getNetworkLabel'
+export * from './calculateUsedCapacity'
+export * from './outPointTransform'
export { CONSTANTS }
diff --git a/packages/neuron-ui/src/utils/outPointTransform.ts b/packages/neuron-ui/src/utils/outPointTransform.ts
new file mode 100644
index 0000000000..14d745ecff
--- /dev/null
+++ b/packages/neuron-ui/src/utils/outPointTransform.ts
@@ -0,0 +1,11 @@
+export const outPointToStr = (value: CKBComponents.OutPoint): string => {
+ return `${value.txHash}_${value.index}`
+}
+
+export const strToOutPoint = (value: string): CKBComponents.OutPoint => {
+ const [txHash, index] = value.split('_')
+ return {
+ txHash,
+ index,
+ }
+}
diff --git a/packages/neuron-ui/src/utils/parsers.ts b/packages/neuron-ui/src/utils/parsers.ts
index cfad394fe1..28663dd69c 100644
--- a/packages/neuron-ui/src/utils/parsers.ts
+++ b/packages/neuron-ui/src/utils/parsers.ts
@@ -1,5 +1,5 @@
import { toUint64Le, parseEpoch } from 'services/chain'
-import { PAGE_SIZE } from './const'
+import { MILLISECONDS, PAGE_SIZE } from './const'
export const listParams = (search: string) => {
const query = new URLSearchParams(search)
@@ -9,6 +9,8 @@ export const listParams = (search: string) => {
pageNo: +(query.get('pageNo') || 1),
pageSize: +(query.get('pageSize') || PAGE_SIZE),
keywords,
+ sort: query.get('sort') || '',
+ direction: query.get('direction') || '',
}
return params
}
@@ -44,3 +46,26 @@ export const toUint128Le = (hexString: string) => {
return `${toUint64Le(`0x${s.substr(18, 16)}`)}${toUint64Le(s.substr(0, 18)).slice(2)}`
}
+
+export const getLockTimestamp = ({
+ lockArgs,
+ epoch,
+ bestKnownBlockTimestamp,
+}: {
+ lockArgs: string
+ epoch: string
+ bestKnownBlockTimestamp: number
+}) => {
+ const targetEpochInfo = epochParser(toUint64Le(`0x${lockArgs.slice(-16)}`))
+ const currentEpochInfo = epochParser(epoch)
+ const targetEpochFraction =
+ Number(targetEpochInfo.length) > 0 ? Number(targetEpochInfo.index) / Number(targetEpochInfo.length) : 1
+ const epochsInfo = {
+ target: Number(targetEpochInfo.number) + Math.min(targetEpochFraction, 1),
+ current: Number(currentEpochInfo.number) + Number(currentEpochInfo.index) / Number(currentEpochInfo.length),
+ }
+ return {
+ hasReached: epochsInfo.target <= epochsInfo.current,
+ lockTimestamp: bestKnownBlockTimestamp + (epochsInfo.target - epochsInfo.current) * MILLISECONDS,
+ }
+}
diff --git a/packages/neuron-ui/src/utils/validators/capacity.ts b/packages/neuron-ui/src/utils/validators/capacity.ts
new file mode 100644
index 0000000000..2f3a53f0c6
--- /dev/null
+++ b/packages/neuron-ui/src/utils/validators/capacity.ts
@@ -0,0 +1,19 @@
+import { CKBToShannonFormatter } from 'utils/formatters'
+import { CapacityTooSmallException } from 'exceptions'
+import { bytes as byteUtils } from '@ckb-lumos/codec'
+import { ckbCore } from 'services/chain'
+
+export const validateCapacity = (item: State.Output) => {
+ const { amount, unit, address } = item
+ const capacity = CKBToShannonFormatter(amount, unit)
+ const script = ckbCore.utils.addressToScript(address as string)
+ const size = 1 + byteUtils.concat(script.args, script.codeHash).byteLength
+ const outputSize = 8 + byteUtils.bytify('0x').byteLength + size
+
+ if (BigInt(capacity) < BigInt(outputSize) * BigInt(10 ** 8)) {
+ throw new CapacityTooSmallException(outputSize.toString())
+ }
+
+ return true
+}
+export default validateCapacity
diff --git a/packages/neuron-ui/src/utils/validators/index.ts b/packages/neuron-ui/src/utils/validators/index.ts
index f17bd58683..9a2e61c4e6 100644
--- a/packages/neuron-ui/src/utils/validators/index.ts
+++ b/packages/neuron-ui/src/utils/validators/index.ts
@@ -13,3 +13,4 @@ export * from './tokenId'
export * from './tokenName'
export * from './symbol'
export * from './decimal'
+export * from './capacity'
diff --git a/packages/neuron-ui/src/widgets/Alert/index.tsx b/packages/neuron-ui/src/widgets/Alert/index.tsx
index 79db002055..f1e1fe4b09 100644
--- a/packages/neuron-ui/src/widgets/Alert/index.tsx
+++ b/packages/neuron-ui/src/widgets/Alert/index.tsx
@@ -4,7 +4,7 @@ import styles from './index.module.scss'
type AlertStatus = 'init' | 'success' | 'error' | 'warn'
-const Alert: React.FC<{ status: AlertStatus; className?: string; withIcon?: boolean }> = ({
+const Alert: React.FC> = ({
status,
children,
className,
diff --git a/packages/neuron-ui/src/widgets/AlertDialog/alertDialog.module.scss b/packages/neuron-ui/src/widgets/AlertDialog/alertDialog.module.scss
index ac08941983..b89b270757 100644
--- a/packages/neuron-ui/src/widgets/AlertDialog/alertDialog.module.scss
+++ b/packages/neuron-ui/src/widgets/AlertDialog/alertDialog.module.scss
@@ -4,7 +4,7 @@
@include dialog-container;
padding: 28px 24px 24px;
text-align: center;
- width: 456px;
+ width: 480px;
&::backdrop {
@include overlay;
@@ -23,7 +23,9 @@
line-height: 28px;
margin: 0;
color: var(--dialog-secondary-text-color);
- word-break: break-word;
+ white-space: pre-wrap;
+ word-wrap: break-word;
+ overflow-wrap: break-word;
}
.actions {
diff --git a/packages/neuron-ui/src/widgets/AlertDialog/index.tsx b/packages/neuron-ui/src/widgets/AlertDialog/index.tsx
index 9d54be38c6..4955d0fac2 100644
--- a/packages/neuron-ui/src/widgets/AlertDialog/index.tsx
+++ b/packages/neuron-ui/src/widgets/AlertDialog/index.tsx
@@ -15,23 +15,21 @@ const AlertDialog = ({
title,
message,
type,
- onClose,
onOk,
onCancel,
action,
}: {
show?: boolean
title?: string
- message?: string
+ message?: React.ReactNode
type: AlertType
- onClose?: () => void
onOk?: () => void
onCancel?: () => void
action?: Action
}) => {
const [t] = useTranslation()
const dialogRef = useRef(null)
- useDialog({ show, dialogRef, onClose: onClose || (() => {}) })
+ useDialog({ show, dialogRef, onClose: onCancel || (() => {}) })
const actions = useMemo<('cancel' | 'ok')[]>(() => {
if (action) {
return action === 'all' ? ['cancel', 'ok'] : [action]
diff --git a/packages/neuron-ui/src/widgets/Breadcrum/breadcrum.module.scss b/packages/neuron-ui/src/widgets/Breadcrum/breadcrum.module.scss
index 3445069b17..c4d4dac300 100644
--- a/packages/neuron-ui/src/widgets/Breadcrum/breadcrum.module.scss
+++ b/packages/neuron-ui/src/widgets/Breadcrum/breadcrum.module.scss
@@ -5,7 +5,6 @@
color: var(--input-second-color);
font-weight: 500;
font-size: 20px;
- line-height: 28px;
.page {
margin-right: 4px;
&:not(:last-child):after {
@@ -19,4 +18,12 @@
color: var(--main-text-color);
}
}
+ .goBack {
+ margin-right: 8px;
+ cursor: pointer;
+
+ & path {
+ stroke: var(--main-text-color);
+ }
+ }
}
diff --git a/packages/neuron-ui/src/widgets/Breadcrum/index.tsx b/packages/neuron-ui/src/widgets/Breadcrum/index.tsx
index 2636711eba..92f948bc55 100644
--- a/packages/neuron-ui/src/widgets/Breadcrum/index.tsx
+++ b/packages/neuron-ui/src/widgets/Breadcrum/index.tsx
@@ -1,17 +1,20 @@
import React, { useCallback } from 'react'
import { useNavigate } from 'react-router-dom'
+import { GoBack } from 'widgets/Icons/icon'
+import { useGoBack } from 'utils'
import styles from './breadcrum.module.scss'
export interface Page {
label: string
- link: string
+ link?: string
}
export interface BreadcumProps {
pages: Page[]
+ showBackIcon?: boolean
}
-const Breadcrum = ({ pages = [] }: BreadcumProps) => {
+const Breadcrum = ({ pages = [], showBackIcon }: BreadcumProps) => {
const navigate = useNavigate()
const onClick = useCallback(
(e: React.MouseEvent) => {
@@ -24,9 +27,11 @@ const Breadcrum = ({ pages = [] }: BreadcumProps) => {
},
[navigate]
)
+ const goBack = useGoBack()
return (
+ {showBackIcon ?
: null}
{pages.map(page => (
void
+ onCancel: () => void
+ onConfirm: (e: React.FormEvent) => void
+}) => {
+ const [t] = useTranslation()
+ const openPath = useCallback((e: React.SyntheticEvent) => {
+ const {
+ dataset: { path },
+ } = e.currentTarget
+ if (path) {
+ shell.openPath(path)
+ }
+ }, [])
+ const onSetDataPath = useCallback(() => {
+ invokeShowOpenDialog({
+ buttonLabel: t('settings.data.set', { lng: navigator.language }),
+ properties: ['openDirectory', 'createDirectory', 'promptToCreate', 'treatPackageAsDirectory'],
+ }).then(res => {
+ if (isSuccessResponse(res) && res.result && !res.result?.canceled && res.result?.filePaths?.length) {
+ onChangeDataPath(res.result.filePaths[0])
+ }
+ })
+ }, [])
+ return (
+
+ )
+}
+
+DataPathDialog.displayName = 'DataPathDialog'
+export default DataPathDialog
diff --git a/packages/neuron-ui/src/widgets/Icons/CellManage.svg b/packages/neuron-ui/src/widgets/Icons/CellManage.svg
new file mode 100644
index 0000000000..0267c25ba6
--- /dev/null
+++ b/packages/neuron-ui/src/widgets/Icons/CellManage.svg
@@ -0,0 +1,3 @@
+
diff --git a/packages/neuron-ui/src/widgets/Icons/Clean.svg b/packages/neuron-ui/src/widgets/Icons/Clean.svg
new file mode 100644
index 0000000000..9edcc0df86
--- /dev/null
+++ b/packages/neuron-ui/src/widgets/Icons/Clean.svg
@@ -0,0 +1,3 @@
+
diff --git a/packages/neuron-ui/src/widgets/Icons/Consume.svg b/packages/neuron-ui/src/widgets/Icons/Consume.svg
new file mode 100644
index 0000000000..45ccfe536c
--- /dev/null
+++ b/packages/neuron-ui/src/widgets/Icons/Consume.svg
@@ -0,0 +1,10 @@
+
diff --git a/packages/neuron-ui/src/widgets/Icons/Detect.svg b/packages/neuron-ui/src/widgets/Icons/Detect.svg
new file mode 100644
index 0000000000..30a972e89e
--- /dev/null
+++ b/packages/neuron-ui/src/widgets/Icons/Detect.svg
@@ -0,0 +1,10 @@
+
diff --git a/packages/neuron-ui/src/widgets/Icons/FirstSync.png b/packages/neuron-ui/src/widgets/Icons/FirstSync.png
new file mode 100644
index 0000000000..ecdfa7a26d
Binary files /dev/null and b/packages/neuron-ui/src/widgets/Icons/FirstSync.png differ
diff --git a/packages/neuron-ui/src/widgets/Icons/Hardware.png b/packages/neuron-ui/src/widgets/Icons/Hardware.png
new file mode 100755
index 0000000000..53939e5f0a
Binary files /dev/null and b/packages/neuron-ui/src/widgets/Icons/Hardware.png differ
diff --git a/packages/neuron-ui/src/widgets/Icons/Lock.svg b/packages/neuron-ui/src/widgets/Icons/Lock.svg
new file mode 100644
index 0000000000..3961f1153a
--- /dev/null
+++ b/packages/neuron-ui/src/widgets/Icons/Lock.svg
@@ -0,0 +1,3 @@
+
diff --git a/packages/neuron-ui/src/widgets/Icons/LockCell.svg b/packages/neuron-ui/src/widgets/Icons/LockCell.svg
new file mode 100644
index 0000000000..4e86c09e48
--- /dev/null
+++ b/packages/neuron-ui/src/widgets/Icons/LockCell.svg
@@ -0,0 +1,10 @@
+
diff --git a/packages/neuron-ui/src/widgets/Icons/NoDiskSpaceWarn.png b/packages/neuron-ui/src/widgets/Icons/NoDiskSpaceWarn.png
new file mode 100644
index 0000000000..8e492f3430
Binary files /dev/null and b/packages/neuron-ui/src/widgets/Icons/NoDiskSpaceWarn.png differ
diff --git a/packages/neuron-ui/src/widgets/Icons/Unlock.svg b/packages/neuron-ui/src/widgets/Icons/Unlock.svg
new file mode 100644
index 0000000000..06cc570010
--- /dev/null
+++ b/packages/neuron-ui/src/widgets/Icons/Unlock.svg
@@ -0,0 +1,10 @@
+
diff --git a/packages/neuron-ui/src/widgets/Icons/icon.module.scss b/packages/neuron-ui/src/widgets/Icons/icon.module.scss
index ec0093bb7c..a64c62ec1d 100644
--- a/packages/neuron-ui/src/widgets/Icons/icon.module.scss
+++ b/packages/neuron-ui/src/widgets/Icons/icon.module.scss
@@ -54,3 +54,9 @@ $activity-color: #1b73b3;
fill: #999;
}
}
+
+.withTheme {
+ path[fill] {
+ fill: var(--main-text-color);
+ }
+}
diff --git a/packages/neuron-ui/src/widgets/Icons/icon.tsx b/packages/neuron-ui/src/widgets/Icons/icon.tsx
index 542cb2843d..ecdd2b8c2e 100644
--- a/packages/neuron-ui/src/widgets/Icons/icon.tsx
+++ b/packages/neuron-ui/src/widgets/Icons/icon.tsx
@@ -46,6 +46,16 @@ import { ReactComponent as AddressbookSvg } from './Addressbook.svg'
import { ReactComponent as AddSvg } from './Add.svg'
import { ReactComponent as AddSimpleSvg } from './AddSimple.svg'
import { ReactComponent as SwitchSvg } from './Switch.svg'
+import { ReactComponent as CleanSvg } from './Clean.svg'
+import { ReactComponent as CellManageSvg } from './CellManage.svg'
+import { ReactComponent as LockSvg } from './Lock.svg'
+import { ReactComponent as LockCellSvg } from './LockCell.svg'
+import { ReactComponent as UnLockSvg } from './Unlock.svg'
+import { ReactComponent as ConsumeSvg } from './Consume.svg'
+import { ReactComponent as DetectSvg } from './Detect.svg'
+import { ReactComponent as DeleteSvg } from './Delete.svg'
+import { ReactComponent as ImportKeystoreSvg } from './SoftWalletImportKeystore.svg'
+import { ReactComponent as ImportHardwareSvg } from './HardWalletImport.svg'
import styles from './icon.module.scss'
@@ -104,7 +114,17 @@ export const Sort = WrapSvg(SortSvg)
export const Edit = WrapSvg(EditSvg)
export const OverviewSend = WrapSvg(OverviewSendSvg)
export const OverviewReceive = WrapSvg(OverviewReceiveSvg)
-export const Addressbook = WrapSvg(AddressbookSvg)
+export const Addressbook = WrapSvg(AddressbookSvg, styles.withTheme)
export const Add = WrapSvg(AddSvg)
export const Switch = WrapSvg(SwitchSvg)
export const AddSimple = WrapSvg(AddSimpleSvg)
+export const Clean = WrapSvg(CleanSvg)
+export const CellManage = WrapSvg(CellManageSvg, styles.withTheme)
+export const Lock = WrapSvg(LockSvg, styles.withTheme)
+export const LockCell = WrapSvg(LockCellSvg)
+export const UnLock = WrapSvg(UnLockSvg)
+export const Consume = WrapSvg(ConsumeSvg)
+export const Detect = WrapSvg(DetectSvg)
+export const Delete = WrapSvg(DeleteSvg)
+export const ImportKeystore = WrapSvg(ImportKeystoreSvg)
+export const ImportHardware = WrapSvg(ImportHardwareSvg)
diff --git a/packages/neuron-ui/src/widgets/MigrateCkbDataDialog/index.tsx b/packages/neuron-ui/src/widgets/MigrateCkbDataDialog/index.tsx
new file mode 100644
index 0000000000..d323c05c7e
--- /dev/null
+++ b/packages/neuron-ui/src/widgets/MigrateCkbDataDialog/index.tsx
@@ -0,0 +1,106 @@
+import React, { useCallback, useRef, useState } from 'react'
+import Dialog from 'widgets/Dialog'
+import { useTranslation } from 'react-i18next'
+import { setCkbNodeDataPath } from 'services/remote'
+import { isSuccessResponse } from 'utils'
+import { Attention } from 'widgets/Icons/icon'
+import Button from 'widgets/Button'
+import AlertDialog from 'widgets/AlertDialog'
+import styles from './migrateCkbDataDialog.module.scss'
+
+const MigrateCkbDataDialog = ({
+ show,
+ prevPath,
+ currentPath,
+ onCancel,
+ onConfirm,
+}: {
+ show: boolean
+ prevPath: string
+ currentPath: string
+ onCancel: () => void
+ onConfirm: (dataPath: string) => void
+}) => {
+ const [t] = useTranslation()
+ const resyncRef = useRef(null)
+ const [failureMessage, setFailureMessage] = useState('')
+ const [savingType, setSavingType] = useState()
+ const startSync = useCallback(
+ (syncType: string) => {
+ setFailureMessage('')
+ setSavingType(syncType)
+ setCkbNodeDataPath({
+ dataPath: currentPath,
+ clearCache: syncType === 'resync',
+ })
+ .then(res => {
+ if (isSuccessResponse(res)) {
+ onConfirm(currentPath)
+ } else {
+ setFailureMessage(typeof res.message === 'string' ? res.message : res.message.content!)
+ }
+ })
+ .finally(() => {
+ setSavingType(undefined)
+ })
+ },
+ [currentPath, onConfirm]
+ )
+ const onActionClick = useCallback(
+ (e: React.MouseEvent) => {
+ if (e.currentTarget.dataset.syncType) {
+ startSync(e.currentTarget.dataset.syncType)
+ }
+ },
+ [startSync]
+ )
+ return (
+ <>
+
+ setFailureMessage('')}
+ onOk={() => {
+ startSync('resync')
+ }}
+ />
+
+ )
+}
+
+MigrateCkbDataDialog.displayName = 'MigrateCkbDataDialog'
+export default MigrateCkbDataDialog
diff --git a/packages/neuron-ui/src/widgets/MigrateCkbDataDialog/migrateCkbDataDialog.module.scss b/packages/neuron-ui/src/widgets/MigrateCkbDataDialog/migrateCkbDataDialog.module.scss
new file mode 100644
index 0000000000..7a63ba0859
--- /dev/null
+++ b/packages/neuron-ui/src/widgets/MigrateCkbDataDialog/migrateCkbDataDialog.module.scss
@@ -0,0 +1,69 @@
+@import '../../styles/mixin.scss';
+
+.dialogContainer {
+ max-width: 700px;
+ color: var(--main-text-color);
+ font-size: 14px;
+ line-height: 24px;
+
+ .attention {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ padding: 8px;
+ width: 80%;
+ margin: 32px auto 0;
+ background: var(--warn-background-color);
+ border: 1px solid rgba(252, 136, 0, 0.2);
+ border-radius: 4px;
+ font-weight: 500;
+ font-size: 12px;
+ line-height: 24px;
+ color: var(--warn-text-color);
+
+ @media (prefers-color-scheme: dark) {
+ border: none;
+ }
+
+ svg {
+ margin-right: 4px;
+ width: 14px;
+ }
+ }
+}
+
+.footer {
+ padding: 24px 0;
+ @include dialog-footer;
+ --footer-background-color: #ecf9f0;
+ @media (prefers-color-scheme: dark) {
+ --footer-background-color: #2d3534;
+ }
+
+ .footerBtn {
+ padding: 0 20px;
+ background: var(--footer-background-color);
+ color: var(--primary-color);
+ &:not([disabled]) {
+ &:hover,
+ &:focus {
+ background-color: var(--footer-background-color);
+ color: color-mix(in srgb, #000000 20%, var(--primary-color));
+ }
+
+ &:active {
+ background-color: var(--footer-background-color);
+ color: color-mix(in srgb, #000000 20%, var(--primary-color));
+ }
+ }
+ &:last-of-type {
+ margin-left: 24px;
+ }
+ svg {
+ g,
+ path {
+ fill: var(--primary-color);
+ }
+ }
+ }
+}
diff --git a/packages/neuron-ui/src/widgets/Pagination/index.tsx b/packages/neuron-ui/src/widgets/Pagination/index.tsx
index 9a9e1d9764..08e6dffbe3 100644
--- a/packages/neuron-ui/src/widgets/Pagination/index.tsx
+++ b/packages/neuron-ui/src/widgets/Pagination/index.tsx
@@ -1,6 +1,6 @@
import React, { useCallback } from 'react'
import { useTranslation } from 'react-i18next'
-import { getPageNoList } from 'utils'
+import { clsx, getPageNoList } from 'utils'
import { ArrowEnd, ArrowNext } from 'widgets/Icons/icon'
import styles from './pagination.module.scss'
@@ -12,9 +12,10 @@ export interface PaginationProps {
pageNo: number
pageSize: number
onChange: (page: number) => void
+ className?: string
}
-const Pagination = ({ count, pageNo, onChange, pageSize }: PaginationProps) => {
+const Pagination = ({ count, pageNo, onChange, pageSize, className }: PaginationProps) => {
const [t] = useTranslation()
const pageCount = Math.ceil(count / pageSize)
const pageNoList = getPageNoList(pageNo, pageCount)
@@ -45,7 +46,7 @@ const Pagination = ({ count, pageNo, onChange, pageSize }: PaginationProps) => {
const disableToEnd = pageNo >= pageCount
return (
-
+
{range}
diff --git a/packages/neuron-ui/src/widgets/RadioGroup/index.tsx b/packages/neuron-ui/src/widgets/RadioGroup/index.tsx
index 1ca7197d1a..0268abc203 100644
--- a/packages/neuron-ui/src/widgets/RadioGroup/index.tsx
+++ b/packages/neuron-ui/src/widgets/RadioGroup/index.tsx
@@ -11,9 +11,9 @@ export interface RadioGroupOptions {
export interface RadioGroupProps {
options: RadioGroupOptions[]
- onChange?: (arg: string | number) => void
- defaultValue?: string | number
- value?: string | number
+ onChange?: (arg: string) => void
+ defaultValue?: string
+ value?: string
itemClassName?: string
className?: string
inputIdPrefix?: string
diff --git a/packages/neuron-ui/src/widgets/RingProgressBar/index.tsx b/packages/neuron-ui/src/widgets/RingProgressBar/index.tsx
index 5712fd2bc7..ff85f6561f 100644
--- a/packages/neuron-ui/src/widgets/RingProgressBar/index.tsx
+++ b/packages/neuron-ui/src/widgets/RingProgressBar/index.tsx
@@ -13,12 +13,14 @@ const RingProgressBar = ({
strokeWidth?: React.CSSProperties['strokeWidth']
size?: React.CSSProperties['width']
}) => {
+ // declare background as a string to avoid type error "Expression produces a union type that is too complex to represent."
+ const background: string = `conic-gradient(${color} 0%, ${color} ${percents}%, ${backgroundColor} ${percents}%, ${backgroundColor} 100%)`
return (
void
+ onChangeEditStatus?: (isEditing: boolean) => void
+ description?: string
+ descKey: string
+}
+
+const ShowOrEditDesc = (props: ShowOrEditDescProps) => {
+ const { onSubmitDescription, onChangeEditStatus, description, descKey } = props
+ const { localDescription, onDescriptionPress, onDescriptionChange, onDescriptionFieldBlur, onDescriptionSelected } =
+ useDescription(onSubmitDescription, onChangeEditStatus, 'textarea')
+ const isSelected = localDescription.key === descKey
+ return (
+