Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace "pending" with "receivable"/"ready to receive" in QT wallet (#3411) #3437

Merged
merged 2 commits into from
Sep 28, 2021
Merged

Replace "pending" with "receivable"/"ready to receive" in QT wallet (#3411) #3437

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c82fd15
Replace "pending" with "receivable"/"ready to receive" in QT wallet (…
shryder Sep 4, 2021
493ef2e
Change wording for a QT tooltip
shryder Sep 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions nano/qt/qt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ void nano_qt::self_pane::set_balance_text (std::pair<nano::uint128_t, nano::uint
auto final_text (std::string ("Balance: ") + wallet.format_balance (balance_a.first));
if (!balance_a.second.is_zero ())
{
final_text += "\nPending: " + wallet.format_balance (balance_a.second);
final_text += "\nReady to receive: " + wallet.format_balance (balance_a.second);
}
wallet.self.balance_label->setText (QString (final_text.c_str ()));
}
Expand Down Expand Up @@ -272,7 +272,7 @@ void nano_qt::accounts::refresh_wallet_balance ()
auto final_text (std::string ("Balance: ") + wallet.format_balance (balance));
if (!pending.is_zero ())
{
final_text += "\nPending: " + wallet.format_balance (pending);
final_text += "\nReady to receive: " + wallet.format_balance (pending);
}
wallet_balance_label->setText (QString (final_text.c_str ()));
this->wallet.node.workers.add_timed_task (std::chrono::steady_clock::now () + std::chrono::seconds (60), [this] () {
Expand Down Expand Up @@ -778,7 +778,7 @@ nano_qt::account_viewer::account_viewer (nano_qt::wallet & wallet_a) :
auto final_text (std::string ("Balance (NANO): ") + wallet.format_balance (balance.first));
if (!balance.second.is_zero ())
{
final_text += "\nPending: " + wallet.format_balance (balance.second);
final_text += "\nReady to receive: " + wallet.format_balance (balance.second);
}
balance_label->setText (QString (final_text.c_str ()));
}
Expand Down Expand Up @@ -1919,7 +1919,7 @@ nano_qt::advanced_actions::advanced_actions (nano_qt::wallet & wallet_a) :
});

bootstrap->setToolTip ("Multi-connection bootstrap to random peers");
search_for_receivables->setToolTip ("Search for pending blocks");
search_for_receivables->setToolTip ("Search for ready to receive blocks");
zhyatt marked this conversation as resolved.
Show resolved Hide resolved
create_block->setToolTip ("Create block in JSON format");
enter_block->setToolTip ("Enter block in JSON format");
}
Expand Down Expand Up @@ -2364,7 +2364,7 @@ void nano_qt::block_creation::create_receive ()
else
{
show_label_error (*status);
status->setText ("Source block is not pending to receive");
status->setText ("Source block is not ready to be received");
}
}
else
Expand Down Expand Up @@ -2529,7 +2529,7 @@ void nano_qt::block_creation::create_open ()
else
{
show_label_error (*status);
status->setText ("Source block is not pending to receive");
status->setText ("Source block is not ready to be received");
}
}
else
Expand Down