From 1d001322cc3ed4740e0e9350faa997ab66b33f97 Mon Sep 17 00:00:00 2001
From: tobtoht <thotbot@protonmail.com>
Date: Tue, 24 Nov 2020 22:16:24 +0100
Subject: [PATCH] Send: Always include pref. currency in combobox

---
 src/sendwidget.cpp | 17 +++++++++++++++++
 src/sendwidget.h   |  2 ++
 src/sendwidget.ui  | 43 +------------------------------------------
 3 files changed, 20 insertions(+), 42 deletions(-)

diff --git a/src/sendwidget.cpp b/src/sendwidget.cpp
index 72a002e..643c28f 100644
--- a/src/sendwidget.cpp
+++ b/src/sendwidget.cpp
@@ -29,6 +29,8 @@ SendWidget::SendWidget(QWidget *parent) :
     ui->label_conversionAmount->setText("");
     ui->label_conversionAmount->hide();
     ui->btn_openAlias->hide();
+
+    this->setupComboBox();
 }
 
 void SendWidget::currencyComboChanged(int index) {
@@ -185,8 +187,23 @@ void SendWidget::onEndTransaction() {
     ui->btnSend->setEnabled(true);
 }
 
+void SendWidget::setupComboBox() {
+    ui->comboCurrencySelection->clear();
+
+    QStringList defaultCurrencies = {"XMR", "USD", "EUR", "CNY", "JPY", "GBP"};
+    QString preferredCurrency = config()->get(Config::preferredFiatCurrency).toString();
+
+    if (defaultCurrencies.contains(preferredCurrency)) {
+        defaultCurrencies.removeOne(preferredCurrency);
+    }
+
+    ui->comboCurrencySelection->insertItems(0, defaultCurrencies);
+    ui->comboCurrencySelection->insertItem(1, preferredCurrency);
+}
+
 void SendWidget::onPreferredFiatCurrencyChanged() {
     this->updateConversionLabel();
+    this->setupComboBox();
 }
 
 SendWidget::~SendWidget() {
diff --git a/src/sendwidget.h b/src/sendwidget.h
index 7c45f78..f36ee58 100644
--- a/src/sendwidget.h
+++ b/src/sendwidget.h
@@ -48,6 +48,8 @@ signals:
     void createTransaction(const QString &address, double amount, const QString &description, bool all);
 
 private:
+    void setupComboBox();
+
     Ui::SendWidget *ui;
     AppContext *m_ctx;
     double amount();
diff --git a/src/sendwidget.ui b/src/sendwidget.ui
index 1bdd72a..fb97ee7 100644
--- a/src/sendwidget.ui
+++ b/src/sendwidget.ui
@@ -105,48 +105,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QComboBox" name="comboCurrencySelection">
-         <item>
-          <property name="text">
-           <string>XMR</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>EUR</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>USD</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>GBP</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>AUD</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>JPY</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>NZD</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>RMB</string>
-          </property>
-         </item>
-        </widget>
+        <widget class="QComboBox" name="comboCurrencySelection"/>
        </item>
       </layout>
      </item>