Skip to content

Commit

Permalink
Merge pull request #1000 from madfish-solutions/releases/v3.1.31
Browse files Browse the repository at this point in the history
Releases/v3.1.31
  • Loading branch information
00-22-11 authored Aug 25, 2022
2 parents 775b0cd + 1cd96b8 commit 305afd6
Show file tree
Hide file tree
Showing 267 changed files with 3,039 additions and 1,155 deletions.
6 changes: 5 additions & 1 deletion .env.ghostnet.pord
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ REACT_APP_NETWORK=ghostnet
REACT_APP_TZKT_EXPLORER_URL=https://ghostnet.tzkt.io

#node
REACT_APP_RPC_URL=https://ghostnet.production.madservice.xyz
#REACT_APP_RPC_URL=https://ghostnet.production.madservice.xyz
REACT_APP_RPC_URLS=https://ghostnet.production.madservice.xyz,https://ghostnet.smartpy.io

#contracts
REACT_APP_TTDEX_CONTRACT=KT1PnmpVWmA5CBUsA5ZAx1HoDW67mPYurAL5
Expand All @@ -33,3 +34,6 @@ REACT_APP_POOLS_URL=wss://tezos-dexes-api-ghostnet.stage.madservice.xyz/
REACT_APP_FARMING_API_URL=https://quipuswap-staking-api-ithacanet.production.madservice.xyz
REACT_APP_STABLESWAP_API_URL=https://quipuswap-stableswap-api-ithacanet.production.madservice.xyz
REACT_APP_LIQUIDITY_API_URL=#no link yet

#sentry
REACT_APP_SENTRY_DSN=***REMOVED***
3 changes: 2 additions & 1 deletion .env.ghostnet.stage
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ REACT_APP_NETWORK=ghostnet
REACT_APP_TZKT_EXPLORER_URL=https://ithacanet.tzkt.io

#node
REACT_APP_RPC_URL=https://ithacanet.production.madservice.xyz
#REACT_APP_RPC_URL=https://ithacanet.production.madservice.xyz
REACT_APP_RPC_URLS=https://ithacanet.production.madservice.xyz,https://ghostnet.smartpy.io

#contracts
REACT_APP_TTDEX_CONTRACT=KT1PnmpVWmA5CBUsA5ZAx1HoDW67mPYurAL5
Expand Down
6 changes: 5 additions & 1 deletion .env.mainnet.prod
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ REACT_APP_NETWORK=mainnet
REACT_APP_TZKT_EXPLORER_URL=https://tzkt.io

#node
REACT_APP_RPC_URL=https://mainnet-node.madfish.solutions
#REACT_APP_RPC_URL=https://mainnet-node.madfish.solutions
REACT_APP_RPC_URLS=https://mainnet-node.madfish.solutions,https://mainnet.smartpy.io

#contracts
REACT_APP_TTDEX_CONTRACT=KT1VNEzpf631BLsdPJjt2ZhgUitR392x6cSi
Expand All @@ -33,3 +34,6 @@ REACT_APP_POOLS_URL=wss://tezos-dexes-api-mainnet.production.madservice.xyz/
REACT_APP_FARMING_API_URL=https://quipuswap-staking-api-mainnet.production.madservice.xyz
REACT_APP_STABLESWAP_API_URL=https://quipuswap-stableswap-api-mainnet.production.madservice.xyz
REACT_APP_LIQUIDITY_API_URL=#no link yet

#sentry
REACT_APP_SENTRY_DSN=***REMOVED***
3 changes: 2 additions & 1 deletion .env.mainnet.stage
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ REACT_APP_NETWORK=mainnet
REACT_APP_TZKT_EXPLORER_URL=https://tzkt.io

#node
REACT_APP_RPC_URL=https://mainnet-node.madfish.solutions
#REACT_APP_RPC_URL=https://mainnet-node.madfish.solutions
REACT_APP_RPC_URLS=https://mainnet-node.madfish.solutions,https://mainnet.smartpy.io

#contracts
REACT_APP_TTDEX_CONTRACT=KT1VNEzpf631BLsdPJjt2ZhgUitR392x6cSi
Expand Down
15 changes: 0 additions & 15 deletions .github/workflows/require-checklist.yaml

This file was deleted.

3 changes: 2 additions & 1 deletion cypress/const.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ export const DEFAULT_WAIT_TIMEOUT = 3000;
export const REPEAT_WAIT_TIMEOUT = 10000;
export const FIELD_WAIT_TIMEOUT = 1000;
export const MICRO_WAIT_TIMEOUT = 1000;
export const MAINNET_QUIPU_TOKEN = 'KT193D4vozYnhGJQVtw7CoxxqphqUEEwK6Vb_0';
export const MAINNET_QUIPU_TOKEN = 'KT193D4vozYnhGJQVtw7CoxxqphqUEEwK6Vb_0';
export const MAINNET_KUSD_TOKEN = 'KT1K9gCRgaLRFKTErYt1wVxA3Frb9FjasjTV';
5 changes: 2 additions & 3 deletions cypress/integration/Farming/Search.spec.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/// <reference types="cypress" />

import { FIELD_WAIT_TIMEOUT } from '../../const';

describe('Search section', () => {
beforeEach(() => {
cy.visit('/farming');
cy.wait(FIELD_WAIT_TIMEOUT);
cy.waitUntil(() => (cy.get('[data-test-id="activeOnlySwitcherTranslation"]')
.invoke('text').then((text) => text ==='Active Only')))
cy.get('[data-test-id="acceptCookieButton"]').click();
});
it('Should_SwitchActiveOnly_When_ClickingOnIt', () => {
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/Farming/VisualTesting.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ describe('Visual testing of the Farming page', () => {
cy.get('[data-test-id="acceptCookieButton"]').click();
cy.wait(DEFAULT_WAIT_TIMEOUT);
});
it('Should_DisplayCorrectlyFarmingPage_When_OpenedFarmingPage', () => {
it.skip('Should_DisplayCorrectlyFarmingPage_When_OpenedFarmingPage', () => {
cy.percySnapshot('FarmingPagelayout', {
percyCSS: `
[data-test-id='farmingListStats'],
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/Home/VisualTesting.spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
describe('Visual test of the Home page', () => {

it('Should_CheckLayout_When_LoadingHomePage', () => {
it.skip('Should_CheckLayout_When_LoadingHomePage', () => {
cy.visit('/');
cy.get('[data-test-id="acceptCookieButton"]').click();
cy.percySnapshot('HomePagelayout', {
Expand Down
12 changes: 5 additions & 7 deletions cypress/integration/Liquidity/ChangeAddRemove.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ import { MICRO_WAIT_TIMEOUT } from '../../const';

describe('When changing add tab to remove tab and vice versa it should be the same selected tokens', () => {
beforeEach(() => {
//before each 'it' go to liquidity tab'
cy.visit('/');
cy.get('[data-test-id="header"] [data-test-id="menuButton"]').click();
cy.get('[data-test-id="menu"] [data-test-id="navigationButton-Liquidity"]').click();
cy.visit('/liquidity');
cy.get('[data-test-id="acceptCookieButton"]').click();
});
it('Should_HaveSameTokenOnRemove_When_ClickingOnRemoveFromAdd', () => {
cy.get('[data-test-id="addLiquidityTokenA"] [data-test-id="tokenSelectButton"]').click();
Expand All @@ -16,18 +14,18 @@ describe('When changing add tab to remove tab and vice versa it should be the s
cy.get('[data-test-id="addLiquidityTokenB"] [data-test-id="tokenSelectButton"]').click();
cy.wait(MICRO_WAIT_TIMEOUT);
cy.get('[data-test-id="USDS"]').click();
cy.get('[data-test-id="cardTab-1"]').click();
cy.get('[data-test-id="liquidityPageTokenSelect"] [data-test-id="cardTab-1"]').click();
cy.get('[data-test-id="selectLPButton"]').should('contain', 'wXTZ / USDS');
});
it('Should_HaveSameTokenOnAdd_When_ClickingOnAddRemove', () => {
cy.get('[data-test-id="cardTab-1"]').click();
cy.get('[data-test-id="liquidityPageTokenSelect"] [data-test-id="cardTab-1"]').click();
cy.get('[data-test-id="selectLPButton"]').click();
cy.get('[data-test-id="TEZ"] [data-test-id="checkbox"]').click();
cy.get('[data-test-id="QUIPU"] [data-test-id="checkbox"]').click();
cy.get('[data-test-id="tzBTC"] [data-test-id="checkbox"]').click();
cy.get('[data-test-id="STKR"] [data-test-id="checkbox"]').click();
cy.get('[data-test-id="buttonSelect"]').click();
cy.get('[data-test-id="cardTab-0"]').click();
cy.get('[data-test-id="liquidityPageTokenSelect"] [data-test-id="cardTab-0"]').click();
cy.get('[data-test-id="liquidityPageTitle"]').should('contain', 'tzBTC / STKR');
});
});
15 changes: 6 additions & 9 deletions cypress/integration/Liquidity/FieldsCalculation.spec.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,24 @@
/// <reference types="cypress" />

import { notDeepEqual } from 'assert';
import { DEFAULT_WAIT_TIMEOUT } from '../../const';

describe('Input fields are recalculating after entering in another field data', () => {
beforeEach(() => {
cy.visit('/');
cy.get('[data-test-id="header"] [data-test-id="menuButton"]').click();
cy.get('[data-test-id="menu"] [data-test-id="navigationButton-Liquidity"]').click();
cy.visit('/liquidity');
cy.get('[data-test-id="acceptCookieButton"]').click();
});
it('Should_DisplayDataInSecondInput_When_FirstInputIs1', () => {
cy.get('[data-test-id="addLiquidityTokenA"] [data-test-id="addLiquidityTokenA"]').click().type('1');
cy.wait(DEFAULT_WAIT_TIMEOUT)
cy.waitUntil(() => (cy.get('[data-test-id="addLiquidityTokenB"] [data-test-id="addLiquidityTokenB"]')
.invoke('val').then(parseFloat).then((val) => !Number.isNaN(val))))
cy.get('[data-test-id="addLiquidityTokenB"] [data-test-id="addLiquidityTokenB"]')
.invoke('val')
.then(parseFloat)
.should('be.gte', 0)
cy.reload();

});
it('Should_DisplayDataInFirstInput_When_SecondInputIs1', () => {
cy.get('[data-test-id="addLiquidityTokenB"] [data-test-id="addLiquidityTokenB"]').click().type('1');
cy.wait(DEFAULT_WAIT_TIMEOUT);
cy.waitUntil(() => (cy.get('[data-test-id="addLiquidityTokenA"] [data-test-id="addLiquidityTokenA"]')
.invoke('val').then(parseFloat).then((val) => !Number.isNaN(val))))
cy.get('[data-test-id="addLiquidityTokenA"] [data-test-id="addLiquidityTokenA"]')
.invoke('val')
.then(parseFloat)
Expand Down
6 changes: 2 additions & 4 deletions cypress/integration/Liquidity/FormExists.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@

describe('Form exists', () => {
beforeEach(() => {
//before each 'it' go to liquidity tab'
cy.visit('/');
cy.get('[data-test-id="header"] [data-test-id="menuButton"]').click();
cy.get('[data-test-id="menu"] [data-test-id="navigationButton-Liquidity"]').click();
cy.visit('/liquidity');
cy.get('[data-test-id="acceptCookieButton"]').click();
});
it('Should_DisplayExchangeDetails_When_OpenedLiquidityPage', () => {
// Check if Title 'Pool Details' ok
Expand Down
4 changes: 1 addition & 3 deletions cypress/integration/Liquidity/LiquiditySlippage.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ import { MICRO_WAIT_TIMEOUT } from '../../const';

describe('Select different slippage and check if max invested is ok', () => {
beforeEach(() => {
cy.visit('/');
cy.get('[data-test-id="header"] [data-test-id="menuButton"]').click();
cy.get('[data-test-id="menu"] [data-test-id="navigationButton-Liquidity"]').click();
cy.visit('/liquidity');
cy.get('[data-test-id="acceptCookieButton"]').click();
cy.get('[data-test-id="addLiquidityTokenA"] [data-test-id="tokenSelectButton"]').click();
cy.wait(MICRO_WAIT_TIMEOUT);
Expand Down
20 changes: 11 additions & 9 deletions cypress/integration/Liquidity/RemoveChangeToken.spec.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
/// <reference types="cypress" />

import { DEFAULT_WAIT_TIMEOUT } from '../../const';
import { MICRO_WAIT_TIMEOUT } from '../../const';
import { MAINNET_QUIPU_TOKEN } from '../../const';

describe('Remove liquidity tab, calculating field', () => {
beforeEach(() => {
// Go to the remove page from home page
cy.visit('/');
cy.get('[data-test-id="header"] [data-test-id="menuButton"]').click();
cy.get('[data-test-id="menu"] [data-test-id="navigationButton-Liquidity"]').click();
cy.get('[data-test-id="liquidityPageTokenSelect"] [data-test-id="cardTab-1"]').click();
cy.visit(`/liquidity/remove/tez-${MAINNET_QUIPU_TOKEN}`);
cy.get('[data-test-id="acceptCookieButton"]').click();
});
it('Should_DisplayOutputFields_When_InputIs1', () => {
cy.get('[data-test-id="positionSelectInput"]').click().type('1');
cy.wait(DEFAULT_WAIT_TIMEOUT);
cy.waitUntil(() => (cy.get('[data-test-id="outputA"] [data-test-id="outputA"]')
.invoke('val').then(parseFloat).then((val) => !Number.isNaN(val))))
cy.get('[data-test-id="outputA"] [data-test-id="outputA"]').invoke('val').then(parseFloat).should('be.gte', 0);
cy.get('[data-test-id="outputB"] [data-test-id="outputB"]').invoke('val').then(parseFloat).should('be.gte', 0);
});
Expand All @@ -35,19 +34,22 @@ describe('Remove liquidity tab, calculating field', () => {
cy.get('[data-test-id="KUSD"] [data-test-id="checkbox"]').click();
cy.get('[data-test-id="buttonSelect"]').click();
cy.get('[data-test-id="positionSelectInput"]').click().type('1');
cy.wait(DEFAULT_WAIT_TIMEOUT);
cy.waitUntil(() => (cy.get('[data-test-id="outputA"] [data-test-id="outputA"]')
.invoke('val').then(parseFloat).then((val) => !Number.isNaN(val))))
cy.get('[data-test-id="amount"]').invoke('text').then(parseFloat).should('be.gte', 0);
cy.get('[data-test-id="amount"]').eq(1).invoke('text').then(parseFloat).should('be.gte', 0);
});
it('Should_DisplayQuipuKusdInDetailsSection_When_InputIs1', () => {
cy.get('[data-test-id="liquidityPageTokenSelect"] [data-test-id="positionSelectInput"] [data-test-id="selectLPButton"]')
.click();
//Sell price in pool details section 1 quipu
cy.wait(DEFAULT_WAIT_TIMEOUT);
cy.wait(MICRO_WAIT_TIMEOUT);
cy.get('[data-test-id="TEZ"] [data-test-id="checkbox"]').click();
cy.get('[data-test-id="KUSD"] [data-test-id="checkbox"]').click();
cy.get('[data-test-id="buttonSelect"]').click();
cy.get('[data-test-id="positionSelectInput"]').click().type('1');
cy.waitUntil(() => (cy.get('[data-test-id="outputA"] [data-test-id="outputA"]')
.invoke('val').then(parseFloat).then((val) => !Number.isNaN(val))))
cy.get('[data-test-id="detailsCardCells"] [data-test-id="amount"]')
.eq(0).invoke('text').then(parseFloat).should('be.eq', 1);
cy.get('[data-test-id="detailsCardCells"] [data-test-id="rightVisibleCurrency"]')
Expand All @@ -66,7 +68,7 @@ describe('Remove liquidity tab, calculating field', () => {
it('Should_DisplayNotification_When_PoolDoesntExist', () => {
cy.get('[data-test-id="liquidityPageTokenSelect"] [data-test-id="positionSelectInput"] [data-test-id="selectLPButton"]')
.click();
cy.wait(DEFAULT_WAIT_TIMEOUT);
cy.wait(MICRO_WAIT_TIMEOUT);
cy.get('[data-test-id="QUIPU"] [data-test-id="checkbox"]').click();
cy.get('[data-test-id="WRAP"] [data-test-id="checkbox"]').click();
cy.get('[data-test-id="TEZ"] [data-test-id="checkbox"]').click();
Expand Down
7 changes: 3 additions & 4 deletions cypress/integration/Liquidity/RemoveExist.spec.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
/// <reference types="cypress" />

import { MAINNET_QUIPU_TOKEN } from '../../const';

describe('Form exists', () => {
beforeEach(() => {
// Go to the remove page from home page
cy.visit('/');
cy.get('[data-test-id="header"] [data-test-id="menuButton"]').click();
cy.get('[data-test-id="menu"] [data-test-id="navigationButton-Liquidity"]').click();
cy.get('[data-test-id="liquidityPageTokenSelect"] [data-test-id="cardTab-1"]').click();
cy.visit(`/liquidity/remove/tez-${MAINNET_QUIPU_TOKEN}`);
cy.get('[data-test-id="acceptCookieButton"]').click();
});
it('Should_DisplayExchangeDetails_When_OpenedRLiquidityPage', () => {
Expand Down
28 changes: 15 additions & 13 deletions cypress/integration/Liquidity/TokenSelect.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,27 @@

import { DEFAULT_WAIT_TIMEOUT, REPEAT_WAIT_TIMEOUT } from '../../const';
import { MICRO_WAIT_TIMEOUT } from '../../const';
import { MAINNET_QUIPU_TOKEN, MAINNET_KUSD_TOKEN } from '../../const';

describe('Select new tokens in the fields', () => {
beforeEach(() => {
cy.visit('/liquidity');
cy.visit(`/liquidity/add/${MAINNET_KUSD_TOKEN}-${MAINNET_QUIPU_TOKEN}`);
cy.get('[data-test-id="acceptCookieButton"]').click();
cy.get('[data-test-id="addLiquidityTokenA"] [data-test-id="tokenSelectButton"]').click();
cy.wait(MICRO_WAIT_TIMEOUT);
cy.get('[data-test-id="KUSD"]').click();
});
it('Should_DisplayNewTokens_When_SelectIt', () => {
cy.get('[data-test-id="addLiquidityTokenA"] [data-test-id="tokenSelectButton"]').should('contain', 'KUSD');
});
it('Should_RecalculateSecondInput_When_1InTheFirstInput', () => {
cy.get('[data-test-id="addLiquidityTokenA"] [data-test-id="addLiquidityTokenA"]').click().type('1');
cy.wait(DEFAULT_WAIT_TIMEOUT);
cy.waitUntil(() => (cy.get('[data-test-id="addLiquidityTokenB"] [data-test-id="addLiquidityTokenB"]')
.invoke('val').then(parseFloat).then((val) => !Number.isNaN(val))))
cy.get('[data-test-id="addLiquidityTokenB"] [data-test-id="addLiquidityTokenB"]')
.invoke('val').then(parseFloat).should('be.gte', 0);
});
it('Should_DisplayDataInFirstInput_When_SecondInputIs1', () => {
cy.get('[data-test-id="addLiquidityTokenB"] [data-test-id="addLiquidityTokenB"]', { timeout: REPEAT_WAIT_TIMEOUT })
.click().type('1');
cy.wait(DEFAULT_WAIT_TIMEOUT);
cy.get('[data-test-id="addLiquidityTokenB"] [data-test-id="addLiquidityTokenB"]').click().type('1');
cy.waitUntil(() => (cy.get('[data-test-id="addLiquidityTokenA"] [data-test-id="addLiquidityTokenA"]')
.invoke('val').then(parseFloat).then((val) => !Number.isNaN(val))))
cy.get('[data-test-id="addLiquidityTokenA"] [data-test-id="addLiquidityTokenA"]')
.invoke('val').then(parseFloat).should('be.gte', 0);
});
Expand All @@ -32,7 +31,7 @@ describe('Select new tokens in the fields', () => {
cy.wait(MICRO_WAIT_TIMEOUT);
cy.get('[data-test-id="hDAO"]').click();
cy.get('[data-test-id="addLiquidityTokenB"] [data-test-id="tokenSelectButton"]')
.should('contain', 'hDAO')
.should('contain', 'hDAO')
});
it('Should_DisplayNewTitle_When_NewTokenAreSelected', () => {
// Check if title of the page is ok
Expand Down Expand Up @@ -68,14 +67,16 @@ describe('Select new tokens in the fields', () => {
});
it('Should_CalculateFirstToken_When_TokenToTokenInExistingPool', () => {
cy.get('[data-test-id="addLiquidityTokenB"] [data-test-id="addLiquidityTokenB"]')
.click().type('1');
cy.wait(DEFAULT_WAIT_TIMEOUT);
.click().type('1');
cy.waitUntil(() => (cy.get('[data-test-id="addLiquidityTokenA"] [data-test-id="addLiquidityTokenA"]')
.invoke('val').then(parseFloat).then((val) => !Number.isNaN(val))))
cy.get('[data-test-id="addLiquidityTokenA"] [data-test-id="addLiquidityTokenA"]')
.invoke('val').then(parseFloat).should('be.gte', 0);
});
it('Should_CalculateSecondInput_When_FirstInputIsChangedInExistingPool', () => {
cy.get('[data-test-id="addLiquidityTokenA"] [data-test-id="addLiquidityTokenA"]').click().type('1.1');
cy.wait(DEFAULT_WAIT_TIMEOUT);
cy.waitUntil(() => (cy.get('[data-test-id="addLiquidityTokenB"] [data-test-id="addLiquidityTokenB"]')
.invoke('val').then(parseFloat).then((val) => !Number.isNaN(val))))
cy.get('[data-test-id="addLiquidityTokenB"] [data-test-id="addLiquidityTokenB"]')
.invoke('val').then(parseFloat).should('be.gte', 0);
});
Expand All @@ -87,7 +88,8 @@ describe('Select new tokens in the fields', () => {
cy.get('[data-test-id="addLiquidityTokenB"] [data-test-id="tokenSelectButton"]').click();
cy.get('[data-test-id="uUSD"]').click();
cy.get('[data-test-id="addLiquidityTokenB"] [data-test-id="addLiquidityTokenB"]').click().type('15');
cy.wait(MICRO_WAIT_TIMEOUT)
cy.waitUntil(() => (cy.get('[data-test-id="addLiquidityTokenB"] [data-test-id="addLiquidityTokenB"]')
.invoke('val').then(parseFloat).then((val) => !Number.isNaN(val))))
cy.contains('[title="15"]', '15').should('contain', 15);
});
});
2 changes: 1 addition & 1 deletion cypress/integration/Liquidity/VisualTesting.spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
describe('Visual test of the Liquidity page', () => {

it('Should_CheckLayout_When_LoadingLiqiudityPage', () => {
it.skip('Should_CheckLayout_When_LoadingLiqiudityPage', () => {
cy.visit('/liquidity/add/tez-KT193D4vozYnhGJQVtw7CoxxqphqUEEwK6Vb_0');
cy.get('[data-test-id="acceptCookieButton"]').click();
cy.percySnapshot('LiquidityPagelayout', {
Expand Down
Loading

0 comments on commit 305afd6

Please sign in to comment.