neptune/ghost-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix nomination selection (multi) (#1671)

Browse Source
This commit is contained in:
Jaco Greeff 2019-09-27 10:15:57 +02:00 committed by GitHub
parent e7fcf611ae
commit ba8d55c1f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/app-staking/src/Actions/Accounts.tsx
View File

@ -11,7 +11,7 @@ import { withCalls, withMulti } from '@polkadot/react-api/with';
import React, { useState } from 'react';
import styled from 'styled-components';
import { Button, CardGrid } from '@polkadot/react-components';
import { Button, CardGrid, InputAddress } from '@polkadot/react-components';
import createOption from '@polkadot/ui-keyring/options/item';
import { getAddressName } from '@polkadot/react-components/util';
@ -43,7 +43,8 @@ function Accounts ({ allAccounts, allStashes, className, myControllers, recently
const [isNewStakeOpen, setIsNewStateOpen] = useState(false);
const myStashes = getMyStashes(myControllers, allAccounts);
const stashOptions = allStashes.map((stashId): KeyringSectionOption =>
createOption(stashId, getAddressName(stashId, 'account'))
// FIXME The static setting here just does screwy
(InputAddress as any).createOption(createOption(stashId, getAddressName(stashId, 'account')))
);
const isEmpty = !isNewStakeOpen && (!myStashes || myStashes.length === 0);

30
packages/react-components/src/InputAddress/index.tsx
View File

@ -48,7 +48,7 @@ interface State {
const STORAGE_KEY = 'options:InputAddress';
const DEFAULT_TYPE = 'all';
const transformToAddress = (value: string | Uint8Array): string | null => {
function transformToAddress (value: string | Uint8Array): string | null {
try {
return addressToAddress(value) || null;
} catch (error) {
@ -56,9 +56,9 @@ const transformToAddress = (value: string | Uint8Array): string | null => {
}
return null;
};
}
const transformToAccountId = (value: string): string | null => {
function transformToAccountId (value: string): string | null {
if (!value) {
return null;
}
@ -68,9 +68,9 @@ const transformToAccountId = (value: string): string | null => {
return !accountId
? null
: accountId;
};
}
const createOption = (address: string): KeyringSectionOption => {
function createOption (address: string): KeyringSectionOption {
let isRecent: boolean | undefined;
const pair = keyring.getAccount(address);
let name: string | undefined;
@ -89,7 +89,7 @@ const createOption = (address: string): KeyringSectionOption => {
}
return createItem(createKeyringItem(address, name), !isRecent);
};
}
class InputAddress extends React.PureComponent<Props, State> {
public state: State = {};
@ -151,15 +151,9 @@ class InputAddress extends React.PureComponent<Props, State> {
? optionsAll[type]
: []
);
let _defaultValue;
if (value !== undefined) {
_defaultValue = undefined;
} else if (isMultiple) {
_defaultValue = undefined;
} else {
_defaultValue = actualValue;
}
const _defaultValue = (isMultiple || value !== undefined)
? undefined
: actualValue;
return (
<Dropdown
@ -287,7 +281,7 @@ class InputAddress extends React.PureComponent<Props, State> {
export { InputAddress };
export default withMulti(
const InputAddressExported = withMulti(
styled(InputAddress)`
.ui.dropdown .text {
width: 100%;
@ -327,3 +321,7 @@ export default withMulti(
}, {})
})
);
(InputAddressExported as any).createOption = createItem;
export default InputAddressExported;