Merge branch 'main' into fix/routing-issue

bhavya2611 · web-flow · commit 16a1939d3af1 · 2022-08-25T20:11:32.000+05:30
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-16.9
+16.16.0
diff --git a/components/ConversationsList.tsx b/components/ConversationsList.tsx
@@ -2,7 +2,7 @@ import { classNames, truncate, formatDate, checkPath } from '../helpers'
 import Link from 'next/link'
 import Address from './Address'
 import { useRouter } from 'next/router'
-import { Conversation } from '@xmtp/xmtp-js/dist/types/src/conversations'
+import { Conversation } from '@xmtp/xmtp-js'
 import useConversation from '../hooks/useConversation'
 import { XmtpContext } from '../contexts/xmtp'
 import { Message } from '@xmtp/xmtp-js'
diff --git a/contexts/xmtp.ts b/contexts/xmtp.ts
@@ -1,7 +1,7 @@
 import { createContext, Dispatch } from 'react'
 import { Client, Message } from '@xmtp/xmtp-js'
 import { Signer } from 'ethers'
-import { Conversation } from '@xmtp/xmtp-js/dist/types/src/conversations'
+import { Conversation } from '@xmtp/xmtp-js'
 
 export type MessageStoreEvent = {
   peerAddress: string
diff --git a/helpers/env.ts b/helpers/env.ts
@@ -1,5 +1,10 @@
-export const getEnv = (): 'dev' | 'production' => {
-  return process.env.NEXT_PUBLIC_XMTP_ENVIRONMENT === 'production'
-    ? 'production'
-    : 'dev'
+export const getEnv = (): 'dev' | 'production' | 'local' => {
+  const envVar = process.env.NEXT_PUBLIC_XMTP_ENVIRONMENT
+  if (envVar === 'production') {
+    return envVar
+  }
+  if (envVar === 'local') {
+    return envVar
+  }
+  return 'dev'
 }
diff --git a/hooks/useConversation.ts b/hooks/useConversation.ts
@@ -36,7 +36,7 @@ const useConversation = (
       if (!conversation) return
       console.log('Listing messages for peer address', conversation.peerAddress)
       setLoading(true)
-      const msgs = await conversation.messages({ pageSize: 100 })
+      const msgs = await conversation.messages()
       if (dispatchMessages) {
         dispatchMessages({
           peerAddress: conversation.peerAddress,
diff --git a/next.config.js b/next.config.js
@@ -11,6 +11,7 @@ const nextConfig = optimizedImages({
       // https://github.com/vercel/next.js/issues/7755#issuecomment-937721514
       config.resolve.fallback.fs = false
     }
+    config.resolve.mainFields = ['browser', 'main', 'module']
     return config
   },
 })
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ const nextConfig = optimizedImages({`
`11`	`11`	`// https://github.com/vercel/next.js/issues/7755#issuecomment-937721514`
`12`	`12`	`config.resolve.fallback.fs = false`
`13`	`13`	`}`
	`14`	`+ config.resolve.mainFields = ['browser', 'main', 'module']`
`14`	`15`	`return config`
`15`	`16`	`},`
`16`	`17`	`})`