Code

chore: grab most upstream changes#11

Code

Merged

MuckT merged 56 commits intomain-wallet-dmwallet-dm/xmtp-dapp:main-wallet-dmfrom tomm/upstream-merge-20240210wallet-dm/xmtp-dapp:tomm/upstream-merge-20240210Copy head branch name to clipboardFeb 11, 2024

Commits

Commits on Nov 20, 2023

• Merge pull request ephemeraHQ#407 from xmtp-labs/dev

  Show description for 6a233b9
  daria-github

  authored
  6a233b9

  Copy full SHA for 6a233b9

Commits on Nov 22, 2023

• Merge pull request ephemeraHQ#409 from xmtp-labs/dev

  Show description for 1bed2ef
  daria-github

  authored
  1bed2ef

  Copy full SHA for 1bed2ef

Commits on Jan 3, 2024

• Merge pull request ephemeraHQ#415 from xmtp-labs/dev

  Show description for 3d60706
  daria-github

  authored
  3d60706

  Copy full SHA for 3d60706

Commits on Jan 9, 2024

• Merge pull request ephemeraHQ#417 from xmtp-labs/dev

  Show description for 3692fb9
  daria-github

  authored
  3692fb9

  Copy full SHA for 3692fb9

Commits on Jan 12, 2024

• add portable consent

  

  daria-github

  committed
  4733d77

  Copy full SHA for 4733d77

• updated initial sort

  

  daria-github

  committed
  aad2bae

  Copy full SHA for aad2bae

Commits on Jan 13, 2024

• updated dependencies

  

  daria-github

  committed
  e29fe0c

  Copy full SHA for e29fe0c

• fixed type

  

  daria-github

  committed
  49803b2

  Copy full SHA for 49803b2

Commits on Jan 16, 2024

• memoized messages to pass

  

  daria-github

  committed
  f867ef3

  Copy full SHA for f867ef3

• Merge pull request ephemeraHQ#419 from xmtp-labs/dj/portable-consent

  Show description for 4328abd
  daria-github

  authored
  4328abd

  Copy full SHA for 4328abd

• test wip, updated tab switching logic

  

  daria-github

  committed
  2762aea

  Copy full SHA for 2762aea

• remove consent tests

  

  daria-github

  committed
  b52acd9

  Copy full SHA for b52acd9

• fix lint error

  

  daria-github

  committed
  14a1bc8

  Copy full SHA for 14a1bc8

• Merge branch 'dev' into dj/portable-consent

  daria-github

  authored
  9d4a732

  Copy full SHA for 9d4a732

Commits on Jan 17, 2024

• Merge pull request ephemeraHQ#420 from xmtp-labs/dj/portable-consent

  Show description for 497e306
  daria-github

  authored
  497e306

  Copy full SHA for 497e306

• updated port

  

  daria-github

  committed
  82eccaa

  Copy full SHA for 82eccaa

• consent test boilerplate

  

  daria-github

  committed
  af40140

  Copy full SHA for af40140

• updated tab flow and tests

  

  daria-github

  committed
  8d5c0e7

  Copy full SHA for 8d5c0e7

• Merge branch 'dev' into dj/portable-consent

  daria-github

  authored
  c026dfa

  Copy full SHA for c026dfa

• Merge pull request ephemeraHQ#421 from xmtp-labs/dj/portable-consent

  Show description for a02edc8
  daria-github

  authored
  a02edc8

  Copy full SHA for a02edc8

Commits on Jan 19, 2024

• convo list wip

  

  daria-github

  committed
  6ec441f

  Copy full SHA for 6ec441f

Commits on Jan 22, 2024

• updated consent flow

  

  daria-github

  committed
  cbc60c3

  Copy full SHA for cbc60c3

• revert package json changes

  

  daria-github

  committed
  53b294a

  Copy full SHA for 53b294a

Commits on Jan 23, 2024

• comment out code for sent messages

  

  daria-github

  committed
  a338e39

  Copy full SHA for a338e39

• added db hook

  

  daria-github

  committed
  7f6d424

  Copy full SHA for 7f6d424

• Merge branch 'dev' into dj/portable-consent-changes

  daria-github

  authored
  f35b2a3

  Copy full SHA for f35b2a3

• Merge pull request ephemeraHQ#422 from xmtp-labs/dj/portable-consent-changes

  Show description for e57d4ab
  daria-github

  authored
  e57d4ab

  Copy full SHA for e57d4ab

• bump react sdk

  

  daria-github

  committed
  39aa0fa

  Copy full SHA for 39aa0fa

• updated vite config for wasm

  

  daria-github

  committed
  038aaa2

  Copy full SHA for 038aaa2

• Merge pull request ephemeraHQ#425 from xmtp-labs/dj/bump-react-sdk

  Show description for 61f511b
  daria-github

  authored
  61f511b

  Copy full SHA for 61f511b

Commits on Jan 25, 2024

• revert to pre consent sdk version

  

  daria-github

  committed
  17c1838

  Copy full SHA for 17c1838

• update lockfile

  

  daria-github

  committed
  cfeeb55

  Copy full SHA for cfeeb55

• Merge pull request ephemeraHQ#427 from xmtp-labs/dj/revert-react-sdk-bump

  Show description for 2724b18
  daria-github

  authored
  2724b18

  Copy full SHA for 2724b18

Commits on Jan 26, 2024

• bumped sdk and db version

  

  daria-github

  committed
  949bb12

  Copy full SHA for 949bb12

• regenerated lockfile

  

  daria-github

  committed
  3b20b2b

  Copy full SHA for 3b20b2b

• updated vite config

  

  daria-github

  committed
  0a8fa5c

  Copy full SHA for 0a8fa5c

Commits on Jan 29, 2024

• added patch version

  

  daria-github

  committed
  4224e51

  Copy full SHA for 4224e51

• Merge pull request ephemeraHQ#428 from xmtp-labs/dj/bump-sdk-5.0

  Show description for 33bfd5d
  daria-github

  authored
  33bfd5d

  Copy full SHA for 33bfd5d

Commits on Feb 3, 2024

• updated frames get/post logic

  

  daria-github

  committed
  c5c2f81

  Copy full SHA for c5c2f81

Commits on Feb 5, 2024

• Merge pull request ephemeraHQ#431 from xmtp-labs/dj/frames

  Show description for ff18531
  daria-github

  authored
  ff18531

  Copy full SHA for ff18531

Commits on Feb 6, 2024

• bumped sdk version

  

  daria-github

  committed
  0dddce1

  Copy full SHA for 0dddce1

• bumped db version

  

  daria-github

  committed
  3bad2d4

  Copy full SHA for 3bad2d4

• flattened props

  

  daria-github

  committed
  31e01bc

  Copy full SHA for 31e01bc

• Merge branch 'dev' into dj/frames

  daria-github

  authored
  ab98764

  Copy full SHA for ab98764

• Merge pull request ephemeraHQ#432 from xmtp-labs/dj/frames

  Show description for e7ababe
  daria-github

  authored
  e7ababe

  Copy full SHA for e7ababe

• updated to latest frames spec

  

  daria-github

  committed
  cdfec08

  Copy full SHA for cdfec08

• Merge branch 'dev' into dj/frames

  daria-github

  authored
  3ec07e7

  Copy full SHA for 3ec07e7

• Merge pull request ephemeraHQ#433 from xmtp-labs/dj/frames

  Show description for a545dd2
  daria-github

  authored
  a545dd2

  Copy full SHA for a545dd2

Commits on Feb 7, 2024

• Merge branch 'main' into dj/fix-conflicts

  

  daria-github

  committed
  38071d9

  Copy full SHA for 38071d9

• Merge pull request ephemeraHQ#434 from xmtp-labs/dj/fix-conflicts

  Show description for cc8962c
  daria-github

  authored
  cc8962c

  Copy full SHA for cc8962c

Commits on Feb 10, 2024

• chore: merge upstream

  MuckT

  committed
  6a1080e

  Copy full SHA for 6a1080e

• build(deps): downgrade @xmtp/react-sdk

  MuckT

  committed
  bda29e1

  Copy full SHA for bda29e1

• build(deps): remove deprecated vite-plugin-rewrite-all

  MuckT

  committed
  7cc5b09

  Copy full SHA for 7cc5b09

• chore: remove setConsentFilter and consentFilter

  MuckT

  committed
  f8cc370

  Copy full SHA for f8cc370

Commits on Feb 11, 2024

• style: run lint and format

  MuckT

  committed
  8bcfb81

  Copy full SHA for 8bcfb81

• style: run prettier

  MuckT

  committed
  e2e71a5

  Copy full SHA for e2e71a5