e2e: make tests green again.

package.json

@@ -58,7 +58,7 @@
     "test": "react-app-rewired test --env=jsdom",
     "up": "docker-compose up --abort-on-container-exit --exit-code-from e2e",
     "cy:run": "cd teste2e && npm install && cypress run",
-    "cy:open": "cd teste2e && cypress open",
+    "cy:open": "cd teste2e && npm install && cypress open",
     "test:e2e:run": "START_SERVER_AND_TEST_INSECURE=1 start-server-and-test start https-get://localhost:3000 cy:run",
     "test:e2e:browser": "START_SERVER_AND_TEST_INSECURE=1 start-server-and-test start https-get://localhost:3000 cy:open",
     "eject": "react-app-rewired eject",

src/actions/api.js

@@ -838,9 +838,7 @@ export const onSubmitProposal = (
     return Promise.resolve(
       api.makeProposal(name, description, rfpDeadline, type, rfpLink, files)
     )
-      .then((proposal) => {
-        return api.signRegister(userid, proposal);
-      })
+      .then((proposal) => api.signRegister(userid, proposal))
       .then((proposal) => api.newProposal(csrf, proposal))
       .then(({ record }) => {
         dispatch(

src/components/ModalConfirm.jsx

@@ -55,10 +55,10 @@ const ModalConfirm = ({
       onClose={success && onCloseSuccess ? onCloseSuccess : onClose}
       iconComponent={
         !success ? (
-          <Icon type={"info"} size={26} />
+          <Icon type="info" size={26} />
         ) : (
           <Icon
-            type={"checkmark"}
+            type="checkmark"
             iconColor={iconCheckmarkColor}
             backgroundColor={successIconBgColor}
             size={26}

src/components/ModalConfirmWithReason.jsx

@@ -20,7 +20,8 @@ const ModalConfirmWithReason = ({
   title,
   reasonLabel,
   successMessage,
-  successTitle
+  successTitle,
+  onCloseSuccess
 }) => {
   const [success, setSuccess] = useState(false);
 
@@ -58,7 +59,7 @@ const ModalConfirmWithReason = ({
       style={{ width: "600px" }}
       title={(success && successTitle) || title}
       show={show}
-      onClose={onClose}
+      onClose={success && onCloseSuccess ? onCloseSuccess : onClose}
       iconComponent={
         !success ? (
           <Icon type={"info"} size={26} />
@@ -128,7 +129,9 @@ const ModalConfirmWithReason = ({
         <>
           {successMessage}
           <div className="justify-right margin-top-m">
-            <Button data-testid="reason-confirm-success" onClick={onClose}>
+            <Button
+              data-testid="reason-confirm-success"
+              onClick={onCloseSuccess || onClose}>
               Ok
             </Button>
           </div>

src/containers/Proposal/Actions/PublicActionsProvider.jsx

@@ -1,4 +1,5 @@
 import React, { useCallback } from "react";
+import { withRouter } from "react-router-dom";
 import { Text } from "pi-ui";
 import Link from "src/components/Link";
 import { PublicProposalsActionsContext, usePublicActions } from "./hooks";
@@ -17,7 +18,7 @@ import {
   PROPOSAL_STATE_VETTED
 } from "src/constants";
 
-const PublicActionsProvider = ({ children }) => {
+const PublicActionsProvider = ({ children, history }) => {
   const {
     onCensorProposal,
     onAbandonProposal,
@@ -31,6 +32,10 @@ const PublicActionsProvider = ({ children }) => {
 
   const handleOpenAbandonModal = useCallback(
     (proposal) => {
+      const handleCloseSuccess = () => {
+        handleCloseModal();
+        history.push(`/record/${proposal.censorshiprecord.token}`);
+      };
       handleOpenModal(ModalConfirmWithReason, {
         title: `Abandon - ${proposal.name}`,
         reasonLabel: "Abandon reason",
@@ -43,10 +48,11 @@ const PublicActionsProvider = ({ children }) => {
             under the <Link to="/?tab=abandoned">Abandoned</Link> tab.
           </Text>
         ),
-        onClose: handleCloseModal
+        onClose: handleCloseModal,
+        onCloseSuccess: handleCloseSuccess
       });
     },
-    [handleCloseModal, handleOpenModal, onAbandonProposal]
+    [handleCloseModal, handleOpenModal, onAbandonProposal, history]
   );
 
   const handleOpenAuthorizeVoteModal = useCallback(
@@ -166,9 +172,8 @@ const PublicActionsProvider = ({ children }) => {
       successMessage: (
         <Text>
           The proposal has been successfully censored! Now it will appear under
-          under{" "}
-          <Link to={"/admin/records?tab=unvetted censored"}>Censored</Link> tab
-          among Admin Proposals.
+          under <Link to="/admin/records?tab=unvetted censored">Censored</Link>{" "}
+          tab among Admin Proposals.
         </Text>
       ),
       onClose: handleCloseModal
@@ -190,4 +195,4 @@ const PublicActionsProvider = ({ children }) => {
   );
 };
 
-export default PublicActionsProvider;
+export default withRouter(PublicActionsProvider);

src/containers/Proposal/Actions/UnvettedActionsProvider.jsx

@@ -13,8 +13,9 @@ const UnvettedActionsProvider = ({ children, history }) => {
   const [handleOpenModal, handleCloseModal] = useModalContext();
 
   const handleOpenCensorModal = (proposal) => {
-    const handleClose = () => {
+    const handleCloseSuccess = () => {
       handleCloseModal();
+      history.push(`/record/${proposal.censorshiprecord.token}`);
     };
     handleOpenModal(ModalConfirmWithReason, {
       title: `Censor proposal - ${proposal.name}`,
@@ -25,19 +26,16 @@ const UnvettedActionsProvider = ({ children, history }) => {
       successMessage: (
         <Text>
           The proposal has been successfully censored! Now it will appear under
-          under{" "}
-          <Link to={"/admin/records?tab=unvetted censored"}>Censored</Link> tab
-          among Admin Proposals.
+          under <Link to="/admin/records?tab=unvetted censored">Censored</Link>{" "}
+          tab among Admin Proposals.
         </Text>
       ),
-      onClose: handleClose
+      onClose: handleCloseModal,
+      onCloseSuccess: handleCloseSuccess
     });
   };
 
   const handleOpenApproveModal = (proposal) => {
-    const handleClose = () => {
-      handleCloseModal();
-    };
     const handleCloseSuccess = () => {
       handleCloseModal();
       history.push(`/record/${proposal.censorshiprecord.token}`);
@@ -50,11 +48,11 @@ const UnvettedActionsProvider = ({ children, history }) => {
       successMessage: (
         <Text>
           The proposal has been successfully approved! Now it will appear under{" "}
-          <Link to={"/?tab=in%20discussion"}>In discussion</Link> tab among
-          Public Proposals.
+          <Link to="/?tab=in%20discussion">In discussion</Link> tab among Public
+          Proposals.
         </Text>
       ),
-      onClose: handleClose,
+      onClose: handleCloseModal,
       onCloseSuccess: handleCloseSuccess
     });
   };

src/lib/api.js

@@ -86,36 +86,34 @@ export const makeProposal = (
   type,
   linkto = 0,
   attachments = []
-) => {
-  return {
-    files: [
-      convertMarkdownToFile(markdown),
-      {
-        //proposal metadata file
-        name: PROPOSAL_METADATA_FILENAME,
-        mime: "text/plain; charset=utf-8",
-        digest: objectToSHA256({ name }),
-        payload: bufferToBase64String(objectToBuffer({ name }))
-      },
-      ...(linkby || linkto
-        ? [
-            {
-              name: VOTE_METADATA_FILENAME,
-              mime: "text/plain; charset=utf-8",
-              digest: objectToSHA256({ linkto, linkby }),
-              payload: bufferToBase64String(objectToBuffer({ linkto, linkby }))
-            }
-          ]
-        : []),
-      ...(attachments || [])
-    ].map(({ name, mime, payload, digest }) => ({
-      name,
-      mime,
-      payload,
-      digest: digest ? digest : digestPayload(payload)
-    }))
-  };
-};
+) => ({
+  files: [
+    convertMarkdownToFile(markdown),
+    {
+      // Proposal metadata file
+      name: PROPOSAL_METADATA_FILENAME,
+      mime: "text/plain; charset=utf-8",
+      digest: objectToSHA256({ name }),
+      payload: bufferToBase64String(objectToBuffer({ name }))
+    },
+    ...(linkby || linkto
+      ? [
+          {
+            name: VOTE_METADATA_FILENAME,
+            mime: "text/plain; charset=utf-8",
+            digest: objectToSHA256({ linkto, linkby }),
+            payload: bufferToBase64String(objectToBuffer({ linkto, linkby }))
+          }
+        ]
+      : []),
+    ...(attachments || [])
+  ].map(({ name, mime, payload, digest }) => ({
+    name,
+    mime,
+    payload,
+    digest: digest ? digest : digestPayload(payload)
+  }))
+});
 
 export const makeInvoice = (
   month,

src/reducers/models/credits.js

@@ -19,7 +19,7 @@ const credits = (state = DEFAULT_STATE, action) =>
             })(state),
           [act.RECEIVE_RESCAN_USER_PAYMENTS]: () => {
             const userid = action.payload.userid;
-            const newcredits = action.payload.newcredits;
+            const newcredits = action.payload.newcredits || [];
             const unspent = state.byUserID[userid]
               ? [...state.byUserID[userid].unspent, ...newcredits]
               : [...newcredits];

teste2e/cypress/e2e/adminComments.js

@@ -12,18 +12,18 @@ describe("User admin comments", () => {
     const proposal = buildProposal();
     cy.login(user);
     cy.identity();
-    cy.createProposal(proposal).then((res) => {
-      cy.approveProposal(res.body.censorshiprecord);
-      cy.visit(`proposals/${res.body.censorshiprecord.token.substring(0, 7)}`);
+    cy.createProposal(proposal).then(({ body: { record } }) => {
+      cy.approveProposal(record.censorshiprecord);
+      cy.visit(`record/${record.censorshiprecord.token.substring(0, 7)}`);
       cy.findByText(/waiting for author/i).should("exist");
       const { text } = buildComment();
       cy.findByTestId(/text-area/i).type(text);
-      cy.route("POST", "/api/v1/comments/new").as("newComment");
+      cy.route("POST", "/api/comments/v1/new").as("newComment");
       cy.findByText(/add comment/i).click();
       cy.wait("@newComment");
       cy.findByText(/censor/i).click();
       cy.findByLabelText(/censor reason/i).type("censor");
-      cy.route("POST", "/api/v1/comments/censor").as("confirm");
+      cy.route("POST", "/api/comments/v1/del").as("confirm");
       cy.findByText(/confirm/i).click();
       cy.wait("@confirm");
       cy.findByText(/ok/i).click();