🪢 Merge Validators into dev (#4776)

Joystream · Feb 21, 2024 · b4ae1e0 · b4ae1e0
2 parents 73d86d9 + a2cf534
commit b4ae1e0
Show file tree

Hide file tree

Showing 84 changed files with 3,450 additions and 1,453 deletions.
diff --git a/packages/ui/.storybook/preview.tsx b/packages/ui/.storybook/preview.tsx
@@ -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' })
@@ -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>

diff --git a/packages/ui/src/accounts/model/encodeAddress.ts b/packages/ui/src/accounts/model/encodeAddress.ts
@@ -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)