lukechilds
/
ledger-live-desktop
mirror of https://github.com/lukechilds/ledger-live-desktop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix countervalues to always reload based on the selector

master
Gaëtan Renaudeau 7 years ago
parent
056f0f4399
commit
99acefb311
5 changed files with 21 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      package.json
  2. 23
      src/components/SettingsPage/sections/Currencies.js
  3. 26
      src/components/SettingsPage/sections/Display.js
  4. 19
      src/components/modals/AddAccount/index.js
  5. 6
      yarn.lock

2
package.json
View File

@ -42,7 +42,7 @@
"@ledgerhq/hw-transport": "^4.12.0", "@ledgerhq/hw-transport": "^4.12.0",
"@ledgerhq/hw-transport-node-hid": "^4.12.0", "@ledgerhq/hw-transport-node-hid": "^4.12.0",
"@ledgerhq/ledger-core": "^1.2.0", "@ledgerhq/ledger-core": "^1.2.0",
"@ledgerhq/live-common": "^2.8.1", "@ledgerhq/live-common": "^2.9.1",
"axios": "^0.18.0", "axios": "^0.18.0",
"babel-runtime": "^6.26.0", "babel-runtime": "^6.26.0",
"bcryptjs": "^2.4.3", "bcryptjs": "^2.4.3",

23
src/components/SettingsPage/sections/Currencies.js
View File

@ -15,7 +15,6 @@ import type { Settings, CurrencySettings, T } from 'types/common'
import { counterValueCurrencySelector } from 'reducers/settings' import { counterValueCurrencySelector } from 'reducers/settings'
import { currenciesSelector } from 'reducers/accounts' import { currenciesSelector } from 'reducers/accounts'
import CounterValues from 'helpers/countervalues'
import SelectCurrency from 'components/SelectCurrency' import SelectCurrency from 'components/SelectCurrency'
import StepperNumber from 'components/base/StepperNumber' import StepperNumber from 'components/base/StepperNumber'
@ -138,21 +137,13 @@ class TabCurrencies extends PureComponent<Props, State> {
/> />
<Body> <Body>
<Row title="Exchange" desc="The exchange to use"> <Row title="Exchange" desc="The exchange to use">
<CounterValues.PollingConsumer> <ExchangeSelect
{polling => ( from={currency}
// TODO move to a dedicated "row" component to={counterValueCurrency}
<ExchangeSelect exchangeId={exchange}
from={currency} onChange={this.handleChangeExchange}
to={counterValueCurrency} style={{ minWidth: 200 }}
exchangeId={exchange} />
onChange={exchange => {
this.handleChangeExchange(exchange)
polling.poll()
}}
style={{ minWidth: 200 }}
/>
)}
</CounterValues.PollingConsumer>
</Row> </Row>
<Row <Row
title={t('settings:currencies.confirmationsToSpend')} title={t('settings:currencies.confirmationsToSpend')}

26
src/components/SettingsPage/sections/Display.js
View File

@ -10,7 +10,6 @@ import Select from 'components/base/Select'
import RadioGroup from 'components/base/RadioGroup' import RadioGroup from 'components/base/RadioGroup'
import IconDisplay from 'icons/Display' import IconDisplay from 'icons/Display'
import languageKeys from 'config/languages' import languageKeys from 'config/languages'
import CounterValues from 'helpers/countervalues'
import regionsByKey from 'helpers/regions.json' import regionsByKey from 'helpers/regions.json'
@ -135,22 +134,15 @@ class TabProfile extends PureComponent<Props, State> {
title={t('settings:display.counterValue')} title={t('settings:display.counterValue')}
desc={t('settings:display.counterValueDesc')} desc={t('settings:display.counterValueDesc')}
> >
<CounterValues.PollingConsumer> <Select
{polling => ( style={{ minWidth: 250 }}
<Select small
style={{ minWidth: 250 }} onChange={this.handleChangeCounterValue}
small itemToString={item => (item ? item.name : '')}
onChange={item => { renderSelected={item => item && item.name}
this.handleChangeCounterValue(item) items={fiats}
polling.poll() value={cachedCounterValue}
}} />
itemToString={item => (item ? item.name : '')}
renderSelected={item => item && item.name}
items={fiats}
value={cachedCounterValue}
/>
)}
</CounterValues.PollingConsumer>
</Row> </Row>
<Row title={t('settings:display.language')} desc={t('settings:display.languageDesc')}> <Row title={t('settings:display.language')} desc={t('settings:display.languageDesc')}>
<Select <Select

19
src/components/modals/AddAccount/index.js
View File

@ -28,7 +28,6 @@ import Button from 'components/base/Button'
import Modal, { ModalContent, ModalTitle, ModalFooter, ModalBody } from 'components/base/Modal' import Modal, { ModalContent, ModalTitle, ModalFooter, ModalBody } from 'components/base/Modal'
import StepConnectDevice from 'components/modals/StepConnectDevice' import StepConnectDevice from 'components/modals/StepConnectDevice'
import { getBridgeForCurrency } from 'bridge' import { getBridgeForCurrency } from 'bridge'
import CounterValues from 'helpers/countervalues'
import StepCurrency from './01-step-currency' import StepCurrency from './01-step-currency'
import StepImport from './03-step-import' import StepImport from './03-step-import'
@ -62,7 +61,6 @@ type Props = {
closeModal: Function, closeModal: Function,
t: T, t: T,
updateAccount: Function, updateAccount: Function,
counterValuesPolling: *,
} }
type State = { type State = {
@ -173,8 +171,6 @@ class AddAccountModal extends PureComponent<Props, State> {
selectedAccounts.forEach(a => addAccount({ ...a, archived: false })) selectedAccounts.forEach(a => addAccount({ ...a, archived: false }))
this.setState({ selectedAccounts: [] }) this.setState({ selectedAccounts: [] })
closeModal(MODAL_ADD_ACCOUNT) closeModal(MODAL_ADD_ACCOUNT)
this.props.counterValuesPolling.poll()
this.props.counterValuesPolling.flush()
} }
handleNextStep = () => { handleNextStep = () => {
@ -298,17 +294,4 @@ class AddAccountModal extends PureComponent<Props, State> {
) )
} }
} }
export default compose(connect(mapStateToProps, mapDispatchToProps), translate())(AddAccountModal)
// FIXME This is kinda ugly architecture right now.
// I think we should delegate more work to individual steps
// e.g. each step is responsible to connect to redux, not at top level.
const AddAccountModalAndCounterValues = props => (
<CounterValues.PollingConsumer>
{cvPolling => <AddAccountModal counterValuesPolling={cvPolling} {...props} />}
</CounterValues.PollingConsumer>
)
export default compose(connect(mapStateToProps, mapDispatchToProps), translate())(
AddAccountModalAndCounterValues,
)

6
yarn.lock
View File

@ -1460,9 +1460,9 @@
npm "^5.7.1" npm "^5.7.1"
prebuild-install "^2.2.2" prebuild-install "^2.2.2"
"@ledgerhq/live-common@^2.8.1": "@ledgerhq/live-common@^2.9.1":
version "2.8.1" version "2.9.1"
resolved "https://registry.yarnpkg.com/@ledgerhq/live-common/-/live-common-2.8.1.tgz#7b1ad72679c899d6f5abc911b9fe36dc08ccf8a7" resolved "https://registry.yarnpkg.com/@ledgerhq/live-common/-/live-common-2.9.1.tgz#fdf7e348cb72622f7ef703d8d70534e3ea4ce242"
dependencies: dependencies:
axios "^0.18.0" axios "^0.18.0"
invariant "^2.2.2" invariant "^2.2.2"

Write Preview
Loading…
Cancel
Save