status-im/embark-area-51
2
0
Fork 0
mirror of https://github.com/status-im/embark-area-51.git synced 2025-02-17 01:37:26 +00:00
Code Issues Projects Releases Wiki Activity

PR feedback

Browse Source
This commit is contained in:
Anthony Laibe 2018-10-17 14:11:10 +01:00 committed by Pascal Precht
parent 3844d864e7
commit 4e23acb558
No known key found for this signature in database
GPG Key ID: 0EE28D8D6FD85D7D
4 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
embark-ui/src/actions/index.js
View File

@ -323,13 +323,13 @@ export const gasOracle = {
failure: (error) => action(GAS_ORACLE[FAILURE], {error}) failure: (error) => action(GAS_ORACLE[FAILURE], {error})
}; };
<<<<<<< HEAD
export const EXPLORER_SEARCH = createRequestTypes('EXPLORER_SEARCH'); export const EXPLORER_SEARCH = createRequestTypes('EXPLORER_SEARCH');
export const explorerSearch = { export const explorerSearch = {
request: (searchValue) => action(EXPLORER_SEARCH[REQUEST], {searchValue}), request: (searchValue) => action(EXPLORER_SEARCH[REQUEST], {searchValue}),
success: (searchResult) => action(EXPLORER_SEARCH[SUCCESS], {searchResult}), success: (searchResult) => action(EXPLORER_SEARCH[SUCCESS], {searchResult}),
failure: (error) => action(EXPLORER_SEARCH[FAILURE], {error}) failure: (error) => action(EXPLORER_SEARCH[FAILURE], {error})
======= };
export const WEB3_CONNECT = createRequestTypes('WEB3_CONNECT'); export const WEB3_CONNECT = createRequestTypes('WEB3_CONNECT');
export const web3Connect = { export const web3Connect = {
request: () => action(WEB3_CONNECT[REQUEST]), request: () => action(WEB3_CONNECT[REQUEST]),
@ -349,7 +349,6 @@ export const web3EstimateGas = {
request: (contract, args) => action(WEB3_ESTIMAGE_GAS[REQUEST], {contract, args}), request: (contract, args) => action(WEB3_ESTIMAGE_GAS[REQUEST], {contract, args}),
success: (gas, payload) => action(WEB3_ESTIMAGE_GAS[SUCCESS], {contract: payload.contract, gas}), success: (gas, payload) => action(WEB3_ESTIMAGE_GAS[SUCCESS], {contract: payload.contract, gas}),
failure: (error, payload) => action(WEB3_ESTIMAGE_GAS[FAILURE], {web3Error: error, contract: payload.contract}) failure: (error, payload) => action(WEB3_ESTIMAGE_GAS[FAILURE], {web3Error: error, contract: payload.contract})
>>>>>>> Adding option to switch deployment pipeline
}; };
// Web Socket // Web Socket

9
embark-ui/src/components/ContractsDeployment.js
View File

@ -1,5 +1,6 @@
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import React from 'react'; import React from 'react';
import FontAwesomeIcon from 'react-fontawesome';
import { import {
Row, Row,
Col, Col,
@ -47,7 +48,7 @@ const LayoutContract = ({contract, children}) => (
const DeploymentResult = ({deployment}) => { const DeploymentResult = ({deployment}) => {
if (deployment.running) { if (deployment.running) {
return <p>Deployment is in progress <i className="fa fa-spinner fa-spin fa-fw"/></p> return <p>Deployment is in progress <FontAwesomeIcon className="ml-1" name="spinner" spin/></p>
} }
if (deployment.error) { if (deployment.error) {
@ -73,7 +74,7 @@ const DeploymentResult = ({deployment}) => {
const GasEstimateResult = ({gasEstimate}) => { const GasEstimateResult = ({gasEstimate}) => {
if (gasEstimate.running) { if (gasEstimate.running) {
return <p>Gas Estimation is in progresss <i className="fa fa-spinner fa-spin fa-fw"/></p> return <p>Gas Estimation is in progresss <FontAwesomeIcon className="ml-1" name="spinner" spin/></p>
} }
if (gasEstimate.error) { if (gasEstimate.error) {
@ -197,7 +198,7 @@ const ContractsHeader = ({deploymentPipeline, updateDeploymentPipeline}) => (
onChange={() => updateDeploymentPipeline(DEPLOYMENT_PIPELINES.embark)} onChange={() => updateDeploymentPipeline(DEPLOYMENT_PIPELINES.embark)}
checked={deploymentPipeline === DEPLOYMENT_PIPELINES.embark} /> checked={deploymentPipeline === DEPLOYMENT_PIPELINES.embark} />
Embark Embark
<i className="ml-1 fa fa-question" id="embark-tooltip" /> <FontAwesomeIcon className="ml-1" name="question" id="embark-tooltip" />
<UncontrolledTooltip placement="bottom" target="embark-tooltip"> <UncontrolledTooltip placement="bottom" target="embark-tooltip">
Embark will deploy the contracts automatically for you each time there is a change in one of them. Embark will deploy the contracts automatically for you each time there is a change in one of them.
</UncontrolledTooltip> </UncontrolledTooltip>
@ -210,7 +211,7 @@ const ContractsHeader = ({deploymentPipeline, updateDeploymentPipeline}) => (
onChange={() => updateDeploymentPipeline(DEPLOYMENT_PIPELINES.injectedWeb3)} onChange={() => updateDeploymentPipeline(DEPLOYMENT_PIPELINES.injectedWeb3)}
checked={deploymentPipeline === DEPLOYMENT_PIPELINES.injectedWeb3} /> checked={deploymentPipeline === DEPLOYMENT_PIPELINES.injectedWeb3} />
Injected Web3 Injected Web3
<i className="ml-1 fa fa-question" id="web3-tooltip" /> <FontAwesomeIcon className="ml-1" name="question" id="web3-tooltip" />
<UncontrolledTooltip placement="bottom" target="web3-tooltip"> <UncontrolledTooltip placement="bottom" target="web3-tooltip">
You will have full control on your deployment You will have full control on your deployment
</UncontrolledTooltip> </UncontrolledTooltip>

9
embark-ui/src/reducers/index.js
View File

@ -1,14 +1,9 @@
import {combineReducers} from 'redux'; import {combineReducers} from 'redux';
<<<<<<< HEAD
import {REQUEST, SUCCESS, FAILURE, CONTRACT_COMPILE, FILES, LOGOUT, AUTHENTICATE, import {REQUEST, SUCCESS, FAILURE, CONTRACT_COMPILE, FILES, LOGOUT, AUTHENTICATE,
FETCH_CREDENTIALS, UPDATE_BASE_ETHER, CHANGE_THEME, FETCH_THEME, EXPLORER_SEARCH, FETCH_CREDENTIALS, UPDATE_BASE_ETHER, CHANGE_THEME, FETCH_THEME, EXPLORER_SEARCH,
SIGN_MESSAGE, VERIFY_MESSAGE, TOGGLE_BREAKPOINT} from "../actions"; SIGN_MESSAGE, VERIFY_MESSAGE, TOGGLE_BREAKPOINT,
import {EMBARK_PROCESS_NAME, DARK_THEME} from '../constants'; UPDATE_DEPLOYMENT_PIPELINE, WEB3_CONNECT, WEB3_DEPLOY, WEB3_ESTIMAGE_GAS} from "../actions";
=======
import {REQUEST, SUCCESS, FAILURE, CONTRACT_COMPILE, FILES, LOGOUT, AUTHENTICATE, CHANGE_THEME, FETCH_THEME,
FETCH_CREDENTIALS, UPDATE_BASE_ETHER, UPDATE_DEPLOYMENT_PIPELINE, WEB3_CONNECT, WEB3_DEPLOY, WEB3_ESTIMAGE_GAS} from "../actions";
import {EMBARK_PROCESS_NAME, DARK_THEME, DEPLOYMENT_PIPELINES} from '../constants'; import {EMBARK_PROCESS_NAME, DARK_THEME, DEPLOYMENT_PIPELINES} from '../constants';
>>>>>>> Adding option to switch deployment pipeline
const BN_FACTOR = 10000; const BN_FACTOR = 10000;
const VOID_ADDRESS = '0x0000000000000000000000000000000000000000'; const VOID_ADDRESS = '0x0000000000000000000000000000000000000000';

3
embark-ui/src/services/web3.js
View File

@ -12,8 +12,7 @@ export const connect = () => {
reject(error); reject(error);
} }
} else if (window.web3) { } else if (window.web3) {
const web3 = new Web3(window.web3.currentProvider); resolve(new Web3(window.web3.currentProvider));
resolve(web3);
} else { } else {
reject(Error('Non-Ethereum browser detected. You should use MetaMask!')); reject(Error('Non-Ethereum browser detected. You should use MetaMask!'));
} }