RESULT: ${JSON.stringify(res)}
` - ); - }).catch(err => { - jQuery("#upgradeAccount-info").html( - `ERROR: ${JSON.stringify(err)}
` - ); - }); - }) - .catch(err => { - jQuery("#upgradeAccount-info").html( - `ERROR: ${JSON.stringify(err)}
` - ); - }); - }); - $("#signMessage-click").click(function (e) { if (!isAccess) return; echojslib.extension.proofOfAuthority('This is example message!', jQuery("#signMessage-account")[0].value) diff --git a/extension/background.js b/extension/background.js index 97891ca0..e91efdba 100644 --- a/extension/background.js +++ b/extension/background.js @@ -65,6 +65,8 @@ let signMessageRequests = []; const providerNotification = new NotificationManager(); const signNotification = new NotificationManager(); +const tabUrls = {}; + const connectSubscribe = (status) => { try { switch (status) { @@ -102,7 +104,7 @@ const getNetwork = async () => { const createSocket = async (url) => { if (!url) { - const network = await getNetwork(); + const network = await storage.get('current_network') || NETWORKS[0]; ({ url } = network); @@ -199,10 +201,12 @@ const createNotification = (title = '', message = '') => { */ const createAccount = async (name, path) => { try { + storageSetDraft(FORM_SIGN_UP, 'loading', true); const network = await getNetwork(); const { error, example } = await validateAccountExist(name); if (error) { + storageSetDraft(FORM_SIGN_UP, 'loading', false); storageSetDraft(FORM_SIGN_UP, 'error', { error, example }); emitter.emit('offerName', error, example); return null; @@ -217,8 +221,9 @@ const createAccount = async (name, path) => { storage.remove(DRAFT_STORAGE_KEY); } catch (err) { await emitter.emit('addAccountError', FormatHelper.formatError(err)); - storageSetDraft(FORM_SIGN_UP, 'error', { error: FormatHelper.formatError(err), example: '' }); + } finally { + storageSetDraft(FORM_SIGN_UP, 'loading', false); } return null; @@ -261,11 +266,24 @@ const resolveAccounts = async () => { */ const onMessage = (request, sender, sendResponse) => { const { hostname } = urlParse(sender.tab.url); + const { id: tabId } = sender.tab; request = JSON.parse(JSON.stringify(request)); if (!request.method || !request.appId || request.appId !== APP_ID) return false; + if (request.method === 'closeTab') { + const indexFindRequest = providerRequests.findIndex((rq) => rq.origin === hostname); + if (indexFindRequest === -1) return true; + const indexTabId = providerRequests[indexFindRequest].tabs + .findIndex((id) => id === tabId); + if (indexTabId === -1) return true; + providerRequests[indexFindRequest].cbs.splice(indexTabId, 1); + providerRequests[indexFindRequest].ids.splice(indexTabId, 1); + providerRequests[indexFindRequest].tabs.splice(indexTabId, 1); + return true; + } + if (typeof processedOrigins[hostname] !== 'boolean') { if (request.method !== 'getAccess') { @@ -273,12 +291,20 @@ const onMessage = (request, sender, sendResponse) => { return true; } - if (providerRequests.find((p) => p.origin === hostname)) { - sendResponse({ id: request.id, error: 'Access has already requested' }); + const indexRequest = providerRequests.findIndex((p) => p.origin === hostname); + if (indexRequest !== -1) { + providerRequests[indexRequest].ids.push(request.id); + providerRequests[indexRequest].cbs.push(sendResponse); + providerRequests[indexRequest].tabs.push(tabId); return true; } - providerRequests.push({ origin: hostname, id: request.id, cb: sendResponse }); + providerRequests.push({ + origin: hostname, + tabs: [tabId], + ids: [request.id], + cbs: [sendResponse], + }); setBadge(); @@ -619,15 +645,16 @@ const onSwitchActiveAccount = (res) => { * @param {Boolean} status */ export const onProviderApproval = (err, id, status) => { - const request = providerRequests.find((r) => String(r.id) === id); + const request = providerRequests.find(({ ids }) => String(ids[0]) === id); if (!request) { return; } - request.cb({ error: err, id: request.id, status }); - providerRequests = providerRequests.filter((p) => p.id !== request.id); + request.ids.forEach((rId, index) => request.cbs[index]({ error: err, id: rId, status })); + + providerRequests = providerRequests.filter(({ ids }) => ids[0] !== request.ids[0]); processedOrigins[request.origin] = status; if (!providerRequests.length) { @@ -713,8 +740,8 @@ window.getList = () => requestQueue.map(({ id, data }) => ({ id, options: data } window.getPrivateKey = () => PrivateKey; window.getAes = () => aes; window.Transaction = () => Transaction; -window.getProviderMap = () => providerRequests.reduce((map, { id, origin }) => { - map[id] = origin; +window.getProviderMap = () => providerRequests.reduce((map, { ids: [reqId], origin }) => { + map[reqId] = origin; return map; }, {}); @@ -737,3 +764,6 @@ crypto.on('unlocked', onPinUnlock); extensionizer.runtime.onInstalled.addListener(onFirstInstall); extensionizer.browserAction.setBadgeText({ text: 'BETA' }); + + + diff --git a/extension/contentscript.js b/extension/contentscript.js index 6ad45e0b..6e8378ff 100644 --- a/extension/contentscript.js +++ b/extension/contentscript.js @@ -2,6 +2,7 @@ const extensionizer = require('./extensionizer'); const { APP_ID } = require('../src/constants/GlobalConstants'); +const getAccessRequest = {}; /** * inpage script injection to web page @@ -49,14 +50,28 @@ const onResponse = (res, origin = '*') => { * On Inpage message * @param event */ -const onMessage = (event) => { - - const { data } = event; +const onMessage = async (event) => { + const { data, origin } = event; if (data.target !== 'content' || !data.appId || data.appId !== APP_ID) return; try { - extensionizer.runtime.sendMessage(data, (res) => onResponse(res, event.origin)); + if (data.method !== 'getAccess') { + extensionizer.runtime.sendMessage(data, (res) => onResponse(res, event.origin)); + return; + } + if (!getAccessRequest[origin]) { + getAccessRequest[origin] = new Promise((resolve) => { + extensionizer.runtime.sendMessage(data, (res) => { + onResponse(res, event.origin); + resolve(res); + }); + }); + } else { + const result = await getAccessRequest[origin]; + result.id = event.data.id; + onResponse(result, event.origin); + } } catch (err) { if (err.message.match(/Invocation of form runtime\.connect/) && err.message.match(/doesn't match definition runtime\.connect/)) { console.error('Connection to background error, please reload the page', err); @@ -66,5 +81,12 @@ const onMessage = (event) => { } }; +window.addEventListener('beforeunload', () => { + extensionizer.runtime.sendMessage({ + method: 'closeTab', + appId: APP_ID, + }); +}); + window.addEventListener('message', onMessage, false); diff --git a/package.json b/package.json index 81b1e7b4..88b5f094 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "echo-bridge", "description": "The bridge between your web site and the Echo", - "version": "1.10.0", + "version": "1.10.2", "scripts": { "start": "cross-env NODE_ENV=local webpack-dev-server --mode development --progress --colors --history-api-fallback --hot --inline --port 8081", "build": "cross-env NODE_ENV=production webpack --progress --display-error-details --colors --mode production", @@ -24,7 +24,7 @@ "classnames": "^2.2.6", "config": "^1.30.0", "crypto-random-string": "^1.0.0", - "echojs-lib": "^1.4.0", + "echojs-lib": "^1.6.0", "events": "^3.0.0", "file-loader": "^1.1.11", "focus-trap-react": "^4.0.1", diff --git a/src/actions/BalanceActions.js b/src/actions/BalanceActions.js index 1bac908e..b043a97e 100644 --- a/src/actions/BalanceActions.js +++ b/src/actions/BalanceActions.js @@ -264,7 +264,7 @@ export const setFeeFormValue = () => async (dispatch, getState) => { }, callee: receiver, registrar: fromAccount, - type: OPERATIONS_IDS.CALL_CONTRACT, + type: OPERATIONS_IDS.CONTRACT_CALL, value: { amount: 0, asset_id: assets.get(balances.getIn([selectedFeeBalance, 'asset_type'])), @@ -376,7 +376,7 @@ export const send = () => async (dispatch, getState) => { }, callee: receiver, registrar: fromAccount, - type: OPERATIONS_IDS.CALL_CONTRACT, + type: OPERATIONS_IDS.CONTRACT_CALL, value: { asset_id: coreAsset, amount: 0, @@ -621,6 +621,15 @@ export const watchToken = (contractId) => async (dispatch, getState) => { } const accountId = getState().global.getIn(['account', 'id']); + const [, { code }] = contract; + + const isErc20Token = ValidateTransactionHelper.isErc20Contract(code); + + if (!isErc20Token) { + dispatch(setFormError(FORM_WATCH_TOKEN, 'contractId', 'Invalid token contract')); + dispatch(GlobalReducer.actions.set({ field: 'loading', value: false })); + return null; + } const { symbol, precision, balance } = await getTokenDetails(contractId, accountId); diff --git a/src/actions/ChainStoreAction.js b/src/actions/ChainStoreAction.js index 3c79b8cb..fd431bcc 100644 --- a/src/actions/ChainStoreAction.js +++ b/src/actions/ChainStoreAction.js @@ -6,6 +6,8 @@ import BalanceReducer from '../reducers/BalanceReducer'; import BlockchainReducer from '../reducers/BlockchainReducer'; import { initAssetsBalances, updateTokens } from './BalanceActions'; +import { setValue } from './FormActions'; +import { storageGetDraft } from './GlobalActions'; import echoService from '../services/echo'; @@ -15,13 +17,16 @@ import { } from '../constants/GlobalConstants'; import ChainStoreCacheNames from '../constants/ChainStoreConstants'; import { CONNECTION_ERROR_PATH } from '../constants/RouterConstants'; +import { FORM_SIGN_UP } from '../constants/FormConstants'; import storage from '../services/storage'; import history from '../history'; -import FormatHelper from '../helpers/FormatHelper'; import { updateHistory } from './HistoryActions'; +import FormatHelper from '../helpers/FormatHelper'; + + /** * copy object from ChainStore lib to redux every time when triggered, check connection * @returns {Function} @@ -38,6 +43,17 @@ export const subscribe = () => (dispatch) => { dispatch(updateHistory()); }; +/** + * check loading create account + * @returns {Function} + */ +export const checkActiveLoading = () => async (dispatch) => { + const draftStorage = await storageGetDraft(); + const signUp = draftStorage[FORM_SIGN_UP]; + const loading = signUp && signUp.loading; + dispatch(setValue(FORM_SIGN_UP, 'loading', loading)); + dispatch(GlobalReducer.actions.set({ field: 'loading', value: loading })); +}; /** * connect socket current network * @returns {Function} diff --git a/src/actions/GlobalActions.js b/src/actions/GlobalActions.js index d8305136..97e06556 100644 --- a/src/actions/GlobalActions.js +++ b/src/actions/GlobalActions.js @@ -6,7 +6,7 @@ import { initCrypto, setCryptoInfo, getCryptoInfo, removeCryptoInfo } from './Cr import history from '../history'; import { setFormError, setValue, toggleLoading } from './FormActions'; -import { disconnect, connect } from './ChainStoreAction'; +import { disconnect, connect, checkActiveLoading } from './ChainStoreAction'; import { getTokenDetails, initAssetsBalances, removeBalances } from './BalanceActions'; import { globals, loadRequests } from './SignActions'; @@ -377,7 +377,7 @@ export const onLogout = (name) => async (dispatch, getState) => { await dispatch(initAccount(accounts.getIn([networkName, 0]))); emitter.emit('activeAccountResponse', accounts.getIn([networkName, 0])); - history.push(CREATE_ACCOUNT_PATH); + history.push(INDEX_PATH); } catch (err) { dispatch(set('error', FormatHelper.formatError(err))); } @@ -446,7 +446,7 @@ export const loadInfo = () => async (dispatch, getState) => { Object.entries(tokens).forEach(([accountId, tokensArray]) => { tokensArray.forEach((id) => { - stateTokens = stateTokens.setIn([accountId, `1.14.${id}`], new Map({})); + stateTokens = stateTokens.setIn([accountId, `1.9.${id}`], new Map({})); }); }); @@ -680,8 +680,8 @@ export const switchAccountNetwork = (accountName, network) => async (dispatch) = */ export const globalInit = () => async (dispatch) => { await dispatch(connect()); - await dispatch(initCrypto()); + dispatch(checkActiveLoading()); }; /** diff --git a/src/actions/SignActions.js b/src/actions/SignActions.js index ae6541f8..997511d5 100644 --- a/src/actions/SignActions.js +++ b/src/actions/SignActions.js @@ -48,7 +48,7 @@ const getOperationFee = async (type, transaction) => { let tr = echoService.getChainLib().createTransaction(); - if (type === OPERATIONS_IDS.CALL_CONTRACT) { + if (type === OPERATIONS_IDS.CONTRACT_CALL) { options.fee = undefined; } @@ -206,6 +206,7 @@ export const removeTransaction = (id, isClose) => async (dispatch, getState) => dispatch(GlobalReducer.actions.setIn({ field: 'sign', params: { + transactions: new List(), current: null, }, })); @@ -296,13 +297,7 @@ export const requestHandler = (id, options) => async (dispatch, getState) => { return null; } - // const error = await dispatch(validateTransaction(options)); - // if (error) { - // emitter.emit('response', `${error}`, id, ERROR_STATUS); - // return null; - // } - - const transactions = getState().global.getIn(['sign', 'transactions']); + let transactions = getState().global.getIn(['sign', 'transactions']); if (!transactions.size) { dispatch(GlobalReducer.actions.setIn({ @@ -314,12 +309,17 @@ export const requestHandler = (id, options) => async (dispatch, getState) => { }), }, })); - // await dispatch(setTransaction({ id, options })); } + transactions = transactions.push({ id, options }); + + const dataToShow = await getFetchedData(transactions.get(0).options); dispatch(GlobalReducer.actions.setIn({ field: 'sign', - params: { transactions: transactions.push({ id, options }) }, + params: { + transactions, + dataToShow: new Map(dataToShow), + }, })); return null; diff --git a/src/constants/GlobalConstants.js b/src/constants/GlobalConstants.js index b7c2f5c9..e28247e4 100644 --- a/src/constants/GlobalConstants.js +++ b/src/constants/GlobalConstants.js @@ -154,3 +154,16 @@ export const STORE = 'keyval'; export const PATTERN_ID_MESSAGE = '*'; export const LENGTH_ID_MESSAGE = 10; + +export const ERC20_HASHES = { + 'totalSupply()': '18160ddd', + 'balanceOf(address)': '70a08231', + 'allowance(address,address)': 'dd62ed3e', + 'transfer(address,uint256)': 'a9059cbb', + 'approve(address,uint256)': '095ea7b3', + 'transferFrom(address,address,uint256)': '23b872dd', + 'Transfer(address,address,uint256)': 'ddf252ad', + 'decimals()': '313ce567', + 'symbol()': '95d89b41', +}; + diff --git a/src/constants/OperationConstants.js b/src/constants/OperationConstants.js index bdcb4867..1540b07d 100644 --- a/src/constants/OperationConstants.js +++ b/src/constants/OperationConstants.js @@ -76,18 +76,6 @@ export const operationFields = { field: 'key_auths', }, }, - upgradeAccount: { - account_to_upgrade: { - type: 'account_id', - }, - fee: { - type: 'asset_object', - hasProperties: 'asset_id', - }, - upgrade_to_lifetime_member: { - field: 'string', - }, - }, }; export const operationFieldsSend = { @@ -111,7 +99,7 @@ export const operationFieldsSend = { hasProperties: ['amount', 'asset_id'], }, }, - [OPERATIONS_IDS.CALL_CONTRACT]: { + [OPERATIONS_IDS.CONTRACT_CALL]: { fee: { type: 'asset_object', required: false, @@ -143,8 +131,7 @@ export const operationKeys = { createContract: 'registrar', createAccount: 'registrar', updateAccount: 'account', - upgradeAccount: 'account_to_upgrade', - [OPERATIONS_IDS.CALL_CONTRACT]: 'registrar', + [OPERATIONS_IDS.CONTRACT_CALL]: 'registrar', }; export const operationTypes = { @@ -154,11 +141,11 @@ export const operationTypes = { }, contract: { name: 'Contract call', - code: OPERATIONS_IDS.CALL_CONTRACT, + code: OPERATIONS_IDS.CONTRACT_CALL, }, createContract: { name: 'Contract create', - code: OPERATIONS_IDS.CREATE_CONTRACT, + code: OPERATIONS_IDS.CONTRACT_CREATE, }, createAccount: { name: 'Account create', @@ -168,10 +155,6 @@ export const operationTypes = { name: 'Update account', code: OPERATIONS_IDS.ACCOUNT_UPDATE, }, - upgradeAccount: { - name: 'Upgrade account', - code: OPERATIONS_IDS.ACCOUNT_UPGRADE, - }, }; export const historyOperations = [ diff --git a/src/constants/TransactionConstants.js b/src/constants/TransactionConstants.js index c114c863..cd2e1d28 100644 --- a/src/constants/TransactionConstants.js +++ b/src/constants/TransactionConstants.js @@ -11,46 +11,6 @@ export default { asset: 'amount.asset_id', }, }, - limit_order_create: { - value: OPERATIONS_IDS.LIMIT_ORDER_CREATE, - name: 'Place order', - options: { - from: 'seller', - subject: null, - value: 'amount_to_sell.amount', - asset: 'amount_to_sell.asset_id', - }, - }, - limit_order_cancel: { - value: OPERATIONS_IDS.LIMIT_ORDER_CANCEL, - name: 'Cancel order', - options: { - from: 'fee_paying_account', - subject: ['order', 'name'], - value: null, - asset: null, - }, - }, - call_order_update: { - value: OPERATIONS_IDS.CALL_ORDER_UPDATE, - name: 'Update margin', - options: { - from: 'funding_account', - subject: null, - value: null, - asset: null, - }, - }, - fill_order: { - value: OPERATIONS_IDS.FILL_ORDER, - name: 'Fill order', - options: { - from: 'account_id', - subject: ['order_id', null], - value: 'pays.amount', - asset: 'pays.asset_id', - }, - }, account_create: { value: OPERATIONS_IDS.ACCOUNT_CREATE, name: 'Account created', @@ -81,16 +41,6 @@ export default { asset: null, }, }, - account_upgrade: { - value: OPERATIONS_IDS.ACCOUNT_UPGRADE, - name: 'Upgrade Account', - options: { - from: 'account_to_upgrade', - subject: null, - value: null, - asset: null, - }, - }, account_transfer: { value: OPERATIONS_IDS.ACCOUNT_TRANSFER, name: 'Transfer Account', @@ -171,26 +121,6 @@ export default { asset: 'asset_id', }, }, - asset_settle: { - value: OPERATIONS_IDS.ASSET_SETTLE, - name: 'Asset settlement', - options: { - from: 'account', - subject: null, - value: 'amount.amount', - asset: 'amount.asset_id', - }, - }, - asset_global_settle: { - value: OPERATIONS_IDS.ASSET_GLOBAL_SETTLE, - name: 'Global asset settlement', - options: { - from: 'issuer', - subject: null, - value: 'settle_price', - asset: 'asset_to_settle', - }, - }, asset_publish_feed: { value: OPERATIONS_IDS.ASSET_PUBLISH_FEED, name: 'Publish feed', @@ -231,46 +161,6 @@ export default { asset: null, }, }, - withdraw_permission_create: { - value: OPERATIONS_IDS.WITHDRAW_PERMISSION_CREATE, - name: 'Create withdrawal permission', - options: { - from: 'withdraw_from_account', - subject: null, - value: null, - asset: null, - }, - }, - withdraw_permission_update: { - value: OPERATIONS_IDS.WITHDRAW_PERMISSION_UPDATE, - name: 'Update withdrawal permission', - options: { - from: 'withdraw_from_account', - subject: null, - value: null, - asset: null, - }, - }, - withdraw_permission_claim: { - value: OPERATIONS_IDS.WITHDRAW_PERMISSION_CLAIM, - name: 'Claim withdrawal permission', - options: { - from: 'withdraw_from_account', - subject: ['withdraw_to_account', 'name'], - value: 'amount_to_withdraw.amount', - asset: 'amount_to_withdraw.asset_id', - }, - }, - withdraw_permission_delete: { - value: OPERATIONS_IDS.WITHDRAW_PERMISSION_DELETE, - name: 'Delete withdrawal permission', - options: { - from: 'withdraw_from_account', - subject: null, - value: null, - asset: null, - }, - }, committee_member_create: { value: OPERATIONS_IDS.COMMITTEE_MEMBER_CREATE, name: 'Create committee member', @@ -321,26 +211,6 @@ export default { asset: 'amount.asset_id', }, }, - custom: { - value: OPERATIONS_IDS.CUSTOM, - name: 'Custom', - options: { - from: 'payer', - subject: null, - value: null, - asset: null, - }, - }, - assert: { - value: OPERATIONS_IDS.ASSERT, - name: 'Assert operation', - options: { - from: 'fee_paying_account', - subject: null, - value: null, - asset: null, - }, - }, balance_claim: { value: OPERATIONS_IDS.BALANCE_CLAIM, name: 'Claim balance', @@ -361,16 +231,6 @@ export default { asset: 'amount.asset_id', }, }, - asset_settle_cancel: { - value: OPERATIONS_IDS.ASSET_SETTLE_CANCEL, - name: 'Cancel asset settlement', - options: { - from: 'account', - subject: null, - value: 'amount.amount', - asset: 'amount.asset_id', - }, - }, asset_claim_fees: { value: OPERATIONS_IDS.ASSET_CLAIM_FEES, name: 'Claim asset fees', @@ -382,7 +242,7 @@ export default { }, }, contract: { - value: OPERATIONS_IDS.CREATE_CONTRACT, + value: OPERATIONS_IDS.CONTRACT_CREATE, name: 'Contract created', options: { from: 'registrar', @@ -391,9 +251,9 @@ export default { asset: 'value.asset_id', }, }, - call_contract: { - value: OPERATIONS_IDS.CALL_CONTRACT, - name: 'Call contract', + contract_call: { + value: OPERATIONS_IDS.CONTRACT_CALL, + name: 'Contract call', options: { from: 'registrar', subject: null, @@ -412,7 +272,7 @@ export default { }, }, change_sidechain_config: { - value: OPERATIONS_IDS.CHANGE_SIDECHAIN_CONFIG, + value: OPERATIONS_IDS.SIDECHAIN_CHANGE_CONFIG, name: 'Change sidechain config', options: { from: null, @@ -441,9 +301,9 @@ export default { asset: 'amount.asset_id', }, }, - generate_eth_address: { - value: OPERATIONS_IDS.GENERATE_ETH_ADDRESS, - name: 'Generate eth address', + sidechain_eth_create_address: { + value: OPERATIONS_IDS.SIDECHAIN_ETH_CREATE_ADDRESS, + name: 'Sidechain eth create address', options: { from: 'account', subject: null, @@ -451,9 +311,9 @@ export default { asset: null, }, }, - create_eth_address: { - value: OPERATIONS_IDS.CREATE_ETH_ADDRESS, - name: 'Create eth address', + sidechain_eth_approve_address: { + value: OPERATIONS_IDS.SIDECHAIN_ETH_APPROVE_ADDRESS, + name: 'Sidechain eth approve address', options: { from: 'account', subject: null, @@ -461,9 +321,9 @@ export default { asset: null, }, }, - deposit_eth: { - value: OPERATIONS_IDS.DEPOSIT_ETH, - name: 'Deposit eth', + sidechain_eth_deposit: { + value: OPERATIONS_IDS.SIDECHAIN_ETH_DEPOSIT, + name: 'Sidechain eth deposit', options: { from: 'committee_member_id', subject: ['account', 'name'], @@ -471,9 +331,9 @@ export default { asset: null, }, }, - withdraw_eth: { - value: OPERATIONS_IDS.WITHDRAW_ETH, - name: 'Withdraw eth', + sidechain_eth_withdraw: { + value: OPERATIONS_IDS.SIDECHAIN_ETH_WITHDRAW, + name: 'Sidechain eth withdraw', options: { from: 'account', subject: ['eth_addr'], @@ -481,9 +341,9 @@ export default { asset: null, }, }, - approve_withdraw_eth: { - value: OPERATIONS_IDS.APPROVE_WITHDRAW_ETH, - name: 'Approve withdraw eth', + sidechain_eth_approve_withdraw: { + value: OPERATIONS_IDS.SIDECHAIN_ETH_APPROVE_WITHDRAW, + name: 'Sidechain eth approve withdraw', options: { from: 'committee_member_id', subject: ['withdraw_id'], @@ -512,7 +372,7 @@ export default { }, }, sidechain_issue: { - value: OPERATIONS_IDS.SIDECHAIN_ISSUE, + value: OPERATIONS_IDS.SIDECHAIN_ETH_ISSUE, name: 'Sidechain issue', options: { from: 'account', @@ -522,7 +382,7 @@ export default { }, }, sidechain_burn: { - value: OPERATIONS_IDS.SIDECHAIN_BURN, + value: OPERATIONS_IDS.SIDECHAIN_ETH_BURN, name: 'Sidechain burn', options: { from: 'account', @@ -532,7 +392,7 @@ export default { }, }, register_erc20_token: { - value: OPERATIONS_IDS.REGISTER_ERC20_TOKEN, + value: OPERATIONS_IDS.SIDECHAIN_ERC20_REGISTER_TOKEN, name: 'Register ERC20 token', options: { from: 'account', @@ -542,7 +402,7 @@ export default { }, }, deposit_erc20_token: { - value: OPERATIONS_IDS.DEPOSIT_ERC20_TOKEN, + value: OPERATIONS_IDS.SIDECHAIN_ERC20_DEPOSIT_TOKEN, name: 'Deposit ERC20 token', options: { from: 'account', @@ -552,7 +412,7 @@ export default { }, }, withdraw_erc20_token: { - value: OPERATIONS_IDS.WITHDRAW_ERC20_TOKEN, + value: OPERATIONS_IDS.SIDECHAIN_ERC20_WITHDRAW_TOKEN, name: 'Withdraw ERC20 token', options: { from: 'account', @@ -562,7 +422,7 @@ export default { }, }, approve_erc20_token_withdraw: { - value: OPERATIONS_IDS.APPROVE_ERC20_TOKEN_WITHDRAW, + value: OPERATIONS_IDS.SIDECHAIN_ERC20_APPROVE_TOKEN_WITHDRAW, name: 'Approve ERC20 token withdraw', options: { from: 'account', diff --git a/src/containers/App.jsx b/src/containers/App.jsx index ef8fc334..64da2903 100644 --- a/src/containers/App.jsx +++ b/src/containers/App.jsx @@ -15,7 +15,6 @@ import { PIN_PATHS, SIGN_TRANSACTION_PATH, CONNECTION_ERROR_PATH } from '../cons import bridgeLogo from '../assets/images/bridge-logo-hor-bw.svg'; - class App extends React.Component { @@ -40,7 +39,9 @@ class App extends React.Component { } renderApp() { - const { children, loading, pathname } = this.props; + const { + children, loading, pathname, + } = this.props; return (