Merge branch 'develop' into fx-npx-readme

RocketChat · Mar 17, 2020 · 5386d14 · 5386d14
2 parents d7258ab + b26f04b
commit 5386d14
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 20 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -300,6 +300,11 @@ jobs:
             set +e
             nvm install 8
 
+      - run:	
+          name: Install NPM modules	
+          command: |
+            yarn
+
       - run:
           name: Update Fastlane
           command: |

diff --git a/app/emojis.js b/app/emojis.js
@@ -1224,7 +1224,6 @@ export const emojisByCategory = {
 		'flag_er',
 		'flag_ee',
 		'flag_et',
-		'flag_fk',
 		'flag_fo',
 		'flag_fj',
 		'flag_fi',
@@ -1264,7 +1263,6 @@ export const emojisByCategory = {
 		'flag_kz',
 		'flag_ke',
 		'flag_ki',
-		'flag_xk',
 		'flag_kw',
 		'flag_kg',
 		'flag_la',
@@ -1301,7 +1299,6 @@ export const emojisByCategory = {
 		'flag_nr',
 		'flag_np',
 		'flag_nl',
-		'flag_nc',
 		'flag_nz',
 		'flag_ni',
 		'flag_ne',
@@ -1376,50 +1373,35 @@ export const emojisByCategory = {
 		'flag_va',
 		'flag_ve',
 		'flag_vn',
-		'flag_wf',
-		'flag_eh',
 		'flag_ye',
 		'flag_zm',
 		'flag_zw',
-		'flag_re',
 		'flag_ax',
 		'flag_ta',
 		'flag_io',
-		'flag_bq',
 		'flag_cx',
 		'flag_cc',
 		'flag_gg',
 		'flag_im',
-		'flag_yt',
 		'flag_nf',
 		'flag_pn',
-		'flag_bl',
-		'flag_pm',
-		'flag_gs',
 		'flag_tk',
 		'flag_bv',
 		'flag_hm',
 		'flag_sj',
 		'flag_um',
 		'flag_ic',
-		'flag_ea',
 		'flag_cp',
-		'flag_dg',
 		'flag_as',
 		'flag_aq',
 		'flag_vg',
 		'flag_ck',
 		'flag_cw',
 		'flag_eu',
-		'flag_gf',
-		'flag_tf',
-		'flag_gp',
-		'flag_mq',
 		'flag_mp',
 		'flag_sx',
 		'flag_ss',
-		'flag_tc',
-		'flag_mf'
+		'flag_tc'
 	]
 };
 

diff --git a/app/utils/shortnameToUnicode/emojis.js b/app/utils/shortnameToUnicode/emojis.js