From ffadf5718dbad49e31b574433f015783b9c250a1 Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde@tlon.io>
Date: Wed, 19 Aug 2020 21:44:45 -0400
Subject: [PATCH] links: use tabbar in links-list, settings

---
 .../views/apps/links/components/links-list.js  | 12 ++++++------
 .../views/apps/links/components/settings.js    | 18 ++++++++++++++----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/pkg/interface/src/views/apps/links/components/links-list.js b/pkg/interface/src/views/apps/links/components/links-list.js
index 577b3ee05..822b558af 100644
--- a/pkg/interface/src/views/apps/links/components/links-list.js
+++ b/pkg/interface/src/views/apps/links/components/links-list.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 
 import { LoadingScreen } from './loading';
 import { MessageScreen } from './lib/message-screen';
-import { LinksTabBar } from './lib/links-tabbar';
+import { TabBar } from '~/views/components/chat-link-tabbar';
 import { SidebarSwitcher } from '~/views/components/SidebarSwitch';
 import { Link } from 'react-router-dom';
 import { LinkItem } from './lib/link-item';
@@ -127,11 +127,11 @@ export class Links extends Component {
              {props.resource.metadata.title}
            </h2>
          </Link>
-          <LinksTabBar
-          {...props}
-          popout={props.popout}
-          page={props.page}
-          resourcePath={props.resourcePath}
+          <TabBar
+            location={props.location}
+            popout={props.popout}
+            popoutHref={makeRoutePath(props.resourcePath, true, props.page)}
+            settings={makeRoutePath(props.resourcePath, props.popout) + '/settings'}
           />
         </div>
         <div className="w-100 mt6 flex justify-center overflow-y-scroll ph4 pb4">
diff --git a/pkg/interface/src/views/apps/links/components/settings.js b/pkg/interface/src/views/apps/links/components/settings.js
index d0f0517f7..cde12519d 100644
--- a/pkg/interface/src/views/apps/links/components/settings.js
+++ b/pkg/interface/src/views/apps/links/components/settings.js
@@ -5,7 +5,7 @@ import { Link } from 'react-router-dom';
 
 import { LoadingScreen } from './loading';
 import { Spinner } from '~/views/components/Spinner';
-import { LinksTabBar } from './lib/links-tabbar';
+import { TabBar } from '~/views/components/chat-link-tabbar';
 import SidebarSwitcher from '~/views/components/SidebarSwitch';
 
 import { MetadataSettings } from '~/views/components/metadata/settings';
@@ -154,7 +154,12 @@ export class SettingsScreen extends Component {
                 {props.resource.metadata.title}
               </h2>
             </Link>
-            <LinksTabBar {...props} />
+            <TabBar
+              location={props.location}
+              popout={props.popout}
+              popoutHref={makeRoutePath(props.resourcePath, true, props.page)}
+              settings={makeRoutePath(props.resourcePath, props.popout) + '/settings'}
+            />
           </div>
           <div className="w-100 pl3 mt4 cf">
             <h2 className="f8 pb2">Removing...</h2>
@@ -190,8 +195,13 @@ export class SettingsScreen extends Component {
               {props.resource.metadata.title}
             </h2>
           </Link>
-          <LinksTabBar {...props} />
-        </div>
+          <TabBar
+            location={props.location}
+            popout={props.popout}
+            popoutHref={makeRoutePath(props.resourcePath, true, props.page)}
+            settings={makeRoutePath(props.resourcePath, props.popout) + '/settings'}
+          />
+          </div>
         <div className="w-100 pl3 mt4 cf">
           <h2 className="f8 pb2">Collection Settings</h2>
           <p className="f8 mt3 lh-copy db">Mark all links as read</p>