git.iko.soy/bridge
on master help sign in
Merge pull request #104 from urbit/ui-improvements

Ui improvements

commitdb5943cf0a2160e555ec8709377028b92e75f41b authorChristopher Johnson <chris@cjohnson.io> dateMon 15 Apr 2019, 17:47 (8 years ago) parent90fb2f35a53c8c
3 files changed+5−6
compare with master
unifiedsplit
src/bridge/components/StatelessTransaction.js+1−1 src/bridge/lib/wallet.js+2−2 src/bridge/views/Point/Actions.js+2−3
src/bridge/components/StatelessTransaction.js+1−1
@@ -431,7 +431,7 @@ class StatelessTransaction extends React.Component {
431431 onClick={ setUserApproval }
432432 state={ userApproval }
433433 >
434− <div>
434+ <div onClick={ setUserApproval }>
435435 { `I approve this transaction and wish to send.` }
436436 </div>
437437 </CheckboxButton>
src/bridge/lib/wallet.js+2−2
@@ -4,6 +4,7 @@ import keccak from 'keccak'
44import * as lodash from 'lodash'
55import Maybe from 'folktale/maybe'
66import * as secp256k1 from 'secp256k1'
7+import { isAddress } from 'web3-utils'
78
89const DEFAULT_HD_PATH = "m/44'/60'/0'/0/0"
910
@@ -69,8 +70,7 @@ const stripHexPrefix = hex =>
6970const keccak256 = str =>
7071 keccak('keccak256').update(str).digest()
7172
72−const isValidAddress = (address) =>
73− /^0x[0-9a-fA-F]{40}$/.test(address)
73+const isValidAddress = isAddress
7474
7575const toChecksumAddress = (address) => {
7676 const addr = stripHexPrefix(address).toLowerCase()
src/bridge/views/Point/Actions.js+2−3
@@ -10,7 +10,6 @@ import { Row, Col, H2, P } from '../../components/Base'
1010import { Button } from '../../components/Base'
1111import { ROUTE_NAMES } from '../../lib/router'
1212
13−
1413const isPlanet = point =>
1514 parseInt(point, 10) > 65535
1615
@@ -137,7 +136,7 @@ const Actions = (props) => {
137136 <Button
138137 prop-size={'sm'}
139138 prop-type={'link'}
140− disabled={ !canAcceptTransfer }
139+ disabled={ online && !canAcceptTransfer }
141140 onClick={ () => {
142141 pushRoute(ROUTE_NAMES.ACCEPT_TRANSFER)
143142 }}
@@ -159,7 +158,7 @@ const Actions = (props) => {
159158 <Button
160159 prop-size={'sm'}
161160 prop-type={'link'}
162− disabled={ !canGenKeyfile }
161+ disabled={ online && !canGenKeyfile }
163162 onClick={ () => {
164163 pushRoute(ROUTE_NAMES.GEN_KEYFILE)
165164 }}