Skip to content

Commit fca85f6

Browse files
tobtohttobtoht
committed
main: remove donations
1 parent 173ef4e commit fca85f6

File tree

10 files changed

+1
-77
lines changed

10 files changed

+1
-77
lines changed

‎CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ option(TOR_DIR "Directory containing Tor binaries to embed inside Feather" OFF)
2424
option(CHECK_UPDATES "Enable checking for application updates" OFF)
2525
option(PLATFORM_INSTALLER "Built-in updater fetches installer (windows-only)" OFF)
2626
option(USE_DEVICE_TREZOR "Trezor support compilation" ON)
27-
option(DONATE_BEG "Prompt donation window every once in a while" OFF)
2827
option(WITH_SCANNER "Enable webcam QR scanner" ON)
2928
option(STACK_TRACE "Dump stack trace on crash (Linux only)" OFF)
3029

‎README.md‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,6 @@ For information on how Feather is maintained, see: [MAINTENANCE.md](https://gith
5353

5454
To report a security vulnerability, see: [SECURITY.md](https://github.com/feather-wallet/feather/blob/master/SECURITY.md)
5555

56-
## Support
57-
58-
Feather is funded entirely through donations. We don't take a cut from transaction fees and make no money from exchange integrations.
59-
60-
Donations help pay for hosting, build servers, domain names, e-mail and other recurring costs. Any amount helps.
61-
62-
`47ntfT2Z5384zku39pTM6hGcnLnvpRYW2Azm87GiAAH2bcTidtq278TL6HmwyL8yjMeERqGEBs3cqC8vvHPJd1cWQrGC65f`
63-
6456
## License
6557

6658
Feather is free and open-source software, [licensed under BSD-3](https://raw.githubusercontent.com/feather-wallet/feather/master/LICENSE).

‎contrib/guix/libexec/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ export PATH="${BASEPREFIX}/${HOST}/native/bin:${PATH}"
289289

290290

291291
# Set appropriate CMake options for build type
292-
CMAKEVARS="-DWITH_SCANNER=On -DCHECK_UPDATES=On -DSELF_CONTAINED=On -DDONATE_BEG=On -DFEATHER_TARGET_TRIPLET=${HOST} -DWITH_PLUGIN_REDDIT=Off"
292+
CMAKEVARS="-DWITH_SCANNER=On -DCHECK_UPDATES=On -DSELF_CONTAINED=On -DFEATHER_TARGET_TRIPLET=${HOST} -DWITH_PLUGIN_REDDIT=Off"
293293

294294
if [[ -n "${TAG}" ]]; then
295295
CMAKEVARS+=" -DOFFICIAL_BUILD=On"

‎src/MainWindow.cpp‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,6 @@ MainWindow::MainWindow(WindowManager *windowManager, Wallet *wallet, QWidget *pa
120120
connect(&appData()->prices, &Prices::fiatPricesUpdated, this, &MainWindow::updateBalance);
121121
connect(&appData()->prices, &Prices::cryptoPricesUpdated, this, &MainWindow::updateBalance);
122122

123-
#ifdef DONATE_BEG
124-
this->donationNag();
125-
#endif
126-
127123
connect(m_windowManager->eventFilter, &EventFilter::userActivity, this, &MainWindow::userActivity);
128124
connect(&m_checkUserActivity, &QTimer::timeout, this, &MainWindow::checkUserActivity);
129125
m_checkUserActivity.setInterval(5000);
@@ -407,7 +403,6 @@ void MainWindow::initMenu() {
407403
#endif
408404

409405
connect(ui->actionOfficialWebsite, &QAction::triggered, [this](){Utils::externalLinkWarning(this, "https://featherwallet.org");});
410-
connect(ui->actionDonate_to_Feather, &QAction::triggered, this, &MainWindow::donateButtonClicked);
411406
connect(ui->actionDocumentation, &QAction::triggered, this, &MainWindow::onShowDocumentation);
412407
connect(ui->actionReport_bug, &QAction::triggered, this, &MainWindow::onReportBug);
413408
connect(ui->actionShow_debug_info, &QAction::triggered, this, &MainWindow::showDebugInfo);
@@ -514,10 +509,6 @@ void MainWindow::initWalletContext() {
514509
connect(m_wallet, &Wallet::deviceButtonRequest, this, &MainWindow::onDeviceButtonRequest);
515510
connect(m_wallet, &Wallet::deviceButtonPressed, this, &MainWindow::onDeviceButtonPressed);
516511
connect(m_wallet, &Wallet::deviceError, this, &MainWindow::onDeviceError);
517-
518-
connect(m_wallet, &Wallet::donationSent, this, []{
519-
conf()->set(Config::donateBeg, -1);
520-
});
521512

522513
connect(m_wallet, &Wallet::multiBroadcast, this, &MainWindow::onMultiBroadcast);
523514
}
@@ -1288,11 +1279,6 @@ void MainWindow::changeEvent(QEvent* event)
12881279
}
12891280
}
12901281

1291-
void MainWindow::donateButtonClicked() {
1292-
m_sendWidget->fill(constants::donationAddress, constants::donationDescription);
1293-
ui->tabWidget->setCurrentIndex(this->findTab("Send"));
1294-
}
1295-
12961282
void MainWindow::showHistoryTab() {
12971283
this->raise();
12981284
ui->tabWidget->setCurrentIndex(this->findTab("History"));
@@ -1776,32 +1762,6 @@ void MainWindow::updateTitle() {
17761762
this->setWindowTitle(title);
17771763
}
17781764

1779-
void MainWindow::donationNag() {
1780-
if (m_wallet->nettype() != NetworkType::Type::MAINNET)
1781-
return;
1782-
1783-
if (m_wallet->viewOnly())
1784-
return;
1785-
1786-
if (m_wallet->balanceAll() == 0)
1787-
return;
1788-
1789-
auto donationCounter = conf()->get(Config::donateBeg).toInt();
1790-
if (donationCounter == -1)
1791-
return;
1792-
1793-
donationCounter++;
1794-
if (donationCounter % constants::donationBoundary == 0) {
1795-
auto msg = "Feather development is funded entirely through donations.\n\nPlease consider supporting "
1796-
"the project. Donate any amount to remove this reminder.";
1797-
int ret = QMessageBox::information(this, "Donate to Feather", msg, QMessageBox::Yes, QMessageBox::No);
1798-
if (ret == QMessageBox::Yes) {
1799-
this->donateButtonClicked();
1800-
}
1801-
}
1802-
conf()->set(Config::donateBeg, donationCounter);
1803-
}
1804-
18051765
void MainWindow::addToRecentlyOpened(QString keysFile) {
18061766
auto recent = conf()->get(Config::recentlyOpenedWallets).toList();
18071767

‎src/MainWindow.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ private slots:
152152
void showAddressChecker();
153153
void showURDialog();
154154

155-
void donateButtonClicked();
156155
void payToMany();
157156
void showHistoryTab();
158157
void skinChanged(const QString &skinName);

‎src/MainWindow.ui‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -595,8 +595,6 @@
595595
<addaction name="actionDocumentation"/>
596596
<addaction name="actionReport_bug"/>
597597
<addaction name="actionShow_debug_info"/>
598-
<addaction name="separator"/>
599-
<addaction name="actionDonate_to_Feather"/>
600598
</widget>
601599
<widget class="QMenu" name="menuView">
602600
<property name="title">

‎src/SendWidget.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,6 @@ void SendWidget::addressEdited() {
9494
}
9595

9696
ui->btn_openAlias->setVisible(ui->lineAddress->isOpenAlias());
97-
98-
// Clear donation description if address no longer matches
99-
if (ui->lineDescription->text() == constants::donationDescription && ui->lineAddress->text() != constants::donationAddress) {
100-
ui->lineDescription->clear();
101-
}
10297
}
10398

10499
void SendWidget::amountEdited(const QString &text) {

‎src/constants.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ namespace constants
1919
const quint64 kdfRounds = 1;
2020

2121
const QString seedLanguage = "English"; // todo: move me
22-
23-
// donation constants
24-
const QString donationAddress = "47ntfT2Z5384zku39pTM6hGcnLnvpRYW2Azm87GiAAH2bcTidtq278TL6HmwyL8yjMeERqGEBs3cqC8vvHPJd1cWQrGC65f";
25-
const QString donationDescription = "Donation to the Feather development team";
26-
const int donationBoundary = 25;
2722
}
2823

2924
#endif //FEATHER_CONSTANTS_H

‎src/libwalletqt/Wallet.cpp‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -957,12 +957,6 @@ void Wallet::onTransactionCreated(Monero::PendingTransaction *mtx, const QVector
957957

958958
PendingTransaction *tx = new PendingTransaction(mtx, this);
959959

960-
for (auto &addr : address) {
961-
if (addr == constants::donationAddress) {
962-
this->donationSending = true;
963-
}
964-
}
965-
966960
// tx created, but not sent yet. ask user to verify first.
967961
emit transactionCreated(tx, address);
968962
}
@@ -1014,12 +1008,6 @@ void Wallet::onTransactionCommitted(bool success, PendingTransaction *tx, const
10141008
// Let MainWindow handle this
10151009
emit multiBroadcast(txHexMap);
10161010
}
1017-
1018-
// this tx was a donation to Feather, stop our nagging
1019-
if (this->donationSending) {
1020-
this->donationSending = false;
1021-
emit donationSent();
1022-
}
10231011
}
10241012

10251013
void Wallet::disposeTransaction(PendingTransaction *t) {

‎src/libwalletqt/Wallet.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,6 @@ Q_OBJECT
463463

464464
void transactionCreated(PendingTransaction *tx, const QVector<QString> &address);
465465

466-
void donationSent();
467466
void walletRefreshed();
468467

469468
void initiateTransaction();
@@ -525,7 +524,6 @@ Q_OBJECT
525524
FutureScheduler m_scheduler;
526525

527526
bool m_useSSL;
528-
bool donationSending = false;
529527
bool m_newWallet = false;
530528
bool m_forceKeyImageSync = false;
531529

0 commit comments

Comments
 (0)