Skip to content

Correct Default Proxy header description on ProxySettings - Follow-up #391#395

Merged
hebasto merged 1 commit into
bitcoin-core:mainfrom
pablomartin4btc:qml-ipaddressvalueinput-followup
Apr 10, 2024
Merged

Correct Default Proxy header description on ProxySettings - Follow-up #391#395
hebasto merged 1 commit into
bitcoin-core:mainfrom
pablomartin4btc:qml-ipaddressvalueinput-followup

Conversation

@pablomartin4btc
Copy link
Copy Markdown
Contributor

@pablomartin4btc pablomartin4btc commented Apr 8, 2024

This is a follow-up from #391 (comment).

Currently/ main branch screenshot.

Screenshot from 2024-04-07 23-00-31

This PR branch screenshot.

image

@pablomartin4btc
Copy link
Copy Markdown
Contributor Author

Gentle reminder to #391's reviewers: @johnny9, @GBKS, @D33r-Gee, @MarnixCroes, @stackingsaunter.

Copy link
Copy Markdown
Contributor

@MarnixCroes MarnixCroes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

maybe Tor Proxy description could be changed also, to
Run Tor connections through a dedicated proxy. to be consistent in the wording and the enable to is a bit redundant as well

Follow-up from bitcoin-core#391 (comment).

Removing redundant Tor Proxy description from the top Default Proxy header label.

Rewording Tor Proxy description to be consistent with the top header label.
@pablomartin4btc pablomartin4btc force-pushed the qml-ipaddressvalueinput-followup branch from 3495832 to d558b05 Compare April 8, 2024 15:06
@pablomartin4btc
Copy link
Copy Markdown
Contributor Author

Updates:

Copy link
Copy Markdown
Contributor

@D33r-Gee D33r-Gee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK d558b05

lgtm, wording is clear...

Ubuntu 22.04 Screenshot

Screenshot 2024-04-08 084731

Android (armv7) Screenshot

Screenshot_20240408_085820

Copy link
Copy Markdown
Contributor

@MarnixCroes MarnixCroes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ack d558b05

@GBKS
Copy link
Copy Markdown
Contributor

GBKS commented Apr 9, 2024

tACK d558b05

@hebasto hebasto merged commit b80e167 into bitcoin-core:main Apr 10, 2024
johnny9 pushed a commit to johnny9/bitcoin-core-app that referenced this pull request Jul 4, 2025
…ion on ProxySettings - Follow-up #391

edbe749 qml, component: Fix labelling on ProxySettings (pablomartin4btc)

Pull request description:

  This is a follow-up from bitcoin-core/gui-qml#391 (comment).

  <details>
  <summary>Currently/ <code>main</code> branch screenshot.</summary>

  ![Screenshot from 2024-04-07 23-00-31](https://github.com/bitcoin-core/gui-qml/assets/110166421/ffb86641-9f98-46d0-98d4-3c7ffd826d4e)

  </details>
  <details>
  <summary> This PR branch screenshot.</summary>

  ![image](https://github.com/bitcoin-core/gui-qml/assets/110166421/279abc03-8417-4345-bb21-06a7ff53eae6)

  </details>

ACKs for top commit:
  GBKS:
    tACK edbe749
  D33r-Gee:
    tACK edbe749

Tree-SHA512: b849bf2addafeac85e645281be162cf22d2f34da613f3da3fcef42377546a33e1b19beacb66660e06bc2e55b6b3c10bae08cf0ecdafb1e470fb8d44b040b6ff0
tx-signer450 added a commit to tx-signer450/gui-qml that referenced this pull request Oct 20, 2025
…ion on ProxySettings - Follow-up #391

edbe749856611f82dc0c535f102562dcde58e877 qml, component: Fix labelling on ProxySettings (pablomartin4btc)

Pull request description:

  This is a follow-up from bitcoin-core/gui-qml#391 (comment).

  <details>
  <summary>Currently/ <code>main</code> branch screenshot.</summary>

  ![Screenshot from 2024-04-07 23-00-31](https://github.com/bitcoin-core/gui-qml/assets/110166421/ffb86641-9f98-46d0-98d4-3c7ffd826d4e)

  </details>
  <details>
  <summary> This PR branch screenshot.</summary>

  ![image](https://github.com/bitcoin-core/gui-qml/assets/110166421/279abc03-8417-4345-bb21-06a7ff53eae6)

  </details>

ACKs for top commit:
  GBKS:
    tACK edbe749
  D33r-Gee:
    tACK edbe749856611f82dc0c535f102562dcde58e877

Tree-SHA512: b849bf2addafeac85e645281be162cf22d2f34da613f3da3fcef42377546a33e1b19beacb66660e06bc2e55b6b3c10bae08cf0ecdafb1e470fb8d44b040b6ff0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants