Testing/api endpoint

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"
   },

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
 });

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<WelcomeData>(
       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()}`);

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";

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;