Merge pull request #292 from DAOmasons/rtEditorFix

Rt editor fix
DAOmasons · Aug 8, 2024 · 8034177 · 8034177
2 parents ef8e853 + a68a736
commit 8034177
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 18 deletions.
diff --git a/src/.graphclient/index.ts b/src/.graphclient/index.ts
@@ -10253,7 +10253,7 @@ export type GetProjectsQuery = { Project: Array<(
   )> };
 
 export type GetUserProjectsQueryVariables = Exact<{
-  id: Scalars['String'];
+  chainId: Scalars['String'];
 }>;
 
 
@@ -10889,10 +10889,10 @@ export const GetProjectsDocument = gql`
     ${ProjectDetailsFragmentDoc}
 ${RawMetadataFragmentDoc}` as unknown as DocumentNode<GetProjectsQuery, GetProjectsQueryVariables>;
 export const GetUserProjectsDocument = gql`
-    query GetUserProjects($id: String!) {
+    query GetUserProjects($chainId: String!) {
   Project(
     order_by: {db_write_timestamp: desc, hasEditedProfile: desc_nulls_last}
-    where: {owner: {_eq: $id}}
+    where: {owner: {_eq: $chainId}}
   ) {
     ...ProjectDetails
     metadata {

diff --git a/src/components/RTEditor.tsx b/src/components/RTEditor.tsx
@@ -35,9 +35,9 @@ export const RTEditor = ({
 
   return (
     <RichTextEditor
-      ref={editorContainerRef}
       editor={editor}
-      h={editorHeight}
+      mih={editorHeight}
+      ref={editorContainerRef}
       bg={'transparent'}
       classNames={{ root: classes.editor }}
     >
@@ -65,7 +65,8 @@ export const RTEditor = ({
         p="lg"
         fz="md"
         bg={'transparent'}
-        mih={editorHeight}
+        // mih={editorHeight}
+        // h="100%"
         onClick={handleContentEditorFocus}
       />
     </RichTextEditor>

diff --git a/src/components/feed/RichTextUpdate.tsx b/src/components/feed/RichTextUpdate.tsx
@@ -50,7 +50,7 @@ export const RichTextUpdate = () => {
     isLoading,
     error,
   } = useQuery({
-    queryKey: ['post', id],
+    queryKey: ['post', id, chainId],
     queryFn: () => getRTUpdate(id as string, chainId),
     enabled: !!id,
   });

diff --git a/src/components/grant/AllocationComplete.tsx b/src/components/grant/AllocationComplete.tsx
@@ -1,7 +1,7 @@
 import { formatEther } from 'viem';
 import { useGrant } from '../../hooks/useGrant';
 import { InsetUpdate } from './InsetUpdate';
-import { IconLock, IconShieldHalf } from '@tabler/icons-react';
+import { IconShieldHalf } from '@tabler/icons-react';
 import { Text } from '@mantine/core';
 import { Bold } from '../Typography';
 import { GAME_TOKEN } from '../../constants/gameSetup';

diff --git a/src/components/grant/GrantCard.tsx b/src/components/grant/GrantCard.tsx
@@ -106,7 +106,7 @@ const GrantStatusIndicator = ({
   if (status === GrantStatus.ApplicationSubmitted) {
     return (
       <StatusIndicator
-        text="Application Started"
+        text="Application Submitted"
         icon={<IconFileDescription size={16} />}
       />
     );
@@ -122,7 +122,7 @@ const GrantStatusIndicator = ({
   if (status === GrantStatus.ApplicationApproved) {
     return (
       <StatusIndicator
-        text="Application Not Approved"
+        text="Application Approved"
         icon={<IconFileCheck size={16} />}
       />
     );

diff --git a/src/components/grant/MilestonesDrawer.tsx b/src/components/grant/MilestonesDrawer.tsx
@@ -113,8 +113,6 @@ export const MilestonesDrawer = ({
     });
   };
 
-  console.log('formData', formData);
-
   const handlePostMilestones = async () => {
     setIsLoading(true);
 

diff --git a/src/contexts/GlobalState.tsx b/src/contexts/GlobalState.tsx
@@ -47,7 +47,7 @@ export const GlobalStateProvider = ({
     error: userStateError,
     refetch: refetchUserState,
   } = useQuery({
-    queryKey: [`user-state-${address}`],
+    queryKey: [`user-state-${address}`, chainId],
     queryFn: () => getUserData(address as string, chainId),
     enabled: !!address,
   });

diff --git a/src/graphql/newQueries/getProjects.graphql b/src/graphql/newQueries/getProjects.graphql
@@ -24,10 +24,10 @@ query GetProjects($chainId: Int!) {
   }
 }
 
-query GetUserProjects($id: String!) {
+query GetUserProjects($chainId: String!) {
   Project(
     order_by: { db_write_timestamp: desc, hasEditedProfile: desc_nulls_last }
-    where: { owner: { _eq: $id } }
+    where: { owner: { _eq: $chainId } }
   ) {
     ...ProjectDetails
     metadata {

diff --git a/src/pages/MyProjects.tsx b/src/pages/MyProjects.tsx
@@ -43,7 +43,6 @@ const getUserProjects = async (projects: ProjectCardFromQuery[]) => {
 };
 
 export const MyProjects = () => {
-  const chainId = useChainId();
   const { id } = useParams();
   const theme = useMantineTheme();
 

diff --git a/src/pages/Projects.tsx b/src/pages/Projects.tsx
@@ -16,7 +16,7 @@ export const Projects = () => {
   const chainId = useChainId();
 
   const { data, isLoading, error } = useQuery({
-    queryKey: ['projects'],
+    queryKey: ['projects', chainId],
     queryFn: () => getProjectCards({ chainId }),
     enabled: !!chainId,
   });

diff --git a/src/queries/getProjectCards.ts b/src/queries/getProjectCards.ts
@@ -40,7 +40,6 @@ const projectMetadataResolver = async (project: ProjectCardFromQuery) => {
 export const getProjectCards = async ({ chainId }: { chainId: number }) => {
   try {
     const { GetProjects } = getBuiltGraphSDK();
-
     const result = await GetProjects({ chainId });
 
     const filteredProjects = result.Project?.filter(