From d121007927b59831937c0e8352fc394019f2fef9 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 29 Jul 2025 11:00:27 +0200
Subject: [PATCH] Change "new replies available" notice to be above replies in
 web UI (#35575)

---
 .../status/components/refresh_controller.tsx     | 16 +++-------------
 .../mastodon/features/status/index.jsx           |  3 +--
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/app/javascript/mastodon/features/status/components/refresh_controller.tsx b/app/javascript/mastodon/features/status/components/refresh_controller.tsx
index 04046302b62..2765d5d9f41 100644
--- a/app/javascript/mastodon/features/status/components/refresh_controller.tsx
+++ b/app/javascript/mastodon/features/status/components/refresh_controller.tsx
@@ -2,8 +2,6 @@ import { useEffect, useState, useCallback } from 'react';
 
 import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
 
-import classNames from 'classnames';
-
 import {
   fetchContext,
   completeContextRefresh,
@@ -22,8 +20,7 @@ const messages = defineMessages({
 
 export const RefreshController: React.FC<{
   statusId: string;
-  withBorder?: boolean;
-}> = ({ statusId, withBorder }) => {
+}> = ({ statusId }) => {
   const refresh = useAppSelector(
     (state) => state.contexts.refreshing[statusId],
   );
@@ -78,12 +75,7 @@ export const RefreshController: React.FC<{
 
   if (ready && !loading) {
     return (
-      <button
-        className={classNames('load-more load-gap', {
-          'timeline-hint--with-descendants': withBorder,
-        })}
-        onClick={handleClick}
-      >
+      <button className='load-more load-gap' onClick={handleClick}>
         <FormattedMessage
           id='status.context.load_new_replies'
           defaultMessage='New replies available'
@@ -98,9 +90,7 @@ export const RefreshController: React.FC<{
 
   return (
     <div
-      className={classNames('load-more load-gap', {
-        'timeline-hint--with-descendants': withBorder,
-      })}
+      className='load-more load-gap'
       aria-busy
       aria-live='polite'
       aria-label={intl.formatMessage(messages.loading)}
diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx
index 77d23f55f6d..4a714fa2c59 100644
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@@ -580,7 +580,6 @@ class Status extends ImmutablePureComponent {
       remoteHint = (
         <RefreshController
           statusId={status.get('id')}
-          withBorder={!!descendants}
         />
       );
     }
@@ -653,8 +652,8 @@ class Status extends ImmutablePureComponent {
               </div>
             </Hotkeys>
 
-            {descendants}
             {remoteHint}
+            {descendants}
           </div>
         </ScrollContainer>