From 4d5de0041f60514249e203e1bcbf51b7b04472b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Tue, 20 Aug 2024 15:16:51 +0200
Subject: [PATCH] bugfixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 src/components/translate-button.tsx               | 2 +-
 src/features/ui/components/modals/media-modal.tsx | 3 ++-
 src/reducers/settings.ts                          | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/translate-button.tsx b/src/components/translate-button.tsx
index d244b46e4..5755be9c8 100644
--- a/src/components/translate-button.tsx
+++ b/src/components/translate-button.tsx
@@ -46,7 +46,7 @@ const TranslateButton: React.FC<ITranslateButton> = ({ status }) => {
   };
 
   useEffect(() => {
-    if (settings.autoTranslate && features.translations && renderTranslate && supportsLanguages && status.translation !== false && status.language !== null && !knownLanguages.includes(status.language)) {
+    if (!status.translation && settings.autoTranslate && features.translations && renderTranslate && supportsLanguages && status.translation !== false && status.language !== null && !knownLanguages.includes(status.language)) {
       setAutoTranslating(true);
       dispatch(translateStatus(status.id, intl.locale, true));
     }
diff --git a/src/features/ui/components/modals/media-modal.tsx b/src/features/ui/components/modals/media-modal.tsx
index e81e2c224..d4da99f8f 100644
--- a/src/features/ui/components/modals/media-modal.tsx
+++ b/src/features/ui/components/modals/media-modal.tsx
@@ -64,6 +64,7 @@ const MediaModal: React.FC<IMediaModal> = (props) => {
 
   const getStatus = useCallback(makeGetStatus(), []);
   const status = useAppSelector((state) => getStatus(state, { id: statusId as string }));
+  console.log(statusId, status);
 
   const [isLoaded, setIsLoaded] = useState<boolean>(!!status);
   const [index, setIndex] = useState<number | null>(null);
@@ -206,7 +207,7 @@ const MediaModal: React.FC<IMediaModal> = (props) => {
   }, [index]);
 
   if (statusId) {
-    if (isLoaded) {
+    if (!isLoaded) {
       return (
         <MissingIndicator />
       );
diff --git a/src/reducers/settings.ts b/src/reducers/settings.ts
index 2bc977fe6..09c775128 100644
--- a/src/reducers/settings.ts
+++ b/src/reducers/settings.ts
@@ -27,7 +27,8 @@ const updateFrequentLanguages = (state: State, language: string) =>
 
 const importSettings = (state: State, account: APIEntity) => {
   account = fromJS(account);
-  const prefs = account.getIn(['pleroma', 'settings_store', FE_NAME], ImmutableMap());
+  console.log(account.toJS());
+  const prefs = account.getIn(['__meta', 'pleroma', 'settings_store', FE_NAME], ImmutableMap());
   return state.merge(prefs) as State;
 };