Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge pull request #1748 from wavesplatform/dexw-2311-release-1.4.11 #1772

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "waves-client",
"version": "1.4.10",
"version": "1.4.11",
"description": "The official client application for the Waves platform",
"private": true,
"repository": {
Expand Down
5 changes: 5 additions & 0 deletions src/modules/dex/directives/dexMyOrders/DexMyOrders.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
const { SIGN_TYPE } = require('@waves/signature-adapter');
const { filter, whereEq, uniqBy, prop, where, gt, pick, __, map } = require('ramda');
const ds = require('data-service');
const analytics = require('@waves/event-sender');
const { BigNumber } = require('@waves/bignumber');
const MAX_EXCHANGE_COUNT = 2000;
const { Money } = require('@waves/data-entities');
Expand Down Expand Up @@ -214,6 +215,8 @@
signature: user.matcherSign.signature
})
.then(() => {
analytics.send({ name: 'Cancel All Orders', target: 'all' });

notification.info({
ns: 'app.dex',
title: { literal: 'directives.myOrders.notifications.canceledAll' }
Expand Down Expand Up @@ -298,6 +301,8 @@
dataPromise
.then((signedTxData) => ds.cancelOrder(signedTxData, order.amount.asset.id, order.price.asset.id))
.then(() => {
analytics.send({ name: 'Cancel Order', target: 'all' });

classNameToOrder('force-leave');
const canceledOrder = this.orders.find(whereEq({ id: order.id }));
canceledOrder.state = 'Canceled';
Expand Down