yarn upgrade && yarn format-all

src/components/Blog/Feed/Item/index.tsx

@@ -67,7 +67,7 @@ const Item: React.FC<IBlogFeedItemProps> = ({
     >
       <Link href={slug} className={styles.pictureLink}>
         {picture ? (
-          <Image fluid={image} className={styles.picture} />
+          image && <Image fluid={image} className={styles.picture} />
         ) : (
           <Placeholder className={styles.picture} />
         )}

src/components/Blog/Post/HeroPic/index.tsx

@@ -2,34 +2,42 @@ import Image from 'gatsby-image'
 import React from 'react'
 
 import { BLOG } from '../../../../consts'
-import {
-  IBlogPostHeroPic,
-  IGatsbyImageProps
-} from '../../../../templates/blog-post'
+import { IFluidObject } from '../../../../templates/blog-post'
 
 import styles from './styles.module.css'
 
-const NonStretchedImage: React.FC<IGatsbyImageProps> = props => {
-  let normalizedProps = props
+interface INonStretchedImageProps {
+  fluid: IFluidObject
+  style?: object
+}
+
+interface IHeroPicProps {
+  picture: {
+    fluid: IFluidObject
+  }
+  pictureComment?: string
+}
+
+const NonStretchedImage: React.FC<INonStretchedImageProps> = props => {
+  let style = {}
   if (props.fluid && props.fluid.presentationWidth) {
-    const presetantionWidth = props.fluid?.presentationWidth
+    const presetantionWidth = props.fluid.presentationWidth
     const width =
       presetantionWidth < BLOG.imageMaxWidthHero
         ? presetantionWidth / 2
         : presetantionWidth
-    normalizedProps = {
-      ...props,
-      style: {
-        ...(props.style || {}),
-        maxWidth: width,
-        margin: '0 auto'
-      }
+    style = {
+      ...(props.style || {}),
+
+      maxWidth: width,
+      margin: '0 auto'
     }
   }
-  return <Image {...normalizedProps} />
+
+  return <Image style={style} {...props} />
 }
 
-const HeroPic: React.FC<IBlogPostHeroPic> = ({ pictureComment, picture }) => {
+const HeroPic: React.FC<IHeroPicProps> = ({ pictureComment, picture }) => {
   return (
     <div className={styles.pictureWrapper}>
       <div className={styles.picture}>

src/templates/blog-post.tsx

@@ -1,4 +1,4 @@
-import { FixedObject, FluidObject, GatsbyImageProps } from 'gatsby-image'
+import { FixedObject, FluidObject } from 'gatsby-image'
 
 import { graphql } from 'gatsby'
 import React from 'react'
@@ -8,22 +8,11 @@ import Post from '../components/Blog/Post'
 
 import { ISocialIcon } from '../components/SocialIcon'
 
-interface IFluidObject extends FluidObject {
+export interface IFluidObject extends FluidObject {
   presentationWidth: number
   presentationHeight: number
 }
 
-export interface IGatsbyImageProps extends GatsbyImageProps {
-  fluid?: IFluidObject
-}
-
-export interface IBlogPostHeroPic {
-  picture?: {
-    fluid: IFluidObject
-  }
-  pictureComment?: string
-}
-
 export interface IBlogPostData {
   id: string
   html: string