diff --git a/package-lock.json b/package-lock.json index fa3253ca5..50547901a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -49,7 +49,7 @@ "@vue/tsconfig": "0.5.1", "autoprefixer": "10.4.18", "color": "4.2.3", - "cypress": "10.11.0", + "cypress": "13.8.1", "cypress-image-snapshot": "4.0.1", "eslint": "8.57.0", "eslint-plugin-cypress": "2.15.1", @@ -2295,9 +2295,9 @@ } }, "node_modules/@cypress/request": { - "version": "2.88.12", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz", - "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz", + "integrity": "sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==", "dev": true, "dependencies": { "aws-sign2": "~0.7.0", @@ -2313,7 +2313,7 @@ "json-stringify-safe": "~5.0.1", "mime-types": "~2.1.19", "performance-now": "^2.1.0", - "qs": "~6.10.3", + "qs": "6.10.4", "safe-buffer": "^5.1.2", "tough-cookie": "^4.1.3", "tunnel-agent": "^0.6.0", @@ -5186,15 +5186,6 @@ "url": "https://opencollective.com/storybook" } }, - "node_modules/@storybook/cli/node_modules/commander": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", - "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, "node_modules/@storybook/cli/node_modules/execa": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", @@ -10350,9 +10341,9 @@ } }, "node_modules/commander": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", - "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", + "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==", "dev": true, "engines": { "node": ">= 6" @@ -10988,30 +10979,29 @@ "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" }, "node_modules/cypress": { - "version": "10.11.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-10.11.0.tgz", - "integrity": "sha512-lsaE7dprw5DoXM00skni6W5ElVVLGAdRUUdZjX2dYsGjbY/QnpzWZ95Zom1mkGg0hAaO/QVTZoFVS7Jgr/GUPA==", + "version": "13.8.1", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.8.1.tgz", + "integrity": "sha512-Uk6ovhRbTg6FmXjeZW/TkbRM07KPtvM5gah1BIMp4Y2s+i/NMxgaLw0+PbYTOdw1+egE0FP3mWRiGcRkjjmhzA==", "dev": true, "hasInstallScript": true, "dependencies": { - "@cypress/request": "^2.88.10", + "@cypress/request": "^3.0.0", "@cypress/xvfb": "^1.2.4", - "@types/node": "^14.14.31", "@types/sinonjs__fake-timers": "8.1.1", "@types/sizzle": "^2.3.2", "arch": "^2.2.0", "blob-util": "^2.0.2", "bluebird": "^3.7.2", - "buffer": "^5.6.0", + "buffer": "^5.7.1", "cachedir": "^2.3.0", "chalk": "^4.1.0", "check-more-types": "^2.24.0", "cli-cursor": "^3.1.0", "cli-table3": "~0.6.1", - "commander": "^5.1.0", + "commander": "^6.2.1", "common-tags": "^1.8.0", "dayjs": "^1.10.4", - "debug": "^4.3.2", + "debug": "^4.3.4", "enquirer": "^2.3.6", "eventemitter2": "6.4.7", "execa": "4.1.0", @@ -11020,18 +11010,19 @@ "figures": "^3.2.0", "fs-extra": "^9.1.0", "getos": "^3.2.1", - "is-ci": "^3.0.0", + "is-ci": "^3.0.1", "is-installed-globally": "~0.4.0", "lazy-ass": "^1.6.0", "listr2": "^3.8.3", "lodash": "^4.17.21", "log-symbols": "^4.0.0", - "minimist": "^1.2.6", + "minimist": "^1.2.8", "ospath": "^1.2.2", "pretty-bytes": "^5.6.0", + "process": "^0.11.10", "proxy-from-env": "1.0.0", "request-progress": "^3.0.0", - "semver": "^7.3.2", + "semver": "^7.5.3", "supports-color": "^8.1.1", "tmp": "~0.2.1", "untildify": "^4.0.0", @@ -11041,7 +11032,7 @@ "cypress": "bin/cypress" }, "engines": { - "node": ">=12.0.0" + "node": "^16.0.0 || ^18.0.0 || >=20.0.0" } }, "node_modules/cypress-image-snapshot": { @@ -11282,12 +11273,6 @@ "node": ">= 4.0.0" } }, - "node_modules/cypress/node_modules/@types/node": { - "version": "14.18.63", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz", - "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==", - "dev": true - }, "node_modules/cypress/node_modules/@types/sinonjs__fake-timers": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz", diff --git a/package.json b/package.json index 2179c038e..fa1c0b846 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "@vue/tsconfig": "0.5.1", "autoprefixer": "10.4.18", "color": "4.2.3", - "cypress": "10.11.0", + "cypress": "13.8.1", "cypress-image-snapshot": "4.0.1", "eslint": "8.57.0", "eslint-plugin-cypress": "2.15.1", diff --git a/src/assets/icons/simple/beneficiaries.svg b/src/assets/icons/simple/beneficiaries.svg new file mode 100644 index 000000000..05a718760 --- /dev/null +++ b/src/assets/icons/simple/beneficiaries.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/icons/simple/dashboard-reverse.svg b/src/assets/icons/simple/dashboard-reverse.svg new file mode 100644 index 000000000..d8febd400 --- /dev/null +++ b/src/assets/icons/simple/dashboard-reverse.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/simple/incoming-funds.svg b/src/assets/icons/simple/incoming-funds.svg new file mode 100644 index 000000000..a1bbc0fbb --- /dev/null +++ b/src/assets/icons/simple/incoming-funds.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/simple/payment-light.svg b/src/assets/icons/simple/payment-light.svg new file mode 100644 index 000000000..447e6eb3e --- /dev/null +++ b/src/assets/icons/simple/payment-light.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/simple/trade-finance-with-underline.svg b/src/assets/icons/simple/trade-finance-with-underline.svg new file mode 100644 index 000000000..b58490fb3 --- /dev/null +++ b/src/assets/icons/simple/trade-finance-with-underline.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/simple/transaction.svg b/src/assets/icons/simple/transaction.svg new file mode 100644 index 000000000..65fb47351 --- /dev/null +++ b/src/assets/icons/simple/transaction.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/img/simple-icons.svg b/src/assets/img/simple-icons.svg index ccf4d1119..30a9d957c 100644 --- a/src/assets/img/simple-icons.svg +++ b/src/assets/img/simple-icons.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/components/ec-icon/icon-names.ts b/src/components/ec-icon/icon-names.ts index 7c93aa1d6..4507ac633 100644 --- a/src/components/ec-icon/icon-names.ts +++ b/src/components/ec-icon/icon-names.ts @@ -107,6 +107,7 @@ export enum IconName { SIMPLE_ATTACHMENT = 'simple-attachment', SIMPLE_BANK = 'simple-bank', SIMPLE_BATCH_PAYMENT = 'simple-batch-payment', + SIMPLE_BENEFICIARIES = 'simple-beneficiaries', SIMPLE_BLOCK = 'simple-block', SIMPLE_BUY = 'simple-buy', SIMPLE_CALENDAR = 'simple-calendar', @@ -123,6 +124,7 @@ export enum IconName { SIMPLE_COPY = 'simple-copy', SIMPLE_COUNTRY = 'simple-country', SIMPLE_CURRENCY = 'simple-currency', + SIMPLE_DASHBOARD_REVERSE = 'simple-dashboard-reverse', SIMPLE_DASHBOARD = 'simple-dashboard', SIMPLE_DELETE = 'simple-delete', SIMPLE_DOCUMENT = 'simple-document', @@ -134,6 +136,7 @@ export enum IconName { SIMPLE_FEE = 'simple-fee', SIMPLE_HEDGING = 'simple-hedging', SIMPLE_HELP = 'simple-help', + SIMPLE_INCOMING_FUNDS = 'simple-incoming-funds', SIMPLE_INFO = 'simple-info', SIMPLE_LOADING = 'simple-loading', SIMPLE_LOCKER = 'simple-locker', @@ -142,6 +145,7 @@ export enum IconName { SIMPLE_MORE = 'simple-more', SIMPLE_NUMBERS = 'simple-numbers', SIMPLE_OUTLINE_DELETE = 'simple-outline-delete', + SIMPLE_PAYMENT_LIGHT = 'simple-payment-light', SIMPLE_PAYMENT = 'simple-payment', SIMPLE_PERSON = 'simple-person', SIMPLE_POSTAL_CODE = 'simple-postal-code', @@ -156,8 +160,10 @@ export enum IconName { SIMPLE_SNOWFLAKE = 'simple-snowflake', SIMPLE_THUMB_DOWN = 'simple-thumb-down', SIMPLE_THUMB_UP = 'simple-thumb-up', + SIMPLE_TRADE_FINANCE_WITH_UNDERLINE = 'simple-trade-finance-with-underline', SIMPLE_TRADE_FINANCE = 'simple-trade-finance', SIMPLE_TRADE = 'simple-trade', + SIMPLE_TRANSACTION = 'simple-transaction', SIMPLE_WALLET = 'simple-wallet', SIMPLE_WAND = 'simple-wand', SIMPLE_WITHDRAW = 'simple-withdraw', diff --git a/tests/integration/snapshots/visual-regression.spec.js/icon--all-icons__chrome.snap.png b/tests/integration/snapshots/visual-regression.spec.js/icon--all-icons__chrome.snap.png index 98eca575d..cce082ef0 100644 Binary files a/tests/integration/snapshots/visual-regression.spec.js/icon--all-icons__chrome.snap.png and b/tests/integration/snapshots/visual-regression.spec.js/icon--all-icons__chrome.snap.png differ diff --git a/tests/integration/snapshots/visual-regression.spec.js/icon--all-icons__chrome__knob-0__large.snap.png b/tests/integration/snapshots/visual-regression.spec.js/icon--all-icons__chrome__knob-0__large.snap.png index 39472461f..f1feb3379 100644 Binary files a/tests/integration/snapshots/visual-regression.spec.js/icon--all-icons__chrome__knob-0__large.snap.png and b/tests/integration/snapshots/visual-regression.spec.js/icon--all-icons__chrome__knob-0__large.snap.png differ diff --git a/tests/integration/snapshots/visual-regression.spec.js/icon--all-icons__chrome__knob-1__type-error.snap.png b/tests/integration/snapshots/visual-regression.spec.js/icon--all-icons__chrome__knob-1__type-error.snap.png index 98eca575d..cce082ef0 100644 Binary files a/tests/integration/snapshots/visual-regression.spec.js/icon--all-icons__chrome__knob-1__type-error.snap.png and b/tests/integration/snapshots/visual-regression.spec.js/icon--all-icons__chrome__knob-1__type-error.snap.png differ diff --git a/tests/integration/snapshots/visual-regression.spec.js/icon--all-icons__firefox.snap.png b/tests/integration/snapshots/visual-regression.spec.js/icon--all-icons__firefox.snap.png index 99d6bdc69..2435e4301 100644 Binary files a/tests/integration/snapshots/visual-regression.spec.js/icon--all-icons__firefox.snap.png and b/tests/integration/snapshots/visual-regression.spec.js/icon--all-icons__firefox.snap.png differ diff --git a/tests/integration/snapshots/visual-regression.spec.js/icon--all-icons__firefox__knob-0__large.snap.png b/tests/integration/snapshots/visual-regression.spec.js/icon--all-icons__firefox__knob-0__large.snap.png index 48f8d7152..5dd2a87d4 100644 Binary files a/tests/integration/snapshots/visual-regression.spec.js/icon--all-icons__firefox__knob-0__large.snap.png and b/tests/integration/snapshots/visual-regression.spec.js/icon--all-icons__firefox__knob-0__large.snap.png differ diff --git a/tests/integration/snapshots/visual-regression.spec.js/icon--all-icons__firefox__knob-1__type-error.snap.png b/tests/integration/snapshots/visual-regression.spec.js/icon--all-icons__firefox__knob-1__type-error.snap.png index 99d6bdc69..2435e4301 100644 Binary files a/tests/integration/snapshots/visual-regression.spec.js/icon--all-icons__firefox__knob-1__type-error.snap.png and b/tests/integration/snapshots/visual-regression.spec.js/icon--all-icons__firefox__knob-1__type-error.snap.png differ