linting + merge conflicts

mattermost · Apr 9, 2024 · aecfd27 · aecfd27
1 parent 6c12ed0
commit aecfd27
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/webapp/src/components/github_repo_selector/index.js b/webapp/src/components/github_repo_selector/index.js
@@ -12,8 +12,8 @@ import GithubRepoSelector from './github_repo_selector.jsx';
 
 function mapStateToProps(state) {
     return {
-        yourOrgs: state[`plugins-${pluginId}`].yourOrgs,
-        yourReposByOrg: state[`plugins-${pluginId}`].yourReposByOrg,
+        yourOrgs: state[`plugins-${manifest.id}`].yourOrgs,
+        yourReposByOrg: state[`plugins-${manifest.id}`].yourReposByOrg,
     };
 }
 

diff --git a/webapp/src/reducers/index.js b/webapp/src/reducers/index.js
@@ -48,7 +48,14 @@ function username(state = '', action) {
     }
 }
 
-function userSettings(state = {sidebar_buttons: Constants.SETTING_BUTTONS_TEAM, daily_reminder: true, notifications: true}, action) {
+function userSettings(
+    state = {
+        sidebar_buttons: Constants.SETTING_BUTTONS_TEAM,
+        daily_reminder: true,
+        notifications: true,
+    },
+    action,
+) {
     switch (action.type) {
     case ActionTypes.RECEIVED_CONNECTED:
         return action.data.user_settings;
@@ -240,8 +247,6 @@ export default combineReducers({
     yourRepos,
     yourReposByOrg,
     yourOrgs,
-    yourPrsDetails,
-    yourAssignments,
     yourPrDetails,
     mentions,
     githubUsers,