Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,7 @@ import {
it,
vi,
} from 'vitest'
import {
act,
fireEvent,
renderHook,
screen,
waitFor,
} from '@testing-library/react'
import { fireEvent, renderHook, screen, waitFor } from '@testing-library/react'
import { http, type RequestHandler } from 'msw'

import {
Expand All @@ -51,6 +45,7 @@ import {
teardownTestDatabase,
} from '@test-utils/database-setup'
import { server } from '@test-utils/msw-server'
import { pressIcon } from '@test-utils/pressIcon'
import { renderWithNavigation } from '@test-utils/renderWithNavigation'
import { isElementDisabled } from '@test-utils/rnw'
import { useOnboardingStore } from '@modules/onboarding/hooks/useOnboardingStore'
Expand Down Expand Up @@ -195,18 +190,6 @@ const theOnlyAccount = (): WalletAccount => {
return accounts[0]!
}

// A sheet header's close icon is an svg whose onPress jsdom never dispatches.
const pressIcon = (testID: string): void => {
const icon = screen.getByTestId(testID) as unknown as Record<
string,
{ onPress: () => void }
>
const propsKey = Object.keys(icon).find(key =>
key.startsWith('__reactProps'),
)!
act(() => icon[propsKey]!.onPress())
}

// Imports the recovery phrase active on Ethereum and Base, up to naming it,
// once discovery has added Base.
const importRecoveryPhraseUntilNaming = async (): Promise<void> => {
Expand Down
131 changes: 121 additions & 10 deletions apps/mobile/src/__integration__/discover-folders.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,20 @@
// Native Discover favorites in folders: a folder lists its dApps under a
// header that shows the folder's own name, unstarring removes a dApp from the
// folder and from favorites, All favorites lists newest first, and All folders
// opens a folder.
// opens a folder. The header's "…" menu renames, rearranges and deletes a
// folder without ever removing a favorite.

import { beforeEach, describe, expect, it } from 'vitest'
import { act, fireEvent, screen, waitFor } from '@testing-library/react'
import { createNativeStackNavigator } from '@react-navigation/native-stack'
import { mockDiscoverProjects } from '@perawallet/wallet-core-projects/test-handlers'
import { server } from '@test-utils/msw-server'
import { pressIcon } from '@test-utils/pressIcon'
import { render } from '@test-utils/render'
import { renderWithNavigation } from '@test-utils/renderWithNavigation'
import { headeredScreen } from '@routes/screen-options'
import { BottomSheetManager } from '@modules/bottom-sheet'
import { useBottomSheetStore } from '@modules/bottom-sheet/store/bottomSheetStore'
import { useDiscoverFavoritesStore } from '@modules/discover/store/useDiscoverFavoritesStore'
import type { DiscoverDapp } from '@modules/discover/types'

Expand Down Expand Up @@ -51,25 +55,132 @@ const flush = () =>

const HeaderedStack = createNativeStackNavigator()

/** The folder screen under the app's real navigation header. */
/** The folder screen under the app's real navigation header, with the sheet host. */
const renderFolderWithHeader = (folderId: string) =>
render(
<HeaderedStack.Navigator>
<HeaderedStack.Screen
name='DiscoverFolder'
component={DiscoverFolderScreen}
initialParams={{ folderId }}
options={headeredScreen('discover.favorites.title')}
/>
</HeaderedStack.Navigator>,
<>
<BottomSheetManager />
<HeaderedStack.Navigator>
<HeaderedStack.Screen
name='DiscoverFolder'
component={DiscoverFolderScreen}
initialParams={{ folderId }}
options={headeredScreen('discover.favorites.title')}
/>
</HeaderedStack.Navigator>
</>,
)

const TINYMAN = 'https://tinyman.example'
const FOLKS = 'https://folks.example'

/** A folder holding Tinyman then Folks, opened under its header. */
const openSwapFolder = async () => {
store().addFavorite(dapp('Tinyman'))
store().addFavorite(dapp('Folks'))
const id = store().createFolder('Swap', TINYMAN)
store().setDappInFolder(id, FOLKS, true)
renderFolderWithHeader(id)
await screen.findByTestId('discover_folder_title')
return id
}

const chooseFromMenu = async (choice: string) => {
fireEvent.click(screen.getByTestId('discover_folder_menu_button'))
fireEvent.click(await screen.findByTestId(`discover_folder_menu_${choice}`))
}

describe('Flow: Discover favorite folders', () => {
beforeEach(() => {
server.use(mockDiscoverProjects({ response: [] }))
store().resetState()
})

it('Given a folder, when its menu button is tapped twice, then one menu opens', async () => {
await openSwapFolder()

fireEvent.click(screen.getByTestId('discover_folder_menu_button'))
fireEvent.click(screen.getByTestId('discover_folder_menu_button'))

await screen.findByTestId('discover_folder_menu_rename')
await flush()
// The button's double-press guard keeps the second tap from stacking
// a second menu; the sheet stack is the truth, not the painted DOM.
expect(
useBottomSheetStore.getState().requests.filter(r => r.isVisible),
).toHaveLength(1)
})

it('Given a folder, when it is renamed from its menu, then the header shows the new name', async () => {
const id = await openSwapFolder()

await chooseFromMenu('rename')
const input = await screen.findByTestId('discover_folder_name_input')
expect((input as HTMLInputElement).value).toBe('Swap')
fireEvent.change(input, { target: { value: ' DEX ' } })
fireEvent.click(screen.getByTestId('discover_folder_name_submit'))

await waitFor(() => {
expect(
screen.getByTestId('discover_folder_title').textContent,
).toBe('DEX')
})
expect(store().folders[id]?.name).toBe('DEX')
await flush()
})

it('Given a folder, when it is deleted from its menu, then it leaves the screen and its dApps stay favorites', async () => {
const id = await openSwapFolder()

await chooseFromMenu('delete')
fireEvent.click(
await screen.findByTestId('discover_delete_folder_confirm'),
)

await waitFor(() => {
expect(store().folders[id]).toBeUndefined()
})
expect(store().isFavorite(TINYMAN)).toBe(true)
expect(store().isFavorite(FOLKS)).toBe(true)
await flush()
})

it('Given a folder with two dApps, when one is taken out in Rearrange and Done is tapped, then only the other is listed and both are still favorites', async () => {
const id = await openSwapFolder()

await chooseFromMenu('rearrange')
fireEvent.click(
await screen.findByTestId(`discover_rearrange_remove_${TINYMAN}`),
)
fireEvent.click(screen.getByTestId('discover_rearrange_done'))

await waitFor(() => {
expect(
screen.queryByTestId(`discover_folder_dapp_${TINYMAN}`),
).toBeNull()
})
expect(screen.getByTestId(`discover_folder_dapp_${FOLKS}`)).toBeTruthy()
expect(store().folders[id]?.items).toEqual([FOLKS])
expect(store().isFavorite(TINYMAN)).toBe(true)
await flush()
})

it('Given a folder, when Rearrange is cancelled, then nothing changes', async () => {
const id = await openSwapFolder()

await chooseFromMenu('rearrange')
fireEvent.click(
await screen.findByTestId(`discover_rearrange_remove_${TINYMAN}`),
)
pressIcon('discover_rearrange_header-close')

await waitFor(() => {
expect(screen.queryByTestId('discover_rearrange_done')).toBeNull()
})
expect(store().folders[id]?.items).toEqual([TINYMAN, FOLKS])
await flush()
})

it('Given a folder named web3.apps, then the header shows that name and its dApp count, and its dApps are listed', async () => {
store().addFavorite(dapp('Tinyman'))
store().addFavorite(dapp('Folks'))
Expand Down
6 changes: 6 additions & 0 deletions apps/mobile/src/analytics/events/contexts/discover.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ export enum DiscoverEvent {
FolderCreate = 'discover_folder_create',
FolderDappAdd = 'discover_folder_dapp_add',
FolderDappRemove = 'discover_folder_dapp_remove',
FolderRename = 'discover_folder_rename',
FolderDelete = 'discover_folder_delete',
FolderRearrange = 'discover_folder_rearrange',
FavoriteToastTap = 'discover_favorite_toast_tap',
LegacyFavoritesImported = 'discover_legacy_favorites_imported',
LegacyFavoritesImportFailed = 'discover_favorites_migration_failed',
Expand Down Expand Up @@ -71,6 +74,9 @@ export interface DiscoverRequiredPayloads {
[Key.DappName]: string
[Key.ChainId]?: ChainId
}
[DiscoverEvent.FolderRearrange]: {
[Key.RemovedCount]: number
}
[DiscoverEvent.LegacyFavoritesImported]: {
[Key.ImportedCount]: number
[Key.SkippedCount]: number
Expand Down
1 change: 1 addition & 0 deletions apps/mobile/src/analytics/events/metadata-keys.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ export enum AnalyticsMetadataKey {
ImportedCount = 'imported_count',
SkippedCount = 'skipped_count',
AlreadyFavoriteCount = 'already_favorite_count',
RemovedCount = 'removed_count',
UnreadableKeyCount = 'unreadable_key_count',
AttemptCount = 'attempt_count',
FailureReason = 'failure_reason',
Expand Down
18 changes: 17 additions & 1 deletion apps/mobile/src/i18n/locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,23 @@
"create": "Erstellen",
"save": "Speichern"
},
"empty": "Noch keine dApps in diesem Ordner"
"empty": "Noch keine dApps in diesem Ordner",
"menu": {
"title": "Ordneroptionen",
"open_label": "Ordneroptionen",
"rename": "Ordner umbenennen",
"rearrange": "dApps neu anordnen",
"delete": "Ordner löschen"
},
"rearrange": {
"title": "dApps neu anordnen",
"remove_label": "{{name}} aus diesem Ordner entfernen"
},
"delete_confirm": {
"title": "Diesen Ordner löschen?",
"body": "Seine dApps bleiben in deinen Favoriten.",
"confirm": "Ordner löschen"
}
},
"favorites": {
"title": "Favoriten",
Expand Down
18 changes: 17 additions & 1 deletion apps/mobile/src/i18n/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,23 @@
"create": "Create",
"save": "Save"
},
"empty": "No dApps in this folder yet"
"empty": "No dApps in this folder yet",
"menu": {
"title": "Folder options",
"open_label": "Folder options",
"rename": "Rename Folder",
"rearrange": "Rearrange dApps",
"delete": "Delete Folder"
},
"rearrange": {
"title": "Rearrange dApps",
"remove_label": "Remove {{name}} from this folder"
},
"delete_confirm": {
"title": "Delete this folder?",
"body": "Its dApps stay in your favorites.",
"confirm": "Delete Folder"
}
},
"favorites": {
"title": "Favorites",
Expand Down
18 changes: 17 additions & 1 deletion apps/mobile/src/i18n/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,23 @@
"create": "Crear",
"save": "Guardar"
},
"empty": "Aún no hay dApps en esta carpeta"
"empty": "Aún no hay dApps en esta carpeta",
"menu": {
"title": "Opciones de la carpeta",
"open_label": "Opciones de la carpeta",
"rename": "Cambiar nombre de la carpeta",
"rearrange": "Reordenar dApps",
"delete": "Eliminar carpeta"
},
"rearrange": {
"title": "Reordenar dApps",
"remove_label": "Quitar {{name}} de esta carpeta"
},
"delete_confirm": {
"title": "¿Eliminar esta carpeta?",
"body": "Sus dApps seguirán en tus favoritos.",
"confirm": "Eliminar carpeta"
}
},
"favorites": {
"title": "Favoritos",
Expand Down
18 changes: 17 additions & 1 deletion apps/mobile/src/i18n/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,23 @@
"create": "Créer",
"save": "Enregistrer"
},
"empty": "Aucune dApp dans ce dossier pour le moment"
"empty": "Aucune dApp dans ce dossier pour le moment",
"menu": {
"title": "Options du dossier",
"open_label": "Options du dossier",
"rename": "Renommer le dossier",
"rearrange": "Réorganiser les dApps",
"delete": "Supprimer le dossier"
},
"rearrange": {
"title": "Réorganiser les dApps",
"remove_label": "Retirer {{name}} de ce dossier"
},
"delete_confirm": {
"title": "Supprimer ce dossier ?",
"body": "Ses dApps restent dans vos favoris.",
"confirm": "Supprimer le dossier"
}
},
"favorites": {
"title": "Favoris",
Expand Down
18 changes: 17 additions & 1 deletion apps/mobile/src/i18n/locales/pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,23 @@
"create": "Criar",
"save": "Salvar"
},
"empty": "Ainda não há dApps nesta pasta"
"empty": "Ainda não há dApps nesta pasta",
"menu": {
"title": "Opções da pasta",
"open_label": "Opções da pasta",
"rename": "Renomear pasta",
"rearrange": "Reorganizar dApps",
"delete": "Excluir pasta"
},
"rearrange": {
"title": "Reorganizar dApps",
"remove_label": "Remover {{name}} desta pasta"
},
"delete_confirm": {
"title": "Excluir esta pasta?",
"body": "Os dApps dela continuam nos seus favoritos.",
"confirm": "Excluir pasta"
}
},
"favorites": {
"title": "Favoritos",
Expand Down
18 changes: 17 additions & 1 deletion apps/mobile/src/i18n/locales/tr.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,23 @@
"create": "Oluştur",
"save": "Kaydet"
},
"empty": "Bu klasörde henüz dApp yok"
"empty": "Bu klasörde henüz dApp yok",
"menu": {
"title": "Klasör seçenekleri",
"open_label": "Klasör seçenekleri",
"rename": "Klasörü yeniden adlandır",
"rearrange": "dApp'leri yeniden sırala",
"delete": "Klasörü sil"
},
"rearrange": {
"title": "dApp'leri yeniden sırala",
"remove_label": "Bu klasörden çıkar: {{name}}"
},
"delete_confirm": {
"title": "Bu klasör silinsin mi?",
"body": "İçindeki dApp'ler favorilerinde kalır.",
"confirm": "Klasörü sil"
}
},
"favorites": {
"title": "Favoriler",
Expand Down
Loading
Loading