Browse Source

Merge branch 'develop' into decred-integration

gre-patch-1
meriadec 6 years ago
parent
commit
6fe203462c
No known key found for this signature in database GPG Key ID: 1D2FC2305E2CB399
  1. 2
      src/components/modals/Receive/steps/02-step-connect-device.js
  2. 10
      src/components/modals/Send/index.js

2
src/components/modals/Receive/steps/02-step-connect-device.js

@ -1,6 +1,7 @@
// @flow
import React, { Fragment } from 'react'
import { Trans } from 'react-i18next'
import Box from 'components/base/Box'
import Button from 'components/base/Button'
@ -9,7 +10,6 @@ import CurrencyDownStatusAlert from 'components/CurrencyDownStatusAlert'
import TrackPage from 'analytics/TrackPage'
import type { StepProps } from '../index'
import { Trans } from 'react-i18next'
export default function StepConnectDevice({ account, onChangeAppOpened }: StepProps) {
return (

10
src/components/modals/Send/index.js

@ -4,7 +4,7 @@ import React, { PureComponent } from 'react'
import invariant from 'invariant'
import { compose } from 'redux'
import { connect } from 'react-redux'
import {Trans, translate} from 'react-i18next'
import { Trans, translate } from 'react-i18next'
import { createStructuredSelector } from 'reselect'
import type { Account, Operation } from '@ledgerhq/live-common/lib/types'
@ -75,26 +75,26 @@ export type StepProps<Transaction> = DefaultStepProps & {
const createSteps = () => [
{
id: 'amount',
label: <Trans i18nKey='send.steps.amount.title'/>,
label: <Trans i18nKey="send.steps.amount.title" />,
component: StepAmount,
footer: StepAmountFooter,
},
{
id: 'device',
label: <Trans i18nKey='send.steps.connectDevice.title'/>,
label: <Trans i18nKey="send.steps.connectDevice.title" />,
component: StepConnectDevice,
footer: StepConnectDeviceFooter,
onBack: ({ transitionTo }) => transitionTo('amount'),
},
{
id: 'verification',
label: <Trans i18nKey='send.steps.verification.title'/>,
label: <Trans i18nKey="send.steps.verification.title" />,
component: StepVerification,
shouldPreventClose: true,
},
{
id: 'confirmation',
label: <Trans i18nKey='send.steps.confirmation.title'/>,
label: <Trans i18nKey="send.steps.confirmation.title" />,
component: StepConfirmation,
footer: StepConfirmationFooter,
onBack: ({ transitionTo, onRetry }) => {

Loading…
Cancel
Save