🪢 Merge 3.5.2 into dev (#4848)

Joystream · May 15, 2024 · 4bb466d · 4bb466d
2 parents 671a311 + faf90dc
commit 4bb466d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.5.2] - 2024-05-01
+
+### Fixed
+- Fix nominate links.
+
 ## [3.5.1] - 2024-04-25
 
 ### Fixed
@@ -384,7 +389,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [0.1.1] - 2022-12-02
 
-[unreleased]: https://github.com/Joystream/pioneer/compare/v3.5.1...HEAD
+[unreleased]: https://github.com/Joystream/pioneer/compare/v3.5.2...HEAD
+[3.5.1]: https://github.com/Joystream/pioneer/compare/v3.5.1...v3.5.2
 [3.5.1]: https://github.com/Joystream/pioneer/compare/v3.5.0...v3.5.1
 [3.5.0]: https://github.com/Joystream/pioneer/compare/v3.4.0...v3.5.0
 [3.4.0]: https://github.com/Joystream/pioneer/compare/v3.3.1...v3.4.0

diff --git a/packages/ui/.env.example b/packages/ui/.env.example
@@ -12,6 +12,8 @@ REACT_APP_MAINNET_QUERY_NODE_SOCKET=wss://query.joystream.org/graphql
 REACT_APP_MAINNET_MEMBERSHIP_FAUCET_URL=https://faucet.joystream.org/member-faucet/register
 REACT_APP_MAINNET_BACKEND=https://api-7zai.onrender.com
 
+REACT_APP_POLKADOT_APP=https://polkadot.js.org/apps
+
 # Faucet CAPTCHA
 REACT_APP_CAPTCHA_SITE_KEY=10000000-ffff-ffff-ffff-000000000001
 

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@joystream/pioneer",
-  "version": "3.5.1",
+  "version": "3.5.2",
   "license": "GPL-3.0-only",
   "scripts": {
     "build": "node --max_old_space_size=4096 ./build.js",

diff --git a/packages/ui/src/common/hooks/usePolkadotAppLink.ts b/packages/ui/src/common/hooks/usePolkadotAppLink.ts
@@ -0,0 +1,8 @@
+import { useNetworkEndpoints } from './useNetworkEndpoints'
+
+export const usePolkadotAppLink = (
+  polkadotApp = process.env.REACT_APP_POLKADOT_APP ?? 'https://polkadot.js.org/apps'
+): string => {
+  const [endpoints] = useNetworkEndpoints()
+  return `${polkadotApp}?rpc=${endpoints.nodeRpcEndpoint}#`
+}
diff --git a/packages/ui/src/validators/modals/NominatingRedirectModal/NominatingRedirectModal.tsx b/packages/ui/src/validators/modals/NominatingRedirectModal/NominatingRedirectModal.tsx
@@ -6,11 +6,13 @@ import { Link } from '@/common/components/Link'
 import { Modal, ModalBody, ModalFooter, ModalHeader } from '@/common/components/Modal'
 import { TextBig, TextInlineBig } from '@/common/components/typography'
 import { useModal } from '@/common/hooks/useModal'
+import { usePolkadotAppLink } from '@/common/hooks/usePolkadotAppLink'
 
 import { NominatingRedirectModalCall } from './types'
 
 export const NominatingRedirectModal = () => {
   const { hideModal } = useModal<NominatingRedirectModalCall>()
+  const polkadotAppLink = usePolkadotAppLink()
 
   return (
     <Modal modalSize="m" onClose={hideModal}>
@@ -23,13 +25,10 @@ export const NominatingRedirectModal = () => {
         </TextBig>
       </ModalBody>
       <ModalFooter>
-        <LinkGhost size="medium" href="https://polkadot.js.org/apps/?rpc=wss://rpc.joystream.org:9944#/staking/targets">
+        <LinkGhost size="medium" href={`${polkadotAppLink}/staking/targets`}>
           View detailed stats
         </LinkGhost>
-        <LinkPrimary
-          size="medium"
-          href="https://polkadot.js.org/apps/?rpc=wss://rpc.joystream.org:9944#/staking/actions"
-        >
+        <LinkPrimary size="medium" href={`${polkadotAppLink}/staking/actions`}>
           Nominate <ArrowRightIcon white />
         </LinkPrimary>
       </ModalFooter>