+
+ {t('all')}
+
+
|
{t('subscriber')}
@@ -209,14 +215,37 @@ const ApprovedSubplebbits = () => {
return subplebbitsArray?.map((subplebbit, index) =>
);
};
+const AccountAndSubscriberSubplebbits = () => {
+ const { accountSubplebbits } = useAccountSubplebbits();
+ const account = useAccount();
+ const { subplebbits: subscribedSubplebbits } = useSubplebbits({ subplebbitAddresses: account?.subscriptions || [] });
+
+ const combinedSubplebbits = useMemo(() => {
+ const ownSubplebbitsAddresses = Object.keys(accountSubplebbits);
+ const subscribedAddresses = account?.subscriptions || [];
+
+ const uniqueAddresses = Array.from(new Set([...ownSubplebbitsAddresses, ...subscribedAddresses]));
+
+ return uniqueAddresses.map((addr) => accountSubplebbits[addr] || subscribedSubplebbits[addr]);
+ }, [accountSubplebbits, subscribedSubplebbits, account?.subscriptions]);
+
+ return combinedSubplebbits.map((subplebbit, index) =>
);
+};
+
const Subplebbits = () => {
const location = useLocation();
const isInSubplebbitsSubscriberView = isSubplebbitsSubscriberView(location.pathname);
const isInSubplebbitsModeratorView = isSubplebbitsModeratorView(location.pathname);
const isInSubplebbitsAdminView = isSubplebbitsAdminView(location.pathname);
const isInSubplebbitsOwnerView = isSubplebbitsOwnerView(location.pathname);
+ const isInSubplebbitsVoteView = isSubplebbitsVoteView(location.pathname);
const isInSubplebbitsView =
- isSubplebbitsView(location.pathname) && !isInSubplebbitsSubscriberView && !isInSubplebbitsModeratorView && !isInSubplebbitsAdminView && !isInSubplebbitsOwnerView;
+ isSubplebbitsView(location.pathname) &&
+ !isInSubplebbitsSubscriberView &&
+ !isInSubplebbitsModeratorView &&
+ !isInSubplebbitsAdminView &&
+ !isInSubplebbitsOwnerView &&
+ !isInSubplebbitsVoteView;
let viewRole = 'subscriber';
if (isInSubplebbitsModeratorView) {
@@ -232,11 +261,16 @@ const Subplebbits = () => {
- {isInSubplebbitsSubscriberView || isInSubplebbitsModeratorView || isInSubplebbitsAdminView || isInSubplebbitsOwnerView ?
:
}
+ {isInSubplebbitsSubscriberView || isInSubplebbitsModeratorView || isInSubplebbitsAdminView || isInSubplebbitsOwnerView || isInSubplebbitsView ? (
+
+ ) : (
+
+ )}
- {isInSubplebbitsView &&
}
+ {isInSubplebbitsVoteView &&
}
{(isInSubplebbitsModeratorView || isInSubplebbitsAdminView || isInSubplebbitsOwnerView) &&
}
{isInSubplebbitsSubscriberView &&
}
+ {isInSubplebbitsView &&
}
);
};