Merge branch 'main' into feature/analytics-id

# Conflicts:
#	apps/research/src/components/article/article-payments/ProCheckoutCard.tsx

.firebaserc

@@ -19,6 +19,9 @@
         ],
         "k33-auth-dev": [
           "k33-auth-dev"
+        ],
+        "k33-dev": [
+          "k33-dev"
         ]
       }
     },
@@ -38,6 +41,9 @@
         ],
         "k33-auth": [
           "k33-auth"
+        ],
+        "k33-prod": [
+          "k33-prod"
         ]
       }
     }

DEPLOY.md

@@ -21,6 +21,7 @@ firebase deploy --only hosting:k33-research-dev
 firebase deploy --only hosting:k33-research-archive-dev
 firebase deploy --only hosting:k33-invest-dev
 firebase deploy --only hosting:k33-auth-dev
+firebase deploy --only hosting:k33-dev
 ```
 
 ## k33-prod
@@ -31,4 +32,5 @@ firebase deploy --only hosting:k33-research
 firebase deploy --only hosting:k33-research-archive
 firebase deploy --only hosting:k33-invest
 firebase deploy --only hosting:k33-auth
+firebase deploy --only hosting:k33-prod
 ```

apps/invest/src/components/FundPromotion.tsx

@@ -24,9 +24,7 @@ const FundPromotion: React.FC = () => {
           id="analyst-information"
           className="flex-col gap-2 text-label-light-primary self-center py-10"
         >
-          <h5 className="md:text-heading5 text-heading7">
-            Talk to our analysts
-          </h5>
+          <h5 className="md:text-heading5 text-heading7">fund managers</h5>
           <p className="text-body2">
             Book a call 1-1 with us. Let us help you understand the digital
             assets industry.

apps/invest/src/pages/home.tsx

@@ -36,10 +36,10 @@ const fundCards = {
   },
   position: {
     title: 'position and Near Term Outlook',
-    date: 'June 2023',
+    date: 'September 2023',
     subtitle: '',
     description: [
-      "The charges against Coinbase and Binance by the SEC may have affected the market, but the Bitcoin ETF application from Blackrock, Deutsche Bank's license application to do crypto custody, and the operational launch of EDX Markets backed by Fidelity, Citadel, and Schwab, sends a clear and positive signal. While we maintain the expectation of a sideways market in the short term, the long term view is bullish, driven by underlying adoption.",
+      'Our outlook for the next 6-12 months remains positive, with several important dates lined up. There is a high probability that BTC gets its first spot ETF in the coming 6 months and one could argue that the Grayscale victory made the probability go up further. Ethereum also has upcoming deadlines for futures ETFs and a spot ETH ETF application has been filed. Ethereum is gearing up for an upgrade that will have a positive impact on rollups that use Ethereum as their L1. A spot ETF for Bitcoin is a very positive development and so far the market has not fully internalised the magnitude of the development.',
     ],
   },
   summary: {
@@ -213,7 +213,47 @@ const Home: NextPageWithLayout = () => {
               date="Monthly Performance of K33 vs. Bitcoin"
             >
               <Image src={content} alt="" />
-              <div></div>
+              <table className="bg-white border-separate max-w-[300px] self-center">
+                <thead className="text-caption text-label-light-primary">
+                  <tr>
+                    <th className="text-left px-2 py-1"></th>
+                    <th className="text-left px-2 py-1">K33</th>
+                    <th className="text-left px-2 py-1">BTC</th>
+                  </tr>
+                </thead>
+                <tbody className="text-label-light-secondary text-body3">
+                  <tr>
+                    <td className="px-2 py-1">Year to Date</td>
+                    <td className="px-2 py-1">48.84%</td>
+                    <td className="px-2 py-1">56.75%</td>
+                  </tr>
+                  <tr>
+                    <td className="px-2 py-1">1 Month</td>
+                    <td className="px-2 py-1">-9.97%</td>
+                    <td className="px-2 py-1">-11.31%</td>
+                  </tr>
+                  <tr>
+                    <td className="px-2 py-1">3 Months</td>
+                    <td className="px-2 py-1">-7.84%</td>
+                    <td className="px-2 py-1">-4.84%</td>
+                  </tr>
+                  <tr>
+                    <td className="px-2 py-1">6 Months</td>
+                    <td className="px-2 py-1">6.38%</td>
+                    <td className="px-2 py-1">11.97%</td>
+                  </tr>
+                  <tr>
+                    <td className="px-2 py-1">1 Year</td>
+                    <td className="px-2 py-1">23.31%</td>
+                    <td className="px-2 py-1">29.48%</td>
+                  </tr>
+                  <tr>
+                    <td className="px-2 py-1">Launch to Date</td>
+                    <td className="px-2 py-1">324.40%</td>
+                    <td className="px-2 py-1">232.59%</td>
+                  </tr>
+                </tbody>
+              </table>
             </FundCard>
             <div className="flex flex-col md:gap-4 gap-8">
               <FundCard title={fundCards.summary.title} date={''}>

apps/research/src/components/article/article-actions/styles.module.scss

@@ -14,6 +14,7 @@
   align-items: flex-start;
   padding: 8px;
   position: relative;
+  gap: 8px;
 }
 
 .fadeOut {

apps/research/src/components/article/article-payments/ProCheckoutCard.tsx

@@ -11,6 +11,7 @@ import {
 } from 'antd';
 import { CheckCircleFilled } from '@ant-design/icons';
 import { usePlan } from '@/hooks';
+import { proFeatures } from '@/utils';
 
 const { Title, Text } = Typography;
 const { useToken } = theme;
@@ -162,7 +163,7 @@ const ProCheckoutCard: React.FC<ProCheckoutCardProps> = ({
               padding: 0,
               paddingBottom: 16,
             }}
-            dataSource={features}
+            dataSource={proFeatures}
             renderItem={(feat) => (
               <List.Item
                 style={{

apps/research/src/components/platform/PricingTable.tsx

@@ -11,6 +11,7 @@ import { appStructure } from '@/config';
 import Link from 'next/link';
 import PricingCard from './PricingCard';
 import { setTwoToneColor } from '@ant-design/icons';
+import { proFeatures } from '@/utils';
 
 setTwoToneColor('#777777');
 
@@ -199,7 +200,7 @@ const PricingTable = () => {
                 state: 'active',
               })}
             plan="PRO Plan"
-            features={proPlanFeatures}
+            features={proFeatures}
             price="50"
             action={
               <>
@@ -230,7 +231,7 @@ const PricingTable = () => {
               productStatus.state === 'active' && {
                 state: 'active',
               })}
-            features={proPlanFeatures}
+            features={proFeatures}
             price="500"
             promotions={<Tag color="blue">Save $100</Tag>}
             action={

apps/research/src/utils/index.ts

@@ -63,3 +63,9 @@ export function isBrowser() {
 
 export * from './share';
 export * from './markdown';
+
+export const proFeatures = [
+  'Ahead of the Curve – The Weekly Market Report',
+  'Navigating Narratives – The Weekly DeFi Research Note',
+  'This Week in Crypto – The Weekly Crypto Industry Newsletter',
+];

firebase.json

@@ -123,6 +123,18 @@
       "cleanUrls": true,
       "public": "./apps/auth/out",
       "ignore": ["firebase.json", "**/.*", "**/node_modules/**"]
+    },
+    {
+      "target": "k33-dev",
+      "cleanUrls": true,
+      "public": "./empty",
+      "ignore": ["firebase.json", "**/.*", "**/node_modules/**"]
+    },
+    {
+      "target": "k33-prod",
+      "cleanUrls": true,
+      "public": "./empty",
+      "ignore": ["firebase.json", "**/.*", "**/node_modules/**"]
     }
   ]
 }