Merge branch 'main' into develop

NEARBuilders · Mar 22, 2024 · f2b8dba · f2b8dba
2 parents 21d5a5d + ab57343
commit f2b8dba
Show file tree

Hide file tree

Showing 9 changed files with 687 additions and 427 deletions.
diff --git a/apps/builddao/widget/Profile.jsx b/apps/builddao/widget/Profile.jsx
@@ -5,9 +5,6 @@ if (!accountId) {
 }
 
 const profile = Social.getr(`${accountId}/profile`);
-if (!profile) {
-  return "";
-}
 
 const ProfileContainer = styled.div`
   display: grid;

diff --git a/apps/builddao/widget/Resources.jsx b/apps/builddao/widget/Resources.jsx
@@ -2,19 +2,43 @@ const { Header } = VM.require("buildhub.near/widget/components.Header") || {
   Header: () => <></>,
 };
 
+const { Post } = VM.require("buildhub.near/widget/components") || {
+  Post: () => <></>,
+};
+
 const { MarkdownView } = VM.require("buildhub.near/widget/md-view") || {
   MarkdownView: () => <></>,
 };
 
 const mdPath = props.mdPath;
+const postAccountId = props.postAccountId;
+
+if (mdPath && !postAccountId) {
+  return (
+    <div>
+      <Header>{props.name}</Header>
+      <MarkdownView path={mdPath} />
+    </div>
+  );
+}
+
+if (!mdPath && postAccountId) {
+  return (
+    <div>
+      <Header>{props.name}</Header>
 
-if (!mdPath) {
-  return <p>No Markdown path configured</p>;
+      <Post
+        accountId={postAccountId}
+        blockHeight={props.postBlockHeight}
+        noBorder={true}
+      />
+    </div>
+  );
 }
 
 return (
   <div>
     <Header>{props.name}</Header>
-    <MarkdownView path={mdPath} />
+    <p>No mdPath or post accountId configured</p>
   </div>
 );
diff --git a/apps/builddao/widget/app.jsx b/apps/builddao/widget/app.jsx
@@ -208,6 +208,7 @@ const Root = styled.div`
   /* Typeahead Fix */
   .rbt-token-removeable {
     background: #007bff;
+    color: #fff;
   }
 `;