From a98072efa31d94b152549319d24d7ef92a584125 Mon Sep 17 00:00:00 2001
From: Pat Nakajima <patnakajima@gmail.com>
Date: Mon, 1 May 2023 16:15:39 -0700
Subject: [PATCH 1/8] Add TestView for tests

---
 example/App.tsx                               |  18 ++-
 example/ios/Podfile.lock                      |   2 +-
 .../project.pbxproj                           | 153 ++++++++++++++++++
 .../xmtpreactnativesdkexample.xcscheme        |  11 ++
 .../xmtpreactnativesdkexampleUITests.swift    |  34 ++++
 ...ctnativesdkexampleUITestsLaunchTests.swift |  32 ++++
 example/src/TestView.tsx                      |  11 ++
 ios/XMTPReactNative.podspec                   |   2 +-
 package.json                                  |   2 +-
 9 files changed, 259 insertions(+), 6 deletions(-)
 create mode 100644 example/ios/xmtpreactnativesdkexampleUITests/xmtpreactnativesdkexampleUITests.swift
 create mode 100644 example/ios/xmtpreactnativesdkexampleUITests/xmtpreactnativesdkexampleUITestsLaunchTests.swift
 create mode 100644 example/src/TestView.tsx

diff --git a/example/App.tsx b/example/App.tsx
index 7a53ed419..544fa6dbf 100644
--- a/example/App.tsx
+++ b/example/App.tsx
@@ -1,21 +1,33 @@
 import { ThirdwebProvider } from "@thirdweb-dev/react-native";
 import React, { useState } from "react";
-import { SafeAreaView, StyleSheet } from "react-native";
+import { Button, SafeAreaView, StyleSheet, View } from "react-native";
 import * as XMTP from "xmtp-react-native-sdk";
 
 import AuthView from "./src/AuthView";
 import HomeView from "./src/HomeView";
+import TestView from "./src/TestView";
 
 export default function App() {
   const [client, setClient] = useState<XMTP.Client | null>(null);
+  const [isTesting, setIsTesting] = useState<boolean>(false);
 
-  return (
+  return isTesting ? (
+    <SafeAreaView style={{ flexGrow: 1 }}>
+      <TestView />
+    </SafeAreaView>
+  ) : (
     <ThirdwebProvider activeChain="mainnet">
       <SafeAreaView style={{ flexGrow: 1 }}>
         {client != null ? (
           <HomeView client={client} />
         ) : (
-          <AuthView setClient={setClient} />
+          <View>
+            <AuthView setClient={setClient} />
+            <Button
+              onPress={() => setIsTesting(true)}
+              title="Enable Test Mode"
+            />
+          </View>
         )}
       </SafeAreaView>
     </ThirdwebProvider>
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index f05f5189b..1725b30cf 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -657,7 +657,7 @@ SPEC CHECKSUMS:
   SwiftProtobuf: afced68785854575756db965e9da52bbf3dc45e7
   web3.swift: 2263d1e12e121b2c42ffb63a5a7beb1acaf33959
   XMTP: b2286639f0cff509e909eed5b0ce2aed7eea3e77
-  XMTPReactNative: 30c5c76129cf24a1d4474effcd2a9b4237714b68
+  XMTPReactNative: bdd05452ff13f1276f13ca3d1034535c40bf5970
   XMTPRust: 2c356f57f034d771717933a6127a7d51667f9843
   Yoga: ba09b6b11e6139e3df8229238aa794205ca6a02a
 
diff --git a/example/ios/xmtpreactnativesdkexample.xcodeproj/project.pbxproj b/example/ios/xmtpreactnativesdkexample.xcodeproj/project.pbxproj
index 3e0292dc3..b023fdb75 100644
--- a/example/ios/xmtpreactnativesdkexample.xcodeproj/project.pbxproj
+++ b/example/ios/xmtpreactnativesdkexample.xcodeproj/project.pbxproj
@@ -11,12 +11,24 @@
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		3E461D99554A48A4959DE609 /* SplashScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */; };
+		A6A5DB882A00551E001DF8C2 /* xmtpreactnativesdkexampleUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6A5DB872A00551E001DF8C2 /* xmtpreactnativesdkexampleUITests.swift */; };
+		A6A5DB8A2A00551E001DF8C2 /* xmtpreactnativesdkexampleUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6A5DB892A00551E001DF8C2 /* xmtpreactnativesdkexampleUITestsLaunchTests.swift */; };
 		B18059E884C0ABDD17F3DC3D /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC715A2D49A985799AEE119 /* ExpoModulesProvider.swift */; };
 		BB2F792D24A3F905000567C9 /* Expo.plist in Resources */ = {isa = PBXBuildFile; fileRef = BB2F792C24A3F905000567C9 /* Expo.plist */; };
 		C90474A97E544153BED95C2A /* noop-file.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDF0078FD601458DA88B0565 /* noop-file.swift */; };
 		FD38E403931970F81205A40A /* libPods-xmtpreactnativesdkexample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78B76F8B6347E6AE6088DF9B /* libPods-xmtpreactnativesdkexample.a */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXContainerItemProxy section */
+		A6A5DB8B2A00551E001DF8C2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 13B07F861A680F5B00A75B9A;
+			remoteInfo = xmtpreactnativesdkexample;
+		};
+/* End PBXContainerItemProxy section */
+
 /* Begin PBXFileReference section */
 		008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = "<group>"; };
 		13B07F961A680F5B00A75B9A /* xmtpreactnativesdkexample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = xmtpreactnativesdkexample.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -28,6 +40,9 @@
 		6AF9BAAAC2041F823F5E5BC1 /* Pods-xmtpreactnativesdkexample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-xmtpreactnativesdkexample.release.xcconfig"; path = "Target Support Files/Pods-xmtpreactnativesdkexample/Pods-xmtpreactnativesdkexample.release.xcconfig"; sourceTree = "<group>"; };
 		78B76F8B6347E6AE6088DF9B /* libPods-xmtpreactnativesdkexample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-xmtpreactnativesdkexample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		80323D3D45487AD85F64F249 /* Pods-xmtpreactnativesdkexample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-xmtpreactnativesdkexample.debug.xcconfig"; path = "Target Support Files/Pods-xmtpreactnativesdkexample/Pods-xmtpreactnativesdkexample.debug.xcconfig"; sourceTree = "<group>"; };
+		A6A5DB852A00551E001DF8C2 /* xmtpreactnativesdkexampleUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = xmtpreactnativesdkexampleUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		A6A5DB872A00551E001DF8C2 /* xmtpreactnativesdkexampleUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = xmtpreactnativesdkexampleUITests.swift; sourceTree = "<group>"; };
+		A6A5DB892A00551E001DF8C2 /* xmtpreactnativesdkexampleUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = xmtpreactnativesdkexampleUITestsLaunchTests.swift; sourceTree = "<group>"; };
 		AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SplashScreen.storyboard; path = xmtpreactnativesdkexample/SplashScreen.storyboard; sourceTree = "<group>"; };
 		BB2F792C24A3F905000567C9 /* Expo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Expo.plist; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
@@ -44,6 +59,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		A6A5DB822A00551E001DF8C2 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
@@ -84,6 +106,7 @@
 			children = (
 				13B07FAE1A68108700A75B9A /* xmtpreactnativesdkexample */,
 				832341AE1AAA6A7D00B99B32 /* Libraries */,
+				A6A5DB862A00551E001DF8C2 /* xmtpreactnativesdkexampleUITests */,
 				83CBBA001A601CBA00E9B192 /* Products */,
 				2D16E6871FA4F8E400B85C8A /* Frameworks */,
 				D65327D7A22EEC0BE12398D9 /* Pods */,
@@ -98,6 +121,7 @@
 			isa = PBXGroup;
 			children = (
 				13B07F961A680F5B00A75B9A /* xmtpreactnativesdkexample.app */,
+				A6A5DB852A00551E001DF8C2 /* xmtpreactnativesdkexampleUITests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -110,6 +134,15 @@
 			name = xmtpreactnativesdkexample;
 			sourceTree = "<group>";
 		};
+		A6A5DB862A00551E001DF8C2 /* xmtpreactnativesdkexampleUITests */ = {
+			isa = PBXGroup;
+			children = (
+				A6A5DB872A00551E001DF8C2 /* xmtpreactnativesdkexampleUITests.swift */,
+				A6A5DB892A00551E001DF8C2 /* xmtpreactnativesdkexampleUITestsLaunchTests.swift */,
+			);
+			path = xmtpreactnativesdkexampleUITests;
+			sourceTree = "<group>";
+		};
 		BB2F792B24A3F905000567C9 /* Supporting */ = {
 			isa = PBXGroup;
 			children = (
@@ -161,18 +194,43 @@
 			productReference = 13B07F961A680F5B00A75B9A /* xmtpreactnativesdkexample.app */;
 			productType = "com.apple.product-type.application";
 		};
+		A6A5DB842A00551E001DF8C2 /* xmtpreactnativesdkexampleUITests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A6A5DB8F2A00551E001DF8C2 /* Build configuration list for PBXNativeTarget "xmtpreactnativesdkexampleUITests" */;
+			buildPhases = (
+				A6A5DB812A00551E001DF8C2 /* Sources */,
+				A6A5DB822A00551E001DF8C2 /* Frameworks */,
+				A6A5DB832A00551E001DF8C2 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				A6A5DB8C2A00551E001DF8C2 /* PBXTargetDependency */,
+			);
+			name = xmtpreactnativesdkexampleUITests;
+			productName = xmtpreactnativesdkexampleUITests;
+			productReference = A6A5DB852A00551E001DF8C2 /* xmtpreactnativesdkexampleUITests.xctest */;
+			productType = "com.apple.product-type.bundle.ui-testing";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
 		83CBB9F71A601CBA00E9B192 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastSwiftUpdateCheck = 1430;
 				LastUpgradeCheck = 1130;
 				TargetAttributes = {
 					13B07F861A680F5B00A75B9A = {
 						DevelopmentTeam = FY4NZR34Z3;
 						LastSwiftMigration = 1250;
 					};
+					A6A5DB842A00551E001DF8C2 = {
+						CreatedOnToolsVersion = 14.3;
+						DevelopmentTeam = FY4NZR34Z3;
+						ProvisioningStyle = Automatic;
+						TestTargetID = 13B07F861A680F5B00A75B9A;
+					};
 				};
 			};
 			buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "xmtpreactnativesdkexample" */;
@@ -189,6 +247,7 @@
 			projectRoot = "";
 			targets = (
 				13B07F861A680F5B00A75B9A /* xmtpreactnativesdkexample */,
+				A6A5DB842A00551E001DF8C2 /* xmtpreactnativesdkexampleUITests */,
 			);
 		};
 /* End PBXProject section */
@@ -204,6 +263,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		A6A5DB832A00551E001DF8C2 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
@@ -314,8 +380,25 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		A6A5DB812A00551E001DF8C2 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A6A5DB8A2A00551E001DF8C2 /* xmtpreactnativesdkexampleUITestsLaunchTests.swift in Sources */,
+				A6A5DB882A00551E001DF8C2 /* xmtpreactnativesdkexampleUITests.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+		A6A5DB8C2A00551E001DF8C2 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 13B07F861A680F5B00A75B9A /* xmtpreactnativesdkexample */;
+			targetProxy = A6A5DB8B2A00551E001DF8C2 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
 /* Begin XCBuildConfiguration section */
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
@@ -486,6 +569,67 @@
 			};
 			name = Release;
 		};
+		A6A5DB8D2A00551E001DF8C2 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = FY4NZR34Z3;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GENERATE_INFOPLIST_FILE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
+				MARKETING_VERSION = 1.0;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = org.xmtp.xmtpreactnativesdkexampleUITests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_EMIT_LOC_STRINGS = NO;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				TEST_TARGET_NAME = xmtpreactnativesdkexample;
+			};
+			name = Debug;
+		};
+		A6A5DB8E2A00551E001DF8C2 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_STYLE = Automatic;
+				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 1;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = FY4NZR34Z3;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GENERATE_INFOPLIST_FILE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
+				MARKETING_VERSION = 1.0;
+				MTL_FAST_MATH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = org.xmtp.xmtpreactnativesdkexampleUITests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_EMIT_LOC_STRINGS = NO;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				TEST_TARGET_NAME = xmtpreactnativesdkexample;
+			};
+			name = Release;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -507,6 +651,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		A6A5DB8F2A00551E001DF8C2 /* Build configuration list for PBXNativeTarget "xmtpreactnativesdkexampleUITests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A6A5DB8D2A00551E001DF8C2 /* Debug */,
+				A6A5DB8E2A00551E001DF8C2 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 83CBB9F71A601CBA00E9B192 /* Project object */;
diff --git a/example/ios/xmtpreactnativesdkexample.xcodeproj/xcshareddata/xcschemes/xmtpreactnativesdkexample.xcscheme b/example/ios/xmtpreactnativesdkexample.xcodeproj/xcshareddata/xcschemes/xmtpreactnativesdkexample.xcscheme
index ce9f7ef3d..9d7095974 100644
--- a/example/ios/xmtpreactnativesdkexample.xcodeproj/xcshareddata/xcschemes/xmtpreactnativesdkexample.xcscheme
+++ b/example/ios/xmtpreactnativesdkexample.xcodeproj/xcshareddata/xcschemes/xmtpreactnativesdkexample.xcscheme
@@ -38,6 +38,17 @@
                ReferencedContainer = "container:xmtpreactnativesdkexample.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "A6A5DB842A00551E001DF8C2"
+               BuildableName = "xmtpreactnativesdkexampleUITests.xctest"
+               BlueprintName = "xmtpreactnativesdkexampleUITests"
+               ReferencedContainer = "container:xmtpreactnativesdkexample.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
diff --git a/example/ios/xmtpreactnativesdkexampleUITests/xmtpreactnativesdkexampleUITests.swift b/example/ios/xmtpreactnativesdkexampleUITests/xmtpreactnativesdkexampleUITests.swift
new file mode 100644
index 000000000..e2c4b4b58
--- /dev/null
+++ b/example/ios/xmtpreactnativesdkexampleUITests/xmtpreactnativesdkexampleUITests.swift
@@ -0,0 +1,34 @@
+//
+//  xmtpreactnativesdkexampleUITests.swift
+//  xmtpreactnativesdkexampleUITests
+//
+//  Created by Pat Nakajima on 5/1/23.
+//
+
+import XCTest
+
+final class xmtpreactnativesdkexampleUITests: XCTestCase {
+
+  override func setUpWithError() throws {
+    // Put setup code here. This method is called before the invocation of each test method in the class.
+
+    // In UI tests it is usually best to stop immediately when a failure occurs.
+    continueAfterFailure = false
+
+    // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this.
+  }
+
+  func testExample() throws {
+    // UI tests must launch the application that they test.
+    let app = XCUIApplication()
+    app.launch()
+
+    let button = app.buttons["Enable Test Mode"]
+    _ = button.waitForExistence(timeout: 3)
+    button.tap()
+
+    let view = app.textViews["Test View"]
+    _ = view.waitForExistence(timeout: 3)
+  }
+
+}
diff --git a/example/ios/xmtpreactnativesdkexampleUITests/xmtpreactnativesdkexampleUITestsLaunchTests.swift b/example/ios/xmtpreactnativesdkexampleUITests/xmtpreactnativesdkexampleUITestsLaunchTests.swift
new file mode 100644
index 000000000..ece0b1ca5
--- /dev/null
+++ b/example/ios/xmtpreactnativesdkexampleUITests/xmtpreactnativesdkexampleUITestsLaunchTests.swift
@@ -0,0 +1,32 @@
+//
+//  xmtpreactnativesdkexampleUITestsLaunchTests.swift
+//  xmtpreactnativesdkexampleUITests
+//
+//  Created by Pat Nakajima on 5/1/23.
+//
+
+import XCTest
+
+final class xmtpreactnativesdkexampleUITestsLaunchTests: XCTestCase {
+
+    override class var runsForEachTargetApplicationUIConfiguration: Bool {
+        true
+    }
+
+    override func setUpWithError() throws {
+        continueAfterFailure = false
+    }
+
+    func testLaunch() throws {
+        let app = XCUIApplication()
+        app.launch()
+
+        // Insert steps here to perform after app launch but before taking a screenshot,
+        // such as logging into a test account or navigating somewhere in the app
+
+        let attachment = XCTAttachment(screenshot: app.screenshot())
+        attachment.name = "Launch Screen"
+        attachment.lifetime = .keepAlways
+        add(attachment)
+    }
+}
diff --git a/example/src/TestView.tsx b/example/src/TestView.tsx
new file mode 100644
index 000000000..d36816f3a
--- /dev/null
+++ b/example/src/TestView.tsx
@@ -0,0 +1,11 @@
+import React from "react";
+import { View, Text } from "react-native";
+
+export default function TestView(): JSX.Element {
+  return (
+    <View>
+      <Text>Test View</Text>
+      <Text>This view is used by unit tests.</Text>
+    </View>
+  );
+}
diff --git a/ios/XMTPReactNative.podspec b/ios/XMTPReactNative.podspec
index edb4b8fcc..c6b8aaeb8 100644
--- a/ios/XMTPReactNative.podspec
+++ b/ios/XMTPReactNative.podspec
@@ -24,5 +24,5 @@ Pod::Spec.new do |s|
   }
   
   s.source_files = "**/*.{h,m,swift}"
-  s.dependency "XMTP", "= 0.1.3-beta0"
+  s.dependency "XMTP", "= 0.2.1-beta0"
 end
diff --git a/package.json b/package.json
index 21b5d6b04..8cab6e870 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@xmtp/react-native-sdk",
-  "version": "0.0.0-development",
+  "version": "0.1.0",
   "description": "Wraps for native xmtp sdks for react native",
   "main": "build/index.js",
   "types": "build/index.d.ts",

From d185c80ac1a23a3f869bd2e43e9f9cc439fc1775 Mon Sep 17 00:00:00 2001
From: Pat Nakajima <patnakajima@gmail.com>
Date: Wed, 3 May 2023 13:11:30 -0700
Subject: [PATCH 2/8] Got two tests working

---
 example/App.tsx                               |   4 +-
 .../xmtpreactnativesdkexampleUITests.swift    |  13 +-
 ...ctnativesdkexampleUITestsLaunchTests.swift |   3 -
 example/package-lock.json                     |   7 +-
 example/package.json                          |   5 +-
 example/src/TestView.tsx                      |  11 --
 example/src/TestsView.tsx                     |  80 ++++++++++++
 example/src/tests.ts                          |  57 +++++++++
 ios/Wrappers/ConversationWrapper.swift        |  22 +++-
 ios/XMTPModule.swift                          | 118 ++++++++++--------
 src/index.ts                                  |  78 +++++++++---
 src/lib/Client.ts                             |  14 ++-
 src/lib/Conversation.ts                       |  38 +++++-
 src/lib/Conversations.ts                      |  26 +++-
 tsconfig.json                                 |   1 +
 15 files changed, 366 insertions(+), 111 deletions(-)
 delete mode 100644 example/src/TestView.tsx
 create mode 100644 example/src/TestsView.tsx
 create mode 100644 example/src/tests.ts

diff --git a/example/App.tsx b/example/App.tsx
index 544fa6dbf..aa8cb8625 100644
--- a/example/App.tsx
+++ b/example/App.tsx
@@ -5,7 +5,7 @@ import * as XMTP from "xmtp-react-native-sdk";
 
 import AuthView from "./src/AuthView";
 import HomeView from "./src/HomeView";
-import TestView from "./src/TestView";
+import TestsView from "./src/TestsView";
 
 export default function App() {
   const [client, setClient] = useState<XMTP.Client | null>(null);
@@ -13,7 +13,7 @@ export default function App() {
 
   return isTesting ? (
     <SafeAreaView style={{ flexGrow: 1 }}>
-      <TestView />
+      <TestsView />
     </SafeAreaView>
   ) : (
     <ThirdwebProvider activeChain="mainnet">
diff --git a/example/ios/xmtpreactnativesdkexampleUITests/xmtpreactnativesdkexampleUITests.swift b/example/ios/xmtpreactnativesdkexampleUITests/xmtpreactnativesdkexampleUITests.swift
index e2c4b4b58..497a979fe 100644
--- a/example/ios/xmtpreactnativesdkexampleUITests/xmtpreactnativesdkexampleUITests.swift
+++ b/example/ios/xmtpreactnativesdkexampleUITests/xmtpreactnativesdkexampleUITests.swift
@@ -24,11 +24,18 @@ final class xmtpreactnativesdkexampleUITests: XCTestCase {
     app.launch()
 
     let button = app.buttons["Enable Test Mode"]
-    _ = button.waitForExistence(timeout: 3)
+    XCTAssert(button.waitForExistence(timeout: 3))
     button.tap()
 
-    let view = app.textViews["Test View"]
-    _ = view.waitForExistence(timeout: 3)
+    let view = app.staticTexts["Test View"]
+    XCTAssert(view.waitForExistence(timeout: 3))
+
+    let result = app.staticTexts["result"]
+    XCTAssert(result.waitForExistence(timeout: 3))
+
+    let input = app.textFields["input"]
+    XCTAssert(input.waitForExistence(timeout: 3))
+    
   }
 
 }
diff --git a/example/ios/xmtpreactnativesdkexampleUITests/xmtpreactnativesdkexampleUITestsLaunchTests.swift b/example/ios/xmtpreactnativesdkexampleUITests/xmtpreactnativesdkexampleUITestsLaunchTests.swift
index ece0b1ca5..35acfdc2f 100644
--- a/example/ios/xmtpreactnativesdkexampleUITests/xmtpreactnativesdkexampleUITestsLaunchTests.swift
+++ b/example/ios/xmtpreactnativesdkexampleUITests/xmtpreactnativesdkexampleUITestsLaunchTests.swift
@@ -21,9 +21,6 @@ final class xmtpreactnativesdkexampleUITestsLaunchTests: XCTestCase {
         let app = XCUIApplication()
         app.launch()
 
-        // Insert steps here to perform after app launch but before taking a screenshot,
-        // such as logging into a test account or navigating somewhere in the app
-
         let attachment = XCTAttachment(screenshot: app.screenshot())
         attachment.name = "Launch Screen"
         attachment.lifetime = .keepAlways
diff --git a/example/package-lock.json b/example/package-lock.json
index be37bbaf8..f31a6a90b 100644
--- a/example/package-lock.json
+++ b/example/package-lock.json
@@ -27,6 +27,7 @@
       },
       "devDependencies": {
         "@babel/core": "^7.20.0",
+        "@types/node": "^18.16.3",
         "@types/react": "~18.0.14",
         "typescript": "^4.9.4"
       }
@@ -6840,9 +6841,9 @@
       "integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA=="
     },
     "node_modules/@types/node": {
-      "version": "18.15.12",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.12.tgz",
-      "integrity": "sha512-Wha1UwsB3CYdqUm2PPzh/1gujGCNtWVUYF0mB00fJFoR4gTyWTDPjSm+zBF787Ahw8vSGgBja90MkgFwvB86Dg=="
+      "version": "18.16.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.3.tgz",
+      "integrity": "sha512-OPs5WnnT1xkCBiuQrZA4+YAV4HEJejmHneyraIaxsbev5yCEr6KMwINNFP9wQeFIw8FWcoTqF3vQsa5CDaI+8Q=="
     },
     "node_modules/@types/pbkdf2": {
       "version": "3.1.0",
diff --git a/example/package.json b/example/package.json
index eccdfadb8..eeb27d0de 100644
--- a/example/package.json
+++ b/example/package.json
@@ -21,12 +21,13 @@
     "react-native-get-random-values": "^1.8.0",
     "react-native-mmkv": "^2.8.0",
     "react-native-randombytes": "^3.6.1",
-    "react-native-svg": "^13.9.0",
+    "react-native-safe-area-context": "4.5.0",
     "react-native-screens": "~3.20.0",
-    "react-native-safe-area-context": "4.5.0"
+    "react-native-svg": "^13.9.0"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
+    "@types/node": "^18.16.3",
     "@types/react": "~18.0.14",
     "typescript": "^4.9.4"
   },
diff --git a/example/src/TestView.tsx b/example/src/TestView.tsx
deleted file mode 100644
index d36816f3a..000000000
--- a/example/src/TestView.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from "react";
-import { View, Text } from "react-native";
-
-export default function TestView(): JSX.Element {
-  return (
-    <View>
-      <Text>Test View</Text>
-      <Text>This view is used by unit tests.</Text>
-    </View>
-  );
-}
diff --git a/example/src/TestsView.tsx b/example/src/TestsView.tsx
new file mode 100644
index 000000000..2abf4391c
--- /dev/null
+++ b/example/src/TestsView.tsx
@@ -0,0 +1,80 @@
+import React, { useEffect, useState } from "react";
+import { View, Text, TextInput, Button, ScrollView } from "react-native";
+import * as XMTP from "../../src/index";
+import { tests, Test } from "./tests";
+
+type Result = "waiting" | "running" | "success" | "failure" | "error";
+
+function TestView({ test }: { test: Test }): JSX.Element {
+  const [result, setResult] = useState<Result>("waiting");
+  const [errorMessage, setErrorMessage] = useState<string>("");
+
+  async function run() {
+    setResult("running");
+    setErrorMessage("");
+    try {
+      const result = await test.run();
+      setResult(result ? "success" : "failure");
+      setErrorMessage("");
+    } catch (err) {
+      setResult("error");
+      if (err instanceof Error) {
+        setErrorMessage(err.message + "\n" + err.stack);
+      } else {
+        setErrorMessage(JSON.stringify(err));
+      }
+    }
+  }
+
+  const backgroundColor = {
+    waiting: "#fafafa",
+    success: "#d4edda",
+    failure: "#f8d7da",
+    error: "#f8d7da",
+    running: "#fafafa",
+  }[result];
+
+  return (
+    <View style={{ backgroundColor: backgroundColor }}>
+      <View
+        style={{
+          flexDirection: "row",
+          alignItems: "center",
+          justifyContent: "space-between",
+          paddingHorizontal: 12,
+        }}
+      >
+        <Text style={{ fontSize: 12 }}>{test.name}</Text>
+        <Button
+          onPress={async () => await run()}
+          title={result == "running" ? "Running..." : "Run"}
+        />
+      </View>
+      {errorMessage && (
+        <View style={{ paddingHorizontal: 12, paddingBottom: 12 }}>
+          <Text style={{ color: "#721c24" }}>Error: {errorMessage}</Text>
+        </View>
+      )}
+    </View>
+  );
+}
+
+export default function TestsView(): JSX.Element {
+  const [text, setText] = useState<string>("");
+
+  return (
+    <ScrollView>
+      <View>
+        <View style={{ padding: 12 }}>
+          <Text>Test View</Text>
+          <Text testID="Test View">This view is used by unit tests.</Text>
+        </View>
+        <View testID="tests" style={{ paddingHorizontal: 12 }}>
+          {tests.map((test: Test, i) => {
+            return <TestView test={test} key={i} />;
+          })}
+        </View>
+      </View>
+    </ScrollView>
+  );
+}
diff --git a/example/src/tests.ts b/example/src/tests.ts
new file mode 100644
index 000000000..03e02d7ef
--- /dev/null
+++ b/example/src/tests.ts
@@ -0,0 +1,57 @@
+import { Wallet } from "ethers";
+import { Client } from "xmtp-react-native-sdk";
+import * as XMTP from "../../src/index";
+
+function sleep(ms: number) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+export type Test = {
+  name: string;
+  run: () => Promise<boolean>;
+};
+
+export const tests: Test[] = [];
+
+function test(name: string, perform: () => Promise<boolean>) {
+  tests.push({ name, run: perform });
+}
+
+test("can make a client", async () => {
+  const client = await XMTP.Client.createRandom("local");
+  return client.address.length > 0;
+});
+
+test("can message a client", async () => {
+  const bob = await XMTP.Client.createRandom("local");
+  const alice = await XMTP.Client.createRandom("local");
+  console.log("BOB ADDRESS: ", bob.address);
+  console.log("ALICE ADDRESS: ", alice.address);
+
+  if (bob.address === alice.address) {
+    throw new Error("bob and alice should be different");
+  }
+
+  const bobConversation = await bob.conversations.newConversation(
+    alice.address
+  );
+
+  await sleep(1000);
+
+  const aliceConversation = (await alice.conversations.list())[0];
+  if (!aliceConversation) {
+    throw new Error("aliceConversation should exist");
+  }
+
+  await bobConversation.send("hello world");
+
+  const messages = await aliceConversation.messages();
+
+  if (messages.length !== 1) {
+    throw "No message";
+  }
+
+  const message = messages[0];
+
+  return message.content === "hello world";
+});
diff --git a/ios/Wrappers/ConversationWrapper.swift b/ios/Wrappers/ConversationWrapper.swift
index 8c3e09edb..d6b9a2571 100644
--- a/ios/Wrappers/ConversationWrapper.swift
+++ b/ios/Wrappers/ConversationWrapper.swift
@@ -7,18 +7,36 @@
 import Foundation
 import XMTP
 
+struct ConversationWithClientAddress {
+	var clientAddress: String
+	var topic: String
+	var peerAddress: String
+	var version: String
+	var conversationID: String?
+
+	init(client: Client, conversation: XMTP.Conversation) {
+		self.clientAddress = client.address
+		self.topic = conversation.topic
+		self.peerAddress = conversation.peerAddress
+		self.version = conversation.version == .v1 ? "v1" : "v2"
+		self.conversationID = conversation.conversationID
+	}
+}
+
 // Wrapper around XMTP.Conversation to allow passing these objects back
 // into react native.
 struct ConversationWrapper: Wrapper {
-	static func wrap(model: XMTP.Conversation) -> ConversationWrapper {
+	static func wrap(model: ConversationWithClientAddress) -> ConversationWrapper {
 		ConversationWrapper(
+			clientAddress: model.clientAddress,
 			topic: model.topic,
 			peerAddress: model.peerAddress,
-			version: model.version == .v1 ? "v1" : "v2",
+			version: model.version,
 			conversationID: model.conversationID
 		)
 	}
 
+	var clientAddress: String
 	var topic: String
 	var peerAddress: String
 	var version: String
diff --git a/ios/XMTPModule.swift b/ios/XMTPModule.swift
index 12ed01c29..186e473c2 100644
--- a/ios/XMTPModule.swift
+++ b/ios/XMTPModule.swift
@@ -59,11 +59,11 @@ struct SignatureRequest: Codable {
 }
 
 extension Conversation {
-	var cacheKey: String {
+	func cacheKey(_ clientAddress: String) -> String {
 		if let conversationID, conversationID != "" {
-			return "\(topic):\(conversationID)"
+			return "\(clientAddress):\(topic):\(conversationID)"
 		} else {
-			return topic
+			return "\(clientAddress):\(topic)"
 		}
 	}
 }
@@ -84,7 +84,7 @@ public class XMTPModule: Module {
 		),
 	]
 
-	var client: XMTP.Client?
+	var clients: [String: XMTP.Client] = [:]
 	var signer: ReactNativeSigner?
 	var conversations: [String: Conversation] = [:]
 	var subscriptions: [String: Task<Void, Never>] = [:]
@@ -98,12 +98,12 @@ public class XMTPModule: Module {
 
     Events("sign", "authed", "conversation", "message")
 
-		Function("address") { () -> String in
-			if let client {
-				return client.address
-			} else {
-				return "No Client."
-			}
+		Function("address") { (clientAddress: String) -> String in
+			if let client = clients[clientAddress] {
+					return client.address
+				} else {
+					return "No Client."
+				}
     	}
 
 		//
@@ -113,7 +113,7 @@ public class XMTPModule: Module {
 				let signer = ReactNativeSigner(module: self, address: address)
 				self.signer = signer
 				let options = XMTP.ClientOptions(api: apiEnvironments[environment] ?? apiEnvironments["local"]!)
-				self.client = try await XMTP.Client.create(account: signer, options: options)
+				self.clients[address] = try await XMTP.Client.create(account: signer, options: options)
 				self.signer = nil
 				sendEvent("authed")
 		}
@@ -128,47 +128,55 @@ public class XMTPModule: Module {
 			let options = XMTP.ClientOptions(api: apiEnvironments[environment] ?? apiEnvironments["dev"]!)
 			let client = try await Client.create(account: privateKey, options: options)
 
-			self.client = client
+			self.clients[client.address] = client
 			return client.address
 		}
 
 		//
 		// Client API
-		AsyncFunction("listConversations") { () -> [String] in
-			guard let client else {
+		AsyncFunction("listConversations") { (clientAddress: String) -> [String] in
+			guard let client = clients[clientAddress] else {
 				throw Error.noClient
 			}
 
 			let conversations = try await client.conversations.list()
 
 			return try conversations.map { conversation in
-				self.conversations[conversation.cacheKey] = conversation
+				self.conversations[conversation.cacheKey(clientAddress)] = conversation
 
-				return try ConversationWrapper.encode(conversation)
+				return try ConversationWrapper.encode(ConversationWithClientAddress(client: client, conversation: conversation))
 			}
 		}
 
-		AsyncFunction("loadMessages") { (conversationTopic: String, conversationID: String?, limit: Int?, before: Double?, after: Double?) -> [String] in
-			guard let client else {
-				throw Error.noClient
-			}
+		AsyncFunction("loadMessages") { (clientAddress: String, conversationTopic: String, conversationID: String?, limit: Int?, before: Double?, after: Double?) -> [String] in
 
-			guard let conversation = try await findConversation(topic: conversationTopic, conversationID: conversationID) else {
+			guard let conversation = try await findConversation(clientAddress: clientAddress, topic: conversationTopic, conversationID: conversationID) else {
 				throw Error.conversationNotFound("no conversation found for \(conversationTopic)")
 			}
             let beforeDate = before != nil ? Date(timeIntervalSince1970: before!) : nil
             let afterDate = after != nil ? Date(timeIntervalSince1970: after!) : nil
 
-			return try await conversation.messages(limit: limit, before: beforeDate, after: afterDate).map { try DecodedMessageWrapper.encode($0) }
+			let messages = try await conversation.messages(limit: limit, before: beforeDate, after: afterDate).map { try DecodedMessageWrapper.encode($0) }
+
+			let client = clients[clientAddress]!
+			print("OUR (\(clientAddress) CONVERSATIONS \(try! await client.conversations.list().map(\.topic))")
+
+			for (_, client) in clients {
+				print("CONVERSATIONS for \(client.address) \(try! await client.conversations.list().map(\.topic))")
+			}
+
+			print("GOT MESSAGES FOR \(clientAddress): \(messages)")
+
+			return messages
 		}
 
 		// TODO: Support content types
-		AsyncFunction("sendMessage") { (conversationTopic: String, conversationID: String?, content: String) -> String in
-			guard let client else {
+		AsyncFunction("sendMessage") { (clientAddress: String, conversationTopic: String, conversationID: String?, content: String) -> String in
+			guard let client = clients[clientAddress] else {
 				throw Error.noClient
 			}
 
-			guard let conversation = try await findConversation(topic: conversationTopic, conversationID: conversationID) else {
+			guard let conversation = try await findConversation(clientAddress: clientAddress, topic: conversationTopic, conversationID: conversationID) else {
 				throw Error.conversationNotFound("no conversation found for \(conversationTopic)")
 			}
 
@@ -180,28 +188,33 @@ public class XMTPModule: Module {
 			return try DecodedMessageWrapper.encode(decodedMessage)
 		}
 
-		AsyncFunction("createConversation") { (peerAddress: String, conversationID: String?) -> String in
-			guard let client else {
+		AsyncFunction("createConversation") { (clientAddress: String, peerAddress: String, conversationID: String?) -> String in
+			guard let client = clients[clientAddress] else {
 				throw Error.noClient
 			}
 
-			let conversation = try await client.conversations.newConversation(with: peerAddress, context: .init(
-				conversationID: conversationID ?? "",
-				metadata: [:]
-			))
-			return try ConversationWrapper.encode(conversation)
+			do {
+				let conversation = try await client.conversations.newConversation(with: peerAddress, context: .init(
+					conversationID: conversationID ?? ""
+				))
+
+				return try ConversationWrapper.encode(ConversationWithClientAddress(client: client, conversation: conversation))
+			} catch {
+				print("ERRRO!: \(error.localizedDescription)")
+				throw error
+			}
 		}
 
-		Function("subscribeToConversations") {
-			subscribeToConversations()
+		Function("subscribeToConversations") { (clientAddress: String) in
+			subscribeToConversations(clientAddress: clientAddress)
 		}
 
-		AsyncFunction("subscribeToMessages") { (topic: String, conversationID: String?) in
-			try await subscribeToMessages(topic: topic, conversationID: conversationID)
+		AsyncFunction("subscribeToMessages") { (clientAddress: String, topic: String, conversationID: String?) in
+			try await subscribeToMessages(clientAddress: clientAddress, topic: topic, conversationID: conversationID)
 		}
 
-		AsyncFunction("unsubscribeFromMessages") { (topic: String, conversationID: String?) in
-			try await unsubscribeFromMessages(topic: topic, conversationID: conversationID)
+		AsyncFunction("unsubscribeFromMessages") { (clientAddress: String, topic: String, conversationID: String?) in
+			try await unsubscribeFromMessages(clientAddress: clientAddress, topic: topic, conversationID: conversationID)
 		}
   }
 
@@ -209,31 +222,32 @@ public class XMTPModule: Module {
 	// Helpers
 	//
 
-	func findConversation(topic: String, conversationID: String?) async throws -> Conversation? {
-		guard let client else {
+	func findConversation(clientAddress: String, topic: String, conversationID: String?) async throws -> Conversation? {
+		guard let client = clients[clientAddress] else {
+			fatalError("NO CLIENT FOR ADDRES: \(clientAddress)")
 			throw Error.noClient
 		}
 
 		let cacheKey: String
 
 		if let conversationID, conversationID != "" {
-			cacheKey = "\(topic):\(conversationID)"
+			cacheKey = "\(clientAddress):\(topic):\(conversationID)"
 		} else {
-			cacheKey = topic
+			cacheKey = "\(clientAddress):\(topic)"
 		}
 
 		if let conversation = conversations[cacheKey] {
 			return conversation
 		} else if let conversation = try await client.conversations.list().first(where: { $0.topic == topic && $0.conversationID == conversationID }) {
-			conversations[conversation.cacheKey] = conversation
+			conversations[conversation.cacheKey(clientAddress)] = conversation
 			return conversation
 		}
 
 		return nil
 	}
 
-	func subscribeToConversations() {
-		guard let client else {
+	func subscribeToConversations(clientAddress: String) {
+		guard let client = clients[clientAddress] else {
 			return
 		}
 
@@ -254,12 +268,12 @@ public class XMTPModule: Module {
 		}
 	}
 
-	func subscribeToMessages(topic: String, conversationID: String?) async throws {
-		guard let conversation = try await findConversation(topic: topic, conversationID: conversationID) else {
+	func subscribeToMessages(clientAddress: String, topic: String, conversationID: String?) async throws {
+		guard let conversation = try await findConversation(clientAddress: clientAddress, topic: topic, conversationID: conversationID) else {
 			return
 		}
 
-		subscriptions[conversation.cacheKey] = Task {
+		subscriptions[conversation.cacheKey(clientAddress)] = Task {
 			do {
 				for try await message in conversation.streamMessages() {
 					print("GOT A MESSAGE IN SWIFT \(message)")
@@ -271,16 +285,16 @@ public class XMTPModule: Module {
 				}
 			} catch {
 				print("Error in messages subscription: \(error)")
-				subscriptions[conversation.cacheKey]?.cancel()
+				subscriptions[conversation.cacheKey(clientAddress)]?.cancel()
 			}
 		}
 	}
 
-	func unsubscribeFromMessages(topic: String, conversationID: String?) async throws {
-		guard let conversation = try await findConversation(topic: topic, conversationID: conversationID) else {
+	func unsubscribeFromMessages(clientAddress: String, topic: String, conversationID: String?) async throws {
+		guard let conversation = try await findConversation(clientAddress: clientAddress, topic: topic, conversationID: conversationID) else {
 			return
 		}
 
-		subscriptions[conversation.cacheKey]?.cancel()
+		subscriptions[conversation.cacheKey(clientAddress)]?.cancel()
 	}
 }
diff --git a/src/index.ts b/src/index.ts
index d2bc1a78d..11446298c 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -8,7 +8,10 @@ export function address(): string {
   return XMTPModule.address();
 }
 
-export async function auth(address: string, environment: 'local' | 'dev' | 'production') {
+export async function auth(
+  address: string,
+  environment: "local" | "dev" | "production"
+) {
   return await XMTPModule.auth(address, environment);
 }
 
@@ -16,66 +19,103 @@ export async function receiveSignature(requestID: string, signature: string) {
   return await XMTPModule.receiveSignature(requestID, signature);
 }
 
-export async function createRandom(environment: 'local' | 'dev' | 'production'): Promise<string> {
+export async function createRandom(
+  environment: "local" | "dev" | "production"
+): Promise<string> {
   return await XMTPModule.createRandom(environment);
 }
 
-export async function listConversations(): Promise<Conversation[]> {
-  return (await XMTPModule.listConversations()).map((json: string) => {
-    return new Conversation(JSON.parse(json));
-  });
+export async function listConversations(
+  clientAddress: string
+): Promise<Conversation[]> {
+  return (await XMTPModule.listConversations(clientAddress)).map(
+    (json: string) => {
+      return new Conversation(JSON.parse(json));
+    }
+  );
 }
 
 export async function listMessages(
+  clientAddress: string,
   conversationTopic: string,
   conversationID: string | undefined,
-  limit?: number | undefined, 
-  before?: Date | undefined, 
+  limit?: number | undefined,
+  before?: Date | undefined,
   after?: Date | undefined
 ): Promise<DecodedMessage[]> {
-  return (await XMTPModule.loadMessages(conversationTopic, conversationID, limit, before?.getTime, after?.getTime)).map(
-    (json: string) => {
-      return JSON.parse(json);
-    }
-  );
+  return (
+    await XMTPModule.loadMessages(
+      clientAddress,
+      conversationTopic,
+      conversationID,
+      limit,
+      before?.getTime,
+      after?.getTime
+    )
+  ).map((json: string) => {
+    return JSON.parse(json);
+  });
 }
 
 // TODO: support conversation ID
 export async function createConversation(
+  clientAddress: string,
   peerAddress: string,
   conversationID: string | undefined
 ): Promise<Conversation> {
   return new Conversation(
-    JSON.parse(await XMTPModule.createConversation(peerAddress, conversationID))
+    JSON.parse(
+      await XMTPModule.createConversation(
+        clientAddress,
+        peerAddress,
+        conversationID
+      )
+    )
   );
 }
 
 export async function sendMessage(
+  clientAddress: string,
   conversationTopic: string,
   conversationID: string | undefined,
   content: any
 ): Promise<DecodedMessage> {
   return JSON.parse(
-    await XMTPModule.sendMessage(conversationTopic, conversationID, content)
+    await XMTPModule.sendMessage(
+      clientAddress,
+      conversationTopic,
+      conversationID,
+      content
+    )
   );
 }
 
-export function subscribeToConversations() {
-  return XMTPModule.subscribeToConversations();
+export function subscribeToConversations(clientAddress: string) {
+  return XMTPModule.subscribeToConversations(clientAddress);
 }
 
 export async function subscribeToMessages(
+  clientAddress: string,
   topic: string,
   conversationID?: string | undefined
 ) {
-  return await XMTPModule.subscribeToMessages(topic, conversationID);
+  return await XMTPModule.subscribeToMessages(
+    clientAddress,
+    topic,
+    conversationID
+  );
 }
 
 export async function unsubscribeFromMessages(
+  clientAddress: string,
   topic: string,
   conversationID?: string | undefined
 ) {
-  return await XMTPModule.unsubscribeFromMessages(topic, conversationID);
+  return await XMTPModule.unsubscribeFromMessages(
+    clientAddress,
+    topic,
+    conversationID
+  );
 }
 
 export const emitter = new EventEmitter(XMTPModule ?? NativeModulesProxy.XMTP);
diff --git a/src/lib/Client.ts b/src/lib/Client.ts
index 2c25c154c..63be66f82 100644
--- a/src/lib/Client.ts
+++ b/src/lib/Client.ts
@@ -1,14 +1,16 @@
 import { Signer, utils } from "ethers";
-
 import Conversations from "./Conversations";
 import { hexToBytes } from "./util";
 import * as XMTPModule from "../index";
-
+declare const Buffer;
 export class Client {
   address: string;
   conversations: Conversations;
 
-  static async create(signer: Signer, environment: 'local' | 'dev' | 'production'): Promise<Client> {
+  static async create(
+    signer: Signer,
+    environment: "local" | "dev" | "production"
+  ): Promise<Client> {
     return new Promise<Client>((resolve, reject) => {
       (async () => {
         XMTPModule.emitter.addListener(
@@ -40,13 +42,15 @@ export class Client {
     });
   }
 
-  static async createRandom(environment: 'local' | 'dev' | 'production'): Promise<Client> {
+  static async createRandom(
+    environment: "local" | "dev" | "production"
+  ): Promise<Client> {
     const address = await XMTPModule.createRandom(environment);
     return new Client(address);
   }
 
   constructor(address: string) {
     this.address = address;
-    this.conversations = new Conversations();
+    this.conversations = new Conversations(this);
   }
 }
diff --git a/src/lib/Conversation.ts b/src/lib/Conversation.ts
index 92fe44b10..a5a5cd2a3 100644
--- a/src/lib/Conversation.ts
+++ b/src/lib/Conversation.ts
@@ -1,18 +1,22 @@
 import { DecodedMessage } from "./DecodedMessage";
 import * as XMTP from "../index";
+import { Client } from "./Client";
 
 export class Conversation {
+  clientAddress: string;
   topic: string;
   peerAddress: string;
   version: string;
   conversationID?: string | undefined;
 
   constructor(params: {
+    clientAddress: string;
     topic: string;
     peerAddress: string;
     version: string;
     conversationID?: string | undefined;
   }) {
+    this.clientAddress = params.clientAddress;
     this.topic = params.topic;
     this.peerAddress = params.peerAddress;
     this.version = params.version;
@@ -20,9 +24,20 @@ export class Conversation {
   }
 
   // TODO: Support pagination and conversation ID here
-  async messages(limit?: number | undefined, before?: Date | undefined, after?: Date | undefined): Promise<DecodedMessage[]> {
+  async messages(
+    limit?: number | undefined,
+    before?: Date | undefined,
+    after?: Date | undefined
+  ): Promise<DecodedMessage[]> {
     try {
-      return await XMTP.listMessages(this.topic, this.conversationID, limit, before, after);
+      return await XMTP.listMessages(
+        this.clientAddress,
+        this.topic,
+        this.conversationID,
+        limit,
+        before,
+        after
+      );
     } catch (e) {
       console.info("ERROR in listMessages", e);
       return [];
@@ -32,7 +47,12 @@ export class Conversation {
   // TODO: support content types and conversation ID
   async send(content: any): Promise<DecodedMessage> {
     try {
-      return await XMTP.sendMessage(this.topic, this.conversationID, content);
+      return await XMTP.sendMessage(
+        this.clientAddress,
+        this.topic,
+        this.conversationID,
+        content
+      );
     } catch (e) {
       console.info("ERROR in send()", e);
       throw e;
@@ -42,7 +62,11 @@ export class Conversation {
   streamMessages(
     callback: (message: DecodedMessage) => Promise<void>
   ): () => void {
-    XMTP.subscribeToMessages(this.topic, this.conversationID);
+    XMTP.subscribeToMessages(
+      this.clientAddress,
+      this.topic,
+      this.conversationID
+    );
 
     XMTP.emitter.addListener(
       "message",
@@ -61,7 +85,11 @@ export class Conversation {
     );
 
     return () => {
-      XMTP.unsubscribeFromMessages(this.topic, this.conversationID);
+      XMTP.unsubscribeFromMessages(
+        this.clientAddress,
+        this.topic,
+        this.conversationID
+      );
     };
   }
 }
diff --git a/src/lib/Conversations.ts b/src/lib/Conversations.ts
index a53e3c3c7..5f9b9045d 100644
--- a/src/lib/Conversations.ts
+++ b/src/lib/Conversations.ts
@@ -1,10 +1,21 @@
 import { Conversation } from "./Conversation";
+import { Client } from "./Client";
 import * as XMTPModule from "../index";
+
+type Context = {
+  conversationID: string;
+  metadata: { [key: string]: string };
+};
 export default class Conversations {
+  client: Client;
   private known = {} as { [topic: string]: boolean };
 
+  constructor(client: Client) {
+    this.client = client;
+  }
+
   async list(): Promise<Conversation[]> {
-    const result = await XMTPModule.listConversations();
+    const result = await XMTPModule.listConversations(this.client.address);
 
     for (const conversation of result) {
       this.known[conversation.topic] = true;
@@ -14,12 +25,19 @@ export default class Conversations {
   }
 
   // TODO: support conversation ID
-  async newConversation(peerAddress: string): Promise<Conversation> {
-    return await XMTPModule.createConversation(peerAddress, "");
+  async newConversation(
+    peerAddress: string,
+    context?: Context
+  ): Promise<Conversation> {
+    return await XMTPModule.createConversation(
+      this.client.address,
+      peerAddress,
+      context?.conversationID
+    );
   }
 
   async stream(callback: (conversation: Conversation) => Promise<void>) {
-    XMTPModule.subscribeToConversations();
+    XMTPModule.subscribeToConversations(this.client.address);
     XMTPModule.emitter.addListener(
       "conversation",
       async (conversation: Conversation) => {
diff --git a/tsconfig.json b/tsconfig.json
index dbf7492b8..fde3fd2ea 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,6 +2,7 @@
 {
   "extends": "expo-module-scripts/tsconfig.base",
   "compilerOptions": {
+    "lib": ["es2015", "DOM"],
     "outDir": "./build"
   },
   "include": ["./src"],

From aae79a83384eecb766d0451fc22e47b40a3fa4e0 Mon Sep 17 00:00:00 2001
From: Pat Nakajima <patnakajima@gmail.com>
Date: Wed, 3 May 2023 13:12:36 -0700
Subject: [PATCH 3/8] Remove sleep

---
 example/src/tests.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/example/src/tests.ts b/example/src/tests.ts
index 03e02d7ef..507d1cac6 100644
--- a/example/src/tests.ts
+++ b/example/src/tests.ts
@@ -36,8 +36,6 @@ test("can message a client", async () => {
     alice.address
   );
 
-  await sleep(1000);
-
   const aliceConversation = (await alice.conversations.list())[0];
   if (!aliceConversation) {
     throw new Error("aliceConversation should exist");

From 32abf1f5cf6fe24601a455ff00e13b7aa841268c Mon Sep 17 00:00:00 2001
From: Pat Nakajima <patnakajima@gmail.com>
Date: Wed, 3 May 2023 13:13:03 -0700
Subject: [PATCH 4/8] remove prints

---
 example/src/tests.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/example/src/tests.ts b/example/src/tests.ts
index 507d1cac6..8c7a9da9b 100644
--- a/example/src/tests.ts
+++ b/example/src/tests.ts
@@ -25,8 +25,6 @@ test("can make a client", async () => {
 test("can message a client", async () => {
   const bob = await XMTP.Client.createRandom("local");
   const alice = await XMTP.Client.createRandom("local");
-  console.log("BOB ADDRESS: ", bob.address);
-  console.log("ALICE ADDRESS: ", alice.address);
 
   if (bob.address === alice.address) {
     throw new Error("bob and alice should be different");

From 856ec6ee6cb91416db9c4a70696ca4dcd473b63c Mon Sep 17 00:00:00 2001
From: Pat Nakajima <patnakajima@gmail.com>
Date: Wed, 3 May 2023 13:13:32 -0700
Subject: [PATCH 5/8] remove more prints

---
 ios/XMTPModule.swift | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/ios/XMTPModule.swift b/ios/XMTPModule.swift
index 186e473c2..fcb2039ac 100644
--- a/ios/XMTPModule.swift
+++ b/ios/XMTPModule.swift
@@ -159,13 +159,6 @@ public class XMTPModule: Module {
 			let messages = try await conversation.messages(limit: limit, before: beforeDate, after: afterDate).map { try DecodedMessageWrapper.encode($0) }
 
 			let client = clients[clientAddress]!
-			print("OUR (\(clientAddress) CONVERSATIONS \(try! await client.conversations.list().map(\.topic))")
-
-			for (_, client) in clients {
-				print("CONVERSATIONS for \(client.address) \(try! await client.conversations.list().map(\.topic))")
-			}
-
-			print("GOT MESSAGES FOR \(clientAddress): \(messages)")
 
 			return messages
 		}
@@ -276,7 +269,6 @@ public class XMTPModule: Module {
 		subscriptions[conversation.cacheKey(clientAddress)] = Task {
 			do {
 				for try await message in conversation.streamMessages() {
-					print("GOT A MESSAGE IN SWIFT \(message)")
 					sendEvent("message", [
 						"topic": conversation.topic,
 						"conversationID": conversation.conversationID,

From e6951829e00eab89477e310d29c2dc9d88bc49fd Mon Sep 17 00:00:00 2001
From: Pat Nakajima <patnakajima@gmail.com>
Date: Wed, 3 May 2023 13:13:52 -0700
Subject: [PATCH 6/8] better label

---
 example/App.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/example/App.tsx b/example/App.tsx
index aa8cb8625..a4d312ef1 100644
--- a/example/App.tsx
+++ b/example/App.tsx
@@ -23,10 +23,7 @@ export default function App() {
         ) : (
           <View>
             <AuthView setClient={setClient} />
-            <Button
-              onPress={() => setIsTesting(true)}
-              title="Enable Test Mode"
-            />
+            <Button onPress={() => setIsTesting(true)} title="Unit tests" />
           </View>
         )}
       </SafeAreaView>

From c7b05010fd2f897379c44cb4b1fc4ac0851da9cc Mon Sep 17 00:00:00 2001
From: Pat Nakajima <patnakajima@gmail.com>
Date: Wed, 3 May 2023 13:19:45 -0700
Subject: [PATCH 7/8] run automatically

---
 example/src/TestsView.tsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/example/src/TestsView.tsx b/example/src/TestsView.tsx
index 2abf4391c..cb6f3f900 100644
--- a/example/src/TestsView.tsx
+++ b/example/src/TestsView.tsx
@@ -26,6 +26,12 @@ function TestView({ test }: { test: Test }): JSX.Element {
     }
   }
 
+  useEffect(() => {
+    (async () => {
+      await run();
+    })();
+  }, [test]);
+
   const backgroundColor = {
     waiting: "#fafafa",
     success: "#d4edda",

From cae81d28fc40feff09036f42ce7308cef5b2b009 Mon Sep 17 00:00:00 2001
From: Pat Nakajima <patnakajima@gmail.com>
Date: Wed, 3 May 2023 13:43:02 -0700
Subject: [PATCH 8/8] Make xcode tests actually respect the result

---
 .../project.pbxproj                           |  4 --
 .../xmtpreactnativesdkexampleUITests.swift    | 24 ++++++---
 ...ctnativesdkexampleUITestsLaunchTests.swift | 29 -----------
 example/src/TestsView.tsx                     | 52 ++++++++++++++++---
 example/src/tests.ts                          |  4 ++
 5 files changed, 67 insertions(+), 46 deletions(-)
 delete mode 100644 example/ios/xmtpreactnativesdkexampleUITests/xmtpreactnativesdkexampleUITestsLaunchTests.swift

diff --git a/example/ios/xmtpreactnativesdkexample.xcodeproj/project.pbxproj b/example/ios/xmtpreactnativesdkexample.xcodeproj/project.pbxproj
index b023fdb75..8b2cdf4fc 100644
--- a/example/ios/xmtpreactnativesdkexample.xcodeproj/project.pbxproj
+++ b/example/ios/xmtpreactnativesdkexample.xcodeproj/project.pbxproj
@@ -12,7 +12,6 @@
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		3E461D99554A48A4959DE609 /* SplashScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */; };
 		A6A5DB882A00551E001DF8C2 /* xmtpreactnativesdkexampleUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6A5DB872A00551E001DF8C2 /* xmtpreactnativesdkexampleUITests.swift */; };
-		A6A5DB8A2A00551E001DF8C2 /* xmtpreactnativesdkexampleUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6A5DB892A00551E001DF8C2 /* xmtpreactnativesdkexampleUITestsLaunchTests.swift */; };
 		B18059E884C0ABDD17F3DC3D /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC715A2D49A985799AEE119 /* ExpoModulesProvider.swift */; };
 		BB2F792D24A3F905000567C9 /* Expo.plist in Resources */ = {isa = PBXBuildFile; fileRef = BB2F792C24A3F905000567C9 /* Expo.plist */; };
 		C90474A97E544153BED95C2A /* noop-file.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDF0078FD601458DA88B0565 /* noop-file.swift */; };
@@ -42,7 +41,6 @@
 		80323D3D45487AD85F64F249 /* Pods-xmtpreactnativesdkexample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-xmtpreactnativesdkexample.debug.xcconfig"; path = "Target Support Files/Pods-xmtpreactnativesdkexample/Pods-xmtpreactnativesdkexample.debug.xcconfig"; sourceTree = "<group>"; };
 		A6A5DB852A00551E001DF8C2 /* xmtpreactnativesdkexampleUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = xmtpreactnativesdkexampleUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		A6A5DB872A00551E001DF8C2 /* xmtpreactnativesdkexampleUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = xmtpreactnativesdkexampleUITests.swift; sourceTree = "<group>"; };
-		A6A5DB892A00551E001DF8C2 /* xmtpreactnativesdkexampleUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = xmtpreactnativesdkexampleUITestsLaunchTests.swift; sourceTree = "<group>"; };
 		AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SplashScreen.storyboard; path = xmtpreactnativesdkexample/SplashScreen.storyboard; sourceTree = "<group>"; };
 		BB2F792C24A3F905000567C9 /* Expo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Expo.plist; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
@@ -138,7 +136,6 @@
 			isa = PBXGroup;
 			children = (
 				A6A5DB872A00551E001DF8C2 /* xmtpreactnativesdkexampleUITests.swift */,
-				A6A5DB892A00551E001DF8C2 /* xmtpreactnativesdkexampleUITestsLaunchTests.swift */,
 			);
 			path = xmtpreactnativesdkexampleUITests;
 			sourceTree = "<group>";
@@ -384,7 +381,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A6A5DB8A2A00551E001DF8C2 /* xmtpreactnativesdkexampleUITestsLaunchTests.swift in Sources */,
 				A6A5DB882A00551E001DF8C2 /* xmtpreactnativesdkexampleUITests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/example/ios/xmtpreactnativesdkexampleUITests/xmtpreactnativesdkexampleUITests.swift b/example/ios/xmtpreactnativesdkexampleUITests/xmtpreactnativesdkexampleUITests.swift
index 497a979fe..c44662540 100644
--- a/example/ios/xmtpreactnativesdkexampleUITests/xmtpreactnativesdkexampleUITests.swift
+++ b/example/ios/xmtpreactnativesdkexampleUITests/xmtpreactnativesdkexampleUITests.swift
@@ -18,24 +18,34 @@ final class xmtpreactnativesdkexampleUITests: XCTestCase {
     // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this.
   }
 
-  func testExample() throws {
+  func testRunTests() throws {
     // UI tests must launch the application that they test.
     let app = XCUIApplication()
     app.launch()
 
-    let button = app.buttons["Enable Test Mode"]
+    // Go to unit tests page
+    let button = app.buttons["Unit tests"]
     XCTAssert(button.waitForExistence(timeout: 3))
     button.tap()
 
+    // Make sure we're there
     let view = app.staticTexts["Test View"]
     XCTAssert(view.waitForExistence(timeout: 3))
 
-    let result = app.staticTexts["result"]
-    XCTAssert(result.waitForExistence(timeout: 3))
+    // Wait for tests to complete
+    let complete = app.staticTexts["tests-complete"]
+    XCTAssert(complete.waitForExistence(timeout: 5))
 
-    let input = app.textFields["input"]
-    XCTAssert(input.waitForExistence(timeout: 3))
-    
+    // See if we have any failures
+    if app.staticTexts["FAIL"].waitForExistence(timeout: 3) {
+      // Take a screenshot so we can see what failed in the UI
+      let screenshot = app.windows.firstMatch.screenshot()
+      let attachment = XCTAttachment(screenshot: screenshot)
+      attachment.lifetime = .keepAlways
+      add(attachment)
+
+      XCTFail("Tests failed.")
+    }
   }
 
 }
diff --git a/example/ios/xmtpreactnativesdkexampleUITests/xmtpreactnativesdkexampleUITestsLaunchTests.swift b/example/ios/xmtpreactnativesdkexampleUITests/xmtpreactnativesdkexampleUITestsLaunchTests.swift
deleted file mode 100644
index 35acfdc2f..000000000
--- a/example/ios/xmtpreactnativesdkexampleUITests/xmtpreactnativesdkexampleUITestsLaunchTests.swift
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-//  xmtpreactnativesdkexampleUITestsLaunchTests.swift
-//  xmtpreactnativesdkexampleUITests
-//
-//  Created by Pat Nakajima on 5/1/23.
-//
-
-import XCTest
-
-final class xmtpreactnativesdkexampleUITestsLaunchTests: XCTestCase {
-
-    override class var runsForEachTargetApplicationUIConfiguration: Bool {
-        true
-    }
-
-    override func setUpWithError() throws {
-        continueAfterFailure = false
-    }
-
-    func testLaunch() throws {
-        let app = XCUIApplication()
-        app.launch()
-
-        let attachment = XCTAttachment(screenshot: app.screenshot())
-        attachment.name = "Launch Screen"
-        attachment.lifetime = .keepAlways
-        add(attachment)
-    }
-}
diff --git a/example/src/TestsView.tsx b/example/src/TestsView.tsx
index cb6f3f900..1efec75ef 100644
--- a/example/src/TestsView.tsx
+++ b/example/src/TestsView.tsx
@@ -5,7 +5,14 @@ import { tests, Test } from "./tests";
 
 type Result = "waiting" | "running" | "success" | "failure" | "error";
 
-function TestView({ test }: { test: Test }): JSX.Element {
+function TestView({
+  test,
+  onComplete,
+}: {
+  test: Test;
+  onComplete: () => void;
+}): JSX.Element {
+  const [markedComplete, setMarkedComplete] = useState<boolean>(false);
   const [result, setResult] = useState<Result>("waiting");
   const [errorMessage, setErrorMessage] = useState<string>("");
 
@@ -24,6 +31,11 @@ function TestView({ test }: { test: Test }): JSX.Element {
         setErrorMessage(JSON.stringify(err));
       }
     }
+
+    if (!markedComplete) {
+      onComplete();
+      setMarkedComplete(true);
+    }
   }
 
   useEffect(() => {
@@ -56,9 +68,19 @@ function TestView({ test }: { test: Test }): JSX.Element {
           title={result == "running" ? "Running..." : "Run"}
         />
       </View>
+      {result == "failure" && (
+        <Text
+          testID="FAIL"
+          style={{ paddingHorizontal: 12, paddingBottom: 12 }}
+        >
+          {test.name} failed
+        </Text>
+      )}
       {errorMessage && (
         <View style={{ paddingHorizontal: 12, paddingBottom: 12 }}>
-          <Text style={{ color: "#721c24" }}>Error: {errorMessage}</Text>
+          <Text testID="FAIL" style={{ color: "#721c24" }}>
+            Error: {errorMessage}
+          </Text>
         </View>
       )}
     </View>
@@ -66,18 +88,36 @@ function TestView({ test }: { test: Test }): JSX.Element {
 }
 
 export default function TestsView(): JSX.Element {
-  const [text, setText] = useState<string>("");
+  const [completedTests, setCompletedTests] = useState<number>(0);
 
   return (
     <ScrollView>
       <View>
         <View style={{ padding: 12 }}>
-          <Text>Test View</Text>
-          <Text testID="Test View">This view is used by unit tests.</Text>
+          <Text testID="Test View">Unit Tests</Text>
+          <View
+            style={{ flexDirection: "row", justifyContent: "space-between" }}
+          >
+            <Text>
+              Running {completedTests}/{tests.length}
+            </Text>
+
+            {completedTests == tests.length && (
+              <Text testID="tests-complete">Done</Text>
+            )}
+          </View>
         </View>
         <View testID="tests" style={{ paddingHorizontal: 12 }}>
           {tests.map((test: Test, i) => {
-            return <TestView test={test} key={i} />;
+            return (
+              <TestView
+                test={test}
+                onComplete={() => {
+                  setCompletedTests((prev) => prev + 1);
+                }}
+                key={i}
+              />
+            );
           })}
         </View>
       </View>
diff --git a/example/src/tests.ts b/example/src/tests.ts
index 8c7a9da9b..0252b7e3c 100644
--- a/example/src/tests.ts
+++ b/example/src/tests.ts
@@ -17,6 +17,10 @@ function test(name: string, perform: () => Promise<boolean>) {
   tests.push({ name, run: perform });
 }
 
+// test("can fail", async () => {
+//   return false;
+// });
+
 test("can make a client", async () => {
   const client = await XMTP.Client.createRandom("local");
   return client.address.length > 0;