Skip to content

Commit

Permalink
Merge #1344: gui: add help text for electrum address
Browse files Browse the repository at this point in the history
0084163 gui: add help text for electrum address (Michael Mallan)

Pull request description:

  This adds a short text explanation about SSL usage in Electrum addresses to both the installer and settings page.

  This is a modified version of #1342.

ACKs for top commit:
  edouardparis:
    ACK 0084163

Tree-SHA512: 1b25547c07afaebc3ce86bdcb8c9de8d83b9f36b1bbfabbec2303e1c57e8c64c154412081c2bc26500e2c0d1d48f764b47730ebd4fb21d1c554e7da26ce8f0fb
  • Loading branch information
edouardparis committed Sep 16, 2024
2 parents ec3a799 + 0084163 commit 47fb6ef
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
6 changes: 5 additions & 1 deletion gui/src/app/view/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ use crate::{
view::{hw, warning::warn},
},
hw::HardwareWallet,
node::bitcoind::{RpcAuthType, RpcAuthValues},
node::{
bitcoind::{RpcAuthType, RpcAuthValues},
electrum,
},
};

pub fn list(cache: &Cache, is_remote_backend: bool) -> Element<Message> {
Expand Down Expand Up @@ -591,6 +594,7 @@ pub fn electrum_edit<'a>(
.size(P1_SIZE)
.padding(5),
)
.push(text(electrum::ADDRESS_NOTES).size(P2_SIZE))
.spacing(5),
);

Expand Down
1 change: 1 addition & 0 deletions gui/src/installer/view.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1382,6 +1382,7 @@ pub fn define_electrum<'a>(address: &form::Value<String>) -> Element<'a, Message
.size(text::P1_SIZE)
.padding(10),
)
.push(text(electrum::ADDRESS_NOTES).size(text::P2_SIZE))
.spacing(10);

Column::new().push(col_address).spacing(50).into()
Expand Down
4 changes: 4 additions & 0 deletions gui/src/node/electrum.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ pub enum ConfigField {
Address,
}

pub const ADDRESS_NOTES: &str = "Note: include \"ssl://\" as a prefix \
for SSL connections. Be aware that self-signed \
SSL certificates are currently not supported.";

impl fmt::Display for ConfigField {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self {
Expand Down

0 comments on commit 47fb6ef

Please sign in to comment.