@@ -5,7 +5,7 @@ import * as ob from 'urbit-ob'
55
66import { Button, } from '../components/Base'
77import { Row, Col, H1, P, Anchor } from '../components/Base'
8−import { InnerLabel, GalaxyInput, AddressInput, ValidatedSigil, ShowBlockie, Form } from '../components/Base'
8+import { InnerLabel, GalaxyInput, AddressInput, ValidatedSigil, ShowBlockie } from '../components/Base'
99import StatelessTransaction from '../components/StatelessTransaction'
1010
1111import { BRIDGE_ERROR } from '../lib/error'
@@ -192,93 +192,90 @@ class CreateGalaxy extends React.Component {
192192 }
193193 </P>
194194
195− <Form>
196−
197− <GalaxyInput
198− className='mono'
199− prop-size='lg'
200− prop-format='innerLabel'
201− autoFocus
202− placeholder='e.g. ~zod'
203− value={state.galaxyName}
204− onChange={v => this.handleGalaxyNameInput(v)}>
205− <InnerLabel>{ 'Galaxy Name' }</InnerLabel>
206− <ValidatedSigil
207− className='tr-0 mt-05 mr-0 abs'
208− patp={state.galaxyName}
209− size={76}
210− margin={8} />
211− </GalaxyInput>
212−
213− <AddressInput
214− className='mono mt-8'
215− prop-size='lg'
216− prop-format='innerLabel'
217− value={ state.galaxyOwner }
218− onChange={ v => this.handleAddressInput(v) }>
219− <InnerLabel>
220− { 'Address that will own this galaxy' }
221− </InnerLabel>
222− <ShowBlockie
223− className={'mt-1'}
224− address={state.galaxyOwner} />
225− </AddressInput>
226−
227− <Anchor
195+ <GalaxyInput
196+ className='mono'
197+ prop-size='lg'
198+ prop-format='innerLabel'
199+ autoFocus
200+ placeholder='e.g. ~zod'
201+ value={state.galaxyName}
202+ onChange={v => this.handleGalaxyNameInput(v)}>
203+ <InnerLabel>{ 'Galaxy Name' }</InnerLabel>
204+ <ValidatedSigil
205+ className='tr-0 mt-05 mr-0 abs'
206+ patp={state.galaxyName}
207+ size={76}
208+ margin={8} />
209+ </GalaxyInput>
210+
211+ <AddressInput
212+ className='mono mt-8'
213+ prop-size='lg'
214+ prop-format='innerLabel'
215+ value={ state.galaxyOwner }
216+ onChange={ v => this.handleAddressInput(v) }>
217+ <InnerLabel>
218+ { 'Address that will own this galaxy' }
219+ </InnerLabel>
220+ <ShowBlockie
228221 className={'mt-1'}
229− prop-size={'sm'}
230− prop-disabled={!validAddress}
231− target={'_blank'}
232− href={`https://etherscan.io/address/${state.galaxyOwner}`}>
233− {'View on Etherscan ↗'}
234− </Anchor>
235−
236− <Button
237− prop-size='lg wide'
238− className='mt-8'
239− prop-color={buttonTriState(state.isAvailable)}
240− disabled={!validGalaxy}
241− onClick={() => this.confirmAvailability()}>
242− {buttonTriStateText(state.isAvailable)}
243− </Button>
244−
245− <StatelessTransaction
246− address={state.galaxyOwner}
247− shipName={state.galaxyName}
248− isAvailable={state.isAvailable}
249− web3={props.web3}
250− contracts={props.contracts}
251− wallet={props.wallet}
252− walletType={props.walletType}
253− walletHdPath={props.walletHdPath}
254− // Tx
255− txApproval={state.txApproval}
256− txn={state.txn}
257− stx={state.stx}
258− nonce={state.nonce}
259− gasPrice={state.gasPrice}
260− chainId={state.chainId}
261− gasLimit={state.gasLimit}
262− canGenerate={
263− validAddress === true &&
264− validGalaxy === true &&
265− state.isAvailable === true
266− }
267− canSign={!Maybe.Nothing.hasInstance(state.txn)}
268− canSend={!Maybe.Nothing.hasInstance(state.stx)}
269− // Methods
270− createUnsignedTxn={() => this.createUnsignedTxn()}
271− clearTransaction={() => this.clearTransaction()}
272− setApproval={() => this.setState({txApproval: !state.txApproval})}
273− setTxn={txn => this.setState({txn})}
274− setStx={stx => this.setState({stx})}
275− setNonce={nonce => this.setState({nonce})}
276− setChainId={chainId => this.setState({chainId})}
277− setGasPrice={gasPrice => this.setState({gasPrice})}
278− setGasLimit={gasLimit => this.setState({gasLimit})}
279− handleSubmit={this.handleSubmit} />
280−
281− </Form>
222+ address={state.galaxyOwner} />
223+ </AddressInput>
224+
225+ <Anchor
226+ className={'mt-1'}
227+ prop-size={'sm'}
228+ prop-disabled={!validAddress}
229+ target={'_blank'}
230+ href={`https://etherscan.io/address/${state.galaxyOwner}`}>
231+ {'View on Etherscan ↗'}
232+ </Anchor>
233+
234+ <Button
235+ prop-size='lg wide'
236+ className='mt-8'
237+ prop-color={buttonTriState(state.isAvailable)}
238+ disabled={!validGalaxy}
239+ onClick={() => this.confirmAvailability()}>
240+ {buttonTriStateText(state.isAvailable)}
241+ </Button>
242+
243+ <StatelessTransaction
244+ address={state.galaxyOwner}
245+ shipName={state.galaxyName}
246+ isAvailable={state.isAvailable}
247+ web3={props.web3}
248+ contracts={props.contracts}
249+ wallet={props.wallet}
250+ walletType={props.walletType}
251+ walletHdPath={props.walletHdPath}
252+ // Tx
253+ txApproval={state.txApproval}
254+ txn={state.txn}
255+ stx={state.stx}
256+ nonce={state.nonce}
257+ gasPrice={state.gasPrice}
258+ chainId={state.chainId}
259+ gasLimit={state.gasLimit}
260+ canGenerate={
261+ validAddress === true &&
262+ validGalaxy === true &&
263+ state.isAvailable === true
264+ }
265+ canSign={!Maybe.Nothing.hasInstance(state.txn)}
266+ canSend={!Maybe.Nothing.hasInstance(state.stx)}
267+ // Methods
268+ createUnsignedTxn={() => this.createUnsignedTxn()}
269+ clearTransaction={() => this.clearTransaction()}
270+ setApproval={() => this.setState({txApproval: !state.txApproval})}
271+ setTxn={txn => this.setState({txn})}
272+ setStx={stx => this.setState({stx})}
273+ setNonce={nonce => this.setState({nonce})}
274+ setChainId={chainId => this.setState({chainId})}
275+ setGasPrice={gasPrice => this.setState({gasPrice})}
276+ setGasLimit={gasLimit => this.setState({gasLimit})}
277+ handleSubmit={this.handleSubmit} />
278+
282279 </Col>
283280 </Row>
284281 )