Merge pull request #320 from oxen-io/sort-sn-staked-list

Sorts the "MY STAKES" service node list alphabetically

package.json

@@ -1,6 +1,6 @@
 {
   "name": "oxen-electron-wallet",
-  "version": "1.7.2",
+  "version": "1.8.0",
   "description": "Modern GUI interface for Oxen Currency",
   "productName": "Oxen Electron Wallet",
   "repository": {

src/components/service_node/service_node_unlock.vue

@@ -72,13 +72,20 @@ export default {
         node.contributors.find(
           c => c.address === this.our_address && c.amount > 0
         );
-      return nodes.filter(getOurContribution).map(n => {
-        const ourContribution = getOurContribution(n);
-        return {
-          ...n,
-          ourContributionAmount: ourContribution.amount
-        };
-      });
+      return nodes
+        .filter(getOurContribution)
+        .sort((a, b) => {
+          if (a.service_node_pubkey < b.service_node_pubkey) return -1;
+          if (a.service_node_pubkey > b.service_node_pubkey) return 1;
+          return 0;
+        })
+        .map(n => {
+          const ourContribution = getOurContribution(n);
+          return {
+            ...n,
+            ourContributionAmount: ourContribution.amount
+          };
+        });
     },
     fetching: state => state.gateway.daemon.service_nodes.fetching
   }),

src/pages/wallet-select/index.vue

@@ -31,9 +31,13 @@
         </div>
         <div class="hr-separator" />
         <!-- Hardware wallets -->
-        <q-list-header v-if="hardware_wallets.length">{{
-          $t("strings.hardwareWallets")
-        }}</q-list-header>
+        <q-list-header v-if="hardware_wallets.length">
+          <div class="header row justify-between items-center">
+            <div class="header-title">
+              {{ $t("strings.hardwareWallets") }}
+            </div>
+          </div>
+        </q-list-header>
         <WalletListItem
           v-for="wallet in hardware_wallets"
           :key="`${wallet.address}-${wallet.name}`"
@@ -41,9 +45,13 @@
           :open-wallet="openWallet"
         />
         <!-- Regular wallets -->
-        <q-list-header v-if="hardware_wallets.length">{{
-          $t("strings.regularWallets")
-        }}</q-list-header>
+        <q-list-header v-if="hardware_wallets.length">
+          <div class="header row justify-between items-center">
+            <div class="header-title">
+              {{ $t("strings.regularWallets") }}
+            </div>
+          </div>
+        </q-list-header>
         <WalletListItem
           v-for="wallet in regular_wallets"
           :key="`${wallet.address}-${wallet.name}`"