From a0c24dbbcc12f46fc6b5db5bf5adf7d039aa3af9 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 31 Dec 2020 10:56:43 -0600
Subject: [PATCH] Admin: improve approval UI for mobile, display snackbar
 messages

---
 .../features/admin/awaiting_approval.js       | 21 +++++++++++++------
 app/styles/components/admin.scss              |  6 +++++-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/soapbox/features/admin/awaiting_approval.js b/app/soapbox/features/admin/awaiting_approval.js
index 4486f4b27..94c7284c9 100644
--- a/app/soapbox/features/admin/awaiting_approval.js
+++ b/app/soapbox/features/admin/awaiting_approval.js
@@ -8,10 +8,13 @@ import Column from '../ui/components/column';
 import IconButton from 'soapbox/components/icon_button';
 import ScrollableList from 'soapbox/components/scrollable_list';
 import { fetchUsers, deleteUsers, approveUsers } from 'soapbox/actions/admin';
+import snackbar from 'soapbox/actions/snackbar';
 
 const messages = defineMessages({
   heading: { id: 'column.admin.awaiting_approval', defaultMessage: 'Awaiting Approval' },
   emptyMessage: { id: 'admin.awaiting_approval.empty_message', defaultMessage: 'There is nobody waiting for approval. When a new user signs up, you can review them here.' },
+  approved: { id: 'admin.awaiting_approval.approved_message', defaultMessage: '{acct} was approved!' },
+  rejected: { id: 'admin.awaiting_approval.rejected_message', defaultMessage: '{acct} was rejected.' },
 });
 
 const mapStateToProps = state => {
@@ -43,16 +46,22 @@ class AwaitingApproval extends ImmutablePureComponent {
   }
 
   handleApprove = nickname => {
-    const { dispatch } = this.props;
+    const { dispatch, intl } = this.props;
     return e => {
-      dispatch(approveUsers([nickname]));
+      dispatch(approveUsers([nickname])).then(() => {
+        const message = intl.formatMessage(messages.approved, { acct: `@${nickname}` });
+        dispatch(snackbar.success(message));
+      }).catch(() => {});
     };
   }
 
   handleReject = nickname => {
-    const { dispatch } = this.props;
+    const { dispatch, intl } = this.props;
     return e => {
-      dispatch(deleteUsers([nickname]));
+      dispatch(deleteUsers([nickname])).then(() => {
+        const message = intl.formatMessage(messages.rejected, { acct: `@${nickname}` });
+        dispatch(snackbar.info(message));
+      }).catch(() => {});
     };
   }
 
@@ -70,8 +79,8 @@ class AwaitingApproval extends ImmutablePureComponent {
                 <blockquote className='unapproved-account__reason'>{user.get('registration_reason')}</blockquote>
               </div>
               <div className='unapproved-account__actions'>
-                <IconButton icon='check' onClick={this.handleApprove(user.get('nickname'))} />
-                <IconButton icon='close' onClick={this.handleReject(user.get('nickname'))} />
+                <IconButton icon='check' size={22} onClick={this.handleApprove(user.get('nickname'))} />
+                <IconButton icon='close' size={22} onClick={this.handleReject(user.get('nickname'))} />
               </div>
             </div>
           ))}
diff --git a/app/styles/components/admin.scss b/app/styles/components/admin.scss
index 01e343a03..b544d9f70 100644
--- a/app/styles/components/admin.scss
+++ b/app/styles/components/admin.scss
@@ -85,9 +85,13 @@
 
   &__actions {
     margin-left: auto;
-    padding-left: 20px;
     display: flex;
     flex-wrap: nowrap;
+    padding-left: 20px;
+
+    button.icon-button:nth-child(n+2) {
+      padding-left: 10px;
+    }
   }
 }