From 64e8f96da449c00f8660e56146a09f0b77a97bdd Mon Sep 17 00:00:00 2001
From: AP <potdevin.anthony@gmail.com>
Date: Fri, 12 Jun 2020 18:07:58 +0200
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20correct=20hop=20public=20?=
 =?UTF-8?q?key?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/generic/helpers.tsx                        | 2 +-
 src/graphql/queries/__generated__/getResume.generated.tsx | 3 ++-
 src/graphql/queries/getResume.ts                          | 1 +
 src/views/home/quickActions/decode/Decoded.tsx            | 2 +-
 src/views/transactions/PaymentsCards.tsx                  | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/generic/helpers.tsx b/src/components/generic/helpers.tsx
index d74069f2..1311bac1 100644
--- a/src/components/generic/helpers.tsx
+++ b/src/components/generic/helpers.tsx
@@ -68,7 +68,7 @@ export const getWithCopy = (text: string) => {
 };
 
 export const getNodeLink = (publicKey: string, alias?: string) => {
-  if (alias && alias === 'Node not found') {
+  if (!publicKey || (alias && alias === 'Node not found')) {
     return 'Node not found';
   }
   const link = `${appUrls.oneml}${publicKey}`;
diff --git a/src/graphql/queries/__generated__/getResume.generated.tsx b/src/graphql/queries/__generated__/getResume.generated.tsx
index b4848bf0..b371e394 100644
--- a/src/graphql/queries/__generated__/getResume.generated.tsx
+++ b/src/graphql/queries/__generated__/getResume.generated.tsx
@@ -72,7 +72,7 @@ export type GetResumeQuery = { __typename?: 'Query' } & {
                             node?: Types.Maybe<
                               { __typename?: 'nodeType' } & Pick<
                                 Types.NodeType,
-                                'alias'
+                                'alias' | 'public_key'
                               >
                             >;
                           }
@@ -126,6 +126,7 @@ export const GetResumeDocument = gql`
           hops {
             node {
               alias
+              public_key
             }
           }
           id
diff --git a/src/graphql/queries/getResume.ts b/src/graphql/queries/getResume.ts
index 6de4f5f5..e1bc7faa 100644
--- a/src/graphql/queries/getResume.ts
+++ b/src/graphql/queries/getResume.ts
@@ -39,6 +39,7 @@ export const GET_RESUME = gql`
           hops {
             node {
               alias
+              public_key
             }
           }
           id
diff --git a/src/views/home/quickActions/decode/Decoded.tsx b/src/views/home/quickActions/decode/Decoded.tsx
index 0bdd2c81..76dfe139 100644
--- a/src/views/home/quickActions/decode/Decoded.tsx
+++ b/src/views/home/quickActions/decode/Decoded.tsx
@@ -89,7 +89,7 @@ export const Decoded = ({ request, setShow }: DecodedProps) => {
               {renderLine('Forwarded Tokens', hop.forward)}
               {renderLine(
                 `Destination `,
-                getNodeLink(destination, hop.node.node.alias)
+                getNodeLink(hop.public_key, hop.node.node.alias)
               )}
               {renderLine('Channel', hop.channel)}
               {renderLine(
diff --git a/src/views/transactions/PaymentsCards.tsx b/src/views/transactions/PaymentsCards.tsx
index 261b997c..f33fb809 100644
--- a/src/views/transactions/PaymentsCards.tsx
+++ b/src/views/transactions/PaymentsCards.tsx
@@ -82,7 +82,7 @@ export const PaymentsCard = ({
         {hops.map((hop, index: number) =>
           renderLine(
             `Hop ${index + 1}:`,
-            getNodeLink(destination, hop.node.alias)
+            getNodeLink(hop.node.public_key, hop.node.alias)
           )
         )}
         {renderLine('Id:', id)}