Merge branch 'HIN-982-fixes' into 'develop'

fix(country-list): display country dropdown on signUp

See merge request !80

packages/component-faraday-ui/src/helpers/withCountries.js

@@ -9,8 +9,6 @@ const countryMapper = c => {
       return 'SRB'
     case 'ME':
       return 'MNT'
-    case 'CG':
-      return 'CD'
     default:
       return c
   }
@@ -24,8 +22,6 @@ const codeMapper = c => {
       return 'RS'
     case 'MNT':
       return 'ME'
-    case 'CD':
-      return 'CG'
     default:
       return c
   }

packages/components-faraday/src/components/SignUp/SignUpStep0.js

@@ -12,6 +12,7 @@ import {
   Label,
   ActionLink,
   ItemOverrideAlert,
+  withCountries,
 } from 'pubsweet-component-faraday-ui'
 
 const AgreeCheckbox = ({ value, onChange }) => (
@@ -73,7 +74,13 @@ const Step0 = ({
         <ItemOverrideAlert ml={1} vertical>
           <Label required>Country</Label>
           <ValidatedField
-            component={TextField}
+            component={input => (
+              <Menu
+                {...input}
+                options={countries}
+                placeholder="Please select"
+              />
+            )}
             name="country"
             validate={[requiredValidator]}
           />
@@ -128,9 +135,11 @@ const Step0 = ({
   )
 
 export default compose(
+  withCountries,
   reduxForm({
     form: 'signUpInvitation',
     destroyOnUnmount: false,
     forceUnregisterOnUnmount: true,
+    enableReinitialize: true,
   }),
 )(Step0)