From 4005910f3736b67b9673c493a4728b1cac331d11 Mon Sep 17 00:00:00 2001
From: Sachin Chavda <sachin.chavda.1024@gmail.com>
Date: Tue, 10 Sep 2024 01:23:16 +0530
Subject: [PATCH 1/3] Fixed Header of settings page

---
 src/pages/settings/InitialSettingsPage.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index eeacd56f8d5c..bd084eefb38e 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -428,18 +428,19 @@ function InitialSettingsPage({userWallet, bankAccountList, fundList, walletTerms
 
     return (
         <ScreenWrapper
-            style={[styles.w100, styles.pb0]}
+            style={[styles.w100, styles.pb0, styles.pt4]}
             includePaddingTop={false}
             includeSafeAreaPaddingBottom={false}
             testID={InitialSettingsPage.displayName}
         >
+            {headerContent}
             <ScrollView
                 ref={scrollViewRef}
                 onScroll={onScroll}
                 scrollEventThrottle={16}
-                contentContainerStyle={[styles.w100, styles.pt4]}
+                contentContainerStyle={[styles.w100]}
+                showsVerticalScrollIndicator = {false}
             >
-                {headerContent}
                 {accountMenuItems}
                 {workspaceMenuItems}
                 {generalMenuItems}

From 05e5ace37a8639577c60af2a3afe35fb92deb691 Mon Sep 17 00:00:00 2001
From: Sachin Chavda <sachin.chavda.1024@gmail.com>
Date: Tue, 10 Sep 2024 02:07:07 +0530
Subject: [PATCH 2/3] prettier

---
 src/pages/settings/InitialSettingsPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index bd084eefb38e..38d80cf1e41d 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -439,7 +439,7 @@ function InitialSettingsPage({userWallet, bankAccountList, fundList, walletTerms
                 onScroll={onScroll}
                 scrollEventThrottle={16}
                 contentContainerStyle={[styles.w100]}
-                showsVerticalScrollIndicator = {false}
+                showsVerticalScrollIndicator={false}
             >
                 {accountMenuItems}
                 {workspaceMenuItems}

From 4127f28517c78460150cd33bbb57bfaf54baabe6 Mon Sep 17 00:00:00 2001
From: Sachin Chavda <sachin.chavda.1024@gmail.com>
Date: Tue, 10 Sep 2024 21:12:53 +0530
Subject: [PATCH 3/3] chnaged header avatar size to default and fixed skeleton
 view to match new header style

---
 src/components/AccountSwitcher.tsx                   | 2 +-
 src/components/AccountSwitcherSkeletonView/index.tsx | 8 ++++----
 src/pages/settings/InitialSettingsPage.tsx           | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/AccountSwitcher.tsx b/src/components/AccountSwitcher.tsx
index ba30ea0062b9..266bdd6fde2c 100644
--- a/src/components/AccountSwitcher.tsx
+++ b/src/components/AccountSwitcher.tsx
@@ -132,7 +132,7 @@ function AccountSwitcher() {
                 <View style={[styles.flexRow, styles.gap3]}>
                     <Avatar
                         type={CONST.ICON_TYPE_AVATAR}
-                        size={CONST.AVATAR_SIZE.MEDIUM}
+                        size={CONST.AVATAR_SIZE.DEFAULT}
                         avatarID={currentUserPersonalDetails?.accountID}
                         source={currentUserPersonalDetails?.avatar}
                         fallbackIcon={currentUserPersonalDetails.fallbackIcon}
diff --git a/src/components/AccountSwitcherSkeletonView/index.tsx b/src/components/AccountSwitcherSkeletonView/index.tsx
index eb01a23e9ade..3faf7e563f3c 100644
--- a/src/components/AccountSwitcherSkeletonView/index.tsx
+++ b/src/components/AccountSwitcherSkeletonView/index.tsx
@@ -16,7 +16,7 @@ type AccountSwitcherSkeletonViewProps = {
     avatarSize?: ValueOf<typeof CONST.AVATAR_SIZE>;
 };
 
-function AccountSwitcherSkeletonView({shouldAnimate = true, avatarSize = CONST.AVATAR_SIZE.LARGE}: AccountSwitcherSkeletonViewProps) {
+function AccountSwitcherSkeletonView({shouldAnimate = true, avatarSize = CONST.AVATAR_SIZE.DEFAULT}: AccountSwitcherSkeletonViewProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
@@ -30,7 +30,7 @@ function AccountSwitcherSkeletonView({shouldAnimate = true, avatarSize = CONST.A
                 animate={shouldAnimate}
                 backgroundColor={theme.skeletonLHNIn}
                 foregroundColor={theme.skeletonLHNOut}
-                height={avatarPlaceholderSize + styles.pb3.paddingBottom}
+                height={avatarPlaceholderSize}
             >
                 <Circle
                     cx={startPositionX}
@@ -39,13 +39,13 @@ function AccountSwitcherSkeletonView({shouldAnimate = true, avatarSize = CONST.A
                 />
                 <Rect
                     x={startPositionX + avatarPlaceholderRadius + styles.gap3.gap}
-                    y="11"
+                    y="6"
                     width="45%"
                     height="8"
                 />
                 <Rect
                     x={startPositionX + avatarPlaceholderRadius + styles.gap3.gap}
-                    y="31"
+                    y="26"
                     width="55%"
                     height="8"
                 />
diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index 38d80cf1e41d..30f4cf010f70 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -370,11 +370,11 @@ function InitialSettingsPage({userWallet, bankAccountList, fundList, walletTerms
     const workspaceMenuItems = useMemo(() => getMenuItemsSection(workspaceMenuItemsData), [workspaceMenuItemsData, getMenuItemsSection]);
 
     const headerContent = (
-        <View style={[styles.ph5, styles.pb3]}>
+        <View style={[styles.ph5, styles.pv5]}>
             {isEmptyObject(currentUserPersonalDetails) || currentUserPersonalDetails.displayName === undefined ? (
-                <AccountSwitcherSkeletonView avatarSize={CONST.AVATAR_SIZE.MEDIUM} />
+                <AccountSwitcherSkeletonView avatarSize={CONST.AVATAR_SIZE.DEFAULT} />
             ) : (
-                <View style={[styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.pb3, styles.gap3]}>
+                <View style={[styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.gap3]}>
                     <AccountSwitcher />
                     <Tooltip text={translate('statusPage.status')}>
                         <PressableWithFeedback
@@ -428,7 +428,7 @@ function InitialSettingsPage({userWallet, bankAccountList, fundList, walletTerms
 
     return (
         <ScreenWrapper
-            style={[styles.w100, styles.pb0, styles.pt4]}
+            style={[styles.w100, styles.pb0]}
             includePaddingTop={false}
             includeSafeAreaPaddingBottom={false}
             testID={InitialSettingsPage.displayName}