refactor: fixed review suggestions

Author: sundasnoreen12

src/profile/__snapshots__/ProfilePage.test.jsx.snap

@@ -977,7 +977,6 @@ exports[`<ProfilePage /> Renders correctly in various states test country edit w
                          
                       </option>
                       <option
-                        disabled=""
                         value="ME"
                       >
                         Montenegro

src/profile/data/sagas.test.js

@@ -99,7 +99,7 @@ describe('RootSaga', () => {
       const action = profileActions.fetchProfile('booyah');
       const gen = handleFetchProfile(action);
 
-      const result = [{}, [1, 2, 3], []];
+      const result = [{}, [1, 2, 3], [{ code: 'AX', name: 'Åland Islands' }, { code: 'AL', name: 'Albania' }]];
 
       expect(gen.next().value).toEqual(select(userAccountSelector));
       expect(gen.next(selectorData).value).toEqual(put(profileActions.fetchProfileBegin()));
@@ -109,7 +109,7 @@ describe('RootSaga', () => {
         call(ProfileApiService.getCountryList),
       ]));
       expect(gen.next(result).value)
-        .toEqual(put(profileActions.fetchProfileSuccess(result[0], {}, result[1], false, [])));
+        .toEqual(put(profileActions.fetchProfileSuccess(result[0], {}, result[1], false, [{ code: 'AX', name: 'Åland Islands' }, { code: 'AL', name: 'Albania' }])));
       expect(gen.next().value).toEqual(put(profileActions.fetchProfileReset()));
       expect(gen.next().value).toBeUndefined();
     });

src/profile/data/selectors.js

@@ -117,12 +117,10 @@ export const sortedCountriesSelector = createSelector(
   profileAccountSelector,
   (locale, countries, profileAccount) => {
     const countryList = getCountryList(locale);
-    const countriesCodes = new Set(countries.map(country => country.code));
+    const countriesCodes = new Set(countries.map(({ code }) => code));
+    const userCountryCode = profileAccount.country;
 
-    return countryList.filter(({ code }) => {
-      const isUserCountry = code === profileAccount.country || countriesCodes.has(code);
-      return isUserCountry;
-    });
+    return countryList.filter(({ code }) => code === userCountryCode || countriesCodes.has(code));
   },
 );
 

src/profile/forms/Country.jsx

@@ -49,9 +49,8 @@ class Country extends React.Component {
 
   isDisabledCountry = (country) => {
     const { countries } = this.props;
-    const countriesCodes = new Set(countries.map(countryObj => countryObj.code));
 
-    return !countriesCodes.has(country);
+    return countries.length > 0 && !new Set(countries.map(({ code }) => code)).has(country);
   };
 
   render() {