Merge pull request #181 from Polygant/release/1.3.8

mihsergeev · web-flow · commit aa96ccf0ee5d · 2023-11-02T17:18:21.000+03:00
Release/1.3.8
diff --git a/src/api/TradingView/index.js b/src/api/TradingView/index.js
@@ -15,85 +15,88 @@ const supportedResolutions = [
 const config = {
   supported_resolutions: supportedResolutions,
 };
-export default {
-  onReady: (cb) => {
-    setTimeout(() => cb(config), 0);
-  },
-  resolveSymbol: (symbolName, onSymbolResolvedCallback) => {
-    var splitData = symbolName.split(/[:/]/);
-    var projectTitle = localStorage.getItem("project_title");
-    if (!projectTitle) {
-      projectTitle = "Crypto exchange";
-    }
-    var symbolStub = {
-      name: symbolName,
-      description: "",
-      type: "crypto",
-      session: "24x7",
-      timezone: "Etc/UTC",
-      has_empty_bars: true,
-      ticker: symbolName,
-      exchange: projectTitle,
-      minmov: 1,
-      pricescale: 100000,
-      has_intraday: true,
-      intraday_multipliers: ["1", "60"],
-      supported_resolution: supportedResolutions,
-      volume_precision: 8,
-      data_status: "streaming",
-    };
-    if (splitData[1].match(/USD|EUR|RUB|JPY|AUD|GBP|KRW|CNY/)) {
-      symbolStub.pricescale = 100;
-    }
-    setTimeout(function () {
-      onSymbolResolvedCallback(symbolStub);
-    }, 0);
-  },
-  getBars: function (symbolInfo, resolution, periodParams, onHistoryCallback) {
-    historyProvider
-      .getBars(symbolInfo, resolution, periodParams.from, periodParams.to)
-      .then(async (data) => {
-        let ohlc = [];
-        let dataLength = data.data["records"].length;
-        let i = 0;
-        for (i; i < dataLength; i += 1) {
-          if (data.data["records"][i][1] > 0) {
-            ohlc.push({
-              time: data.data["records"][i][0], // the date
-              open: data.data["records"][i][4], // open
-              high: data.data["records"][i][1], // high
-              low: data.data["records"][i][2], // low
-              close: data.data["records"][i][5], // close
-              volume: data.data["records"][i][3], // volume
-            });
+export default (precision = null) => {
+  return {
+    onReady: (cb) => {
+      setTimeout(() => cb(config), 0);
+    },
+    resolveSymbol: (symbolName, onSymbolResolvedCallback) => {
+      var projectTitle = localStorage.getItem("project_title");
+      if (!projectTitle) {
+        projectTitle = "Crypto exchange";
+      }
+      var symbolStub = {
+        name: symbolName,
+        description: "",
+        type: "crypto",
+        session: "24x7",
+        timezone: "Etc/UTC",
+        has_empty_bars: true,
+        ticker: symbolName,
+        exchange: projectTitle,
+        minmov: 1,
+        pricescale: Math.round(1 / (precision || 0.01)),
+        has_intraday: true,
+        intraday_multipliers: ["1", "60"],
+        supported_resolution: supportedResolutions,
+        volume_precision: 8,
+        data_status: "streaming",
+      };
+      setTimeout(function () {
+        onSymbolResolvedCallback(symbolStub);
+      }, 0);
+    },
+    getBars: function (
+      symbolInfo,
+      resolution,
+      periodParams,
+      onHistoryCallback
+    ) {
+      historyProvider
+        .getBars(symbolInfo, resolution, periodParams.from, periodParams.to)
+        .then(async (data) => {
+          let ohlc = [];
+          let dataLength = data.data["records"].length;
+          let i = 0;
+          for (i; i < dataLength; i += 1) {
+            if (data.data["records"][i][1] > 0) {
+              ohlc.push({
+                time: data.data["records"][i][0], // the date
+                open: data.data["records"][i][4], // open
+                high: data.data["records"][i][1], // high
+                low: data.data["records"][i][2], // low
+                close: data.data["records"][i][5], // close
+                volume: data.data["records"][i][3], // volume
+              });
+            }
+          }
+          historyProvider.history[symbolInfo.name] = {
+            lastBar: ohlc[ohlc.length - 1],
+          };
+          if (ohlc.length) {
+            onHistoryCallback(ohlc, { noData: false });
+          } else {
+            onHistoryCallback(ohlc, { noData: true });
           }
-        }
-        historyProvider.history[symbolInfo.name] = {
-          lastBar: ohlc[ohlc.length - 1],
-        };
-        if (ohlc.length) {
-          onHistoryCallback(ohlc, { noData: false });
-        } else {
-          onHistoryCallback(ohlc, { noData: true });
-        }
-      });
-  },
-  subscribeBars: (
-    symbolInfo,
-    resolution,
-    onRealtimeCallback,
-    subscribeUID,
-    onResetCacheNeededCallback
-  ) => {
-    stream.subscribeBars(
+        });
+    },
+    subscribeBars: (
       symbolInfo,
       resolution,
       onRealtimeCallback,
       subscribeUID,
       onResetCacheNeededCallback
-    );
-  },
-  unsubscribeBars: () => {
-    stream.unsubscribeBars();
-  },
+    ) => {
+      stream.subscribeBars(
+        symbolInfo,
+        resolution,
+        onRealtimeCallback,
+        subscribeUID,
+        onResetCacheNeededCallback
+      );
+    },
+    unsubscribeBars: () => {
+      stream.unsubscribeBars();
+    },
+  };
 };
diff --git a/src/components/layout/Base.vue b/src/components/layout/Base.vue
@@ -248,6 +248,7 @@ input[type="password"],
 .address-text-field,
 .currency-list .currency-table .table tbody tr.active,
 .wallet-list .currency-table .table tbody tr.active,
+.nav-tabs .nav-link:not(.active),
 .alert-container,
 .footer {
   background-color: v-bind(mainBackgroundLocal) !important;
diff --git a/src/mixins/getFixedDecimal.js b/src/mixins/getFixedDecimal.js
@@ -48,6 +48,8 @@ function addSpace(number) {
  */
 
 function getFixedDecimal(val, precision = 8, toClosest = false) {
+  console.log(val, precision);
+  if (val === Infinity) debugger;
   return val
     ? new Decimal(
         new Decimal(val).toFixed(
diff --git a/src/modules/trade/components/LimitsList.vue b/src/modules/trade/components/LimitsList.vue
@@ -75,10 +75,9 @@
     />
     <div class="limit-list__row mt-3 limit-list__caption">
       <span>{{ $t("common.fee") }}:</span>
-      <span
-        >{{ noExponents(fee) }}
-        {{ operation == "buy" ? baseCurrency : quoteCurrency }}</span
-      >
+      <span>
+        {{ fee }} {{ operation == "buy" ? baseCurrency : quoteCurrency }}
+      </span>
     </div>
     <button
       class="limit-list__submit-button mt-4"
@@ -258,14 +257,14 @@ export default {
         case "buy":
           this.lastEditedField = FIELDS.SUM;
           this.resultedQuoteSum =
-            this.addSpaceFixDecimal(
+            this.getFixedDecimal(
               this.getCoolBalance(this.quoteCurrency) * fraction,
               this.coins[this.quoteCurrency].decimals
             ) + "";
           break;
         case "sell":
           this.operationData.quantity =
-            this.addSpaceFixDecimal(
+            this.getFixedDecimal(
               this.getCoolBalance(this.baseCurrency) * fraction,
               this.coins[this.baseCurrency].decimals
             ) + "";
@@ -276,28 +275,30 @@ export default {
     updateResultedSum: debounce(function () {
       if (this.lastEditedField === FIELDS.QUANTITY)
         this.resultedQuoteSum = String(
-          this.addSpaceFixDecimal(
+          this.getFixedDecimal(
             this.operationData.price * this.operationData.quantity,
             this.coins[this.quoteCurrency].decimals
           )
         );
+
+      console.log({ updateResultedSum: this.resultedQuoteSum });
     }, 500),
 
     updateOperationQuantity: debounce(function () {
-      console.log("updateOperationQuantity");
-      if (this.lastEditedField === FIELDS.SUM)
+      if (this.lastEditedField === FIELDS.SUM) {
         if (
           !Number.isNaN(Number(this.operationData.price)) &&
           Number(this.operationData.price) !== 0 &&
           !Number.isNaN(this.resultedQuoteSum)
         )
           this.operationData.quantity = String(
-            this.addSpaceFixDecimal(
+            this.getFixedDecimal(
               this.resultedQuoteSum / this.operationData.price || 0,
               this.coins[this.baseCurrency].decimals
             )
           );
         else this.operationData.quantity = "0";
+      }
     }, 500),
 
     getMax8Digits(x) {
diff --git a/src/modules/trade/components/TradeGraphic.vue b/src/modules/trade/components/TradeGraphic.vue
@@ -4,14 +4,22 @@
 
 <script>
 import { mapGetters } from "vuex";
-import Datafeed from "~/api/TradingView";
+import getDatafeed from "~/api/TradingView";
 import { widget } from "~/assets/TradingView/charting_library/charting_library.esm.js";
 import localConfig from "~/local_config";
 
 export default {
+  // eslint-disable-next-line vue/require-prop-types
+  props: {
+    precision: {
+      type: Number,
+      required: true,
+    },
+  },
   data() {
     return {
       tvWidget: null,
+      datafeed: null,
     };
   },
   computed: {
@@ -32,11 +40,24 @@ export default {
   watch: {
     lang() {
       try {
+        this.setGraphColor();
         this.makeChart();
       } catch (e) {
         console.log(e);
       }
     },
+    precision: {
+      immediate: true,
+      handler(value) {
+        if (!value) return;
+        try {
+          this.setGraphColor();
+          this.makeChart();
+        } catch (e) {
+          console.log(e);
+        }
+      },
+    },
     currentTheme() {
       this.setGraphColor();
       this.makeChart();
@@ -58,7 +79,7 @@ export default {
   },
 
   beforeUnmount() {
-    Datafeed.unsubscribeBars();
+    if (this.datafeed) this.datafeed.unsubscribeBars();
   },
 
   methods: {
@@ -73,6 +94,10 @@ export default {
       }, 1000);
     },
     makeChart() {
+      if (this.datafeed) {
+        this.datafeed.unsubscribeBars();
+      }
+      this.datafeed = getDatafeed(this.precision);
       const intervalFromLocalStorage =
           localStorage.getItem("chart_interval") || "5",
         tvWidget = new widget({
@@ -81,7 +106,7 @@ export default {
           timezone: "Etc/UTC",
           container: this.$refs.graphic,
           locale: this.lang,
-          datafeed: Datafeed,
+          datafeed: this.datafeed,
           library_path: "/public/TV/charting_library/",
           autosize: true,
           toolbar_bg: "#f6f6f8",
diff --git a/src/modules/trade/components/orders/Orders-sell-buy.vue b/src/modules/trade/components/orders/Orders-sell-buy.vue
@@ -76,6 +76,9 @@ export default {
   name: "OrdersSellBuy",
   mixins: [getCoolTrade, getFixedDecimal],
 
+  // eslint-disable-next-line vue/require-prop-types
+  props: ["precision"],
+
   data() {
     return {
       currentPriceStakan: 0,
@@ -104,24 +107,19 @@ export default {
     getPriceForStakan() {
       const price = this.currentPriceStakan;
 
-      if (this.isFiat(this.currentQuoteCurrency)) {
-        if (price >= 100000) {
-          return this.addSpaceFixDecimal(price, 0);
-        } else {
-          return this.addSpaceFixDecimal(price, 2);
-        }
+      if (price >= 10000) {
+        return this.addSpaceFixDecimal(price, 0);
+      } else if (price >= 1000) {
+        return this.addSpaceFixDecimal(price, 1);
+      } else if (price >= 100) {
+        return this.addSpaceFixDecimal(price, 2);
+      } else if (price >= 10) {
+        return this.addSpaceFixDecimal(price, 3);
       } else {
-        if (price >= 10000) {
-          return this.addSpaceFixDecimal(price, 0);
-        } else if (price >= 1000) {
-          return this.addSpaceFixDecimal(price, 1);
-        } else if (price >= 100) {
-          return this.addSpaceFixDecimal(price, 2);
-        } else if (price >= 10) {
-          return this.addSpaceFixDecimal(price, 3);
-        } else {
-          return this.addSpaceFixDecimal(price, 4);
-        }
+        return this.addSpaceFixDecimal(
+          price,
+          -Math.round(Math.log(this.precision || 0.01) / Math.log(10))
+        );
       }
     },
   },
diff --git a/src/modules/trade/components/orders/Orders-table-row.vue b/src/modules/trade/components/orders/Orders-table-row.vue
diff --git a/src/modules/trade/components/orders/Orders.vue b/src/modules/trade/components/orders/Orders.vue
diff --git a/src/modules/trade/pages/Trade.vue b/src/modules/trade/pages/Trade.vue
