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.

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

AND-144 Add Terms and Privacy policy to the About screen #235

Merged
merged 3 commits into from
Jan 14, 2025
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Fix incorrect support email in some places
  • Loading branch information
Radiokot committed Jan 14, 2025
commit 9ac53ce5b2b96efa291141f3537160b0632bd66a
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -7,6 +7,10 @@
- Ability to have both file and seed phrase wallets in the app and switch between them
- Ability to open the Terms and Conditions and the Privacy Policy from the About screen

### Fixed

- Incorrect support email address in some error messages

### Removed

- Ability to create new accounts and identities in a file wallet.
8 changes: 4 additions & 4 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1005,7 +1005,7 @@
<string name="passcode_use_full_password">Use full password instead</string>
<string name="passcode_backspace_button">Delete</string>
<string name="passcode_biometrics_button">Use biometrics</string>
<string name="passcode_setup_failed">Failed to set up passcode, please contact \nsupport@concordium.software.com</string>
<string name="passcode_setup_failed">Failed to set up passcode, please contact \nsupport@concordium.com</string>
<string name="passcode_create_setup_biometrics_title">Enable biometrics for next time?</string>
<string name="passcode_create_setup_biometrics_details">After you log out now, you’ll be able to sign in faster when you come back</string>
<string name="passcode_create_setup_biometrics_allow">Enable biometrics</string>
@@ -1019,23 +1019,23 @@
<string name="setup_wallet_seed_phrase_digital_copy">Digital copy</string>
<string name="setup_wallet_seed_phrase_screenshot">Screenshot</string>
<string name="setup_wallet_seed_phrase_copied">@string/copied</string>
<string name="setup_wallet_failed">Failed to set up the wallet, please contact \nsupport@concordium.software.com</string>
<string name="setup_wallet_failed">Failed to set up the wallet, please contact \nsupport@concordium.com</string>
<string name="saved_seed_phrase_reveal_seed_phrase_copy">Copy to clipboard</string>
<string name="saved_seed_phrase_reveal_seed_phrase_show">Show seed phrase</string>
<string name="saved_seed_phrase_reveal_title">@string/your_seed_phrase</string>
<string name="saved_seed_phrase_reveal_details">Your seed phrase is the access key to all the funds in your wallet. If you forget it you will lose access to your wallet(s). Keep it somewhere safe</string>
<string name="saved_seed_phrase_reveal_transcribe">Transcribe</string>
<string name="saved_seed_phrase_reveal_digital_copy">Digital copy</string>
<string name="saved_seed_phrase_reveal_screenshot">Screenshot</string>
<string name="saved_seed_phrase_reveal_failed">Failed to reveal the phrase, please contact \nsupport@concordium.software.com</string>
<string name="saved_seed_phrase_reveal_failed">Failed to reveal the phrase, please contact \nsupport@concordium.com</string>
<string name="saved_seed_reveal_seed_copy">Copy to clipboard</string>
<string name="saved_seed_reveal_seed_show">Show wallet private key</string>
<string name="saved_seed_reveal_title">@string/your_wallet_seed</string>
<string name="saved_seed_reveal_details">Your wallet private key is the access key to all the funds in your wallet. Copy it and keep it safe. To avoid mistakes, do not write it down manually.</string>
<string name="saved_seed_reveal_transcribe">Transcribe</string>
<string name="saved_seed_reveal_copy_and_keep">Copy and keep safe</string>
<string name="saved_seed_reveal_screenshot">Screenshot</string>
<string name="saved_seed_reveal_failed">Failed to reveal the key, please contact \nsupport@concordium.software.com</string>
<string name="saved_seed_reveal_failed">Failed to reveal the key, please contact \nsupport@concordium.com</string>

<!-- Identity proofs in WalletConnect -->
<string name="zero_knowledge_proof">Zero-knowledge proof</string>