fix(AccountTabs): reorder tabs in account and org page (#5394)

Author: blegesse-w

src/accounts/AccountTabs.tsx

@@ -29,18 +29,18 @@ const AccountTabs: FC<Props> = ({activeTab}) => {
   const orgID = useSelector(getOrg)?.id
 
   const tabs: AccountPageTab[] = [
-    {
-      text: 'Billing',
-      id: Tab.Billing,
-      testID: 'accounts-billing-tab',
-      link: `/orgs/${orgID}/billing`,
-    },
     {
       text: 'Settings',
       id: Tab.About,
       testID: 'accounts-setting-tab',
       link: `/orgs/${orgID}/accounts/settings`,
     },
+    {
+      text: 'Billing',
+      id: Tab.Billing,
+      testID: 'accounts-billing-tab',
+      link: `/orgs/${orgID}/billing`,
+    },
   ]
 
   return (

src/organizations/components/OrgNavigation.tsx

@@ -40,18 +40,18 @@ const OrgNavigation: FC<Props> = ({activeTab}) => {
       enabled: () => !CLOUD,
       link: `/orgs/${orgID}/members`,
     },
-    {
-      text: 'Members',
-      id: Tab.Users,
-      enabled: () => CLOUD,
-      link: `/orgs/${orgID}/users`,
-    },
     {
       text: 'Settings',
       id: Tab.About,
       enabled: () => CLOUD,
       link: `/orgs/${orgID}/about`,
     },
+    {
+      text: 'Members',
+      id: Tab.Users,
+      enabled: () => CLOUD,
+      link: `/orgs/${orgID}/users`,
+    },
     {
       text: 'About',
       id: Tab.About,

src/pageLayout/components/UserWidget.tsx

@@ -41,6 +41,14 @@ const UserWidget: FC<Props> = ({
     <TreeNav.User username={me.name} team={org.name} testID="user-nav">
       <CloudOnly>
         <TreeNav.SubHeading label="Account" />
+        <TreeNav.UserItem
+          id="account"
+          label="Settings"
+          testID="user-account-switching-page"
+          linkElement={className => (
+            <Link className={className} to={`${orgPrefix}/accounts/settings`} />
+          )}
+        />
         <TreeNav.UserItem
           id="billing"
           label="Billing"
@@ -49,15 +57,15 @@ const UserWidget: FC<Props> = ({
             <Link className={className} to={`${orgPrefix}/billing`} />
           )}
         />
+        <TreeNav.SubHeading label="Organization" />
         <TreeNav.UserItem
-          id="account"
+          id="about"
           label="Settings"
-          testID="user-account-switching-page"
+          testID="user-nav-item-about"
           linkElement={className => (
-            <Link className={className} to={`${orgPrefix}/accounts/settings`} />
+            <Link className={className} to={`${orgPrefix}/about`} />
           )}
         />
-        <TreeNav.SubHeading label="Organization" />
         <TreeNav.UserItem
           id="users"
           label="Members"
@@ -66,14 +74,6 @@ const UserWidget: FC<Props> = ({
             <Link className={className} to={`${orgPrefix}/users`} />
           )}
         />
-        <TreeNav.UserItem
-          id="about"
-          label="Settings"
-          testID="user-nav-item-about"
-          linkElement={className => (
-            <Link className={className} to={`${orgPrefix}/about`} />
-          )}
-        />
         <TreeNav.UserItem
           id="usage"
           label="Usage"