From 95410f705f15f0eab611400c1b9fda4830503815 Mon Sep 17 00:00:00 2001
From: Ivan Chen <ivan@tagg.id>
Date: Fri, 16 Jul 2021 19:20:28 -0400
Subject: Fix trimmer logic

---
 src/screens/upload/EditMedia.tsx | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

(limited to 'src/screens')

diff --git a/src/screens/upload/EditMedia.tsx b/src/screens/upload/EditMedia.tsx
index 6b2d6008..1dc408ee 100644
--- a/src/screens/upload/EditMedia.tsx
+++ b/src/screens/upload/EditMedia.tsx
@@ -135,19 +135,14 @@ export const EditMedia: React.FC<EditMediaProps> = ({route, navigation}) => {
         }));
       }
       setCropLoading(true);
-      trimVideo(
+      cropVideo(
         mediaUri,
-        (trimmedURL: string) =>
-          cropVideo(
-            trimmedURL,
-            (croppedURL: string) => {
-              setCropLoading(false);
-              // Pass the trimmed/cropped video
-              callback(croppedURL);
-            },
-            videoCrop,
-          ),
-        trimEnds,
+        (croppedURL: string) => {
+          setCropLoading(false);
+          // Pass the trimmed/cropped video
+          callback(croppedURL);
+        },
+        videoCrop,
       );
     }
   };
@@ -267,7 +262,21 @@ export const EditMedia: React.FC<EditMediaProps> = ({route, navigation}) => {
           <TouchableOpacity onPress={() => setHideTrimmer(true)}>
             <Text style={styles.bigText}>Cancel</Text>
           </TouchableOpacity>
-          <TouchableOpacity onPress={() => setHideTrimmer(true)}>
+          <TouchableOpacity
+            onPress={() =>
+              trimVideo(
+                mediaUri,
+                (trimmedUri: string) => {
+                  setCropLoading(true);
+                  setMediaUri(trimmedUri);
+                  setTimeout(() => {
+                    setHideTrimmer(true);
+                    setCropLoading(false);
+                  }, 500);
+                },
+                trimEnds,
+              )
+            }>
             <Text style={styles.bigText}>Save</Text>
           </TouchableOpacity>
         </View>
-- 
cgit v1.2.3-70-g09d2