Merge pull request #105 from topcoder-platform/PROD-1558_account-redo

testflyjets · web-flow · commit 47aeb5c2fa35 · 2022-05-03T15:03:41.000-07:00
PROD-1558 account settings redo -&gt; dev
diff --git a/src/App.jsx b/src/App.jsx
@@ -60,7 +60,7 @@ const App = () => {
           noThrow
           profileUrl={
             location.pathname.includes("/self-service")
-              ? "/self-service/profile/"
+              ? "/self-service/account/"
               : `/profile/${_.get(auth, "profile.handle", "")}`
           }
           hideSwitchTools={isNavigationDisabled}
diff --git a/src/components/UserMenu/index.jsx b/src/components/UserMenu/index.jsx
@@ -69,7 +69,7 @@ const UserMenu = ({ profile, profileUrl }) => {
                       to={`${profileUrl}`}
                       onClick={closeMenu}
                     >
-                      Profile
+                      {profileUrl.startsWith('/self-service') ? 'Account' : 'Profile'}
                     </Link>
                   </li>
                   <li>

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ const App = () => {`
`60`	`60`	`noThrow`
`61`	`61`	`profileUrl={`
`62`	`62`	`location.pathname.includes("/self-service")`
`63`		`- ? "/self-service/profile/"`
	`63`	`+ ? "/self-service/account/"`
`64`	`64`	: `/profile/${_.get(auth, "profile.handle", "")}`
`65`	`65`	`}`
`66`	`66`	`hideSwitchTools={isNavigationDisabled}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ const UserMenu = ({ profile, profileUrl }) => {`
`69`	`69`	to={`${profileUrl}`}
`70`	`70`	`onClick={closeMenu}`
`71`	`71`	`>`
`72`		`- Profile`
	`72`	`+ {profileUrl.startsWith('/self-service') ? 'Account' : 'Profile'}`
`73`	`73`	`</Link>`
`74`	`74`	`</li>`
`75`	`75`	`<li>`