diff --git a/src/__tests__/components/CommentsSection.test.js b/src/__tests__/components/CommentsSection.test.js
new file mode 100644
index 000000000..c1cab688c
--- /dev/null
+++ b/src/__tests__/components/CommentsSection.test.js
@@ -0,0 +1,191 @@
+import React from "react";
+import {render,fireEvent,waitFor } from "@testing-library/react-native";
+import { CommentsSection } from "../../components/ChartCard/ChatComments/CommentsSection";
+import userLevelStore from "../../store/userLevel";
+import { Role } from "../../utility/enums";
+
+
+jest.mock("@react-native-firebase/firestore", () => {
+    return jest.fn();
+  });
+
+  jest.mock('@react-native-firebase/storage', () => {
+    return {
+      ref: jest.fn(() => ({
+        getDownloadURL: jest.fn(),
+        putFile: jest.fn(),
+      })),
+    };
+  });
+  
+  jest.mock("@react-native-firebase/crashlytics", () => () => ({
+    crashlytics: jest.fn(),
+  }));
+
+  jest.mock("../../context/SuperAdminContext", () => ({
+    useSuperAdminFunction: () => ({
+      setGetAllUsers: jest.fn(),
+      userLevel: jest.fn(),
+    }),
+  }));
+
+const mockAddComment = jest.fn();
+const mockDeleteComment = jest.fn();
+
+const superAdmin = () => {
+    userLevelStore.setUserLevel(Role.superadmin);
+  };
+
+  const user = () => {
+    userLevelStore.setUserLevel(Role.user);
+  };
+
+const loggedInUser = {
+    id: "user1", 
+    activitiesAndAccumulatedTime: [],
+    connectedActivities: [],
+    firstName: "Erik",
+    lastName: "Andersson",
+    statusActive: true 
+  };
+  const anotherUser = {
+    id: "user4",
+    activitiesAndAccumulatedTime: [],
+    connectedActivities: [],
+    firstName: "Alex",
+    lastName: "Johnson",
+    statusActive: true
+};
+  
+const comments = [
+    { comment: 'First comment', userID: 'user2', userFirstName: 'John', userLastName: 'Doe' },
+    { comment: 'Second comment', userID: 'user3', userFirstName: 'Jane', userLastName: 'Smith' },
+    { comment: 'Third comment', userID: 'user1', userFirstName: 'Erik', userLastName: 'Andersson' }
+  ]; 
+
+describe("Testing CommentsSection Component", () => {
+  user()
+    it('renders comments correctly', () => {
+        const { getByText } = render(
+          <CommentsSection
+            comments={comments}
+            addComment={mockAddComment}
+            deleteComment={mockDeleteComment}
+            loggedInUser={loggedInUser}
+            postID="post1"
+          />
+        );
+    
+        expect(getByText('John Doe')).toBeTruthy();
+        expect(getByText('First comment')).toBeTruthy();
+        expect(getByText('Jane Smith')).toBeTruthy();
+        expect(getByText('Second comment')).toBeTruthy();
+        expect(getByText('Erik Andersson')).toBeTruthy();
+        expect(getByText('Third comment')).toBeTruthy();
+      });
+
+      it('should add a comment', () => {
+        const { getByPlaceholderText, getByTestId} = render(
+          <CommentsSection
+          comments={comments}
+          addComment={mockAddComment}
+          deleteComment={mockDeleteComment}
+          loggedInUser={loggedInUser}
+          postID="post1"
+        />
+        );
+    
+        const input = getByPlaceholderText('Skriv en kommentar');
+        const submitButton = getByTestId('arrow-upward');
+    
+        fireEvent.changeText(input, 'New Comment');
+        fireEvent.press(submitButton);
+        expect(mockAddComment).toHaveBeenCalledWith({
+          comment: 'New Comment',
+          userID: loggedInUser.id,
+          userFirstName:loggedInUser.firstName,
+          userLastName: loggedInUser.lastName
+        });
+      });
+
+      it('shows delete option only for logged in user comment', () => {
+        user()
+        const { getByTestId,getByText} = render(
+          <CommentsSection
+          comments={comments}
+          addComment={mockAddComment}
+          deleteComment={mockDeleteComment}
+          loggedInUser={loggedInUser}
+          postID="post1"
+        />
+        );
+        const editMenu = getByTestId('chat-card-edit-menu');
+        expect(editMenu).toBeTruthy(); 
+      });  
+
+      it('Superadmin should see delete option for all comments', () => {
+        superAdmin();
+        const { getAllByTestId} = render(
+          <CommentsSection
+          comments={comments}
+          addComment={mockAddComment}
+          deleteComment={mockDeleteComment}
+          loggedInUser={loggedInUser}
+          postID="post1"
+        />
+        );
+        const editMenu = getAllByTestId('chat-card-edit-menu');
+        expect(editMenu).toHaveLength(3);          
+      });  
+      it('Delete option not visible for others comments', () => {
+        user(); 
+        const { queryByTestId } = render(
+          <CommentsSection
+            comments={comments}
+            addComment={mockAddComment}
+            deleteComment={mockDeleteComment}
+            loggedInUser={anotherUser}
+            postID="post1"
+          />
+        );
+        
+        const editMenu = queryByTestId('chat-card-edit-menu');
+        expect(editMenu).toBeFalsy(); 
+    });
+    it('Should delete comment when user who wrote it pressing delete', async () => {
+      user(); 
+      const { getByTestId, getByText,debug } = render(
+        <CommentsSection
+          comments={comments}
+          addComment={mockAddComment}
+          deleteComment={mockDeleteComment}
+          loggedInUser={loggedInUser}
+          postID="post1"
+        />
+      );
+    
+      const deleteMenu = getByTestId('chat-card-edit-menu');
+      fireEvent.press(deleteMenu);
+      const deleteButton = getByTestId("dropdown-overlay-ta bort");
+      fireEvent.press(deleteButton); 
+
+      // TODO: mock alert to test delet function 
+
+      // await waitFor(() => {
+      //   expect(mockAlert).toHaveBeenCalledWith(
+      //     '',
+      //     'Vill du ta bort den här kommentar?', 
+      //     // expect.any(Array)
+      //   );
+  
+      // expect(mockDeleteComment).toBeTruthy();
+    //   expect(mockDeleteComment).toHaveBeenCalledWith({
+    //     comment: 'Third comment',
+    //     userID: loggedInUser.id, 
+    //     userFirstName: loggedInUser.firstName,
+    //     userLastName: loggedInUser.lastName,
+    //   }, 'post1');
+    //  });  
+  }); 
+    
+});
diff --git a/src/components/ChartCard/EmojiList.tsx b/src/components/ChartCard/EmojiList.tsx
index 3efd50a2a..3600f1c14 100644
--- a/src/components/ChartCard/EmojiList.tsx
+++ b/src/components/ChartCard/EmojiList.tsx
@@ -82,8 +82,9 @@ const styles = StyleSheet.create({
       },
       modalContainer: {
         flex: 1,
-        justifyContent: "center",
-        alignItems: "center",
+        justifyContent: 'center',
+        alignItems: 'center',
+        marginTop: "60%", 
       },
       modalContent: {
         backgroundColor:colors.background,
diff --git a/src/screens/Chat/ChatCardScreen/ChatCardScreen.tsx b/src/screens/Chat/ChatCardScreen/ChatCardScreen.tsx
index a253b0bcf..0a1c7e3ff 100644
--- a/src/screens/Chat/ChatCardScreen/ChatCardScreen.tsx
+++ b/src/screens/Chat/ChatCardScreen/ChatCardScreen.tsx
@@ -68,7 +68,7 @@ export const ChatCardScreen = ({route,navigation}:Props) => {
             <View style={styles.postDetails}>
               <Text style={styles.username}>{post.userFirstName} {post.userLastName}</Text>
               <ChatCardDate date={post.date} />
-              <Text style={styles.changedText}>ändrats</Text>
+              {post.changed && <Text style={styles.changedText}>ändrats</Text>}
             </View>
           )}
           <View style={styles.emojiDetails}>
@@ -125,6 +125,7 @@ const styles = StyleSheet.create({
     marginBottom:20
   },
   changedText:{
-    ...typography.b2
+    ...typography.b2,
+    color: colors.secondary
   }  
 });
diff --git a/src/screens/Chat/ChatCardScreen/ChatCardWithActivity.tsx b/src/screens/Chat/ChatCardScreen/ChatCardWithActivity.tsx
index 7af9a8cd5..1310fc364 100644
--- a/src/screens/Chat/ChatCardScreen/ChatCardWithActivity.tsx
+++ b/src/screens/Chat/ChatCardScreen/ChatCardWithActivity.tsx
@@ -37,6 +37,7 @@ const styles = StyleSheet.create({
       changedText:{
         ...typography.b2,
         textAlign:'right',
+        color: colors.secondary
       }
   });
   
\ No newline at end of file
diff --git a/src/screens/Chat/useUserPostsActions.tsx b/src/screens/Chat/useUserPostsActions.tsx
index 270a1dc1b..7f9c34812 100644
--- a/src/screens/Chat/useUserPostsActions.tsx
+++ b/src/screens/Chat/useUserPostsActions.tsx
@@ -14,9 +14,10 @@ import { AlertQuestion } from "../../components/Alerts/AlertQuestion ";
 import { updatePostInFirestore } from "../../firebase-functions/updateTS/update";
 
 const alertMessage =
-  "Vill du publicera det här inlägget i chatten? Alla DGGG-användare kommer att se detta inlägg.\n\
-  Den här inlägg raderas automatiskt efter ett år.";
-  const alertUpdateMessage= "Vill du spara ändringarna."
+  "Vill du publicera det här inlägget i chatten? Alla DGGG-användare kommer att se detta inlägg. nlägget raderas automatiskt efter ett år.";
+  
+
+const alertUpdateMessage= "Vill du spara ändringarna."
 
 export const useUserPostsActions = () => {
   const [loading, setLoading] = useState(false);