diff --git a/ts/components/conversation/TimerNotification.tsx b/ts/components/conversation/TimerNotification.tsx
index 3f5cfb7b4..593560c24 100644
--- a/ts/components/conversation/TimerNotification.tsx
+++ b/ts/components/conversation/TimerNotification.tsx
@@ -107,7 +107,7 @@ function useFollowSettingsButtonClick({ messageId }: WithMessageId) {
   return { doIt };
 }
 
-function useAreSameThanOurSide({ messageId }: WithMessageId) {
+function useOurExpirationMatches({ messageId }: WithMessageId) {
   const timespanSeconds = useMessageExpirationUpdateTimespanSeconds(messageId);
   const expirationMode = useMessageExpirationUpdateMode(messageId);
   const disabled = useMessageExpirationUpdateDisabled(messageId);
@@ -135,7 +135,7 @@ const FollowSettingsButton = ({ messageId }: WithMessageId) => {
   const click = useFollowSettingsButtonClick({
     messageId,
   });
-  const areSameThanOurs = useAreSameThanOurSide({ messageId });
+  const areSameThanOurs = useOurExpirationMatches({ messageId });
 
   if (!v2Released || !isPrivateAndFriend) {
     return null;
diff --git a/ts/components/conversation/message/message-item/ReadableMessage.tsx b/ts/components/conversation/message/message-item/ReadableMessage.tsx
index db9c6a328..057c03e37 100644
--- a/ts/components/conversation/message/message-item/ReadableMessage.tsx
+++ b/ts/components/conversation/message/message-item/ReadableMessage.tsx
@@ -75,7 +75,7 @@ async function markReadFromMessageId({
   messageId,
   isUnread,
 }: WithMessageId & WithConvoId & { isUnread: boolean }) {
-  // isUnread comes from the redux store in memory, so pretty fast and allows us to fetch from the DB too often
+  // isUnread comes from the redux store in memory, so pretty fast and allows us to not fetch from the DB too often
   if (!isUnread) {
     return;
   }
diff --git a/ts/state/selectors/messages.ts b/ts/state/selectors/messages.ts
index a6042295f..695c1570d 100644
--- a/ts/state/selectors/messages.ts
+++ b/ts/state/selectors/messages.ts
@@ -224,7 +224,7 @@ export function useMessageCallNotificationType(messageId: string) {
  */
 
 /**
- * Return the data exrtaction type linked to the specified message
+ * Return the data extraction type linked to the specified message
  */
 export function useMessageDataExtractionType(messageId: string) {
   return useMessagePropsByMessageId(messageId)?.propsForDataExtractionNotification?.type;