Skip to content

fix: empty folder text - WPB-23213#4549

Merged
WilhelmOks merged 16 commits intodevelopfrom
fix/WPB-23213-empty-folder-state
Apr 21, 2026
Merged

fix: empty folder text - WPB-23213#4549
WilhelmOks merged 16 commits intodevelopfrom
fix/WPB-23213-empty-folder-state

Conversation

@WilhelmOks
Copy link
Copy Markdown
Collaborator

@WilhelmOks WilhelmOks commented Apr 10, 2026

BugWPB-23213 [iOS] Incorrect copy for folder empty state

Issue

Added different text for empty folders (different to the text of the empty roots).

Also refactored FilesInfoView to make the switch logic for the different states more clear and easier to maintain.
And removed .accessibilityLabel() from Text() since it's redundant.

Moved LoadMoreView from FilesInfoView into a separate file.

Second phase:

Unified MoveToFolderEmptyStateView into FilesInfoView (It has been used by the Move-to-Folder view and also by the Edit-File view).

Added snapshot tests for FilesInfoView.

Introduced Variants to SnapshotHelper to make it easier to test light/dark themes and different sizes.
@johnxnguyen @caldrian please review this part in particular as it also affects the code outside of Wire Drive.

Testing

  • Go to the files list of a Drive enabled conversation or to the Drive tab
  • Empty folders should have different text than a completely empty files list (root)
  • Empty folders in the Recycle Bin should also have different text

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 10, 2026

Test Results

347 tests   347 ✅  2m 17s ⏱️
 67 suites    0 💤
  2 files      0 ❌

Results for commit df50f17.

♻️ This comment has been updated with latest results.

Summary: workflow run #24731087737
Allure report (download zip): html-report-29417-fix_WPB-23213-empty-folder-state

@WilhelmOks WilhelmOks enabled auto-merge April 10, 2026 09:44
@WilhelmOks WilhelmOks disabled auto-merge April 13, 2026 14:30
@WilhelmOks WilhelmOks marked this pull request as draft April 13, 2026 15:59
@WilhelmOks WilhelmOks marked this pull request as ready for review April 15, 2026 08:34
Copy link
Copy Markdown
Contributor

@jullianm jullianm left a comment

Choose a reason for hiding this comment

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

Nice work, left a few feedbacks before approving. As we're introducing a new helper method for snapshot tests, I'd suggest adding devs from the iOS team as reviewers as well.

Comment thread WireFoundation/Sources/WireTesting/Utilities/SnapshotHelper.swift
Comment thread WireFoundation/Sources/WireTesting/Utilities/SnapshotHelper.swift Outdated
Copy link
Copy Markdown
Collaborator

@OlivellaO OlivellaO left a comment

Choose a reason for hiding this comment

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

LGTM

Comment thread WireFoundation/Sources/WireTesting/Utilities/SnapshotHelper.swift
@WilhelmOks
Copy link
Copy Markdown
Collaborator Author

Nice work, left a few feedbacks before approving. As we're introducing a new helper method for snapshot tests, I'd suggest adding devs from the iOS team as reviewers as well.

Makes sense, I added Sam and John.

@samwyndham samwyndham removed their request for review April 15, 2026 13:01
@WilhelmOks WilhelmOks requested a review from caldrian April 17, 2026 07:50
Copy link
Copy Markdown
Contributor

@jullianm jullianm left a comment

Choose a reason for hiding this comment

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

Nice work!

@WilhelmOks WilhelmOks enabled auto-merge April 21, 2026 15:27
@sonarqubecloud
Copy link
Copy Markdown

Quality Gate Failed Quality Gate failed

Failed conditions
6.0% Duplication on New Code (required ≤ 3%)

See analysis details on SonarQube Cloud

@WilhelmOks WilhelmOks added this pull request to the merge queue Apr 21, 2026
Merged via the queue into develop with commit 800870c Apr 21, 2026
13 of 14 checks passed
@WilhelmOks WilhelmOks deleted the fix/WPB-23213-empty-folder-state branch April 21, 2026 17:06
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.

4 participants