Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2024-11-16 17:27:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request 'Xmr.to: disable tor checkbox on Tails and Whonix' (#43) from tobtoht/feather:xmrto_tails_tor into master

Browse source 
Reviewed-on: https://git.wownero.com/feather/feather/pulls/43
This commit is contained in:
dsc 2020-10-11 17:03:32 +00:00
commit 9c139e40d3
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/xmrtowidget.cpp
View file

@ -15,6 +15,7 @@ XMRToWidget::XMRToWidget(QWidget *parent) :
ui(new Ui::XMRToWidget)
{
ui->setupUi(this);
m_ctx = MainWindow::getContext();
QString amount_rx = R"(^\d*\.\d*$)";
QRegExp rx;
@ -62,6 +63,10 @@ XMRToWidget::XMRToWidget(QWidget *parent) :
m_contextMenu->popup(ui->historyTable->viewport()->mapToGlobal(point));
}
});
if (m_ctx->isTails || m_ctx->isWhonix) {
ui->torCheckBox->setDisabled(true);
}
}
void XMRToWidget::setHistoryModel(XmrToModel *model) {
@ -81,8 +86,6 @@ void XMRToWidget::onWalletClosed() {
void XMRToWidget::onCreateOrder() {
// @TODO: regex verify
if(m_ctx == nullptr)
this->m_ctx = MainWindow::getContext();
auto amount = ui->lineAmount->text();
if(amount.isEmpty()) {
@ -123,9 +126,6 @@ void XMRToWidget::onTorCheckBoxToggled(int state) {
}
void XMRToWidget::updateConversionLabel() {
if(m_ctx == nullptr)
this->m_ctx = MainWindow::getContext();
QString amount = ui->lineAmount->text();
int curIndex = ui->comboBox_currency->currentIndex();

3
src/xmrtowidget.h
View file

@ -51,7 +51,8 @@ private:
Ui::XMRToWidget *ui;
AppContext *m_ctx;
bool m_ratesDisplayed = false;
const QString m_regionBlockMessage = "Beware that XMR.To region blocks certain IPs, which can be problematic in combination with Tor. Use the clearnet option if this is a problem.";
const QString m_regionBlockMessage = "Beware that XMR.To region blocks certain IPs, which can be problematic in combination with Tor. "
"Wait a few minutes for the circuit to switch, or disable the option to relay over Tor if the problem persists.";
double m_unlockedBalance = 0;
XmrToModel *tableModel;