merge: staging

zeitgeistpm · Mar 2, 2024 · 188a724 · 188a724
2 parents 4f8847a + b7abe4f
commit 188a724
Show file tree

Hide file tree

Showing 122 changed files with 3,209 additions and 2,239 deletions.
diff --git a/.env.example b/.env.example
@@ -41,12 +41,15 @@ NEXT_PUBLIC_SITE_URL=http://localhost:3000
 # disable grillchat
 NEXT_PUBLIC_GRILLCHAT_DISABLE=true
 
-# web3auth client id
-NEXT_PUBLIC_WEB3AUTH_CLIENT_ID_ZTG=BHyRKGUvkWeDLXdLO1FBFZDqLtSMPuDN-zMWN1_Yb9KMZKWriIu-7ZxMBPBT72P-ER6FH_a-rlesWwY8Vgm0fjg
+# web3auth
+NEXT_PUBLIC_WEB3AUTH_CLIENT_ID=
+NEXT_PUBLIC_AUTH0_CLIENT_ID=
+NEXT_PUBLIC_DISCORD_CLIENT_ID=
+NEXT_PUBLIC_AUTH0_DOMAIN=
 
 NEXT_PUBLIC_OTHER_TAGS=["Coindesk"]
 
-NEXT_PUBLIC_COIN_GECKO_API_KEY=
+COIN_GECKO_API_KEY=
 
 # sanity cms config
 NEXT_PUBLIC_SANITY_PROJECT_ID="4wbnjof1"
@@ -55,3 +58,7 @@ NEXT_PUBLIC_SANITY_VERSION="2022-03-07"
 # enable topics
 NEXT_PUBLIC_SHOW_TOPICS=true
 
+# whitelisted creators of trusted markets
+# note: should be addresses of official zeitgeist markets or trusted third party creators.
+NEXT_PUBLIC_WHITELISTED_TRUSTED_CREATORS=["xxxxxx"]
+
diff --git a/components/account/Account.tsx b/components/account/Account.tsx
@@ -27,7 +27,7 @@ export const Account = () => {
       <Modal open={walletSelectModalOpen} onClose={closeWalletSelect}>
         <Dialog.Panel
           className="
-    w-full max-w-[564px]  rounded-ztg-10 bg-white p-[15px]"
+    w-full max-w-[450px]  rounded-lg bg-white p-8"
         >
           <WalletSelect />
         </Dialog.Panel>

diff --git a/components/account/AccountButton.tsx b/components/account/AccountButton.tsx
@@ -13,7 +13,6 @@ import { useUserLocation } from "lib/hooks/useUserLocation";
 import { useWallet } from "lib/state/wallet";
 import { formatNumberLocalized, shortenAddress } from "lib/util";
 import { FaNetworkWired } from "react-icons/fa";
-
 import Link from "next/link";
 import { useRouter } from "next/router";
 import React, { FC, Fragment, PropsWithChildren, useState } from "react";
@@ -27,10 +26,7 @@ import {
   User,
 } from "react-feather";
 import { useChainConstants } from "../../lib/hooks/queries/useChainConstants";
-import {
-  DesktopOnboardingModal,
-  MobileOnboardingModal,
-} from "./OnboardingModal";
+import { DesktopOnboardingModal } from "./OnboardingModal";
 import SettingsModal from "components/settings/SettingsModal";
 import CopyIcon from "../ui/CopyIcon";
 
@@ -89,6 +85,7 @@ const AccountButton: FC<{
     isNovaWallet,
     getProxyFor,
     realAddress,
+    walletId,
   } = useWallet();
   const proxy = getProxyFor(activeAccount?.address);
 
@@ -106,11 +103,6 @@ const AccountButton: FC<{
 
   const { data: constants } = useChainConstants();
 
-  const isMobileDevice =
-    /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(
-      navigator.userAgent,
-    );
-
   const connect = async () => {
     if (isNovaWallet) {
       selectWallet("polkadot-js");
@@ -342,7 +334,9 @@ const AccountButton: FC<{
                             <div
                               className="mb-3 flex items-center px-6 hover:bg-slate-100"
                               onClick={() => {
-                                accountModals.openAccountSelect();
+                                walletId === "web3auth"
+                                  ? accountModals.openWalletSelect()
+                                  : accountModals.openAccountSelect();
                               }}
                             >
                               <User />
@@ -415,23 +409,14 @@ const AccountButton: FC<{
           setShowSettingsModal(false);
         }}
       />
-      {isMobileDevice ? (
+      <>
         <Modal open={showOnboarding} onClose={() => setShowOnboarding(false)}>
-          <MobileOnboardingModal />
+          <DesktopOnboardingModal />
         </Modal>
-      ) : (
-        <>
-          <Modal open={showOnboarding} onClose={() => setShowOnboarding(false)}>
-            <DesktopOnboardingModal />
-          </Modal>
-          <Modal
-            open={showGetZtgModal}
-            onClose={() => setShowGetZtgModal(false)}
-          >
-            <DesktopOnboardingModal step={4} />
-          </Modal>
-        </>
-      )}
+        <Modal open={showGetZtgModal} onClose={() => setShowGetZtgModal(false)}>
+          <DesktopOnboardingModal step={4} />
+        </Modal>
+      </>
     </>
   );
 };

diff --git a/components/account/AccountModalContent.tsx b/components/account/AccountModalContent.tsx
@@ -9,7 +9,6 @@ import { useChainConstants } from "lib/hooks/queries/useChainConstants";
 const AccountModalContent: FC = () => {
   const { activeAccount, disconnectWallet, accounts, selectAccount } =
     useWallet();
-
   const { data: activeBalance } = useZtgBalance(activeAccount?.address);
   const { data: constants } = useChainConstants();
 

diff --git a/components/account/AccountSelect.tsx b/components/account/AccountSelect.tsx
@@ -1,7 +1,6 @@
-import { Unpacked } from "@zeitgeistpm/utility/dist/array";
 import { useWallet } from "lib/state/wallet";
 
-import React, { FC, useEffect, useMemo, useState } from "react";
+import React, { FC } from "react";
 import Select, {
   components,
   ControlProps,
@@ -14,7 +13,6 @@ import Select, {
 import CopyIcon from "../ui/CopyIcon";
 import AccountSelectOption from "./AccountSelectOption";
 import AccountSelectValue from "./AccountSelectValue";
-import { useAccountModals } from "lib/state/account";
 
 export type AccountOption = { label: string; value: string };