Ranked collective & Fellowship (#7945)

* Ranked collective & Fellowship

* Ranked

* Display collective members

* Members with rank

packages/apps-routing/src/fellowship.ts

@@ -0,0 +1,24 @@
+// Copyright 2017-2022 @polkadot/apps-routing authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { TFunction } from 'i18next';
+import type { Route } from './types';
+
+import Component from '@polkadot/app-fellowship';
+
+export default function create (t: TFunction): Route {
+  return {
+    Component,
+    display: {
+      needsAccounts: true,
+      needsApi: [
+        'tx.fellowshipCollective.vote',
+        'tx.fellowshipReferenda.submit'
+      ]
+    },
+    group: 'governance',
+    icon: 'people-arrows',
+    name: 'fellowship',
+    text: t('nav.fellowship', 'Fellowship', { ns: 'apps-routing' })
+  };
+}

packages/apps-routing/src/index.ts

@@ -17,6 +17,7 @@ import council from './council';
 import democracy from './democracy';
 import explorer from './explorer';
 import extrinsics from './extrinsics';
+import fellowship from './fellowship';
 import files from './files';
 import gilt from './gilt';
 import js from './js';
@@ -25,6 +26,7 @@ import nfts from './nfts';
 import parachains from './parachains';
 import poll from './poll';
 import preimages from './preimages';
+import ranked from './ranked';
 import referenda from './referenda';
 import rpc from './rpc';
 import runtime from './runtime';
@@ -60,6 +62,8 @@ export default function create (t: TFunction): Routes {
     techcomm(t),
     membership(t),
     alliance(t),
+    fellowship(t),
+    ranked(t),
     preimages(t),
     whitelist(t),
     parachains(t),

packages/apps-routing/src/ranked.ts

@@ -0,0 +1,24 @@
+// Copyright 2017-2022 @polkadot/apps-routing authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { TFunction } from 'i18next';
+import type { Route } from './types';
+
+import Component from '@polkadot/app-ranked';
+
+export default function create (t: TFunction): Route {
+  return {
+    Component,
+    display: {
+      needsAccounts: true,
+      needsApi: [
+        'tx.rankedCollective.vote',
+        'tx.rankedPolls.submit'
+      ]
+    },
+    group: 'governance',
+    icon: 'people-arrows',
+    name: 'ranked',
+    text: t('nav.ranked', 'Ranked collective', { ns: 'apps-routing' })
+  };
+}

packages/page-fellowship/README.md

@@ -0,0 +1 @@
+# @polkadot/app-fellowship

packages/page-fellowship/package.json

@@ -1,11 +1,11 @@
 {
   "bugs": "https://github.com/polkadot-js/apps/issues",
-  "homepage": "https://github.com/polkadot-js/apps/tree/master/packages/page-ranked-collective#readme",
+  "homepage": "https://github.com/polkadot-js/apps/tree/master/packages/page-fellowship#readme",
   "license": "Apache-2.0",
-  "name": "@polkadot/app-ranked-collective",
+  "name": "@polkadot/app-fellowship",
   "private": true,
   "repository": {
-    "directory": "packages/page-ranked-collective",
+    "directory": "packages/page-fellowship",
     "type": "git",
     "url": "https://github.com/polkadot-js/apps.git"
   },

packages/page-fellowship/src/index.tsx

@@ -0,0 +1,24 @@
+// Copyright 2017-2022 @polkadot/app-fellowship authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import React from 'react';
+
+import Main from '@polkadot/app-ranked/App';
+
+interface Props {
+  basePath: string;
+  className?: string;
+}
+
+function App ({ basePath, className }: Props): React.ReactElement<Props> {
+  return (
+    <Main
+      basePath={basePath}
+      className={className}
+      palletColl='fellowshipCollective'
+      palletPoll='fellowshipReferenda'
+    />
+  );
+}
+
+export default React.memo(App);

packages/page-ranked-collective/README.md

@@ -1 +0,0 @@
-# @polkadot/app-ranked-collective

packages/page-ranked-collective/src/index.tsx

@@ -1,17 +0,0 @@
-// Copyright 2017-2022 @polkadot/app-ranked-collective authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import React from 'react';
-
-interface Props {
-  basePath: string;
-  className?: string;
-}
-
-function App ({ className }: Props): React.ReactElement<Props> {
-  return (
-    <div className={className} />
-  );
-}
-
-export default React.memo(App);

packages/page-ranked/LICENSE

@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                    http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by Licensor and
+  subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  copyright license to reproduce, prepare Derivative Works of,
+  publicly display, publicly perform, sublicense, and distribute the
+  Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  (except as stated in this section) patent license to make, have made,
+  use, offer to sell, sell, import, and otherwise transfer the Work,
+  where such license applies only to those patent claims licensable
+  by such Contributor that are necessarily infringed by their
+  Contribution(s) alone or by combination of their Contribution(s)
+  with the Work to which such Contribution(s) was submitted. If You
+  institute patent litigation against any entity (including a
+  cross-claim or counterclaim in a lawsuit) alleging that the Work
+  or a Contribution incorporated within the Work constitutes direct
+  or contributory patent infringement, then any patent licenses
+  granted to You under this License for that Work shall terminate
+  as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+  Work or Derivative Works thereof in any medium, with or without
+  modifications, and in Source or Object form, provided that You
+  meet the following conditions:
+
+  (a) You must give any other recipients of the Work or
+      Derivative Works a copy of this License; and
+
+  (b) You must cause any modified files to carry prominent notices
+      stating that You changed the files; and
+
+  (c) You must retain, in the Source form of any Derivative Works
+      that You distribute, all copyright, patent, trademark, and
+      attribution notices from the Source form of the Work,
+      excluding those notices that do not pertain to any part of
+      the Derivative Works; and
+
+  (d) If the Work includes a "NOTICE" text file as part of its
+      distribution, then any Derivative Works that You distribute must
+      include a readable copy of the attribution notices contained
+      within such NOTICE file, excluding those notices that do not
+      pertain to any part of the Derivative Works, in at least one
+      of the following places: within a NOTICE text file distributed
+      as part of the Derivative Works; within the Source form or
+      documentation, if provided along with the Derivative Works; or,
+      within a display generated by the Derivative Works, if and
+      wherever such third-party notices normally appear. The contents
+      of the NOTICE file are for informational purposes only and
+      do not modify the License. You may add Your own attribution
+      notices within Derivative Works that You distribute, alongside
+      or as an addendum to the NOTICE text from the Work, provided
+      that such additional attribution notices cannot be construed
+      as modifying the License.
+
+  You may add Your own copyright statement to Your modifications and
+  may provide additional or different license terms and conditions
+  for use, reproduction, or distribution of Your modifications, or
+  for any such Derivative Works as a whole, provided Your use,
+  reproduction, and distribution of the Work otherwise complies with
+  the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+  any Contribution intentionally submitted for inclusion in the Work
+  by You to the Licensor shall be under the terms and conditions of
+  this License, without any additional terms or conditions.
+  Notwithstanding the above, nothing herein shall supersede or modify
+  the terms of any separate license agreement you may have executed
+  with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+  names, trademarks, service marks, or product names of the Licensor,
+  except as required for reasonable and customary use in describing the
+  origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+  agreed to in writing, Licensor provides the Work (and each
+  Contributor provides its Contributions) on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+  implied, including, without limitation, any warranties or conditions
+  of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+  PARTICULAR PURPOSE. You are solely responsible for determining the
+  appropriateness of using or redistributing the Work and assume any
+  risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+  whether in tort (including negligence), contract, or otherwise,
+  unless required by applicable law (such as deliberate and grossly
+  negligent acts) or agreed to in writing, shall any Contributor be
+  liable to You for damages, including any direct, indirect, special,
+  incidental, or consequential damages of any character arising as a
+  result of this License or out of the use or inability to use the
+  Work (including but not limited to damages for loss of goodwill,
+  work stoppage, computer failure or malfunction, or any and all
+  other commercial damages or losses), even if such Contributor
+  has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+  the Work or Derivative Works thereof, You may choose to offer,
+  and charge a fee for, acceptance of support, warranty, indemnity,
+  or other liability obligations and/or rights consistent with this
+  License. However, in accepting such obligations, You may act only
+  on Your own behalf and on Your sole responsibility, not on behalf
+  of any other Contributor, and only if You agree to indemnify,
+  defend, and hold each Contributor harmless for any liability
+  incurred by, or claims asserted against, such Contributor by reason
+  of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+  To apply the Apache License to your work, attach the following
+  boilerplate notice, with the fields enclosed by brackets "[]"
+  replaced with your own identifying information. (Don't include
+  the brackets!)  The text should be enclosed in the appropriate
+  comment syntax for the file format. We also recommend that a
+  file or class name and description of purpose be included on the
+  same "printed page" as the copyright notice for easier
+  identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

packages/page-ranked/README.md

@@ -0,0 +1 @@
+# @polkadot/app-ranked

packages/page-ranked/package.json

@@ -0,0 +1,18 @@
+{
+  "bugs": "https://github.com/polkadot-js/apps/issues",
+  "homepage": "https://github.com/polkadot-js/apps/tree/master/packages/page-ranked#readme",
+  "license": "Apache-2.0",
+  "name": "@polkadot/app-ranked",
+  "private": true,
+  "repository": {
+    "directory": "packages/page-ranked",
+    "type": "git",
+    "url": "https://github.com/polkadot-js/apps.git"
+  },
+  "sideEffects": false,
+  "type": "module",
+  "version": "0.119.2-4-x",
+  "dependencies": {
+    "@babel/runtime": "^7.18.9"
+  }
+}

packages/page-ranked/src/App.tsx

@@ -0,0 +1,62 @@
+// Copyright 2017-2022 @polkadot/app-ranked authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { PalletColl, PalletPoll } from './types';
+
+import React, { useRef } from 'react';
+import { Route, Switch } from 'react-router';
+
+import Referenda from '@polkadot/app-referenda/Referenda';
+import { Tabs } from '@polkadot/react-components';
+
+import Members from './Members';
+import { useTranslation } from './translate';
+import useMembers from './useMembers';
+
+interface Props {
+  basePath: string;
+  className?: string;
+  palletColl: PalletColl;
+  palletPoll: PalletPoll;
+}
+
+function App ({ basePath, className, palletColl, palletPoll }: Props): React.ReactElement<Props> {
+  const { t } = useTranslation();
+  const members = useMembers(palletColl);
+
+  const tabsRef = useRef([
+    {
+      isRoot: true,
+      name: 'overview',
+      text: t<string>('Overview')
+    },
+    {
+      name: 'referenda',
+      text: t<string>('Referenda')
+    }
+  ]);
+
+  return (
+    <main className={className}>
+      <Tabs
+        basePath={basePath}
+        items={tabsRef.current}
+      />
+      <Switch>
+        <Route path={`${basePath}/referenda`}>
+          <Referenda
+            isVoteBasic
+            members={members && members.memberIds}
+            palletReferenda={palletPoll}
+            palletVote={palletColl}
+          />
+        </Route>
+        <Route>
+          <Members members={members && members.members} />
+        </Route>
+      </Switch>
+    </main>
+  );
+}
+
+export default React.memo(App);

packages/page-ranked/src/Member.tsx

@@ -0,0 +1,29 @@
+// Copyright 2017-2022 @polkadot/app-ranked authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Member as MemberType } from './types';
+
+import React from 'react';
+
+import { AddressSmall } from '@polkadot/react-components';
+import { formatNumber } from '@polkadot/util';
+
+interface Props {
+  className?: string;
+  value: MemberType;
+}
+
+function Member ({ className, value: { accountId, info } }: Props): React.ReactElement<Props> {
+  return (
+    <tr className={className}>
+      <td className='address all'>
+        <AddressSmall value={accountId} />
+      </td>
+      <td className='number'>
+        {formatNumber(info.rank)}
+      </td>
+    </tr>
+  );
+}
+
+export default React.memo(Member);

packages/page-ranked/src/Members.tsx

@@ -0,0 +1,41 @@
+// Copyright 2017-2022 @polkadot/app-ranked authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Member as MemberType } from './types';
+
+import React, { useRef } from 'react';
+
+import { Table } from '@polkadot/react-components';
+
+import Member from './Member';
+import { useTranslation } from './translate';
+
+interface Props {
+  className?: string;
+  members?: MemberType[];
+}
+
+function Members ({ className, members }: Props): React.ReactElement<Props> {
+  const { t } = useTranslation();
+  const headerRef = useRef([
+    [t('members'), 'start'],
+    [t('rank'), 'number']
+  ]);
+
+  return (
+    <Table
+      className={className}
+      empty={members && t<string>('No members found')}
+      header={headerRef.current}
+    >
+      {members && members.map((a): React.ReactNode => (
+        <Member
+          key={a.accountId}
+          value={a}
+        />
+      ))}
+    </Table>
+  );
+}
+
+export default React.memo(Members);

packages/page-ranked/src/index.tsx

@@ -0,0 +1,24 @@
+// Copyright 2017-2022 @polkadot/app-ranked authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import React from 'react';
+
+import Main from './App';
+
+interface Props {
+  basePath: string;
+  className?: string;
+}
+
+function App ({ basePath, className }: Props): React.ReactElement<Props> {
+  return (
+    <Main
+      basePath={basePath}
+      className={className}
+      palletColl='rankedCollective'
+      palletPoll='rankedPolls'
+    />
+  );
+}
+
+export default React.memo(App);

packages/page-ranked/src/translate.ts

@@ -1,10 +1,10 @@
-// Copyright 2017-2022 @polkadot/app-ranked-collective authors & contributors
+// Copyright 2017-2022 @polkadot/app-ranked authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import type { UseTranslationResponse } from 'react-i18next';
 
 import { useTranslation as useTranslationBase } from 'react-i18next';
 
-export function useTranslation (): UseTranslationResponse<'app-ranked-collective', undefined> {
-  return useTranslationBase('app-ranked-collective');
+export function useTranslation (): UseTranslationResponse<'app-ranked', undefined> {
+  return useTranslationBase('app-ranked');
 }

packages/page-ranked/src/types.ts

@@ -0,0 +1,13 @@
+// Copyright 2017-2022 @polkadot/app-ranked authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { PalletRankedCollectiveMemberRecord } from '@polkadot/types/lookup';
+
+export type PalletColl = 'rankedCollective' | 'fellowshipCollective';
+
+export type PalletPoll = 'rankedPolls' | 'fellowshipReferenda';
+
+export interface Member {
+  accountId: string;
+  info: PalletRankedCollectiveMemberRecord;
+}

packages/page-ranked/src/useMemberIds.ts

@@ -0,0 +1,41 @@
+// Copyright 2017-2022 @polkadot/app-referenda authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Changes } from '@polkadot/react-hooks/useEventChanges';
+import type { StorageKey } from '@polkadot/types';
+import type { AccountId32, EventRecord } from '@polkadot/types/interfaces';
+import type { PalletColl } from './types';
+
+import { createNamedHook, useApi, useEventChanges, useMapKeys } from '@polkadot/react-hooks';
+
+const OPT_ID = {
+  transform: (keys: StorageKey<[AccountId32]>[]): AccountId32[] =>
+    keys.map(({ args: [id] }) => id)
+};
+
+function filter (records: EventRecord[]): Changes<AccountId32> {
+  const added: AccountId32[] = [];
+  const removed: AccountId32[] = [];
+
+  records.forEach(({ event: { data: [id], method } }): void => {
+    if (method === 'MemberAdded') {
+      added.push(id as AccountId32);
+    } else {
+      removed.push(id as AccountId32);
+    }
+  });
+
+  return { added, removed };
+}
+
+function useMemberIdsImpl (collective: PalletColl): AccountId32[] | undefined {
+  const { api } = useApi();
+  const startValue = useMapKeys(api.query[collective].members, OPT_ID);
+
+  return useEventChanges([
+    api.events[collective].MemberAdded,
+    api.events[collective].MemberRemoved
+  ], filter, startValue);
+}
+
+export default createNamedHook('useMemberIds', useMemberIdsImpl);

packages/page-ranked/src/useMembers.ts

@@ -0,0 +1,52 @@
+// Copyright 2017-2022 @polkadot/app-preimages authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Option } from '@polkadot/types';
+import type { AccountId32 } from '@polkadot/types/interfaces';
+import type { PalletRankedCollectiveMemberRecord } from '@polkadot/types/lookup';
+import type { Member, PalletColl } from './types';
+
+import { useMemo } from 'react';
+
+import { createNamedHook, useApi, useCall } from '@polkadot/react-hooks';
+
+import useMembersIds from './useMemberIds';
+
+interface Result {
+  memberIds: string[];
+  members: Member[];
+}
+
+const OPT_MEM = {
+  transform: ([[ids], infos]: [[AccountId32[]], Option<PalletRankedCollectiveMemberRecord>[]]) =>
+    infos
+      .map((info, i) => [info.unwrapOr(null), ids[i]])
+      .filter((r): r is [PalletRankedCollectiveMemberRecord, AccountId32] => !!r[0])
+      .map(([info, accountId]): Member => ({
+        accountId: accountId.toString(),
+        info
+      })),
+  withParamsTransform: true
+};
+
+function createResult (members: Member[]): Result {
+  const memberIds = members.map(({ accountId }) => accountId);
+
+  return {
+    memberIds,
+    members
+  };
+}
+
+function useMembersImpl (collective: PalletColl): Result | undefined {
+  const { api } = useApi();
+  const memberIds = useMembersIds(collective);
+  const all = useCall(memberIds && memberIds.length !== 0 && api.query[collective].members.multi, [memberIds], OPT_MEM);
+
+  return useMemo(
+    () => all && createResult(all),
+    [all]
+  );
+}
+
+export default createNamedHook('useMembers', useMembersImpl);

packages/page-ranked/tsconfig.build.json

@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": "..",
+    "outDir": "./build",
+    "rootDir": "./src"
+  },
+  "references": []
+}

packages/page-referenda/src/RefOngoing.tsx

@@ -30,7 +30,7 @@ function expandOngoing (info: Referendum['info']): Expanded {
   };
 }
 
-function Ongoing ({ isMember, members, palletVote, value: { id, info } }: Props): React.ReactElement<Props> {
+function Ongoing ({ isMember, isVoteBasic, members, palletVote, value: { id, info } }: Props): React.ReactElement<Props> {
   const { t } = useTranslation();
   const { ongoing: { decisionDeposit, proposalHash, submissionDeposit, tally }, shortHash, tallyTotal } = useMemo(
     () => expandOngoing(info),
@@ -67,6 +67,7 @@ function Ongoing ({ isMember, members, palletVote, value: { id, info } }: Props)
           <Vote
             id={id}
             isMember={isMember}
+            isVoteBasic={isVoteBasic}
             members={members}
             palletVote={palletVote}
             preimage={preimage}

packages/page-referenda/src/Referenda.tsx

@@ -14,12 +14,13 @@ import useReferenda from './useReferenda';
 
 interface Props {
   className?: string;
+  isVoteBasic: boolean;
   members?: string[];
   palletReferenda: PalletReferenda;
   palletVote: PalletVote;
 }
 
-function Referenda ({ className, members, palletReferenda, palletVote }: Props): React.ReactElement<Props> {
+function Referenda ({ className, isVoteBasic, members, palletReferenda, palletVote }: Props): React.ReactElement<Props> {
   const { t } = useTranslation();
   const { allAccounts } = useAccounts();
   const referenda = useReferenda(palletReferenda);
@@ -44,6 +45,7 @@ function Referenda ({ className, members, palletReferenda, palletVote }: Props):
         {referenda && referenda.map((r) => (
           <Referendum
             isMember={isMember}
+            isVoteBasic={isVoteBasic}
             key={r.key}
             members={members}
             palletVote={palletVote}

packages/page-referenda/src/Vote.tsx

@@ -15,12 +15,13 @@ import { useTranslation } from './translate';
 interface Props {
   id: BN;
   isMember: boolean;
+  isVoteBasic: boolean;
   members?: string[];
   palletVote: PalletVote;
   preimage: Preimage;
 }
 
-function Voting ({ id, isMember, members, palletVote, preimage: { proposal } }: Props): React.ReactElement<Props> | null {
+function Voting ({ id, isMember, isVoteBasic, members, palletVote, preimage: { proposal } }: Props): React.ReactElement<Props> | null {
   const { t } = useTranslation();
   const { api } = useApi();
   const { hasAccounts } = useAccounts();
@@ -54,26 +55,28 @@ function Voting ({ id, isMember, members, palletVote, preimage: { proposal } }:
                 onChange={setAccountId}
               />
             </Modal.Columns>
-            <Modal.Columns
-              hint={
-                <>
-                  <p>{t<string>('The balance associated with the vote will be locked as per the conviction specified and will not be available for transfer during this period.')}</p>
-                  <p>{t<string>('Conviction locks do overlap and are not additive, meaning that funds locked during a previous vote can be locked again.')}</p>
-                </>
-              }
-            >
-              <VoteValue
-                accountId={accountId}
-                autoFocus
-                onChange={setBalance}
-              />
-              <ConvictionDropdown
-                help={t<string>('The conviction to use for this vote, with an appropriate lock period.')}
-                label={t<string>('conviction')}
-                onChange={setConviction}
-                value={conviction}
-              />
-            </Modal.Columns>
+            {!isVoteBasic && (
+              <Modal.Columns
+                hint={
+                  <>
+                    <p>{t<string>('The balance associated with the vote will be locked as per the conviction specified and will not be available for transfer during this period.')}</p>
+                    <p>{t<string>('Conviction locks do overlap and are not additive, meaning that funds locked during a previous vote can be locked again.')}</p>
+                  </>
+                }
+              >
+                <VoteValue
+                  accountId={accountId}
+                  autoFocus
+                  onChange={setBalance}
+                />
+                <ConvictionDropdown
+                  help={t<string>('The conviction to use for this vote, with an appropriate lock period.')}
+                  label={t<string>('conviction')}
+                  onChange={setConviction}
+                  value={conviction}
+                />
+              </Modal.Columns>
+            )}
           </Modal.Content>
           <Modal.Actions>
             <TxButton
@@ -83,7 +86,9 @@ function Voting ({ id, isMember, members, palletVote, preimage: { proposal } }:
               label={t<string>('Vote Nay')}
               onStart={toggleVoting}
               params={
-                [id, { Standard: { balance, vote: { aye: false, conviction } } }]
+                isVoteBasic
+                  ? [id, false]
+                  : [id, { Standard: { balance, vote: { aye: false, conviction } } }]
               }
               tx={api.tx[palletVote].vote}
             />
@@ -94,7 +99,9 @@ function Voting ({ id, isMember, members, palletVote, preimage: { proposal } }:
               label={t<string>('Vote Aye')}
               onStart={toggleVoting}
               params={
-                [id, { Standard: { balance, vote: { aye: true, conviction } } }]
+                isVoteBasic
+                  ? [id, true]
+                  : [id, { Standard: { balance, vote: { aye: true, conviction } } }]
               }
               tx={api.tx[palletVote].vote}
             />

packages/page-referenda/src/index.tsx

@@ -31,6 +31,7 @@ function App ({ basePath, className }: Props): React.ReactElement<Props> {
         items={tabsRef.current}
       />
       <Referenda
+        isVoteBasic={false}
         palletReferenda='referenda'
         palletVote='convictionVoting'
       />

packages/page-referenda/src/types.ts

@@ -13,11 +13,12 @@ export interface Referendum {
 export interface ReferendumProps {
   className?: string;
   isMember: boolean;
+  isVoteBasic: boolean;
   members?: string[];
   palletVote: PalletVote;
   value: Referendum;
 }
 
-export type PalletReferenda = 'referenda';
+export type PalletReferenda = 'referenda' | 'rankedPolls' | 'fellowshipReferenda';
 
-export type PalletVote = 'convictionVoting';
+export type PalletVote = 'convictionVoting' | 'rankedCollective' | 'fellowshipCollective';

tsconfig.base.json

@@ -36,6 +36,8 @@
       "@polkadot/app-extrinsics/*": ["page-extrinsics/src/*"],
       "@polkadot/app-explorer": ["page-explorer/src"],
       "@polkadot/app-explorer/*": ["page-explorer/src/*"],
+      "@polkadot/app-fellowship": ["page-fellowship/src"],
+      "@polkadot/app-fellowship/*": ["page-fellowship/src/*"],
       "@polkadot/app-files": ["page-files/src"],
       "@polkadot/app-files/*": ["page-files/src/*"],
       "@polkadot/app-gilt": ["page-gilt/src"],
@@ -54,8 +56,8 @@
       "@polkadot/app-poll/*": ["page-poll/src/*"],
       "@polkadot/app-preimages": ["page-preimages/src"],
       "@polkadot/app-preimages/*": ["page-preimages/src/*"],
-      "@polkadot/app-ranked-collective": ["page-ranked-collective/src"],
-      "@polkadot/app-ranked-collective/*": ["page-ranked-collective/src/*"],
+      "@polkadot/app-ranked": ["page-ranked/src"],
+      "@polkadot/app-ranked/*": ["page-ranked/src/*"],
       "@polkadot/app-referenda": ["page-referenda/src"],
       "@polkadot/app-referenda/*": ["page-referenda/src/*"],
       "@polkadot/app-rpc": ["page-rpc/src"],

yarn.lock

@@ -2864,6 +2864,14 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@polkadot/app-fellowship@workspace:packages/page-fellowship":
+  version: 0.0.0-use.local
+  resolution: "@polkadot/app-fellowship@workspace:packages/page-fellowship"
+  dependencies:
+    "@babel/runtime": ^7.18.9
+  languageName: unknown
+  linkType: soft
+
 "@polkadot/app-files@workspace:packages/page-files":
   version: 0.0.0-use.local
   resolution: "@polkadot/app-files@workspace:packages/page-files"
@@ -2937,9 +2945,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/app-ranked-collective@workspace:packages/page-ranked-collective":
+"@polkadot/app-ranked@workspace:packages/page-ranked":
   version: 0.0.0-use.local
-  resolution: "@polkadot/app-ranked-collective@workspace:packages/page-ranked-collective"
+  resolution: "@polkadot/app-ranked@workspace:packages/page-ranked"
   dependencies:
     "@babel/runtime": ^7.18.9
   languageName: unknown