base

gallery-so · May 15, 2024 · 16a3ee6 · 16a3ee6
1 parent 6361260
commit 16a3ee6
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 39 deletions.
diff --git a/apps/mobile/src/components/Feed/Events/TokensAddedToCollectionFeedEvent.tsx b/apps/mobile/src/components/Feed/Events/TokensAddedToCollectionFeedEvent.tsx
@@ -11,7 +11,6 @@ import { TokensAddedToCollectionFeedEventQueryFragment$key } from '~/generated/T
 import { MainTabStackNavigatorProp } from '~/navigation/types';
 import { contexts } from '~/shared/analytics/constants';
 import { removeNullValues } from '~/shared/relay/removeNullValues';
-import unescape from '~/shared/utils/unescape';
 
 import { Typography } from '../../Typography';
 import { EventTokenGrid } from '../EventTokenGrid';
@@ -76,7 +75,7 @@ export function TokensAddedToCollectionFeedEvent({
     );
   }, [eventData.collection?.tokens, eventData.isPreFeed, eventData.newTokens]);
 
-  const collectionName = unescape(eventData.collection?.name ?? '');
+  const collectionName = eventData.collection?.name ?? '';
 
   return (
     <View className="flex flex-1 flex-col">

diff --git a/apps/mobile/src/components/Feed/FeedListSectionHeader.tsx b/apps/mobile/src/components/Feed/FeedListSectionHeader.tsx
@@ -9,7 +9,6 @@ import { FeedListSectionHeaderFragment$key } from '~/generated/FeedListSectionHe
 import { MainTabStackNavigatorProp } from '~/navigation/types';
 import { contexts } from '~/shared/analytics/constants';
 import { getTimeSince } from '~/shared/utils/time';
-import unescape from '~/shared/utils/unescape';
 
 import { GalleryTouchableOpacity } from '../GalleryTouchableOpacity';
 import { Typography } from '../Typography';
@@ -62,7 +61,7 @@ export function FeedListSectionHeader({ feedEventRef }: FeedListSectionHeaderPro
     return null;
   }
 
-  const galleryName = unescape(feedEvent.eventData.gallery?.name || '');
+  const galleryName = feedEvent.eventData.gallery?.name || '';
 
   return (
     <View className="flex flex-row items-center justify-between bg-white dark:bg-black-900 px-3 pb-2">

diff --git a/apps/mobile/src/components/Gallery/GalleryVirtualizedRow.tsx b/apps/mobile/src/components/Gallery/GalleryVirtualizedRow.tsx
@@ -9,7 +9,6 @@ import { Typography } from '~/components/Typography';
 import { GalleryVirtualizedRowQueryFragment$key } from '~/generated/GalleryVirtualizedRowQueryFragment.graphql';
 import { MainTabStackNavigatorProp } from '~/navigation/types';
 import { contexts } from '~/shared/analytics/constants';
-import unescape from '~/shared/utils/unescape';
 
 import { GalleryTouchableOpacity } from '../GalleryTouchableOpacity';
 
@@ -68,7 +67,7 @@ export function GalleryVirtualizedRow({ queryRef, item, isOnCollectionScreen }:
           properties={{ variant: 'collection title' }}
         >
           <Typography className="text-sm" font={{ family: 'ABCDiatype', weight: 'Bold' }}>
-            {unescape(item.name || 'Untitled')}
+            {item.name || 'Untitled'}
           </Typography>
         </GalleryTouchableOpacity>
       </View>

diff --git a/apps/mobile/src/components/ProfileView/GalleryPreviewCard.tsx b/apps/mobile/src/components/ProfileView/GalleryPreviewCard.tsx
@@ -17,7 +17,6 @@ import { GalleryPreviewCardQueryFragment$key } from '~/generated/GalleryPreviewC
 import { MainTabStackNavigatorProp, RootStackNavigatorProp } from '~/navigation/types';
 import { contexts } from '~/shared/analytics/constants';
 import { ReportingErrorBoundary } from '~/shared/errors/ReportingErrorBoundary';
-import unescape from '~/shared/utils/unescape';
 
 import { BottomSheetRow } from '../BottomSheetRow';
 import { GalleryTouchableOpacity } from '../GalleryTouchableOpacity';
@@ -85,7 +84,7 @@ export function GalleryPreviewCard({ galleryRef, isFeatured, queryRef }: Gallery
       <View className="flex flex-row items-center justify-center">
         <View className="flex flex-1 flex-col">
           <Typography className="text-sm" font={{ family: 'ABCDiatype', weight: 'Bold' }}>
-            {gallery.name ? unescape(gallery.name) : 'Untitled'}
+            {gallery.name ?? 'Untitled'}
           </Typography>
           {descriptionFirstLine && (
             <Typography

diff --git a/apps/web/src/components/HoverCard/CommunityHoverCard.tsx b/apps/web/src/components/HoverCard/CommunityHoverCard.tsx
@@ -193,10 +193,7 @@ function CommunityHoverCardContent({
           {community.description && (
             <StyledCardDescription>
               <BaseM>
-                <Markdown
-                  text={unescape(community.description)}
-                  eventContext={contexts['Hover Card']}
-                />
+                <Markdown text={community.description} eventContext={contexts['Hover Card']} />
               </BaseM>
             </StyledCardDescription>
           )}

diff --git a/apps/web/src/components/HoverCard/UserHoverCard.tsx b/apps/web/src/components/HoverCard/UserHoverCard.tsx
@@ -1,4 +1,3 @@
-import unescape from 'lodash/unescape';
 import { Route } from 'nextjs-routes';
 import { PropsWithChildren, useCallback, useMemo } from 'react';
 import {
@@ -190,7 +189,7 @@ function UserHoverCardContent({
         {user.bio && (
           <StyledCardDescription>
             <BaseM>
-              <Markdown text={unescape(user.bio)} eventContext={contexts['Hover Card']} />
+              <Markdown text={user.bio} eventContext={contexts['Hover Card']} />
             </BaseM>
           </StyledCardDescription>
         )}

diff --git a/apps/web/src/components/Notifications/notifications/SomeoneAdmiredYourComment.tsx b/apps/web/src/components/Notifications/notifications/SomeoneAdmiredYourComment.tsx
@@ -9,7 +9,6 @@ import { ProfilePicture } from '~/components/ProfilePicture/ProfilePicture';
 import { SomeoneAdmiredYourCommentFragment$key } from '~/generated/SomeoneAdmiredYourCommentFragment.graphql';
 import { AdmireIcon } from '~/icons/SocializeIcons';
 import { ErrorWithSentryMetadata } from '~/shared/errors/ErrorWithSentryMetadata';
-import unescape from '~/shared/utils/unescape';
 
 import { NotificationPostPreviewWithBoundary } from './NotificationPostPreview';
 import { StyledAdmireIconWrapper } from './SomeoneAdmiredYourToken';
@@ -95,7 +94,7 @@ export default function SomeoneAdmiredYourComment({ notificationRef, onClose }:
                 <strong>comment</strong>
               </BaseM>
             </StyledTextWrapper>
-            <StyledCaption>{unescape(comment?.comment ?? '')}</StyledCaption>
+            <StyledCaption>{comment?.comment ?? ''}</StyledCaption>
           </VStack>
         </VStack>
       </HStack>

diff --git a/apps/web/src/components/Notifications/notifications/SomeoneRepliedToYourComment.tsx b/apps/web/src/components/Notifications/notifications/SomeoneRepliedToYourComment.tsx
@@ -138,7 +138,7 @@ export function SomeoneRepliedToYourComment({ notificationRef, queryRef, onClose
             <TimeAgoText as="span">{timeAgo}</TimeAgoText>
           </StyledTextWrapper>
           <VStack gap={4}>
-            <StyledCaption>{unescape(comment.comment)}</StyledCaption>
+            <StyledCaption>{comment.comment}</StyledCaption>
 
             <HStack gap={4}>
               <AdmireIcon

diff --git a/apps/web/src/contexts/globalLayout/GlobalNavbar/CollectionNavbar/CollectionNavbar.tsx b/apps/web/src/contexts/globalLayout/GlobalNavbar/CollectionNavbar/CollectionNavbar.tsx
@@ -18,7 +18,6 @@ import { CollectionNavbarFragment$key } from '~/generated/CollectionNavbarFragme
 import { useIsMobileOrMobileLargeWindowWidth } from '~/hooks/useWindowSize';
 import { contexts } from '~/shared/analytics/constants';
 import colors from '~/shared/theme/colors';
-import unescape from '~/shared/utils/unescape';
 
 import {
   NavbarCenterContent,
@@ -75,7 +74,7 @@ export function CollectionNavbar({ queryRef, username, collectionId }: Collectio
 
   const unescapedCollectionName = useMemo(() => {
     if (query.collectionById?.__typename === 'Collection') {
-      return unescape(query.collectionById?.name ?? '') || 'untitled';
+      return query.collectionById?.name || 'untitled';
     }
 
     return 'untitled';

diff --git a/apps/web/src/scenes/NftDetailPage/NftDetailText.tsx b/apps/web/src/scenes/NftDetailPage/NftDetailText.tsx
@@ -144,15 +144,15 @@ function NftDetailText({ queryRef, tokenRef, authenticatedUserOwnsAsset, toggleL
     }
 
     track('Admire Token Click');
-    admireToken(token.id, token.dbid, info, decodedTokenName);
+    admireToken(token.id, token.dbid, info, name);
   }, [
     query.viewer?.__typename,
     track,
     admireToken,
     token.id,
     token.dbid,
     info,
-    decodedTokenName,
+    name,
     showAuthModal,
   ]);
 
@@ -169,16 +169,9 @@ function NftDetailText({ queryRef, tokenRef, authenticatedUserOwnsAsset, toggleL
       token.dbid,
       token.viewerAdmire.dbid,
       query.viewer?.user?.dbid,
-      decodedTokenName
+      name
     );
-  }, [
-    decodedTokenName,
-    query.viewer,
-    removeTokenAdmire,
-    token.dbid,
-    token.id,
-    token.viewerAdmire?.dbid,
-  ]);
+  }, [name, query.viewer, removeTokenAdmire, token.dbid, token.id, token.viewerAdmire?.dbid]);
 
   const isMobile = useIsMobileWindowWidth();
 

diff --git a/packages/shared/src/utils/unescape.ts b/packages/shared/src/utils/unescape.ts
@@ -1,9 +0,0 @@
-import unescapeFn from 'lodash.unescape';
-
-/** Fixes bug where lodash.unescape does not unescape double quotes in our code base */
-export default function unescape(_s: string) {
-  const s = _s.trim();
-  // Check to see if string includes the double quote character; if string does not have it, this is slightly faster
-  // https://perf.link/#eyJpZCI6ImdubDgwbmp6cWduIiwidGl0bGUiOiJGaW5kaW5nIG51bWJlcnMgaW4gYW4gYXJyYXkgb2YgMTAwMCIsImJlZm9yZSI6ImNvbnN0IHN0ciA9IFwiVGhpcyAgaXMgYSBzdHJpbmdcIiIsInRlc3RzIjpbeyJuYW1lIjoiVGVzdCBDYXNlIiwiY29kZSI6InN0ci5yZXBsYWNlQWxsKFwiJiMzOTtcIiwgJ1wiJykiLCJydW5zIjpbOTgwMDAsMTEwMDAsMTQxNTAwMCw5MzMwMDAsMjY5NDAwMCw3NzQ1MDAwLDkwMDAsNTMwMDAwLDcxMzcwMDAsMTQ5OTAwMCwxNTE0MDAwLDUyMzAwMCwxNjMzMDAwLDExMzkwMDAsMTM1MzAwMCwxNzAxMDAwLDMxMzQwMDAsNTI3MDAwLDEwMDAwMCwyMTgzMDAwLDkwMDAsMTY0NjAwMCwxMDAwLDI5OTMwMDAsMzU0MDAwLDM1NzQwMDAsMTQ3MTAwMCwxMTAwMCwxNTMwMDAwLDM4OTQwMDAsNTMzMDAwLDE0OTkwMDAsNzEzMDAwMCwyMzk2MDAwLDI0NDAwMCw4NDUwMDAsMTY1MjAwMCwzMDAwMCwxMDAwMDAsMjU5MTAwMCw5MDAwLDU3MzAwMCw4OTYwMDAsMjU4NzAwMCwzNTE2MDAwLDE0ODUwMDAsMzU3ODAwMCwyMzY4MDAwLDE0OTkwMDAsMjA3NzAwMCw4NTUwMDAsNDQxNTAwMCw0NjE0MDAwLDExNjMwMDAsMTI2NzAwMCwxNzMyMDAwLDExMDAwLDE2NDYwMDAsMTEwMDAsNDYxMTAwMCwxNjE2MDAwLDkwMDAsMzEwNTAwMCw0MjUwMDAwLDEwMDAwLDE2NzQwMDAsMzk2MDAwLDYxNzUwMDAsNjQ0MDAwLDE0OTkwMDAsMTAwMDAsMTczMzAwMCwyMzA5MDAwLDUyMjkwMDAsNDA2MzAwMCw0NTY1MDAwLDc4OTAwMCwyODgyMDAwLDkwMDAsOTAwMCwyMjQxMDAwLDYyNTcwMDAsMTU0NzAwMCwyNjA3MDAwLDEwMDAwMCwzMzc4MDAwLDU0MDAwMCw5ODAwMCwxODEyMDAwLDE1MzkwMDAsMzYzOTAwMCwxMzgxMDAwLDE0OTkwMDAsOTAwMCwxMDAwMCwxMDgwMDAsMTAwMDAsNDYwOTAwMCw1NjUwMDAsMTY4NTAwMF0sIm9wcyI6MTgxOTA0MH0seyJuYW1lIjoiVGVzdCBDYXNlIiwiY29kZSI6InN0ci5pbmNsdWRlcyhcIiYjMzk7XCIpID8gc3RyLnJlcGxhY2VBbGwoXCImIzM5O1wiLCAnXCInKSA6IHN0ciIsInJ1bnMiOlsxMDAwMCw5MzAwMCwxNDkyMDAwLDIzMzQwMDAsNTcyODAwMCwxMDc5MTAwMCw5MDAwLDE5NDMwMDAsMTE2MzYwMDAsNDI3MjAwMCwzNzM3MDAwLDI4MDEwMDAsMzczNTAwMCw0MTY1MDAwLDE5OTAwMCwzMjIxMDAwLDQ4MTYwMDAsMTkyNTAwMCwxMTAxMDAwLDQwOTgwMDAsNzEwNjAwMCw0NDcxMDAwLDU3MzYwMDAsNjM1MjAwMCwxMjU4MDAwLDYyMjcwMDAsMzUxMzAwMCwzNjAwMDAsNDg2MjAwMCw1NjE3MDAwLDE2NTcwMDAsMzQ3NTAwMCwxMDQ2MDAwMCw0NjQwMDAwLDE0MDgwMDAsMTY0NjAwMCwzNzMwMDAwLDI3OTkwMDAsMzY0MDAwLDU5NzkwMDAsOTAwMCwxNjQ2MDAwLDM3NTUwMDAsNTAyMTAwMCw1NzYyMDAwLDM2NzQwMDAsNTg5ODAwMCw1NTgwMDAwLDI3MTgwMDAsMzk2NjAwMCwzNDEyMDAwLDU4NjAwMDAsNjcxODAwMCwzMzQ3MDAwLDE3NzIwMDAsNTMyOTAwMCw2NjE0MDAwLDM4MDkwMDAsOTgwMDAsNjY0MzAwMCw0MDA2MDAwLDY3MDcwMDAsNTQ0OTAwMCw2MzMyMDAwLDMyNDAwMCw0NDUyMDAwLDI1NjUwMDAsODQ0MjAwMCwxNjQ2MDAwLDMwNjAwMDAsMTAwMDAsMzg2MzAwMCw1NTM3MDAwLDcxODAwMDAsNzQyMDAwMCw3MTYwMDAwLDE2NDYwMDAsMTQ3NTAwMCwxMDAwMCw5MDAwLDUwOTMwMDAsOTM0NjAwMCwzNzM1MDAwLDQ0NDcwMDAsMTI3ODAwMCw2MDI5MDAwLDE4MjgwMDAsMjI3MDAwMCw0MDI5MDAwLDM5ODcwMDAsNjEwMTAwMCwzMjU5MDAwLDU3NzYwMDAsOTAwMCwxMDkwMDAsMTAzNzAwMCw5MDAwLDU2NzcwMDAsMjA0NzAwMCw0MTIwMDAwXSwib3BzIjozNzg4NzYwfV0sInVwZGF0ZWQiOiIyMDIyLTAzLTIyVDAwOjMzOjQ0Ljk1N1oifQ%3D%3D
-  return s.includes('&#34;') ? unescapeFn(s).split('&#34;').join('"') : unescapeFn(s); // If string is undefined (e.g. empty) this will just return ""
-}