This commit is contained in:
Jaco 2022-11-28 12:59:41 +02:00 committed by GitHub
parent 5214e13d51
commit c06e0c4e6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 402 additions and 397 deletions

View File

@ -69,7 +69,7 @@
"@babel/runtime": "^7.20.1",
"@crustio/crust-pin": "^1.0.0",
"@pinata/sdk": "^1.2.1",
"@polkadot/dev": "^0.67.162",
"@polkadot/dev": "^0.67.163",
"@types/chart.js": "^2.9.37",
"@types/file-saver": "^2.0.5",
"@types/jest": "^29.2.3",
@ -94,26 +94,26 @@
"styled-components": "^5.3.6"
},
"resolutions": {
"@polkadot/api": "^9.9.1",
"@polkadot/api-augment": "^9.9.1",
"@polkadot/api-base": "^9.9.1",
"@polkadot/api-contract": "^9.9.1",
"@polkadot/api-derive": "^9.9.1",
"@polkadot/hw-ledger": "^10.1.13",
"@polkadot/keyring": "^10.1.13",
"@polkadot/networks": "^10.1.13",
"@polkadot/api": "^9.9.4",
"@polkadot/api-augment": "^9.9.4",
"@polkadot/api-base": "^9.9.4",
"@polkadot/api-contract": "^9.9.4",
"@polkadot/api-derive": "^9.9.4",
"@polkadot/hw-ledger": "^10.1.14",
"@polkadot/keyring": "^10.1.14",
"@polkadot/networks": "^10.1.14",
"@polkadot/phishing": "^0.18.11",
"@polkadot/rpc-augment": "^9.9.1",
"@polkadot/rpc-core": "^9.9.1",
"@polkadot/rpc-provider": "^9.9.1",
"@polkadot/types": "^9.9.1",
"@polkadot/types-augment": "^9.9.1",
"@polkadot/types-codec": "^9.9.1",
"@polkadot/types-create": "^9.9.1",
"@polkadot/types-known": "^9.9.1",
"@polkadot/types-support": "^9.9.1",
"@polkadot/util": "^10.1.13",
"@polkadot/util-crypto": "^10.1.13",
"@polkadot/rpc-augment": "^9.9.4",
"@polkadot/rpc-core": "^9.9.4",
"@polkadot/rpc-provider": "^9.9.4",
"@polkadot/types": "^9.9.4",
"@polkadot/types-augment": "^9.9.4",
"@polkadot/types-codec": "^9.9.4",
"@polkadot/types-create": "^9.9.4",
"@polkadot/types-known": "^9.9.4",
"@polkadot/types-support": "^9.9.4",
"@polkadot/util": "^10.1.14",
"@polkadot/util-crypto": "^10.1.14",
"@polkadot/wasm-crypto": "^6.3.1",
"babel-core": "^7.0.0-bridge.0",
"styled-components": "^5.3.1",

View File

@ -32,12 +32,12 @@
"@metaverse-network-sdk/type-definitions": "^0.0.1-13",
"@parallel-finance/type-definitions": "1.7.13",
"@phala/typedefs": "0.2.32",
"@polkadot/api": "^9.9.1",
"@polkadot/api-derive": "^9.9.1",
"@polkadot/networks": "^10.1.13",
"@polkadot/types": "^9.9.1",
"@polkadot/util": "^10.1.13",
"@polkadot/x-fetch": "^10.1.13",
"@polkadot/api": "^9.9.4",
"@polkadot/api-derive": "^9.9.4",
"@polkadot/networks": "^10.1.14",
"@polkadot/types": "^9.9.4",
"@polkadot/util": "^10.1.14",
"@polkadot/x-fetch": "^10.1.14",
"@polymathnetwork/polymesh-types": "0.0.2",
"@snowfork/snowbridge-types": "0.2.7",
"@sora-substrate/type-definitions": "1.10.21",

View File

@ -14,7 +14,7 @@
"dependencies": {
"@babel/core": "^7.20.2",
"@babel/polyfill": "^7.12.1",
"@polkadot/dev": "^0.67.162",
"@polkadot/dev": "^0.67.163",
"@polkadot/react-components": "^0.122.3-57-x",
"electron-log": "^4.4.8",
"electron-updater": "^5.3.0"

View File

@ -18,7 +18,7 @@
"@babel/runtime": "^7.20.1",
"@polkadot/apps-config": "^0.122.3-57-x",
"@polkadot/apps-routing": "^0.122.3-57-x",
"@polkadot/dev": "^0.67.162",
"@polkadot/dev": "^0.67.163",
"@polkadot/react-api": "^0.122.3-57-x",
"@polkadot/react-components": "^0.122.3-57-x",
"@polkadot/react-hooks": "^0.122.3-57-x",

View File

@ -14,12 +14,12 @@
"version": "0.122.3-57-x",
"dependencies": {
"@babel/runtime": "^7.20.1",
"@polkadot/hw-ledger": "^10.1.13",
"@polkadot/hw-ledger": "^10.1.14",
"@polkadot/phishing": "^0.18.11",
"@polkadot/react-components": "^0.122.3-57-x",
"@polkadot/react-hooks": "^0.122.3-57-x",
"@polkadot/util": "^10.1.13",
"@polkadot/vanitygen": "^0.52.16",
"@polkadot/util": "^10.1.14",
"@polkadot/vanitygen": "^0.52.17",
"detect-browser": "^5.3.0",
"file-saver": "^2.0.5"
},

View File

@ -12,7 +12,8 @@ export interface Cid {
export interface Member {
accountId: string;
role: PalletAllianceMemberRole['type'];
// Founder here is deprecated
role: PalletAllianceMemberRole['type'] | 'Founder';
}
export interface MemberInfo {

View File

@ -8,7 +8,8 @@ import { useEffect, useState } from 'react';
import { createNamedHook, useApi, useCall } from '@polkadot/react-hooks';
const ROLES = <const> ['Founder', 'Fellow', 'Ally'];
// these are reversed (catering for old "Founder" role)
const ROLES = <const> ['Retiring', 'Ally', 'Fellow', 'Founder'];
function addMembers (prev: Member[], ...query: AccountId32[][]): Member[] {
const all: Member[] = [];
@ -31,7 +32,7 @@ function addMembers (prev: Member[], ...query: AccountId32[][]): Member[] {
}
}
return all;
return all.reverse();
}
function useMembersImpl (): Member[] | undefined {
@ -40,11 +41,15 @@ function useMembersImpl (): Member[] | undefined {
const role0 = useCall<AccountId32[]>(api.query.alliance.members, [ROLES[0]]);
const role1 = useCall<AccountId32[]>(api.query.alliance.members, [ROLES[1]]);
const role2 = useCall<AccountId32[]>(api.query.alliance.members, [ROLES[2]]);
// for the Founder role, we don't expect and actual value
const role3 = useCall<AccountId32[]>(api.query.alliance.members, [ROLES[3]]);
useEffect((): void => {
role0 && role1 && role2 &&
setState((prev = []) => addMembers(prev, role0, role1, role2));
}, [role0, role1, role2]);
setState((prev = []) =>
addMembers(prev, role0, role1, role2, role3 || [])
);
}, [role0, role1, role2, role3]);
return state;
}

View File

@ -14,6 +14,6 @@
"version": "0.122.3-57-x",
"dependencies": {
"@babel/runtime": "^7.20.1",
"@polkadot/api-contract": "^9.9.1"
"@polkadot/api-contract": "^9.9.4"
}
}

View File

@ -18,10 +18,10 @@
},
"dependencies": {
"@babel/runtime": "^7.20.1",
"@polkadot/api": "^9.9.1",
"@polkadot/api": "^9.9.4",
"@polkadot/extension-compat-metamask": "^0.44.6",
"@polkadot/extension-dapp": "^0.44.6",
"@polkadot/rpc-provider": "^9.9.1",
"@polkadot/rpc-provider": "^9.9.4",
"fflate": "^0.7.4",
"rxjs": "^7.5.7"
}

View File

@ -17,15 +17,15 @@
"@fortawesome/fontawesome-svg-core": "^6.2.0",
"@fortawesome/free-solid-svg-icons": "^6.2.0",
"@fortawesome/react-fontawesome": "^0.2.0",
"@polkadot/keyring": "^10.1.13",
"@polkadot/keyring": "^10.1.14",
"@polkadot/react-api": "^0.122.3-57-x",
"@polkadot/react-identicon": "^2.9.13",
"@polkadot/react-qr": "^2.9.13",
"@polkadot/react-query": "^0.122.3-57-x",
"@polkadot/ui-keyring": "^2.9.13",
"@polkadot/ui-settings": "^2.9.13",
"@polkadot/util": "^10.1.13",
"@polkadot/util-crypto": "^10.1.13",
"@polkadot/util": "^10.1.14",
"@polkadot/util-crypto": "^10.1.14",
"chart.js": "^3.9.1",
"codeflask": "^1.4.1",
"i18next": "^21.9.2",

View File

@ -14,7 +14,7 @@
"version": "0.122.3-57-x",
"dependencies": {
"@babel/runtime": "^7.20.1",
"@polkadot/hw-ledger": "^10.1.13",
"@polkadot/hw-ledger": "^10.1.14",
"is-ipfs": "6.0.2"
}
}

View File

@ -14,7 +14,7 @@
"version": "0.122.3-57-x",
"dependencies": {
"@babel/runtime": "^7.20.1",
"@polkadot/hw-ledger": "^10.1.13",
"@polkadot/hw-ledger": "^10.1.14",
"@polkadot/react-components": "^0.122.3-57-x"
}
}

View File

@ -17,7 +17,7 @@
"testcontainers": "^8.16.0"
},
"devDependencies": {
"@polkadot/types-support": "^9.9.1",
"@polkadot/types-support": "^9.9.4",
"@testing-library/jest-dom": "^5.16.5",
"tsconfig-paths": "^4.1.0"
}

703
yarn.lock

File diff suppressed because it is too large Load Diff