From e74604f3431e0b8ed11a0c0d9c679206dff2bbb7 Mon Sep 17 00:00:00 2001
From: Max Wittal <max.wittal@mwittal.de>
Date: Tue, 23 May 2023 00:00:28 +0700
Subject: [PATCH] gui refactor

---
 www/web-gui/public/explorer.js | 24 +++++++++++-------------
 www/web-gui/public/swap.js     |  9 ++++-----
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/www/web-gui/public/explorer.js b/www/web-gui/public/explorer.js
index d9c563bab..659e46694 100644
--- a/www/web-gui/public/explorer.js
+++ b/www/web-gui/public/explorer.js
@@ -554,7 +554,7 @@ Vue.component('transaction-view', {
 						<tbody>
 						<tr>
 							<td class="key-cell">{{ $t('transaction_view.height') }}</td>
-							<td colspan="2">
+							<td>
 								<template v-if="data.height">
 									<router-link :to="'/explore/block/height/' + data.height">{{data.height}}</router-link>
 								</template>
@@ -563,41 +563,39 @@ Vue.component('transaction-view', {
 						</tr>
 						<tr v-if="data.did_fail" class="red--text">
 							<td class="key-cell">{{ $t('transaction_view.message') }}</td>
-							<td colspan="2">{{data.message}}</td>
+							<td>{{data.message}}</td>
 						</tr>
 						<tr v-if="data.confirm">
 							<td class="key-cell">{{ $t('transaction_view.confirmed') }}</td>
-							<td colspan="2">{{data.confirm}}</td>
+							<td>{{data.confirm}}</td>
 						</tr>
-						<tr v-if="data.expires != 4294967295">
+						<tr v-if="data.expires < 4294967295">
 							<td class="key-cell">{{ $t('transaction_view.expires') }}</td>
-							<td colspan="2">{{data.expires}}</td>
+							<td>{{data.expires}}</td>
 						</tr>
 						<tr>
 							<td class="key-cell">{{ $t('transaction_view.note') }}</td>
-							<td colspan="2">{{data.note}}</td>
+							<td>{{data.note}}</td>
 						</tr>
 						<tr v-if="data.time">
 							<td class="key-cell">{{ $t('transaction_view.time') }}</td>
-							<td colspan="2">{{new Date(data.time * 1000).toLocaleString()}}</td>
+							<td>{{new Date(data.time * 1000).toLocaleString()}}</td>
 						</tr>
 						<tr v-if="data.deployed">
 							<td class="key-cell">{{ $t('transaction_view.address') }}</td>
-							<td colspan="2"><router-link :to="'/explore/address/' + data.address">{{data.address}}</router-link></td>
+							<td><router-link :to="'/explore/address/' + data.address">{{data.address}}</router-link></td>
 						</tr>
 						<tr v-if="data.sender">
 							<td class="key-cell">{{ $t('transaction_view.sender') }}</td>
-							<td colspan="2"><router-link :to="'/explore/address/' + data.sender">{{data.sender}}</router-link></td>
+							<td><router-link :to="'/explore/address/' + data.sender">{{data.sender}}</router-link></td>
 						</tr>
 						<tr>
 							<td class="key-cell">{{ $t('transaction_view.cost') }}</td>
-							<td class="collapsing"><b>{{data.cost.value}}</b></td>
-							<td>MMX</td>
+							<td><b>{{data.cost.value}}</b> MMX</td>
 						</tr>
 						<tr>
 							<td class="key-cell">{{ $t('transaction_view.fee') }}</td>
-							<td class="collapsing"><b>{{data.fee.value}}</b></td>
-							<td>MMX</td>
+							<td><b>{{data.fee.value}}</b> MMX</td>
 						</tr>
 						</tbody>
 					</v-simple-table>
diff --git a/www/web-gui/public/swap.js b/www/web-gui/public/swap.js
index 2ae663164..6c2202365 100644
--- a/www/web-gui/public/swap.js
+++ b/www/web-gui/public/swap.js
@@ -569,11 +569,10 @@ Vue.component('swap-trade', {
 			req.amount = amount;
 			req.min_trade = min_trade;
 			req.num_iter = num_iter;
-			const options = {};
+			req.options = {};
 			if(fee_ratio) {
-				options.fee_ratio = fee_ratio;
+				req.options.fee_ratio = fee_ratio;
 			}
-			req.options = options;
 			fetch('/wapi/wallet/swap/trade', {body: JSON.stringify(req), method: "post"})
 				.then(response => {
 					if(response.ok) {
@@ -633,10 +632,10 @@ Vue.component('swap-trade', {
 			}
 		},
 		buy_amount() {
-			this.update_buy_estimate(true);
+			this.update_buy_estimate();
 		},
 		buy_num_iter() {
-			this.update_buy_estimate(true);
+			this.update_buy_estimate();
 		},
 		sell_amount() {
 			this.update_sell_estimate();