Merge pull request #531 from near/develop

Weekly promotion of develop to main - early release
near · Nov 15, 2023 · 53a3bea · 53a3bea
2 parents c4afdf2 + 6333ec4
commit 53a3bea
Show file tree

Hide file tree

Showing 11 changed files with 80 additions and 129 deletions.
diff --git a/src/AccountProfileOverlay.jsx b/src/AccountProfileOverlay.jsx
@@ -8,16 +8,17 @@ const verifications = props.verifications;
 const overlayStyles = props.overlayStyles;
 const side = props.side ?? "top";
 
-State.init({
-  hasBeenFlagged: false,
-  showConfirmModal: false,
-});
+const [hasBeenFlagged, setHasBeenFlagged] = useState(false);
+const [showConfirmModal, setShowConfirmModal] = useState(false);
 
 const onReport = () => {
-  State.update({
-    showConfirmModal: false,
-    hasBeenFlagged: true,
-  });
+  setShowConfirmModal(false);
+  setHasBeenFlagged(true);
+};
+
+const onReportCancel = () => {
+  setShowConfirmModal(false);
+  setHasBeenFlagged(false);
 };
 
 const Wrapper = styled.span`
@@ -142,7 +143,7 @@ const overlay = (
               props={{
                 item: contentModerationItem,
                 onFlag: () => {
-                  State.update({ hasBeenFlagged: true });
+                  setHasBeenFlagged(true);
                 },
               }}
             />
@@ -154,7 +155,7 @@ const overlay = (
               src="${REPL_ACCOUNT}/widget/Flagged.Trigger"
               props={{
                 onClick: () => {
-                  State.update({ showConfirmModal: true });
+                  setShowConfirmModal(true);
                 },
               }}
             />
@@ -336,9 +337,9 @@ return (
           title: "Flagged for moderation",
           description:
             "Thanks for helping our Content Moderators. The item you flagged will be reviewed.",
-          open: state.hasBeenFlagged,
+          open: hasBeenFlagged,
           onOpenChange: () => {
-            State.update({ hasBeenFlagged: false });
+            setHasBeenFlagged(false);
           },
           duration: 5000,
         }}
@@ -347,11 +348,11 @@ return (
       <Widget
         src="${REPL_ACCOUNT}/widget/Flagged.Modal"
         props={{
-          open: state.showConfirmModal,
-          onOpenChange: handleModalClose,
+          open: showConfirmModal,
           reportedAccountId: props.accountId,
           contentModerationFlagValue: contentModerationItem,
           onReport,
+          onReportCancel,
         }}
       />
     </FlaggedWrapper>

diff --git a/src/DIG/Button.jsx b/src/DIG/Button.jsx
@@ -13,6 +13,12 @@ let {
   ...forwardedProps
 } = props;
 
+if (forwardedProps.as) {
+  throw new Error(
+    'Invalid prop "as" passed to DIG.Button. If you need to render an anchor instead of a button, simply pass a "href" prop.'
+  );
+}
+
 fill = fill ?? "solid";
 size = size ?? "default";
 type = type ?? "button";

diff --git a/src/DIG/Dialog.jsx b/src/DIG/Dialog.jsx
@@ -38,7 +38,7 @@ const Overlay = styled(`${variant}.Overlay`)`
   position: fixed;
   inset: 0;
   animation: overlayShow 150ms cubic-bezier(0.16, 1, 0.3, 1);
-  z-index: 10000;
+  z-index: 1049;
 
   @keyframes overlayShow {
     from {
@@ -63,7 +63,7 @@ const Content = styled(`${variant}.Content`)`
   max-height: 85vh;
   padding: 24px;
   animation: contentShow 150ms cubic-bezier(0.16, 1, 0.3, 1);
-  z-index: 10005;
+  z-index: 1054;
   outline: none;
 
   @keyframes contentShow {
@@ -161,6 +161,8 @@ confirmButton = confirmButton ?? (
   />
 );
 
+if (!forwardedProps?.open) return <></>;
+
 return (
   <Root {...forwardedProps}>
     {trigger && (

diff --git a/src/Flagged/Modal.jsx b/src/Flagged/Modal.jsx
@@ -1,5 +1,6 @@
 let {
   onReport,
+  onReportCancel,
   reportedAccountId,
   contentModerationFlagValue,
   ...forwardedProps
@@ -10,7 +11,7 @@ const socialSet = (index) =>
     onCommit: () => {
       onReport && onReport();
     },
-    onCancel: () => onOpenChange(false),
+    onCancel: () => { onReportCancel && onReportCancel() },
   });
 
 const reportAccount = () => {
@@ -41,6 +42,8 @@ const reportAccountWithPosts = () => {
   });
 };
 
+if (!forwardedProps.open) return <></>;
+
 return (
   <Widget
     src="${REPL_ACCOUNT}/widget/DIG.Dialog"
@@ -53,6 +56,7 @@ return (
       onCancel: reportAccount,
       onConfirm: reportAccountWithPosts,
       enableCloseButton: true,
+      onOpenChange: onReportCancel,
     }}
   />
 );
diff --git a/src/Moderation/CheckPostModeration.jsx b/src/Moderation/CheckPostModeration.jsx
@@ -207,11 +207,14 @@ State.init({
 });
 
 const selfModerationData = context.accountId
-  ? Social.getr(`${context.accountId}/moderate`, "optimistic") ?? false
+  ? Social.getr(`${context.accountId}/moderate`, "optimistic")
   : [];
 State.update({ selfModerationData });
 
-if (state.selfModerationData && state.loadingState === "none") {
+if (
+  (selfModerationData || typeof selfModerationData === "undefined") &&
+  state.loadingState === "none"
+) {
   State.update({
     loadingState: "loading",
   });

diff --git a/src/NearOrg/Ecosystem/CommunityPage.jsx b/src/NearOrg/Ecosystem/CommunityPage.jsx
@@ -295,7 +295,6 @@ return (
                       variant: "primary",
                       fill: "outline",
                       size: "large",
-                      as: "a",
                       target: "_blank",
                     }}
                   />
@@ -377,7 +376,6 @@ return (
                     variant: "primary",
                     fill: "outline",
                     size: "small",
-                    as: "a",
                     target: "_blank",
                   }}
                 />
@@ -417,7 +415,6 @@ return (
                     variant: "primary",
                     fill: "outline",
                     size: "small",
-                    as: "a",
                     target: "_blank",
                   }}
                 />
@@ -449,7 +446,6 @@ return (
                           variant: "primary",
                           fill: "outline",
                           size: "small",
-                          as: "a",
                           target: "_blank",
                         }}
                       />

diff --git a/src/NearOrg/Ecosystem/GetFundingPage.jsx b/src/NearOrg/Ecosystem/GetFundingPage.jsx
@@ -406,7 +406,6 @@ return (
                               variant: "primary",
                               fill: "outline",
                               size: "small",
-                              as: "a",
                               target: "_blank",
                             }}
                           />

diff --git a/src/NearOrg/Ecosystem/OverviewPage.jsx b/src/NearOrg/Ecosystem/OverviewPage.jsx
@@ -531,7 +531,6 @@ return (
               label: "Visit AwesomeNEAR",
               variant: "affirmative",
               size: "large",
-              as: "a",
               target: "_blank",
             }}
           />
@@ -582,7 +581,6 @@ return (
                   variant: "primary",
                   fill: "outline",
                   size: "large",
-                  as: "a",
                   target: "_blank",
                 }}
               />
@@ -615,7 +613,6 @@ return (
                   variant: "primary",
                   fill: "outline",
                   size: "large",
-                  as: "a",
                   target: "_blank",
                 }}
               />
@@ -648,7 +645,6 @@ return (
                   variant: "primary",
                   fill: "outline",
                   size: "large",
-                  as: "a",
                   target: "_blank",
                 }}
               />
@@ -689,7 +685,6 @@ return (
                     variant: "primary",
                     fill: "outline",
                     size: "large",
-                    as: "a",
                     target: "_blank",
                   }}
                 />
@@ -705,7 +700,6 @@ return (
                 label: "Browse DAOs on AstroDAO",
                 variant: "affirmative",
                 size: "large",
-                as: "a",
                 target: "_blank",
               }}
             />
@@ -756,7 +750,6 @@ return (
                   label: "Create a new DAO",
                   variant: "affirmative",
                   size: "large",
-                  as: "a",
                   target: "_blank",
                 }}
               />
@@ -878,7 +871,6 @@ return (
                       label: "Browse Governance Forum",
                       variant: "affirmative",
                       size: "large",
-                      as: "a",
                       target: "_blank",
                     }}
                   />
@@ -928,7 +920,6 @@ return (
                       label: "Read on Medium",
                       variant: "destructive",
                       size: "large",
-                      as: "a",
                       target: "_blank",
                     }}
                   />
@@ -1132,7 +1123,6 @@ return (
                     variant: "primary",
                     fill: "outline",
                     size: "large",
-                    as: "a",
                     target: "_blank",
                   }}
                 />
@@ -1177,7 +1167,6 @@ return (
                     variant: "primary",
                     fill: "outline",
                     size: "large",
-                    as: "a",
                     target: "_blank",
                   }}
                 />
@@ -1249,7 +1238,6 @@ return (
                   variant: "primary",
                   fill: "outline",
                   size: "large",
-                  as: "a",
                   target: "_blank",
                 }}
               />
@@ -1303,7 +1291,6 @@ return (
                         variant: "primary",
                         fill: "outline",
                         size: "large",
-                        as: "a",
                         target: "_blank",
                       }}
                     />
@@ -1379,7 +1366,6 @@ return (
                       variant: "primary",
                       fill: "outline",
                       size: "large",
-                      as: "a",
                       target: "_blank",
                     }}
                   />
@@ -1401,7 +1387,6 @@ return (
                       variant: "primary",
                       fill: "outline",
                       size: "large",
-                      as: "a",
                       target: "_blank",
                     }}
                   />
@@ -1417,7 +1402,6 @@ return (
                     variant: "primary",
                     fill: "outline",
                     size: "large",
-                    as: "a",
                     target: "_blank",
                   }}
                 />
@@ -1504,7 +1488,6 @@ return (
                 variant: "primary",
                 fill: "outline",
                 size: "large",
-                as: "a",
                 target: "_blank",
               }}
             />
@@ -1532,7 +1515,6 @@ return (
                 variant: "primary",
                 fill: "outline",
                 size: "large",
-                as: "a",
                 target: "_blank",
               }}
             />
@@ -1583,7 +1565,6 @@ return (
                   variant: "primary",
                   fill: "outline",
                   size: "large",
-                  as: "a",
                   target: "_blank",
                 }}
               />
@@ -1629,7 +1610,6 @@ return (
                       variant: "primary",
                       fill: "outline",
                       size: "large",
-                      as: "a",
                       target: "_blank",
                     }}
                   />
@@ -1686,7 +1666,6 @@ return (
                   variant: "primary",
                   fill: "outline",
                   size: "large",
-                  as: "a",
                   target: "_blank",
                 }}
               />
@@ -1732,7 +1711,6 @@ return (
                   variant: "primary",
                   fill: "outline",
                   size: "large",
-                  as: "a",
                   target: "_blank",
                 }}
               />
@@ -1804,7 +1782,6 @@ return (
                       variant: "primary",
                       fill: "outline",
                       size: "large",
-                      as: "a",
                       target: "_blank",
                     }}
                   />