diff --git a/src/ui/component/fileActions/view.jsx b/src/ui/component/fileActions/view.jsx
index f7e64bc5b..4cf88efda 100644
--- a/src/ui/component/fileActions/view.jsx
+++ b/src/ui/component/fileActions/view.jsx
@@ -19,11 +19,11 @@ type Props = {
 };
 
 class FileActions extends React.PureComponent<Props> {
-  MaximizeViewer() {
+  maximizeViewer = () => {
     // Get viewer container
     const viewer = document.getElementsByClassName('content__embedded')[0];
     viewer.webkitRequestFullscreen();
-  }
+  };
 
   render() {
     const { fileInfo, uri, openModal, claimIsMine, claimId, showFullscreen } = this.props;
@@ -33,14 +33,7 @@ class FileActions extends React.PureComponent<Props> {
       <React.Fragment>
         {showFullscreen && (
           <Tooltip onComponent body={__('Full screen (f)')}>
-            <Button
-              button="alt"
-              description={__('Fullscreen')}
-              icon={ICONS.FULLSCREEN}
-              onClick={() => {
-                this.MaximizeViewer();
-              }}
-            />
+            <Button button="alt" description={__('Fullscreen')} icon={ICONS.FULLSCREEN} onClick={this.maximizeViewer} />
           </Tooltip>
         )}
         {showDelete && (
diff --git a/src/ui/page/file/view.jsx b/src/ui/page/file/view.jsx
index 511677f55..74a417850 100644
--- a/src/ui/page/file/view.jsx
+++ b/src/ui/page/file/view.jsx
@@ -92,23 +92,8 @@ class FilePage extends React.Component<Props> {
     setViewed(uri);
   }
 
-  // This is now marked as a react lecacy method:
-  // https://reactjs.org/docs/react-component.html#unsafe_componentwillmount
-  UNSAFE_componentWillReceiveProps(nextProps: Props) {
-    const { fetchFileInfo, uri, setViewed } = this.props;
-    // @if TARGET='app'
-    if (nextProps.fileInfo === undefined) {
-      fetchFileInfo(uri);
-    }
-    // @endif
-
-    if (uri !== nextProps.uri) {
-      setViewed(nextProps.uri);
-    }
-  }
-
   componentDidUpdate(prevProps: Props) {
-    const { isSubscribed, claim, uri, fetchViewCount, claimIsMine } = this.props;
+    const { isSubscribed, claim, uri, fileInfo, setViewed, fetchViewCount, claimIsMine, fetchFileInfo } = this.props;
 
     if (!prevProps.isSubscribed && isSubscribed) {
       this.removeFromSubscriptionNotifications();
@@ -117,6 +102,16 @@ class FilePage extends React.Component<Props> {
     if (prevProps.uri !== uri && claimIsMine) {
       fetchViewCount(claim.claim_id);
     }
+
+    // @if TARGET='app'
+    if (fileInfo === undefined) {
+      fetchFileInfo(uri);
+    }
+    // @endif
+
+    if (prevProps.uri !== uri) {
+      setViewed(uri);
+    }
   }
 
   removeFromSubscriptionNotifications() {