summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-06-06 17:24:08 -0400
committerGitHub <noreply@github.com>2017-06-06 17:24:08 -0400
commit6e7b912ec61a6a791e0e8405ff6f6bd7e622a187 (patch)
treec2fa1d2bae0b344859339d9077af5d822420e7bb /webapp/components/admin_console
parent02f09b8af90f1df38762b5257291b31597575dbb (diff)
downloadchat-6e7b912ec61a6a791e0e8405ff6f6bd7e622a187.tar.gz
chat-6e7b912ec61a6a791e0e8405ff6f6bd7e622a187.tar.bz2
chat-6e7b912ec61a6a791e0e8405ff6f6bd7e622a187.zip
PLT-4257 Add pop-up asking if user wants to reset status (#6526)
* Add pop-up asking if user wants to reset status * Update test snapshot * Update prop name for old uses of confirm modal * Updating checkbox (#6586) * Updating style for checkbox (#6596)
Diffstat (limited to 'webapp/components/admin_console')
-rw-r--r--webapp/components/admin_console/system_users/system_users_dropdown.jsx4
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/admin_console/system_users/system_users_dropdown.jsx b/webapp/components/admin_console/system_users/system_users_dropdown.jsx
index 159e133e5..fe53ade44 100644
--- a/webapp/components/admin_console/system_users/system_users_dropdown.jsx
+++ b/webapp/components/admin_console/system_users/system_users_dropdown.jsx
@@ -202,7 +202,7 @@ export default class SystemUsersDropdown extends React.Component {
title={title}
message={message}
confirmButtonClass={confirmButtonClass}
- confirmButton={deactivateMemberButton}
+ confirmButtonText={deactivateMemberButton}
onConfirm={this.handleDeactivateMember}
onCancel={this.handleDeactivateCancel}
/>
@@ -467,7 +467,7 @@ export default class SystemUsersDropdown extends React.Component {
show={this.state.showDemoteModal}
title={title}
message={message}
- confirmButton={confirmButton}
+ confirmButtonText={confirmButton}
onConfirm={this.handleDemoteSubmit}
onCancel={this.handleDemoteCancel}
/>