From 017b4f564dc566750195040d1437dd69b6cfcf33 Mon Sep 17 00:00:00 2001
From: Ryan Miller <ryan.m@getsession.org>
Date: Wed, 28 Aug 2024 14:00:44 +1000
Subject: [PATCH] chore: cleanup strings usages

---
 ts/components/basic/StyledI18nSubText.tsx     | 16 -------------
 .../header/ConversationHeaderTitle.tsx        |  2 +-
 ts/components/dialog/OpenUrlModal.tsx         |  2 +-
 ts/components/dialog/StyledSubText.tsx        | 24 -------------------
 4 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 ts/components/dialog/StyledSubText.tsx

diff --git a/ts/components/basic/StyledI18nSubText.tsx b/ts/components/basic/StyledI18nSubText.tsx
index 9756f0825..61df4a428 100644
--- a/ts/components/basic/StyledI18nSubText.tsx
+++ b/ts/components/basic/StyledI18nSubText.tsx
@@ -15,12 +15,6 @@ const StyledI18nSubTextContainer = styled('div')`
   padding-inline: var(--margins-lg);
 `;
 
-const StyledI18nSubMessageTextContainer = styled('div')`
-  // Overrides SASS in this one case
-  margin-top: 0;
-  margin-bottom: var(--margins-md);
-`;
-
 export const StyledI18nSubText = forwardRef<HTMLSpanElement, I18nProps<LocalizerToken>>(
   ({ className, ...props }) => {
     return (
@@ -30,13 +24,3 @@ export const StyledI18nSubText = forwardRef<HTMLSpanElement, I18nProps<Localizer
     );
   }
 );
-
-export const StyledI18nSubMessageText = forwardRef<HTMLSpanElement, I18nProps<LocalizerToken>>(
-  ({ className, ...props }) => {
-    return (
-      <StyledI18nSubMessageTextContainer className={className}>
-        <I18n {...props} />
-      </StyledI18nSubMessageTextContainer>
-    );
-  }
-);
diff --git a/ts/components/conversation/header/ConversationHeaderTitle.tsx b/ts/components/conversation/header/ConversationHeaderTitle.tsx
index 22f5282d2..107c6bfea 100644
--- a/ts/components/conversation/header/ConversationHeaderTitle.tsx
+++ b/ts/components/conversation/header/ConversationHeaderTitle.tsx
@@ -82,7 +82,7 @@ export const ConversationHeaderTitle = (props: ConversationHeaderTitleProps) =>
 
     if (isGroup && memberCount > 0 && !isKickedFromGroup) {
       const count = String(memberCount);
-      return i18n(isPublic ? 'membersActive' : 'members', { count });
+      return isPublic ? i18n('membersActive', { count }) : i18n('members', { count });
     }
 
     return null;
diff --git a/ts/components/dialog/OpenUrlModal.tsx b/ts/components/dialog/OpenUrlModal.tsx
index a07b09fae..2aab7b4c4 100644
--- a/ts/components/dialog/OpenUrlModal.tsx
+++ b/ts/components/dialog/OpenUrlModal.tsx
@@ -48,7 +48,7 @@ export function OpenUrlModal(props: OpenUrlModalState) {
     >
       <div className="session-modal__centered">
         <StyledScrollDescriptionContainer>
-          <StyledI18nSubText asTag="span" token="urlOpenDescription" args={{ url }} />
+          <StyledI18nSubText token="urlOpenDescription" asTag="span" args={{ url }} />
         </StyledScrollDescriptionContainer>
       </div>
       <SpacerMD />
diff --git a/ts/components/dialog/StyledSubText.tsx b/ts/components/dialog/StyledSubText.tsx
deleted file mode 100644
index 6f0b8721b..000000000
--- a/ts/components/dialog/StyledSubText.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import styled from 'styled-components';
-
-/**
- * @deprecated Use {@link StyledI18nSubText} instead.
- */
-export const StyledSubText = styled('span')<{ textLength: number }>`
-  font-size: var(--font-size-md);
-  line-height: 1.5;
-  margin-bottom: var(--margins-lg);
-
-  max-width: ${props =>
-    props.textLength > 90
-      ? '60ch'
-      : '33ch'}; // this is ugly, but we want the dialog description to have multiple lines when a short text is displayed
-`;
-
-/**
- * @deprecated Use {@link StyledI18nSubMessageText} instead.
- */
-export const StyledSubMessageText = styled('span')`
-  // Overrides SASS in this one case
-  margin-top: 0;
-  margin-bottom: var(--margins-md);
-`;