git.iko.soy/bridge
on master help sign in
other.js: cleaning up my typography descriptions,login.js: small copy changes
commit3c0a33e608eac63bdb97ecbef02bc7acf14a01ac authorJimmy <jyng02@gmail.com> dateMon 9 Mar 2020, 19:26 (7 years ago) parent615749c
11 files changed+17−29
compare with master
unifiedsplit
src/components/View.js+1−5 src/form/Inputs.js+2−1 src/views/Login.js+5−4 src/views/Login/Keystore.js+2−2 src/views/Login/Ledger.js+1−4 src/views/Login/Metamask.js+1−4 src/views/Login/Mnemonic.js+1−1 src/views/Login/Other.js+1−1 src/views/Login/PrivateKey.js+1−1 src/views/Login/Ticket.js+1−1 src/views/Login/Trezor.js+1−5
src/components/View.js+1−5
@@ -70,11 +70,7 @@ function View({
7070 className
7171 )}
7272 {...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)}>
7874 {showBackButton && !backIsLogout && (
7975 <MiniBackButton
8076 hpadding={!isMobile}
src/form/Inputs.js+2−1
@@ -18,6 +18,7 @@ const PLACEHOLDER_HD_PATH = DEFAULT_HD_PATH;
1818const PLACEHOLDER_MNEMONIC =
1919 'example crew supreme gesture quantum web media hazard theory mercy wing kitten';
2020const PLACEHOLDER_TICKET = '~sampel-ticlyt-migfun-falmel';
21+const PLACEHOLDER_PASSWORD = '****-****-****-****';
2122const PLACEHOLDER_ADDRESS = '0x';
2223const PLACEHOLDER_HEX = '0x';
2324const PLACEHOLDER_PRIVATE_KEY =
@@ -44,7 +45,7 @@ export function TicketInput({ name, hidden, ...rest }) {
4445 type={hidden ? 'password' : 'text'}
4546 name={name}
4647 obscure={value => value.replace(/[^~-]+/g, '••••••')}
47− placeholder={PLACEHOLDER_TICKET}
48+ placeholder={PLACEHOLDER_PASSWORD}
4849 autoCapitalize="none"
4950 autoCorrect="off"
5051 accessory={
src/views/Login.js+5−4
@@ -60,7 +60,7 @@ export default function Login() {
6060 <View pop={pop} inset>
6161 <Grid>
6262 <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">
6464 Urbit ID /&nbsp;
6565 </Grid.Item>
6666 <Grid.Item as={Text}>Login</Grid.Item>
@@ -88,9 +88,10 @@ export default function Login() {
8888 )}
8989 {isOther && (
9090 <Grid.Item
91+ as={LinkButton}
9192 onClick={() => setisOther(false)}
9293 full
93− className="t-center underline mt8">
94+ className="t-center underline f6 mt8">
9495 Back
9596 </Grid.Item>
9697 )}
@@ -102,9 +103,9 @@ export default function Login() {
102103 as="a"
103104 href="https://github.com/urbit/bridge/releases"
104105 className="us-none pointer">
105− <span className="underline">Offline </span>↗
106+ <span className="underline">Offline</span> ↗
106107 </Flex.Item>
107− <Flex.Item className="gray4">Version {version}</Flex.Item>
108+ <Flex.Item className="gray4">v{version}</Flex.Item>
108109 </Flex>
109110 </Footer>
110111 </View>
src/views/Login/Keystore.js+2−2
@@ -1,6 +1,6 @@
11import React, { useCallback, useMemo } from 'react';
22import { Just } from 'folktale/maybe';
3−import { P, Grid } from 'indigo-react';
3+import { Text, Grid } from 'indigo-react';
44import * as keythereum from 'keythereum';
55
66import { useWallet } from 'store/wallet';
@@ -56,7 +56,7 @@ export default function Keystore({ className, goHome }) {
5656
5757 return (
5858 <Grid className={className}>
59− <Grid.Item full as={P}>
59+ <Grid.Item full as={Text} className="f6 gray4 mb3">
6060 Please upload your Ethereum keystore file. If your keystore file is
6161 encrypted with a password, you'll also need to enter that below.
6262 </Grid.Item>
src/views/Login/Ledger.js+1−4
@@ -150,10 +150,7 @@ export default function Ledger({ className, goHome }) {
150150
151151 const renderHTTPS = () => (
152152 <>
153− <Grid.Item full as={H5}>
154− Authenticate With Your Ledger
155− </Grid.Item>
156− <Grid.Item full as={Text} className="f6 mb3">
153+ <Grid.Item full as={Text} className="f6 gray4 mb3">
157154 Connect and authenticate to your Ledger, and then open the "Ethereum"
158155 application. If you're running on older firmware, make sure the "browser
159156 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() {
4747function Login({ onSubmit, goHome }) {
4848 return (
4949 <>
50− <Grid.Item full as={H5}>
51− Authenticate with Metamask
52− </Grid.Item>
53− <Grid.Item full as={Text} className="f6 mb3">
50+ <Grid.Item full as={Text} className="f6 gray4 mb3">
5451 If you wish to login with a different wallet, please change it in the
5552 Metamask extension
5653 </Grid.Item>
src/views/Login/Mnemonic.js+1−1
@@ -113,7 +113,7 @@ export default function Mnemonic({ className, goHome }) {
113113 <Grid.Item full as={FormError} />
114114
115115 <Grid.Item full as={SubmitButton} handleSubmit={handleSubmit}>
116− Continue
116+ Login
117117 </Grid.Item>
118118 </>
119119 )}
src/views/Login/Other.js+1−1
@@ -32,10 +32,10 @@ const VIEWS = {
3232};
3333
3434const OPTIONS = [
35+ { text: 'Metamask', value: NAMES.METAMASK },
3536 { text: 'Mnemonic (BIP 39)', value: NAMES.MNEMONIC },
3637 { text: 'Ledger', value: NAMES.LEDGER },
3738 { text: 'Trezor', value: NAMES.TREZOR },
38− { text: 'Metamask', value: NAMES.METAMASK },
3939 { text: 'Ethereum Private Key', value: NAMES.PRIVATE_KEY },
4040 { text: 'Ethereum Keystore', value: NAMES.KEYSTORE },
4141];
src/views/Login/PrivateKey.js+1−1
@@ -53,7 +53,7 @@ export default function PrivateKey({ className, goHome }) {
5353 />
5454 <Grid.Item full as={FormError} />
5555 <Grid.Item full as={SubmitButton} handleSubmit={handleSubmit}>
56− Continue
56+ Login
5757 </Grid.Item>
5858 </>
5959 )}
src/views/Login/Ticket.js+1−1
@@ -276,7 +276,7 @@ export default function Ticket({ className, goHome }) {
276276 ? 'Logging in...'
277277 : isWarning
278278 ? 'Login Anyway'
279− : 'Continue'
279+ : 'Login'
280280 }
281281 </Grid.Item>
282282 </>
src/views/Login/Trezor.js+1−5
@@ -94,11 +94,7 @@ export default function Trezor({ className, goHome }) {
9494
9595 return (
9696 <Grid className={className}>
97− <Grid.Item full as={H5}>
98− Authenticate With Your Trezor
99− </Grid.Item>
100−
101− <Grid.Item full as={Text} className="f6 mb3">
97+ <Grid.Item full as={Text} className="f6 gray4 mb3">
10298 Connect and authenticate to your Trezor. If you'd like to use a custom
10399 derivation path, you may enter it below.
104100 </Grid.Item>