Adjust treasury threshold to 60% (#2300)

* Adjust threasury threshold to 60%

* Update TypeScript version

* Fix linting
This commit is contained in:
Jaco Greeff 2020-02-23 15:57:32 +01:00 committed by GitHub
parent 05aaaecfdc
commit fb81a16cc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 373 additions and 424 deletions

View File

@ -1,24 +0,0 @@
#!/bin/bash
exit 0
# checkout latest
git fetch
git checkout gh-pages
git pull
git checkout --orphan gh-pages-temp
# cleanup
rm -rf node_modules
rm -rf coverage
rm -rf packages
rm -rf test
# add
git add -A
git commit -am "refresh history"
# danger, force new
git branch -D gh-pages
git branch -m gh-pages
git push -f origin gh-pages

View File

@ -10,14 +10,15 @@
"packages/*"
],
"resolutions": {
"@polkadot/api": "^1.4.0-beta.16",
"@polkadot/api-contract": "^1.4.0-beta.16",
"@polkadot/keyring": "^2.4.1",
"@polkadot/types": "^1.4.0-beta.16",
"@polkadot/util": "^2.4.1",
"@polkadot/util-crypto": "^2.4.1",
"@polkadot/api": "^1.4.0-beta.35",
"@polkadot/api-contract": "^1.4.0-beta.35",
"@polkadot/keyring": "^2.5.1",
"@polkadot/typegen": "^1.4.0-beta.35",
"@polkadot/types": "^1.4.0-beta.35",
"@polkadot/util": "^2.5.1",
"@polkadot/util-crypto": "^2.5.1",
"babel-core": "^7.0.0-bridge.0",
"typescript": "^3.7.5"
"typescript": "^3.8.2"
},
"scripts": {
"analyze": "yarn run build && cd packages/apps && yarn run source-map-explorer build/main.*.js",
@ -38,8 +39,9 @@
"@babel/core": "^7.8.4",
"@babel/register": "^7.8.3",
"@babel/runtime": "^7.8.4",
"@polkadot/dev": "^0.40.19",
"@polkadot/dev": "^0.41.3",
"@polkadot/ts": "^0.2.3",
"@polkadot/typegen": "^1.4.0-beta.35",
"@types/bn.js": "^4.11.6",
"@types/chart.js": "^2.9.11",
"@types/file-saver": "^2.0.0",

View File

@ -13,7 +13,7 @@
"dependencies": {
"@babel/runtime": "^7.8.4",
"@polkadot/react-components": "0.40.0-beta.46",
"@polkadot/react-qr": "^0.52.0-beta.2",
"@polkadot/react-qr": "^0.52.0-beta.3",
"detect-browser": "^4.8.0",
"file-saver": "^2.0.0",
"yargs": "^15.0.2"

View File

@ -12,6 +12,6 @@
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.8.4",
"@polkadot/api-contract": "^1.4.0-beta.16"
"@polkadot/api-contract": "^1.4.0-beta.35"
}
}

View File

@ -22,7 +22,7 @@ export default function Submission ({ councilProposals, id, isDisabled }: Props)
const { api } = useApi();
const councilThreshold = useCall<number>(api.query.electionsPhragmen?.members || api.query.elections.members, [], {
transform: (value: any[]): number =>
Math.ceil(value.length * 0.5)
Math.ceil(value.length * 0.6)
});
const [isOpen, toggleOpen] = useToggle();
const [accountId, setAccountId] = useState<string | null>(null);

View File

@ -17,7 +17,7 @@
"@babel/runtime": "^7.8.4",
"@polkadot/react-components": "0.40.0-beta.46",
"@polkadot/react-signer": "0.40.0-beta.46",
"@polkadot/ui-assets": "^0.52.0-beta.2",
"@polkadot/ui-assets": "^0.52.0-beta.3",
"query-string": "^6.10.1"
}
}

View File

@ -31,8 +31,8 @@
"homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme",
"dependencies": {
"@babel/runtime": "^7.8.4",
"@polkadot/api": "^1.4.0-beta.16",
"@polkadot/extension-dapp": "^0.22.0-beta.4",
"@polkadot/api": "^1.4.0-beta.35",
"@polkadot/extension-dapp": "^0.22.0-beta.5",
"edgeware-node-types": "^1.1.0",
"rxjs-compat": "^6.5.3"
}

View File

@ -11,12 +11,12 @@
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.8.4",
"@polkadot/keyring": "^2.4.1",
"@polkadot/keyring": "^2.5.1",
"@polkadot/react-api": "0.40.0-beta.46",
"@polkadot/react-identicon": "^0.52.0-beta.2",
"@polkadot/react-identicon": "^0.52.0-beta.3",
"@polkadot/react-query": "0.40.0-beta.46",
"@polkadot/ui-keyring": "^0.52.0-beta.2",
"@polkadot/ui-settings": "^0.52.0-beta.2",
"@polkadot/ui-keyring": "^0.52.0-beta.3",
"@polkadot/ui-settings": "^0.52.0-beta.3",
"chart.js": "^2.9.2",
"codeflask": "^1.4.0",
"i18next": "^19.1.0",

View File

@ -55,7 +55,7 @@ function parseFile (raw: Uint8Array): Parsed {
export default function KeyValueArray ({ className, defaultValue, isDisabled, isError, label, onChange, onEnter, onEscape, style, withLabel }: Props): React.ReactElement<Props> {
const { t } = useTranslation();
const [placeholder, setPlaceholder] = useState(t(EMPTY_PLACEHOLDER));
const [placeholder, setPlaceholder] = useState<string>(t(EMPTY_PLACEHOLDER));
if (isDisabled) {
const pairs = defaultValue.value as Vec<Pair>;

View File

@ -12,6 +12,6 @@
"dependencies": {
"@babel/runtime": "^7.8.4",
"@polkadot/react-components": "0.40.0-beta.46",
"@polkadot/react-qr": "^0.52.0-beta.2"
"@polkadot/react-qr": "^0.52.0-beta.3"
}
}

731
yarn.lock

File diff suppressed because it is too large Load Diff