From e02d5142e5d913757585176900d0641b9692d7cc Mon Sep 17 00:00:00 2001
From: Justin <dice.warrant-02@icloud.com>
Date: Mon, 21 Mar 2022 15:23:57 -0400
Subject: [PATCH] Properly handle navigating to previous page if 'backHref' is
 undefined

---
 app/soapbox/components/ui/column/column.tsx |  22 ++++++++++++++++----
 app/soapbox/features/edit_profile/index.js  | Bin 17630 -> 17004 bytes
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/soapbox/components/ui/column/column.tsx b/app/soapbox/components/ui/column/column.tsx
index a9c5f0d2e1..08ef17b9a3 100644
--- a/app/soapbox/components/ui/column/column.tsx
+++ b/app/soapbox/components/ui/column/column.tsx
@@ -1,10 +1,11 @@
 import React from 'react';
+import { RouteComponentProps, withRouter } from 'react-router-dom';
 
 import Helmet from 'soapbox/components/helmet';
 
 import { Card, CardBody, CardHeader, CardTitle } from '../card/card';
 
-interface IColumn {
+interface IColumn extends RouteComponentProps {
   backHref?: string,
   label?: string,
   transparent?: boolean,
@@ -12,7 +13,20 @@ interface IColumn {
 }
 
 const Column: React.FC<IColumn> = React.forwardRef((props, ref: React.ForwardedRef<HTMLDivElement>): JSX.Element => {
-  const { backHref, children, label, transparent = false, withHeader = true } = props;
+  const { backHref, children, label, history, transparent = false, withHeader = true } = props;
+
+  const handleBackClick = () => {
+    if (backHref) {
+      history.push(backHref);
+      return;
+    }
+
+    if (history.length === 1) {
+      history.push('/');
+    } else {
+      history.goBack();
+    }
+  };
 
   const renderChildren = () => {
     if (transparent) {
@@ -22,7 +36,7 @@ const Column: React.FC<IColumn> = React.forwardRef((props, ref: React.ForwardedR
     return (
       <Card variant='rounded'>
         {withHeader ? (
-          <CardHeader backHref={backHref}>
+          <CardHeader onBackClick={handleBackClick}>
             <CardTitle title={label} />
           </CardHeader>
         ) : null}
@@ -43,4 +57,4 @@ const Column: React.FC<IColumn> = React.forwardRef((props, ref: React.ForwardedR
   );
 });
 
-export default Column;
+export default withRouter(Column);
diff --git a/app/soapbox/features/edit_profile/index.js b/app/soapbox/features/edit_profile/index.js
index 4939bd13e01161b57d24f824187dff4ed83b9692..008711462c12b910721a5b56e423724cbc5fa76c 100644
GIT binary patch
delta 470
zcmZY6JxBs^7zS|cL(U7szVNg&PQCNIJH4w+QSpO3X|bSaiXei5C^4h2Aqa_rXsl-{
z8l=V?BIjBg8X6*+w7qhPwjeq!1aW#_c>X`$2ma+F-N%9MI^SBnZ~d~h#7JB?0yuP=
zK}&vkoC&NuQ!ogfcyjjP(Wl3!lSYB>2FudO2@0Z70eP0k1Iwa6ZbaHm)%_Y5Y_KJc
zs@V<~Rk!;tN0X}%1Y}-ru*bYvvqIhZ-S#H;;{G%J0#)l86?$v;mb6*zdL!7YeNRMN
zovwsUm=if1ib)i-{Z+Jr;U+O9P2ke&!?U!5dA<iLo(+^`BjTb7Kh-zhoR(kxXB772
z87;TqTkawv%Hr~Nj3kS+Vlf~T^dKD=!dY+{m4E^!G>crwg*RU>ZbJ-=0i{ie?UJCw
zQZW@iC-9yafKjzVQb(|$4&zicYr6rr>bTae9i`C$3??Nqq9nF9H?ynSuVs>UeMA|{
Ku4izUWPSl>X`Y?{

delta 880
zcmZXSO-~b16o!M8QmEC4P1;)8OxtN^`ekXGeuyo!!=_PUNMy&x(HW$n3}rfCfRL(j
z<HC(^qAL>O&W{DAu5jUkHNqdzA7EUVxM*UCapumzP?^QO=bU-p=bn>$e?IH`{=9E@
zr=R9!Awf;4E4M7H>rqYQ1yR=H*}BpYJKOzTUz<{7UTQUYS(Fs&QC(Tkb>+=@zR?o5
zCWa~FD`_}tjhE}Zq?8$Xc~ufbfiVRXMI^ePy3apYtjXehnMt)oMX5^<TRmDsZ6~cz
ziq;U)CI94t+NLUwZc(WobV@s3XHN{DHf2z>DRnho1@ibE@nR`6gyYZ{?%5m&2Xoj>
z+VCZAg%GS_Gv>mlpcBoK1&3)Xz6M80ymWIAA80#{jr@>Kk@{acie`u*@#_$cI(r3c
z>?nNkStRJ<Io=D}eTEkzvB|pK<KGMC&-pzO*BQSZoROQ1C_Y94J)9}#I^jHKbgwqo
zHlxpYGS|M5pKz>ffSjYvH^cf)d3)ndykW!GXKT=6Z}b|`b=5wkk_|J_r}#B)!RL4u
z1F;SAuN@mvYXewMxbZGFM`|0a8x2)&`f^x_-!i=K|MRVo{71qAU&VuVWf0z^y%S7c
z9YQ)khRI|OFY|ZRi_F4Vm{WKC@>UBJ4zg~%Rrkx88~9VWhzrGVCsf=~Z@d!3w~8O#
zN|Df0)eKzRB`j7QYR!Qs)oD^csNTU**#a-;M4a=2<3{}2yDyPvXFe~phG~xa2c1<V
A4*&oF