some ui touchup

buck54321 · Nov 11, 2024 · 997f5a7 · 997f5a7
1 parent 4d8aeca
commit 997f5a7
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 20 deletions.
diff --git a/client/webserver/jsintl.go b/client/webserver/jsintl.go
@@ -218,7 +218,7 @@ const (
 	idCEXBalances                    = "CEX_BALANCES"
 	idCausesSelfMatch                = "CAUSES_SELF_MATCH"
 	idCexNotConnected                = "CEX_NOT_CONNECTED"
-	idRemovingBotConfig              = "REMOVING_BOT_CONFIG"
+	idDeleteBot                      = "DELETE_BOT"
 )
 
 var enUS = map[string]*intl.Translation{
@@ -436,7 +436,7 @@ var enUS = map[string]*intl.Translation{
 	idCEXBalances:                    {T: "{{ cexName }} Balances"},
 	idCausesSelfMatch:                {T: "This order would cause a self-match"},
 	idCexNotConnected:                {T: "{{ cexName }} not connected"},
-	idRemovingBotConfig:              {T: "Are you sure you want to remove the config for the {{ baseSymbol }}-{{ quoteSymbol }} market on {{ host }}?"},
+	idDeleteBot:                      {T: "Are you sure you want to delete this bot for the {{ baseTicker }}-{{ quoteTicker }} market on {{ host }}?"},
 }
 
 var ptBR = map[string]*intl.Translation{

diff --git a/client/webserver/locales/en-us.go b/client/webserver/locales/en-us.go
@@ -678,5 +678,5 @@ var EnUS = map[string]*intl.Translation{
 	"Priority":                    {T: "Priority"},
 	"Wallet Balances":             {T: "Wallet Balances"},
 	"Placements":                  {T: "Placements"},
-	"removing_bot_config":         {T: "Removing Bot Config"},
+	"delete_bot":                  {T: "Delete Bot"},
 }
diff --git a/client/webserver/site/src/html/mm.tmpl b/client/webserver/site/src/html/mm.tmpl
@@ -151,9 +151,6 @@
                       <button data-tmpl="reconfigureBttn">
                         <span class="ico-settings fs17"></span>
                       </button>
-                      <button class="ms-1 danger" data-tmpl="removeBttn">
-                        <span class="ico-cross fs17"></span>
-                      </button>
                     </div>
                   </div>
                   <span data-tmpl="offError" class="fs16 px-3 text-center text-warning d-hide"></span>
@@ -410,6 +407,12 @@
                     </div>
                     <div data-tmpl="placementsChart" class="flex-grow-1 border-start position-relative"></div>
                   </div>
+                  <div class="py-1 px-3 d-flex justify-content-start grey border-top">
+                    <span data-tmpl="removeBttn" class="pointer hoverbg flex-center">
+                      <span class="ico-cross fs11 me-1"></span>
+                      delete this bot
+                    </span>
+                  </div>
                 </div>
 
                 {{- /* NO FIAT RATES */ -}}
@@ -616,14 +619,10 @@
 
     <form class="position-relative mw-425 d-hide" id="confirmRemoveForm" autocomplete="off">
       <div class="form-closer"><span class="ico-cross"></span></div>
-      <div>
-        <header>[[[removing_bot_config]]]</header>
-        <div>
-          <span id="confirmRemoveCfgMsg"></span>
-        </div>
-        <button id="confirmRemoveConfigBttn" type="button" class="feature mt-2">Confirm</button>
-        <div id="removeCfgErr" class="fs15 text-center d-hide text-danger text-break"></div>
-      </div>
+      <header>[[[delete_bot]]]</header>
+      <div id="confirmRemoveCfgMsg"></div>
+      <button id="confirmRemoveConfigBttn" type="button" class="feature mt-2 mx-2">Confirm</button>
+      <div id="removeCfgErr" class="fs15 text-center d-hide text-danger text-break"></div>
     </form>
   </div>  {{- /* END FORMS */ -}}
 </div>

diff --git a/client/webserver/site/src/js/locales.ts b/client/webserver/site/src/js/locales.ts
@@ -218,7 +218,7 @@ export const ID_ORDER_REPORT_TITLE = 'ORDER_REPORT_TITLE'
 export const ID_CEX_BALANCES = 'CEX_BALANCES'
 export const ID_CAUSES_SELF_MATCH = 'CAUSES_SELF_MATCH'
 export const ID_CEX_NOT_CONNECTED = 'CEX_NOT_CONNECTED'
-export const ID_REMOVING_BOT_CONFIG = 'REMOVING_BOT_CONFIG'
+export const ID_DELETE_BOT = 'DELETE_BOT'
 
 let locale: Locale
 

diff --git a/client/webserver/site/src/js/mm.ts b/client/webserver/site/src/js/mm.ts
@@ -325,11 +325,9 @@ export default class MarketMakerPage extends BasePage {
     const page = this.page
     this.removingCfg = mwh
     Doc.hide(page.removeCfgErr)
-    const baseAsset = app().assets[mwh.baseID]
-    const quoteAsset = app().assets[mwh.quoteID]
-    const baseSymbol = baseAsset.symbol.toUpperCase()
-    const quoteSymbol = quoteAsset.symbol.toUpperCase()
-    page.confirmRemoveCfgMsg.textContent = intl.prep(intl.ID_REMOVING_BOT_CONFIG, { host: mwh.host, baseSymbol, quoteSymbol })
+    const { unitInfo: { conventional: { unit: baseTicker } } } = app().assets[mwh.baseID]
+    const { unitInfo: { conventional: { unit: quoteTicker } } } = app().assets[mwh.quoteID]
+    page.confirmRemoveCfgMsg.textContent = intl.prep(intl.ID_DELETE_BOT, { host: mwh.host, baseTicker, quoteTicker })
     this.forms.show(this.page.confirmRemoveForm)
   }