Merge pull request #798 from Marvel-Ib/ch-show-route-hint-if-available

Add route hint to copy button on person's profile if available
stakwork · Oct 27, 2023 · d4cedd3 · d4cedd3
2 parents 66c9285 + 584f261
commit d4cedd3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/frontend/app/src/people/interfaces.ts b/frontend/app/src/people/interfaces.ts
@@ -385,6 +385,7 @@ export interface AboutViewProps {
   owner_pubkey?: string;
   description?: string;
   canEdit?: boolean;
+  owner_route_hint?: string;
 }
 
 export interface BlogViewProps {

diff --git a/frontend/app/src/people/utils/ConnectCard.tsx b/frontend/app/src/people/utils/ConnectCard.tsx
@@ -95,6 +95,8 @@ export default function ConnectCard(props: ConnectCardProps) {
   const showAssignModal = () => setAssignModal(true);
 
   const qrString = person && person?.owner_pubkey ? makeConnectQR(person?.owner_pubkey) : '';
+  const ownerPubkey = person && person?.owner_pubkey ? `${person.owner_pubkey}` : '';
+  const routeHint = person && person?.owner_route_hint ? `:${person.owner_route_hint}` : '';
 
   return (
     <div onClick={(e: any) => e.stopPropagation()}>
@@ -124,7 +126,7 @@ export default function ConnectCard(props: ConnectCardProps) {
 
             <>
               {person?.owner_pubkey && (
-                <QrBar value={person?.owner_pubkey} simple style={{ marginTop: 11 }} />
+                <QrBar value={`${ownerPubkey}${routeHint}`} simple style={{ marginTop: 11 }} />
               )}
             </>
             <Button

diff --git a/frontend/app/src/people/widgetViews/AboutView.tsx b/frontend/app/src/people/widgetViews/AboutView.tsx
@@ -218,7 +218,7 @@ const Img = styled.div<ImageProps>`
 `;
 export const AboutView = observer((props: AboutViewProps) => {
   const history = useHistory();
-  const { price_to_meet, extras, twitter_confirmed, owner_pubkey } = props;
+  const { price_to_meet, extras, twitter_confirmed, owner_pubkey, owner_route_hint } = props;
   const { twitter, github, coding_languages, tribes, repos, lightning, amboss, email } =
     extras || {};
 
@@ -264,7 +264,7 @@ export const AboutView = observer((props: AboutViewProps) => {
 
       <Divider />
 
-      {owner_pubkey && <QrBar value={owner_pubkey} />}
+      {owner_pubkey && <QrBar value={`${owner_pubkey}:${owner_route_hint}`} />}
 
       {tag && (
         <>

diff --git a/frontend/app/src/store/ui.ts b/frontend/app/src/store/ui.ts
@@ -19,6 +19,7 @@ export interface MeInfo {
   pubkey: string;
   uuid?: string;
   owner_pubkey?: string;
+  owner_route_hint?: string;
   photo_url: string;
   alias: string;
   img?: string;