diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.html b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.html index 3414cc8d32..d66c43ac50 100644 --- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.html +++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.html @@ -27,37 +27,14 @@ </bit-callout> <ng-container *ngIf="!done"> - <ng-container *ngIf="accountDeprovisioning.enabled"> - <div *ngIf="users.length > 0 && !error && isRevoking"> - <p>{{ "revokeMembersWarning" | i18n }}</p> - <ul> - <li> - {{ "claimedAccountRevoke" | i18n }} - </li> - <li> - {{ "unclaimedAccountRevoke" | i18n }} - </li> - </ul> - <p> - {{ "restoreMembersInstructions" | i18n }} - </p> - <p *ngIf="this.showNoMasterPasswordWarning"> - {{ "removeMembersWithoutMasterPasswordWarning" | i18n }} - </p> - </div> - </ng-container> - - <ng-container *ngIf="!accountDeprovisioning.enabled"> - <bit-callout type="warning" *ngIf="users.length > 0 && !error && isRevoking"> - <p>{{ "revokeUsersWarning" | i18n }}</p> - </bit-callout> - </ng-container> + <bit-callout type="warning" *ngIf="users.length > 0 && !error && isRevoking"> + <p>{{ "revokeUsersWarning" | i18n }}</p> + </bit-callout> <bit-table *ngIf="accountDeprovisioning.enabled"> <ng-container header> <tr> <th bitCell class="tw-w-1/2">{{ "member" | i18n }}</th> - <th bitCell *ngIf="isRevoking">{{ "details" | i18n }}</th> <th bitCell *ngIf="this.showNoMasterPasswordWarning">{{ "details" | i18n }}</th> </tr> </ng-container> @@ -74,11 +51,6 @@ </div> </div> </td> - <td *ngIf="isRevoking" bitCell width="30"> - {{ - user.managedByOrganization ? ("claimedAccount" | i18n) : ("unclaimedAccount" | i18n) - }} - </td> <td bitCell *ngIf="this.showNoMasterPasswordWarning"> <span class="tw-block tw-lowercase tw-text-muted"> <ng-container *ngIf="user.hasMasterPassword === true"> - </ng-container> diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json index 5e86e13f6c..abc3aa3a1d 100644 --- a/apps/web/src/locales/en/messages.json +++ b/apps/web/src/locales/en/messages.json @@ -35,24 +35,6 @@ "restoreMembers": { "message": "Restore members" }, - "revokeMembersWarning":{ - "message": "Members with claimed and unclaimed accounts will have different results when revoked:" - }, - "claimedAccountRevoke": { - "message": "Claimed account: Revoke access to Bitwarden account" - }, - "unclaimedAccountRevoke": { - "message": "Unclaimed account: Revoke access to organization data" - }, - "claimedAccount": { - "message": "Claimed account" - }, - "unclaimedAccount": { - "message": "Unclaimed account" - }, - "restoreMembersInstructions": { - "message": "To restore a member's account, go to the Revoked tab. The process may take a few seconds to complete and cannot be interrupted or canceled." - }, "cannotRestoreAccessError":{ "message": "Cannot restore organization access" },