Merge pull request #27 from MyEtherWallet/donation_addresses

Fix instances where donation addresses were hardcoded

common/containers/Tabs/SendTransaction/components/Donate.jsx

@@ -2,6 +2,7 @@
 
 import React from 'react';
 import translate from 'translations';
+import { donationAddressMap } from 'config/data';
 
 export default class Donate extends React.Component {
   props: {
@@ -31,7 +32,7 @@ export default class Donate extends React.Component {
 
   onClick = () => {
     // FIXME move to config
-        this.props.onDonate('0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8', '1', 'ETH');
+    this.props.onDonate(donationAddressMap.ETH, '1', 'ETH');
 
     this.setState({ clicked: true });
   };

common/containers/Tabs/SendTransaction/index.jsx

@@ -15,6 +15,7 @@ import {
 import pickBy from 'lodash/pickBy';
 // import type { Transaction } from './types';
 import customMessages from './messages';
+import { donationAddressMap } from 'config/data';
 
 type State = {
   hasQueryString: boolean,
@@ -77,7 +78,15 @@ export class SendTransaction extends React.Component {
     const unitReadable = 'UNITREADABLE';
     const nodeUnit = 'NODEUNIT';
     const hasEnoughBalance = false;
-        const { to, value, unit, gasLimit, data, readOnly, hasQueryString } = this.state;
+    const {
+      to,
+      value,
+      unit,
+      gasLimit,
+      data,
+      readOnly,
+      hasQueryString
+    } = this.state;
     const customMessage = customMessages.find(m => m.to === to);
 
     // tokens
@@ -86,7 +95,7 @@ export class SendTransaction extends React.Component {
     return (
       <section className="container" style={{ minHeight: '50%' }}>
         <div className="tab-content">
-                    <main className="tab-pane active" ng-controller="sendTxCtrl">
+          <main className="tab-pane active">
 
             {hasQueryString &&
               <div className="alert alert-info">
@@ -129,7 +138,7 @@ export class SendTransaction extends React.Component {
                     </h4>
                   </div>
                   <AddressField
-                                        placeholder="0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8"
+                    placeholder={donationAddressMap.ETH}
                     value={this.state.to}
                     onChange={readOnly ? null : this.onAddressChange}
                   />

common/containers/Tabs/SendTransaction/messages.js

@@ -1,9 +1,10 @@
 // @flow
+import { donationAddressMap } from 'config/data';
 
 export default [
   {
     // donation address example
-        to: '0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8',
+    to: donationAddressMap.ETH,
     gasLimit: 21000,
     data: '',
     msg: 'Thank you for donating to MyEtherWallet. TO THE MOON!'

common/sagas/ens.js

@@ -4,6 +4,7 @@ import { delay } from 'redux-saga';
 import { cacheEnsAddress } from 'actions/ens';
 import type { ResolveEnsNameAction } from 'actions/ens';
 import { getEnsAddress } from 'selectors/ens';
+import { donationAddressMap } from 'config/data';
 
 function* resolveEns(action: ResolveEnsNameAction) {
   const ensName = action.payload;
@@ -25,7 +26,7 @@ function* resolveEns(action: ResolveEnsNameAction) {
     return;
   }
   yield call(delay, 1000);
-    yield put(cacheEnsAddress(ensName, '0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8'));
+  yield put(cacheEnsAddress(ensName, donationAddressMap.ETH));
 }
 
 export default function* notificationsSaga() {