| {t('file')} | ++ + {uploadedFileName ? uploadedFileName : t('no_file_chosen')} + | +
| {t('options')} |
diff --git a/src/components/reply-modal/reply-modal.module.css b/src/components/reply-modal/reply-modal.module.css
index 8daaf256..bdf8fc6e 100644
--- a/src/components/reply-modal/reply-modal.module.css
+++ b/src/components/reply-modal/reply-modal.module.css
@@ -64,6 +64,12 @@
vertical-align: top;
}
+.footer {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+
.footer button {
text-transform: capitalize;
float: right;
@@ -80,9 +86,37 @@
padding-top: 2px;
}
+.spoilerButton label, .spoilerButton input[type="checkbox"] {
+ cursor: pointer;
+}
+
.publishButton {
width: 75px;
- filter: var(--filter80)
+ filter: var(--filter80);
+}
+
+.uploadButton {
+ float: left;
+ margin-right: 5px;
+ white-space: nowrap;
+}
+
+.uploadButton button {
+ white-space: nowrap;
+}
+
+.uploadFileName {
+ display: inline-block;
+ width: calc(100% - 75px);
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+}
+
+.uploadContainer {
+ display: inline-flex;
+ align-items: center;
+ width: 130px;
}
.offlineBoard {
@@ -103,4 +137,15 @@
.title {
cursor: default;
}
+}
+
+.error {
+ width: 294px;
+ font-family: monospace;
+ background-color: #E62020;
+ font-size: 12px;
+ color: white;
+ padding: 3px 5px;
+ margin-top: 1px;
+ text-shadow: 0 1px rgba(0, 0, 0, 0.20);
}
\ No newline at end of file
diff --git a/src/components/reply-modal/reply-modal.tsx b/src/components/reply-modal/reply-modal.tsx
index 5c9182f4..d7c4bfce 100644
--- a/src/components/reply-modal/reply-modal.tsx
+++ b/src/components/reply-modal/reply-modal.tsx
@@ -15,6 +15,10 @@ import styles from './reply-modal.module.css';
import { LinkTypePreviewer } from '../post-form';
import _ from 'lodash';
import useAnonMode from '../../hooks/use-anon-mode';
+import FileUploader from '../../plugins/file-uploader';
+import { Capacitor } from '@capacitor/core';
+
+const isAndroid = Capacitor.getPlatform() === 'android';
interface ReplyModalProps {
closeModal: () => void;
@@ -68,20 +72,23 @@ const ReplyModal = ({ closeModal, showReplyModal, parentCid, postCid, scrollY, s
}
}, [address, getExistingSigner, getNewSigner, setPublishReplyOptions, anonMode, displayName]);
+ const [error, setError] = useState
@@ -218,11 +255,23 @@ const ReplyModal = ({ closeModal, showReplyModal, parentCid, postCid, scrollY, s
{!(isInAllView || isInSubscriptionsView) && offlineAlert}
- {url && (
+ {url && !isAndroid && (
<>
- {t('link_type')}:
+ {error && (
+
+ {t('error')}: {error}
+
+ )}
{_.capitalize(t('interface_language'))}:
-
-
-
-
-
-
-
-
-
+
+ {_.capitalize(t('threads_without_images_tip'))}
+
+
+
+ {_.capitalize(t('hide_gore_boards_tip'))}
+
+
+
+ {_.capitalize(t('hide_adult_boards_tip'))}
+
+
+
+ {_.capitalize(t('fit_expanded_images_to_screen_tip'))}
+
+
+
);
diff --git a/src/components/topbar/topbar.module.css b/src/components/topbar/topbar.module.css
index 6561004e..1dae083c 100644
--- a/src/components/topbar/topbar.module.css
+++ b/src/components/topbar/topbar.module.css
@@ -32,6 +32,7 @@
}
.disabledButton {
+ text-transform: capitalize;
cursor: not-allowed !important;
}
diff --git a/src/components/topbar/topbar.tsx b/src/components/topbar/topbar.tsx
index 55aa4f5e..2392afe6 100644
--- a/src/components/topbar/topbar.tsx
+++ b/src/components/topbar/topbar.tsx
@@ -96,7 +96,7 @@ const TopBarDesktop = () => {
e.preventDefault();
}}
>
- Create
+ {t('create')}
] [
{
e.preventDefault();
}}
>
- Vote
+ {t('vote')}
]
diff --git a/src/hooks/use-publish-reply.ts b/src/hooks/use-publish-reply.ts
index 85f28a1c..a6cd90cf 100644
--- a/src/hooks/use-publish-reply.ts
+++ b/src/hooks/use-publish-reply.ts
@@ -1,7 +1,7 @@
import { useCallback } from 'react';
-import { useAccount, usePublishComment } from '@plebbit/plebbit-react-hooks';
+import { Comment, useAccount, usePublishComment } from '@plebbit/plebbit-react-hooks';
import useAnonMode from './use-anon-mode';
-import usePublishReplyStore, { SetReplyStoreData } from '../stores/use-publish-reply-store';
+import usePublishReplyStore from '../stores/use-publish-reply-store';
const usePublishReply = ({ cid, subplebbitAddress }: { cid: string; subplebbitAddress: string }) => {
const parentCid = cid;
@@ -22,8 +22,8 @@ const usePublishReply = ({ cid, subplebbitAddress }: { cid: string; subplebbitAd
const resetReplyStore = usePublishReplyStore((state) => state.resetReplyStore);
const setPublishReplyOptions = useCallback(
- (options: Partial{_.capitalize(t('hide_avatars_tip'))}
- {state === 'failed' ? (
- {state}
- ) : isInSubscriptionsView && subscriptions?.length === 0 ? (
- t('not_subscribed_to_any_board')
- ) : blocked ? (
- 'you have blocked this board'
- ) : !hasMore && feed.length === 0 ? (
- t('no_posts')
- ) : (
- hasMore &&
- );
const handleNewerPostsButtonClick = () => {
window.scrollTo({ top: 0, left: 0 });
@@ -219,13 +198,46 @@ const Board = () => {
))
)}
-
-
- )}
- - {error.message} -
-
);
}
- return {footerContent} ;
+ return (
+
+ {footerContent}
+
+ );
};
// save the last Virtuoso state to restore it when navigating back
@@ -273,47 +285,24 @@ const Board = () => {
title={title}
/>
)}
- {feed.length !== 0 ? (
- <>
- {rules && !description && rules.length > 0 &&
+ {state === 'failed' ? (
+ {state}
+ ) : isInSubscriptionsView && subscriptions?.length === 0 ? (
+ t('not_subscribed_to_any_board')
+ ) : blocked ? (
+ 'you have blocked this board'
+ ) : (
+ hasMore &&
+
+
+ )}
+ {blocked && (
+ <>
+ [
+ {
+ unblock();
+ reset();
+ }}
+ >
+ Unblock
+
+ ]
+
+ )}
+ + {error.message} +
- {loadingString}
- {blocked && (
- <>
- [
- {
- unblock();
- reset();
- }}
- >
- Unblock
-
- ]
-
- )}
-
- )}
+ return |