status-im
/
MyCrypto
mirror of https://github.com/status-im/MyCrypto.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix merge conflicts

This commit is contained in:
Daniel Ternyak 2017-05-30 18:35:30 -05:00
parent e80ad3b053 e9cddb516e
commit 62dcec96d9
9 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/components/Footer/index.jsx
View File

@ -17,7 +17,7 @@ export default class Footer extends Component {
<p aria-hidden="true"> <p aria-hidden="true">
<a href="/"> <a href="/">
{/* TODO - don't hardcode image path*/} {/* TODO - don't hardcode image path*/}
<img src={"https://www.myetherwallet.com/images/logo-myetherwallet.svg"} <img src={'https://www.myetherwallet.com/images/logo-myetherwallet.svg'}
height="55px" width="auto" alt="Ether Wallet"/> height="55px" width="auto" alt="Ether Wallet"/>
</a> </a>
</p> </p>

14
common/containers/Tabs/GenerateWallet/components/GenerateWalletPasswordComponent.jsx
View File

@ -1,9 +1,9 @@
import React, {Component} from "react"; import React, {Component} from 'react';
import PropTypes from "prop-types"; import PropTypes from 'prop-types';
import {Field, reduxForm} from "redux-form"; import {Field, reduxForm} from 'redux-form';
import GenerateWalletPasswordInputComponent from "./GenerateWalletPasswordInputComponent"; import GenerateWalletPasswordInputComponent from './GenerateWalletPasswordInputComponent';
import LedgerTrezorWarning from "./LedgerTrezorWarning"; import LedgerTrezorWarning from './LedgerTrezorWarning';
import translate from "translations"; import translate from "translations";
@ -60,8 +60,8 @@ class GenerateWalletPasswordComponent extends Component {
generateWalletFile, generateWalletFile,
hasDownloadedWalletFile, hasDownloadedWalletFile,
generateWalletHasDownloadedFileAction, generateWalletHasDownloadedFileAction,
generateWalletContinueToPaperAction, generateWalletContinueToPaperAction
canProceedToPaper // canProceedToPaper
} = this.props; } = this.props;

8
common/containers/Tabs/GenerateWallet/components/GenerateWalletPasswordInputComponent.jsx
View File

@ -1,5 +1,5 @@
import React, {Component} from "react"; import React, {Component} from 'react';
import PropTypes from "prop-types"; import PropTypes from 'prop-types';
export default class GenerateWalletPasswordInputComponent extends Component { export default class GenerateWalletPasswordInputComponent extends Component {
@ -22,7 +22,7 @@ export default class GenerateWalletPasswordInputComponent extends Component {
<div className="input-group" style={{width: '100%'}}> <div className="input-group" style={{width: '100%'}}>
<input {...this.props.input} <input {...this.props.input}
name="password" name="password"
className={this.props.meta.error ? 'form-control is-invalid' : "form-control"} className={this.props.meta.error ? 'form-control is-invalid' : 'form-control'}
type={this.props.showPassword ? 'text' : 'password'} type={this.props.showPassword ? 'text' : 'password'}
placeholder="Do NOT forget to save this!" placeholder="Do NOT forget to save this!"
aria-label="Enter a strong password (at least 9 characters)"/> aria-label="Enter a strong password (at least 9 characters)"/>
@ -46,5 +46,3 @@ export default class GenerateWalletPasswordInputComponent extends Component {
} }
} }

2
common/containers/Tabs/GenerateWallet/components/LedgerTrezorWarning.jsx
View File

@ -1,4 +1,4 @@
import React from "react"; import React from 'react';
const LedgerTrezorWarning = () => ( const LedgerTrezorWarning = () => (
<section className="row"> <section className="row">

10
common/containers/Tabs/GenerateWallet/index.js
View File

@ -1,13 +1,13 @@
import GenerateWalletPasswordComponent from "./components/GenerateWalletPasswordComponent"; import GenerateWalletPasswordComponent from './components/GenerateWalletPasswordComponent';
import React, {Component} from "react"; import React, {Component} from 'react';
import {connect} from "react-redux"; import {connect} from 'react-redux';
import { import {
GENERATE_WALLET_FILE_ACTION, GENERATE_WALLET_FILE_ACTION,
GENERATE_WALLET_HAS_DOWNLOADED_FILE_ACTION, GENERATE_WALLET_HAS_DOWNLOADED_FILE_ACTION,
SHOW_GENERATE_WALLET_PASSWORD_ACTION, SHOW_GENERATE_WALLET_PASSWORD_ACTION,
GENERATE_WALLET_CONTINUE_TO_PAPER_ACTION GENERATE_WALLET_CONTINUE_TO_PAPER_ACTION
} from "actions/generateWallet"; } from 'actions/generateWallet';
import PropTypes from "prop-types"; import PropTypes from 'prop-types';
class GenerateWallet extends Component { class GenerateWallet extends Component {
constructor(props) { constructor(props) {

2
common/containers/Tabs/Help/index.js
View File

@ -1,4 +1,4 @@
import React from "react"; import React from 'react';
const Help = () => ( const Help = () => (
<section className="container" style={{minHeight: '50%'}}> <section className="container" style={{minHeight: '50%'}}>

2
common/containers/Tabs/ViewWallet/index.js
View File

@ -1,4 +1,4 @@
import React, {Component} from "react"; import React, {Component} from 'react';
export default class ViewWallet extends Component { export default class ViewWallet extends Component {
constructor(props) { constructor(props) {

2
common/reducers/generateWallet.js
View File

@ -4,7 +4,7 @@ import {
GENERATE_WALLET_HAS_DOWNLOADED_FILE, GENERATE_WALLET_HAS_DOWNLOADED_FILE,
GENERATE_WALLET_CONTINUE_TO_PAPER GENERATE_WALLET_CONTINUE_TO_PAPER
} from "actions/generateWallet"; } from 'actions/generateWallet';
const initialState = { const initialState = {

2
webpack_config/server.js
View File

@ -29,7 +29,7 @@ try {
const devMiddleWare = require('webpack-dev-middleware')(compiler, { const devMiddleWare = require('webpack-dev-middleware')(compiler, {
publicPath: webpackConfig.output.publicPath, publicPath: webpackConfig.output.publicPath,
quiet: false, quiet: true,
inline: true, inline: true,
headers: { headers: {
'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Origin': '*',