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

Fix controller validation (#1763)

Browse Source 
* Fix controller validation

* Rework newError determiniation
This commit is contained in:
Jaco Greeff 2019-10-25 14:29:33 +02:00 committed by GitHub
parent c6f0bf0e73
commit cdf7c280ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
packages/app-staking/src/Actions/Account/InputValidationController.tsx
View File

@ -29,29 +29,27 @@ function ValidateController ({ accountId, bondedId, controllerId, defaultControl
const [error, setError] = useState<string | null>(null);
useEffect((): void => {
const newError = ((): string | null => {
if (defaultController === controllerId) {
// don't show an error if the selected controller is the default
// this applies when changing controller
return null;
} else if (controllerId === accountId) {
return isUnsafeChain
// don't show an error if the selected controller is the default
// this applies when changing controller
if (defaultController !== controllerId) {
let newError: string | null = null;
if (controllerId === accountId) {
newError = isUnsafeChain
? t(`${DISTINCT} You will be allowed to make the transaction, but take care to not tie up all funds, only use a portion of the available funds during this period.`)
: t(DISTINCT);
} else if (bondedId) {
return t('A controller account should not map to another stash. This selected controller is a stash, controlled by {{bondedId}}', { replace: { bondedId } });
newError = t('A controller account should not map to another stash. This selected controller is a stash, controlled by {{bondedId}}', { replace: { bondedId } });
} else if (stashId) {
return t('A controller account should not be set to manages multiple stashes. The selected controller is already controlling {{stashId}}', { replace: { stashId } });
newError = t('A controller account should not be set to manages multiple stashes. The selected controller is already controlling {{stashId}}', { replace: { stashId } });
}
return null;
})();
if (error !== newError) {
onError(newError);
setError(newError);
if (error !== newError) {
onError(newError);
setError(newError);
}
}
}, [accountId, controllerId, defaultController]);
}, [accountId, bondedId, controllerId, defaultController, stashId]);
if (!error || !accountId) {
return null;