From a7b33dc20296073af33035fedd4aa2226e6400f2 Mon Sep 17 00:00:00 2001 From: Yaroslav Grachev Date: Wed, 28 Jun 2023 11:57:12 +0300 Subject: [PATCH 1/4] fix: use selected accounts for validators (#904) Co-authored-by: Yaroslav Grachev --- .../Staking/Operations/ChangeValidators/ChangeValidators.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/screens/Staking/Operations/ChangeValidators/ChangeValidators.tsx b/src/renderer/screens/Staking/Operations/ChangeValidators/ChangeValidators.tsx index 56459d5292..a70c941294 100644 --- a/src/renderer/screens/Staking/Operations/ChangeValidators/ChangeValidators.tsx +++ b/src/renderer/screens/Staking/Operations/ChangeValidators/ChangeValidators.tsx @@ -156,7 +156,7 @@ export const ChangeValidators = () => { }; const getNominateTxs = (validators: Address[]): Transaction[] => { - return accounts.map(({ accountId }) => { + return txAccounts.map(({ accountId }) => { return { chainId, address: toAddress(accountId, { prefix: addressPrefix }), From 12ba3cdb25a0b4d27ade89607c03993dd6db2695 Mon Sep 17 00:00:00 2001 From: egor0798 Date: Wed, 28 Jun 2023 12:16:50 +0200 Subject: [PATCH 2/4] Fix: fixed assets loading state after multisig create (#905) * fix: fixed assets loading state after multisig create * fix: fixed error * chore: removed unused code --------- Co-authored-by: Egor --- .../modals/CreateMultisigAccount/CreateMultisigAccount.tsx | 2 +- src/renderer/context/NetworkContext/NetworkContext.tsx | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/renderer/components/modals/CreateMultisigAccount/CreateMultisigAccount.tsx b/src/renderer/components/modals/CreateMultisigAccount/CreateMultisigAccount.tsx index b0532551e6..003fc636f7 100644 --- a/src/renderer/components/modals/CreateMultisigAccount/CreateMultisigAccount.tsx +++ b/src/renderer/components/modals/CreateMultisigAccount/CreateMultisigAccount.tsx @@ -24,8 +24,8 @@ type Props = { export const CreateMultisigAccount = ({ isOpen, onClose }: Props) => { const { t } = useI18n(); - const navigate = useNavigate(); const { matrix, isLoggedIn } = useMatrix(); + const navigate = useNavigate(); const { getLiveAccounts, addAccount, setActiveAccount } = useAccount(); const accounts = getLiveAccounts(); diff --git a/src/renderer/context/NetworkContext/NetworkContext.tsx b/src/renderer/context/NetworkContext/NetworkContext.tsx index 992894086e..100a3345df 100644 --- a/src/renderer/context/NetworkContext/NetworkContext.tsx +++ b/src/renderer/context/NetworkContext/NetworkContext.tsx @@ -118,7 +118,9 @@ export const NetworkProvider = ({ children }: PropsWithChildren) => { return; } - if (previousAccounts?.length !== activeAccounts.length) { + const firstPrevAcc = previousAccounts?.length && previousAccounts[0]; + const firstNewAcc = activeAccounts.length && activeAccounts[0]; + if (previousAccounts?.length !== activeAccounts.length || firstPrevAcc !== firstNewAcc) { connectedConnections.forEach((chain) => { const accountIds = getAccountIds(chain.chainId); subscribeBalanceChanges(chain, accountIds); @@ -139,7 +141,7 @@ export const NetworkProvider = ({ children }: PropsWithChildren) => { unsubscribe(chain.chainId); }); })(); - }, [connectedConnections.length, activeAccounts.length]); + }, [connectedConnections.length, activeAccounts.length, activeAccounts.length && activeAccounts[0]]); return ( From fdde8fc63be636afbd5a11f50e996d56d3e519ab Mon Sep 17 00:00:00 2001 From: Yaroslav Grachev Date: Wed, 28 Jun 2023 13:17:18 +0300 Subject: [PATCH 3/4] Fix: Unbond (#906) --- .../Overview/components/NetworkInfo/NetworkInfo.tsx | 7 ++++++- src/renderer/services/staking/eraService.ts | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/renderer/screens/Staking/Overview/components/NetworkInfo/NetworkInfo.tsx b/src/renderer/screens/Staking/Overview/components/NetworkInfo/NetworkInfo.tsx index 3212d68b53..1610a11313 100644 --- a/src/renderer/screens/Staking/Overview/components/NetworkInfo/NetworkInfo.tsx +++ b/src/renderer/screens/Staking/Overview/components/NetworkInfo/NetworkInfo.tsx @@ -55,7 +55,12 @@ export const NetworkInfo = ({ // without key dropdown doesn't show changes (thought functionally everything works fine) // TODO look into it const element = ( - + ); acc.push({ id: chainId, value: chain, element }); diff --git a/src/renderer/services/staking/eraService.ts b/src/renderer/services/staking/eraService.ts index eacd904be6..a2bce4cb7e 100644 --- a/src/renderer/services/staking/eraService.ts +++ b/src/renderer/services/staking/eraService.ts @@ -42,7 +42,7 @@ export const useEra = (): IEraService => { const sessionStartSlot = currentSessionIndex * sessionLength + genesisSlot; const sessionProgress = currentSlot - sessionStartSlot; const eraProgress = (currentSessionIndex - eraStartSessionIndex) * sessionLength + sessionProgress; - const eraRemained = eraLength * sessionLength - eraProgress; + const eraRemained = eraLength * sessionLength - eraProgress / 1000; const leftEras = destinationEra - activeEra.toNumber() - 1; const timeForLeftEras = leftEras * eraLength * sessionLength * blockCreationTime; From b2763cc661cd9dbd32ed01fe917d0bc97faf7c6c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 28 Jun 2023 10:40:48 +0000 Subject: [PATCH 4/4] ci: update version in package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1976a9373b..363670edc3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nova-spektr", "description": "Polkadot Enterprise application", - "version": "0.9.0", + "version": "1.0.0", "main": "./release/build/main.js", "license": "MIT", "author": {