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

Check isEditable for network swap (#4495)

Browse Source
This commit is contained in:
Jaco Greeff 2021-01-25 15:29:32 +01:00 committed by GitHub
parent a42e0f371d
commit 6155dbd224
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/page-accounts/src/Accounts/Account.tsx
View File

@ -96,7 +96,7 @@ function Account ({ account: { address, meta }, className = '', delegation, filt
const recoveryInfo = useCall<RecoveryConfig | null>(api.api.query.recovery?.recoverable, [address], transformRecovery);
const multiInfos = useMultisigApprovals(address);
const proxyInfo = useProxies(address);
const { flags: { isDevelopment, isExternal, isHardware, isInjected, isMultisig, isProxied }, genesisHash, identity, name: accName, onSetGenesisHash, tags } = useAccountInfo(address);
const { flags: { isDevelopment, isEditable, isExternal, isHardware, isInjected, isMultisig, isProxied }, genesisHash, identity, name: accName, onSetGenesisHash, tags } = useAccountInfo(address);
const [{ democracyUnlockTx }, setUnlockableIds] = useState<DemocracyUnlockable>({ democracyUnlockTx: null, ids: [] });
const [vestingVestTx, setVestingTx] = useState<SubmittableExtrinsic<'promise'> | null>(null);
const [isBackupOpen, toggleBackup] = useToggle();
@ -578,7 +578,7 @@ function Account ({ account: { address, meta }, className = '', delegation, filt
<ChainLock
className='accounts--network-toggle'
genesisHash={genesisHash}
isDisabled={api.isDevelopment}
isDisabled={api.isDevelopment || !isEditable}
onChange={onSetGenesisHash}
/>
</Menu>

2
packages/react-hooks/src/useAccountInfo.ts
View File

@ -112,7 +112,7 @@ export function useAccountInfo (value: string | null, isContract = false): UseAc
setFlags((flags): AddressFlags => ({
...flags,
isDevelopment: accountOrAddress?.meta.isTesting || false,
isEditable: !!(!identity?.display && (isInContacts || accountOrAddress?.meta.isMultisig || (accountOrAddress && !(accountOrAddress.meta.isInjected || accountOrAddress.meta.isHardware)))) || false,
isEditable: !!(!identity?.display && (isInContacts || accountOrAddress?.meta.isMultisig || (accountOrAddress && !(accountOrAddress.meta.isInjected)))) || false,
isExternal: !!accountOrAddress?.meta.isExternal || false,
isHardware: !!accountOrAddress?.meta.isHardware || false,
isInContacts,