Fixed failing tests

...ascripts/diff_notes/components/resolve_comment_btn.js.es6

...ripts/diff_notes/components/resolve_discussion_btn.js.es6

app/assets/javascripts/diff_notes/diff_notes_bundle.js.es6

app/assets/javascripts/diff_notes/models/disucssion.js.es6

app/assets/javascripts/diff_notes/models/note.js.es6

app/assets/javascripts/diff_notes/services/resolve.js.es6

app/assets/javascripts/diff_notes/stores/comments.js.es6

app/views/projects/notes/_note.html.haml

spec/features/merge_requests/diff_notes_resolve_spec.rb