Post-merge updates and fixes

- Put back SETTINGS.LANGUAGE.
- Update import for `doResolveUris`.

ui/component/commentsList/index.js

@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
+import { doResolveUris } from 'redux/actions/claims';
 import {
-  doResolveUris,
   makeSelectClaimForUri,
   makeSelectClaimIsMine,
   selectFetchingMyChannels,

ui/component/commentsReplies/index.js

@@ -1,10 +1,6 @@
 import { connect } from 'react-redux';
-import {
-  makeSelectClaimIsMine,
-  selectMyChannelClaims,
-  makeSelectClaimForUri,
-  doResolveUris,
-} from 'redux/selectors/claims';
+import { doResolveUris } from 'redux/actions/claims';
+import { makeSelectClaimIsMine, selectMyChannelClaims, makeSelectClaimForUri } from 'redux/selectors/claims';
 import { selectIsFetchingCommentsByParentId, makeSelectRepliesForParentId } from 'redux/selectors/comments';
 import { selectUserVerifiedEmail } from 'redux/selectors/user';
 import CommentsReplies from './view';

ui/constants/shared_preferences.js

@@ -28,4 +28,5 @@ export const CLIENT_SYNC_KEYS = [
   SETTINGS.FLOATING_PLAYER,
   SETTINGS.DARK_MODE_TIMES,
   SETTINGS.AUTOMATIC_DARK_MODE_ENABLED,
+  SETTINGS.LANGUAGE,
 ];