db5943c · bridge · git.iko.soy

src/bridge/components/StatelessTransaction.js+1−1

compare with master

unifiedsplit

@@ -431,7 +431,7 @@ class StatelessTransaction extends React.Component {

431 onClick={ setUserApproval }

432 state={ userApproval }

433 >

434− <div>

434+ <div onClick={ setUserApproval }>

435 { `I approve this transaction and wish to send.` }

436 </div>

437 </CheckboxButton>

src/bridge/lib/wallet.js+2−2

@@ -4,6 +4,7 @@ import keccak from 'keccak'

4import * as lodash from 'lodash'

5import Maybe from 'folktale/maybe'

6import * as secp256k1 from 'secp256k1'

7+import { isAddress } from 'web3-utils'

7

8

8const DEFAULT_HD_PATH = "m/44'/60'/0'/0/0"

9const DEFAULT_HD_PATH = "m/44'/60'/0'/0/0"

9

10

@@ -69,8 +70,7 @@ const stripHexPrefix = hex =>

69const keccak256 = str =>

70const keccak256 = str =>

70 keccak('keccak256').update(str).digest()

71 keccak('keccak256').update(str).digest()

71

72

72−const isValidAddress = (address) =>

73+const isValidAddress = isAddress

73− /^0x[0-9a-fA-F]{40}$/.test(address)

74

75const toChecksumAddress = (address) => {

76 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'

10import { Button } from '../../components/Base'

11import { ROUTE_NAMES } from '../../lib/router'

12

13−

14const isPlanet = point =>

13const isPlanet = point =>

15 parseInt(point, 10) > 65535

14 parseInt(point, 10) > 65535

16

15

@@ -137,7 +136,7 @@ const Actions = (props) => {

137 <Button

136 <Button

138 prop-size={'sm'}

137 prop-size={'sm'}

139 prop-type={'link'}

138 prop-type={'link'}

140− disabled={ !canAcceptTransfer }

139+ disabled={ online && !canAcceptTransfer }

141 onClick={ () => {

140 onClick={ () => {

142 pushRoute(ROUTE_NAMES.ACCEPT_TRANSFER)

141 pushRoute(ROUTE_NAMES.ACCEPT_TRANSFER)

143 }}

142 }}

@@ -159,7 +158,7 @@ const Actions = (props) => {

159 <Button

158 <Button

160 prop-size={'sm'}

159 prop-size={'sm'}

161 prop-type={'link'}

160 prop-type={'link'}

162− disabled={ !canGenKeyfile }

161+ disabled={ online && !canGenKeyfile }

163 onClick={ () => {

162 onClick={ () => {

164 pushRoute(ROUTE_NAMES.GEN_KEYFILE)

163 pushRoute(ROUTE_NAMES.GEN_KEYFILE)

165 }}

164 }}