diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index 8e636ebd3..000000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: Notifier - -# triggers for notifying -# these are some important trigger cases could be change as need -# check here https://developer.github.com/webhooks/ -on: - issue_comment: - types: created - issues: - types: [opened, edited, pinned, closed, reopened, assigned, labeled] - pull_request: - types: [opened, closed, edited, ready_for_review, review_requested, reopened] - pull_request_review_comment: - types: created - push: - -jobs: - build: - name: Notifier - runs-on: ubuntu-latest - - steps: - - name: Notifier - uses: GokulDas027/TelegramBridge@master - if: always() - with: - chat: ${{ secrets.chat }} # save your chat id at settings/secrets with name: chat - token: ${{ secrets.token }} # savethe bot token at settings/secrets with name: token - status: ${{ job.status }} # don't change - event: ${{ github.event_name }} # don't change - actor: ${{ github.actor }} # don't change diff --git a/package.json b/package.json index 3a4e6f8bd..1733e6646 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bancor-ui", - "version": "2.5.4", + "version": "2.5.5", "private": false, "scripts": { "start": "vue-cli-service serve", @@ -15,12 +15,12 @@ "build-report": "vue-cli-service build --report" }, "dependencies": { - "@0x/contract-addresses": "^6.0.0", - "@0x/protocol-utils": "^1.5.1", + "@0x/contract-addresses": "^6.2.0", + "@0x/protocol-utils": "^1.6.1", "@0x/web3-wrapper": "^7.5.3", "@dfuse/client": "^0.3.20", - "@firebase/analytics": "^0.6.9", - "@firebase/app": "^0.6.20", + "@firebase/analytics": "^0.6.10", + "@firebase/app": "^0.6.22", "@fortawesome/fontawesome-pro": "^5.15.3", "@fortawesome/fontawesome-svg-core": "^1.2.35", "@fortawesome/free-brands-svg-icons": "^5.15.3", @@ -29,21 +29,18 @@ "@fortawesome/pro-regular-svg-icons": "^5.15.3", "@fortawesome/pro-solid-svg-icons": "^5.15.3", "@fortawesome/vue-fontawesome": "^2.0.2", - "@sentry/browser": "^6.3.4", - "@sentry/integrations": "^6.3.4", - "@sentry/tracing": "^6.3.4", + "@sentry/browser": "^6.4.1", + "@sentry/integrations": "^6.4.1", + "@sentry/tracing": "^6.4.1", "@tweenjs/tween.js": "^18.6.4", - "@types/lodash.debounce": "^4.0.6", - "@types/numeral": "^2.0.1", - "@vue/composition-api": "^1.0.0-rc.8", + "@vue/composition-api": "^1.0.0-rc.9", "axios": "^0.21.1", "bancorx": "^0.3.0", "bignumber.js": "^9.0.0", "bnc-onboard": "1.25.0", - "bootstrap": "^4.6.0", + "bootstrap": "4.6.0", "bootstrap-vue": "^2.21.2", - "core-js": "^3.11.1", - "csv-parse": "^4.15.4", + "core-js": "^3.12.1", "dayjs": "^1.10.4", "decimal.js": "^10.2.0", "eos-common": "^0.8.0", @@ -58,16 +55,16 @@ "eos-transit-simpleos-provider": "^4.0.1", "eos-transit-tokenpocket-provider": "^4.0.1", "eos-transit-whalevault-provider": "^4.0.1", - "eosjs": "^21.0.4", + "eosjs": "21.0.4", "eth-multicall": "^1.3.13", "fast-sort": "^3.0.2", - "ipfs-http-client": "^49.0.4", + "ipfs-http-client": "49.0.4", "json-bigint": "^1.0.0", "lodash": "^4.17.21", "lodash-webpack-plugin": "^0.11.6", "lodash.debounce": "^4.0.8", "numeral": "^2.0.6", - "rxjs": "^6.6.7", + "rxjs": "6.6.7", "vue": "^2.6.11", "vue-analytics": "^5.17.2", "vue-class-component": "^7.2.3", @@ -82,38 +79,40 @@ "vuex-module-decorators": "^1.0.1", "vuex-router-sync": "^5.0.0", "waait": "^1.0.5", - "web3": "^1.3.5" + "web3": "1.3.6" }, "devDependencies": { "@babel/plugin-transform-modules-commonjs": "^7.14.0", "@types/jest": "^26.0.23", + "@types/lodash.debounce": "^4.0.6", + "@types/numeral": "^2.0.1", "@types/webpack": "^5.28.0", - "@typescript-eslint/eslint-plugin": "^4.22.0", - "@typescript-eslint/parser": "^4.22.0", - "@vue/cli-plugin-babel": "^4.5.12", - "@vue/cli-plugin-eslint": "^4.5.12", - "@vue/cli-plugin-typescript": "^4.5.12", - "@vue/cli-plugin-unit-jest": "^4.5.12", - "@vue/cli-plugin-vuex": "^4.5.0", - "@vue/cli-service": "^4.5.12", + "@typescript-eslint/eslint-plugin": "^4.24.0", + "@typescript-eslint/parser": "^4.24.0", + "@vue/cli-plugin-babel": "^4.5.13", + "@vue/cli-plugin-eslint": "^4.5.13", + "@vue/cli-plugin-typescript": "^4.5.13", + "@vue/cli-plugin-unit-jest": "^4.5.13", + "@vue/cli-plugin-vuex": "^4.5.13", + "@vue/cli-service": "^4.5.13", "@vue/eslint-config-prettier": "^6.0.0", "@vue/eslint-config-typescript": "^7.0.0", - "@vue/test-utils": "^1.1.4", + "@vue/test-utils": "^1.2.0", "babel-eslint": "^10.0.3", "babel-plugin-lodash": "^3.3.4", "babel-plugin-transform-decorators": "^6.24.1", - "eslint": "^7.25.0", + "eslint": "^7.27.0", "eslint-plugin-prettier": "^3.4.0", "eslint-plugin-vue": "^7.9.0", "jest": "^26.6.2", "jest-fetch-mock": "^3.0.3", - "node-sass": "^5.0.0", - "prettier": "^2.2.1", + "node-sass": "5.0.0", + "prettier": "^2.3.0", "sass-loader": "10.1.1", - "ts-jest": "^26.5.5", + "ts-jest": "^26.5.6", "tslib": "^2.2.0", "typescript": "^4.2.4", - "vue-cli-plugin-i18n": "^2.1.0", + "vue-cli-plugin-i18n": "^2.1.1", "vue-jest": "^3.0.7", "vue-template-compiler": "^2.6.11" }, diff --git a/src/api/eos/rpc.ts b/src/api/eos/rpc.ts index 8213e57de..e1745ff90 100644 --- a/src/api/eos/rpc.ts +++ b/src/api/eos/rpc.ts @@ -5,5 +5,6 @@ export const rpc = new JsonRpc("https://eos.greymass.com"); export const dfuseClient = createDfuseClient({ network: "eos.dfuse.eosnation.io", - authentication: false + apiKey: "d43c24a5e6c303337364c382d3eb51e9" + // authentication: false }); diff --git a/src/api/eth/bancorApi.ts b/src/api/eth/bancorApi.ts index b65eea224..5656d0af4 100644 --- a/src/api/eth/bancorApi.ts +++ b/src/api/eth/bancorApi.ts @@ -1,5 +1,6 @@ import axios from "axios"; import { EthNetworks } from "../web3"; + interface TokenMeta { id: string; image: string; @@ -83,7 +84,7 @@ export const getWelcomeData = async ( try { const res = await axios.get( network == EthNetworks.Mainnet - ? "https://api-v2.bancor.network/welcome" + ? "http://35.242.151.4:3000/welcome" : "https://ropsten-ptdczarhfq-nw.a.run.app/welcome" ); console.info(`API data fetched at ${new Date()}`); diff --git a/src/api/pureHelpers.ts b/src/api/pureHelpers.ts index 00f95cb04..51b8c34e1 100644 --- a/src/api/pureHelpers.ts +++ b/src/api/pureHelpers.ts @@ -292,6 +292,7 @@ export const prettifyNumber = ( else return numeral(bigNum).format("$0,0.00"); } else { if (bigNum.lte(0)) return "0"; + else if (bigNum.gte(1000)) return numeral(bigNum).format("0,0", Math.floor); else if (bigNum.gte(2)) return numeral(bigNum).format("0,0.[00]", Math.floor); else if (bigNum.lt(0.000001)) return "< 0.000001"; diff --git a/src/assets/_scss/custom/_styles.scss b/src/assets/_scss/custom/_styles.scss index c92276df7..cc6c904a4 100644 --- a/src/assets/_scss/custom/_styles.scss +++ b/src/assets/_scss/custom/_styles.scss @@ -380,6 +380,10 @@ border-color: $gray-placeholder !important; background-color: white !important; } + &.btn-error { + color: white !important; + background-color: $text-error-light !important; + } } .modal .modal-content { @@ -743,6 +747,22 @@ color: white !important; } +.icon-primary-light { + background-color: white !important; + border-radius: 6px !important; + border: 1px solid $primary !important; + padding: 3px; + color: $primary !important; +} + +.icon-primary-dark { + background-color: $dropdown-dark !important; + border-radius: 6px !important; + border: 1px solid $primary-dark !important; + padding: 3px; + color: $primary-dark !important; +} + .seperator-dark { margin-bottom: 1rem; border: 1px solid $gray-border-dark; diff --git a/src/assets/media/logos/mercuryo-dark.png b/src/assets/media/logos/mercuryo-dark.png new file mode 100644 index 000000000..4a10e13fa Binary files /dev/null and b/src/assets/media/logos/mercuryo-dark.png differ diff --git a/src/assets/media/logos/mercuryo-dark.svg b/src/assets/media/logos/mercuryo-dark.svg new file mode 100644 index 000000000..b526b2a17 --- /dev/null +++ b/src/assets/media/logos/mercuryo-dark.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/media/logos/mercuryo.png b/src/assets/media/logos/mercuryo.png new file mode 100644 index 000000000..88a000afb Binary files /dev/null and b/src/assets/media/logos/mercuryo.png differ diff --git a/src/assets/media/logos/mercuryo.svg b/src/assets/media/logos/mercuryo.svg new file mode 100644 index 000000000..0db4ede9d --- /dev/null +++ b/src/assets/media/logos/mercuryo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/common/Button.vue b/src/components/common/Button.vue index 8d257f8a0..6cd9c51ba 100644 --- a/src/components/common/Button.vue +++ b/src/components/common/Button.vue @@ -20,6 +20,7 @@ import BaseComponent from "@/components/BaseComponent.vue"; export default class MainButton extends BaseComponent { @Prop({ default: "" }) label!: string; @Prop({ default: false }) active!: boolean; + @Prop({ default: false }) error!: boolean; @Prop({ default: false }) large!: boolean; @Prop({ default: false }) disabled!: boolean; @Prop({ default: false }) small!: boolean; @@ -27,7 +28,9 @@ export default class MainButton extends BaseComponent { @Prop({ default: true }) block!: boolean; get variant() { - return this.active + return this.error + ? "error" + : this.active ? "primary" : this.darkMode ? "outline-gray-dark" diff --git a/src/components/common/PercentageSlider.vue b/src/components/common/PercentageSlider.vue index be65d6aba..d6ec638f7 100644 --- a/src/components/common/PercentageSlider.vue +++ b/src/components/common/PercentageSlider.vue @@ -1,11 +1,14 @@