Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🪢 Merge Validators into dev #4776

Merged
merged 18 commits into from
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions packages/ui/.storybook/preview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { TransactionStatusProvider } from '../src/common/providers/transactionSt
import { MockProvidersDecorator, MockRouterDecorator } from '../src/mocks/providers'
import { i18next } from '../src/services/i18n'
import { KeyringContext } from '../src/common/providers/keyring/context'
import { ValidatorContextProvider } from '../src/validators/providers/provider'
import { Keyring } from '@polkadot/ui-keyring'

configure({ testIdAttribute: 'id' })
Expand Down Expand Up @@ -56,11 +57,13 @@ const ModalDecorator: Decorator = (Story) => (
<TransactionStatusProvider>
<ModalContextProvider>
<OnBoardingProvider>
<Story />
<GlobalModals />
<NotificationsHolder>
<TransactionStatus />
</NotificationsHolder>
<ValidatorContextProvider>
<Story />
<GlobalModals />
<NotificationsHolder>
<TransactionStatus />
</NotificationsHolder>
</ValidatorContextProvider>
</OnBoardingProvider>
</ModalContextProvider>
</TransactionStatusProvider>
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/src/accounts/model/encodeAddress.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { encodeAddress as encode } from '@polkadot/util-crypto'

const JOYSTREAM_SS58_PREFIX = 126
import { CHAIN_PROPERTIES } from '@/app/constants/chain'

export const encodeAddress = (key: Parameters<typeof encode>[0]) => encode(key, JOYSTREAM_SS58_PREFIX)
export const encodeAddress = (key: Parameters<typeof encode>[0]) => encode(key, CHAIN_PROPERTIES.ss58Format)
Loading
Loading