git.iko.soy/bridge
on master help sign in
Import folktale/maybe unqualified in auth views.
feb792eJared Tobin
src/bridge/views/Mnemonic.js+3−3
compare with master
unifiedsplit
@@ -1,5 +1,5 @@
1import * as bip39 from 'bip39'
1import * as bip39 from 'bip39'
2−import Maybe from 'folktale/maybe'
2+import { Just, Nothing } from 'folktale/maybe'
3import React from 'react'
3import React from 'react'
4import { Button } from '../components/Base'
4import { Button } from '../components/Base'
5import { Input, MnemonicInput, InnerLabel, InputCaption } from '../components/Base'
5import { Input, MnemonicInput, InnerLabel, InputCaption } from '../components/Base'
@@ -62,7 +62,7 @@ class Mnemonic extends React.Component {
62 const { setWallet, setAuthMnemonic, setWalletHdPath } = this.props
62 const { setWallet, setAuthMnemonic, setWalletHdPath } = this.props
63 const wallet = walletFromMnemonic(mnemonic, hdpath)
63 const wallet = walletFromMnemonic(mnemonic, hdpath)
64 setWallet(wallet)
64 setWallet(wallet)
65− setAuthMnemonic(Maybe.Just(mnemonic))
65+ setAuthMnemonic(Just(mnemonic))
66 setWalletHdPath(hdpath)
66 setWalletHdPath(hdpath)
67 }
67 }
68
68
@@ -114,7 +114,7 @@ class Mnemonic extends React.Component {
114
114
115 <Button
115 <Button
116 className={'mt-10'}
116 className={'mt-10'}
117− disabled={ Maybe.Nothing.hasInstance(wallet) }
117+ disabled={ Nothing.hasInstance(wallet) }
118 onClick={ () => {
118 onClick={ () => {
119 popRoute()
119 popRoute()
120 pushRoute(ROUTE_NAMES.SHIPS)
120 pushRoute(ROUTE_NAMES.SHIPS)
src/bridge/views/Shards.js+3−3
@@ -1,4 +1,4 @@
1−import Maybe from 'folktale/maybe'
1+import { Just, Nothing } from 'folktale/maybe'
2import React from 'react'
2import React from 'react'
3import { Button } from '../components/Base'
3import { Button } from '../components/Base'
4import { InnerLabel, ValidatedSigil, PointInput, ShardInput } from '../components/Base'
4import { InnerLabel, ValidatedSigil, PointInput, ShardInput } from '../components/Base'
@@ -87,7 +87,7 @@ class Shards extends React.Component {
87 const mnemonic = urbitWallet.ownership.seed
87 const mnemonic = urbitWallet.ownership.seed
88 const wallet = walletFromMnemonic(mnemonic, DEFAULT_HD_PATH)
88 const wallet = walletFromMnemonic(mnemonic, DEFAULT_HD_PATH)
89 setWallet(wallet)
89 setWallet(wallet)
90− setUrbitWallet(Maybe.Just(urbitWallet))
90+ setUrbitWallet(Just(urbitWallet))
91 }
91 }
92 }
92 }
93
93
@@ -183,7 +183,7 @@ class Shards extends React.Component {
183 <Button
183 <Button
184 className={'mt-4'}
184 className={'mt-4'}
185 prop-size={'xl wide'}
185 prop-size={'xl wide'}
186− disabled={ Maybe.Nothing.hasInstance(wallet) }
186+ disabled={ Nothing.hasInstance(wallet) }
187 onClick={ () => {
187 onClick={ () => {
188 popRoute()
188 popRoute()
189 pushRoute(ROUTE_NAMES.SHIPS)
189 pushRoute(ROUTE_NAMES.SHIPS)
src/bridge/views/Ticket.js+4−4
@@ -1,4 +1,4 @@
1−import Maybe from 'folktale/maybe'
1+import { Just, Nothing } from 'folktale/maybe'
2import React from 'react'
2import React from 'react'
3import { Button } from '../components/Base'
3import { Button } from '../components/Base'
4import { InnerLabel, ValidatedSigil, PointInput, TicketInput } from '../components/Base'
4import { InnerLabel, ValidatedSigil, PointInput, TicketInput } from '../components/Base'
@@ -66,7 +66,7 @@ class Ticket extends React.Component {
66 const mnemonic = urbitWallet.ownership.seed
66 const mnemonic = urbitWallet.ownership.seed
67 const wallet = walletFromMnemonic(mnemonic, DEFAULT_HD_PATH)
67 const wallet = walletFromMnemonic(mnemonic, DEFAULT_HD_PATH)
68 setWallet(wallet)
68 setWallet(wallet)
69− setUrbitWallet(Maybe.Just(urbitWallet))
69+ setUrbitWallet(Just(urbitWallet))
70
70
71 this.setState({
71 this.setState({
72 isUnlocking: false
72 isUnlocking: false
@@ -122,7 +122,7 @@ class Ticket extends React.Component {
122 <Button
122 <Button
123 className={'mt-8'}
123 className={'mt-8'}
124 prop-size={'lg wide'}
124 prop-size={'lg wide'}
125− disabled={this.state.isUnlocking || Maybe.Just.hasInstance(wallet)}
125+ disabled={this.state.isUnlocking || Just.hasInstance(wallet)}
126 // prop-color={this.buttonTriState(wallet)}
126 // prop-color={this.buttonTriState(wallet)}
127 onClick={() => this.walletFromTicket(ticket, pointName)}>
127 onClick={() => this.walletFromTicket(ticket, pointName)}>
128
128
@@ -137,7 +137,7 @@ class Ticket extends React.Component {
137 <Button
137 <Button
138 className={'mt-4'}
138 className={'mt-4'}
139 prop-size={'xl wide'}
139 prop-size={'xl wide'}
140− disabled={ Maybe.Nothing.hasInstance(wallet) }
140+ disabled={ Nothing.hasInstance(wallet) }
141 onClick={ () => {
141 onClick={ () => {
142 popRoute()
142 popRoute()
143 pushRoute(ROUTE_NAMES.SHIPS)
143 pushRoute(ROUTE_NAMES.SHIPS)