diff --git a/src/blockchain/orderlib.js b/src/blockchain/orderlib.js index 11887a4..9a1c6cc 100644 --- a/src/blockchain/orderlib.js +++ b/src/blockchain/orderlib.js @@ -164,7 +164,7 @@ export function parseOrderStatus(chainId, status) { function parseFill(obj) { let [tx, time, filledIn, filledOut, fee] = obj - time = new Date(time * 1000) + // time = new Date(time * 1000) filledIn = BigInt(filledIn) filledOut = BigInt(filledOut) const filled = obj.amountIsInput ? filledIn : filledOut diff --git a/src/charts/ohlc.js b/src/charts/ohlc.js index 2d963bf..0b365b2 100644 --- a/src/charts/ohlc.js +++ b/src/charts/ohlc.js @@ -144,7 +144,8 @@ export async function loadOHLC (symbol, contract, from, to, tvRes) { let baseUrl let latest = null // latest time, price - function fill(end, period) { + function fill(end) { + const period = res.seconds if (latest===null) return const [latestTime, price] = latest end = ohlcStart(end, period) @@ -206,6 +207,8 @@ export async function loadOHLC (symbol, contract, from, to, tvRes) { const rows = responses[ri].split('\n') for( let rj=0; rj= from) { - fill(time, res.seconds) + if ( time >= from ) { + if ( latest !== null && time > latest[0] + res.seconds) { + fill(time) + } const bar = {time: time * 1000, open, high, low, close}; bars.push(bar) latest = [time, close] } } } - console.log(`processed ${lineNum} lines`) + // console.log(`processed ${lineNum} lines`) } // console.log('loadOHLC prefill bars', bars) - fill(to, res.seconds) + fill(to) // console.log('loadOHLC bars', bars) return bars } diff --git a/src/components/PairPrice.vue b/src/components/PairPrice.vue index ee19101..3df6de1 100644 --- a/src/components/PairPrice.vue +++ b/src/components/PairPrice.vue @@ -38,15 +38,13 @@ function pairPrice(chainId, baseToken, quoteToken, price) { if (price === null || price === undefined) return null const decimals = quoteToken.d - baseToken.d - // console.log('pairPrice', chainId, baseToken, quoteToken, price, decimals) if (decimals >= 0) price /= 10 ** decimals else price *= 10 ** -decimals - // console.log('adjusted pairPrice', price) - if (inversionPreference(chainId, baseToken, quoteToken)) + const pref = inversionPreference(chainId, baseToken, quoteToken); + if (pref) price = 1 / price - // console.log('inverted?', price) return price } diff --git a/src/components/Pulse.vue b/src/components/Pulse.vue index 86ff432..78f78fc 100644 --- a/src/components/Pulse.vue +++ b/src/components/Pulse.vue @@ -16,6 +16,7 @@ function pulse() { if (props.touch === lastValue) return lastValue = props.touch const e = element.value; + if (!e) return if (!e.classList.contains('pulse')) { // add class for the first time e.classList.add('pulse') diff --git a/src/components/TosCard.vue b/src/components/TosCard.vue index edb27bd..66f25b6 100644 --- a/src/components/TosCard.vue +++ b/src/components/TosCard.vue @@ -5,7 +5,7 @@ Last Updated November 18, 2024 - Please read these Terms of Service (the “Terms”) and our Privacy Policy carefully because they govern your + Please read these Terms of Service (the “Terms”) and our Privacy Policy carefully because they govern your use of the website (and all subdomains and subpages thereon) located at dexorder.trade, including without limitation the subdomains app.dexorder.trade and www.dexorder.trade (collectively, the “Site”), and the Dexorder web @@ -205,7 +205,7 @@ (i) Subject to your compliance with these Terms, Dexorder will use its commercially reasonable efforts to provide you with access to the Dexorder Service and to cause your Interactions to be executed on the applicable DEX in accordance with Dexorder’s Execution Policy located at - https://dexorder.trade/home/execution_policy + https://dexorder.trade/execution-policy (“Execution Policy”), however from time to time the Site and the Dexorder Service may be inaccessible or inoperable for any reason, including, without limitation: (a) if an Interaction repeatedly fails to be executed (such as due to an diff --git a/src/components/chart/Toolbar.vue b/src/components/chart/Toolbar.vue index 0a8a553..069a6ba 100644 --- a/src/components/chart/Toolbar.vue +++ b/src/components/chart/Toolbar.vue @@ -9,7 +9,7 @@ - + diff --git a/src/misc.js b/src/misc.js index 104ba92..8312e98 100644 --- a/src/misc.js +++ b/src/misc.js @@ -146,10 +146,8 @@ export function inversionPreference(chainId, base, quote) { break // definitely inverted } } - console.log('inverted?', base, quote, preferInverted) prefs.inverted[key] = preferInverted } - // console.log('inversion preference', base, quote, prefs.inverted[key], inputInverted) return prefs.inverted[key] !== inputInverted }