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

Fix swap info #7979

Merged
merged 2 commits into from
Mar 3, 2025
Merged

Fix swap info #7979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ef655a
Remove redundant code from AddressCheckType
rafaelekol Mar 3, 2025
937d0d8
Fix price cell in TransactionInfo to handle big text
rafaelekol Mar 3, 2025
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
13 changes: 0 additions & 13 deletions app/src/main/java/io/horizontalsystems/bankwallet/core/address/AddressCheckType.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,4 @@ enum class AddressCheckType {
Sanction -> R.string.Send_Address_ErrorMessage_SanctionDetected_Description
}

val clearInfoTitle: Int
get() = when (this) {
Phishing -> R.string.Send_Address_PhishingCheck_ClearInfo_Title
Blacklist -> R.string.Send_Address_BlacklistCheck_ClearInfo_Title
Sanction -> R.string.Send_Address_SanctionCheck_ClearInfo_Title
}

val clearInfoDescription: Int
get() = when (this) {
Phishing -> R.string.Send_Address_PhishingCheck_ClearInfo_Description
Blacklist -> R.string.Send_Address_BlacklistCheck_ClearInfo_Description
Sanction -> R.string.Send_Address_SanctionCheck_ClearInfo_Description
}
}
6 changes: 3 additions & 3 deletions ...c/main/java/io/horizontalsystems/bankwallet/ui/compose/components/TransactionInfoCells.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,11 +225,11 @@ fun PriceWithToggleCell(
modifier = Modifier.padding(horizontal = 16.dp),
) {
subhead2_grey(text = title, modifier = Modifier.padding(end = 16.dp))
Spacer(Modifier.weight(1f))
subhead1_leah(
text = if (showValueOne) valueOne else valueTwo,
maxLines = 1,
overflow = TextOverflow.Ellipsis
overflow = TextOverflow.Ellipsis,
textAlign = TextAlign.End,
modifier = Modifier.weight(1f)
)
HSpacer(8.dp)
HsIconButton(
Expand Down
6 changes: 0 additions & 6 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,8 +452,6 @@
<string name="Send_Address_Error_Clear">Clear</string>
<string name="Send_Address_AddressCheck">Address Check</string>
<string name="Send_Address_PhishingCheck">Phishing Check</string>
<string name="Send_Address_PhishingCheck_ClearInfo_Title">Phishing: Clear</string>
<string name="Send_Address_PhishingCheck_ClearInfo_Description">The verification is based on your transaction history, and no suspicious activity has been detected. The entered address has not been involved in known spam transactions associated with phishing attempts.</string>
<string name="Send_Address_PhishingCheck_Info1">Analyzes the provided destination address for potential phishing risks.</string>
<string name="Send_Address_PhishingCheck_Info2">Clear: No suspicious activity detected.</string>
<string name="Send_Address_PhishingCheck_Info3">Detected: It appears that someone may be trying to trick you into sending funds to an incorrect address. Do not proceed unless absolutely certain that the address is correct. Consider sending a small test transaction first.</string>
Expand All @@ -465,10 +463,6 @@
<string name="Send_Address_SanctionCheck_Info1">Verifies whether the recipient’s address is subject to international sanctions, using data from Chainalysis.com.</string>
<string name="Send_Address_SanctionCheck_Info2">Clear: No sanctions detected.</string>
<string name="Send_Address_SanctionCheck_Info3">Detected: Potential legal risk. Transactions with this address may be restricted or illegal in certain jurisdictions.</string>
<string name="Send_Address_BlacklistCheck_ClearInfo_Title">Blacklist: Clear</string>
<string name="Send_Address_BlacklistCheck_ClearInfo_Description">The recipient address has passed verification through Chainalysis.com and has not been flagged. This means the address has not been detected in any known blacklists or associated with suspicious activity.</string>
<string name="Send_Address_SanctionCheck_ClearInfo_Title">Sanction: Clear</string>
<string name="Send_Address_SanctionCheck_ClearInfo_Description">The recipient address has passed verification through Chainalysis.com and has not been flagged. This means the address has not been detected in any known blacklists or associated with suspicious activity.</string>
<string name="Send_Address_ErrorMessage_PhishingDetected">Phishing Address Detected!</string>
<string name="Send_Address_ErrorMessage_BlacklistDetected">Blacklisted Address Detected!</string>
<string name="Send_Address_ErrorMessage_SanctionDetected">Sanctioned Address Detected!</string>
Expand Down