From c3da616b559569bc3e1ffcb9dfcd482fb3d4dbe7 Mon Sep 17 00:00:00 2001
From: Jaco <jacogr@gmail.com>
Date: Mon, 12 Jul 2021 07:33:50 +0300
Subject: [PATCH] Ensure siDefault is always used on InputNumber (#5810)

---
 packages/page-society/src/useVoters.ts        | 12 ++++--------
 packages/react-components/src/InputNumber.tsx | 12 ++++++++++--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/page-society/src/useVoters.ts b/packages/page-society/src/useVoters.ts
index 1cb4fdc222..89afda977e 100644
--- a/packages/page-society/src/useVoters.ts
+++ b/packages/page-society/src/useVoters.ts
@@ -3,7 +3,6 @@
 
 import type { ApiPromise } from '@polkadot/api';
 import type { DeriveSocietyCandidate } from '@polkadot/api-derive/types';
-import type { AccountId } from '@polkadot/types/interfaces';
 import type { Voters } from './types';
 
 import { useEffect, useState } from 'react';
@@ -13,16 +12,13 @@ import { useApi, useCall, useEventTrigger } from '@polkadot/react-hooks';
 const EMPTY_VOTERS: Voters = {};
 
 async function getVoters (api: ApiPromise, candidates: DeriveSocietyCandidate[]): Promise<Voters> {
-  const accountIds: AccountId[] = [];
   const skeptics: string[] = [];
   const voters: string[] = [];
 
-  candidates.forEach(({ accountId }): void => {
-    accountIds.push(accountId);
-  });
-
-  const entries = accountIds.length
-    ? await Promise.all(accountIds.map((a) => api.query.society.votes.entries(a)))
+  const entries = candidates.length
+    ? await Promise.all(candidates.map(({ accountId }) =>
+      api.query.society.votes.entries(accountId)
+    ))
     : [];
 
   entries.forEach((list): void => {
diff --git a/packages/react-components/src/InputNumber.tsx b/packages/react-components/src/InputNumber.tsx
index 7d14e56b48..461371155a 100644
--- a/packages/react-components/src/InputNumber.tsx
+++ b/packages/react-components/src/InputNumber.tsx
@@ -292,10 +292,18 @@ function InputNumber ({ autoFocus, bitLength = DEFAULT_BITLENGTH, children, clas
     >
       {!!si && (
         <Dropdown
-          defaultValue={si.value}
+          defaultValue={
+            isDisabled && siDefault
+              ? siDefault.value
+              : si.value
+          }
           dropdownClassName='ui--SiDropdown'
           isButton
-          onChange={_onSelectSiUnit}
+          onChange={
+            isDisabled
+              ? undefined
+              : _onSelectSiUnit
+          }
           options={siOptions}
         />
       )}