merge conflict resolve

frontend/src/pages/activity/[id].tsx

@@ -1,4 +1,5 @@
 import React, { useEffect, useState } from 'react';
+import Head from 'next/head';
 import { useRouter } from 'next/router';
 import { useTranslation } from 'next-i18next';
 
@@ -125,7 +126,12 @@ export default function Activity() {
 
   return (
     <div className="mx-6 lg:mx-0 w-full h-screen">
-      <NavHeader pageName="Project Activity" isProjectRelated />
+      <Head>
+        <title>Audit Logs</title>
+        <link rel="icon" href="/infisical.ico" />
+        <meta property="og:image" content="/images/message.png" />
+      </Head>
+      <NavHeader pageName="Audit Logs" isProjectRelated />
       {currentSidebarAction && (
         <ActivitySideBar toggleSidebar={toggleSidebar} currentAction={currentSidebarAction} />
       )}

frontend/src/pages/integrations/travisci/authorize.tsx

@@ -47,9 +47,9 @@ export default function TravisCICreateIntegrationPage() {
     return (
     <div className="h-full w-full flex justify-center items-center">
       <Card className="max-w-md p-8 rounded-md">
-        <CardTitle className='text-center'>TravisCI Integration</CardTitle>
+        <CardTitle className='text-center'>Travis CI Integration</CardTitle>
          <FormControl
-          label="Travis API Token"
+          label="Travis CI API Token"
           errorText={apiKeyErrorText}
           isError={apiKeyErrorText !== '' ?? false}
         >
@@ -65,7 +65,7 @@ export default function TravisCICreateIntegrationPage() {
             className='mt-4'
             isLoading={isLoading}
         >
-            Connect to TravisCI
+            Connect to Travis CI
         </Button>
       </Card>
     </div>

frontend/src/pages/integrations/travisci/create.tsx

@@ -73,7 +73,7 @@ export default function TravisCICreateIntegrationPage() {
     return (integrationAuth && workspace && selectedSourceEnvironment && integrationAuthApps && targetApp) ? (
     <div className="h-full w-full flex justify-center items-center">
       <Card className="max-w-md p-8 rounded-md">
-        <CardTitle className='text-center'>TravisCI Integration</CardTitle>
+        <CardTitle className='text-center'>Travis CI Integration</CardTitle>
         <FormControl
           label="Project Environment"
           className='mt-4'
@@ -91,7 +91,7 @@ export default function TravisCICreateIntegrationPage() {
           </Select>
         </FormControl>
         <FormControl
-          label="TravisCI Project"
+          label="Travis CI Project"
           className='mt-4'
         >
           <Select

frontend/src/pages/login.tsx

@@ -90,7 +90,7 @@ export default function Login() {
           <ListBox
             isSelected={lang}
             onChange={setLanguage}
-            data={['en', 'ko', 'fr', 'pt-BR']}
+            data={['en', 'ko', 'fr', 'pt-BR', 'pt-PT']}
             isFull
             text={`${t('common:language')}: `}
           />

frontend/src/pages/settings/billing/[id].tsx

@@ -77,13 +77,13 @@ export default function SettingsBilling() {
   }, []);
 
   return (
-    <div className="bg-bunker-800 max-h-screen flex flex-col justify-between text-white">
+    <div className="bg-bunker-800 pb-4 flex flex-col justify-between text-white">
       <Head>
         <title>{t('common:head-title', { title: t('billing:title') })}</title>
         <link rel="icon" href="/infisical.ico" />
       </Head>
       <div className="flex flex-row">
-        <div className="w-full max-h-screen pb-2 overflow-y-auto">
+        <div className="w-full pb-2">
           <NavHeader pageName={t('billing:title')} />
           <div className="flex flex-row justify-between items-center ml-6 my-8 text-xl max-w-5xl">
             <div className="flex flex-col justify-start items-start text-3xl">
@@ -93,7 +93,6 @@ export default function SettingsBilling() {
           </div>
           <div className="flex flex-col ml-6 text-mineshaft-50 w-max">
             <p className="text-xl font-semibold">{t('billing:subscription')}</p>
-            <div className="mt-4 text-bunker-200 h-14 flex justify-center items-center rounded-md bg-bunker-600 mr-4"> If you are looking to get an annual plan, please reach out to <a className="ml-1.5 underline text-primary underline-offset-2" href="mailto:[email protected]">team@infisical.com</a></div>
             <div className="grid grid-cols-2 grid-rows-2 gap-y-6 gap-x-3 mt-4 overflow-x-auto">
               {plans.map((plan) => (
                 <Plan key={plan.name} plan={plan} />