Change order of onboarding steps (#38121)

app/javascript/mastodon/features/onboarding/follows.tsx

@@ -121,7 +121,6 @@ export const Follows: React.FC<{
         icon='person'
         iconComponent={PersonIcon}
         multiColumn={multiColumn}
-        showBackButton
       />
 
       <ColumnSearchHeader
@@ -146,10 +145,10 @@ export const Follows: React.FC<{
             {displayedAccountIds.length > 0 && <div className='spacer' />}
 
             <div className='column-footer'>
-              <Link className='button button--block' to='/home'>
+              <Link className='button button--block' to='/start/profile'>
                 <FormattedMessage
-                  id='onboarding.follows.done'
-                  defaultMessage='Done'
+                  id='onboarding.follows.next'
+                  defaultMessage='Next: Setup your profile'
                 />
               </Link>
             </div>

app/javascript/mastodon/features/onboarding/profile.tsx

@@ -133,7 +133,7 @@ export const Profile: React.FC<{
       }),
     )
       .then(() => {
-        history.push('/start/follows');
+        history.push('/home');
         dispatch(closeOnboarding());
         return '';
       })
@@ -160,6 +160,7 @@ export const Profile: React.FC<{
         icon='person'
         iconComponent={PersonIcon}
         multiColumn={multiColumn}
+        showBackButton
       />
 
       <div className='scrollable scrollable--flex'>
@@ -297,8 +298,8 @@ export const Profile: React.FC<{
               <LoadingIndicator />
             ) : (
               <FormattedMessage
-                id='onboarding.profile.save_and_continue'
-                defaultMessage='Save and continue'
+                id='onboarding.profile.finish'
+                defaultMessage='Finish'
               />
             )}
           </Button>

app/javascript/mastodon/features/ui/index.jsx

@@ -230,8 +230,8 @@ class SwitchingColumnsArea extends PureComponent {
             <WrappedRoute path='/bookmarks' component={BookmarkedStatuses} content={children} />
             <WrappedRoute path='/pinned' component={PinnedStatuses} content={children} />
 
-            <WrappedRoute path={['/start', '/start/profile']} exact component={OnboardingProfile} content={children} />
-            <WrappedRoute path='/start/follows' component={OnboardingFollows} content={children} />
+            <WrappedRoute path='/start/profile' exact component={OnboardingProfile} content={children} />
+            <WrappedRoute path={['/start', '/start/follows']} exact component={OnboardingFollows} content={children} />
             <WrappedRoute path='/directory' component={Directory} content={children} />
             <WrappedRoute path='/explore' component={Explore} content={children} />
             <WrappedRoute path='/search' component={Search} content={children} />

app/javascript/mastodon/locales/en.json

@@ -960,17 +960,17 @@
   "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
   "notifications_permission_banner.title": "Never miss a thing",
   "onboarding.follows.back": "Back",
-  "onboarding.follows.done": "Done",
   "onboarding.follows.empty": "Unfortunately, no results can be shown right now. You can try using search or browsing the explore page to find people to follow, or try again later.",
+  "onboarding.follows.next": "Next: Setup your profile",
   "onboarding.follows.search": "Search",
   "onboarding.follows.title": "Follow people to get started",
   "onboarding.profile.discoverable": "Make my profile discoverable",
   "onboarding.profile.discoverable_hint": "When you opt in to discoverability on Mastodon, your posts may appear in search results and trending, and your profile may be suggested to people with similar interests to you.",
   "onboarding.profile.display_name": "Display name",
   "onboarding.profile.display_name_hint": "Your full name or your fun name…",
+  "onboarding.profile.finish": "Finish",
   "onboarding.profile.note": "Bio",
   "onboarding.profile.note_hint": "You can @mention other people or #hashtags…",
-  "onboarding.profile.save_and_continue": "Save and continue",
   "onboarding.profile.title": "Profile setup",
   "onboarding.profile.upload_avatar": "Upload profile picture",
   "onboarding.profile.upload_header": "Upload profile header",

app/javascript/styles/mastodon/components.scss

@@ -11509,6 +11509,9 @@ noscript {
 
 .column-footer {
   padding: 16px;
+  position: sticky;
+  bottom: 0;
+  background: var(--color-bg-primary);
 }
 
 .lists-scrollable {