Merge branch 'more-fixes' into shigusegubu-themes3

src/api/admin.js

@@ -435,7 +435,7 @@ export const downloadRemoteEmojiPackZIP = ({
   return promisedRequest({
     url: EMOJI_PACKS_DL_REMOTE_ZIP_URL,
     method: 'POST',
-    payload: data,
+    formData: data,
   })
 }
 
@@ -460,7 +460,7 @@ export const addNewEmojiFile = ({ packName, file, shortcode, filename }) => {
   return promisedRequest({
     url: EMOJI_UPDATE_FILE_URL(packName),
     method: 'POST',
-    payload: data,
+    formData: data,
   })
 }
 

src/api/user.js

@@ -181,9 +181,6 @@ export const unmuteConversation = ({ id, credentials }) =>
   }).then(({ data, ...rest }) => ({ ...rest, data: parseStatus(data) }))
 
 export const vote = ({ pollId, choices, credentials }) => {
-  const form = new FormData()
-  form.append('choices', choices)
-
   return promisedRequest({
     url: MASTODON_VOTE_URL(encodeURIComponent(pollId)),
     method: 'POST',