Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: adds search in activities #5838

Merged
merged 5 commits into from Feb 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
97 changes: 72 additions & 25 deletions packages/mobile/components/ActivityList.svelte
@@ -1,48 +1,95 @@
<script lang="ts">
import { time } from '@core/app'
import { localize } from '@core/i18n'
import { getMonthYear } from '@core/utils'
import { Activity, setAsyncStatusOfAccountActivities } from '@core/wallet'
import { activityFilter, queriedActivities } from '@core/wallet/stores'
import VirtualList from '@sveltejs/svelte-virtual-list'
import { FilterType } from '../lib/routers/routers/dashboard'
import { FontWeight, Text } from 'shared/components'
import { ActivityTile, Filter } from '../../mobile/components'
import { ActivityTile, Filter, SearchInput } from '../../mobile/components'
import { FilterType } from '../lib/routers/routers/dashboard'
import { time } from '@core/app'
import { getGroupSeparator, localize } from '@core/i18n'
import { getMonthYear } from '@core/utils'
import {
Activity,
ActivityType,
getActivityTileTitle,
getFormattedAmountFromActivity,
setAsyncStatusOfAccountActivities,
} from '@core/wallet'

type ActivityTileData = {
title: string | undefined
amount: number | undefined
activity: Activity
}

export let onTileClick: (activity: Activity) => unknown = () => {}
export let onReject: (activity: Activity) => unknown = () => {}
export let onClaim: (activity: Activity) => unknown = () => {}

$: setAsyncStatusOfAccountActivities($time)
let searchValue = ''

$: activityListWithTitles = $queriedActivities.map((activity, index) => {
const currentTitle = getActivityGroupTitleForTimestamp(activity.time)
const previousTitle = $queriedActivities[index - 1]
? getActivityGroupTitleForTimestamp($queriedActivities[index - 1]?.time)
: undefined
if (currentTitle !== previousTitle || index === 0) {
const amount = $queriedActivities.filter(
(activity) => getActivityGroupTitleForTimestamp(activity.time) === currentTitle
).length

return { title: currentTitle, amount, activity }
} else {
return { title: undefined, amount: undefined, activity }
}
})
$: setAsyncStatusOfAccountActivities($time)
$: activityTileDataList = searchActivities(getActivityTileDataList($queriedActivities), searchValue)

function getActivityGroupTitleForTimestamp(time: Date): string {
const dateString = getMonthYear(time)
return dateString === getMonthYear(new Date()) ? localize('general.thisMonth') : dateString
}

function getActivityTileDataList(activities: Activity[]): ActivityTileData[] {
return activities.map((activity, index) => {
const currentTitle = getActivityGroupTitleForTimestamp(activity.time)
const previousTitle =
activities[index - 1] && getActivityGroupTitleForTimestamp(activities[index - 1]?.time)
if (currentTitle !== previousTitle || index === 0) {
const amount = activities.filter(
(activity) => getActivityGroupTitleForTimestamp(activity.time) === currentTitle
).length

return { title: currentTitle, amount, activity }
} else {
return { title: undefined, amount: undefined, activity }
}
})
}

function searchActivities(activities: ActivityTileData[], searchValue: string): ActivityTileData[] {
if (!activities || !searchValue) {
return activities
}

const searchTerm = searchValue.toLowerCase()
const filteredActivities = activities?.filter((activity) => {
const title = localize(getActivityTileTitle(activity?.activity))?.toLowerCase()
const transactionId = activity?.activity?.transactionId?.toLowerCase()

const addressOrName =
activity?.activity?.subject?.type === 'address'
? activity?.activity?.subject?.address?.toLowerCase()
: activity?.activity?.subject?.account?.name?.toLowerCase()

const amount = getFormattedAmountFromActivity(
activity?.activity?.type === ActivityType.Basic || activity?.activity?.type === ActivityType.Foundry
? activity?.activity
: undefined
)
?.toLowerCase()
?.replace(getGroupSeparator(), '')

return [title, transactionId, addressOrName, amount].some((item) => item?.includes(searchTerm))
})
return filteredActivities
}
</script>

<activity-list-container class="asset-list h-full flex flex-auto flex-col flex-grow flex-shrink-0">
<activity-list-header class="flex justify-between items-center sticky pb-4">
<activity-list-header class="flex justify-between items-center">
<search-input-container class="block flex-1">
<SearchInput bind:value={searchValue} />
</search-input-container>
<Filter filterStoreValue={$activityFilter} filterType={FilterType.Activity} />
</activity-list-header>
{#if activityListWithTitles.length > 0}
<VirtualList items={activityListWithTitles} let:item>
{#if activityTileDataList.length > 0}
<VirtualList items={activityTileDataList} let:item>
<activity-tile-container class="block mb-2">
{#if item.title}
<Text fontWeight={FontWeight.semibold} color="gray-600" classes="my-2">
Expand Down
Expand Up @@ -7,6 +7,8 @@ export function getFormattedAmountFromActivity(
activity: TransactionActivity | FoundryActivity,
signed: boolean = true
): string {
if (!activity) return ''

const metadata = getAssetFromPersistedAssets(activity.assetId)?.metadata
const amount = formatTokenAmountBestMatch(activity.rawAmount, metadata, 2)
if (activity.type === ActivityType.Basic) {
Expand Down