Merge remote-tracking branch 'origin/main' into develop

NaturalSelectionLabs · Nov 29, 2021 · 9217574 · 9217574
2 parents 0342444 + da4ad01
commit 9217574
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/src/assets/images/chains/Solana.png b/src/assets/images/chains/Solana.png
diff --git a/src/components/AccountItem.vue b/src/components/AccountItem.vue
@@ -8,6 +8,7 @@
                 'bg-Ronin': chain === 'Ronin',
                 'bg-Misskey': chain === 'Misskey',
                 'bg-Twitter': chain === 'Twitter',
+                'bg-Solana': chain === 'Solana',
             }"
             :style="{ width: size + 'px', height: size + 'px' }"
             @mouseenter="isHover = true"

diff --git a/src/views/Followers.vue b/src/views/Followers.vue
@@ -42,7 +42,7 @@ import FollowerCard from '@/components/FollowerCard.vue';
 import RSS3, { IRSS3 } from '@/common/rss3';
 import RNSUtils from '@/common/rns';
 import config from '@/config';
-import { reverse } from 'lodash';
+import { reverse, uniq } from 'lodash';
 import { getName } from '@/common/utils';
 
 interface Profile {
@@ -119,7 +119,7 @@ export default class Followers extends Vue {
 
         const rss3 = await RSS3.visitor();
         const initFollowersList = await rss3.backlinks.get(this.ethAddress, 'following');
-        const followersList = reverse(initFollowersList);
+        const followersList = uniq(reverse(initFollowersList));
 
         if (rss3 && followersList) {
             for (const item of followersList) {

diff --git a/src/views/Followings.vue b/src/views/Followings.vue
@@ -42,7 +42,7 @@ import FollowerCard from '@/components/FollowerCard.vue';
 import RSS3, { IRSS3 } from '@/common/rss3';
 import RNSUtils from '@/common/rns';
 import config from '@/config';
-import { reverse } from 'lodash';
+import { reverse, uniq } from 'lodash';
 import { getName } from '@/common/utils';
 
 interface Profile {
@@ -119,7 +119,7 @@ export default class Followings extends Vue {
 
         const rss3 = await RSS3.visitor();
         const initFollowersList = (await rss3.links.get(this.ethAddress, 'following'))?.list || [];
-        const followersList = reverse(initFollowersList);
+        const followersList = uniq(reverse(initFollowersList));
 
         if (rss3 && followersList) {
             for (const item of followersList) {

diff --git a/tailwind.config.js b/tailwind.config.js
@@ -226,6 +226,7 @@ module.exports = {
                 Ronin: 'url(@/assets/images/chains/Ronin.png)',
                 Misskey: 'url(@/assets/images/chains/Misskey.png)',
                 Twitter: 'url(@/assets/images/chains/Twitter.png)',
+                Solana: 'url(@/assets/images/chains/Solana.png)',
                 Roninscan: 'url(@/assets/images/scans/Roninscan.png)',
                 pass3gif: 'url(@/assets/images/pass3.gif)',
                 pass3logo: 'url(@/assets/images/pass3logo.svg)',