grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge master into jr-email-verification

Browse Source
This commit is contained in:
Jannis R
2016-12-09 16:52:44 +01:00
parent c249c51dd3 1213ada59c
commit eb1429237b
73 changed files with 584 additions and 780 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
js/src/modals/Verification/store.js
View File

@@ -19,9 +19,8 @@ import { sha3 } from '~/api/util/sha3';
import Contract from '~/api/contract';
import Contracts from '~/contracts';
import { checkIfVerified, checkIfRequested, awaitPuzzle } from '~/contracts/verification';
import checkIfTxFailed from '../../util/check-if-tx-failed';
import waitForConfirmations from '../../util/wait-for-block-confirmations';
import { checkIfVerified, checkIfRequested, awaitPuzzle } from '~/contracts/sms-verification';
import { checkIfTxFailed, waitForConfirmations } from '~/util/tx';
export const LOADING = 'fetching-contract';
export const QUERY_DATA = 'query-data';