From 28f44d943f0328df66c3fd52f4338e6b7cc343e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Se=CC=81rgio=20Ramos?= <mail@sergioramos.me>
Date: Thu, 4 Jan 2018 11:22:32 +0000
Subject: [PATCH] fix(my-joy-beta): fix custom image on summary

---
 .../my-joy-beta/src/components/instances/summary.js   | 11 +++++++----
 packages/my-joy-beta/src/graphql/get-instance.gql     |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/my-joy-beta/src/components/instances/summary.js b/packages/my-joy-beta/src/components/instances/summary.js
index 5f9676d7..691af44d 100644
--- a/packages/my-joy-beta/src/components/instances/summary.js
+++ b/packages/my-joy-beta/src/components/instances/summary.js
@@ -158,7 +158,9 @@ export const Meta = ({
   </Row>,
   <Margin top={2} bottom={3}>
     <Flex>
-      <Label>{image ? titleCase(image.name) : 'Custom Image'}</Label>
+      <Label>
+        {image && image.name ? titleCase(image.name) : 'Custom Image'}
+      </Label>
       <VerticalDivider />
       <Label>
         {brand === 'LX'
@@ -354,9 +356,10 @@ export default withTheme(
             />
             <CopiableField text={instance.id} label="ID" />
             <CopiableField text={instance.compute_node} label="CN UUID" />
-            {instance.image && (
-              <CopiableField text={instance.image.id} label="Image UUID" />
-            )}
+            {instance.image &&
+              instance.image.id && (
+                <CopiableField text={instance.image.id} label="Image UUID" />
+              )}
             <CopiableField
               text={`ssh root@${instance.primary_ip}`}
               label="Login"
diff --git a/packages/my-joy-beta/src/graphql/get-instance.gql b/packages/my-joy-beta/src/graphql/get-instance.gql
index 659ebaa5..ebbeb249 100644
--- a/packages/my-joy-beta/src/graphql/get-instance.gql
+++ b/packages/my-joy-beta/src/graphql/get-instance.gql
@@ -2,6 +2,7 @@ query instance($name: String) {
   machines(name: $name) {
     id
     state
+    brand
     name
     created
     updated