Skip to content

Commit

Permalink
0.3 (#352)
Browse files Browse the repository at this point in the history 
* Update ethereumjs-tx in hot signer

* Substantial maintenance
  • Loading branch information
@floating
floating committed Aug 21, 2020
1 parent ac31448 commit 10343aa
Show file tree
Hide file tree
Showing 43 changed files with 508 additions and 454 deletions.
4 changes: 2 additions & 2 deletions app/App/Components/Dropdown/index.js
View file
Expand Up @@ -56,8 +56,8 @@ const Dropdown = ({ options, syncValue, initialValue, style, className, onChange
onMouseDown={(e) => { setExpanded(!expanded) }}
>
<div className={`dropdownItems ${id}`} style={expanded ? {} : { marginTop }}>
{ options.map((option, index) => {
return <div key={option.text + index} className={`dropdownItem ${id}`} onMouseDown={() => handleSelect(index)}>{ option.text }</div>
{options.map((option, index) => {
return <div key={option.text + index} className={`dropdownItem ${id}`} onMouseDown={() => handleSelect(index)}>{option.text}</div>
})}
</div>
</div>
Expand Down
31 changes: 20 additions & 11 deletions app/App/Panel/Badge/index.js
View file
Expand Up @@ -13,12 +13,12 @@ class Bridge extends React.Component {
</div>
<div className='badgeInput'>
<div className='badgeInputButton'>
<div className='badgeInputInner' onMouseDown={() => this.store.updateBadge()}>{'Ok'}</div>
<div className='badgeInputInner' onMouseDown={() => this.store.updateBadge()}>Ok</div>
</div>
</div>
<div className='badgeInput'>
<div className='badgeInputButton'>
<div className='badgeInputInner' onMouseDown={() => link.send('tray:updateRestart')}>{'Restart Now'}</div>
<div className='badgeInputInner' onMouseDown={() => link.send('tray:updateRestart')}>Restart Now</div>
</div>
</div>
</div>
Expand All @@ -33,23 +33,32 @@ class Bridge extends React.Component {
</div>
<div className='badgeInput'>
<div className='badgeInputButton'>
<div className='badgeInputInner' onMouseDown={() => {
link.send('tray:installAvailableUpdate', true, false)
}}>{'Install Update'}</div>
<div
className='badgeInputInner' onMouseDown={() => {
link.send('tray:installAvailableUpdate', true, false)
}}
>{'Install Update'}
</div>
</div>
</div>
<div className='badgeInput'>
<div className='badgeInputButton'>
<div className='badgeInputInner' onMouseDown={() => {
link.send('tray:installAvailableUpdate', false, false)
}}>{'Remind Me Later'}</div>
<div
className='badgeInputInner' onMouseDown={() => {
link.send('tray:installAvailableUpdate', false, false)
}}
>{'Remind Me Later'}
</div>
</div>
</div>
<div className='badgeInput'>
<div className='badgeInputButton'>
<div className='badgeInputInner badgeInputSmall' onMouseDown={() => {
link.send('tray:installAvailableUpdate', false, true)
}}>{'Skip This Version'}</div>
<div
className='badgeInputInner badgeInputSmall' onMouseDown={() => {
link.send('tray:installAvailableUpdate', false, true)
}}
>{'Skip This Version'}
</div>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/App/Panel/Client/Status/index.js
View file
Expand Up @@ -7,7 +7,7 @@ const Status = ({ client }) => {
return (
<div className='connectionOptionStatus'>
<Indicator state={state} />
{ state === 'syncing' && !isNaN(syncPercentage) ? (
{state === 'syncing' && !isNaN(syncPercentage) ? (
<div className='connectionOptionStatusText'>{state} ({syncPercentage} %)</div>
) : (
<div className='connectionOptionStatusText'>{state}</div>
Expand Down
3 changes: 2 additions & 1 deletion app/App/Panel/Client/index.js
View file
Expand Up @@ -34,7 +34,8 @@ class Client extends React.Component {
<div className='signerPermissionOrigin' style={{ direction: 'initial' }}>{this.fullName(client)}</div>
<div
className={this.store(`main.clients.${client}.on`) ? 'signerPermissionToggle signerPermissionToggleOn' : 'signerPermissionToggle'}
onMouseDown={_ => this.toggle()}>
onMouseDown={_ => this.toggle()}
>
<div className='signerPermissionToggleSwitch' />
</div>
</div>
Expand Down
34 changes: 14 additions & 20 deletions app/App/Panel/Local/index.js
View file
@@ -1,7 +1,7 @@
import React from 'react'
import Restore from 'react-restore'
import link from '../../../link'
import Client from '../Client'
// import Client from '../Client'

import Dropdown from '../../Components/Dropdown'

Expand All @@ -28,10 +28,10 @@ class Settings extends React.Component {
<div className='appInfoLine appInfoLineReset'>
{this.state.resetConfirm ? (
<span className='appInfoLineResetConfirm'>
{'Are you sure?'} <span onMouseDown={() => link.send('tray:resetAllSettings')}>{'Yes'}</span> <span>{'/'}</span> <span onMouseDown={() => this.setState({ resetConfirm: false })}>{'No'}</span>
{'Are you sure?'} <span onMouseDown={() => link.send('tray:resetAllSettings')}>Yes</span> <span>/</span> <span onMouseDown={() => this.setState({ resetConfirm: false })}>No</span>
</span>
) : (
<span onMouseDown={() => this.setState({ resetConfirm: true })}>{'Reset All Settings & Data'}</span>
<span onMouseDown={() => this.setState({ resetConfirm: true })}>Reset All Settings & Data</span>
)}
</div>
<div className='appInfoLine appInfoLineVersion'>{'v' + require('../../../../package.json').version}</div>
Expand Down Expand Up @@ -91,7 +91,7 @@ class Settings extends React.Component {
quit () {
return (
<div className='quitFrame'>
<div onMouseDown={() => link.send('tray:quit')} className='quitFrameButton'>{'Quit'}</div>
<div onMouseDown={() => link.send('tray:quit')} className='quitFrameButton'>Quit</div>
</div>
)
}
Expand Down Expand Up @@ -124,7 +124,7 @@ class Settings extends React.Component {
<div className='localSettingsWrapFadeBot' />
<div className='localSettingsWrap'>
<div className='localSettingsTitle connectionTitle'>
<div>{'Connection'}</div>
<div>Connection</div>
<Dropdown
syncValue={this.store('main.connection.network')}
onChange={(network) => this.selectNetwork(network)}
Expand All @@ -138,7 +138,7 @@ class Settings extends React.Component {
<div className='signerPermission'>
<div className={this.store('main.connection.local.on') ? 'connectionOption connectionOptionOn' : 'connectionOption'}>
<div className='connectionOptionToggle'>
<div className='signerPermissionOrigin'>{'Local'}</div>
<div className='signerPermissionOrigin'>Local</div>
<div className={this.store('main.connection.local.on') ? 'signerPermissionToggle signerPermissionToggleOn' : 'signerPermissionToggle'} onMouseDown={_ => link.send('tray:action', 'toggleConnection', 'local')}>
<div className='signerPermissionToggleSwitch' />
</div>
Expand All @@ -153,7 +153,7 @@ class Settings extends React.Component {
<div className='signerOptionSetText'>{this.store('main.connection.local.type')}</div>
) : (_ => {
const status = this.store('main.connection.local.status')
if (status === 'not found' || status === 'loading' || status === 'disconnected') return <div>{'scanning...'}</div>
if (status === 'not found' || status === 'loading' || status === 'disconnected') return <div>scanning...</div>
return ''
})()}
<div className='signerOptionSetButton' />
Expand All @@ -166,7 +166,7 @@ class Settings extends React.Component {
<div className='signerPermission'>
<div className={this.store('main.connection.secondary.on') ? 'connectionOption connectionOptionOn' : 'connectionOption'}>
<div className='connectionOptionToggle'>
<div className='signerPermissionOrigin'>{'Secondary'}</div>
<div className='signerPermissionOrigin'>Secondary</div>
<div className={this.store('main.connection.secondary.on') ? 'signerPermissionToggle signerPermissionToggleOn' : 'signerPermissionToggle'} onMouseDown={_ => link.send('tray:action', 'toggleConnection', 'secondary')}>
<div className='signerPermissionToggleSwitch' />
</div>
Expand All @@ -190,17 +190,11 @@ class Settings extends React.Component {
</div>
</div>
</div>
{/* Local clients */}
<div className='localSettingsTitle connectionTitle'>
<div>{'Local Clients'}</div>
</div>
<Client client='parity' />
<Client client='ipfs' />

<div className='localSettingsTitle'>{'Settings'}</div>
<div className='localSettingsTitle'>Settings</div>
<div className='signerPermission'>
<div className='signerPermissionControls'>
<div className='signerPermissionOrigin'>{'Run on Startup'}</div>
<div className='signerPermissionOrigin'>Run on Startup</div>
<div className={this.store('main.launch') ? 'signerPermissionToggle signerPermissionToggleOn' : 'signerPermissionToggle'} onMouseDown={_ => link.send('tray:action', 'toggleLaunch')}>
<div className='signerPermissionToggleSwitch' />
</div>
Expand All @@ -211,7 +205,7 @@ class Settings extends React.Component {
</div>
<div className='signerPermission'>
<div className='signerPermissionControls'>
<div className='signerPermissionOrigin'>{'Glide'}</div>
<div className='signerPermissionOrigin'>Glide</div>
<div className={this.store('main.reveal') ? 'signerPermissionToggle signerPermissionToggleOn' : 'signerPermissionToggle'} onMouseDown={_ => link.send('tray:action', 'toggleReveal')}>
<div className='signerPermissionToggleSwitch' />
</div>
Expand All @@ -222,19 +216,19 @@ class Settings extends React.Component {
</div>
<div className='signerPermission'>
<div className='signerPermissionControls'>
<div className='signerPermissionOrigin'>{'Ledger Derivation Path'}</div>
<div className='signerPermissionOrigin'>Ledger Derivation Path</div>
<Dropdown
syncValue={this.store('main.ledger.derivation')}
onChange={(value) => link.send('tray:action', 'setLedgerDerivation', value)}
options={[{ text: 'Legacy', value: 'legacy' }, { text: 'Live', value: 'live' }]}
/>
</div>
<div className='signerPermissionDetails'>
{`Use Ledger's Legacy or Live derivation path`}
{'Use Ledger\'s Legacy or Live derivation path'}
</div>
</div>
{this.quit()}
<div className='viewLicense' onMouseDown={() => this.store.notify('openExternal', { url: 'https://github.com/floating/frame/blob/master/LICENSE' })}>{'View License'}</div>
<div className='viewLicense' onMouseDown={() => this.store.notify('openExternal', { url: 'https://github.com/floating/frame/blob/master/LICENSE' })}>View License</div>
</div>
{this.appInfo()}
</div>
Expand Down
37 changes: 20 additions & 17 deletions app/App/Panel/Main/Add/AddAragon/index.js
View file
Expand Up @@ -152,25 +152,25 @@ class AddAragon extends React.Component {
<div className='addAccountItemIconType addAccountItemIconSmart' style={{ paddingTop: '6px' }}>{svg.aragon(30)}</div>
<div className='addAccountItemIconHex addAccountItemIconHexSmart' />
</div>
<div className='addAccountItemTopTitle'>{'Aragon'}</div>
<div className='addAccountItemTopTitle'>{''}</div>
<div className='addAccountItemTopTitle'>Aragon</div>
<div className='addAccountItemTopTitle' />
</div>
<div className='addAccountItemSummary'>{'An Aragon smart account allows you to use your Aragon DAO with any dapp'}</div>
<div className='addAccountItemSummary'>An Aragon smart account allows you to use your Aragon DAO with any dapp</div>
<div className='addAccountItemOption'>
<div className='addAccountItemOptionIntro' onMouseDown={() => this.adding()}>
<div className='addAccountItemDeviceTitle'>{'Add Aragon Account'}</div>
<div className='addAccountItemDeviceTitle'>Add Aragon Account</div>
</div>
<div className='addAccountItemOptionSetup' style={{ transform: `translateX(-${100 * this.state.index}%)` }}>
<div className='addAccountItemOptionSetupFrames'>
<div className='addAccountItemOptionSetupFrame'>
<div className='addAccountItemOptionTitle'>{'enter dao name'}</div>
<div className='addAccountItemOptionTitle'>enter dao name</div>
<div className='addAccountItemOptionInputPhrase'>
<input tabIndex={'-1'} ref={this.forms[0]} value={this.state.name} onChange={e => this.onChange('name', e)} onFocus={e => this.onFocus('name', e)} onBlur={e => this.onBlur('name', e)} onKeyPress={e => { if (e.key === 'Enter') this.next() }} />
<input tabIndex='-1' ref={this.forms[0]} value={this.state.name} onChange={e => this.onChange('name', e)} onFocus={e => this.onFocus('name', e)} onBlur={e => this.onBlur('name', e)} onKeyPress={e => { if (e.key === 'Enter') this.next() }} />
</div>
<div className='addAccountItemOptionSubmit' onMouseDown={() => this.next()}>{'Next'}</div>
<div className='addAccountItemOptionSubmit' onMouseDown={() => this.next()}>Next</div>
</div>
<div className='addAccountItemOptionSetupFrame'>
<div className='addAccountItemOptionTitle'>{'Choose acting account'}</div>
<div className='addAccountItemOptionTitle'>Choose acting account</div>
<div className='addAccountItemOptionList'>
{Object.keys(this.store('main.accounts'))
.filter(id => this.accountFilter(id))
Expand All @@ -182,7 +182,7 @@ class AddAragon extends React.Component {
</div>
</div>
<div className='addAccountItemOptionSetupFrame'>
<div className='addAccountItemOptionTitle'>{'Choose acting address'}</div>
<div className='addAccountItemOptionTitle'>Choose acting address</div>
<div className='addAccountItemOptionList'>
{(this.store('main.accounts', this.state.actorId, 'addresses') || []).map((a, i) => {
return (
Expand All @@ -195,18 +195,21 @@ class AddAragon extends React.Component {
</div>
<div className='addAccountItemOptionSetupFrame'>
<div className='addAccountItemOptionTitle'>{this.state.status}</div>
{this.state.error ? <div className='addAccountItemOptionSubmit' onMouseDown={() => this.restart()}>{'try again'}</div> : null}
{this.state.error ? <div className='addAccountItemOptionSubmit' onMouseDown={() => this.restart()}>try again</div> : null}
</div>
</div>
</div>
</div>
<div className='addAccountItemSummary' onMouseDown={() => {
const net = this.store('main.connection.network')
const open = url => this.store.notify('openExternal', { url })
if (net === '1') return open('https://mainnet.aragon.org')
if (net === '4') return open('https://rinkeby.aragon.org')
return open('https://aragon.org')
}}>{'Don\'t have a dao? Create one'}</div>
<div
className='addAccountItemSummary' onMouseDown={() => {
const net = this.store('main.connection.network')
const open = url => this.store.notify('openExternal', { url })
if (net === '1') return open('https://mainnet.aragon.org')
if (net === '4') return open('https://rinkeby.aragon.org')
return open('https://aragon.org')
}}
>{'Don\'t have a dao? Create one'}
</div>
</div>
</div>
)
Expand Down
21 changes: 12 additions & 9 deletions app/App/Panel/Main/Add/AddHardware/index.js
View file
Expand Up @@ -29,23 +29,23 @@ class AddHardware extends React.Component {
<div className='addAccountItemIconHex addAccountItemIconHexHardware' />
</div>
<div className='addAccountItemTopTitle'>{this.deviceName}</div>
<div className='addAccountItemTopTitle'>{''}</div>
<div className='addAccountItemTopTitle' />
</div>
<div className='addAccountItemSummary'>{`Unlock your ${this.deviceName} to get started`}</div>
<div className='addAccountItemDevices'>
{untethered.length || tethered.length ? (
untethered.map((signer, i) => {
return (
<div className='addAccountItemDevice' key={signer.id}>
<div className='addAccountItemDeviceTitle'>{'Device Found'}</div>
<div className='addAccountItemDeviceTitle'>Device Found</div>
<div className='addAccountItemDeviceStatus'>{signer.status}</div>
</div>
)
}).concat(tethered.map((signer, i) => {
return (
<div className='addAccountItemDevice' key={signer.id} onMouseDown={() => this.store.toggleAddAccount()}>
<div className='addAccountItemDeviceTitle'>{'Device Found'}</div>
<div className='addAccountItemDeviceStatus'>{'Account Created'}</div>
<div className='addAccountItemDeviceTitle'>Device Found</div>
<div className='addAccountItemDeviceStatus'>Account Created</div>
</div>
)
}))
Expand All @@ -57,11 +57,14 @@ class AddHardware extends React.Component {
</div>
)}
</div>
<div className='addAccountItemSummary' onMouseDown={() => {
const open = url => this.store.notify('openExternal', { url })
if (this.deviceName === 'ledger') return open('https://shop.ledger.com/pages/ledger-nano-x?r=1fb484cde64f')
if (this.deviceName === 'trezor') return open('https://shop.trezor.io/?offer_id=10&aff_id=3270')
}}>{`Need a signer? Get a ${this.deviceName}`}</div>
<div
className='addAccountItemSummary' onMouseDown={() => {
const open = url => this.store.notify('openExternal', { url })
if (this.deviceName === 'ledger') return open('https://shop.ledger.com/pages/ledger-nano-x?r=1fb484cde64f')
if (this.deviceName === 'trezor') return open('https://shop.trezor.io/?offer_id=10&aff_id=3270')
}}
>{`Need a signer? Get a ${this.deviceName}`}
</div>
</div>
</div>
)
Expand Down

0 comments on commit 10343aa

Please sign in to comment.