498 phone number validation2 (#504)

* Update SMS country code drop down order.  Top 5 countries at the top.

* Remove zero prefix from country code.

* Remove Russia from top 5 in country code drop down.  They have their own blockchain.

app/components/elements/CountryCode.jsx

@@ -2,6 +2,13 @@ import React from 'react'
 
 export default props => {
     return <select {...props}>
+        {/* Top countries (duplicated from below) */}
+        <option value="1">United States +(1)</option>
+        <option value="44">United Kingdom +(44)</option>
+        <option value="1">Canada +(1)</option>
+        <option value="34">Spain +(34)</option>
+
+        {/* TeleSign supported country codes */}
         <option value=""></option>
         <option value="93">Afghanistan +(93)</option>
         <option value="355">Albania +(355)</option>

server/server_pages/enter_confirm_mobile.jsx

@@ -103,7 +103,7 @@ export default function useEnterAndConfirmMobilePages(app) {
         const localPhone = this.request.body.phone;
         const enterMobileUrl = `/enter_mobile?phone=${localPhone}&country=${country}`
 
-        if (!country && country === '') {
+        if (!country || country === '') {
             this.flash = {error: 'Please select a country code'};
             this.redirect(enterMobileUrl);
             return;
@@ -115,7 +115,7 @@ export default function useEnterAndConfirmMobilePages(app) {
             return;
         }
 
-        const phone = digits(country + localPhone)
+        const phone = digits(parseInt(country) + localPhone)
 
         const eid = yield models.Identity.findOne(
             {attributes: ['id'], where: {user_id, provider: 'email', verified: true}, order: 'id DESC'}