Add option to not show QR code in Wallet CLI #1882
Open
+67
−21
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
OBorce
requested review from
erubboli,
azarovh and
ImplOfAnImpl
as code owners
azarovh
approved these changes
Feb 11, 2025
| String::new() | ||
| } else { | ||
| let qr_code_string = qrcode_or_error_string(str_data); | ||
| format!("\n\nOr scan the Qr code with it:\n\n{qr_code_string}") |
There was a problem hiding this comment.
This code is very context dependant and it's quite easy to break formatting here when used incorrectly from outside. I'd duplicate some code but do this in place.
It's possible to write it in a more compact way with no_qr.then().unwrap_or_else()
ImplOfAnImpl
approved these changes
Feb 12, 2025
Comment on lines
1827
to
1834
| fn optional_qrcode_or_error_string(str_data: &str, no_qr: bool) -> String { | ||
| if no_qr { | ||
| String::new() | ||
| } else { | ||
| let qr_code_string = qrcode_or_error_string(str_data); | ||
| format!("\n\nOr scan the Qr code with it:\n\n{qr_code_string}") | ||
| } | ||
| } |
There was a problem hiding this comment.
I don't like this function either, because it's very specific (due to the message) and yet has a super generic name. Let's remove it.
Comment on lines
1823
to
1825
| fn disabled_qr_code_env() -> bool { | ||
| std::env::var("ML_DISABLE_QR").is_ok() | ||
| } |
There was a problem hiding this comment.
qr_codes_disabled_via_env?- This is actually redundant, because we add env vars for all command line arguments via the
clapmachinery. E.g. your no--no-qroption can be controlled by the env varML_WALLET_NO_QR.
OBorce
force-pushed
the
feature/wallet-cli-no-qr-code
branch
from
229e2bb to
1e77cba
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add a startup option for Wallet CLI to disable the output of QR codes in responses.
Closes #1859