Merge pull request #907 from novasamatech/rc/1.0.0-106

Release candidate - 1.0.0
novasamatech · Jun 28, 2023 · e3f594a · e3f594a
2 parents 3b39f41 + b2763cc
commit e3f594a
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git 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": {

diff --git 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
@@ -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 (
     <NetworkContext.Provider value={{ connections, connectToNetwork, connectWithAutoBalance, ...rest }}>

diff --git 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 }),

diff --git 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 = (
-            <ChainComponent key={chain.chainId} className="overflow-hidden" fontClass="truncate" chain={chain} />
+            <ChainComponent
+              key={chain.chainId}
+              className="overflow-hidden"
+              fontClass="text-text-primary truncate"
+              chain={chain}
+            />
           );
 
           acc.push({ id: chainId, value: chain, element });

diff --git 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;