       name = "#{@state.team.get 'slug'}-logo-#{Date.now()}.png"
       mimeType = file.type
       content = file
-      TeamFlux.actions.uploads3({ name, content, mimeType }).then ({ url }) =>
+      TeamFlux.actions.uploads3({ name, content, mimeType })
+      .then ({ url }) =>
         dataToUpdate =
           customize:
             logo: url
         @updateTeam { dataToUpdate }
 
-      .catch ({ err }) ->
+      .timeout 15000
+
+      .catch ({ err }) =>
         showError err  if err
+        showError 'There was a problem while uploading your logo, please try again later!'  unless err
+        @setState { loading: no }
 
     reader.readAsDataURL file
 

      teamNameChanged={@state.teamNameChanged}
      canEdit={@state.canEdit}
      loading={@state.loading}
      logopath={@state.logopath}
      onUploadInput={@bound 'onUploadInput'}
      onClickLogo={@bound 'onClickLogo'}
      onRemoveLogo={@bound 'onRemoveLogo'}

View            = require './view'
Encoder         = require 'htmlencode'
showError       = require 'app/util/showError'
DEFAULT_LOGOPATH = '/a/images/logos/sidebar_footer_logo.svg'

notify = (title, duration = 5000) -> new kd.NotificationView { title, duration }

