Merge pull request #1565 from gurmeetb/issue_1474

Fix for Issuse #1474

Author: ThomasKranitsas

src/shared/reducers/page/settings.js

@@ -36,9 +36,27 @@ function mergeSkills(state, { type, payload, error }) {
 
   let maxIsNew = 0;
 
+  // add skill logic
   let addedSkillName = '';
-  let removedSkillName = '';
+  _.forEach(newSkills, (newSkill, tagId) => {
+    const oldSkill = oldSkills[tagId];
+    if (!oldSkill) {
+      if (!firstTime) {
+        maxIsNew += 1;
+      }
+      // Add the new skill and set 'isNew' field
+      mergedSkills[tagId] = {
+        ...newSkill,
+        isNew: firstTime ? 0 : maxIsNew,
+      };
+      addedSkillName = newSkill.tagName;
+    } else if (!newSkill.hidden && oldSkill.hidden) {
+      addedSkillName = newSkill.tagName;
+    }
+  });
 
+  let removedSkillName = '';
+  // remove skill logic
   _.forEach(oldSkills, (oldSkill, tagId) => {
     const newSkill = newSkills[tagId];
     if (!newSkill) {
@@ -64,35 +82,16 @@ function mergeSkills(state, { type, payload, error }) {
     }
   });
 
-  _.forEach(newSkills, (newSkill, tagId) => {
-    const oldSkill = oldSkills[tagId];
-    if (!oldSkill) {
-      if (!firstTime) {
-        maxIsNew += 1;
-      }
-      // Add the new skill and set 'isNew' field
-      mergedSkills[tagId] = {
-        ...newSkill,
-        isNew: firstTime ? 0 : maxIsNew,
-      };
-      addedSkillName = newSkill.tagName;
-    } else if (!newSkill.hidden && oldSkill.hidden) {
-      addedSkillName = newSkill.tagName;
-    }
-  });
-
   if (type === 'PROFILE/ADD_SKILL_DONE') {
     if (payload.skill) {
-      toastrSuccess('Success! ', `Skill "${payload.skill.name}" was added.`);
-    } else {
-      toastrSuccess('Success! ', `Skill "${addedSkillName}" was added.`);
+      addedSkillName = payload.skill.name;
     }
+    toastrSuccess('Success! ', `Skill "${addedSkillName}" was added.`);
   } else if (type === 'PROFILE/HIDE_SKILL_DONE') {
     if (payload.skill) {
-      toastrSuccess('Success! ', `Skill "${payload.skill.name}" was removed.`);
-    } else {
-      toastrSuccess('Success! ', `Skill "${removedSkillName}" was removed.`);
+      removedSkillName = payload.skill.name;
     }
+    toastrSuccess('Success! ', `Skill "${removedSkillName}" was removed.`);
   }
 
   return {