Merge pull request #121 from xmtp/fix-ts-errors

Simplify Wallet buttons
xmtp · Sep 20, 2023 · 583bbc1 · 583bbc1
2 parents ef2ca46 + e77e96d
commit 583bbc1
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 39 deletions.
diff --git a/example/src/LaunchScreen.tsx b/example/src/LaunchScreen.tsx
@@ -67,20 +67,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 +106,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
@@ -131,16 +131,11 @@ 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`)
    */
-  env: keyof typeof Env;
+  env: 'local' | 'dev' | 'production';
   /**
    * identifier that's included with API requests.
    *