Merge branch 'rc/2.2.3' into 'master'

rc 2.2.3 to MASTER

See merge request pleroma/pleroma-fe!1328

1 files changed, 2 insertions, 2 deletions

diff --git a/src/modules/instance.js b/src/modules/instance.js
index 5f7bf0ec..411b1caa 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -127,7 +127,7 @@ const instance = {
               imageUrl: false,
               replacement: values[key]
             }
-          }).sort((a, b) => a.displayText - b.displayText)
+          }).sort((a, b) => a.name > b.name ? 1 : -1)
           commit('setInstanceOption', { name: 'emoji', value: emoji })
         } else {
           throw (res)
@@ -154,7 +154,7 @@ const instance = {
             }
             // Technically could use tags but those are kinda useless right now,
             // should have been "pack" field, that would be more useful
-          }).sort((a, b) => a.displayText.toLowerCase() > b.displayText.toLowerCase() ? 1 : 0)
+          }).sort((a, b) => a.displayText.toLowerCase() > b.displayText.toLowerCase() ? 1 : -1)
           commit('setInstanceOption', { name: 'customEmoji', value: emoji })
         } else {
           throw (res)