@@ -90,13 +90,13 @@ class AccountHistory extends React.Component {
{userHistory.map(
({ __typename, created_at, assigned_by, until, status }) => (
{moment(new Date(created_at)).format('MMM DD, YYYY')}
@@ -105,7 +105,7 @@ class AccountHistory extends React.Component {
className={cn(
styles.item,
styles.action,
- 'talk-admin-account-history-row-status'
+ 'talk-admin-user-history-row-status'
)}
>
{buildActionResponse(__typename, created_at, until, status)}
@@ -114,7 +114,7 @@ class AccountHistory extends React.Component {
className={cn(
styles.item,
styles.username,
- 'talk-admin-account-history-row-assigned-by'
+ 'talk-admin-user-history-row-assigned-by'
)}
>
{getModerationValue(assigned_by)}
@@ -128,8 +128,8 @@ class AccountHistory extends React.Component {
}
}
-AccountHistory.propTypes = {
+UserHistory.propTypes = {
user: PropTypes.object.isRequired,
};
-export default AccountHistory;
+export default UserHistory;
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 000000000..d6105c594
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,27 @@
+{
+ "name": "talk",
+ "version": "4.3.0",
+ "lockfileVersion": 1,
+ "requires": true,
+ "dependencies": {
+ "exenv": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
+ "integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50="
+ },
+ "react-side-effect": {
+ "version": "1.1.5",
+ "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.1.5.tgz",
+ "integrity": "sha512-Z2ZJE4p/jIfvUpiUMRydEVpQRf2f8GMHczT6qLcARmX7QRb28JDBTpnM2g/i5y/p7ZDEXYGHWg0RbhikE+hJRw==",
+ "requires": {
+ "exenv": "1.2.2",
+ "shallowequal": "1.0.2"
+ }
+ },
+ "shallowequal": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.0.2.tgz",
+ "integrity": "sha512-zlVXeVUKvo+HEv1e2KQF/csyeMKx2oHvatQ9l6XjCUj3agvC8XGf6R9HvIPDSmp8FNPvx7b5kaEJTRi7CqxtEw=="
+ }
+ }
+}
diff --git a/test/e2e/page_objects/admin.js b/test/e2e/page_objects/admin.js
index 218afe425..8e319e499 100644
--- a/test/e2e/page_objects/admin.js
+++ b/test/e2e/page_objects/admin.js
@@ -128,8 +128,8 @@ module.exports = {
rejectedTab: '.talk-admin-user-detail-rejected-tab',
historyTab: '.talk-admin-user-detail-history-tab',
historyPane: '.talk-admin-user-detail-history-tab-pane',
- accountHistory: '.talk-admin-account-history',
- accountHistoryRowStatus: '.talk-admin-account-history-row-status',
+ UserHistory: '.talk-admin-user-history',
+ UserHistoryRowStatus: '.talk-admin-user-history-row-status',
actionsMenu: '.talk-admin-user-detail-actions-button',
actionItemSuspendUser: '.action-menu-item#suspendUser',
actionMenuButton:
diff --git a/test/e2e/specs/06_suspendUser.js b/test/e2e/specs/06_suspendUser.js
index 0b89c5c01..81fde3781 100644
--- a/test/e2e/specs/06_suspendUser.js
+++ b/test/e2e/specs/06_suspendUser.js
@@ -125,7 +125,7 @@ module.exports = {
.waitForElementVisible('@historyTab')
.click('@historyTab')
.waitForElementVisible('@historyPane')
- .waitForElementVisible('@accountHistory')
+ .waitForElementVisible('@UserHistory')
.click('@closeButton');
},
'admin logs out': client => {