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.

Sign up for GitHub

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: Add context offchain profile to wallet connection #10661

Merged
merged 8 commits into from
Jul 29, 2024
Merged

feat: Add context offchain profile to wallet connection #10661

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f65b121
feat: Add context offchain profile to wallet connection
Jarsen136 Jul 19, 2024
055d3e6
feat: profile skeleton loader
Jarsen136 Jul 22, 2024
8b6d55e
chore: NeoSkeleton
Jarsen136 Jul 22, 2024
e816df7
Merge branch 'main' into issue-10652
hassnian Jul 23, 2024
859ee32
Merge branch 'main' into issue-10652
Jarsen136 Jul 23, 2024
4cfdcf6
refactor: useProfiles
Jarsen136 Jul 23, 2024
636fffa
chore: remove import
Jarsen136 Jul 23, 2024
ab9941c
Merge branch 'main' into issue-10652
Jarsen136 Jul 24, 2024
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
67 changes: 54 additions & 13 deletions components/common/ConnectWallet/WalletMenuItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,27 +44,43 @@
</span>
</div>

<div v-if="walletAccounts.length && showAccountList" class="account-list">
<div
v-if="walletAccountsWithProfile.length && showAccountList"
class="account-list">
<div
v-for="option in walletAccounts"
v-for="option in walletAccountsWithProfile"
:key="option.address"
class="account-item">
<a
class="pl-5 flex items-center"
class="pl-5 flex items-center justify-between"
:value="option.address"
@click="emitAccountChange(option)">
<Avatar
:size="33"
:value="option.address"
class="mr-2 image-outline" />
<div class="flex flex-col">
<span class="text-k-grey text-xs account-name">{{
option.name
}}</span>
<div class="account-address">
{{ shortAddress(option.address, 6, -3) }}
<div class="flex items-center">
<Avatar
:size="33"
:value="option.address"
class="mr-2 image-outline" />
<div class="flex flex-col">
<span class="text-k-grey text-xs account-name">{{
option.name
}}</span>
<div class="account-address">
{{ shortAddress(option.address, 6, -3) }}
</div>
</div>
</div>
<div
v-if="option.profile"
class="flex items-center rounded-full bg-neutral-3 dark:bg-neutral-11 px-[6px] py-[3px] h-[22px] gap-[0.375rem] mr-1">
<ProfileAvatar
:size="12.5"
:address="option.address"
:profile-image="option.profile?.image" />
<span
class="text-sm max-w-[80px] text-ellipsis whitespace-nowrap overflow-hidden"
>{{ option.profile?.name }}</span
>
</div>
</a>
</div>
</div>
Expand All @@ -81,6 +97,9 @@ import { useWalletStore } from '@/stores/wallet'
import { NeoIcon } from '@kodadot1/brick'
import Avatar from '@/components/shared/Avatar.vue'
import NeoTag from '@/components/shared/gallery/NeoTag.vue'
import { fetchProfilesByIds, toSubstrateAddress } from '@/services/profile'
import { useQuery } from '@tanstack/vue-query'
import type { Profile } from '@/services/profile'

defineProps<{
wallet: BaseDotsamaWallet
Expand All @@ -104,12 +123,34 @@ const emitAccountChange = (account): void => {

const ss58Format = computed(() => chainProperties.value?.ss58Format)

const walletAccountsWithProfile = computed(() => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will break on evm

Copy link
Contributor Author

@Jarsen136 Jarsen136 Jul 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will break on evm

could you expand more?

I tested connection with evm and it works well. It would not go with these codes with evm.

return walletAccounts.value.map((account) => {
return {
...account,
profile: existingProfiles.value?.find(
(p) => p.address === toSubstrateAddress(account.address),
),
}
})
})

watch(walletAccounts, (newValue) => {
if (shouldUpdate(newValue, walletAccounts.value)) {
walletAccounts.value = newValue
}
})

const { data: existingProfiles } = useQuery<Profile[]>({
queryKey: [
'account-profiles',
computed(() => `${walletAccounts.value.sort().join(',')}`),
],
queryFn: () =>
walletAccounts.value.length
? fetchProfilesByIds(walletAccounts.value.map((a) => a.address))
: [],
})

const formatAccount = (account: WalletAccount): WalletAccount => {
return {
...account,
Expand Down
Loading