From 297fec3c38ba7291ada0ccd5445963f704134254 Mon Sep 17 00:00:00 2001 From: Megha <100185149+Megha-Dev-19@users.noreply.github.com> Date: Wed, 12 Jun 2024 23:35:05 +0530 Subject: [PATCH] Move proposals related files and fix notification roles selector (#377) * move proposals related files * minor fixes * fix pre-commit command --- .../widget/fetch => new/widget/lib}/daos.jsx | 0 apps/new/widget/page/activity/Index.jsx | 2 +- .../widget/page/proposals/Card.jsx} | 9 +++++ .../widget/page/proposals/Filters.jsx} | 6 ++-- .../widget/page/proposals/Index.jsx} | 19 +++++++---- .../proposals}/NotificationRolesSelector.jsx | 24 +++++++++---- .../page/proposals/VisibilityInfoModal.jsx} | 6 ++-- .../page/proposals/create}/AddMember.jsx | 32 ++++++++++------- .../page/proposals/create}/FunctionCall.jsx | 33 +++++++++++------- .../widget/page/proposals/create/Index.jsx} | 20 +++++++---- .../page/proposals/create}/RemoveMember.jsx | 32 ++++++++++------- .../widget/page/proposals/create}/Text.jsx | 34 +++++++++++-------- .../page/proposals/create}/Transfer.jsx | 32 ++++++++++------- package.json | 5 +-- 14 files changed, 164 insertions(+), 90 deletions(-) rename apps/{old/widget/fetch => new/widget/lib}/daos.jsx (100%) rename apps/{old/widget/components/ProposalCard.jsx => new/widget/page/proposals/Card.jsx} (98%) rename apps/{old/widget/components/modals/ProposalsFilters.jsx => new/widget/page/proposals/Filters.jsx} (96%) rename apps/{old/widget/Proposals.jsx => new/widget/page/proposals/Index.jsx} (94%) rename apps/{old/widget/Notification => new/widget/page/proposals}/NotificationRolesSelector.jsx (89%) rename apps/{old/widget/components/modals/propose/ProposalVisibilityInfoModal.jsx => new/widget/page/proposals/VisibilityInfoModal.jsx} (92%) rename apps/{old/widget/components/modals/propose => new/widget/page/proposals/create}/AddMember.jsx (94%) rename apps/{old/widget/components/modals/propose => new/widget/page/proposals/create}/FunctionCall.jsx (95%) rename apps/{old/widget/components/modals/CreateProposal.jsx => new/widget/page/proposals/create/Index.jsx} (88%) rename apps/{old/widget/components/modals/propose => new/widget/page/proposals/create}/RemoveMember.jsx (94%) rename apps/{old/widget/components/modals/propose => new/widget/page/proposals/create}/Text.jsx (91%) rename apps/{old/widget/components/modals/propose => new/widget/page/proposals/create}/Transfer.jsx (94%) diff --git a/apps/old/widget/fetch/daos.jsx b/apps/new/widget/lib/daos.jsx similarity index 100% rename from apps/old/widget/fetch/daos.jsx rename to apps/new/widget/lib/daos.jsx diff --git a/apps/new/widget/page/activity/Index.jsx b/apps/new/widget/page/activity/Index.jsx index cd761b47..510e4f21 100644 --- a/apps/new/widget/page/activity/Index.jsx +++ b/apps/new/widget/page/activity/Index.jsx @@ -140,7 +140,7 @@ const config = { }, }, proposals: { - path: "${alias_old}/widget/Proposals", + path: "${config_account}/widget/page.proposals.Index", blockHeight: "final", init: { feedName: "Proposals", diff --git a/apps/old/widget/components/ProposalCard.jsx b/apps/new/widget/page/proposals/Card.jsx similarity index 98% rename from apps/old/widget/components/ProposalCard.jsx rename to apps/new/widget/page/proposals/Card.jsx index e8b6b905..2e77a321 100644 --- a/apps/old/widget/components/ProposalCard.jsx +++ b/apps/new/widget/page/proposals/Card.jsx @@ -198,6 +198,7 @@ const cls = (c) => c.join(" "); const YouVotedBadge = () => { return (
Date.now() && (
@@ -356,6 +362,7 @@ function renderData({
@@ -681,10 +688,12 @@ function renderFooter({ totalVotes, votes, comments, daoId, proposal }) { const renderModal = (item, index) => { return ( diff --git a/apps/old/widget/components/modals/ProposalsFilters.jsx b/apps/new/widget/page/proposals/Filters.jsx similarity index 96% rename from apps/old/widget/components/modals/ProposalsFilters.jsx rename to apps/new/widget/page/proposals/Filters.jsx index 34cc8b5a..dd0b8289 100644 --- a/apps/old/widget/components/modals/ProposalsFilters.jsx +++ b/apps/new/widget/page/proposals/Filters.jsx @@ -1,4 +1,4 @@ -const { daos } = VM.require("${config_account}/widget/fetch.daos") || { +const { daos } = VM.require("${config_account}/widget/lib.daos") || { daos: [], }; @@ -7,7 +7,7 @@ if (!daos) { } const options = daos.map((dao) => dao.contract_id); -const { Modal, Button } = VM.require("${config_account}/widget/components") || { +const { Modal, Button } = VM.require("${alias_old}/widget/components") || { Modal: () => <>, Button: () => <>, }; @@ -177,6 +177,7 @@ return ( {proposalTypeOptions[key].map((item) => { return ( { return ( , Modal: <>, }; -const { Header } = VM.require("${config_account}/widget/components.Header") || { +const { Header } = VM.require("${alias_old}/widget/components.Header") || { Header: () => <>, }; const DaoSDK = VM.require("sdks.near/widget/SDKs.Sputnik.DaoSDK") || (() => {}); @@ -157,7 +157,8 @@ const handleVote = ({ action, proposalId, proposer, showNotification }) => { proposalId: proposalId, }, type: "custom", - widget: "${config_account}/widget/Proposals", + widget: + "${config_account}/widget/Index?page=activity&tab=proposals", }, }, ]), @@ -285,7 +286,8 @@ const proposalsComponent = useMemo(() => { return ( setShowModal(!showProposalModal), }} /> {}); -const { InputField } = VM.require("${config_account}/widget/components") || { +const { InputField } = VM.require("${alias_old}/widget/components") || { InputField: <>, }; @@ -24,7 +24,9 @@ const group = sdk.getGroupsAndMembers(); if (group === null || !group.length) { return; } -setGroupsAndMembers(group); +if (!groupsAndMembers.length) { + setGroupsAndMembers(group); +} const handleCheckboxChange = (role) => { setSelectedRoles((prevRoles) => { @@ -46,9 +48,11 @@ const ThemeContainer = props.ThemeContainer || styled.div` --primary-color: rgb(255, 175, 81); + --text-color: white; `; const Wrapper = styled.div` + color: var(--text-color) !important; .checked > span:first-child { background: var(--primary-color) !important; border-color: var(--primary-color) !important; @@ -64,6 +68,11 @@ const Wrapper = styled.div` label { font-size: 13px; + margin-bottom: 5px; + } + + .text { + color: var(--text-color) !important; } `; @@ -98,7 +107,8 @@ const createNotificationsData = () => { page: "proposal", }, type: "buildhub/custom", - widget: "${config_account}/widget/home", + widget: + "${config_account}/widget/Index?page=activity&tab=proposals", }, }; }), @@ -134,12 +144,13 @@ const groupList = useMemo(() => { return null; } return ( -
+
+
{capitalizeFirstLetter(group.name)} ({membersLength} members)
), @@ -159,13 +170,14 @@ return (
Send notification to following roles: (Optional)
- setMessage(e.target.value)} + rows="2" />
{groupList}
diff --git a/apps/old/widget/components/modals/propose/ProposalVisibilityInfoModal.jsx b/apps/new/widget/page/proposals/VisibilityInfoModal.jsx similarity index 92% rename from apps/old/widget/components/modals/propose/ProposalVisibilityInfoModal.jsx rename to apps/new/widget/page/proposals/VisibilityInfoModal.jsx index cd3dba02..9bd0e90c 100644 --- a/apps/old/widget/components/modals/propose/ProposalVisibilityInfoModal.jsx +++ b/apps/new/widget/page/proposals/VisibilityInfoModal.jsx @@ -1,7 +1,7 @@ -const { Button } = VM.require("${config_account}/widget/components") || { +const { Button } = VM.require("${alias_old}/widget/components") || { Button: () => <>, }; -const { Modal } = VM.require("${config_account}/widget/components.Modal") || { +const { Modal } = VM.require("${alias_old}/widget/components.Modal") || { Modal: () => <>, }; @@ -79,7 +79,7 @@ const Content = styled.div` padding: 0 20px; `; const url = - "${alias_gateway_url}/${config_account}/widget/app?page=feed&tab=proposals"; + "${alias_gateway_url}/${config_account}/widget/Index?page=feed&tab=proposals"; const ProposalVisibilityInfoModal = ({ open, setInfoModalActive, sdkCall }) => { const handleCopy = () => { clipboard diff --git a/apps/old/widget/components/modals/propose/AddMember.jsx b/apps/new/widget/page/proposals/create/AddMember.jsx similarity index 94% rename from apps/old/widget/components/modals/propose/AddMember.jsx rename to apps/new/widget/page/proposals/create/AddMember.jsx index 31acf6a6..c5a02024 100644 --- a/apps/old/widget/components/modals/propose/AddMember.jsx +++ b/apps/new/widget/page/proposals/create/AddMember.jsx @@ -1,8 +1,8 @@ -const { Button } = VM.require("${config_account}/widget/components") || { +const { Button } = VM.require("${alias_old}/widget/components") || { Button: () => <>, }; const { ProposalVisibilityInfoModal } = VM.require( - "${config_account}/widget/components.modals.propose.ProposalVisibilityInfoModal", + "${config_account}/widget/page.proposals.VisibilityInfoModal", ) || { ProposalVisibilityInfoModal: () => <>, }; @@ -186,6 +186,22 @@ const sdkCall = () => { }); }; +const NotificationSelector = useMemo(() => { + return ( + { + setNotificationData(v); + }, + proposalType: "Add Member", + }} + /> + ); +}, [selectedDAO]); + return (
@@ -233,6 +249,7 @@ return ( key={memoizedKey} >
- { - setNotificationData(v); - }, - proposalType: "Add Member", - }} - /> + {NotificationSelector}