Merge pull request #99 from tooot-app/main

Fix crash

src/components/Parse/Emojis.tsx

@@ -73,23 +73,19 @@ const ParseEmojis = React.memo(
                 if (emojiIndex === -1) {
                   return <Text key={emojiShortcode + i}>{emojiShortcode}</Text>
                 } else {
-                  if (i === 0) {
+                  const uri = reduceMotionEnabled
-                    return <Text key={emojiShortcode + i}> </Text>
+                    ? emojis[emojiIndex].static_url
+                    : emojis[emojiIndex].url
+                  if (validUrl.isHttpsUri(uri)) {
+                    return (
+                      <FastImage
+                        key={emojiShortcode + i}
+                        source={{ uri }}
+                        style={styles.image}
+                      />
+                    )
                   } else {
-                    const uri = reduceMotionEnabled
+                    return null
-                      ? emojis[emojiIndex].static_url
-                      : emojis[emojiIndex].url
-                    if (validUrl.isHttpsUri(uri)) {
-                      return (
-                        <FastImage
-                          key={emojiShortcode + i}
-                          source={{ uri }}
-                          style={styles.image}
-                        />
-                      )
-                    } else {
-                      return null
-                    }
                   }
                 }
               } else {

src/components/Timeline/Shared/Poll.tsx

@@ -152,14 +152,16 @@ const TimelinePoll: React.FC<Props> = ({
         </Text>
       )
     } else {
-      return (
+      if (poll.expires_at) {
-        <Text style={[styles.expiration, { color: theme.secondary }]}>
+        return (
-          <Trans
+          <Text style={[styles.expiration, { color: theme.secondary }]}>
-            i18nKey='componentTimeline:shared.poll.meta.expiration.until'
+            <Trans
-            components={[<RelativeTime date={poll.expires_at} />]}
+              i18nKey='componentTimeline:shared.poll.meta.expiration.until'
-          />
+              components={[<RelativeTime date={poll.expires_at} />]}
-        </Text>
+            />
-      )
+          </Text>
+        )
+      }
     }
   }, [mode, i18n.language, poll.expired, poll.expires_at])
 

src/screens/Compose/Root/Drafts.tsx

@@ -28,6 +28,7 @@ const ComposeDrafts: React.FC<Props> = ({ accessibleRefDrafts }) => {
   if (!composeState.dirty && instanceDrafts?.length) {
     return (
       <View
+        accessible
         ref={accessibleRefDrafts}
         style={styles.base}
         children={