From dec4aa9619067653198a1c7e05f4795f41aaaaba Mon Sep 17 00:00:00 2001
From: Katalina Okano <git2@kat.cafe>
Date: Sun, 19 Feb 2023 11:45:30 -0500
Subject: [PATCH] Revert "flip role order"

This reverts commit 175144cc7a7d2b0ff2959a108527d1640fb0fafb.
---
 .../api/src/routes/interactions/helpers.ts    |  6 -----
 .../editable-role-list/EditableRoleList.tsx   |  4 ++--
 .../picker-category/PickerCategory.tsx        |  4 ++--
 packages/misc-utils/sortBy.ts                 | 22 -------------------
 4 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/packages/api/src/routes/interactions/helpers.ts b/packages/api/src/routes/interactions/helpers.ts
index 623b47b..869cb28 100644
--- a/packages/api/src/routes/interactions/helpers.ts
+++ b/packages/api/src/routes/interactions/helpers.ts
@@ -13,7 +13,6 @@ export const verifyRequest = async (
     const signature = request.headers.get('x-signature-ed25519');
 
     if (!timestamp || !signature) {
-      console.error("interactions: missing signature headers", { timestamp, signature });
       return false;
     }
 
@@ -32,13 +31,8 @@ export const verifyRequest = async (
       bufferizeString(timestamp + JSON.stringify(interaction))
     );
 
-    if (!verified) {
-      console.error("interactions: signature verification failed", { timestamp, signature });
-    }
-
     return verified;
   } catch (e) {
-    console.error("interactions: signature verification failed", e);
     return false;
   }
 };
diff --git a/packages/design-system/molecules/editable-role-list/EditableRoleList.tsx b/packages/design-system/molecules/editable-role-list/EditableRoleList.tsx
index 3cb2b63..3eb17e3 100644
--- a/packages/design-system/molecules/editable-role-list/EditableRoleList.tsx
+++ b/packages/design-system/molecules/editable-role-list/EditableRoleList.tsx
@@ -2,10 +2,10 @@ import { Popover } from '@roleypoly/design-system/atoms/popover';
 import { Role } from '@roleypoly/design-system/atoms/role';
 import { RoleSearch } from '@roleypoly/design-system/molecules/role-search';
 import { Role as RoleT } from '@roleypoly/types';
+import { sortBy, uniq } from 'lodash';
 import React from 'react';
 import { GoPlus } from 'react-icons/go';
 import { AddRoleButton, EditableRoleListStyled } from './EditableRoleList.styled';
-import { sortByReverse } from '@roleypoly/misc-utils/sortBy';
 
 type Props = {
   roles: RoleT[];
@@ -36,7 +36,7 @@ export const EditableRoleList = (props: Props) => {
     <EditableRoleListStyled>
       {props.selectedRoles.length !== 0 ? (
         <>
-          {sortByReverse(
+          {sortBy(
             props.roles.filter((r) => props.selectedRoles.includes(r.id)),
             'position'
           ).map((role) => (
diff --git a/packages/design-system/molecules/picker-category/PickerCategory.tsx b/packages/design-system/molecules/picker-category/PickerCategory.tsx
index 5a447de..f8aada8 100644
--- a/packages/design-system/molecules/picker-category/PickerCategory.tsx
+++ b/packages/design-system/molecules/picker-category/PickerCategory.tsx
@@ -1,6 +1,6 @@
 import { Role } from '@roleypoly/design-system/atoms/role';
 import { AmbientLarge, LargeText } from '@roleypoly/design-system/atoms/typography';
-import { sortByReverse } from '@roleypoly/misc-utils/sortBy';
+import { sortBy } from '@roleypoly/misc-utils/sortBy';
 import { Category as RPCCategory, Role as RPCRole, RoleSafety } from '@roleypoly/types';
 import * as React from 'react';
 import ReactTooltip from 'react-tooltip';
@@ -47,7 +47,7 @@ export const PickerCategory = (props: CategoryProps) => (
       )}
     </Head>
     <Category>
-      {sortByReverse(props.roles, 'position').map((role, idx) => (
+      {sortBy(props.roles, 'position').map((role, idx) => (
         <Container key={idx}>
           <Role
             role={role}
diff --git a/packages/misc-utils/sortBy.ts b/packages/misc-utils/sortBy.ts
index 986ce62..1be2c8d 100644
--- a/packages/misc-utils/sortBy.ts
+++ b/packages/misc-utils/sortBy.ts
@@ -19,25 +19,3 @@ export const sortBy = <T, Key extends keyof T>(
     return -1;
   });
 };
-
-export const sortByReverse = <T, Key extends keyof T>(
-  array: T[],
-  key: Key,
-  predicate?: (a: T[typeof key], b: T[typeof key]) => number
-) => {
-  return array.sort((a, b) => {
-    if (predicate) {
-      return predicate(a[key], b[key]);
-    }
-
-    if (a[key] === b[key]) {
-      return 0;
-    }
-
-    if (a[key] > b[key]) {
-      return -1;
-    }
-
-    return 1;
-  });
-}
\ No newline at end of file