f0a7c70 · bridge · git.iko.soy

git.iko.soy/bridge

wip: renaming, removing, reorganizing

- animation styles - unused values - linter issues

commitf0a7c702017274c953d4051f1dfe1d5ab10ce881 authortomholford <tomholford@users.noreply.github.com> dateWed 8 Sep 2021, 08:44 (5 years ago) parent754a6ac

7 files changed+3−26

compare with master

unifiedsplit

src/style/bridge.scss−12 src/style/activate.scss → src/style/fadeable.scss src/style/index.scss+2−2 src/views/Activate/ActivateCodeForm.tsx−2 src/views/Activate/ActivateHeader.tsx−5 src/views/Activate/MasterKeyReveal.tsx+1−1 src/views/Activate/useActivateFlowState.js−4

src/style/bridge.scss−12

@@ -28,15 +28,3 @@ div.copy-button-wide {

2828 font-size: 0.75rem;

2929 }

3030}

31−

32−// For fading content in and out

33−

34−.faded-out{

35− opacity:0;

36− transition: opacity 0.5s;

37−

38−}

39−.faded-in{

40− opacity:1;

41− transition: opacity 0.5s;

42−}

src/style/activate.scss → src/style/fadeable.scssrenamed

The content is the same.

src/style/index.scss+2−2

@@ -13,5 +13,5 @@

1313/* Bridge Styles */

1414@import './bridge.scss';

1515

16−/* Activate Flow animations */

17−@import './activate.scss';

16+/* Fade animations */

17+@import './fadeable.scss';

src/views/Activate/ActivateCodeForm.tsx−2

@@ -17,7 +17,6 @@ import { CheckboxInput, Grid } from 'indigo-react';

1717import { useCallback, useMemo, useRef } from 'react';

1818import { useActivateFlow } from './ActivateFlow';

1919import WarningBox from 'components/WarningBox';

20−import { CSSTransition } from 'react-transition-group';

2120import useRoller from 'lib/useRoller';

2221import useImpliedTicket from 'lib/useImpliedTicket';

2322import {

@@ -45,7 +44,6 @@ const ActivateCodeForm = ({ afterSubmit }: ActivateCodeFormProps) => {

4544 const didWarn = useRef<boolean>(false);

4645

4746 const {

48− isIn,

4947 setDerivedPoint,

5048 setDerivedWallet,

5149 setInviteWallet,

src/views/Activate/ActivateHeader.tsx−5

@@ -1,7 +1,4 @@

11import { Box, Text } from '@tlon/indigo-react';

2−import { DEFAULT_FADE_TIMEOUT } from 'lib/constants';

3−import { CSSTransition } from 'react-transition-group';

4−import { useActivateFlow } from './ActivateFlow';

52import withFadeable from './withFadeable';

74type ActivateHeaderProps = {

@@ -11,8 +8,6 @@ type ActivateHeaderProps = {

118};

129

1310const ActivateHeader = ({ copy }: ActivateHeaderProps) => {

14− const { isIn } = useActivateFlow();

15−

1611 return (

1712 <Box>

1813 <Text

src/views/Activate/MasterKeyReveal.tsx+1−1

@@ -12,7 +12,7 @@ import { useLocalRouter } from 'lib/LocalRouter';

1212import { FadeableActivateButton as ActivateButton } from './ActivateButton';

1313

1414const MasterKeyReveal = () => {

15− const { isIn, setIsIn } = useActivateFlow();

15+ const { setIsIn } = useActivateFlow();

1616 const { push, names } = useLocalRouter();

1717 const [showMasterKey, setShowMasterKey] = useState<boolean>(false);

1818 const [triggerAnimation, setTriggerAnimation] = useState<boolean>(false);

src/views/Activate/useActivateFlowState.js−4

@@ -7,7 +7,6 @@ export default function useActivateFlowState() {

77 const [derivedPoint, setDerivedPoint] = useState(Nothing());

88 const [generated, setGenerated] = useState(false);

99 const [incomingPoints, setIncomingPoints] = useState(Nothing());

10− const [isFaded, setIsFaded] = useState(false);

1110 const [isIn, setIsIn] = useState(false);

1211

1312 const reset = useCallback(() => {

@@ -16,7 +15,6 @@ export default function useActivateFlowState() {

1615 setDerivedPoint(Nothing());

1716 setGenerated(false);

1817 setIncomingPoints(Nothing());

19− setIsFaded(false);

2018 }, [

2119 setDerivedWallet,

2220 setInviteWallet,

@@ -36,8 +34,6 @@ export default function useActivateFlowState() {

3634 setGenerated,

3735 incomingPoints,

3836 setIncomingPoints,

39− isFaded,

40− setIsFaded,

4137 isIn,

4238 setIsIn,

4339 reset,