Skip to content

Update IdentityInfo #2052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jacogr merged 3 commits into from
Dec 15, 2019
Merged

Update IdentityInfo #2052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ffa762b
Update IdentityInfo
jacogr Dec 15, 2019
d19ed4d
Remove test data
jacogr Dec 15, 2019
1af7853
Bump API (fixed decodable Data)
jacogr Dec 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
"packages/*"
],
"resolutions": {
"@polkadot/api": "^0.99.1",
"@polkadot/api-contract": "^0.99.1",
"@polkadot/api": "^0.100.0-beta.1",
"@polkadot/api-contract": "^0.100.0-beta.1",
"@polkadot/keyring": "^1.7.1",
"@polkadot/types": "^0.99.1",
"@polkadot/types": "^0.100.0-beta.1",
"@polkadot/util": "^1.7.1",
"@polkadot/util-crypto": "^1.7.1",
"babel-core": "^7.0.0-bridge.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/app-contracts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.7.5",
"@polkadot/api-contract": "^0.99.1",
"@polkadot/api-contract": "^0.100.0-beta.1",
"@polkadot/react-components": "^0.39.0-beta.3"
}
}
2 changes: 1 addition & 1 deletion packages/react-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme",
"dependencies": {
"@babel/runtime": "^7.7.6",
"@polkadot/api": "^0.99.1",
"@polkadot/api": "^0.100.0-beta.1",
"@polkadot/extension-dapp": "^0.14.1",
"edgeware-node-types": "^1.0.10",
"rxjs-compat": "^6.5.3"
Expand Down
38 changes: 23 additions & 15 deletions packages/react-params/src/Param/IdentityInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { Props } from '../types';
import React, { useEffect, useState } from 'react';
import styled from 'styled-components';
import { Input, Toggle } from '@polkadot/react-components';
import { isHex } from '@polkadot/util';

import Bare from './Bare';
import Struct from './Struct';
Expand Down Expand Up @@ -45,16 +46,16 @@ function IdentityInfo (props: Props): React.ReactElement<Props> {
const { t } = useTranslation();
const [hasDisplay, setHasDisplay] = useState(true);
const [hasEmail, setHasEmail] = useState(false);
const [hasImage, setHasImage] = useState(false);
const [hasImg, setHasImg] = useState(false);
const [hasLegal, setHasLegal] = useState(false);
const [hasPgp, setHasPgp] = useState(false);
const [hasRiot, setHasRiot] = useState(false);
const [hasWeb, setHasWeb] = useState(false);
const [valDisplay, setValDisplay] = useState('');
const [valEmail, setValEmail] = useState('');
const [valImage, setValImage] = useState('');
const [{ errImg, valImg }, setValImg] = useState<{ errImg: boolean; valImg: string }>({ errImg: true, valImg: '' });
const [valLegal, setValLegal] = useState('');
const [valPgp, setValPgp] = useState('');
const [{ errPgp, valPgp }, setValPgp] = useState<{ errPgp: boolean; valPgp: string }>({ errPgp: true, valPgp: '' });
const [valRiot, setValRiot] = useState('');
const [valWeb, setValWeb] = useState('');

Expand All @@ -63,22 +64,25 @@ function IdentityInfo (props: Props): React.ReactElement<Props> {
value: {
display: { [hasDisplay ? 'raw' : 'none']: hasDisplay ? valDisplay : null },
email: { [hasEmail ? 'raw' : 'none']: hasEmail ? valEmail : null },
image: { [hasImage ? 'raw' : 'none']: hasImage ? valImage : null },
image: { [hasImg ? 'sha256' : 'none']: hasImg ? valImg : null },
legal: { [hasLegal ? 'raw' : 'none']: hasLegal ? valLegal : null },
riot: { [hasRiot ? 'raw' : 'none']: hasRiot ? valRiot : null },
web: { [hasWeb ? 'raw' : 'none']: hasWeb ? valWeb : null },
pgpFingerprint: hasPgp ? valPgp : null
},
isValid: true
isValid: !((hasImg && errImg) || (hasPgp && errPgp))
});
}, [hasDisplay, hasEmail, hasImage, hasLegal, hasPgp, hasRiot, hasWeb, valDisplay, valEmail, valImage, valLegal, valPgp, valRiot, valWeb]);
}, [errImg, errPgp, hasDisplay, hasEmail, hasImg, hasLegal, hasPgp, hasRiot, hasWeb, valDisplay, valEmail, valImg, valLegal, valPgp, valRiot, valWeb]);

if (isDisabled) {
return (
<Struct {...props} />
);
}

const _onChangeImg = (valImg: string): void => setValImg({ valImg, errImg: !isHex(valImg, 256) });
const _onChangePgp = (valPgp: string): void => setValPgp({ valPgp, errPgp: !isHex(valPgp, 160) });

return (
<Bare
className={className}
Expand Down Expand Up @@ -145,15 +149,17 @@ function IdentityInfo (props: Props): React.ReactElement<Props> {
/>
</WrapToggle>
<WrapToggle
onChange={setHasImage}
value={hasImage}
onChange={setHasImg}
value={hasImg}
>
<Input
isDisabled={!hasImage}
label={t('image')}
onChange={setValImage}
maxLength={32}
value={hasImage ? valImage : '<none>'}
isDisabled={!hasImg}
isError={hasImg && errImg}
label={t('sha2 image hash')}
onChange={_onChangeImg}
placeholder={t('0x...')}
maxLength={66}
value={hasImg ? valImg : '<none>'}
/>
</WrapToggle>
<WrapToggle
Expand All @@ -162,8 +168,10 @@ function IdentityInfo (props: Props): React.ReactElement<Props> {
>
<Input
isDisabled={!hasPgp}
label={t('Pgp')}
onChange={setValPgp}
isError={hasPgp && errPgp}
label={t('pgp hash')}
onChange={_onChangePgp}
placeholder={t('0x...')}
maxLength={42}
value={hasPgp ? valPgp : '<none>'}
/>
Expand Down
92 changes: 46 additions & 46 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2044,35 +2044,35 @@
dependencies:
"@types/node" ">= 8"

"@polkadot/api-contract@^0.99.1":
version "0.99.1"
resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.99.1.tgz#a264f2250731aaa00038dca0738ddb43fbbd70b9"
integrity sha512-lJs2i+4tkRG1Ko5a8yEw6/HO1KQ9EM4j0tiHsY1DZzQSujpOpPMB2ekaE27CiDIgKLMBUlEzzBWYh9m059tpSg==
"@polkadot/api-contract@^0.100.0-beta.1":
version "0.100.0-beta.1"
resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.100.0-beta.1.tgz#1387f30b3e63b5779d787123bcfe8bd34d21182f"
integrity sha512-0qA0GddJIvaACM7bVV9qd42lUZiX9NMmqEdmbREltRZ8W+7nt29XGOJDZ15SmVFp0oH9ZdH08kRIn1V38l3tjQ==
dependencies:
"@babel/runtime" "^7.7.6"
"@polkadot/types" "^0.99.1"
"@polkadot/types" "^0.100.0-beta.1"

"@polkadot/api-derive@^0.99.1":
version "0.99.1"
resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.99.1.tgz#dd494360707a897bd445a99199aa6d85c863e503"
integrity sha512-Zqg8jc9vLcfmgNdMip6Z25+0vM+OdhMR7TnXd+iDOOE65cT8pJ+MOVTrDYFgWSYjNLFbBhraXW46U9DPJA+UEw==
"@polkadot/api-derive@^0.100.0-beta.1":
version "0.100.0-beta.1"
resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.100.0-beta.1.tgz#8bf3e3baf8785fe7e703d6866fdf537cdc7ca3b3"
integrity sha512-9liZMg3Z6xb5xIHpalmt30otTC54aE9jA3TZQsQcT+s9T9v2yHqUS+TnsZk+JuHblV9vcEbzECJmbCH/h48V8g==
dependencies:
"@babel/runtime" "^7.7.6"
"@polkadot/api" "^0.99.1"
"@polkadot/types" "^0.99.1"
"@polkadot/api" "^0.100.0-beta.1"
"@polkadot/types" "^0.100.0-beta.1"

"@polkadot/api@^0.99.1":
version "0.99.1"
resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.99.1.tgz#ff5fa4dc3600060d73f20d1d7261bccc502bc6e0"
integrity sha512-pVTGcj2CpO7cuh5sGUs7aRvmBQVQxTawAVXaQNP4pcAwJcmqxWIYXtxCpvBm1gUMctMJ7N/fcO75M6csQ/zrOg==
"@polkadot/api@^0.100.0-beta.1":
version "0.100.0-beta.1"
resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.100.0-beta.1.tgz#73f5aa00497595f4e381ee0fc49c4716c6c3060d"
integrity sha512-Nzxdl3eolhGa1DpW5RFzlZ3F+jBXSh0TyCOrrziRw+osPyvl3qPyy1HWDhQyc+QcdeXdV4PK0QkwPae3aVUo/w==
dependencies:
"@babel/runtime" "^7.7.6"
"@polkadot/api-derive" "^0.99.1"
"@polkadot/api-derive" "^0.100.0-beta.1"
"@polkadot/keyring" "^1.7.1"
"@polkadot/metadata" "^0.99.1"
"@polkadot/rpc-core" "^0.99.1"
"@polkadot/rpc-provider" "^0.99.1"
"@polkadot/types" "^0.99.1"
"@polkadot/metadata" "^0.100.0-beta.1"
"@polkadot/rpc-core" "^0.100.0-beta.1"
"@polkadot/rpc-provider" "^0.100.0-beta.1"
"@polkadot/types" "^0.100.0-beta.1"
"@polkadot/util-crypto" "^1.7.1"

"@polkadot/dev-react@^0.32.0-beta.19":
Expand Down Expand Up @@ -2177,10 +2177,10 @@
dependencies:
"@babel/runtime" "^7.7.5"

"@polkadot/jsonrpc@^0.99.1":
version "0.99.1"
resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.99.1.tgz#15c35a5c4f0796f7347099c288d806ec215e602f"
integrity sha512-IviosdZUm5kA92+FCBf2LYhEdGZnTt5owuyZfVEDV+2HEXr3zivSyBtZkBhmH6Qn5W5Je/sVM8VJ+6pC8ShozA==
"@polkadot/jsonrpc@^0.100.0-beta.1":
version "0.100.0-beta.1"
resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.100.0-beta.1.tgz#0015e84f641f43e24b84b0e67b15160715e76645"
integrity sha512-IHLCiEExcS2RK0jimLSk67+agMVZeyVSQkms+wYTHfbTtqTHoR2UcWBq8/TAtoB7SidCHLoDy16kpwcDpKfQYA==
dependencies:
"@babel/runtime" "^7.7.6"

Expand All @@ -2193,13 +2193,13 @@
"@polkadot/util" "^1.7.1"
"@polkadot/util-crypto" "^1.7.1"

"@polkadot/metadata@^0.99.1":
version "0.99.1"
resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-0.99.1.tgz#26ee6478729a518eb6dd13ac23241d1fcd7d67f8"
integrity sha512-GJBkFCviIz/yev30gYLrCDLX7OG7goD0O+HWD9rIFe88J0OhmGL+ULu+xPVNSD+jzvBOPZ3FpxN4p60C5XFoVg==
"@polkadot/metadata@^0.100.0-beta.1":
version "0.100.0-beta.1"
resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-0.100.0-beta.1.tgz#c80367d439c6750f7e173e5c8345f830d7c3c721"
integrity sha512-wWavc/pjyH5mRYm7zao7aiDXSLhIQdhpfZTg5u5DVwiP8u1qh0gk1rfG0XkmFSnASgo19wsd5ipjSSIgN1ZWyg==
dependencies:
"@babel/runtime" "^7.7.6"
"@polkadot/types" "^0.99.1"
"@polkadot/types" "^0.100.0-beta.1"
"@polkadot/util" "^1.7.1"
"@polkadot/util-crypto" "^1.7.1"

Expand Down Expand Up @@ -2228,25 +2228,25 @@
qrcode-generator "^1.4.4"
react-qr-reader "^2.2.1"

"@polkadot/rpc-core@^0.99.1":
version "0.99.1"
resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.99.1.tgz#a46ba29200128d099f5d11d4fee10ed7d739b3ac"
integrity sha512-P0Bq2ehef38Mv69WxL3FkTvlw4QlGABf7fBrPhuZDLywNHoKrOkLHW1bBoRN7nk94IodFxpV0k6GksBahZFj7g==
"@polkadot/rpc-core@^0.100.0-beta.1":
version "0.100.0-beta.1"
resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.100.0-beta.1.tgz#5c5b614ec013b69fdc348129635363dec0f89422"
integrity sha512-4pvvBKIwf31vkb8ZwRkWYj+yWLFzClk7qCcvulNLrXmXCAD26QDyzT6gZADktJxzFjvzs24R9SH7kRSW8bHXtw==
dependencies:
"@babel/runtime" "^7.7.6"
"@polkadot/jsonrpc" "^0.99.1"
"@polkadot/rpc-provider" "^0.99.1"
"@polkadot/types" "^0.99.1"
"@polkadot/jsonrpc" "^0.100.0-beta.1"
"@polkadot/rpc-provider" "^0.100.0-beta.1"
"@polkadot/types" "^0.100.0-beta.1"
"@polkadot/util" "^1.7.1"
rxjs "^6.5.3"

"@polkadot/rpc-provider@^0.99.1":
version "0.99.1"
resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.99.1.tgz#510a4235e031d59c3c5ae9dc113be5901aaf43c9"
integrity sha512-VFVSPjurw3aWYceaeYZUlkRMaaXWQ2Es8K9Xz7CsCiJf1+4uTKLeLseD3isfsL56RGpgdtZ1zgFUIexDSOxDAQ==
"@polkadot/rpc-provider@^0.100.0-beta.1":
version "0.100.0-beta.1"
resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.100.0-beta.1.tgz#844b206687c6e3a91e382f43477b40ef15858e19"
integrity sha512-qWk4YuG3u6Uei4Q6rYloOteB/sbkuI4zA9pHx/XQpvO3v2ROZxhbE7K8j39fyEc0HF/lJfVmpnxE1pgi+hQudQ==
dependencies:
"@babel/runtime" "^7.7.6"
"@polkadot/metadata" "^0.99.1"
"@polkadot/metadata" "^0.100.0-beta.1"
"@polkadot/util" "^1.7.1"
"@polkadot/util-crypto" "^1.7.1"
eventemitter3 "^4.0.0"
Expand All @@ -2260,13 +2260,13 @@
dependencies:
"@types/chrome" "^0.0.91"

"@polkadot/types@^0.99.1":
version "0.99.1"
resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.99.1.tgz#a14f2d38f82e2e4cfd042922df5d70a7f78d86c5"
integrity sha512-iuN+GNS9bd3h+9/EodFPtzm6a+jzoLVpDbmxfDnEiyGrzf2JfQK08P/5v1H+9cCmNbcK8fP9LQdG4vBWvJPDmw==
"@polkadot/types@^0.100.0-beta.1":
version "0.100.0-beta.1"
resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.100.0-beta.1.tgz#d2d4b80581a55e2d2a58654de193a5c3b7b345e7"
integrity sha512-xulH3ubVK6xGkAlDFVkEY66ipNzqFLO+vkjtsHapNzJS98i+dxdDVisuqgjabfv675Q5Ia95cAWug3iUFr/EVw==
dependencies:
"@babel/runtime" "^7.7.6"
"@polkadot/metadata" "^0.99.1"
"@polkadot/metadata" "^0.100.0-beta.1"
"@polkadot/util" "^1.7.1"
"@polkadot/util-crypto" "^1.7.1"
"@types/memoizee" "^0.4.3"
Expand Down