From 5d550e58b363736f8bda37a8a3be2099451b6e00 Mon Sep 17 00:00:00 2001
From: Tyler Shipe <tjshipe@gmail.com>
Date: Sat, 15 Jan 2022 20:00:34 -0600
Subject: [PATCH] remove cluster env var and link explorer txs to correct
 cluster

---
 components/Notification.tsx | 6 ++++--
 stores/useMangoStore.tsx    | 5 ++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/components/Notification.tsx b/components/Notification.tsx
index 4da7f94a..cb6667f2 100644
--- a/components/Notification.tsx
+++ b/components/Notification.tsx
@@ -5,7 +5,7 @@ import {
   InformationCircleIcon,
   XCircleIcon,
 } from '@heroicons/react/outline'
-import useMangoStore from '../stores/useMangoStore'
+import useMangoStore, { CLUSTER } from '../stores/useMangoStore'
 import { Notification, notify } from '../utils/notifications'
 import { useTranslation } from 'next-i18next'
 import Loading from './Loading'
@@ -143,7 +143,9 @@ const Notification = ({ notification }: { notification: Notification }) => {
           ) : null}
           {txid ? (
             <a
-              href={'https://explorer.solana.com/tx/' + txid}
+              href={
+                'https://explorer.solana.com/tx/' + txid + '?cluster=' + CLUSTER
+              }
               className="flex items-center mt-1 text-sm"
               target="_blank"
               rel="noreferrer"
diff --git a/stores/useMangoStore.tsx b/stores/useMangoStore.tsx
index 4cc6af6c..b21fbb86 100644
--- a/stores/useMangoStore.tsx
+++ b/stores/useMangoStore.tsx
@@ -52,8 +52,8 @@ export const ENDPOINTS: EndpointInfo[] = [
 ]
 
 type ClusterType = 'mainnet' | 'devnet'
-
-const CLUSTER = (process.env.NEXT_PUBLIC_CLUSTER as ClusterType) || 'mainnet'
+const DEFAULT_MANGO_GROUP_NAME = process.env.NEXT_PUBLIC_GROUP || 'devnet.2'
+export const CLUSTER = DEFAULT_MANGO_GROUP_NAME.split('.')[0] as ClusterType
 const ENDPOINT = ENDPOINTS.find((e) => e.name === CLUSTER)
 
 export const WEBSOCKET_CONNECTION = new Connection(
@@ -61,7 +61,6 @@ export const WEBSOCKET_CONNECTION = new Connection(
   'processed' as Commitment
 )
 
-const DEFAULT_MANGO_GROUP_NAME = process.env.NEXT_PUBLIC_GROUP || 'mainnet.1'
 export const DEFAULT_MANGO_GROUP_CONFIG = Config.ids().getGroup(
   CLUSTER,
   DEFAULT_MANGO_GROUP_NAME