Skip to content

Commit 490b423

Browse files
Revert "Drag and drop components, browser favorites reordering (#5978)"
This reverts commit 5feae69.
1 parent 3c017f0 commit 490b423

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+160
-2861
lines changed

src/components/AnimatedComponents/AnimatedFlatList.ts

-4
This file was deleted.

src/components/DappBrowser/BrowserTab.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ const HomepageOrWebView = ({
123123
const isOnHomepage = useBrowserStore(state => !state.getTabData?.(tabId)?.url || state.getTabData?.(tabId)?.url === RAINBOW_HOME);
124124

125125
return isOnHomepage ? (
126-
<Homepage tabId={tabId} />
126+
<Homepage />
127127
) : (
128128
<FreezableWebView
129129
addRecent={addRecent}

src/components/DappBrowser/Homepage.tsx

+96-251
Large diffs are not rendered by default.

src/components/DappBrowser/control-panel/ControlPanel.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ import { address } from '@/utils/abbreviations';
5353
import { fontWithWidthWorklet } from '@/styles/buildTextStyles';
5454
import { useAppSessionsStore } from '@/state/appSessions';
5555
import { DEFAULT_TAB_URL, RAINBOW_HOME } from '../constants';
56-
import { FavoritedSite, useFavoriteDappsStore } from '@/state/browser/favoriteDappsStore';
56+
import { useFavoriteDappsStore } from '@/state/favoriteDapps';
57+
import { Site } from '@/state/browserHistory';
5758
import WalletTypes from '@/helpers/walletTypes';
5859
import { usePersistentDominantColorFromImage } from '@/hooks/usePersistentDominantColorFromImage';
5960
import { findWalletWithAccount } from '@/helpers/findWalletWithAccount';
@@ -915,7 +916,7 @@ const FavoriteButton = React.memo(function FavButton({ animatedAccentColor }: {
915916
if (isFavorite) {
916917
removeFavorite(tabData?.url || '');
917918
} else {
918-
const site: FavoritedSite = {
919+
const site: Omit<Site, 'timestamp'> = {
919920
name: tabData?.title || '',
920921
url: tabData?.url || '',
921922
image: tabData?.logoUrl || '',

src/components/DappBrowser/search-input/SearchInput.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ import { IS_IOS } from '@/env';
2222
import * as i18n from '@/languages';
2323
import { fontWithWidth } from '@/styles';
2424
import font from '@/styles/fonts';
25+
import { Site } from '@/state/browserHistory';
2526
import { useBrowserStore } from '@/state/browser/browserStore';
26-
import { FavoritedSite, useFavoriteDappsStore } from '@/state/browser/favoriteDappsStore';
27+
import { useFavoriteDappsStore } from '@/state/favoriteDapps';
2728
import { GestureHandlerButton } from '@/__swaps__/screens/Swap/components/GestureHandlerButton';
2829
import { THICK_BORDER_WIDTH } from '@/__swaps__/screens/Swap/constants';
2930
import { FadeMask } from '@/__swaps__/screens/Swap/components/FadeMask';
@@ -63,7 +64,7 @@ const TheeDotMenu = function TheeDotMenu({
6364
if (isFavorite) {
6465
removeFavorite(url);
6566
} else {
66-
const site: FavoritedSite = {
67+
const site: Omit<Site, 'timestamp'> = {
6768
name: getNameFromFormattedUrl(formattedUrlValue.value),
6869
url: url,
6970
image: useBrowserStore.getState().getActiveTabLogo() || `https://${formattedUrlValue.value}/apple-touch-icon.png`,

src/components/drag-and-drop/DndContext.ts

-40
This file was deleted.

0 commit comments

Comments
 (0)