0.6

echoprotocol · Oct 16, 2019 · 8289c17 · 8289c17
2 parents 320ded3 + 2b281cd
commit 8289c17
Show file tree

Hide file tree

Showing 11 changed files with 364 additions and 85 deletions.
diff --git a/app/actions/transaction-actions.js b/app/actions/transaction-actions.js
@@ -86,7 +86,6 @@ export const formatTransaction = async (type, operation, blockNumber, resultId,
 	}
 
 	const block = await Services.getEcho().api.getBlock(blockNumber);
-	const feeAsset = await Services.getEcho().api.getObject(operation.getIn(['fee', 'asset_id']));
 
 	let { name, options } = Object.values(OPERATIONS).find((i) => i.value === type);
 
@@ -98,12 +97,16 @@ export const formatTransaction = async (type, operation, blockNumber, resultId,
 		type,
 		name,
 		timestamp: block.timestamp,
-		fee: {
+	};
+
+	if (operation.get('fee')) {
+		const feeAsset = await Services.getEcho().api.getObject(operation.getIn(['fee', 'asset_id']));
+		object.fee = {
 			amount: operation.getIn(['fee', 'amount']),
 			precision: feeAsset.precision,
 			symbol: feeAsset.symbol,
-		},
-	};
+		};
+	}
 
 	if (CONTRACT_TYPES.includes(type)) {
 		const result = await Services.getEcho().api.getContractResult(resultId);
@@ -138,8 +141,9 @@ export const formatTransaction = async (type, operation, blockNumber, resultId,
 					value: field,
 					id: field,
 				};
+			case OPTION_TYPES.ECHO_ASSET:
 			case OPTION_TYPES.ASSET:
-				response = await Services.getEcho().api.getObject(field);
+				response = await Services.getEcho().api.getObject(field || ECHO_ASSET_ID);
 
 				return {
 					...base,
@@ -257,11 +261,11 @@ const getFilteredHistory = async (filter, offset = 0, count = DEFAULT_HISTORY_CO
 	);
 
 	let transactions = items.map(({
-		id, body, transaction, result,
+		id, body, transaction, result, virtual, block,
 	}) => formatTransaction(
 		Number(id),
 		fromJS(body),
-		transaction.block.round,
+		virtual ? block.round : transaction.block.round,
 		result,
 		selectedAccounts,
 	));
@@ -319,10 +323,7 @@ export const setDefaultFilters = () => async (dispatch, getState) => {
 	coins = coins.map((i) => ({ ...i, selected: true }));
 	filter = filter.set('coins', fromJS(coins));
 
-	// TODO: delete slice after adding new operation to graphql
-	const oldOperations = Object.keys(OPERATIONS).slice(0, Object.keys(OPERATIONS).length - 7);
-
-	filter = filter.set('types', fromJS(oldOperations.map((type) => ({
+	filter = filter.set('types', fromJS(Object.keys(OPERATIONS).map((type) => ({
 		type,
 		name: OPERATIONS[type].name,
 		selected: true,
@@ -449,7 +450,7 @@ export const loadMoreTransactions = () => async (dispatch, getState) => {
  * @returns {Function}
  */
 export const setNewTransaction = ({
-	id, body, transaction, result,
+	id, body, transaction, result, virtual, block,
 }) => async (dispatch, getState) => {
 
 	const selectedAccounts = getState().wallet.getIn(['history', 'filter', 'accounts'])
@@ -459,7 +460,7 @@ export const setNewTransaction = ({
 	const operation = await formatTransaction(
 		Number(id),
 		fromJS(body),
-		transaction.block.round,
+		virtual ? block.round : transaction.block.round,
 		result,
 		selectedAccounts,
 	);

diff --git a/app/actions/transfer-actions.js b/app/actions/transfer-actions.js
@@ -183,7 +183,7 @@ export const setFeeFormValue = () => async (dispatch, getState) => {
 			const asset = selectedBalance
 				? objectsById.get(objectsById.getIn([selectedBalance, 'asset_type']))
 				: objectsById.get(ECHO_ASSET_ID);
-			type = 'transfer';
+			type = OPERATIONS_IDS.TRANSFER;
 
 			options = {
 				amount: {
@@ -384,7 +384,7 @@ export const send = () => async (dispatch, getState) => {
 			};
 		} else {
 
-			type = 'transfer';
+			type = OPERATIONS_IDS.TRANSFER;
 			options = {
 				amount: {
 					amount: parseFloat(amount),

diff --git a/app/components/history/index.jsx b/app/components/history/index.jsx
@@ -226,7 +226,7 @@ class History extends React.Component {
 						<li className="from-to-icon">
 							{
 								/* left */
-								transaction.get('subject') ? (
+								transaction.get('from') && transaction.get('subject') ? (
 									<Icon className="arrow-direction" />
 								) : null
 							}

diff --git a/app/constants/global-constants.js b/app/constants/global-constants.js
@@ -68,7 +68,7 @@ export const ECHO_ASSET_SYMBOL = 'ECHO';
 export const MAX_ASSET_SYMBOL_LENGTH = 5;
 export const GLOBAL_ID_1 = constants.DYNAMIC_GLOBAL_OBJECT_ID;
 export const ECHO_PROXY_TO_SELF_ACCOUNT = '1.2.5';
-export const CONTRACT_ID_PREFIX = `1.${constants.OBJECT_TYPES.CONTRACT}`;
+export const CONTRACT_ID_PREFIX = `1.${constants.PROTOCOL_OBJECT_TYPE_ID.CONTRACT}`;
 export const EETH_ASSET_SYMBOL = 'EETH';
 export const ERC20_TOKEN_PRECISION = 18;