From 5b46f0c0f754840371ed205e4b4ac141ae335f30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Sun, 6 Mar 2022 23:20:13 +0100
Subject: [PATCH] Fix: User is returned to a previously viewed page after
 replying to a post
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/components/modal_root.js                          | 4 ++++
 .../scheduled_statuses/components/scheduled_status.js         | 2 +-
 app/soapbox/features/ui/components/pending_status.js          | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/components/modal_root.js b/app/soapbox/components/modal_root.js
index 99b6b1c0e..599d090f6 100644
--- a/app/soapbox/components/modal_root.js
+++ b/app/soapbox/components/modal_root.js
@@ -54,6 +54,10 @@ class ModalRoot extends React.PureComponent {
     onCancel: PropTypes.func,
   };
 
+  static contextTypes = {
+    router: PropTypes.object,
+  };
+
   state = {
     revealed: !!this.props.children,
   };
diff --git a/app/soapbox/features/scheduled_statuses/components/scheduled_status.js b/app/soapbox/features/scheduled_statuses/components/scheduled_status.js
index c79de8af1..7daf0a024 100644
--- a/app/soapbox/features/scheduled_statuses/components/scheduled_status.js
+++ b/app/soapbox/features/scheduled_statuses/components/scheduled_status.js
@@ -39,7 +39,7 @@ class ScheduledStatus extends ImmutablePureComponent {
       <div className='scheduled-status'>
         <div className={classNames('status__wrapper', `status__wrapper-${status.get('visibility')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id') })} tabIndex={this.props.muted ? null : 0}>
           <div className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), muted: this.props.muted })} data-id={status.get('id')}>
-            <div className='status__expand' onClick={this.handleExpandClick} role='presentation' />
+            <div className='status__expand' role='presentation' />
             <div className='status__info'>
               <NavLink to={statusUrl} className='status__relative-time'>
                 <RelativeTimestamp timestamp={status.get('created_at')} futureDate />
diff --git a/app/soapbox/features/ui/components/pending_status.js b/app/soapbox/features/ui/components/pending_status.js
index e788819a6..05ec179af 100644
--- a/app/soapbox/features/ui/components/pending_status.js
+++ b/app/soapbox/features/ui/components/pending_status.js
@@ -63,7 +63,7 @@ class PendingStatus extends ImmutablePureComponent {
       <div className={classNames('pending-status', className)}>
         <div className={classNames('status__wrapper', `status__wrapper-${status.get('visibility')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id') })} tabIndex={this.props.muted ? null : 0}>
           <div className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), muted: this.props.muted })} data-id={status.get('id')}>
-            <div className='status__expand' onClick={this.handleExpandClick} role='presentation' />
+            <div className='status__expand' role='presentation' />
             <div className='status__info'>
               <span className='status__relative-time'>
                 <RelativeTimestamp timestamp={status.get('created_at')} />