Skip to content

Commit

Permalink
Initial v0.5 integration (#418)
Browse files Browse the repository at this point in the history
  • Loading branch information
floating authored May 5, 2021
1 parent 7885114 commit 3ab0b36
Show file tree
Hide file tree
Showing 27 changed files with 648 additions and 778 deletions.
12 changes: 7 additions & 5 deletions app/App/Panel/Local/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ class Settings extends React.Component {
this.networkType = context.store('main.currentNetwork.type')
const primaryCustom = context.store('main.networks', this.networkType, this.network, 'connection.primary.custom') || this.customMessage
const secondaryCustom = context.store('main.networks', this.networkType, this.network, 'connection.secondary.custom') || this.customMessage
const latticeEndpoint = context.store('main.lattice.endpoint')
const latticeEndpointMode = context.store('main.lattice.endpointMode')
const latticeSuffix = context.store('main.lattice.suffix')
const latticeEndpoint = context.store('main.latticeSettings.endpoint')
const latticeEndpointMode = context.store('main.latticeSettings.endpointMode')
const latticeSuffix = context.store('main.latticeSettings.suffix')
this.state = { localShake: {}, primaryCustom, secondaryCustom, latticeEndpoint, latticeSuffix, latticeEndpointMode, resetConfirm: false, expandNetwork: false }
context.store.observer(() => {
const { type, id } = context.store('main.currentNetwork')
Expand Down Expand Up @@ -102,6 +102,7 @@ class Settings extends React.Component {
clearTimeout(this.inputLatticeTimeout)
const value = e.target.value.replace(/\s+/g, '')
this.setState({ latticeEndpoint: value })
// TODO: Update to target specific Lattice device rather than global
this.inputLatticeTimeout = setTimeout(() => link.send('tray:action', 'setLatticeEndpoint', this.state.latticeEndpoint), 1000)
}

Expand All @@ -110,6 +111,7 @@ class Settings extends React.Component {
clearTimeout(this.inputLatticeSuffixTimeout)
const value = e.target.value.replace(/\s+/g, '')
this.setState({ latticeSuffix: value })
// TODO: Update to target specific Lattice device rather than global
this.inputLatticeSuffixTimeout = setTimeout(() => link.send('tray:action', 'setLatticeSuffix', this.state.latticeSuffix), 1000)
}

Expand Down Expand Up @@ -358,7 +360,7 @@ class Settings extends React.Component {
<div className='signerPermissionControls'>
<div className='signerPermissionOrigin'>Lattice Accounts</div>
<Dropdown
syncValue={this.store('main.lattice.accountLimit')}
syncValue={this.store('main.latticeSettings.accountLimit')}
onChange={(value) => link.send('tray:action', 'setLatticeAccountLimit', value)}
options={[
{ text: '1', value: 1 },
Expand All @@ -382,7 +384,7 @@ class Settings extends React.Component {
<div className='signerPermissionControls'>
<div className='signerPermissionOrigin'>Lattice Relay</div>
<Dropdown
syncValue={this.store('main.lattice.endpointMode')}
syncValue={this.store('main.latticeSettings.endpointMode')}
onChange={(value) => {

let newState = {
Expand Down
1 change: 1 addition & 0 deletions app/App/Panel/Main/Account/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,7 @@ class Account extends React.Component {
if (type === 'trezor') return <div className='signerSelectIconWrap signerIconHardware'>{svg.trezor(20)}</div>
if (type === 'seed' || type === 'ring') return <div className='signerSelectIconWrap signerIconHot'>{svg.flame(24)}</div>
if (type === 'aragon') return <div className='signerSelectIconWrap signerIconSmart'>{svg.aragon(28)}</div>
if (type === 'lattice') return <div className='signerSelectIconWrap signerIconSmart'>{svg.lattice(22)}</div>
return <div className='signerSelectIconWrap'>{svg.logo(20)}</div>
})()}
</div>
Expand Down
220 changes: 0 additions & 220 deletions app/App/Panel/Main/Add/AddGnosisSafe/index.js

This file was deleted.

Loading

0 comments on commit 3ab0b36

Please sign in to comment.