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

Enable account closure #18412

Merged
merged 61 commits into from
May 19, 2023
Merged
Changes from 1 commit
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
9c1b3fb
Add close account button
mkevins May 8, 2023
db7bacb
Merge pull request #18382 from wordpress-mobile/feature/enable-accoun…
ovitrif May 8, 2023
9dd2b37
Add ui state and methods for account closure dialog
mkevins May 8, 2023
7edd583
Add account closure dialog
mkevins May 8, 2023
8fc1bb9
Extract flat button components
mkevins May 9, 2023
ea6edb6
Make some minor style adjustments to the dialog
mkevins May 9, 2023
6f824ad
Use extracted button components in dialog
mkevins May 9, 2023
b3971f7
Add ui state for atomic sites to the model
mkevins May 9, 2023
01b7724
Add ineligible dialog
mkevins May 9, 2023
e78ca07
Add ineligible dialog to the ui
mkevins May 9, 2023
a75a374
Add account closure origin for help requests
mkevins May 9, 2023
114db4e
Wire up contact support button to launch HelpActivity
mkevins May 9, 2023
7e481dd
Merge branch 'feature/enable-account-closure' into feature/enable-acc…
mkevins May 9, 2023
8900ab3
Add pending state to button
mkevins May 9, 2023
0fc22ea
Add pending flag to dialog state
mkevins May 9, 2023
99c8a6c
Add fake account closure implementation
mkevins May 9, 2023
1eca8a0
Wire up the confirm button to the close account function
mkevins May 9, 2023
48dcb30
Remove unused imports
ovitrif May 9, 2023
bdc3897
Merge pull request #18386 from wordpress-mobile/feature/enable-accoun…
ovitrif May 9, 2023
0563436
Remove unnecessary type-guard in fake closeAccount function
mkevins May 9, 2023
f478167
Refactor: remove unused imports
ovitrif May 9, 2023
8bb341f
Update: add inline magic number detekt suppression temporarily
ovitrif May 9, 2023
5060a01
Merge pull request #18391 from wordpress-mobile/feature/enable-accoun…
mkevins May 9, 2023
0af907f
Merge branch 'trunk' into feature/enable-account-closure
mkevins May 10, 2023
73f9e04
Update FluxC version to reference PR artifact
mkevins May 11, 2023
cf8f5ed
Extract a common dialog component for normal and error flows
mkevins May 10, 2023
dd105e2
Disable cancel button while account closure is pending
mkevins May 11, 2023
780799d
Add account closure error message strings
mkevins May 11, 2023
f84e272
Add dialog error ui
mkevins May 11, 2023
8bc21db
Add error handling to the view model
mkevins May 11, 2023
f4d8ec0
Add string for successful account closure
mkevins May 11, 2023
74ca2b5
Add dialog success ui
mkevins May 11, 2023
a99b301
Log user out after successful account closure
mkevins May 11, 2023
c96d531
Fix the names of composable preview functions
mkevins May 11, 2023
8118fa4
Make cancel button disabled without spinner while pending
mkevins May 11, 2023
d1323ef
Refactor user events to make logout smoother
mkevins May 11, 2023
939b22c
Autofocus username input when account closure dialog opens
mkevins May 11, 2023
b6bcdd9
Add account closure analytics events
mkevins May 16, 2023
58af67d
Add account closure tracking functions
mkevins May 16, 2023
d8dea83
Track success and failure of account closure
mkevins May 16, 2023
15cd55c
Re-enable pre-flight check for atomic sites
mkevins May 17, 2023
7cd6f4f
Merge branch 'trunk' into feature/enable-account-closure
mkevins May 17, 2023
63cceae
Merge branch 'feature/enable-account-closure' into feature/enable-acc…
mkevins May 17, 2023
7c5e25b
Merge branch 'feature/enable-account-closure--18393-add-api-endpoint'…
mkevins May 17, 2023
0cc62cb
Merge branch 'feature/enable-account-closure--18406-add-error-handlin…
mkevins May 17, 2023
4d0eba1
Update FluxC reference
mkevins May 17, 2023
8e713c4
Merge branch 'feature/enable-account-closure--18393-add-api-endpoint'…
mkevins May 17, 2023
a6cd729
Merge branch 'feature/enable-account-closure--18406-add-error-handlin…
mkevins May 17, 2023
0d0b431
Merge pull request #18407 from wordpress-mobile/feature/enable-accoun…
mkevins May 17, 2023
65b2522
Merge pull request #18444 from wordpress-mobile/feature/enable-accoun…
ovitrif May 17, 2023
f3fab89
Fix compilation issues in account settings vm
ovitrif May 17, 2023
934d626
Merge pull request #18450 from wordpress-mobile/feature/enable-accoun…
mkevins May 17, 2023
488dc3f
Add test for getSitesUseCase
mkevins May 17, 2023
19d7cc6
Fix typo in test name
mkevins May 17, 2023
93f9741
Extract account closure function to a use case class
mkevins May 18, 2023
6c216d5
Add unit tests for account closure ui state
mkevins May 18, 2023
011c091
Merge pull request #18409 from wordpress-mobile/feature/enable-accoun…
ovitrif May 18, 2023
bdf5833
Removes empty line to fix lint issue
May 18, 2023
229c44c
Merge pull request #18457 from wordpress-mobile/feature/enable-accoun…
May 18, 2023
92f1812
Merge branch 'trunk' into feature/enable-account-closure
mkevins May 19, 2023
6e49556
Add release note
mkevins May 19, 2023
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 typo in test name
  • Loading branch information
mkevins committed May 17, 2023
commit 19d7cc6ca058d87a5107ab26a565181d15a1e82e
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class AccountSettingsViewModelTest : BaseUnitTest() {
}

@Test
fun `The initial primarysite is shown from cached account settings`() = test {
fun `The initial primary site is shown from cached account settings`() = test {
uiState.primarySiteSettingsUiState.primarySite?.siteId?.let {
assertThat(it).isEqualTo(getAccountUseCase.account.primarySiteId)
}
Expand Down