Use && operator to render JSX conditionally where possible

Use && operator to render JSX conditionally where possible #2509