Revert "Drag and drop components, browser favorites reordering (#5978)"

This reverts commit 5feae69.
rainbow-me · Aug 16, 2024 · 490b423 · 490b423
1 parent 3c017f0
commit 490b423
Show file tree

Hide file tree

Showing 54 changed files with 160 additions and 2,861 deletions.
diff --git a/src/components/AnimatedComponents/AnimatedFlatList.ts b/src/components/AnimatedComponents/AnimatedFlatList.ts
diff --git a/src/components/DappBrowser/BrowserTab.tsx b/src/components/DappBrowser/BrowserTab.tsx
@@ -123,7 +123,7 @@ const HomepageOrWebView = ({
   const isOnHomepage = useBrowserStore(state => !state.getTabData?.(tabId)?.url || state.getTabData?.(tabId)?.url === RAINBOW_HOME);
 
   return isOnHomepage ? (
-    <Homepage tabId={tabId} />
+    <Homepage />
   ) : (
     <FreezableWebView
       addRecent={addRecent}

diff --git a/src/components/DappBrowser/Homepage.tsx b/src/components/DappBrowser/Homepage.tsx
diff --git a/src/components/DappBrowser/control-panel/ControlPanel.tsx b/src/components/DappBrowser/control-panel/ControlPanel.tsx
@@ -53,7 +53,8 @@ import { address } from '@/utils/abbreviations';
 import { fontWithWidthWorklet } from '@/styles/buildTextStyles';
 import { useAppSessionsStore } from '@/state/appSessions';
 import { DEFAULT_TAB_URL, RAINBOW_HOME } from '../constants';
-import { FavoritedSite, useFavoriteDappsStore } from '@/state/browser/favoriteDappsStore';
+import { useFavoriteDappsStore } from '@/state/favoriteDapps';
+import { Site } from '@/state/browserHistory';
 import WalletTypes from '@/helpers/walletTypes';
 import { usePersistentDominantColorFromImage } from '@/hooks/usePersistentDominantColorFromImage';
 import { findWalletWithAccount } from '@/helpers/findWalletWithAccount';
@@ -915,7 +916,7 @@ const FavoriteButton = React.memo(function FavButton({ animatedAccentColor }: {
     if (isFavorite) {
       removeFavorite(tabData?.url || '');
     } else {
-      const site: FavoritedSite = {
+      const site: Omit<Site, 'timestamp'> = {
         name: tabData?.title || '',
         url: tabData?.url || '',
         image: tabData?.logoUrl || '',

diff --git a/src/components/DappBrowser/search-input/SearchInput.tsx b/src/components/DappBrowser/search-input/SearchInput.tsx
@@ -22,8 +22,9 @@ import { IS_IOS } from '@/env';
 import * as i18n from '@/languages';
 import { fontWithWidth } from '@/styles';
 import font from '@/styles/fonts';
+import { Site } from '@/state/browserHistory';
 import { useBrowserStore } from '@/state/browser/browserStore';
-import { FavoritedSite, useFavoriteDappsStore } from '@/state/browser/favoriteDappsStore';
+import { useFavoriteDappsStore } from '@/state/favoriteDapps';
 import { GestureHandlerButton } from '@/__swaps__/screens/Swap/components/GestureHandlerButton';
 import { THICK_BORDER_WIDTH } from '@/__swaps__/screens/Swap/constants';
 import { FadeMask } from '@/__swaps__/screens/Swap/components/FadeMask';
@@ -63,7 +64,7 @@ const TheeDotMenu = function TheeDotMenu({
       if (isFavorite) {
         removeFavorite(url);
       } else {
-        const site: FavoritedSite = {
+        const site: Omit<Site, 'timestamp'> = {
           name: getNameFromFormattedUrl(formattedUrlValue.value),
           url: url,
           image: useBrowserStore.getState().getActiveTabLogo() || `https://${formattedUrlValue.value}/apple-touch-icon.png`,

diff --git a/src/components/drag-and-drop/DndContext.ts b/src/components/drag-and-drop/DndContext.ts