From aaa3da3c07d19e0a4f532df9e3b43f167624d03c Mon Sep 17 00:00:00 2001
From: Pat Nakajima <patnakajima@gmail.com>
Date: Tue, 19 Sep 2023 12:02:17 -0400
Subject: [PATCH 1/2] Simplify this code, there's no need to iterate

---
 example/src/LaunchScreen.tsx | 90 +++++++++++++++++++++++-------------
 src/lib/Client.ts            |  2 +-
 2 files changed, 58 insertions(+), 34 deletions(-)

diff --git a/example/src/LaunchScreen.tsx b/example/src/LaunchScreen.tsx
index 3002f818..3d76a7c6 100644
--- a/example/src/LaunchScreen.tsx
+++ b/example/src/LaunchScreen.tsx
@@ -5,6 +5,7 @@ import React from "react";
 import { useXmtp } from "./XmtpContext";
 import * as XMTP from "xmtp-react-native-sdk";
 import { useSavedKeys } from "./hooks";
+import { Env } from "xmtp-react-native-sdk/lib/Client";
 
 const appVersion = "XMTP_RN_EX/0.0.1";
 
@@ -67,20 +68,30 @@ export default function LaunchScreen({
       >
         Random Wallet
       </Text>
-      {["dev", "local"].map((env) => (
-        <View key={`generated-${env}`} style={{ margin: 16 }}>
-          <Button
-            title={`Use Generated Wallet (${env})`}
-            color={env === "dev" ? "green" : "purple"}
-            onPress={() => {
-              configureWallet(
-                env,
-                XMTP.Client.createRandom({ env, appVersion }),
-              );
-            }}
-          />
-        </View>
-      ))}
+      <View key={`generated-dev`} style={{ margin: 16 }}>
+        <Button
+          title={`Use Generated Wallet (dev)`}
+          color="green"
+          onPress={() => {
+            configureWallet(
+              'dev',
+              XMTP.Client.createRandom({ env: 'dev', appVersion }),
+            );
+          }}
+        />
+      </View>
+      <View key={`generated-local`} style={{ margin: 16 }}>
+        <Button
+          title={`Use Generated Wallet (local)`}
+          color="purple"
+          onPress={() => {
+            configureWallet(
+              'local',
+              XMTP.Client.createRandom({ env: 'local', appVersion }),
+            );
+          }}
+        />
+      </View>
       {!!savedKeys.keyBundle && (
         <>
           <Divider key="divider-saved" />
@@ -96,26 +107,39 @@ export default function LaunchScreen({
           >
             Saved Wallet
           </Text>
-          {["dev", "local"].map((env) => (
-            <View key={`saved-${env}`} style={{ margin: 16 }}>
-              <Button
-                title={`Use Saved Wallet (${env})`}
-                color={env === "dev" ? "green" : "purple"}
-                onPress={() => {
-                  configureWallet(
-                    env,
-                    XMTP.Client.createFromKeyBundle(savedKeys.keyBundle!, {
-                      env,
-                      appVersion,
-                    }),
-                  );
-                }}
-              />
-            </View>
-          ))}
-          <View key={`saved-clear`} style={{ margin: 16 }}>
+          <View key="saved-dev" style={{ margin: 16 }}>
+            <Button
+              title="Use Saved Wallet (dev)"
+              color="green"
+              onPress={() => {
+                configureWallet(
+                  'dev',
+                  XMTP.Client.createFromKeyBundle(savedKeys.keyBundle!, {
+                    env: 'dev',
+                    appVersion,
+                  }),
+                );
+              }}
+            />
+          </View>
+          <View key="saved-local" style={{ margin: 16 }}>
+            <Button
+              title="Use Saved Wallet (local)"
+              color="purple"
+              onPress={() => {
+                configureWallet(
+                  'local',
+                  XMTP.Client.createFromKeyBundle(savedKeys.keyBundle!, {
+                    env: 'local',
+                    appVersion,
+                  }),
+                );
+              }}
+            />
+          </View>
+          <View key="saved-clear" style={{ margin: 16 }}>
             <Button
-              title={`Clear Saved Wallet`}
+              title="Clear Saved Wallet"
               // color={"black"}
               onPress={() => savedKeys.clear()}
             />
diff --git a/src/lib/Client.ts b/src/lib/Client.ts
index 33bd04fc..66d29983 100644
--- a/src/lib/Client.ts
+++ b/src/lib/Client.ts
@@ -140,7 +140,7 @@ export type NetworkOptions = {
   /**
    * Specify which XMTP environment to connect to. (default: `dev`)
    */
-  env: keyof typeof Env;
+  env: 'local' | 'dev' | 'production';
   /**
    * identifier that's included with API requests.
    *

From e77e96d39a2f2caef240e5225ade645d0a41b681 Mon Sep 17 00:00:00 2001
From: Pat Nakajima <patnakajima@gmail.com>
Date: Tue, 19 Sep 2023 12:59:17 -0400
Subject: [PATCH 2/2] Remove Env

---
 example/src/LaunchScreen.tsx | 1 -
 src/lib/Client.ts            | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/example/src/LaunchScreen.tsx b/example/src/LaunchScreen.tsx
index 3d76a7c6..e5c6d811 100644
--- a/example/src/LaunchScreen.tsx
+++ b/example/src/LaunchScreen.tsx
@@ -5,7 +5,6 @@ import React from "react";
 import { useXmtp } from "./XmtpContext";
 import * as XMTP from "xmtp-react-native-sdk";
 import { useSavedKeys } from "./hooks";
-import { Env } from "xmtp-react-native-sdk/lib/Client";
 
 const appVersion = "XMTP_RN_EX/0.0.1";
 
diff --git a/src/lib/Client.ts b/src/lib/Client.ts
index 66d29983..1b6f2897 100644
--- a/src/lib/Client.ts
+++ b/src/lib/Client.ts
@@ -131,11 +131,6 @@ export class Client {
 }
 
 export type ClientOptions = NetworkOptions;
-export enum Env {
-  local = 'local',
-  dev = 'dev',
-  production = 'production'
-}
 export type NetworkOptions = {
   /**
    * Specify which XMTP environment to connect to. (default: `dev`)