Skip to content

Conversation

@saleniuk
Copy link
Contributor

@saleniuk saleniuk commented Jan 2, 2026

BugWPB-22554 [Android] Arrow shouldn't be visible when there's a toggle in settings


PR Submission Checklist for internal contributors

  • The PR Title

    • conforms to the style of semantic commits messages¹ supported in Wire's Github Workflow²
    • contains a reference JIRA issue number like SQPIT-764
    • answers the question: If merged, this PR will: ... ³
  • The PR Description

    • is free of optional paragraphs and you have filled the relevant parts to the best of your ability

What's new in this PR?

Issues

In settings, for rows that have a toggle, there shouldn't be an arrow icon visible, the app should either show a toggle or arrow icon.

Causes (Optional)

This is just an outcome of actually fixing the part of code that had no sense before, as previously it was like this:

actions = {
    trailingIcon?.let {
        Icon(
            painter = painterResource(id = trailingIcon),
            contentDescription = "",
            tint = MaterialTheme.wireColorScheme.onSecondaryButtonEnabled,
            modifier = Modifier
                .defaultMinSize(80.dp)
                .clickable(onIconPressed)
        )
    } ?: Icons.Filled.ChevronRight
},

so in case of null trailingIcon (and it should be null when there's a toggle) it was passing the ImageVector but it wasn't drawing it (not wrapped in any Icon nor Image drawable) and when replacing material Icons it was actually wrapped with Icon because it was probably noticed that it doesn't do anything.

Solutions

Remove creating Icon with arrow when trailingIcon is null - in this case it shouldn't have any trailing icon.

Testing

How to Test

Open settings and check "lock with passcode" option, if app lock is enabled for the user and not enforced by team, so when the toggle is visible and editable.

Attachments (Optional)

Before After

PR Post Submission Checklist for internal contributors (Optional)

  • Wire's Github Workflow has automatically linked the PR to a JIRA issue

PR Post Merge Checklist for internal contributors

  • If any soft of configuration variable was introduced by this PR, it has been added to the relevant documents and the CI jobs have been updated.

References
  1. https://sparkbox.com/foundry/semantic_commit_messages
  2. https://github.com/wireapp/.github#usage
  3. E.g. feat(conversation-list): Sort conversations by most emojis in the title #SQPIT-764.

@sonarqubecloud
Copy link

sonarqubecloud bot commented Jan 2, 2026

@saleniuk saleniuk enabled auto-merge January 2, 2026 11:29
@saleniuk saleniuk added this pull request to the merge queue Jan 2, 2026
Merged via the queue into develop with commit deedce5 Jan 2, 2026
20 of 21 checks passed
@saleniuk saleniuk deleted the fix/settings-remove-arrow-when-toggle-is-visible branch January 2, 2026 11:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants