floating · floating · May 18, 2021 · May 18, 2021
diff --git a/app/App/Panel/Local/index.js b/app/App/Panel/Local/index.js
@@ -14,7 +14,7 @@ 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.latticeSettings.endpoint')
+    const latticeEndpoint = context.store('main.latticeSettings.endpointCustom')
     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 }
@@ -103,7 +103,7 @@ class Settings extends React.Component {
     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)
+    this.inputLatticeTimeout = setTimeout(() => link.send('tray:action', 'setLatticeEndpointCustom', this.state.latticeEndpoint), 1000)
   }
 
   inputLatticeSuffix (e) {
@@ -191,11 +191,6 @@ class Settings extends React.Component {
     presets = Object.keys(presets).map(i => ({ text: i, value: type + ':' + id + ':' + i }))
     presets = presets.concat(Object.keys(networkPresets.default).map(i => ({ text: i, value: type + ':' + id + ':' + i })))
     presets.push({ text: 'Custom', value: type + ':' + id + ':' + 'custom' })
-    let latticePresets = {
-      'default': 'https://signing.gridpl.us',
-      'custom': ''
-    }
-    latticePresets = Object.keys(latticePresets).map((el, i) => ({ text: el, value: latticePresets[el]}))
 
     const networkOptions = []
     Object.keys(networks).forEach(type => {
@@ -388,16 +383,8 @@ class Settings extends React.Component {
               <Dropdown
                   syncValue={this.store('main.latticeSettings.endpointMode')}
                   onChange={(value) => {
-
-                    let newState = {
-                      latticeEndpointMode: value
-                    }
-
-                    if (value === 'default') {
-                      link.send('tray:action', 'setLatticeEndpoint', latticePresets['default'])
-                    }
                     link.send('tray:action', 'setLatticeEndpointMode', value)
-                    this.setState(newState)
+                    this.setState({ latticeEndpointMode: value })
                   }}
                   options={[{ text: 'Default', value: 'default' }, { text: 'Custom', value: 'custom' }]}
               />

diff --git a/dash/App/Signer/index.js b/dash/App/Signer/index.js
@@ -12,7 +12,6 @@ class Signer extends React.Component {
       addressLimit: 4,
       latticePairCode: ''
     }
-    this.loadingStatus = ['loading', 'connecting', 'addresses']
   }
 
   status () {
@@ -96,11 +95,7 @@ class Signer extends React.Component {
           {this.status()}
         </div>
         {this.statusText()}
-        {this.loadingStatus.indexOf(this.props.status) > -1 ? (
-          <div className='signerLoading'>
-            <div className='signerLoadingLoader' />
-          </div>
-        ) : this.props.type === 'lattice' && this.props.status === 'pairing' ? (
+        {this.props.type === 'lattice' && this.props.status === 'pairing' ? (
           <div className='signerLatticePair'>
             <div className='signerLatticePairTitle'>Please input your Lattice's pairing code</div>
             <div className='signerLatticePairInput'>
@@ -123,7 +118,7 @@ class Signer extends React.Component {
               className='signerLatticePairSubmit'
             >Pair</div>
           </div>
-        ) : (
+        ) : this.props.status === 'ok' || this.props.status === 'locked' ? (
           <>
             <div className='signerAccountsTitle'>
               <span>{'Add & Remove Accounts'}</span>
@@ -158,6 +153,10 @@ class Signer extends React.Component {
               <div className='signerBottomPageNext' onMouseDown={() => this.nextPage()}>{svg.triangleLeft(20)}</div>
             </div>
           </>
+        ) : (
+          <div className='signerLoading'>
+            <div className='signerLoadingLoader' />
+          </div>
         )}
         <div className='signerDrawer' onMouseDown={() => this.setState({ showControls: !this.state.showControls })}>
           <div className='showControls'>

diff --git a/main/signers/lattice/Lattice/index.js b/main/signers/lattice/Lattice/index.js
@@ -27,39 +27,58 @@ class Lattice extends Signer {
     this.type = 'lattice'
     this.status = 'loading'
 
-    this.suffix = ''
-    this.baseUrl = ''
-    this.privKey = ''
-
     this.latticeObs = store.observer(() => {
-      this.config = store('main.lattice', deviceId) || {}
-      if (!this.config.privKey) {
-        store.updateLattice(deviceId, { privKey: crypto.randomBytes(32).toString('hex') })
-      } else {
-        if (
-          this.suffix !== this.config.suffix ||
-          this.baseUrl !== this.config.baseUrl ||
-          this.privKey !== this.config.privKey
-        ) {
-          this.client = this.createClient()
-        }
+      this.createClient()
+
+      if (this.accountLimit !== store('main.latticeSettings.accountLimit')) {
+        this.accountLimit = store('main.latticeSettings.accountLimit')
+        this.open()
       }
+
     })
 
     this.update()
     this.deviceStatus()
   }
 
   createClient () {
-    const { suffix, baseUrl, privKey } = this.config
-    const clientConfig = {
-      name: suffix ? `Frame-${suffix}` : 'Frame',
-      crypto: crypto,
-      timeout: 30000,
-      baseUrl,
-      privKey
+    let endpointMode, baseUrl, suffix, privKey
+    endpointMode = store('main.latticeSettings.endpointMode')
+    if (endpointMode === 'custom') {
+      baseUrl = store('main.latticeSettings.endpointCustom')
+    } else {
+      baseUrl = 'https://signing.gridpl.us'
+    }
+    suffix = store('main.latticeSettings.suffix')
+    privKey = store('main.lattice', this.deviceId, 'privKey')
+
+    if (
+      this.endpointMode !== endpointMode ||
+      this.suffix !== suffix ||
+      this.baseUrl !== baseUrl ||
+      this.privKey !== privKey
+    ) {
+      this.endpointMode = endpointMode
+      this.suffix = suffix
+      this.baseUrl = baseUrl
+      this.privKey = privKey
+      console.log('creating client with', {
+        name: suffix ? `Frame-${suffix}` : 'Frame',
+        timeout: 30000,
+        baseUrl,
+        privKey
+      })
+      this.client = new Client({
+        name: suffix ? `Frame-${suffix}` : 'Frame',
+        crypto: crypto,
+        timeout: 30000,
+        baseUrl,
+        privKey
+      })
+      this.status = 'disconnected'
+      this.update()
+      this.deviceStatus()
     }
-    return new Client(clientConfig)
   }
 
   async setPair (pin) {
@@ -76,12 +95,12 @@ class Lattice extends Signer {
 
   async open () {
     try {
-      if (this.config.deviceId) {
+      if (this.deviceId) {
         if (!this.client) throw new Error('Client not ready during open')
         this.status = 'connecting'
         this.update()
         const clientConnect = promisify(this.client.connect).bind(this.client)
-        this.paired = await clientConnect(this.config.deviceId)
+        this.paired = await clientConnect(this.deviceId)
         if (this.paired) {
           this.status = 'addresses'
           this.update()
@@ -94,6 +113,8 @@ class Lattice extends Signer {
         return new Error('No deviceId')
       }
     } catch (err) {
+      this.status = 'disconnected'
+      this.update()
       log.error('Lattice Open Error', err)
       return new Error(err)
     }
@@ -130,7 +151,7 @@ class Lattice extends Signer {
       this.update()
       return result
     } catch (err) {
-      this.status = 'locked'
+      this.status = err.message
       this.update()
       return []
     }
@@ -142,8 +163,8 @@ class Lattice extends Signer {
   }
 
   async deviceStatus () {
-    // this.pollStatus() // Unscheduled requets reult in errors
-    if (this.deviceStatusActive || this.verifyActive) return
+    // this.pollStatus() // Unscheduled requets result in errors
+    if (this.deviceStatusActive) return
     this.deviceStatusActive = true
     try {
       // If signer has no addresses, try deriving them

diff --git a/main/store/actions/index.js b/main/store/actions/index.js
@@ -132,6 +132,15 @@ module.exports = {
   setLatticeAccountLimit: (u, limit) => {
     u('main.latticeSettings.accountLimit', () => limit)
   },
+  setLatticeEndpointMode: (u, mode) => {
+    u('main.latticeSettings.endpointMode', () => mode)
+  },
+  setLatticeEndpointCustom: (u, url) => {
+    u('main.latticeSettings.endpointCustom', () => url)
+  },
+  setLatticeSuffix: (u, suffix) => {
+    u('main.latticeSettings.suffix', () => suffix)
+  },
   setLedgerDerivation: (u, value) => {
     u('main.ledger.derivation', () => value)
   },

diff --git a/main/store/state/index.js b/main/store/state/index.js
@@ -147,7 +147,10 @@ const initial = {
     menubarGasPrice: main('menubarGasPrice', false),
     lattice: main('lattice', {}),
     latticeSettings: {
-      accountLimit: main('latticeSettings.accountLimit', 4)
+      accountLimit: main('latticeSettings.accountLimit', 4),
+      endpointMode: main('latticeSettings.endpointMode', 'default'),
+      endpointCustom: main('latticeSettings.endpointCustom', ''),
+      suffix: main('latticeSettings.suffix', '')
     },
     ledger: {
       derivation: main('ledger.derivation', 'live'),