2059fcc · bridge · git.iko.soy

src/components/Buttons.js+4−1

compare with master

unifiedsplit

@@ -25,7 +25,10 @@ export const OfflineButton = props => (

25);

26

27export const BootArvoButton = props => (

28+ <OutButton

28− <OutButton href="https://urbit.org/docs/getting-started" detail="Boot your computer" {...props}>

29+ href="https://urbit.org/docs/getting-started"

30+ detail="Boot your computer"

31+ {...props}>

29 Boot Arvo

32 Boot Arvo

30 </OutButton>

33 </OutButton>

31);

34);

src/components/MiniBackButton.js+7−5

@@ -4,8 +4,10 @@ import { IconButton } from 'indigo-react';

4

5import { ReactComponent as Back } from 'assets/back.svg';

6

7−export default ({ className, ...rest }) => (

7+export default ({ className, isExit = false, ...rest }) => {

8+ return (

8− <IconButton {...rest}>

9+ <IconButton {...rest}>

9− <Back className={cn('black', className)} />

10+ {isExit ? '⏏' : <Back className={cn('black', className)} />}

10− </IconButton>

11+ </IconButton>

11−);

12+ );

13+};

src/components/View.js+4

@@ -7,6 +7,8 @@ import useBreakpoints from 'lib/useBreakpoints';

7import MiniBackButton from './MiniBackButton';

8import { useHistory } from 'store/history';

9

10+const EXPECT_LOGOUT_WHEN_POPPING_AT_DEPTH = 2;

11+

10// View is a top-level component that all Views must render to inherit styling

12// View is a top-level component that all Views must render to inherit styling

11function View({

13function View({

12 className,

14 className,

@@ -28,6 +30,7 @@ function View({

28 const goBack = useCallback(() => pop(), [pop]);

30 const goBack = useCallback(() => pop(), [pop]);

29

31

30 const showBackButton = size > 1 && !!pop;

32 const showBackButton = size > 1 && !!pop;

33+ const backIsLogout = size === EXPECT_LOGOUT_WHEN_POPPING_AT_DEPTH;

31

34

32 return (

35 return (

33 <Flex

36 <Flex

@@ -52,6 +55,7 @@ function View({

52 <MiniBackButton

55 <MiniBackButton

53 hpadding={!isMobile}

56 hpadding={!isMobile}

54 vpadding={isMobile}

57 vpadding={isMobile}

58+ isExit={backIsLogout}

55 onClick={goBack}

59 onClick={goBack}

56 />

60 />

57 )}

61 )}