3c0a33e · bridge · git.iko.soy

src/components/View.js+1−5

compare with master

unifiedsplit

@@ -70,11 +70,7 @@ function View({

70 className

71 )}

72 {...rest}>

73− <Flex.Item

74− as={Flex}

75− col

76− style={{ width: '48px' }}

77− className={cn(insetPadding)}>

73+ <Flex.Item as={Flex} col className={cn(insetPadding)}>

78 {showBackButton && !backIsLogout && (

74 {showBackButton && !backIsLogout && (

79 <MiniBackButton

75 <MiniBackButton

80 hpadding={!isMobile}

76 hpadding={!isMobile}

src/form/Inputs.js+2−1

@@ -18,6 +18,7 @@ const PLACEHOLDER_HD_PATH = DEFAULT_HD_PATH;

18const PLACEHOLDER_MNEMONIC =

19 'example crew supreme gesture quantum web media hazard theory mercy wing kitten';

20const PLACEHOLDER_TICKET = '~sampel-ticlyt-migfun-falmel';

21+const PLACEHOLDER_PASSWORD = '****-****-****-****';

21const PLACEHOLDER_ADDRESS = '0x';

22const PLACEHOLDER_ADDRESS = '0x';

22const PLACEHOLDER_HEX = '0x';

23const PLACEHOLDER_HEX = '0x';

23const PLACEHOLDER_PRIVATE_KEY =

24const PLACEHOLDER_PRIVATE_KEY =

@@ -44,7 +45,7 @@ export function TicketInput({ name, hidden, ...rest }) {

44 type={hidden ? 'password' : 'text'}

45 type={hidden ? 'password' : 'text'}

45 name={name}

46 name={name}

46 obscure={value => value.replace(/[^~-]+/g, '••••••')}

47 obscure={value => value.replace(/[^~-]+/g, '••••••')}

47− placeholder={PLACEHOLDER_TICKET}

48+ placeholder={PLACEHOLDER_PASSWORD}

48 autoCapitalize="none"

49 autoCapitalize="none"

49 autoCorrect="off"

50 autoCorrect="off"

50 accessory={

51 accessory={

src/views/Login.js+5−4

@@ -60,7 +60,7 @@ export default function Login() {

60 <View pop={pop} inset>

61 <Grid>

62 <Grid.Item full as={Text} className="flex justify-center mt9 mb7">

63− <Grid.Item as={Text} className="gray4">

63+ <Grid.Item as={Text} className="gray3">

64 Urbit ID / 

65 </Grid.Item>

66 <Grid.Item as={Text}>Login</Grid.Item>

@@ -88,9 +88,10 @@ export default function Login() {

88 )}

89 {isOther && (

90 <Grid.Item

91+ as={LinkButton}

91 onClick={() => setisOther(false)}

92 onClick={() => setisOther(false)}

92 full

93 full

93− className="t-center underline mt8">

94+ className="t-center underline f6 mt8">

94 Back

95 Back

95 </Grid.Item>

96 </Grid.Item>

96 )}

97 )}

@@ -102,9 +103,9 @@ export default function Login() {

102 as="a"

103 as="a"

103 href="https://github.com/urbit/bridge/releases"

104 href="https://github.com/urbit/bridge/releases"

104 className="us-none pointer">

105 className="us-none pointer">

105− <span className="underline">Offline </span>↗

106+ <span className="underline">Offline</span> ↗

106 </Flex.Item>

107 </Flex.Item>

107− <Flex.Item className="gray4">Version {version}</Flex.Item>

108+ <Flex.Item className="gray4">v{version}</Flex.Item>

108 </Flex>

109 </Flex>

109 </Footer>

110 </Footer>

110 </View>

111 </View>

src/views/Login/Keystore.js+2−2

@@ -1,6 +1,6 @@

1import React, { useCallback, useMemo } from 'react';

2import { Just } from 'folktale/maybe';

3−import { P, Grid } from 'indigo-react';

3+import { Text, Grid } from 'indigo-react';

4import * as keythereum from 'keythereum';

5

6import { useWallet } from 'store/wallet';

@@ -56,7 +56,7 @@ export default function Keystore({ className, goHome }) {

56

57 return (

58 <Grid className={className}>

59− <Grid.Item full as={P}>

59+ <Grid.Item full as={Text} className="f6 gray4 mb3">

60 Please upload your Ethereum keystore file. If your keystore file is

61 encrypted with a password, you'll also need to enter that below.

62 </Grid.Item>

src/views/Login/Ledger.js+1−4

@@ -150,10 +150,7 @@ export default function Ledger({ className, goHome }) {

150

151 const renderHTTPS = () => (

152 <>

153− <Grid.Item full as={H5}>

153+ <Grid.Item full as={Text} className="f6 gray4 mb3">

154− Authenticate With Your Ledger

155− </Grid.Item>

156− <Grid.Item full as={Text} className="f6 mb3">

157 Connect and authenticate to your Ledger, and then open the "Ethereum"

154 Connect and authenticate to your Ledger, and then open the "Ethereum"

158 application. If you're running on older firmware, make sure the "browser

155 application. If you're running on older firmware, make sure the "browser

159 support" option is turned on. To sign transactions, you'll also need to

156 support" option is turned on. To sign transactions, you'll also need to

src/views/Login/Metamask.js+1−4

@@ -47,10 +47,7 @@ function Unsupported() {

47function Login({ onSubmit, goHome }) {

48 return (

49 <>

50− <Grid.Item full as={H5}>

50+ <Grid.Item full as={Text} className="f6 gray4 mb3">

51− Authenticate with Metamask

52− </Grid.Item>

53− <Grid.Item full as={Text} className="f6 mb3">

54 If you wish to login with a different wallet, please change it in the

51 If you wish to login with a different wallet, please change it in the

55 Metamask extension

52 Metamask extension

56 </Grid.Item>

53 </Grid.Item>

src/views/Login/Mnemonic.js+1−1

@@ -113,7 +113,7 @@ export default function Mnemonic({ className, goHome }) {

113 <Grid.Item full as={FormError} />

114

115 <Grid.Item full as={SubmitButton} handleSubmit={handleSubmit}>

116− Continue

116+ Login

117 </Grid.Item>

118 </>

119 )}

src/views/Login/Other.js+1−1

@@ -32,10 +32,10 @@ const VIEWS = {

32};

33

34const OPTIONS = [

35+ { text: 'Metamask', value: NAMES.METAMASK },

35 { text: 'Mnemonic (BIP 39)', value: NAMES.MNEMONIC },

36 { text: 'Mnemonic (BIP 39)', value: NAMES.MNEMONIC },

36 { text: 'Ledger', value: NAMES.LEDGER },

37 { text: 'Ledger', value: NAMES.LEDGER },

37 { text: 'Trezor', value: NAMES.TREZOR },

38 { text: 'Trezor', value: NAMES.TREZOR },

38− { text: 'Metamask', value: NAMES.METAMASK },

39 { text: 'Ethereum Private Key', value: NAMES.PRIVATE_KEY },

40 { text: 'Ethereum Keystore', value: NAMES.KEYSTORE },

41];

src/views/Login/PrivateKey.js+1−1

@@ -53,7 +53,7 @@ export default function PrivateKey({ className, goHome }) {

53 />

54 <Grid.Item full as={FormError} />

55 <Grid.Item full as={SubmitButton} handleSubmit={handleSubmit}>

56− Continue

56+ Login

57 </Grid.Item>

58 </>

59 )}

src/views/Login/Ticket.js+1−1

@@ -276,7 +276,7 @@ export default function Ticket({ className, goHome }) {

276 ? 'Logging in...'

277 : isWarning

278 ? 'Login Anyway'

279− : 'Continue'

279+ : 'Login'

280 }

281 </Grid.Item>

282 </>

src/views/Login/Trezor.js+1−5

@@ -94,11 +94,7 @@ export default function Trezor({ className, goHome }) {

94

95 return (

96 <Grid className={className}>

97− <Grid.Item full as={H5}>

97+ <Grid.Item full as={Text} className="f6 gray4 mb3">

98− Authenticate With Your Trezor

99− </Grid.Item>

100−

101− <Grid.Item full as={Text} className="f6 mb3">

102 Connect and authenticate to your Trezor. If you'd like to use a custom

98 Connect and authenticate to your Trezor. If you'd like to use a custom

103 derivation path, you may enter it below.

99 derivation path, you may enter it below.

104 </Grid.Item>

100 </Grid.Item>