diff --git a/.gitignore b/.gitignore index 12c18aa4a..8e74dfc48 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ node_modules .DS_Store bundle .cache +cache hot.json nohot.json config.json @@ -13,3 +14,4 @@ test/.userData .parcel-cache *.tsbuildinfo scripts +*.code-workspace diff --git a/app/App/Panel/Local/index.js b/app/App/Panel/Local/index.js index 03fa27d04..33d26e8f0 100644 --- a/app/App/Panel/Local/index.js +++ b/app/App/Panel/Local/index.js @@ -109,7 +109,11 @@ class Settings extends React.Component { inputLatticeSuffix (e) { e.preventDefault() clearTimeout(this.inputLatticeSuffixTimeout) - const value = e.target.value.replace(/\s+/g, '') + + // Lattice only supports a suffix of up to 24 characters, and we append "Frame-" + // to the front so limit it to 18 characters + const value = e.target.value.replace(/\s+/g, '').substring(0, 18) + 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) @@ -379,7 +383,9 @@ class Settings extends React.Component { onChange={(value) => link.send('tray:action', 'setLatticeAccountLimit', value)} options={[ { text: '5', value: 5 }, - { text: '10', value: 10 } + { text: '10', value: 10 }, + { text: '20', value: 20 }, + { text: '40', value: 40 }, ]} /> diff --git a/app/App/Panel/Main/Account/Requests/ChainRequest/index.js b/app/App/Panel/Main/Account/Requests/ChainRequest/index.js index bf5c82b7f..0f1e6dd5e 100644 --- a/app/App/Panel/Main/Account/Requests/ChainRequest/index.js +++ b/app/App/Panel/Main/Account/Requests/ChainRequest/index.js @@ -15,6 +15,7 @@ class ChainRequest extends React.Component { render () { const status = this.props.req.status const notice = this.props.req.notice + const type = this.props.req.type let requestClass = 'signerRequest' if (status === 'success') requestClass += ' signerRequestSuccess' if (status === 'declined') requestClass += ' signerRequestDeclined' @@ -50,36 +51,64 @@ class ChainRequest extends React.Component { ) : (