diff --git a/packages/page-accounts/src/modals/ProxyOverview.tsx b/packages/page-accounts/src/modals/ProxyOverview.tsx index 4c0fa3df4a..2bdf562ca8 100644 --- a/packages/page-accounts/src/modals/ProxyOverview.tsx +++ b/packages/page-accounts/src/modals/ProxyOverview.tsx @@ -124,7 +124,7 @@ function NewProxy ({ index, onChangeAccount, onChangeType, onRemove, proxiedAcco isError={!accountId} label={t('proxy account')} onChange={_onChangeAccount} - type='account' + type='allPlus' value={accountId} /> {accountId && accountId.eq(proxiedAccount) && ( diff --git a/packages/react-components/src/InputAddress/index.tsx b/packages/react-components/src/InputAddress/index.tsx index 2b871d0c5f..3ba9f9f60e 100644 --- a/packages/react-components/src/InputAddress/index.tsx +++ b/packages/react-components/src/InputAddress/index.tsx @@ -314,15 +314,25 @@ class InputAddress extends React.PureComponent { const accountId = transformToAccountId(query); if (accountId) { - const item = keyring.saveRecent( - accountId.toString() - ).option; + const account = keyring.getAccount(accountId); - matches.push({ - key: item.key, - name: item.name, - value: item.value || undefined - }); + if (account) { + matches.push({ + key: account.address, + name: account.meta.name, + value: account.address + }); + } else { + const item = keyring.saveRecent( + accountId.toString() + ).option; + + matches.push({ + key: item.key, + name: item.name, + value: item.value || undefined + }); + } } }