+
+
+
+
+
cid && upvote()} />
+
+
{postScore}
+
+
cid && downvote()} />
+
+ {hasThumbnail && !isInPostView && (
+
+
+
+ )}
- {hasThumbnail && !isInPostView && (
-
-
+
+
+ {isInPostView && link ? (
+
+ {postTitle ?? '-'}
+
+ ) : (
+
+ {postTitle ?? '-'}
+
+ )}
+ {flair && (
+ <>
+ {' '}
+
+
+ )}{' '}
+ {linkUrl && (
+
+ (
+
+ {linkUrl}
+
+ )
+
+ )}
+
+ {!isInPostView && (
+
+ )}
+
+ {t('submitted')} {getFormattedTimeAgo(timestamp)} {edit &&
*}{' '}
+ {t('post_by')}{' '}
+
+ {!isInSubplebbitView && (
+ <>
+ {t('post_to')}{' '}
+
+ p/{subplebbit?.shortAddress || subplebbitAddress}
+
+
+ )}
+ {pinned &&
- {t('announcement')}}
+
+ {state === 'pending' &&
{loadingString}
}
+
-
- )}
-
-
-
- {isInPostView && link ? (
-
- {postTitle}
-
- ) : (
-
- {postTitle}
-
- )}
- {flair && (
- <>
- {' '}
-
-
- )}{' '}
- {linkUrl && (
-
- (
-
- {linkUrl}
-
- )
-
- )}
-
- {!isInPostView && (
-
- )}
-
- {t('submitted')} {getFormattedTimeAgo(timestamp)} {edit &&
*}{' '}
- {t('post_by')}{' '}
-
- {!isInSubplebbitView && (
- <>
- {t('post_to')}{' '}
-
- p/{subplebbit?.shortAddress || subplebbitAddress}
-
-
- )}
- {pinned &&
- {t('announcement')}}
- {state === 'pending' &&
{loadingString}
}
-
- {isEditing ? (
-
- ) : (
-
- )}
);
diff --git a/src/components/post/thumbnail/thumbnail.module.css b/src/components/post/thumbnail/thumbnail.module.css
index eb97e4bf..5fc7ab2c 100644
--- a/src/components/post/thumbnail/thumbnail.module.css
+++ b/src/components/post/thumbnail/thumbnail.module.css
@@ -2,6 +2,7 @@
position: relative;
float: left;
padding-right: 5px;
+ padding-bottom: 2px;
width: var(--width, 70px); /* Fallback to 70px if variable not set */
height: var(--height, 70px); /* Fallback to 70px if variable not set */
}
diff --git a/src/components/reply/reply.module.css b/src/components/reply/reply.module.css
index b0a5039e..eaced4ca 100644
--- a/src/components/reply/reply.module.css
+++ b/src/components/reply/reply.module.css
@@ -104,6 +104,7 @@
font-size: small;
unicode-bidi: isolate;
margin-top: 5px;
+ position: relative;
}
.highlightMedia {
@@ -128,6 +129,25 @@
color: var(--markdown-link) !important;
}
+.hideSpoiler {
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ background-color: black;
+ color: black;
+ cursor: pointer;
+}
+
+.showSpoilerButton {
+ color: white;
+ text-transform: lowercase;
+ position: absolute;
+ cursor: pointer;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+}
+
.highlightContent {
background-color: var(--yellow-highlight);
padding: 2px 5px;
diff --git a/src/components/reply/reply.tsx b/src/components/reply/reply.tsx
index 46cc6433..b56c96c8 100644
--- a/src/components/reply/reply.tsx
+++ b/src/components/reply/reply.tsx
@@ -201,9 +201,9 @@ interface ReplyProps {
const Reply = ({ cidOfReplyWithContext, depth = 0, isSingleComment, isSingleReply, isNotification = false, reply = {} }: ReplyProps) => {
// handle pending mod or author edit
- const { editedComment: editedPost } = useEditedComment({ comment: reply });
- if (editedPost) {
- reply = editedPost;
+ const { state: editState, editedComment } = useEditedComment({ comment: reply });
+ if (editedComment) {
+ reply = editedComment;
}
const {
author,
@@ -230,6 +230,8 @@ const Reply = ({ cidOfReplyWithContext, depth = 0, isSingleComment, isSingleRepl
} = reply || {};
const subplebbit = useSubplebbit({ subplebbitAddress });
+ const [showSpoiler, setShowSpoiler] = useState(false);
+
const { blocked, unblock } = useBlock({ address: cid });
const [collapsed, setCollapsed] = useState(blocked);
useEffect(() => {
@@ -279,6 +281,8 @@ const Reply = ({ cidOfReplyWithContext, depth = 0, isSingleComment, isSingleRepl
{state === 'failed' && }
{cid === undefined && state !== 'failed' && }
+ {editState === 'failed' && }
+ {editState === 'pending' && }
);
@@ -348,8 +352,14 @@ const Reply = ({ cidOfReplyWithContext, depth = 0, isSingleComment, isSingleRepl
/>
)}
{!collapsed && (
-
- {commentMediaInfo && (!removed || !deleted) && (
+
{
+ spoiler && !showSpoiler && setShowSpoiler(true);
+ }}
+ >
+
+ {commentMediaInfo && !(removed || deleted || (spoiler && !showSpoiler)) && (
) : (
+ {spoiler && !showSpoiler &&
{t('view_spoiler')}
}
{content &&
(removed ? (
[{t('removed')}]
diff --git a/src/components/topbar/topbar.tsx b/src/components/topbar/topbar.tsx
index 0983cadf..40e0445a 100644
--- a/src/components/topbar/topbar.tsx
+++ b/src/components/topbar/topbar.tsx
@@ -126,6 +126,9 @@ const TopBar = () => {
{t('edit_subscriptions')}
+
+ {t('default_communities')}
+
@@ -179,7 +182,7 @@ const TopBar = () => {
- {t('edit')} »
+ {t('more')} »
diff --git a/src/views/settings/address-settings/address-settings.module.css b/src/views/settings/address-settings/address-settings.module.css
index 104a75da..cbc49742 100644
--- a/src/views/settings/address-settings/address-settings.module.css
+++ b/src/views/settings/address-settings/address-settings.module.css
@@ -44,4 +44,12 @@
position: relative;
bottom: 2px;
margin-bottom: -2px;
+}
+
+.copyAddressSetting {
+ padding-bottom: 10px;
+}
+
+.copyAddressSetting button {
+ margin-left: 0;
}
\ No newline at end of file
diff --git a/src/views/settings/address-settings/address-settings.tsx b/src/views/settings/address-settings/address-settings.tsx
index fe9e6b26..f2fec941 100644
--- a/src/views/settings/address-settings/address-settings.tsx
+++ b/src/views/settings/address-settings/address-settings.tsx
@@ -131,6 +131,9 @@ const AddressSettings = () => {
return (