status-im/MyCrypto
2
0
Fork 0
mirror of https://github.com/status-im/MyCrypto.git synced 2025-02-22 07:48:30 +00:00
Code Issues Projects Releases Wiki Activity

fix merge errors

Browse Source
This commit is contained in:
crptm 2017-07-04 06:22:16 +04:00
parent 40f2c4466a
commit bead2b30ad
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/config/data.js
View File

@ -7,6 +7,8 @@ export const DONATION_ADDRESSES_MAP = {
REP: '0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8'
};
export const donationAddressMap = DONATION_ADDRESSES_MAP;
export const languages = [
{
sign: 'en',

5
common/sagas/ens.js
View File

@ -6,6 +6,7 @@ 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) {
if (!action) return;
const ensName = action.payload;
@ -32,8 +33,4 @@ function* resolveEns(action?: ResolveEnsNameAction) {
export default function* notificationsSaga(): Generator<Effect, void, any> {
yield takeEvery('ENS_RESOLVE', resolveEns);
export default function* notificationsSaga() {
yield takeEvery('ENS_RESOLVE', resolveEns);
export default function* notificationsSaga() {
yield takeEvery('ENS_RESOLVE', resolveEns);
}