stream-chat-react-native-core 5.36.1-beta.1 → 5.36.1-beta.3

package/lib/commonjs/contexts/messageInputContext/MessageInputContext.js

@@ -226,12 +226,13 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
                 text: t('Open Settings')
               }]);
             }
-            if (!photo.cancelled) {
-              setSelectedImages(function (images) {
-                return [].concat((0, _toConsumableArray2["default"])(images), [photo]);
-              });
+            if (photo.cancelled) {
+              _context.next = 9;
+              break;
             }
-          case 7:
+            _context.next = 9;
+            return uploadNewImage(photo);
+          case 9:
           case "end":
             return _context.stop();
         }
@@ -242,15 +243,15 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
     };
   }();
   var pickAndUploadImageFromNativePicker = function () {
-    var _ref3 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee2() {
+    var _ref3 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee3() {
       var result;
-      return _regenerator["default"].wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regenerator["default"].wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            _context2.next = 2;
+            _context3.next = 2;
             return (0, _native.pickImage)();
           case 2:
-            result = _context2.sent;
+            result = _context3.sent;
             if (result.askToOpenSettings) {
               _reactNative.Alert.alert(t('Allow access to your Gallery'), t('Device gallery permissions is used to take photos or videos.'), [{
                 style: 'cancel',
@@ -264,94 +265,124 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
               }]);
             }
             if (result.assets && result.assets.length > 0) {
-              result.assets.forEach(function (asset) {
-                if (asset.type.includes('image')) {
-                  setSelectedImages(function (prevImages) {
-                    return [].concat((0, _toConsumableArray2["default"])(prevImages), [asset]);
-                  });
-                } else {
-                  setSelectedFiles(function (prevFiles) {
-                    return [].concat((0, _toConsumableArray2["default"])(prevFiles), [Object.assign({}, asset, {
-                      mimeType: asset.type,
-                      type: _types.FileTypes.Video
-                    })]);
-                  });
-                }
-              });
+              result.assets.forEach(function () {
+                var _ref4 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee2(asset) {
+                  return _regenerator["default"].wrap(function _callee2$(_context2) {
+                    while (1) switch (_context2.prev = _context2.next) {
+                      case 0:
+                        if (!asset.type.includes('image')) {
+                          _context2.next = 5;
+                          break;
+                        }
+                        _context2.next = 3;
+                        return uploadNewImage(asset);
+                      case 3:
+                        _context2.next = 7;
+                        break;
+                      case 5:
+                        _context2.next = 7;
+                        return uploadNewFile(Object.assign({}, asset, {
+                          mimeType: asset.type,
+                          type: _types.FileTypes.Video
+                        }));
+                      case 7:
+                      case "end":
+                        return _context2.stop();
+                    }
+                  }, _callee2);
+                }));
+                return function (_x) {
+                  return _ref4.apply(this, arguments);
+                };
+              }());
             }
           case 5:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2);
+      }, _callee3);
     }));
     return function pickAndUploadImageFromNativePicker() {
       return _ref3.apply(this, arguments);
     };
   }();
-  var openAttachmentPicker = function openAttachmentPicker() {
+  var openAttachmentPicker = (0, _react.useCallback)(function () {
     _reactNative.Keyboard.dismiss();
     setSelectedPicker('images');
     openPicker();
-  };
-  var closeAttachmentPicker = function closeAttachmentPicker() {
+  }, [openPicker, setSelectedPicker]);
+  var closeAttachmentPicker = (0, _react.useCallback)(function () {
     setSelectedPicker(undefined);
     closePicker();
-  };
-  var toggleAttachmentPicker = function toggleAttachmentPicker() {
+  }, [closePicker, setSelectedPicker]);
+  var toggleAttachmentPicker = (0, _react.useCallback)(function () {
     if (selectedPicker) {
       closeAttachmentPicker();
     } else {
       openAttachmentPicker();
     }
-  };
+  }, [closeAttachmentPicker, openAttachmentPicker, selectedPicker]);
   var onSelectItem = function onSelectItem(item) {
     setMentionedUsers(function (prevMentionedUsers) {
       return [].concat((0, _toConsumableArray2["default"])(prevMentionedUsers), [item.id]);
     });
   };
   var pickFile = function () {
-    var _ref4 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee3() {
+    var _ref5 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee5() {
       var result;
-      return _regenerator["default"].wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      return _regenerator["default"].wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
             if (!(_native.pickDocument === null)) {
-              _context3.next = 3;
+              _context5.next = 3;
               break;
             }
             console.log('The file picker is not installed. Check our Getting Started documentation to install it.');
-            return _context3.abrupt("return");
+            return _context5.abrupt("return");
           case 3:
             if (!(numberOfUploads >= value.maxNumberOfFiles)) {
-              _context3.next = 6;
+              _context5.next = 6;
               break;
             }
             _reactNative.Alert.alert('Maximum number of files reached');
-            return _context3.abrupt("return");
+            return _context5.abrupt("return");
           case 6:
-            _context3.next = 8;
+            _context5.next = 8;
             return (0, _native.pickDocument)({
               maxNumberOfFiles: value.maxNumberOfFiles - numberOfUploads
             });
           case 8:
-            result = _context3.sent;
+            result = _context5.sent;
             if (!result.cancelled && result.assets) {
-              result.assets.forEach(function (asset) {
-                uploadNewFile(asset);
-              });
+              result.assets.forEach(function () {
+                var _ref6 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee4(asset) {
+                  return _regenerator["default"].wrap(function _callee4$(_context4) {
+                    while (1) switch (_context4.prev = _context4.next) {
+                      case 0:
+                        _context4.next = 2;
+                        return uploadNewFile(asset);
+                      case 2:
+                      case "end":
+                        return _context4.stop();
+                    }
+                  }, _callee4);
+                }));
+                return function (_x2) {
+                  return _ref6.apply(this, arguments);
+                };
+              }());
             }
           case 10:
           case "end":
-            return _context3.stop();
+            return _context5.stop();
         }
-      }, _callee3);
+      }, _callee5);
     }));
     return function pickFile() {
-      return _ref4.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
-  var removeFile = function removeFile(id) {
+  var removeFile = (0, _react.useCallback)(function (id) {
     if (fileUploads.some(function (file) {
       return file.id === id;
     })) {
@@ -364,8 +395,8 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
         return prevNumberOfUploads - 1;
       });
     }
-  };
-  var removeImage = function removeImage(id) {
+  }, [fileUploads, setFileUploads, setNumberOfUploads]);
+  var removeImage = (0, _react.useCallback)(function (id) {
     if (imageUploads.some(function (image) {
       return image.id === id;
     })) {
@@ -378,9 +409,13 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
         return prevNumberOfUploads - 1;
       });
     }
-  };
+  }, [imageUploads, setImageUploads, setNumberOfUploads]);
   var resetInput = function resetInput() {
     var pendingAttachments = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    if ((0, _native.isImageMediaLibraryAvailable)()) {
+      setSelectedFiles([]);
+      setSelectedImages([]);
+    }
     setFileUploads([]);
     setGiphyActive(false);
     setShowMoreOptions(true);
@@ -460,8 +495,8 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
     }
   };
   var sendMessage = function () {
-    var _ref5 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee4() {
-      var _ref6,
+    var _ref7 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee6() {
+      var _ref8,
         customMessageData,
         linkInfos,
         prevText,
@@ -477,24 +512,24 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
         message,
         updatedMessage,
         updateMessagePromise,
-        _args5 = arguments;
-      return _regenerator["default"].wrap(function _callee4$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+        _args7 = arguments;
+      return _regenerator["default"].wrap(function _callee6$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            _ref6 = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {}, customMessageData = _ref6.customMessageData;
+            _ref8 = _args7.length > 0 && _args7[0] !== undefined ? _args7[0] : {}, customMessageData = _ref8.customMessageData;
             if (!sending.current) {
-              _context5.next = 3;
+              _context7.next = 3;
               break;
             }
-            return _context5.abrupt("return");
+            return _context7.abrupt("return");
           case 3:
             linkInfos = (0, _parseLinks.parseLinksFromText)(text);
             if (!(!channelCapabities.sendLinks && linkInfos.length > 0)) {
-              _context5.next = 7;
+              _context7.next = 7;
               break;
             }
             _reactNative.Alert.alert(t('Links are disabled'), t('Sending links is not allowed in this conversation'));
-            return _context5.abrupt("return");
+            return _context7.abrupt("return");
           case 7:
             sending.current = true;
             startCooldown();
@@ -505,46 +540,46 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
             }
             attachments = [];
             _loop = _regenerator["default"].mark(function _loop(_image) {
-              return _regenerator["default"].wrap(function _loop$(_context4) {
-                while (1) switch (_context4.prev = _context4.next) {
+              return _regenerator["default"].wrap(function _loop$(_context6) {
+                while (1) switch (_context6.prev = _context6.next) {
                   case 0:
                     if (!enableOfflineSupport) {
-                      _context4.next = 5;
+                      _context6.next = 5;
                       break;
                     }
                     if (!(_image.state === _utils2.FileState.NOT_SUPPORTED)) {
-                      _context4.next = 3;
+                      _context6.next = 3;
                       break;
                     }
-                    return _context4.abrupt("return", {
+                    return _context6.abrupt("return", {
                       v: void 0
                     });
                   case 3:
                     attachments.push(mapImageUploadToAttachment(_image));
-                    return _context4.abrupt("return", "continue");
+                    return _context6.abrupt("return", "continue");
                   case 5:
                     if (!((!_image || _image.state === _utils2.FileState.UPLOAD_FAILED) && !enableOfflineSupport)) {
-                      _context4.next = 7;
+                      _context6.next = 7;
                       break;
                     }
-                    return _context4.abrupt("return", "continue");
+                    return _context6.abrupt("return", "continue");
                   case 7:
                     if (!(_image.state === _utils2.FileState.UPLOADING)) {
-                      _context4.next = 14;
+                      _context6.next = 14;
                       break;
                     }
                     if (!value.sendImageAsync) {
-                      _context4.next = 12;
+                      _context6.next = 12;
                       break;
                     }
                     setAsyncIds(function (prevAsyncIds) {
                       return [].concat((0, _toConsumableArray2["default"])(prevAsyncIds), [_image.id]);
                     });
-                    _context4.next = 14;
+                    _context6.next = 14;
                     break;
                   case 12:
                     sending.current = false;
-                    return _context4.abrupt("return", {
+                    return _context6.abrupt("return", {
                       v: setText(prevText)
                     });
                   case 14:
@@ -553,107 +588,107 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
                     }
                   case 15:
                   case "end":
-                    return _context4.stop();
+                    return _context6.stop();
                 }
               }, _loop);
             });
             _iterator3 = _createForOfIteratorHelper(imageUploads);
-            _context5.prev = 15;
+            _context7.prev = 15;
             _iterator3.s();
           case 17:
             if ((_step3 = _iterator3.n()).done) {
-              _context5.next = 27;
+              _context7.next = 27;
               break;
             }
             _image = _step3.value;
-            return _context5.delegateYield(_loop(_image), "t0", 20);
+            return _context7.delegateYield(_loop(_image), "t0", 20);
           case 20:
-            _ret = _context5.t0;
+            _ret = _context7.t0;
             if (!(_ret === "continue")) {
-              _context5.next = 23;
+              _context7.next = 23;
               break;
             }
-            return _context5.abrupt("continue", 25);
+            return _context7.abrupt("continue", 25);
           case 23:
             if (!((0, _typeof2["default"])(_ret) === "object")) {
-              _context5.next = 25;
+              _context7.next = 25;
               break;
             }
-            return _context5.abrupt("return", _ret.v);
+            return _context7.abrupt("return", _ret.v);
           case 25:
-            _context5.next = 17;
+            _context7.next = 17;
             break;
           case 27:
-            _context5.next = 32;
+            _context7.next = 32;
             break;
           case 29:
-            _context5.prev = 29;
-            _context5.t1 = _context5["catch"](15);
-            _iterator3.e(_context5.t1);
+            _context7.prev = 29;
+            _context7.t1 = _context7["catch"](15);
+            _iterator3.e(_context7.t1);
           case 32:
-            _context5.prev = 32;
+            _context7.prev = 32;
             _iterator3.f();
-            return _context5.finish(32);
+            return _context7.finish(32);
           case 35:
             _iterator4 = _createForOfIteratorHelper(fileUploads);
-            _context5.prev = 36;
+            _context7.prev = 36;
             _iterator4.s();
           case 38:
             if ((_step4 = _iterator4.n()).done) {
-              _context5.next = 53;
+              _context7.next = 53;
               break;
             }
             _file3 = _step4.value;
             if (!enableOfflineSupport) {
-              _context5.next = 45;
+              _context7.next = 45;
               break;
             }
             if (!(_file3.state === _utils2.FileState.NOT_SUPPORTED)) {
-              _context5.next = 43;
+              _context7.next = 43;
               break;
             }
-            return _context5.abrupt("return");
+            return _context7.abrupt("return");
           case 43:
             attachments.push(mapFileUploadToAttachment(_file3));
-            return _context5.abrupt("continue", 51);
+            return _context7.abrupt("continue", 51);
           case 45:
             if (!(!_file3 || _file3.state === _utils2.FileState.UPLOAD_FAILED)) {
-              _context5.next = 47;
+              _context7.next = 47;
               break;
             }
-            return _context5.abrupt("continue", 51);
+            return _context7.abrupt("continue", 51);
           case 47:
             if (!(_file3.state === _utils2.FileState.UPLOADING)) {
-              _context5.next = 50;
+              _context7.next = 50;
               break;
             }
             sending.current = false;
-            return _context5.abrupt("return");
+            return _context7.abrupt("return");
           case 50:
             if (_file3.state === _utils2.FileState.UPLOADED || _file3.state === _utils2.FileState.FINISHED) {
               attachments.push(mapFileUploadToAttachment(_file3));
             }
           case 51:
-            _context5.next = 38;
+            _context7.next = 38;
             break;
           case 53:
-            _context5.next = 58;
+            _context7.next = 58;
             break;
           case 55:
-            _context5.prev = 55;
-            _context5.t2 = _context5["catch"](36);
-            _iterator4.e(_context5.t2);
+            _context7.prev = 55;
+            _context7.t2 = _context7["catch"](36);
+            _iterator4.e(_context7.t2);
           case 58:
-            _context5.prev = 58;
+            _context7.prev = 58;
             _iterator4.f();
-            return _context5.finish(58);
+            return _context7.finish(58);
           case 61:
             if (!(!prevText && attachments.length === 0)) {
-              _context5.next = 64;
+              _context7.next = 64;
               break;
             }
             sending.current = false;
-            return _context5.abrupt("return");
+            return _context7.abrupt("return");
           case 64:
             message = value.editing;
             if (message && message.type !== 'error') {
@@ -695,12 +730,12 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
             }
           case 66:
           case "end":
-            return _context5.stop();
+            return _context7.stop();
         }
-      }, _callee4, null, [[15, 29, 32, 35], [36, 55, 58, 61]]);
+      }, _callee6, null, [[15, 29, 32, 35], [36, 55, 58, 61]]);
     }));
     return function sendMessage() {
-      return _ref5.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
   var sendMessageAsync = function sendMessageAsync(id) {
@@ -767,16 +802,16 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
   };
   var triggerSettings = getTriggerSettings();
   var updateMessage = function () {
-    var _ref7 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee5() {
-      return _regenerator["default"].wrap(function _callee5$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+    var _ref9 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee7() {
+      return _regenerator["default"].wrap(function _callee7$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
           case 0:
-            _context6.prev = 0;
+            _context8.prev = 0;
             if (!value.editing) {
-              _context6.next = 4;
+              _context8.next = 4;
               break;
             }
-            _context6.next = 4;
+            _context8.next = 4;
             return client.updateMessage(Object.assign({}, value.editing, {
               quoted_message: undefined,
               text: giphyEnabled && giphyActive ? "/giphy ".concat(text) : text
@@ -784,20 +819,20 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
           case 4:
             value.clearEditingState();
             resetInput();
-            _context6.next = 11;
+            _context8.next = 11;
             break;
           case 8:
-            _context6.prev = 8;
-            _context6.t0 = _context6["catch"](0);
-            console.log(_context6.t0);
+            _context8.prev = 8;
+            _context8.t0 = _context8["catch"](0);
+            console.log(_context8.t0);
           case 11:
           case "end":
-            return _context6.stop();
+            return _context8.stop();
         }
-      }, _callee5, null, [[0, 8]]);
+      }, _callee7, null, [[0, 8]]);
     }));
     return function updateMessage() {
-      return _ref7.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }();
   var regexCondition = /File (extension \.\w{2,4}|type \S+) is not supported/;
@@ -838,51 +873,51 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
     }
   };
   var uploadFile = function () {
-    var _ref9 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee6(_ref8) {
+    var _ref11 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee8(_ref10) {
       var newFile, file, id, response, _file$mimeType, compressedUri, extraData;
-      return _regenerator["default"].wrap(function _callee6$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
+      return _regenerator["default"].wrap(function _callee8$(_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
           case 0:
-            newFile = _ref8.newFile;
+            newFile = _ref10.newFile;
             file = newFile.file, id = newFile.id;
             setFileUploads(getUploadSetStateAction(id, _utils2.FileState.UPLOADING));
             response = {};
-            _context7.prev = 4;
+            _context9.prev = 4;
             if (!value.doDocUploadRequest) {
-              _context7.next = 11;
+              _context9.next = 11;
               break;
             }
-            _context7.next = 8;
+            _context9.next = 8;
             return value.doDocUploadRequest(file, channel);
           case 8:
-            response = _context7.sent;
-            _context7.next = 26;
+            response = _context9.sent;
+            _context9.next = 26;
             break;
           case 11:
             if (!(channel && file.uri)) {
-              _context7.next = 26;
+              _context9.next = 26;
               break;
             }
             uploadAbortControllerRef.current.set(file.name, client.createAbortControllerForNextRequest());
             if (!((_file$mimeType = file.mimeType) != null && _file$mimeType.includes('image'))) {
-              _context7.next = 22;
+              _context9.next = 22;
               break;
             }
-            _context7.next = 16;
+            _context9.next = 16;
             return (0, _compressImage.compressedImageURI)(file, value.compressImageQuality);
           case 16:
-            compressedUri = _context7.sent;
-            _context7.next = 19;
+            compressedUri = _context9.sent;
+            _context9.next = 19;
             return channel.sendFile(compressedUri, file.name, file.mimeType);
           case 19:
-            response = _context7.sent;
-            _context7.next = 25;
+            response = _context9.sent;
+            _context9.next = 25;
             break;
           case 22:
-            _context7.next = 24;
+            _context9.next = 24;
             return channel.sendFile(file.uri, file.name, file.mimeType);
           case 24:
-            response = _context7.sent;
+            response = _context9.sent;
           case 25:
             uploadAbortControllerRef.current["delete"](file.name);
           case 26:
@@ -891,70 +926,70 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
               url: response.file
             };
             setFileUploads(getUploadSetStateAction(id, _utils2.FileState.UPLOADED, extraData));
-            _context7.next = 36;
+            _context9.next = 36;
             break;
           case 30:
-            _context7.prev = 30;
-            _context7.t0 = _context7["catch"](4);
-            if (!(_context7.t0 instanceof Error && (_context7.t0.name === 'AbortError' || _context7.t0.name === 'CanceledError'))) {
-              _context7.next = 35;
+            _context9.prev = 30;
+            _context9.t0 = _context9["catch"](4);
+            if (!(_context9.t0 instanceof Error && (_context9.t0.name === 'AbortError' || _context9.t0.name === 'CanceledError'))) {
+              _context9.next = 35;
               break;
             }
             uploadAbortControllerRef.current["delete"](file.name);
-            return _context7.abrupt("return");
+            return _context9.abrupt("return");
           case 35:
-            handleFileOrImageUploadError(_context7.t0, false, id);
+            handleFileOrImageUploadError(_context9.t0, false, id);
           case 36:
           case "end":
-            return _context7.stop();
+            return _context9.stop();
         }
-      }, _callee6, null, [[4, 30]]);
+      }, _callee8, null, [[4, 30]]);
     }));
-    return function uploadFile(_x) {
-      return _ref9.apply(this, arguments);
+    return function uploadFile(_x3) {
+      return _ref11.apply(this, arguments);
     };
   }();
   var uploadImage = function () {
-    var _ref11 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee7(_ref10) {
+    var _ref13 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee9(_ref12) {
       var _file$name;
-      var newImage, _ref12, file, id, response, uri, filename, compressedUri, contentType, newImageUploads;
-      return _regenerator["default"].wrap(function _callee7$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+      var newImage, _ref14, file, id, response, uri, filename, compressedUri, contentType, newImageUploads;
+      return _regenerator["default"].wrap(function _callee9$(_context10) {
+        while (1) switch (_context10.prev = _context10.next) {
           case 0:
-            newImage = _ref10.newImage;
-            _ref12 = newImage || {}, file = _ref12.file, id = _ref12.id;
+            newImage = _ref12.newImage;
+            _ref14 = newImage || {}, file = _ref14.file, id = _ref14.id;
             if (file) {
-              _context8.next = 4;
+              _context10.next = 4;
               break;
             }
-            return _context8.abrupt("return");
+            return _context10.abrupt("return");
           case 4:
             response = {};
             uri = file.uri || '';
             filename = (_file$name = file.name) != null ? _file$name : (0, _utils2.getFileNameFromPath)(uri);
-            _context8.prev = 7;
-            _context8.next = 10;
+            _context10.prev = 7;
+            _context10.next = 10;
             return (0, _compressImage.compressedImageURI)(file, value.compressImageQuality);
           case 10:
-            compressedUri = _context8.sent;
+            compressedUri = _context10.sent;
             contentType = (0, _mimeTypes.lookup)(filename) || 'multipart/form-data';
             if (!value.doImageUploadRequest) {
-              _context8.next = 18;
+              _context10.next = 18;
               break;
             }
-            _context8.next = 15;
+            _context10.next = 15;
             return value.doImageUploadRequest(file, channel);
           case 15:
-            response = _context8.sent;
-            _context8.next = 29;
+            response = _context10.sent;
+            _context10.next = 29;
             break;
           case 18:
             if (!(compressedUri && channel)) {
-              _context8.next = 29;
+              _context10.next = 29;
               break;
             }
             if (!value.sendImageAsync) {
-              _context8.next = 24;
+              _context10.next = 24;
               break;
             }
             uploadAbortControllerRef.current.set(filename, client.createAbortControllerForNextRequest());
@@ -977,14 +1012,14 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
             }, function () {
               uploadAbortControllerRef.current["delete"](filename);
             });
-            _context8.next = 29;
+            _context10.next = 29;
             break;
           case 24:
             uploadAbortControllerRef.current.set(filename, client.createAbortControllerForNextRequest());
-            _context8.next = 27;
+            _context10.next = 27;
             return channel.sendImage(compressedUri, filename, contentType);
           case 27:
-            response = _context8.sent;
+            response = _context10.sent;
             uploadAbortControllerRef.current["delete"](filename);
           case 29:
             if (Object.keys(response).length) {
@@ -995,37 +1030,37 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
               });
               setImageUploads(newImageUploads);
             }
-            _context8.next = 38;
+            _context10.next = 38;
             break;
           case 32:
-            _context8.prev = 32;
-            _context8.t0 = _context8["catch"](7);
-            if (!(_context8.t0 instanceof Error && (_context8.t0.name === 'AbortError' || _context8.t0.name === 'CanceledError'))) {
-              _context8.next = 37;
+            _context10.prev = 32;
+            _context10.t0 = _context10["catch"](7);
+            if (!(_context10.t0 instanceof Error && (_context10.t0.name === 'AbortError' || _context10.t0.name === 'CanceledError'))) {
+              _context10.next = 37;
               break;
             }
             uploadAbortControllerRef.current["delete"](filename);
-            return _context8.abrupt("return");
+            return _context10.abrupt("return");
           case 37:
-            handleFileOrImageUploadError(_context8.t0, true, id);
+            handleFileOrImageUploadError(_context10.t0, true, id);
           case 38:
           case "end":
-            return _context8.stop();
+            return _context10.stop();
         }
-      }, _callee7, null, [[7, 32]]);
+      }, _callee9, null, [[7, 32]]);
     }));
-    return function uploadImage(_x2) {
-      return _ref11.apply(this, arguments);
+    return function uploadImage(_x4) {
+      return _ref13.apply(this, arguments);
     };
   }();
   var uploadNewFile = function () {
-    var _ref13 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee8(file) {
-      var _file$mimeType2;
-      var id, fileConfig, size_limit, isAllowed, sizeLimit, fileState, fileType, newFile;
-      return _regenerator["default"].wrap(function _callee8$(_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
+    var _ref15 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee10(file) {
+      var _file$mimeType2, _id, fileConfig, size_limit, isAllowed, sizeLimit, fileState, fileType, newFile;
+      return _regenerator["default"].wrap(function _callee10$(_context11) {
+        while (1) switch (_context11.prev = _context11.next) {
           case 0:
-            id = (0, _utils2.generateRandomId)();
+            _context11.prev = 0;
+            _id = (0, _utils2.generateRandomId)();
             fileConfig = getFileUploadConfig();
             size_limit = fileConfig.size_limit;
             isAllowed = (0, _utils.isUploadAllowed)({
@@ -1034,7 +1069,7 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
             });
             sizeLimit = size_limit || _utils.MAX_FILE_SIZE_TO_UPLOAD;
             if (!(file.size && file.size > sizeLimit)) {
-              _context9.next = 9;
+              _context11.next = 10;
               break;
             }
             _reactNative.Alert.alert(t('File is too large: {{ size }}, maximum upload size is {{ limit }}', {
@@ -1044,46 +1079,58 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
             setSelectedFiles(selectedFiles.filter(function (selectedFile) {
               return selectedFile.uri !== file.uri;
             }));
-            return _context9.abrupt("return");
-          case 9:
+            return _context11.abrupt("return");
+          case 10:
             fileState = isAllowed ? _utils2.FileState.UPLOADING : _utils2.FileState.NOT_SUPPORTED;
             fileType = file.type || ((_file$mimeType2 = file.mimeType) == null ? void 0 : _file$mimeType2.split('/')[0]);
             newFile = {
               duration: file.duration || 0,
               file: file,
-              id: file.id || id,
+              id: file.id || _id,
               state: fileState,
-              type: fileType
+              type: fileType,
+              url: file.uri
             };
-            _context9.next = 14;
+            _context11.next = 15;
             return Promise.all([setFileUploads(function (prevFileUploads) {
               return prevFileUploads.concat([newFile]);
             }), setNumberOfUploads(function (prevNumberOfUploads) {
               return prevNumberOfUploads + 1;
             })]);
-          case 14:
-            if (isAllowed) {
-              uploadFile({
-                newFile: newFile
-              });
-            }
           case 15:
+            if (!isAllowed) {
+              _context11.next = 18;
+              break;
+            }
+            _context11.next = 18;
+            return uploadFile({
+              newFile: newFile
+            });
+          case 18:
+            _context11.next = 23;
+            break;
+          case 20:
+            _context11.prev = 20;
+            _context11.t0 = _context11["catch"](0);
+            console.log('Error uploading file', _context11.t0);
+          case 23:
           case "end":
-            return _context9.stop();
+            return _context11.stop();
         }
-      }, _callee8);
+      }, _callee10, null, [[0, 20]]);
     }));
-    return function uploadNewFile(_x3) {
-      return _ref13.apply(this, arguments);
+    return function uploadNewFile(_x5) {
+      return _ref15.apply(this, arguments);
     };
   }();
   var uploadNewImage = function () {
-    var _ref14 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee9(image) {
-      var id, imageUploadConfig, size_limit, isAllowed, sizeLimit, imageState, newImage;
-      return _regenerator["default"].wrap(function _callee9$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
+    var _ref16 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee11(image) {
+      var _id2, imageUploadConfig, size_limit, isAllowed, sizeLimit, imageState, newImage;
+      return _regenerator["default"].wrap(function _callee11$(_context12) {
+        while (1) switch (_context12.prev = _context12.next) {
           case 0:
-            id = (0, _utils2.generateRandomId)();
+            _context12.prev = 0;
+            _id2 = (0, _utils2.generateRandomId)();
             imageUploadConfig = getImageUploadConfig();
             size_limit = imageUploadConfig.size_limit;
             isAllowed = (0, _utils.isUploadAllowed)({
@@ -1092,7 +1139,7 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
             });
             sizeLimit = size_limit || _utils.MAX_FILE_SIZE_TO_UPLOAD;
             if (!(image.size && (image == null ? void 0 : image.size) > sizeLimit)) {
-              _context10.next = 9;
+              _context12.next = 10;
               break;
             }
             _reactNative.Alert.alert(t('File is too large: {{ size }}, maximum upload size is {{ limit }}', {
@@ -1102,37 +1149,47 @@ var MessageInputProvider = function MessageInputProvider(_ref) {
             setSelectedImages(selectedImages.filter(function (selectedImage) {
               return selectedImage.uri !== image.uri;
             }));
-            return _context10.abrupt("return");
-          case 9:
+            return _context12.abrupt("return");
+          case 10:
             imageState = isAllowed ? _utils2.FileState.UPLOADING : _utils2.FileState.NOT_SUPPORTED;
             newImage = {
               file: image,
               height: image.height,
-              id: id,
+              id: _id2,
               state: imageState,
               url: image.uri,
               width: image.width
             };
-            _context10.next = 13;
+            _context12.next = 14;
             return Promise.all([setImageUploads(function (prevImageUploads) {
               return prevImageUploads.concat([newImage]);
             }), setNumberOfUploads(function (prevNumberOfUploads) {
               return prevNumberOfUploads + 1;
             })]);
-          case 13:
-            if (isAllowed) {
-              uploadImage({
-                newImage: newImage
-              });
-            }
           case 14:
+            if (!isAllowed) {
+              _context12.next = 17;
+              break;
+            }
+            _context12.next = 17;
+            return uploadImage({
+              newImage: newImage
+            });
+          case 17:
+            _context12.next = 22;
+            break;
+          case 19:
+            _context12.prev = 19;
+            _context12.t0 = _context12["catch"](0);
+            console.log('Error uploading image', _context12.t0);
+          case 22:
           case "end":
-            return _context10.stop();
+            return _context12.stop();
         }
-      }, _callee9);
+      }, _callee11, null, [[0, 19]]);
     }));
-    return function uploadNewImage(_x4) {
-      return _ref14.apply(this, arguments);
+    return function uploadNewImage(_x6) {
+      return _ref16.apply(this, arguments);
     };
   }();
   var messageInputContext = (0, _useCreateMessageInputContext.useCreateMessageInputContext)(Object.assign({