From 29a190f02a5b99d11ef0c223c2c31072d64f8702 Mon Sep 17 00:00:00 2001
From: Alireza Hassani <alirezahassani@Meshkees-Mac-mini.local>
Date: Wed, 9 Sep 2026 11:37:35 +0330
Subject: [PATCH] Improve SMS settings layout and add send-modal variable
 chips.

Credit/usage divider, total row plus typed counts grid, and insertable template vars on compose.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../src/components/SendCustomerSmsModal.tsx   | 43 +++++++++++++++-
 .../src/components/SmsSettingsSection.tsx     | 43 +++++++++-------
 .../src/pages/SettingsPage.module.css         | 50 ++++++++++++++++++-
 .../src/pages/BusinessesPage.module.css       | 40 +++++++++++++++
 apps/super-admin/src/pages/BusinessesPage.tsx | 45 +++++++++--------
 5 files changed, 178 insertions(+), 43 deletions(-)

diff --git a/apps/business/src/components/SendCustomerSmsModal.tsx b/apps/business/src/components/SendCustomerSmsModal.tsx
index 508233b..ae272c1 100644
--- a/apps/business/src/components/SendCustomerSmsModal.tsx
+++ b/apps/business/src/components/SendCustomerSmsModal.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import { createPortal } from 'react-dom'
 import { X } from 'lucide-react'
 import { useLocale } from '@meshkee/dashboard-ui'
@@ -12,6 +12,7 @@ import {
 } from '../services/customerService'
 import { listSmsTemplates, type SmsTemplate } from '../services/smsTemplateService'
 import modalStyles from './VariationsModal.module.css'
+import settingsStyles from '../pages/SettingsPage.module.css'
 
 export type SmsComposeTarget =
   | { mode: 'single'; customer: BusinessCustomerListItem }
@@ -27,6 +28,7 @@ interface SendCustomerSmsModalProps {
 
 const ANIMATION_MS = 220
 const MAX_LEN = 700
+const SMS_VARS = ['{{user.name}}', '{{user.lastname}}', '{{user.title}}'] as const
 
 export function SendCustomerSmsModal({
   open,
@@ -45,6 +47,7 @@ export function SendCustomerSmsModal({
   const [templatesLoading, setTemplatesLoading] = useState(false)
   const [isSubmitting, setIsSubmitting] = useState(false)
   const [error, setError] = useState('')
+  const messageRef = useRef<HTMLTextAreaElement>(null)
 
   useEffect(() => {
     if (open && target) {
@@ -103,6 +106,21 @@ export function SendCustomerSmsModal({
     if (tpl) setMessage(tpl.body.slice(0, MAX_LEN))
   }
 
+  function insertVariable(token: string) {
+    if (selectedTemplate?.isVerified) return
+    const el = messageRef.current
+    const start = el?.selectionStart ?? message.length
+    const end = el?.selectionEnd ?? message.length
+    const next = `${message.slice(0, start)}${token}${message.slice(end)}`.slice(0, MAX_LEN)
+    const inserted = Math.min(token.length, MAX_LEN - message.slice(0, start).length)
+    const cursor = start + Math.max(0, inserted)
+    setMessage(next)
+    requestAnimationFrame(() => {
+      el?.focus()
+      el?.setSelectionRange(cursor, cursor)
+    })
+  }
+
   async function handleSubmit() {
     if (!target || !canSend) return
     setIsSubmitting(true)
@@ -216,8 +234,31 @@ export function SendCustomerSmsModal({
 
           <div className={modalStyles.field}>
             <label htmlFor="customer-sms-message">{t('customers.smsModal.message')}</label>
+            <div
+              className={settingsStyles.smsVarChips}
+              role="group"
+              aria-label={t('settings.sms.variablesHint')}
+            >
+              {SMS_VARS.map((token) => (
+                <button
+                  key={token}
+                  type="button"
+                  className={settingsStyles.smsVarChip}
+                  onClick={() => insertVariable(token)}
+                  disabled={
+                    isSubmitting ||
+                    Boolean(selectedTemplate?.isVerified) ||
+                    message.length >= MAX_LEN
+                  }
+                  dir="ltr"
+                >
+                  {token}
+                </button>
+              ))}
+            </div>
             <textarea
               id="customer-sms-message"
+              ref={messageRef}
               value={message}
               onChange={(e) => setMessage(e.target.value.slice(0, MAX_LEN))}
               rows={5}
diff --git a/apps/business/src/components/SmsSettingsSection.tsx b/apps/business/src/components/SmsSettingsSection.tsx
index ef8f2fc..3d65d7c 100644
--- a/apps/business/src/components/SmsSettingsSection.tsx
+++ b/apps/business/src/components/SmsSettingsSection.tsx
@@ -288,24 +288,31 @@ export function SmsSettingsSection() {
         </strong>
       </div>
 
-      <div className={settingsStyles.smsSentStack} role="group" aria-label={t('settings.sms.sentCount')}>
-        {(
-          [
-            ['settings.sms.sentTotal', sentCount],
-            ['settings.sms.sentMass', sentByType.mass],
-            ['settings.sms.sentSingular', sentByType.singular],
-            ['settings.sms.sentAuth', sentByType.auth],
-            ['settings.sms.sentAutoCustomer', sentByType.autoCustomer],
-            ['settings.sms.sentAdmin', sentByType.admin],
-          ] as const
-        ).map(([labelKey, value]) => (
-          <div key={labelKey} className={`${settingsStyles.smsCreditRow} ${settingsStyles.smsSentRow}`}>
-            <span className={settingsStyles.smsCreditLabel}>{t(labelKey)}</span>
-            <strong className={settingsStyles.smsCreditValue}>
-              {loading ? '…' : value.toLocaleString(isFa ? 'fa-IR' : 'en-US')}
-            </strong>
-          </div>
-        ))}
+      <div className={settingsStyles.smsUsageSection} role="group" aria-label={t('settings.sms.sentCount')}>
+        <div className={`${settingsStyles.smsCreditRow} ${settingsStyles.smsSentRow}`}>
+          <span className={settingsStyles.smsCreditLabel}>{t('settings.sms.sentTotal')}</span>
+          <strong className={settingsStyles.smsCreditValue}>
+            {loading ? '…' : sentCount.toLocaleString(isFa ? 'fa-IR' : 'en-US')}
+          </strong>
+        </div>
+        <div className={settingsStyles.smsSentTypesRow}>
+          {(
+            [
+              ['settings.sms.sentMass', sentByType.mass],
+              ['settings.sms.sentSingular', sentByType.singular],
+              ['settings.sms.sentAuth', sentByType.auth],
+              ['settings.sms.sentAutoCustomer', sentByType.autoCustomer],
+              ['settings.sms.sentAdmin', sentByType.admin],
+            ] as const
+          ).map(([labelKey, value]) => (
+            <div key={labelKey} className={settingsStyles.smsSentTypeCell}>
+              <span className={settingsStyles.smsSentTypeLabel}>{t(labelKey)}</span>
+              <strong className={settingsStyles.smsSentTypeValue}>
+                {loading ? '…' : value.toLocaleString(isFa ? 'fa-IR' : 'en-US')}
+              </strong>
+            </div>
+          ))}
+        </div>
       </div>
 
       <div className={settingsStyles.smsTemplatesSummary}>
diff --git a/apps/business/src/pages/SettingsPage.module.css b/apps/business/src/pages/SettingsPage.module.css
index fbd5193..949615e 100644
--- a/apps/business/src/pages/SettingsPage.module.css
+++ b/apps/business/src/pages/SettingsPage.module.css
@@ -249,11 +249,13 @@
   font-family: var(--font-ui);
 }
 
-.smsSentStack {
+.smsUsageSection {
   display: flex;
   flex-direction: column;
   gap: 8px;
-  margin-top: 10px;
+  margin-top: 16px;
+  padding-top: 16px;
+  border-top: 1px solid rgba(148, 163, 184, 0.2);
 }
 
 .smsSentRow {
@@ -272,6 +274,50 @@
   font-size: 14px;
 }
 
+.smsSentTypesRow {
+  display: grid;
+  grid-template-columns: repeat(5, minmax(0, 1fr));
+  gap: 8px;
+}
+
+.smsSentTypeCell {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  min-width: 0;
+  padding: 10px 12px;
+  border-radius: var(--radius-sm);
+  border: 1px solid rgba(15, 23, 42, 0.1);
+  background: rgba(15, 23, 42, 0.04);
+}
+
+.smsSentTypeLabel {
+  font-size: 11px;
+  font-weight: 500;
+  line-height: 1.35;
+  color: var(--text-secondary);
+}
+
+.smsSentTypeValue {
+  font-size: 14px;
+  font-weight: 700;
+  font-variant-numeric: tabular-nums;
+  font-family: var(--font-ui);
+  color: var(--text-primary);
+}
+
+@media (max-width: 900px) {
+  .smsSentTypesRow {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+  }
+}
+
+@media (max-width: 520px) {
+  .smsSentTypesRow {
+    grid-template-columns: 1fr;
+  }
+}
+
 .smsTemplatesSummary {
   display: flex;
   align-items: center;
diff --git a/apps/super-admin/src/pages/BusinessesPage.module.css b/apps/super-admin/src/pages/BusinessesPage.module.css
index c9688c3..381fffe 100644
--- a/apps/super-admin/src/pages/BusinessesPage.module.css
+++ b/apps/super-admin/src/pages/BusinessesPage.module.css
@@ -146,6 +146,46 @@
   gap: 8px;
 }
 
+.smsSentTypesRow {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 8px;
+}
+
+.smsSentTypeCell {
+  display: flex;
+  flex-direction: row;
+  align-items: baseline;
+  justify-content: space-between;
+  gap: 8px;
+  min-width: 0;
+  padding: 10px 12px;
+  border-radius: var(--radius-sm, 10px);
+  border: 1px solid rgba(15, 23, 42, 0.1);
+  background: rgba(15, 23, 42, 0.04);
+}
+
+.smsSentTypeLabel {
+  font-size: 12px;
+  font-weight: 500;
+  line-height: 1.35;
+  color: var(--text-secondary);
+}
+
+.smsSentTypeValue {
+  font-size: 14px;
+  font-weight: 700;
+  font-variant-numeric: tabular-nums;
+  color: var(--text-primary);
+  text-align: end;
+}
+
+@media (max-width: 720px) {
+  .smsSentTypesRow {
+    grid-template-columns: 1fr;
+  }
+}
+
 .entityGroupLabel {
   font-size: 12px;
   font-weight: 500;
diff --git a/apps/super-admin/src/pages/BusinessesPage.tsx b/apps/super-admin/src/pages/BusinessesPage.tsx
index 24b6e10..4482fdc 100644
--- a/apps/super-admin/src/pages/BusinessesPage.tsx
+++ b/apps/super-admin/src/pages/BusinessesPage.tsx
@@ -2173,29 +2173,30 @@ export function BusinessesPage() {
                 {(smsSettingsBusiness?.smsSentCount ?? 0).toLocaleString('en-US')}
               </strong>
             </div>
-            {(
-              [
-                ['Mass send', smsSettingsBusiness?.smsSentByType?.mass],
-                ['Singular', smsSettingsBusiness?.smsSentByType?.singular],
-                ['Auth service', smsSettingsBusiness?.smsSentByType?.auth],
+            <div className={styles.smsSentTypesRow}>
+              {(
                 [
-                  'Auto customer',
-                  smsSettingsBusiness?.smsSentByType?.autoCustomer,
-                ],
-                ['Admin notification', smsSettingsBusiness?.smsSentByType?.admin],
-              ] as const
-            ).map(([label, value]) => (
-              <div
-                key={label}
-                className={`${styles.dataRow} ${styles.dataRowNeutral}`}
-                role="status"
-              >
-                <span className={styles.dataRowLabel}>{label}</span>
-                <strong className={styles.dataRowValue}>
-                  {(value ?? 0).toLocaleString('en-US')}
-                </strong>
-              </div>
-            ))}
+                  ['Mass send', smsSettingsBusiness?.smsSentByType?.mass],
+                  ['Singular', smsSettingsBusiness?.smsSentByType?.singular],
+                  ['Auth service', smsSettingsBusiness?.smsSentByType?.auth],
+                  [
+                    'Auto customer',
+                    smsSettingsBusiness?.smsSentByType?.autoCustomer,
+                  ],
+                  [
+                    'Admin notification',
+                    smsSettingsBusiness?.smsSentByType?.admin,
+                  ],
+                ] as const
+              ).map(([label, value]) => (
+                <div key={label} className={styles.smsSentTypeCell} role="status">
+                  <span className={styles.smsSentTypeLabel}>{label}</span>
+                  <strong className={styles.smsSentTypeValue}>
+                    {(value ?? 0).toLocaleString('en-US')}
+                  </strong>
+                </div>
+              ))}
+            </div>
           </div>
           <p className={styles.helperText}>
             Lifetime messages billed (one per recipient), split by type. Auto customer and