From fd6115cf8522e539b0a3595f5cd33156e1ac7df3 Mon Sep 17 00:00:00 2001
From: heaven <vojochatdev@gmail.com>
Date: Thu, 4 Jun 2026 13:14:10 +0300
Subject: [PATCH] style(settings): flatten the addresses and advanced blocks so
 the whole General page reads as one flat list

---
 .../common-settings/general/RoomAddress.tsx   | 20 ++++---------------
 .../common-settings/general/RoomUpgrade.tsx   | 10 ++--------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/src/app/features/common-settings/general/RoomAddress.tsx b/src/app/features/common-settings/general/RoomAddress.tsx
index bcae00c3..1a4c201d 100644
--- a/src/app/features/common-settings/general/RoomAddress.tsx
+++ b/src/app/features/common-settings/general/RoomAddress.tsx
@@ -17,8 +17,6 @@ import {
 import { MatrixError } from 'matrix-js-sdk';
 import { useTranslation } from 'react-i18next';
 import { SettingTile } from '../../../components/setting-tile';
-import { SequenceCard } from '../../../components/sequence-card';
-import { SequenceCardStyle } from '../../room-settings/styles.css';
 import { useMatrixClient } from '../../../hooks/useMatrixClient';
 import { useRoom } from '../../../hooks/useRoom';
 import {
@@ -56,12 +54,7 @@ export function RoomPublishedAddresses({ permissions }: RoomPublishedAddressesPr
   const loading = mainState.status === AsyncStatus.Loading;
 
   return (
-    <SequenceCard
-      className={SequenceCardStyle}
-      variant="SurfaceVariant"
-      direction="Column"
-      gap="400"
-    >
+    <Box direction="Column" gap="400">
       <SettingTile
         title={t('RoomSettings.published_addresses')}
         description={
@@ -127,7 +120,7 @@ export function RoomPublishedAddresses({ permissions }: RoomPublishedAddressesPr
           </Box>
         )}
       </CutoutCard>
-    </SequenceCard>
+    </Box>
   );
 }
 
@@ -379,12 +372,7 @@ export function RoomLocalAddresses({ permissions }: { permissions: RoomPermissio
   const { localAliasesState, addLocalAlias, removeLocalAlias } = useLocalAliases(room.roomId);
 
   return (
-    <SequenceCard
-      className={SequenceCardStyle}
-      variant="SurfaceVariant"
-      direction="Column"
-      gap="400"
-    >
+    <Box direction="Column" gap="400">
       <SettingTile
         title={t('RoomSettings.local_addresses')}
         description={t('RoomSettings.local_addresses_desc')}
@@ -437,6 +425,6 @@ export function RoomLocalAddresses({ permissions }: { permissions: RoomPermissio
         </CutoutCard>
       )}
       {expand && <LocalAddressInput addLocalAlias={addLocalAlias} />}
-    </SequenceCard>
+    </Box>
   );
 }
diff --git a/src/app/features/common-settings/general/RoomUpgrade.tsx b/src/app/features/common-settings/general/RoomUpgrade.tsx
index 900b2fa3..e4230d04 100644
--- a/src/app/features/common-settings/general/RoomUpgrade.tsx
+++ b/src/app/features/common-settings/general/RoomUpgrade.tsx
@@ -20,7 +20,6 @@ import { useTranslation } from 'react-i18next';
 import { MatrixError, Method } from 'matrix-js-sdk';
 import { RoomTombstoneEventContent } from 'matrix-js-sdk/lib/types';
 import { SequenceCard } from '../../../components/sequence-card';
-import { SequenceCardStyle } from '../../room-settings/styles.css';
 import { SettingTile } from '../../../components/setting-tile';
 import { useRoom } from '../../../hooks/useRoom';
 import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
@@ -217,12 +216,7 @@ export function RoomUpgrade({ permissions, requestClose }: RoomUpgradeProps) {
   const [prompt, setPrompt] = useState(false);
 
   return (
-    <SequenceCard
-      className={SequenceCardStyle}
-      variant="SurfaceVariant"
-      direction="Column"
-      gap="400"
-    >
+    <Box direction="Column" gap="400">
       <SettingTile
         title={
           room.isSpaceRoom() ? t('RoomSettings.upgrade_space') : t('RoomSettings.upgrade_room')
@@ -282,6 +276,6 @@ export function RoomUpgrade({ permissions, requestClose }: RoomUpgradeProps) {
       >
         {prompt && <RoomUpgradeDialog requestClose={() => setPrompt(false)} />}
       </SettingTile>
-    </SequenceCard>
+    </Box>
   );
 }