Merge pull request #39 from superhero-com/features/fix-fetch-verified…

…-accounts-interval fix(#37): stop fetching verified account if the api is offline
superhero-com · Jan 16, 2024 · be09b0b · be09b0b
2 parents 890ae11 + 4f09212
commit be09b0b
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 64 deletions.
diff --git a/package.json b/package.json
@@ -215,5 +215,6 @@
         "outputDirectory": "coverage",
         "outputName": "jest-sonar-report.xml",
         "relativePaths": true
-    }
+    },
+    "packageManager": "yarn@1.22.21"
 }
diff --git a/res/css/superhero/custom.css b/res/css/superhero/custom.css
@@ -33,11 +33,6 @@ h2 .sh_VerifiedIcon {
     mask-image: url("../../themes/superhero/img/icons/diamond.svg");
 }
 
-.mx_QuickSettingsButton.sh_MintTokenButton::before {
-    -webkit-mask-image: url("../../themes/superhero/img/icons/tokens.svg");
-    mask-image: url("../../themes/superhero/img/icons/tokens.svg");
-}
-
 /* START - Update @user chat message highlighting */
 .mx_EventTile.mx_EventTile_highlight,
 .mx_EventTile.mx_EventTile_highlight .markdown-body,

diff --git a/res/themes/superhero/img/icons/tokens.svg b/res/themes/superhero/img/icons/tokens.svg
diff --git a/src/components/views/dialogs/spotlight/SpotlightDialog.tsx b/src/components/views/dialogs/spotlight/SpotlightDialog.tsx
@@ -253,12 +253,15 @@ const findVisibleRoomMembers = (visibleRooms: Room[], cli: MatrixClient, filterD
     return Object.values(
         visibleRooms
             .filter((room) => !filterDMs || !DMRoomMap.shared().getUserIdForRoomId(room.roomId))
-            .reduce((members, room) => {
-                for (const member of room.getJoinedMembers()) {
-                    members[member.userId] = member;
-                }
-                return members;
-            }, {} as Record<string, RoomMember>),
+            .reduce(
+                (members, room) => {
+                    for (const member of room.getJoinedMembers()) {
+                        members[member.userId] = member;
+                    }
+                    return members;
+                },
+                {} as Record<string, RoomMember>,
+            ),
     ).filter((it) => it.userId !== cli.getUserId());
 };
 
@@ -630,8 +633,7 @@ const SpotlightDialog: React.FC<IProps> = ({ initialText = "", initialFilter = n
                         {...ariaProperties}
                     >
                         <DecoratedRoomAvatar room={result.room} size={AVATAR_SIZE} tooltipProps={{ tabIndex: -1 }} />
-                        <RoomName room={result.room} /> {' '}
-                        <NotificationBadge notification={notification} />
+                        <RoomName room={result.room} /> <NotificationBadge notification={notification} />
                         <RoomContextDetails
                             id={`mx_SpotlightDialog_button_result_${result.room.roomId}_details`}
                             className="mx_SpotlightDialog_result_details"
@@ -1071,8 +1073,7 @@ const SpotlightDialog: React.FC<IProps> = ({ initialText = "", initialFilter = n
                                         size={AVATAR_SIZE}
                                         tooltipProps={{ tabIndex: -1 }}
                                     />
-                                    <RoomName room={room} /> {' '}
-                                    <NotificationBadge notification={notification} />
+                                    <RoomName room={room} /> <NotificationBadge notification={notification} />
                                     <RoomContextDetails
                                         id={`mx_SpotlightDialog_button_recentSearch_${room.roomId}_details`}
                                         className="mx_SpotlightDialog_result_details"

diff --git a/src/components/views/elements/RoomName.tsx b/src/components/views/elements/RoomName.tsx
@@ -58,7 +58,7 @@ export const RoomName = ({ room, children, maxLength }: IProps): JSX.Element =>
                 {isCommunityRoom && <CommunityRoomIcon className="sh_RoomTokenGatedRoomIcon" />}
                 {isTokenGatedRoom && <TokenGatedRoomIcon className="sh_RoomTokenGatedRoomIcon" />}
                 <span dir="auto">{truncatedRoomName}</span>
-                {(roomUsers?.length && !isTokenGatedRoom && !isCommunityRoom) ? (
+                {roomUsers?.length && !isTokenGatedRoom && !isCommunityRoom ? (
                     <UserVerifiedBadge userId={roomUsers[0]} />
                 ) : null}
             </span>

diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx
@@ -652,8 +652,8 @@ export const RoomKickButton = ({
                     ? _t("user_info|disinvite_button_space")
                     : _t("user_info|kick_button_space")
                 : member.membership === "invite"
-                ? _t("user_info|disinvite_button_room")
-                : _t("user_info|kick_button_room"),
+                  ? _t("user_info|disinvite_button_room")
+                  : _t("user_info|kick_button_room"),
             title:
                 member.membership === "invite"
                     ? _t("user_info|disinvite_button_room_name", { roomName: room.name })
@@ -723,8 +723,8 @@ export const RoomKickButton = ({
             ? _t("user_info|disinvite_button_space")
             : _t("user_info|kick_button_space")
         : member.membership === "invite"
-        ? _t("user_info|disinvite_button_room")
-        : _t("user_info|kick_button_room");
+          ? _t("user_info|disinvite_button_room")
+          : _t("user_info|kick_button_room");
 
     return (
         <AccessibleButton
@@ -784,8 +784,8 @@ export const BanToggleButton = ({
                     ? _t("user_info|unban_button_space")
                     : _t("user_info|ban_button_space")
                 : isBanned
-                ? _t("user_info|unban_button_room")
-                : _t("user_info|ban_button_room"),
+                  ? _t("user_info|unban_button_room")
+                  : _t("user_info|ban_button_room"),
             title: isBanned
                 ? _t("user_info|unban_room_confirm_title", { roomName: room.name })
                 : _t("user_info|ban_room_confirm_title", { roomName: room.name }),

diff --git a/src/components/views/rooms/RoomTile.tsx b/src/components/views/rooms/RoomTile.tsx
@@ -479,12 +479,11 @@ export class RoomTile extends React.PureComponent<ClassProps, State> {
         return (
             <React.Fragment>
                 <RovingTabIndexWrapper inputRef={this.roomTileRef}>
-                    {({ onFocus, isActive, ref }): ReactElement => (
+                    {({ onFocus, isActive }): ReactElement<any, any> => (
                         <Button
                             {...props}
                             onFocus={onFocus}
                             tabIndex={isActive ? 0 : -1}
-                            inputRef={ref}
                             className={classes}
                             onClick={this.onTileClick}
                             onContextMenu={this.onContextMenu}

diff --git a/src/components/views/spaces/MintTokenButton.tsx b/src/components/views/spaces/MintTokenButton.tsx
diff --git a/src/context/SuperheroProvider.tsx b/src/context/SuperheroProvider.tsx
@@ -17,7 +17,10 @@ export const SuperheroProvider = ({ children, config }: any): any => {
                 method: "POST",
             })
                 .then((res) => res.json())
-                .then(setVerifiedAccounts);
+                .then(setVerifiedAccounts)
+                .catch(() => {
+                    //
+                });
         }
     }