diff --git a/.gitignore b/.gitignore
index 0ed545b6..9d085fd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,5 @@ app.*.map.json
 /android/app/.cxx/
 android/.kotlin/
 devtools_options.yaml
+rust/target
+rust_dependencies/target
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb65f927..f53e8a8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.2.0
+
+- New: Feature to find friends without a phone number
+- New: The verification state is now transferred to the scanned user
+- New: Registration setup to configure the most important configurations
+- Improved: Show ⌛ instead of the flame icon when it is about to expire
+- Improved: FAQ is now in the app rather than opening in the browser
+- Improved: Videos can now be paused
+- Improved: Lock to record hands-free
+- Fix: Many smaller issues
+
 ## 0.1.8
 
 - Improved: Typos and grammar issues thanks to @AlbertUnruh
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 4328836f..ecfa2298 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -16,9 +16,11 @@ analyzer:
     - "lib/src/model/protobuf/**"
     - "lib/src/model/protobuf/api/websocket/**"
     - "lib/generated/**"
+    - "lib/core/**"
+    - "lib/src/localization/**"
     - "dependencies/**"
     - "pubspec.yaml"
-    - "*.arb"
+    - "**.arb"
     - "test/drift/**"
     - "**.g.dart"
 
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index cb1ef880..31dc1c5c 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -5,6 +5,8 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <!-- Set the background color to the primary color so the white logo is visible -->
+        <item name="android:colorBackground">#FF57CC99</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
diff --git a/assets/animated_icons/hourglass.json b/assets/animated_icons/hourglass.json
new file mode 100644
index 00000000..506dc2c8
--- /dev/null
+++ b/assets/animated_icons/hourglass.json
@@ -0,0 +1 @@
+{"v":"5.12.1","fr":60,"ip":0,"op":132,"w":1024,"h":1024,"nm":"emoji_u23f3","ddd":0,"assets":[{"id":"comp_0","nm":"hourglass","fr":60,"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"sand detail 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[512,512,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":84,"s":[{"i":[[7.388,22.82],[1.565,37.537],[-3.992,49.283],[-8.375,-50.473],[0,0]],"o":[[-18.612,-45.18],[-1.308,-31.373],[-9.527,-4.498],[7.79,46.948],[0,0]],"v":[[40.612,217.18],[12.435,45.463],[10.829,-49.526],[8.527,144.576],[12.365,228.927]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":89.162,"s":[{"i":[[15.054,30.153],[-6.768,54.537],[-2.771,53.197],[-8.375,-50.473],[0,0]],"o":[[-19.612,-39.847],[4.121,-33.209],[-9.527,-4.498],[7.79,46.948],[0,0]],"v":[[45.279,221.18],[26.768,75.463],[16.996,-12.192],[8.527,144.576],[10.198,247.594]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":99.484,"s":[{"i":[[30.388,44.82],[13.2,33.956],[-0.329,61.026],[-8.375,-50.473],[0,0]],"o":[[-21.612,-29.18],[-11.377,-29.267],[-9.527,-4.498],[7.79,46.948],[0,0]],"v":[[54.612,229.18],[40.435,138.463],[11.329,12.974],[8.527,144.576],[5.865,284.927]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":102.064,"s":[{"i":[[42.304,40.486],[14.928,31.386],[0.491,61.255],[-8.375,-50.473],[0,0]],"o":[[-27.279,-28.264],[-14.22,-28.3],[-10.302,-7.496],[7.79,46.948],[0,0]],"v":[[65.529,248.847],[46.935,151.13],[12.496,28.308],[8.527,144.576],[4.823,290.802]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":108,"s":[{"i":[[66.138,31.82],[17.065,30.537],[2.13,61.715],[-8.375,-50.473],[0,0]],"o":[[-38.612,-26.43],[-20.935,-39.463],[-11.852,-13.492],[7.79,46.948],[0,0]],"v":[[96.362,273.18],[51.935,183.463],[14.829,58.974],[8.527,144.576],[2.74,302.552]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":116,"s":[{"i":[[57.249,16.867],[23.648,18.616],[15.892,117.205],[-8.375,-50.473],[0,0]],"o":[[-79.457,-23.41],[-28.594,-23.587],[-14.26,-22.804],[7.79,46.948],[0,0]],"v":[[155.457,291.41],[75.341,226.887],[18.638,106.343],[8.527,144.576],[0.052,319.944]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":130.451,"s":[{"i":[[16.584,5.218],[28.257,22.995],[28.171,71.526],[-8.375,-50.473],[0,0]],"o":[[-53.612,-18.18],[-37.435,-30.463],[-18.829,-40.474],[7.79,46.948],[0,0]],"v":[[174.612,304.18],[103.435,250.463],[35.829,182.474],[8.527,144.576],[24.365,306.927]],"c":true}]},{"t":164,"s":[{"i":[[16.584,5.218],[28.258,22.995],[13.171,75.526],[-8.375,-50.473],[0,0]],"o":[[6.388,-10.18],[-37.435,-30.463],[-18.829,-40.474],[7.79,46.948],[0,0]],"v":[[189.612,329.18],[155.435,302.463],[41.829,202.474],[7.527,224.576],[24.365,306.927]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.792144775391,0.156860351563,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":84,"op":164,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"sand detail","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[512,512,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":16,"s":[{"i":[[-4.203,-16.988],[0.847,-8.472],[0,-21.5],[-3.622,8.385],[0,0]],"o":[[12,48.5],[-3,30],[0,10.568],[3.369,-7.799],[0,0]],"v":[[-16,-49.5],[0,30],[0,98.5],[7.38,94.529],[14,77]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":28,"s":[{"i":[[-4.203,-16.988],[0.847,-8.472],[5.069,-35.982],[-6.411,23.639],[0,0]],"o":[[12,48.5],[-3,30],[-1.514,12.441],[5.272,-19.44],[0,0]],"v":[[-16,-17.64],[-10.862,61.136],[-7.965,150.635],[15.693,149.052],[14,77]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":38,"s":[{"i":[[-3.421,-17.083],[2.05,-7.999],[10.375,-32.484],[-11.997,25.645],[0,0]],"o":[[4.183,42.753],[-7.469,28.604],[-19.427,45.689],[10.813,-22.579],[0,0]],"v":[[-8.183,28.497],[-19.355,107.566],[-24.573,212.311],[6.72,191.058],[13.814,115.636]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":48,"s":[{"i":[[0.866,-16.383],[3.252,-7.527],[15.681,-28.986],[-17.583,27.65],[0,0]],"o":[[2.866,41.367],[-11.937,27.207],[-5.961,10.811],[16.354,-25.719],[0,0]],"v":[[-7.366,73.633],[-27.848,153.995],[-48.181,249.986],[-2.253,233.064],[13.628,154.271]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":60,"s":[{"i":[[-1.42,-17.327],[5.122,-6.791],[2.543,-31.51],[-23.348,17.078],[0,0]],"o":[[4.055,27.977],[-18.889,25.035],[-0.67,10.524],[21.717,-15.885],[0,0]],"v":[[-2.428,135.185],[-37.841,216.995],[-76.219,269.522],[-13.703,262.692],[13.338,214.375]],"c":true}]},{"t":74,"s":[{"i":[[-1.401,-17.329],[41.5,-22.5],[47.167,-14.833],[-43.619,26.74],[0,0]],"o":[[4,27.833],[-27.604,14.966],[-0.586,10.519],[40.573,-24.872],[0,0]],"v":[[-2.333,136.167],[-82.5,274.5],[-154.667,307.833],[-48.517,289.902],[13.333,215.333]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.792144775391,0.156860351563,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":96,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"shine down","sr":1,"ks":{"o":{"a":0,"k":60,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[378.193,686.343,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[12.88,-14.96],[-7.12,-38],[-12.96,10.16],[-31.92,46.64],[3.2,15.76],[39.6,-19.84]],"o":[[-25.04,29.28],[7.52,40.08],[41.28,-32.4],[5.44,-8],[-1.92,-9.36],[-17.44,8.8]],"v":[[-34.993,-41.543],[-71.713,65.097],[-13.953,83.977],[47.967,-36.583],[72.927,-85.383],[9.647,-79.703]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":164,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"shine top","sr":1,"ks":{"o":{"a":0,"k":60,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[333.341,318.273,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-13.36,-31.12],[24,-9.12],[16.64,34.24],[-25.12,0.72]],"o":[[10.08,23.52],[-24,9.2],[-16.64,-34.24],[25.12,-0.72]],"v":[[32.979,-16.993],[37.459,69.007],[-38.301,9.887],[-28.301,-70.513]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":164,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"sand mask","td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[521.989,556.553,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[{"i":[[0,0],[-5.219,93.811],[0.001,0.239],[-0.001,0.012],[0,0.018],[74.484,-17.267],[-1.799,-3.863],[0,-0.001],[-56.56,-22.88]],"o":[[112.968,-45.474],[0.036,-0.257],[0,-0.012],[0.001,-0.019],[-0.627,-25.205],[-51.44,11.92],[0,0.001],[38.534,87.834],[13.44,5.52]],"v":[[31.051,-79.593],[232.476,-325.205],[232.523,-325.947],[232.526,-325.984],[232.52,-326.036],[-51.589,-261.193],[-231.965,-242.501],[-231.967,-242.498],[-49.829,-79.593]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":38,"s":[{"i":[[0,0],[-17.391,84.083],[0.001,0.239],[-0.001,0.012],[0.001,0.018],[88.378,1.522],[-1.641,-3.928],[0.001,-0.001],[-56.56,-22.88]],"o":[[99.812,-40.446],[0.036,-0.257],[0,-0.012],[0.001,-0.019],[-0.982,-25.707],[-76.356,-4.312],[-0.001,0.001],[26.838,107.654],[16.501,6.247]],"v":[[31.051,-79.593],[222.769,-288.292],[222.817,-289.034],[222.819,-289.071],[222.813,-289.123],[-16.524,-262.66],[-237.991,-267.768],[-237.994,-267.765],[-49.829,-79.593]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":82,"s":[{"i":[[0,0],[-30.669,73.47],[0.001,0.239],[-0.001,0.012],[0.001,0.018],[111.464,36.981],[-1.469,-4],[0.001,-0.001],[-56.56,-22.88]],"o":[[85.46,-34.96],[0.036,-0.257],[0,-0.012],[0.001,-0.019],[-1.369,-26.256],[-100.467,-33.332],[-0.001,0.001],[14.079,129.277],[19.84,7.04]],"v":[[31.051,-79.593],[212.18,-248.023],[212.228,-248.765],[212.23,-248.802],[212.224,-248.854],[-79.453,-287.534],[-244.566,-295.332],[-244.569,-295.33],[-49.829,-79.593]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":124,"s":[{"i":[[0,0],[-18.497,83.198],[0.001,0.239],[-0.001,0.012],[0.001,0.018],[63.471,-10.514],[-1.627,-3.934],[0.001,-0.001],[-56.56,-22.88]],"o":[[98.616,-39.989],[0.036,-0.257],[0,-0.012],[0.001,-0.019],[-1.014,-25.753],[-63.471,10.514],[-0.001,0.001],[25.775,109.456],[16.779,6.313]],"v":[[31.051,-79.593],[221.887,-284.936],[221.934,-285.678],[221.937,-285.715],[221.931,-285.768],[-12.518,-288.066],[-238.539,-270.065],[-238.542,-270.062],[-49.829,-79.593]],"c":true}]},{"t":164,"s":[{"i":[[0,0],[-5.219,93.811],[0.001,0.239],[-0.001,0.012],[0,0.018],[74.484,-17.267],[-1.799,-3.863],[0,-0.001],[-56.56,-22.88]],"o":[[112.968,-45.474],[0.036,-0.257],[0,-0.012],[0.001,-0.019],[-0.627,-25.205],[-51.44,11.92],[0,0.001],[38.534,87.834],[13.44,5.52]],"v":[[31.051,-79.593],[232.476,-325.205],[232.523,-325.947],[232.526,-325.984],[232.52,-326.036],[-51.589,-261.193],[-231.965,-242.501],[-231.967,-242.498],[-49.829,-79.593]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.792156875134,0.156862750649,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":164,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"sand shadow","tt":1,"tp":5,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[522.311,303.991,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[{"i":[[-39.44,-20.4],[-46.4,16],[-6.16,23.92],[75.92,-17.6],[22.08,-4.64]],"o":[[42.88,22.16],[46.4,-16],[12.866,-39.92],[-51.44,11.92],[-23.433,4.662]],"v":[[-183.351,42.329],[0.009,80.089],[232.009,-71.911],[-54.645,-27.585],[-223.294,0.131]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":38,"s":[{"i":[[-52.216,-20.758],[-62.739,8.383],[-6.16,23.92],[75.92,-17.6],[22.08,-4.64]],"o":[[75,28.387],[66.621,-8.386],[12.866,-39.92],[-51.44,11.92],[-23.433,4.662]],"v":[[-182.394,35.394],[65.792,75.785],[223.64,-36.998],[-60.384,-69.194],[-227.837,-36.695]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":82,"s":[{"i":[[-66.154,-21.149],[-80.563,0.073],[-6.16,23.92],[75.92,-17.6],[22.08,-4.64]],"o":[[110.04,35.18],[88.68,-0.08],[12.866,-39.92],[-51.44,11.92],[-23.433,4.662]],"v":[[-151.351,33.829],[56.009,71.089],[214.509,1.089],[-66.645,-114.585],[-239.294,-52.369]],"c":true}]},{"t":164,"s":[{"i":[[-39.44,-20.4],[-46.4,16],[-6.16,23.92],[75.92,-17.6],[22.08,-4.64]],"o":[[42.88,22.16],[46.4,-16],[12.866,-39.92],[-51.44,11.92],[-23.433,4.662]],"v":[[-183.351,42.329],[0.009,80.089],[232.009,-71.911],[-54.645,-27.585],[-223.294,0.131]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.886274516582,0.65098041296,0.06274510175,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":164,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"sand 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[521.989,556.553,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[{"i":[[40.56,89.28],[0.8,35.44],[0,0],[-56.56,-22.88],[0.72,-62.72],[77.36,-50.32],[12,-30.16],[-6.96,-1.76],[-104.72,0],[-40.8,11.84],[3.6,6.8]],"o":[[-27.04,-59.6],[-1.12,-47.92],[112.968,-45.474],[13.44,5.52],[-0.56,44.88],[-29.12,18.96],[-2.64,6.64],[22.08,5.6],[82.32,0.08],[7.36,-2.16],[-25.12,-47.52]],"v":[[37.611,156.567],[8.251,-21.353],[31.051,-79.593],[-49.829,-79.593],[-14.869,9.527],[-98.389,223.047],[-203.909,299.927],[-195.829,315.847],[-1.669,331.287],[202.731,312.007],[210.491,294.727]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":24,"s":[{"i":[[41.485,94.361],[0.8,35.44],[0,0],[-56.56,-22.88],[0.182,-62.722],[77.36,-50.32],[13.426,-35.776],[-6.96,-1.76],[-104.72,0],[-40.8,11.84],[3.326,6.918]],"o":[[-26.41,-59.869],[-1.12,-47.92],[98.394,-39.904],[16.831,6.325],[-0.062,63.974],[-29.12,18.96],[-2.551,6.673],[22.08,5.6],[82.32,0.08],[7.36,-2.16],[-26.17,-57.095]],"v":[[43.792,161.167],[5.602,-21.088],[31.051,-79.593],[-49.829,-79.593],[-12.988,29.646],[-93.356,235.286],[-203.909,299.927],[-195.829,315.847],[-1.669,331.287],[202.731,312.007],[210.491,294.727]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":46,"s":[{"i":[[42.305,98.871],[0.8,35.44],[0,0],[-56.56,-22.88],[-0.294,-62.723],[77.36,-50.32],[14.691,-40.76],[-6.96,-1.76],[-104.72,0],[-40.8,11.84],[3.083,7.023]],"o":[[-25.851,-60.109],[-1.12,-47.92],[85.46,-34.96],[19.84,7.04],[0.38,80.92],[-29.12,18.96],[-2.472,6.702],[22.08,5.6],[82.32,0.08],[7.36,-2.16],[-27.102,-65.593]],"v":[[36.066,165.249],[3.251,-20.853],[31.051,-79.593],[-49.829,-79.593],[-18.869,13.527],[-88.889,231.047],[-203.909,299.927],[-195.829,315.847],[-1.669,331.287],[202.731,312.007],[210.491,294.727]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":68,"s":[{"i":[[41.015,91.782],[0.8,35.44],[0,0],[-56.56,-22.88],[0.923,-79.123],[77.36,-50.32],[12.702,-32.925],[-6.96,-1.76],[-104.72,0],[-40.8,11.84],[3.465,6.858]],"o":[[-26.73,-59.733],[-1.12,-47.92],[105.792,-42.732],[15.109,5.917],[-0.315,54.282],[-29.12,18.96],[-2.596,6.656],[22.08,5.6],[82.32,0.08],[7.36,-2.16],[-25.637,-52.235]],"v":[[33.208,159.832],[6.947,-21.222],[31.051,-79.593],[-49.829,-79.593],[-12.912,30.571],[-95.911,225.134],[-203.909,299.927],[-195.829,315.847],[-1.669,331.287],[202.731,312.007],[210.491,294.727]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":92,"s":[{"i":[[41.485,94.361],[0.8,35.44],[0,0],[-56.56,-22.88],[0.182,-62.722],[77.36,-50.32],[13.426,-35.776],[-6.96,-1.76],[-104.72,0],[-40.8,11.84],[3.326,6.918]],"o":[[-26.41,-59.869],[-1.12,-47.92],[98.394,-39.904],[16.831,6.325],[-0.062,63.974],[-29.12,18.96],[-2.551,6.673],[22.08,5.6],[82.32,0.08],[7.36,-2.16],[-30.48,-76.28]],"v":[[39.792,174.167],[5.602,-21.088],[31.051,-79.593],[-49.829,-79.593],[-12.988,29.646],[-93.356,235.286],[-203.909,299.927],[-195.829,315.847],[-1.669,331.287],[202.731,312.007],[210.491,294.727]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":114,"s":[{"i":[[45.945,118.198],[0.8,35.44],[0,0],[-56.56,-22.88],[-0.294,-62.723],[77.36,-50.32],[19.92,-68.48],[-6.96,-1.76],[-104.72,0],[-40.8,11.84],[3.083,7.023]],"o":[[-25.851,-60.109],[-1.12,-47.92],[85.46,-34.96],[19.84,7.04],[0.38,80.92],[-29.12,18.96],[-2.472,6.702],[22.08,5.6],[82.32,0.08],[7.36,-2.16],[-26.48,-87.28]],"v":[[36.066,165.249],[3.251,-20.853],[31.051,-79.593],[-49.829,-79.593],[-18.869,13.527],[-88.889,231.047],[-203.909,299.927],[-195.829,315.847],[-1.669,331.287],[202.731,312.007],[210.491,294.727]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":140,"s":[{"i":[[41.015,91.782],[0.8,35.44],[0,0],[-56.56,-22.88],[0.923,-79.123],[77.36,-50.32],[12.702,-32.925],[-6.96,-1.76],[-104.72,0],[-40.8,11.84],[3.465,6.858]],"o":[[-26.73,-59.733],[-1.12,-47.92],[105.792,-42.732],[15.109,5.917],[-0.315,54.282],[-29.12,18.96],[-2.596,6.656],[22.08,5.6],[82.32,0.08],[7.36,-2.16],[-25.637,-52.235]],"v":[[33.208,159.832],[6.947,-21.222],[31.051,-79.593],[-49.829,-79.593],[-12.912,30.571],[-95.911,225.134],[-203.909,299.927],[-195.829,315.847],[-1.669,331.287],[202.731,312.007],[210.491,294.727]],"c":true}]},{"t":164,"s":[{"i":[[40.56,89.28],[0.8,35.44],[0,0],[-56.56,-22.88],[0.72,-62.72],[77.36,-50.32],[12,-30.16],[-6.96,-1.76],[-104.72,0],[-40.8,11.84],[3.6,6.8]],"o":[[-27.04,-59.6],[-1.12,-47.92],[112.968,-45.474],[13.44,5.52],[-0.56,44.88],[-29.12,18.96],[-2.64,6.64],[22.08,5.6],[82.32,0.08],[7.36,-2.16],[-25.12,-47.52]],"v":[[37.611,156.567],[8.251,-21.353],[31.051,-79.593],[-49.829,-79.593],[-14.869,9.527],[-98.389,223.047],[-203.909,299.927],[-195.829,315.847],[-1.669,331.287],[202.731,312.007],[210.491,294.727]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.792156875134,0.156862750649,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":164,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"sand","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[521.989,556.553,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[{"i":[[0,0],[-5.219,93.811],[0.001,0.239],[-0.001,0.012],[0,0.018],[74.484,-17.267],[-1.799,-3.863],[0,-0.001],[-56.56,-22.88]],"o":[[112.968,-45.474],[0.036,-0.257],[0,-0.012],[0.001,-0.019],[-0.627,-25.205],[-51.44,11.92],[0,0.001],[38.534,87.834],[13.44,5.52]],"v":[[31.051,-79.593],[232.476,-325.205],[232.523,-325.947],[232.526,-325.984],[232.52,-326.036],[-51.589,-261.193],[-231.965,-242.501],[-231.967,-242.498],[-49.829,-79.593]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":38,"s":[{"i":[[0,0],[-17.391,84.083],[0.001,0.239],[-0.001,0.012],[0.001,0.018],[88.378,1.522],[-1.641,-3.928],[0.001,-0.001],[-56.56,-22.88]],"o":[[99.812,-40.446],[0.036,-0.257],[0,-0.012],[0.001,-0.019],[-0.982,-25.707],[-76.356,-4.312],[-0.001,0.001],[26.838,107.654],[16.501,6.247]],"v":[[31.051,-79.593],[222.769,-288.292],[222.817,-289.034],[222.819,-289.071],[222.813,-289.123],[-16.524,-262.66],[-237.991,-267.768],[-237.994,-267.765],[-49.829,-79.593]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":82,"s":[{"i":[[0,0],[-30.669,73.47],[0.001,0.239],[-0.001,0.012],[0.001,0.018],[111.464,36.981],[-1.469,-4],[0.001,-0.001],[-56.56,-22.88]],"o":[[85.46,-34.96],[0.036,-0.257],[0,-0.012],[0.001,-0.019],[-1.369,-26.256],[-100.467,-33.332],[-0.001,0.001],[14.079,129.277],[19.84,7.04]],"v":[[31.051,-79.593],[212.18,-248.023],[212.228,-248.765],[212.23,-248.802],[212.224,-248.854],[-79.453,-287.534],[-244.566,-295.332],[-244.569,-295.33],[-49.829,-79.593]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":124,"s":[{"i":[[0,0],[-18.497,83.198],[0.001,0.239],[-0.001,0.012],[0.001,0.018],[63.471,-10.514],[-1.627,-3.934],[0.001,-0.001],[-56.56,-22.88]],"o":[[98.616,-39.989],[0.036,-0.257],[0,-0.012],[0.001,-0.019],[-1.014,-25.753],[-63.471,10.514],[-0.001,0.001],[25.775,109.456],[16.779,6.313]],"v":[[31.051,-79.593],[221.887,-284.936],[221.934,-285.678],[221.937,-285.715],[221.931,-285.768],[-12.518,-288.066],[-238.539,-270.065],[-238.542,-270.062],[-49.829,-79.593]],"c":true}]},{"t":164,"s":[{"i":[[0,0],[-5.219,93.811],[0.001,0.239],[-0.001,0.012],[0,0.018],[74.484,-17.267],[-1.799,-3.863],[0,-0.001],[-56.56,-22.88]],"o":[[112.968,-45.474],[0.036,-0.257],[0,-0.012],[0.001,-0.019],[-0.627,-25.205],[-51.44,11.92],[0,0.001],[38.534,87.834],[13.44,5.52]],"v":[[31.051,-79.593],[232.476,-325.205],[232.523,-325.947],[232.526,-325.984],[232.52,-326.036],[-51.589,-261.193],[-231.965,-242.501],[-231.967,-242.498],[-49.829,-79.593]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.792156875134,0.156862750649,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":164,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"hourglass","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[512,512,0],"ix":2,"l":2},"a":{"a":0,"k":[512,512,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-179.559,0],[0,-26.863],[179.559,0],[0,26.863]],"o":[[179.559,0],[0,26.863],[-179.559,0],[0,-26.863]],"v":[[0,-48.64],[325.12,0],[0,48.64],[-325.12,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.800000011921,0.521568655968,0.321568638086,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[512,80.64],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,26.88],[0,0],[-82.96,0],[0,0],[179.52,0]],"o":[[0,0],[57.44,-7.68],[0,0],[0,26.88],[-179.52,0]],"v":[[-325.12,8.867],[-325.12,-54.093],[325.12,-54.093],[325.12,8.867],[0,57.507]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.54509806633,0.341176480055,0.219607844949,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[512,134.653],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[-211.04,0],[0,0]],"o":[[0,0],[0,0],[0,0],[211.04,0],[0,0]],"v":[[267.68,-32.32],[-268.16,-32.96],[-269.04,3.2],[0,32.96],[269.04,3.2]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.113725490868,0.266666680574,0.701960802078,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[512,183.84],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":39,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[36.88,14.88],[0,6.48],[-5.84,2],[0,221.04],[0,0],[0,0],[0,0],[-36.8,-14.88],[0,-7.28],[5.92,-2],[0,-221.04],[0,0],[-24.32,-5.76],[-129.2,0],[-34.64,8.16],[-0.56,25.28],[0,0]],"o":[[-6,-2.48],[0,-6.48],[36.88,-14.88],[0,0],[0,0],[0,0],[0,214.32],[6,2.48],[0,7.28],[-36.88,14.88],[0,0],[0.96,24.96],[40.32,9.52],[111.28,0],[24.64,-5.84],[0,0],[0.08,-214.32]],"v":[[47.68,-2.88],[39.12,-16.72],[46.96,-29.84],[269.12,-336.72],[267.68,-375.28],[-268.16,-375.92],[-269.12,-335.36],[-47.68,-30.48],[-37.92,-16.64],[-46.96,-3.52],[-269.12,303.36],[-269.12,303.36],[-226.4,355.36],[17.84,375.92],[226.08,359.68],[268.96,306.88],[269.04,302]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.505882382393,0.831372559071,0.980392158031,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[512,526.8],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":75,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-179.559,0],[0,-33.932],[179.559,0],[0,33.932]],"o":[[179.559,0],[0,33.932],[-179.559,0],[0,-33.932]],"v":[[0,-61.44],[325.12,0],[0,61.44],[-325.12,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.800000011921,0.521568655968,0.321568638086,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[512,867.84],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 5","np":2,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-179.559,0],[0,-33.932],[179.559,0],[0,33.932]],"o":[[179.559,0],[0,33.932],[-179.559,0],[0,-33.932]],"v":[[0,-61.44],[325.12,0],[0,61.44],[-325.12,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.694117665291,0.478431373835,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[512,867.84],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 6","np":2,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,33.92],[0,0],[-107.36,0],[0,0],[179.52,0]],"o":[[0,0],[59.2,-15.2],[0,0],[0,33.92],[-179.52,0]],"v":[[-325.12,2.338],[-325.12,-57.022],[325.12,-57.022],[325.12,2.338],[0,63.778]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.54509806633,0.341176480055,0.219607844949,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[512,928.222],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 7","np":2,"cix":2,"bm":0,"ix":7,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":164,"st":0,"ct":1,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"hourglass","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[512,512,0],"ix":2,"l":2},"a":{"a":0,"k":[512,512,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"tm":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":132,"s":[2.7]}],"ix":2},"w":1024,"h":1024,"ip":0,"op":132,"st":0,"bm":0}],"markers":[{"tm":0,"cm":"rest","dr":0}],"props":{}}
\ No newline at end of file
diff --git a/dependencies b/dependencies
index 24d048b4..e0c6a961 160000
--- a/dependencies
+++ b/dependencies
@@ -1 +1 @@
-Subproject commit 24d048b4abbe5c266b09965cc6f3ebdf83f97855
+Subproject commit e0c6a9617a20a8d6bc1ad4c6b9c2e229feb5f37a
diff --git a/flutter_rust_bridge.yaml b/flutter_rust_bridge.yaml
new file mode 100644
index 00000000..30bd38a7
--- /dev/null
+++ b/flutter_rust_bridge.yaml
@@ -0,0 +1,3 @@
+rust_input: crate::bridge
+rust_root: rust
+dart_output: lib/core
\ No newline at end of file
diff --git a/integration_test/api_service.test.dart b/integration_test/api_service.test.dart
new file mode 100644
index 00000000..3b65146f
--- /dev/null
+++ b/integration_test/api_service.test.dart
@@ -0,0 +1,31 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:integration_test/integration_test.dart';
+import 'package:twonly/core/frb_generated.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/services/background/callback_dispatcher.background.dart';
+
+void main() {
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+  setUpAll(() async => RustLib.init());
+
+  test('Can initialize twonlyDB and connect to api server', () async {
+    // Initialize global variables
+    await initBackgroundExecution();
+
+    // Try to connect to the API server
+    final connected = await apiService.connect();
+
+    // Print out the result or test it
+    expect(connected, isA<bool>());
+
+    // We can also check if it's connected
+    // Depending on your test environment, this might be true or false
+    // if the server is unreachable without further setup
+    // expect(apiService.isConnected, isA<bool>());
+
+    // Close the connection after the test
+    if (apiService.isConnected) {
+      await apiService.close(() {});
+    }
+  });
+}
diff --git a/ios/NotificationService/push_notification.pb.swift b/ios/NotificationService/push_notification.pb.swift
index 303e2fa5..1f8a210d 100644
--- a/ios/NotificationService/push_notification.pb.swift
+++ b/ios/NotificationService/push_notification.pb.swift
@@ -230,12 +230,12 @@ struct PushKey: Sendable {
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
 extension PushKind: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{2}\0reaction\0\u{1}response\0\u{1}text\0\u{1}video\0\u{1}twonly\0\u{1}image\0\u{1}contactRequest\0\u{1}acceptRequest\0\u{1}storedMediaFile\0\u{1}testNotification\0\u{1}reopenedMedia\0\u{1}reactionToVideo\0\u{1}reactionToText\0\u{1}reactionToImage\0\u{1}reactionToAudio\0\u{1}addedToGroup\0\u{1}audio\0")
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{2}\0REACTION\0\u{1}RESPONSE\0\u{1}TEXT\0\u{1}VIDEO\0\u{1}TWONLY\0\u{1}IMAGE\0\u{1}CONTACT_REQUEST\0\u{1}ACCEPT_REQUEST\0\u{1}STORED_MEDIA_FILE\0\u{1}TEST_NOTIFICATION\0\u{1}REOPENED_MEDIA\0\u{1}REACTION_TO_VIDEO\0\u{1}REACTION_TO_TEXT\0\u{1}REACTION_TO_IMAGE\0\u{1}REACTION_TO_AUDIO\0\u{1}ADDED_TO_GROUP\0\u{1}AUDIO\0")
 }
 
 extension EncryptedPushNotification: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = "EncryptedPushNotification"
-  static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}keyId\0\u{1}nonce\0\u{1}ciphertext\0\u{1}mac\0")
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{3}key_id\0\u{1}nonce\0\u{1}ciphertext\0\u{1}mac\0")
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
@@ -280,7 +280,7 @@ extension EncryptedPushNotification: SwiftProtobuf.Message, SwiftProtobuf._Messa
 
 extension PushNotification: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = "PushNotification"
-  static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}kind\0\u{1}messageId\0\u{1}additionalContent\0")
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}kind\0\u{3}message_id\0\u{3}additional_content\0")
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
@@ -354,7 +354,7 @@ extension PushUsers: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
 
 extension PushUser: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = "PushUser"
-  static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}userId\0\u{1}displayName\0\u{1}blocked\0\u{1}lastMessageId\0\u{1}pushKeys\0")
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{3}user_id\0\u{3}display_name\0\u{1}blocked\0\u{3}last_message_id\0\u{3}push_keys\0")
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
@@ -408,7 +408,7 @@ extension PushUser: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationB
 
 extension PushKey: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let protoMessageName: String = "PushKey"
-  static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}id\0\u{1}key\0\u{1}createdAtUnixTimestamp\0")
+  static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}id\0\u{1}key\0\u{3}created_at_unix_timestamp\0")
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index d8c25ba3..eeb9bd6f 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -231,6 +231,8 @@ PODS:
   - in_app_purchase_storekit (0.0.1):
     - Flutter
     - FlutterMacOS
+  - integration_test (0.0.1):
+    - Flutter
   - libwebp (1.5.0):
     - libwebp/demux (= 1.5.0)
     - libwebp/mux (= 1.5.0)
@@ -274,8 +276,6 @@ PODS:
     - nanopb/encode (= 3.30910.0)
   - nanopb/decode (3.30910.0)
   - nanopb/encode (3.30910.0)
-  - no_screenshot (0.10.0):
-    - Flutter
   - package_info_plus (0.4.5):
     - Flutter
   - permission_handler_apple (9.3.0):
@@ -285,6 +285,12 @@ PODS:
   - PromisesObjC (2.4.0)
   - restart_app (1.7.3):
     - Flutter
+  - rust_lib_twonly (0.0.1):
+    - Flutter
+  - screen_protector (1.5.1):
+    - Flutter
+    - ScreenProtectorKit (= 1.5.1)
+  - ScreenProtectorKit (1.5.1)
   - SDWebImage (5.21.7):
     - SDWebImage/Core (= 5.21.7)
   - SDWebImage/Core (5.21.7)
@@ -304,31 +310,6 @@ PODS:
   - sqflite_darwin (0.0.4):
     - Flutter
     - FlutterMacOS
-  - sqlite3 (3.52.0):
-    - sqlite3/common (= 3.52.0)
-  - sqlite3/common (3.52.0)
-  - sqlite3/dbstatvtab (3.52.0):
-    - sqlite3/common
-  - sqlite3/fts5 (3.52.0):
-    - sqlite3/common
-  - sqlite3/math (3.52.0):
-    - sqlite3/common
-  - sqlite3/perf-threadsafe (3.52.0):
-    - sqlite3/common
-  - sqlite3/rtree (3.52.0):
-    - sqlite3/common
-  - sqlite3/session (3.52.0):
-    - sqlite3/common
-  - sqlite3_flutter_libs (0.0.1):
-    - Flutter
-    - FlutterMacOS
-    - sqlite3 (~> 3.52.0)
-    - sqlite3/dbstatvtab
-    - sqlite3/fts5
-    - sqlite3/math
-    - sqlite3/perf-threadsafe
-    - sqlite3/rtree
-    - sqlite3/session
   - SwiftProtobuf (1.36.1)
   - SwiftyGif (5.4.5)
   - url_launcher_ios (0.0.1):
@@ -370,17 +351,18 @@ DEPENDENCIES:
   - GoogleUtilities
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
   - in_app_purchase_storekit (from `.symlinks/plugins/in_app_purchase_storekit/darwin`)
+  - integration_test (from `.symlinks/plugins/integration_test/ios`)
   - local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`)
-  - no_screenshot (from `.symlinks/plugins/no_screenshot/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - pro_video_editor (from `.symlinks/plugins/pro_video_editor/ios`)
   - restart_app (from `.symlinks/plugins/restart_app/ios`)
+  - rust_lib_twonly (from `.symlinks/plugins/rust_lib_twonly/ios`)
+  - screen_protector (from `.symlinks/plugins/screen_protector/ios`)
   - sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
-  - sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/darwin`)
   - SwiftProtobuf
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
   - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
@@ -412,10 +394,10 @@ SPEC REPOS:
     - MLKitVision
     - nanopb
     - PromisesObjC
+    - ScreenProtectorKit
     - SDWebImage
     - SDWebImageWebPCoder
     - Sentry
-    - sqlite3
     - SwiftProtobuf
     - SwiftyGif
 
@@ -470,10 +452,10 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/image_picker_ios/ios"
   in_app_purchase_storekit:
     :path: ".symlinks/plugins/in_app_purchase_storekit/darwin"
+  integration_test:
+    :path: ".symlinks/plugins/integration_test/ios"
   local_auth_darwin:
     :path: ".symlinks/plugins/local_auth_darwin/darwin"
-  no_screenshot:
-    :path: ".symlinks/plugins/no_screenshot/ios"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
   permission_handler_apple:
@@ -482,6 +464,10 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/pro_video_editor/ios"
   restart_app:
     :path: ".symlinks/plugins/restart_app/ios"
+  rust_lib_twonly:
+    :path: ".symlinks/plugins/rust_lib_twonly/ios"
+  screen_protector:
+    :path: ".symlinks/plugins/screen_protector/ios"
   sentry_flutter:
     :path: ".symlinks/plugins/sentry_flutter/ios"
   share_plus:
@@ -490,8 +476,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   sqflite_darwin:
     :path: ".symlinks/plugins/sqflite_darwin/darwin"
-  sqlite3_flutter_libs:
-    :path: ".symlinks/plugins/sqlite3_flutter_libs/darwin"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
   video_player_avfoundation:
@@ -540,6 +524,7 @@ SPEC CHECKSUMS:
   GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
   image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326
   in_app_purchase_storekit: 22cca7d08eebca9babdf4d07d0baccb73325d3c8
+  integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
   libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
   local_auth_darwin: c3ee6cce0a8d56be34c8ccb66ba31f7f180aaebb
   Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
@@ -549,12 +534,14 @@ SPEC CHECKSUMS:
   MLKitFaceDetection: 32549f1e70e6e7731261bf9cea2b74095e2531cb
   MLKitVision: 39a5a812db83c4a0794445088e567f3631c11961
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
-  no_screenshot: 03c8ac6586f9652cd45e3d12d74e5992256403ac
   package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
   permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
   pro_video_editor: 44ef9a6d48dbd757ed428cf35396dd05f35c7830
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   restart_app: 0714144901e260eae68f7afc2fc4aacc1a323ad2
+  rust_lib_twonly: 73165b05d0cda50db45852db63f49caa7f319520
+  screen_protector: 18c6aca2dc5d2a832f6787a5318f97f03e9d3150
+  ScreenProtectorKit: 6ceb3e0808341a9bc15d175bff40dfdd4b32da71
   SDWebImage: e9fc87c1aab89a8ab1bbd74eba378c6f53be8abf
   SDWebImageWebPCoder: 0e06e365080397465cc73a7a9b472d8a3bd0f377
   Sentry: d587a8fe91ca13503ecd69a1905f3e8a0fcf61be
@@ -562,8 +549,6 @@ SPEC CHECKSUMS:
   share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
   shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
   sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
-  sqlite3: a51c07cf16e023d6c48abd5e5791a61a47354921
-  sqlite3_flutter_libs: b3e120efe9a82017e5552a620f696589ed4f62ab
   SwiftProtobuf: 9e106a71456f4d3f6a3b0c8fd87ef0be085efc38
   SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
   url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift
index 7b546b5c..6c738da9 100644
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@@ -20,6 +20,10 @@ import workmanager_apple
 
     WorkmanagerDebug.setCurrent(LoggingDebugHandler())
 
+    WorkmanagerPlugin.setPluginRegistrantCallback { registry in
+      GeneratedPluginRegistrant.register(with: registry)
+    }
+
     WorkmanagerPlugin.registerPeriodicTask(
       withIdentifier: "eu.twonly.periodic_task",
       frequency: NSNumber(value: 20 * 60)
diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard
index f2e259c7..e103a99f 100644
--- a/ios/Runner/Base.lproj/LaunchScreen.storyboard
+++ b/ios/Runner/Base.lproj/LaunchScreen.storyboard
@@ -19,7 +19,7 @@
                             <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
                             </imageView>
                         </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" red="0.341176" green="0.8" blue="0.6" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
                             <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
diff --git a/lib/app.dart b/lib/app.dart
index 0576e6fd..d5ed7781 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -1,118 +1,105 @@
 import 'dart:async';
+
+import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:provider/provider.dart';
 import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/localization/generated/app_localizations.dart';
-import 'package:twonly/src/providers/connection.provider.dart';
-import 'package:twonly/src/providers/purchases.provider.dart';
 import 'package:twonly/src/providers/routing.provider.dart';
 import 'package:twonly/src/providers/settings.provider.dart';
-import 'package:twonly/src/services/subscription.service.dart';
-import 'package:twonly/src/themes/dark.dart';
-import 'package:twonly/src/themes/light.dart';
 import 'package:twonly/src/utils/log.dart';
 import 'package:twonly/src/utils/pow.dart';
-import 'package:twonly/src/utils/storage.dart';
-import 'package:twonly/src/views/components/app_outdated.dart';
-import 'package:twonly/src/views/home.view.dart';
-import 'package:twonly/src/views/onboarding/onboarding.view.dart';
-import 'package:twonly/src/views/onboarding/register.view.dart';
-import 'package:twonly/src/views/settings/backup/setup_backup.view.dart';
-import 'package:twonly/src/views/unlock_twonly.view.dart';
+import 'package:twonly/src/visual/components/app_outdated.comp.dart';
+import 'package:twonly/src/visual/themes/dark.dart';
+import 'package:twonly/src/visual/themes/light.dart';
+import 'package:twonly/src/visual/views/critical_error.view.dart';
+import 'package:twonly/src/visual/views/home.view.dart';
+import 'package:twonly/src/visual/views/onboarding/onboarding.view.dart';
+import 'package:twonly/src/visual/views/onboarding/register.view.dart';
+import 'package:twonly/src/visual/views/onboarding/setup.view.dart';
+import 'package:twonly/src/visual/views/unlock_twonly.view.dart';
 
 class App extends StatefulWidget {
-  const App({super.key});
+  const App({required this.storageError, super.key});
+  final bool storageError;
   @override
   State<App> createState() => _AppState();
 }
 
 class _AppState extends State<App> with WidgetsBindingObserver {
-  bool wasPaused = false;
+  bool _wasPaused = false;
 
   @override
   void initState() {
     super.initState();
-    globalIsAppInBackground = false;
+    AppState.isAppInBackground = false;
     WidgetsBinding.instance.addObserver(this);
-
-    globalCallbackConnectionState = ({required isConnected}) async {
-      await context.read<CustomChangeProvider>().updateConnectionState(
-        isConnected,
-      );
-      await setUserPlan();
-    };
-
-    globalCallbackUpdatePlan = (plan) {
-      context.read<PurchasesProvider>().updatePlan(plan);
-    };
-
-    unawaited(initAsync());
-  }
-
-  Future<void> setUserPlan() async {
-    final user = await getUser();
-    if (user != null && mounted) {
-      if (mounted) {
-        context.read<PurchasesProvider>().updatePlan(
-          planFromString(user.subscriptionPlan),
-        );
-      }
-    }
-  }
-
-  Future<void> initAsync() async {
-    await setUserPlan();
-    await apiService.connect();
-    await apiService.listenToNetworkChanges();
   }
 
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) {
     super.didChangeAppLifecycleState(state);
     if (state == AppLifecycleState.resumed) {
-      if (wasPaused) {
-        globalIsAppInBackground = false;
+      if (_wasPaused) {
+        AppState.isAppInBackground = false;
         twonlyDB.markUpdated();
         unawaited(apiService.connect());
       }
     } else if (state == AppLifecycleState.paused) {
-      wasPaused = true;
-      globalIsAppInBackground = true;
+      _wasPaused = true;
+      AppState.isAppInBackground = true;
     }
   }
 
   @override
   void dispose() {
     WidgetsBinding.instance.removeObserver(this);
-    globalCallbackConnectionState = ({required isConnected}) {};
-    globalCallbackUpdatePlan = (planId) {};
     super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
     return ListenableBuilder(
-      listenable: context.watch<SettingsChangeProvider>(),
+      listenable: context.read<SettingsChangeProvider>(),
       builder: (context, child) {
+        const localizationsDelegates = [
+          AppLocalizations.delegate,
+          GlobalMaterialLocalizations.delegate,
+          GlobalWidgetsLocalizations.delegate,
+          GlobalCupertinoLocalizations.delegate,
+        ];
+
+        const supportedLocales = [
+          Locale('en', ''),
+          Locale('de', ''),
+        ];
+
+        if (widget.storageError) {
+          return MaterialApp(
+            scaffoldMessengerKey: AppGlobalKeys.scaffoldMessengerKey,
+            localizationsDelegates: localizationsDelegates,
+            debugShowCheckedModeBanner: false,
+            supportedLocales: supportedLocales,
+            title: 'twonly',
+            theme: lightTheme,
+            darkTheme: darkTheme,
+            themeMode: context.read<SettingsChangeProvider>().themeMode,
+            home: const CriticalErrorView(),
+          );
+        }
+
         return MaterialApp.router(
           routerConfig: routerProvider,
-          scaffoldMessengerKey: globalRootScaffoldMessengerKey,
-          localizationsDelegates: const [
-            AppLocalizations.delegate,
-            GlobalMaterialLocalizations.delegate,
-            GlobalWidgetsLocalizations.delegate,
-            GlobalCupertinoLocalizations.delegate,
-          ],
+          scaffoldMessengerKey: AppGlobalKeys.scaffoldMessengerKey,
+          localizationsDelegates: localizationsDelegates,
           debugShowCheckedModeBanner: false,
-          supportedLocales: const [
-            Locale('en', ''),
-            Locale('de', ''),
-          ],
+          supportedLocales: supportedLocales,
           title: 'twonly',
           theme: lightTheme,
           darkTheme: darkTheme,
-          themeMode: context.watch<SettingsChangeProvider>().themeMode,
+          themeMode: context.read<SettingsChangeProvider>().themeMode,
         );
       },
     );
@@ -130,11 +117,8 @@ class AppMainWidget extends StatefulWidget {
 }
 
 class _AppMainWidgetState extends State<AppMainWidget> {
-  bool _isUserCreated = false;
-  bool _showDatabaseMigration = false;
   bool _showOnboarding = true;
   bool _isLoaded = false;
-  bool _skipBackup = false;
   bool _isTwonlyLocked = true;
 
   (Future<int>?, bool) _proofOfWork = (null, false);
@@ -146,25 +130,18 @@ class _AppMainWidgetState extends State<AppMainWidget> {
   }
 
   Future<void> initAsync() async {
-    _isUserCreated = await isUserCreated();
-
-    if (_isUserCreated) {
+    if (userService.isUserCreated) {
+      await FirebaseMessaging.instance.requestPermission();
       if (_isTwonlyLocked) {
         // do not change in case twonly was already unlocked at some point
-        _isTwonlyLocked = gUser.screenLockEnabled;
+        _isTwonlyLocked = userService.currentUser.screenLockEnabled;
       }
-      if (gUser.appVersion < 62) {
-        _showDatabaseMigration = true;
-      }
-    }
-
-    if (!_isUserCreated && !_showDatabaseMigration) {
+    } else {
       // This means the user is in the onboarding screen, so start with the Proof of Work.
 
       final (proof, disabled) = await apiService.getProofOfWork();
       if (proof != null) {
         Log.info('Starting with proof of work calculation.');
-        // Starting with the proof of work.
         _proofOfWork = (
           calculatePoW(proof.prefix, proof.difficulty.toInt()),
           false,
@@ -187,21 +164,20 @@ class _AppMainWidgetState extends State<AppMainWidget> {
 
     late Widget child;
 
-    if (_showDatabaseMigration) {
-      child = const Center(child: Text('Please reinstall twonly.'));
-    } else if (_isUserCreated) {
+    if (userService.isUserCreated) {
       if (_isTwonlyLocked) {
         child = UnlockTwonlyView(
           callbackOnSuccess: () => setState(() {
             _isTwonlyLocked = false;
           }),
         );
-      } else if (gUser.twonlySafeBackup == null && !_skipBackup) {
-        child = SetupBackupView(
-          callBack: () {
-            _skipBackup = true;
-            setState(() {});
-          },
+      } else if (!userService.currentUser.skipSetupPages &&
+          userService.currentUser.currentSetupPage != null) {
+        // This will only be shown in case the user have not skipped
+        child = SetupView(
+          onUpdate: () => setState(() {
+            // userService.currentUser has updated...
+          }),
         );
       } else {
         child = HomeView(
@@ -224,7 +200,7 @@ class _AppMainWidgetState extends State<AppMainWidget> {
     return Stack(
       children: [
         child,
-        const AppOutdated(),
+        const AppOutdatedComp(),
       ],
     );
   }
diff --git a/lib/core/bridge.dart b/lib/core/bridge.dart
new file mode 100644
index 00000000..dfa22807
--- /dev/null
+++ b/lib/core/bridge.dart
@@ -0,0 +1,97 @@
+// This file is automatically generated, so please do not edit it.
+// @generated by `flutter_rust_bridge`@ 2.12.0.
+
+// ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
+
+import 'frb_generated.dart';
+import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
+
+// These functions are ignored because they are not marked as `pub`: `get_twonly_flutter`
+// These types are ignored because they are neither used by any `pub` functions nor (for structs and enums) marked `#[frb(unignore)]`: `TwonlyFlutter`
+
+Future<void> initializeTwonlyFlutter({required TwonlyConfig config}) =>
+    RustLib.instance.api.crateBridgeInitializeTwonlyFlutter(config: config);
+
+class AnnouncedUser {
+  final PlatformInt64 userId;
+  final Uint8List publicKey;
+  final PlatformInt64 publicId;
+
+  const AnnouncedUser({
+    required this.userId,
+    required this.publicKey,
+    required this.publicId,
+  });
+
+  @override
+  int get hashCode => userId.hashCode ^ publicKey.hashCode ^ publicId.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is AnnouncedUser &&
+          runtimeType == other.runtimeType &&
+          userId == other.userId &&
+          publicKey == other.publicKey &&
+          publicId == other.publicId;
+}
+
+class OtherPromotion {
+  final int promotionId;
+  final PlatformInt64 publicId;
+  final PlatformInt64 fromContactId;
+  final int threshold;
+  final Uint8List announcementShare;
+  final PlatformInt64? publicKeyVerifiedTimestamp;
+
+  const OtherPromotion({
+    required this.promotionId,
+    required this.publicId,
+    required this.fromContactId,
+    required this.threshold,
+    required this.announcementShare,
+    this.publicKeyVerifiedTimestamp,
+  });
+
+  @override
+  int get hashCode =>
+      promotionId.hashCode ^
+      publicId.hashCode ^
+      fromContactId.hashCode ^
+      threshold.hashCode ^
+      announcementShare.hashCode ^
+      publicKeyVerifiedTimestamp.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is OtherPromotion &&
+          runtimeType == other.runtimeType &&
+          promotionId == other.promotionId &&
+          publicId == other.publicId &&
+          fromContactId == other.fromContactId &&
+          threshold == other.threshold &&
+          announcementShare == other.announcementShare &&
+          publicKeyVerifiedTimestamp == other.publicKeyVerifiedTimestamp;
+}
+
+class TwonlyConfig {
+  final String databasePath;
+  final String dataDirectory;
+
+  const TwonlyConfig({
+    required this.databasePath,
+    required this.dataDirectory,
+  });
+
+  @override
+  int get hashCode => databasePath.hashCode ^ dataDirectory.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is TwonlyConfig &&
+          runtimeType == other.runtimeType &&
+          databasePath == other.databasePath &&
+          dataDirectory == other.dataDirectory;
+}
diff --git a/lib/core/bridge/callbacks.dart b/lib/core/bridge/callbacks.dart
new file mode 100644
index 00000000..c7bdf17e
--- /dev/null
+++ b/lib/core/bridge/callbacks.dart
@@ -0,0 +1,61 @@
+// This file is automatically generated, so please do not edit it.
+// @generated by `flutter_rust_bridge`@ 2.12.0.
+
+// ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
+
+import '../bridge.dart';
+import '../frb_generated.dart';
+import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
+
+// These functions are ignored because they are not marked as `pub`: `get_callbacks`
+// These types are ignored because they are neither used by any `pub` functions nor (for structs and enums) marked `#[frb(unignore)]`: `FlutterCallbacks`, `Logging`, `UserDiscoveryCallbacks`
+
+Future<void> initFlutterCallbacks({
+  required FutureOr<RustStreamSink<String>> Function() loggingGetStreamSink,
+  required FutureOr<Uint8List?> Function(Uint8List) userDiscoverySignData,
+  required FutureOr<bool> Function(Uint8List, Uint8List, Uint8List)
+  userDiscoveryVerifySignature,
+  required FutureOr<bool> Function(PlatformInt64, Uint8List)
+  userDiscoveryVerifyStoredPubkey,
+  required FutureOr<bool> Function(List<Uint8List>) userDiscoverySetShares,
+  required FutureOr<Uint8List?> Function(PlatformInt64)
+  userDiscoveryGetShareForContact,
+  required FutureOr<bool> Function(PlatformInt64, PlatformInt64, Uint8List)
+  userDiscoveryPushOwnPromotionAndClearOldVersion,
+  required FutureOr<List<Uint8List>?> Function(PlatformInt64)
+  userDiscoveryGetOwnPromotionsAfterVersion,
+  required FutureOr<bool> Function(OtherPromotion)
+  userDiscoveryStoreOtherPromotion,
+  required FutureOr<List<OtherPromotion>?> Function(PlatformInt64)
+  userDiscoveryGetOtherPromotionsByPublicId,
+  required FutureOr<AnnouncedUser?> Function(PlatformInt64)
+  userDiscoveryGetAnnouncedUserByPublicId,
+  required FutureOr<Uint8List?> Function(PlatformInt64)
+  userDiscoveryGetContactVersion,
+  required FutureOr<bool> Function(PlatformInt64, Uint8List)
+  userDiscoverySetContactVersion,
+  required FutureOr<bool> Function(PlatformInt64, AnnouncedUser, PlatformInt64?)
+  userDiscoveryPushNewUserRelation,
+  required FutureOr<Uint8List?> Function(PlatformInt64)
+  userDiscoveryGetContactPromotion,
+}) => RustLib.instance.api.crateBridgeCallbacksInitFlutterCallbacks(
+  loggingGetStreamSink: loggingGetStreamSink,
+  userDiscoverySignData: userDiscoverySignData,
+  userDiscoveryVerifySignature: userDiscoveryVerifySignature,
+  userDiscoveryVerifyStoredPubkey: userDiscoveryVerifyStoredPubkey,
+  userDiscoverySetShares: userDiscoverySetShares,
+  userDiscoveryGetShareForContact: userDiscoveryGetShareForContact,
+  userDiscoveryPushOwnPromotionAndClearOldVersion:
+      userDiscoveryPushOwnPromotionAndClearOldVersion,
+  userDiscoveryGetOwnPromotionsAfterVersion:
+      userDiscoveryGetOwnPromotionsAfterVersion,
+  userDiscoveryStoreOtherPromotion: userDiscoveryStoreOtherPromotion,
+  userDiscoveryGetOtherPromotionsByPublicId:
+      userDiscoveryGetOtherPromotionsByPublicId,
+  userDiscoveryGetAnnouncedUserByPublicId:
+      userDiscoveryGetAnnouncedUserByPublicId,
+  userDiscoveryGetContactVersion: userDiscoveryGetContactVersion,
+  userDiscoverySetContactVersion: userDiscoverySetContactVersion,
+  userDiscoveryPushNewUserRelation: userDiscoveryPushNewUserRelation,
+  userDiscoveryGetContactPromotion: userDiscoveryGetContactPromotion,
+);
diff --git a/lib/core/bridge/wrapper/user_discovery.dart b/lib/core/bridge/wrapper/user_discovery.dart
new file mode 100644
index 00000000..dab9c080
--- /dev/null
+++ b/lib/core/bridge/wrapper/user_discovery.dart
@@ -0,0 +1,73 @@
+// This file is automatically generated, so please do not edit it.
+// @generated by `flutter_rust_bridge`@ 2.12.0.
+
+// ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
+
+import '../../frb_generated.dart';
+import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
+
+class FlutterUserDiscovery {
+  const FlutterUserDiscovery();
+
+  static Future<Uint8List> getCurrentVersion() => RustLib.instance.api
+      .crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryGetCurrentVersion();
+
+  static Future<List<Uint8List>> getNewMessages({
+    required PlatformInt64 contactId,
+    required List<int> receivedVersion,
+  }) => RustLib.instance.api
+      .crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryGetNewMessages(
+        contactId: contactId,
+        receivedVersion: receivedVersion,
+      );
+
+  static Future<void> handleNewMessages({
+    required PlatformInt64 contactId,
+    PlatformInt64? publicKeyVerifiedTimestamp,
+    required List<Uint8List> messages,
+  }) => RustLib.instance.api
+      .crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryHandleNewMessages(
+        contactId: contactId,
+        publicKeyVerifiedTimestamp: publicKeyVerifiedTimestamp,
+        messages: messages,
+      );
+
+  static Future<void> initializeOrUpdate({
+    required int threshold,
+    required PlatformInt64 userId,
+    required List<int> publicKey,
+    required bool sharePromotion,
+  }) => RustLib.instance.api
+      .crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryInitializeOrUpdate(
+        threshold: threshold,
+        userId: userId,
+        publicKey: publicKey,
+        sharePromotion: sharePromotion,
+      );
+
+  static Future<Uint8List?> shouldRequestNewMessages({
+    required PlatformInt64 contactId,
+    required List<int> version,
+  }) => RustLib.instance.api
+      .crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryShouldRequestNewMessages(
+        contactId: contactId,
+        version: version,
+      );
+
+  static Future<void> updateVerificationStateForUser({
+    required PlatformInt64 contactId,
+    PlatformInt64? publicKeyVerifiedTimestamp,
+  }) => RustLib.instance.api
+      .crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryUpdateVerificationStateForUser(
+        contactId: contactId,
+        publicKeyVerifiedTimestamp: publicKeyVerifiedTimestamp,
+      );
+
+  @override
+  int get hashCode => 0;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is FlutterUserDiscovery && runtimeType == other.runtimeType;
+}
diff --git a/lib/core/frb_generated.dart b/lib/core/frb_generated.dart
new file mode 100644
index 00000000..28dac796
--- /dev/null
+++ b/lib/core/frb_generated.dart
@@ -0,0 +1,2014 @@
+// This file is automatically generated, so please do not edit it.
+// @generated by `flutter_rust_bridge`@ 2.12.0.
+
+// ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field
+
+import 'bridge.dart';
+import 'bridge/callbacks.dart';
+import 'bridge/wrapper/user_discovery.dart';
+import 'dart:async';
+import 'dart:convert';
+import 'frb_generated.dart';
+import 'frb_generated.io.dart'
+    if (dart.library.js_interop) 'frb_generated.web.dart';
+import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
+
+/// Main entrypoint of the Rust API
+class RustLib extends BaseEntrypoint<RustLibApi, RustLibApiImpl, RustLibWire> {
+  @internal
+  static final instance = RustLib._();
+
+  RustLib._();
+
+  /// Initialize flutter_rust_bridge
+  static Future<void> init({
+    RustLibApi? api,
+    BaseHandler? handler,
+    ExternalLibrary? externalLibrary,
+    bool forceSameCodegenVersion = true,
+  }) async {
+    await instance.initImpl(
+      api: api,
+      handler: handler,
+      externalLibrary: externalLibrary,
+      forceSameCodegenVersion: forceSameCodegenVersion,
+    );
+  }
+
+  /// Initialize flutter_rust_bridge in mock mode.
+  /// No libraries for FFI are loaded.
+  static void initMock({
+    required RustLibApi api,
+  }) {
+    instance.initMockImpl(
+      api: api,
+    );
+  }
+
+  /// Dispose flutter_rust_bridge
+  ///
+  /// The call to this function is optional, since flutter_rust_bridge (and everything else)
+  /// is automatically disposed when the app stops.
+  static void dispose() => instance.disposeImpl();
+
+  @override
+  ApiImplConstructor<RustLibApiImpl, RustLibWire> get apiImplConstructor =>
+      RustLibApiImpl.new;
+
+  @override
+  WireConstructor<RustLibWire> get wireConstructor =>
+      RustLibWire.fromExternalLibrary;
+
+  @override
+  Future<void> executeRustInitializers() async {}
+
+  @override
+  ExternalLibraryLoaderConfig get defaultExternalLibraryLoaderConfig =>
+      kDefaultExternalLibraryLoaderConfig;
+
+  @override
+  String get codegenVersion => '2.12.0';
+
+  @override
+  int get rustContentHash => 1680338106;
+
+  static const kDefaultExternalLibraryLoaderConfig =
+      ExternalLibraryLoaderConfig(
+        stem: 'rust_lib_twonly',
+        ioDirectory: 'rust/target/release/',
+        webPrefix: 'pkg/',
+        wasmBindgenName: 'wasm_bindgen',
+      );
+}
+
+abstract class RustLibApi extends BaseApi {
+  Future<Uint8List>
+  crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryGetCurrentVersion();
+
+  Future<List<Uint8List>>
+  crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryGetNewMessages({
+    required PlatformInt64 contactId,
+    required List<int> receivedVersion,
+  });
+
+  Future<void>
+  crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryHandleNewMessages({
+    required PlatformInt64 contactId,
+    PlatformInt64? publicKeyVerifiedTimestamp,
+    required List<Uint8List> messages,
+  });
+
+  Future<void>
+  crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryInitializeOrUpdate({
+    required int threshold,
+    required PlatformInt64 userId,
+    required List<int> publicKey,
+    required bool sharePromotion,
+  });
+
+  Future<Uint8List?>
+  crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryShouldRequestNewMessages({
+    required PlatformInt64 contactId,
+    required List<int> version,
+  });
+
+  Future<void>
+  crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryUpdateVerificationStateForUser({
+    required PlatformInt64 contactId,
+    PlatformInt64? publicKeyVerifiedTimestamp,
+  });
+
+  Future<void> crateBridgeCallbacksInitFlutterCallbacks({
+    required FutureOr<RustStreamSink<String>> Function() loggingGetStreamSink,
+    required FutureOr<Uint8List?> Function(Uint8List) userDiscoverySignData,
+    required FutureOr<bool> Function(Uint8List, Uint8List, Uint8List)
+    userDiscoveryVerifySignature,
+    required FutureOr<bool> Function(PlatformInt64, Uint8List)
+    userDiscoveryVerifyStoredPubkey,
+    required FutureOr<bool> Function(List<Uint8List>) userDiscoverySetShares,
+    required FutureOr<Uint8List?> Function(PlatformInt64)
+    userDiscoveryGetShareForContact,
+    required FutureOr<bool> Function(PlatformInt64, PlatformInt64, Uint8List)
+    userDiscoveryPushOwnPromotionAndClearOldVersion,
+    required FutureOr<List<Uint8List>?> Function(PlatformInt64)
+    userDiscoveryGetOwnPromotionsAfterVersion,
+    required FutureOr<bool> Function(OtherPromotion)
+    userDiscoveryStoreOtherPromotion,
+    required FutureOr<List<OtherPromotion>?> Function(PlatformInt64)
+    userDiscoveryGetOtherPromotionsByPublicId,
+    required FutureOr<AnnouncedUser?> Function(PlatformInt64)
+    userDiscoveryGetAnnouncedUserByPublicId,
+    required FutureOr<Uint8List?> Function(PlatformInt64)
+    userDiscoveryGetContactVersion,
+    required FutureOr<bool> Function(PlatformInt64, Uint8List)
+    userDiscoverySetContactVersion,
+    required FutureOr<bool> Function(
+      PlatformInt64,
+      AnnouncedUser,
+      PlatformInt64?,
+    )
+    userDiscoveryPushNewUserRelation,
+    required FutureOr<Uint8List?> Function(PlatformInt64)
+    userDiscoveryGetContactPromotion,
+  });
+
+  Future<void> crateBridgeInitializeTwonlyFlutter({
+    required TwonlyConfig config,
+  });
+}
+
+class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
+  RustLibApiImpl({
+    required super.handler,
+    required super.wire,
+    required super.generalizedFrbRustBinding,
+    required super.portManager,
+  });
+
+  @override
+  Future<Uint8List>
+  crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryGetCurrentVersion() {
+    return handler.executeNormal(
+      NormalTask(
+        callFfi: (port_) {
+          final serializer = SseSerializer(generalizedFrbRustBinding);
+          pdeCallFfi(
+            generalizedFrbRustBinding,
+            serializer,
+            funcId: 1,
+            port: port_,
+          );
+        },
+        codec: SseCodec(
+          decodeSuccessData: sse_decode_list_prim_u_8_strict,
+          decodeErrorData: sse_decode_AnyhowException,
+        ),
+        constMeta:
+            kCrateBridgeWrapperUserDiscoveryFlutterUserDiscoveryGetCurrentVersionConstMeta,
+        argValues: [],
+        apiImpl: this,
+      ),
+    );
+  }
+
+  TaskConstMeta
+  get kCrateBridgeWrapperUserDiscoveryFlutterUserDiscoveryGetCurrentVersionConstMeta =>
+      const TaskConstMeta(
+        debugName: "flutter_user_discovery_get_current_version",
+        argNames: [],
+      );
+
+  @override
+  Future<List<Uint8List>>
+  crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryGetNewMessages({
+    required PlatformInt64 contactId,
+    required List<int> receivedVersion,
+  }) {
+    return handler.executeNormal(
+      NormalTask(
+        callFfi: (port_) {
+          final serializer = SseSerializer(generalizedFrbRustBinding);
+          sse_encode_i_64(contactId, serializer);
+          sse_encode_list_prim_u_8_loose(receivedVersion, serializer);
+          pdeCallFfi(
+            generalizedFrbRustBinding,
+            serializer,
+            funcId: 2,
+            port: port_,
+          );
+        },
+        codec: SseCodec(
+          decodeSuccessData: sse_decode_list_list_prim_u_8_strict,
+          decodeErrorData: sse_decode_AnyhowException,
+        ),
+        constMeta:
+            kCrateBridgeWrapperUserDiscoveryFlutterUserDiscoveryGetNewMessagesConstMeta,
+        argValues: [contactId, receivedVersion],
+        apiImpl: this,
+      ),
+    );
+  }
+
+  TaskConstMeta
+  get kCrateBridgeWrapperUserDiscoveryFlutterUserDiscoveryGetNewMessagesConstMeta =>
+      const TaskConstMeta(
+        debugName: "flutter_user_discovery_get_new_messages",
+        argNames: ["contactId", "receivedVersion"],
+      );
+
+  @override
+  Future<void>
+  crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryHandleNewMessages({
+    required PlatformInt64 contactId,
+    PlatformInt64? publicKeyVerifiedTimestamp,
+    required List<Uint8List> messages,
+  }) {
+    return handler.executeNormal(
+      NormalTask(
+        callFfi: (port_) {
+          final serializer = SseSerializer(generalizedFrbRustBinding);
+          sse_encode_i_64(contactId, serializer);
+          sse_encode_opt_box_autoadd_i_64(
+            publicKeyVerifiedTimestamp,
+            serializer,
+          );
+          sse_encode_list_list_prim_u_8_strict(messages, serializer);
+          pdeCallFfi(
+            generalizedFrbRustBinding,
+            serializer,
+            funcId: 3,
+            port: port_,
+          );
+        },
+        codec: SseCodec(
+          decodeSuccessData: sse_decode_unit,
+          decodeErrorData: sse_decode_AnyhowException,
+        ),
+        constMeta:
+            kCrateBridgeWrapperUserDiscoveryFlutterUserDiscoveryHandleNewMessagesConstMeta,
+        argValues: [contactId, publicKeyVerifiedTimestamp, messages],
+        apiImpl: this,
+      ),
+    );
+  }
+
+  TaskConstMeta
+  get kCrateBridgeWrapperUserDiscoveryFlutterUserDiscoveryHandleNewMessagesConstMeta =>
+      const TaskConstMeta(
+        debugName: "flutter_user_discovery_handle_new_messages",
+        argNames: ["contactId", "publicKeyVerifiedTimestamp", "messages"],
+      );
+
+  @override
+  Future<void>
+  crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryInitializeOrUpdate({
+    required int threshold,
+    required PlatformInt64 userId,
+    required List<int> publicKey,
+    required bool sharePromotion,
+  }) {
+    return handler.executeNormal(
+      NormalTask(
+        callFfi: (port_) {
+          final serializer = SseSerializer(generalizedFrbRustBinding);
+          sse_encode_u_8(threshold, serializer);
+          sse_encode_i_64(userId, serializer);
+          sse_encode_list_prim_u_8_loose(publicKey, serializer);
+          sse_encode_bool(sharePromotion, serializer);
+          pdeCallFfi(
+            generalizedFrbRustBinding,
+            serializer,
+            funcId: 4,
+            port: port_,
+          );
+        },
+        codec: SseCodec(
+          decodeSuccessData: sse_decode_unit,
+          decodeErrorData: sse_decode_AnyhowException,
+        ),
+        constMeta:
+            kCrateBridgeWrapperUserDiscoveryFlutterUserDiscoveryInitializeOrUpdateConstMeta,
+        argValues: [threshold, userId, publicKey, sharePromotion],
+        apiImpl: this,
+      ),
+    );
+  }
+
+  TaskConstMeta
+  get kCrateBridgeWrapperUserDiscoveryFlutterUserDiscoveryInitializeOrUpdateConstMeta =>
+      const TaskConstMeta(
+        debugName: "flutter_user_discovery_initialize_or_update",
+        argNames: ["threshold", "userId", "publicKey", "sharePromotion"],
+      );
+
+  @override
+  Future<Uint8List?>
+  crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryShouldRequestNewMessages({
+    required PlatformInt64 contactId,
+    required List<int> version,
+  }) {
+    return handler.executeNormal(
+      NormalTask(
+        callFfi: (port_) {
+          final serializer = SseSerializer(generalizedFrbRustBinding);
+          sse_encode_i_64(contactId, serializer);
+          sse_encode_list_prim_u_8_loose(version, serializer);
+          pdeCallFfi(
+            generalizedFrbRustBinding,
+            serializer,
+            funcId: 5,
+            port: port_,
+          );
+        },
+        codec: SseCodec(
+          decodeSuccessData: sse_decode_opt_list_prim_u_8_strict,
+          decodeErrorData: sse_decode_AnyhowException,
+        ),
+        constMeta:
+            kCrateBridgeWrapperUserDiscoveryFlutterUserDiscoveryShouldRequestNewMessagesConstMeta,
+        argValues: [contactId, version],
+        apiImpl: this,
+      ),
+    );
+  }
+
+  TaskConstMeta
+  get kCrateBridgeWrapperUserDiscoveryFlutterUserDiscoveryShouldRequestNewMessagesConstMeta =>
+      const TaskConstMeta(
+        debugName: "flutter_user_discovery_should_request_new_messages",
+        argNames: ["contactId", "version"],
+      );
+
+  @override
+  Future<void>
+  crateBridgeWrapperUserDiscoveryFlutterUserDiscoveryUpdateVerificationStateForUser({
+    required PlatformInt64 contactId,
+    PlatformInt64? publicKeyVerifiedTimestamp,
+  }) {
+    return handler.executeNormal(
+      NormalTask(
+        callFfi: (port_) {
+          final serializer = SseSerializer(generalizedFrbRustBinding);
+          sse_encode_i_64(contactId, serializer);
+          sse_encode_opt_box_autoadd_i_64(
+            publicKeyVerifiedTimestamp,
+            serializer,
+          );
+          pdeCallFfi(
+            generalizedFrbRustBinding,
+            serializer,
+            funcId: 6,
+            port: port_,
+          );
+        },
+        codec: SseCodec(
+          decodeSuccessData: sse_decode_unit,
+          decodeErrorData: sse_decode_AnyhowException,
+        ),
+        constMeta:
+            kCrateBridgeWrapperUserDiscoveryFlutterUserDiscoveryUpdateVerificationStateForUserConstMeta,
+        argValues: [contactId, publicKeyVerifiedTimestamp],
+        apiImpl: this,
+      ),
+    );
+  }
+
+  TaskConstMeta
+  get kCrateBridgeWrapperUserDiscoveryFlutterUserDiscoveryUpdateVerificationStateForUserConstMeta =>
+      const TaskConstMeta(
+        debugName: "flutter_user_discovery_update_verification_state_for_user",
+        argNames: ["contactId", "publicKeyVerifiedTimestamp"],
+      );
+
+  @override
+  Future<void> crateBridgeCallbacksInitFlutterCallbacks({
+    required FutureOr<RustStreamSink<String>> Function() loggingGetStreamSink,
+    required FutureOr<Uint8List?> Function(Uint8List) userDiscoverySignData,
+    required FutureOr<bool> Function(Uint8List, Uint8List, Uint8List)
+    userDiscoveryVerifySignature,
+    required FutureOr<bool> Function(PlatformInt64, Uint8List)
+    userDiscoveryVerifyStoredPubkey,
+    required FutureOr<bool> Function(List<Uint8List>) userDiscoverySetShares,
+    required FutureOr<Uint8List?> Function(PlatformInt64)
+    userDiscoveryGetShareForContact,
+    required FutureOr<bool> Function(PlatformInt64, PlatformInt64, Uint8List)
+    userDiscoveryPushOwnPromotionAndClearOldVersion,
+    required FutureOr<List<Uint8List>?> Function(PlatformInt64)
+    userDiscoveryGetOwnPromotionsAfterVersion,
+    required FutureOr<bool> Function(OtherPromotion)
+    userDiscoveryStoreOtherPromotion,
+    required FutureOr<List<OtherPromotion>?> Function(PlatformInt64)
+    userDiscoveryGetOtherPromotionsByPublicId,
+    required FutureOr<AnnouncedUser?> Function(PlatformInt64)
+    userDiscoveryGetAnnouncedUserByPublicId,
+    required FutureOr<Uint8List?> Function(PlatformInt64)
+    userDiscoveryGetContactVersion,
+    required FutureOr<bool> Function(PlatformInt64, Uint8List)
+    userDiscoverySetContactVersion,
+    required FutureOr<bool> Function(
+      PlatformInt64,
+      AnnouncedUser,
+      PlatformInt64?,
+    )
+    userDiscoveryPushNewUserRelation,
+    required FutureOr<Uint8List?> Function(PlatformInt64)
+    userDiscoveryGetContactPromotion,
+  }) {
+    return handler.executeNormal(
+      NormalTask(
+        callFfi: (port_) {
+          final serializer = SseSerializer(generalizedFrbRustBinding);
+          sse_encode_DartFn_Inputs__Output_StreamSink_String_Sse_AnyhowException(
+            loggingGetStreamSink,
+            serializer,
+          );
+          sse_encode_DartFn_Inputs_list_prim_u_8_strict_Output_opt_list_prim_u_8_strict_AnyhowException(
+            userDiscoverySignData,
+            serializer,
+          );
+          sse_encode_DartFn_Inputs_list_prim_u_8_strict_list_prim_u_8_strict_list_prim_u_8_strict_Output_bool_AnyhowException(
+            userDiscoveryVerifySignature,
+            serializer,
+          );
+          sse_encode_DartFn_Inputs_i_64_list_prim_u_8_strict_Output_bool_AnyhowException(
+            userDiscoveryVerifyStoredPubkey,
+            serializer,
+          );
+          sse_encode_DartFn_Inputs_list_list_prim_u_8_strict_Output_bool_AnyhowException(
+            userDiscoverySetShares,
+            serializer,
+          );
+          sse_encode_DartFn_Inputs_i_64_Output_opt_list_prim_u_8_strict_AnyhowException(
+            userDiscoveryGetShareForContact,
+            serializer,
+          );
+          sse_encode_DartFn_Inputs_i_64_i_64_list_prim_u_8_strict_Output_bool_AnyhowException(
+            userDiscoveryPushOwnPromotionAndClearOldVersion,
+            serializer,
+          );
+          sse_encode_DartFn_Inputs_i_64_Output_opt_list_list_prim_u_8_strict_AnyhowException(
+            userDiscoveryGetOwnPromotionsAfterVersion,
+            serializer,
+          );
+          sse_encode_DartFn_Inputs_other_promotion_Output_bool_AnyhowException(
+            userDiscoveryStoreOtherPromotion,
+            serializer,
+          );
+          sse_encode_DartFn_Inputs_i_64_Output_opt_list_other_promotion_AnyhowException(
+            userDiscoveryGetOtherPromotionsByPublicId,
+            serializer,
+          );
+          sse_encode_DartFn_Inputs_i_64_Output_opt_box_autoadd_announced_user_AnyhowException(
+            userDiscoveryGetAnnouncedUserByPublicId,
+            serializer,
+          );
+          sse_encode_DartFn_Inputs_i_64_Output_opt_list_prim_u_8_strict_AnyhowException(
+            userDiscoveryGetContactVersion,
+            serializer,
+          );
+          sse_encode_DartFn_Inputs_i_64_list_prim_u_8_strict_Output_bool_AnyhowException(
+            userDiscoverySetContactVersion,
+            serializer,
+          );
+          sse_encode_DartFn_Inputs_i_64_announced_user_opt_box_autoadd_i_64_Output_bool_AnyhowException(
+            userDiscoveryPushNewUserRelation,
+            serializer,
+          );
+          sse_encode_DartFn_Inputs_i_64_Output_opt_list_prim_u_8_strict_AnyhowException(
+            userDiscoveryGetContactPromotion,
+            serializer,
+          );
+          pdeCallFfi(
+            generalizedFrbRustBinding,
+            serializer,
+            funcId: 7,
+            port: port_,
+          );
+        },
+        codec: SseCodec(
+          decodeSuccessData: sse_decode_unit,
+          decodeErrorData: null,
+        ),
+        constMeta: kCrateBridgeCallbacksInitFlutterCallbacksConstMeta,
+        argValues: [
+          loggingGetStreamSink,
+          userDiscoverySignData,
+          userDiscoveryVerifySignature,
+          userDiscoveryVerifyStoredPubkey,
+          userDiscoverySetShares,
+          userDiscoveryGetShareForContact,
+          userDiscoveryPushOwnPromotionAndClearOldVersion,
+          userDiscoveryGetOwnPromotionsAfterVersion,
+          userDiscoveryStoreOtherPromotion,
+          userDiscoveryGetOtherPromotionsByPublicId,
+          userDiscoveryGetAnnouncedUserByPublicId,
+          userDiscoveryGetContactVersion,
+          userDiscoverySetContactVersion,
+          userDiscoveryPushNewUserRelation,
+          userDiscoveryGetContactPromotion,
+        ],
+        apiImpl: this,
+      ),
+    );
+  }
+
+  TaskConstMeta get kCrateBridgeCallbacksInitFlutterCallbacksConstMeta =>
+      const TaskConstMeta(
+        debugName: "init_flutter_callbacks",
+        argNames: [
+          "loggingGetStreamSink",
+          "userDiscoverySignData",
+          "userDiscoveryVerifySignature",
+          "userDiscoveryVerifyStoredPubkey",
+          "userDiscoverySetShares",
+          "userDiscoveryGetShareForContact",
+          "userDiscoveryPushOwnPromotionAndClearOldVersion",
+          "userDiscoveryGetOwnPromotionsAfterVersion",
+          "userDiscoveryStoreOtherPromotion",
+          "userDiscoveryGetOtherPromotionsByPublicId",
+          "userDiscoveryGetAnnouncedUserByPublicId",
+          "userDiscoveryGetContactVersion",
+          "userDiscoverySetContactVersion",
+          "userDiscoveryPushNewUserRelation",
+          "userDiscoveryGetContactPromotion",
+        ],
+      );
+
+  @override
+  Future<void> crateBridgeInitializeTwonlyFlutter({
+    required TwonlyConfig config,
+  }) {
+    return handler.executeNormal(
+      NormalTask(
+        callFfi: (port_) {
+          final serializer = SseSerializer(generalizedFrbRustBinding);
+          sse_encode_box_autoadd_twonly_config(config, serializer);
+          pdeCallFfi(
+            generalizedFrbRustBinding,
+            serializer,
+            funcId: 8,
+            port: port_,
+          );
+        },
+        codec: SseCodec(
+          decodeSuccessData: sse_decode_unit,
+          decodeErrorData: sse_decode_AnyhowException,
+        ),
+        constMeta: kCrateBridgeInitializeTwonlyFlutterConstMeta,
+        argValues: [config],
+        apiImpl: this,
+      ),
+    );
+  }
+
+  TaskConstMeta get kCrateBridgeInitializeTwonlyFlutterConstMeta =>
+      const TaskConstMeta(
+        debugName: "initialize_twonly_flutter",
+        argNames: ["config"],
+      );
+
+  Future<void> Function(
+    int,
+  )
+  encode_DartFn_Inputs__Output_StreamSink_String_Sse_AnyhowException(
+    FutureOr<RustStreamSink<String>> Function() raw,
+  ) {
+    return (
+      callId,
+    ) async {
+      Box<RustStreamSink<String>>? rawOutput;
+      Box<AnyhowException>? rawError;
+      try {
+        rawOutput = Box(await raw());
+      } catch (e, s) {
+        rawError = Box(AnyhowException("$e\n\n$s"));
+      }
+
+      final serializer = SseSerializer(generalizedFrbRustBinding);
+      assert((rawOutput != null) ^ (rawError != null));
+      if (rawOutput != null) {
+        serializer.buffer.putUint8(0);
+        sse_encode_StreamSink_String_Sse(rawOutput.value, serializer);
+      } else {
+        serializer.buffer.putUint8(1);
+        sse_encode_AnyhowException(rawError!.value, serializer);
+      }
+      final output = serializer.intoRaw();
+
+      generalizedFrbRustBinding.dartFnDeliverOutput(
+        callId: callId,
+        ptr: output.ptr,
+        rustVecLen: output.rustVecLen,
+        dataLen: output.dataLen,
+      );
+    };
+  }
+
+  Future<void> Function(int, dynamic)
+  encode_DartFn_Inputs_i_64_Output_opt_box_autoadd_announced_user_AnyhowException(
+    FutureOr<AnnouncedUser?> Function(PlatformInt64) raw,
+  ) {
+    return (callId, rawArg0) async {
+      final arg0 = dco_decode_i_64(rawArg0);
+
+      Box<AnnouncedUser?>? rawOutput;
+      Box<AnyhowException>? rawError;
+      try {
+        rawOutput = Box(await raw(arg0));
+      } catch (e, s) {
+        rawError = Box(AnyhowException("$e\n\n$s"));
+      }
+
+      final serializer = SseSerializer(generalizedFrbRustBinding);
+      assert((rawOutput != null) ^ (rawError != null));
+      if (rawOutput != null) {
+        serializer.buffer.putUint8(0);
+        sse_encode_opt_box_autoadd_announced_user(rawOutput.value, serializer);
+      } else {
+        serializer.buffer.putUint8(1);
+        sse_encode_AnyhowException(rawError!.value, serializer);
+      }
+      final output = serializer.intoRaw();
+
+      generalizedFrbRustBinding.dartFnDeliverOutput(
+        callId: callId,
+        ptr: output.ptr,
+        rustVecLen: output.rustVecLen,
+        dataLen: output.dataLen,
+      );
+    };
+  }
+
+  Future<void> Function(int, dynamic)
+  encode_DartFn_Inputs_i_64_Output_opt_list_list_prim_u_8_strict_AnyhowException(
+    FutureOr<List<Uint8List>?> Function(PlatformInt64) raw,
+  ) {
+    return (callId, rawArg0) async {
+      final arg0 = dco_decode_i_64(rawArg0);
+
+      Box<List<Uint8List>?>? rawOutput;
+      Box<AnyhowException>? rawError;
+      try {
+        rawOutput = Box(await raw(arg0));
+      } catch (e, s) {
+        rawError = Box(AnyhowException("$e\n\n$s"));
+      }
+
+      final serializer = SseSerializer(generalizedFrbRustBinding);
+      assert((rawOutput != null) ^ (rawError != null));
+      if (rawOutput != null) {
+        serializer.buffer.putUint8(0);
+        sse_encode_opt_list_list_prim_u_8_strict(rawOutput.value, serializer);
+      } else {
+        serializer.buffer.putUint8(1);
+        sse_encode_AnyhowException(rawError!.value, serializer);
+      }
+      final output = serializer.intoRaw();
+
+      generalizedFrbRustBinding.dartFnDeliverOutput(
+        callId: callId,
+        ptr: output.ptr,
+        rustVecLen: output.rustVecLen,
+        dataLen: output.dataLen,
+      );
+    };
+  }
+
+  Future<void> Function(int, dynamic)
+  encode_DartFn_Inputs_i_64_Output_opt_list_other_promotion_AnyhowException(
+    FutureOr<List<OtherPromotion>?> Function(PlatformInt64) raw,
+  ) {
+    return (callId, rawArg0) async {
+      final arg0 = dco_decode_i_64(rawArg0);
+
+      Box<List<OtherPromotion>?>? rawOutput;
+      Box<AnyhowException>? rawError;
+      try {
+        rawOutput = Box(await raw(arg0));
+      } catch (e, s) {
+        rawError = Box(AnyhowException("$e\n\n$s"));
+      }
+
+      final serializer = SseSerializer(generalizedFrbRustBinding);
+      assert((rawOutput != null) ^ (rawError != null));
+      if (rawOutput != null) {
+        serializer.buffer.putUint8(0);
+        sse_encode_opt_list_other_promotion(rawOutput.value, serializer);
+      } else {
+        serializer.buffer.putUint8(1);
+        sse_encode_AnyhowException(rawError!.value, serializer);
+      }
+      final output = serializer.intoRaw();
+
+      generalizedFrbRustBinding.dartFnDeliverOutput(
+        callId: callId,
+        ptr: output.ptr,
+        rustVecLen: output.rustVecLen,
+        dataLen: output.dataLen,
+      );
+    };
+  }
+
+  Future<void> Function(int, dynamic)
+  encode_DartFn_Inputs_i_64_Output_opt_list_prim_u_8_strict_AnyhowException(
+    FutureOr<Uint8List?> Function(PlatformInt64) raw,
+  ) {
+    return (callId, rawArg0) async {
+      final arg0 = dco_decode_i_64(rawArg0);
+
+      Box<Uint8List?>? rawOutput;
+      Box<AnyhowException>? rawError;
+      try {
+        rawOutput = Box(await raw(arg0));
+      } catch (e, s) {
+        rawError = Box(AnyhowException("$e\n\n$s"));
+      }
+
+      final serializer = SseSerializer(generalizedFrbRustBinding);
+      assert((rawOutput != null) ^ (rawError != null));
+      if (rawOutput != null) {
+        serializer.buffer.putUint8(0);
+        sse_encode_opt_list_prim_u_8_strict(rawOutput.value, serializer);
+      } else {
+        serializer.buffer.putUint8(1);
+        sse_encode_AnyhowException(rawError!.value, serializer);
+      }
+      final output = serializer.intoRaw();
+
+      generalizedFrbRustBinding.dartFnDeliverOutput(
+        callId: callId,
+        ptr: output.ptr,
+        rustVecLen: output.rustVecLen,
+        dataLen: output.dataLen,
+      );
+    };
+  }
+
+  Future<void> Function(int, dynamic, dynamic, dynamic)
+  encode_DartFn_Inputs_i_64_announced_user_opt_box_autoadd_i_64_Output_bool_AnyhowException(
+    FutureOr<bool> Function(PlatformInt64, AnnouncedUser, PlatformInt64?) raw,
+  ) {
+    return (callId, rawArg0, rawArg1, rawArg2) async {
+      final arg0 = dco_decode_i_64(rawArg0);
+      final arg1 = dco_decode_announced_user(rawArg1);
+      final arg2 = dco_decode_opt_box_autoadd_i_64(rawArg2);
+
+      Box<bool>? rawOutput;
+      Box<AnyhowException>? rawError;
+      try {
+        rawOutput = Box(await raw(arg0, arg1, arg2));
+      } catch (e, s) {
+        rawError = Box(AnyhowException("$e\n\n$s"));
+      }
+
+      final serializer = SseSerializer(generalizedFrbRustBinding);
+      assert((rawOutput != null) ^ (rawError != null));
+      if (rawOutput != null) {
+        serializer.buffer.putUint8(0);
+        sse_encode_bool(rawOutput.value, serializer);
+      } else {
+        serializer.buffer.putUint8(1);
+        sse_encode_AnyhowException(rawError!.value, serializer);
+      }
+      final output = serializer.intoRaw();
+
+      generalizedFrbRustBinding.dartFnDeliverOutput(
+        callId: callId,
+        ptr: output.ptr,
+        rustVecLen: output.rustVecLen,
+        dataLen: output.dataLen,
+      );
+    };
+  }
+
+  Future<void> Function(int, dynamic, dynamic, dynamic)
+  encode_DartFn_Inputs_i_64_i_64_list_prim_u_8_strict_Output_bool_AnyhowException(
+    FutureOr<bool> Function(PlatformInt64, PlatformInt64, Uint8List) raw,
+  ) {
+    return (callId, rawArg0, rawArg1, rawArg2) async {
+      final arg0 = dco_decode_i_64(rawArg0);
+      final arg1 = dco_decode_i_64(rawArg1);
+      final arg2 = dco_decode_list_prim_u_8_strict(rawArg2);
+
+      Box<bool>? rawOutput;
+      Box<AnyhowException>? rawError;
+      try {
+        rawOutput = Box(await raw(arg0, arg1, arg2));
+      } catch (e, s) {
+        rawError = Box(AnyhowException("$e\n\n$s"));
+      }
+
+      final serializer = SseSerializer(generalizedFrbRustBinding);
+      assert((rawOutput != null) ^ (rawError != null));
+      if (rawOutput != null) {
+        serializer.buffer.putUint8(0);
+        sse_encode_bool(rawOutput.value, serializer);
+      } else {
+        serializer.buffer.putUint8(1);
+        sse_encode_AnyhowException(rawError!.value, serializer);
+      }
+      final output = serializer.intoRaw();
+
+      generalizedFrbRustBinding.dartFnDeliverOutput(
+        callId: callId,
+        ptr: output.ptr,
+        rustVecLen: output.rustVecLen,
+        dataLen: output.dataLen,
+      );
+    };
+  }
+
+  Future<void> Function(int, dynamic, dynamic)
+  encode_DartFn_Inputs_i_64_list_prim_u_8_strict_Output_bool_AnyhowException(
+    FutureOr<bool> Function(PlatformInt64, Uint8List) raw,
+  ) {
+    return (callId, rawArg0, rawArg1) async {
+      final arg0 = dco_decode_i_64(rawArg0);
+      final arg1 = dco_decode_list_prim_u_8_strict(rawArg1);
+
+      Box<bool>? rawOutput;
+      Box<AnyhowException>? rawError;
+      try {
+        rawOutput = Box(await raw(arg0, arg1));
+      } catch (e, s) {
+        rawError = Box(AnyhowException("$e\n\n$s"));
+      }
+
+      final serializer = SseSerializer(generalizedFrbRustBinding);
+      assert((rawOutput != null) ^ (rawError != null));
+      if (rawOutput != null) {
+        serializer.buffer.putUint8(0);
+        sse_encode_bool(rawOutput.value, serializer);
+      } else {
+        serializer.buffer.putUint8(1);
+        sse_encode_AnyhowException(rawError!.value, serializer);
+      }
+      final output = serializer.intoRaw();
+
+      generalizedFrbRustBinding.dartFnDeliverOutput(
+        callId: callId,
+        ptr: output.ptr,
+        rustVecLen: output.rustVecLen,
+        dataLen: output.dataLen,
+      );
+    };
+  }
+
+  Future<void> Function(int, dynamic)
+  encode_DartFn_Inputs_list_list_prim_u_8_strict_Output_bool_AnyhowException(
+    FutureOr<bool> Function(List<Uint8List>) raw,
+  ) {
+    return (callId, rawArg0) async {
+      final arg0 = dco_decode_list_list_prim_u_8_strict(rawArg0);
+
+      Box<bool>? rawOutput;
+      Box<AnyhowException>? rawError;
+      try {
+        rawOutput = Box(await raw(arg0));
+      } catch (e, s) {
+        rawError = Box(AnyhowException("$e\n\n$s"));
+      }
+
+      final serializer = SseSerializer(generalizedFrbRustBinding);
+      assert((rawOutput != null) ^ (rawError != null));
+      if (rawOutput != null) {
+        serializer.buffer.putUint8(0);
+        sse_encode_bool(rawOutput.value, serializer);
+      } else {
+        serializer.buffer.putUint8(1);
+        sse_encode_AnyhowException(rawError!.value, serializer);
+      }
+      final output = serializer.intoRaw();
+
+      generalizedFrbRustBinding.dartFnDeliverOutput(
+        callId: callId,
+        ptr: output.ptr,
+        rustVecLen: output.rustVecLen,
+        dataLen: output.dataLen,
+      );
+    };
+  }
+
+  Future<void> Function(int, dynamic)
+  encode_DartFn_Inputs_list_prim_u_8_strict_Output_opt_list_prim_u_8_strict_AnyhowException(
+    FutureOr<Uint8List?> Function(Uint8List) raw,
+  ) {
+    return (callId, rawArg0) async {
+      final arg0 = dco_decode_list_prim_u_8_strict(rawArg0);
+
+      Box<Uint8List?>? rawOutput;
+      Box<AnyhowException>? rawError;
+      try {
+        rawOutput = Box(await raw(arg0));
+      } catch (e, s) {
+        rawError = Box(AnyhowException("$e\n\n$s"));
+      }
+
+      final serializer = SseSerializer(generalizedFrbRustBinding);
+      assert((rawOutput != null) ^ (rawError != null));
+      if (rawOutput != null) {
+        serializer.buffer.putUint8(0);
+        sse_encode_opt_list_prim_u_8_strict(rawOutput.value, serializer);
+      } else {
+        serializer.buffer.putUint8(1);
+        sse_encode_AnyhowException(rawError!.value, serializer);
+      }
+      final output = serializer.intoRaw();
+
+      generalizedFrbRustBinding.dartFnDeliverOutput(
+        callId: callId,
+        ptr: output.ptr,
+        rustVecLen: output.rustVecLen,
+        dataLen: output.dataLen,
+      );
+    };
+  }
+
+  Future<void> Function(int, dynamic, dynamic, dynamic)
+  encode_DartFn_Inputs_list_prim_u_8_strict_list_prim_u_8_strict_list_prim_u_8_strict_Output_bool_AnyhowException(
+    FutureOr<bool> Function(Uint8List, Uint8List, Uint8List) raw,
+  ) {
+    return (callId, rawArg0, rawArg1, rawArg2) async {
+      final arg0 = dco_decode_list_prim_u_8_strict(rawArg0);
+      final arg1 = dco_decode_list_prim_u_8_strict(rawArg1);
+      final arg2 = dco_decode_list_prim_u_8_strict(rawArg2);
+
+      Box<bool>? rawOutput;
+      Box<AnyhowException>? rawError;
+      try {
+        rawOutput = Box(await raw(arg0, arg1, arg2));
+      } catch (e, s) {
+        rawError = Box(AnyhowException("$e\n\n$s"));
+      }
+
+      final serializer = SseSerializer(generalizedFrbRustBinding);
+      assert((rawOutput != null) ^ (rawError != null));
+      if (rawOutput != null) {
+        serializer.buffer.putUint8(0);
+        sse_encode_bool(rawOutput.value, serializer);
+      } else {
+        serializer.buffer.putUint8(1);
+        sse_encode_AnyhowException(rawError!.value, serializer);
+      }
+      final output = serializer.intoRaw();
+
+      generalizedFrbRustBinding.dartFnDeliverOutput(
+        callId: callId,
+        ptr: output.ptr,
+        rustVecLen: output.rustVecLen,
+        dataLen: output.dataLen,
+      );
+    };
+  }
+
+  Future<void> Function(int, dynamic)
+  encode_DartFn_Inputs_other_promotion_Output_bool_AnyhowException(
+    FutureOr<bool> Function(OtherPromotion) raw,
+  ) {
+    return (callId, rawArg0) async {
+      final arg0 = dco_decode_other_promotion(rawArg0);
+
+      Box<bool>? rawOutput;
+      Box<AnyhowException>? rawError;
+      try {
+        rawOutput = Box(await raw(arg0));
+      } catch (e, s) {
+        rawError = Box(AnyhowException("$e\n\n$s"));
+      }
+
+      final serializer = SseSerializer(generalizedFrbRustBinding);
+      assert((rawOutput != null) ^ (rawError != null));
+      if (rawOutput != null) {
+        serializer.buffer.putUint8(0);
+        sse_encode_bool(rawOutput.value, serializer);
+      } else {
+        serializer.buffer.putUint8(1);
+        sse_encode_AnyhowException(rawError!.value, serializer);
+      }
+      final output = serializer.intoRaw();
+
+      generalizedFrbRustBinding.dartFnDeliverOutput(
+        callId: callId,
+        ptr: output.ptr,
+        rustVecLen: output.rustVecLen,
+        dataLen: output.dataLen,
+      );
+    };
+  }
+
+  @protected
+  AnyhowException dco_decode_AnyhowException(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return AnyhowException(raw as String);
+  }
+
+  @protected
+  FutureOr<RustStreamSink<String>> Function()
+  dco_decode_DartFn_Inputs__Output_StreamSink_String_Sse_AnyhowException(
+    dynamic raw,
+  ) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    throw UnimplementedError('');
+  }
+
+  @protected
+  FutureOr<AnnouncedUser?> Function(PlatformInt64)
+  dco_decode_DartFn_Inputs_i_64_Output_opt_box_autoadd_announced_user_AnyhowException(
+    dynamic raw,
+  ) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    throw UnimplementedError('');
+  }
+
+  @protected
+  FutureOr<List<Uint8List>?> Function(PlatformInt64)
+  dco_decode_DartFn_Inputs_i_64_Output_opt_list_list_prim_u_8_strict_AnyhowException(
+    dynamic raw,
+  ) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    throw UnimplementedError('');
+  }
+
+  @protected
+  FutureOr<List<OtherPromotion>?> Function(PlatformInt64)
+  dco_decode_DartFn_Inputs_i_64_Output_opt_list_other_promotion_AnyhowException(
+    dynamic raw,
+  ) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    throw UnimplementedError('');
+  }
+
+  @protected
+  FutureOr<Uint8List?> Function(PlatformInt64)
+  dco_decode_DartFn_Inputs_i_64_Output_opt_list_prim_u_8_strict_AnyhowException(
+    dynamic raw,
+  ) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    throw UnimplementedError('');
+  }
+
+  @protected
+  FutureOr<bool> Function(PlatformInt64, AnnouncedUser, PlatformInt64?)
+  dco_decode_DartFn_Inputs_i_64_announced_user_opt_box_autoadd_i_64_Output_bool_AnyhowException(
+    dynamic raw,
+  ) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    throw UnimplementedError('');
+  }
+
+  @protected
+  FutureOr<bool> Function(PlatformInt64, PlatformInt64, Uint8List)
+  dco_decode_DartFn_Inputs_i_64_i_64_list_prim_u_8_strict_Output_bool_AnyhowException(
+    dynamic raw,
+  ) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    throw UnimplementedError('');
+  }
+
+  @protected
+  FutureOr<bool> Function(PlatformInt64, Uint8List)
+  dco_decode_DartFn_Inputs_i_64_list_prim_u_8_strict_Output_bool_AnyhowException(
+    dynamic raw,
+  ) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    throw UnimplementedError('');
+  }
+
+  @protected
+  FutureOr<bool> Function(List<Uint8List>)
+  dco_decode_DartFn_Inputs_list_list_prim_u_8_strict_Output_bool_AnyhowException(
+    dynamic raw,
+  ) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    throw UnimplementedError('');
+  }
+
+  @protected
+  FutureOr<Uint8List?> Function(Uint8List)
+  dco_decode_DartFn_Inputs_list_prim_u_8_strict_Output_opt_list_prim_u_8_strict_AnyhowException(
+    dynamic raw,
+  ) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    throw UnimplementedError('');
+  }
+
+  @protected
+  FutureOr<bool> Function(Uint8List, Uint8List, Uint8List)
+  dco_decode_DartFn_Inputs_list_prim_u_8_strict_list_prim_u_8_strict_list_prim_u_8_strict_Output_bool_AnyhowException(
+    dynamic raw,
+  ) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    throw UnimplementedError('');
+  }
+
+  @protected
+  FutureOr<bool> Function(OtherPromotion)
+  dco_decode_DartFn_Inputs_other_promotion_Output_bool_AnyhowException(
+    dynamic raw,
+  ) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    throw UnimplementedError('');
+  }
+
+  @protected
+  Object dco_decode_DartOpaque(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return decodeDartOpaque(raw, generalizedFrbRustBinding);
+  }
+
+  @protected
+  RustStreamSink<String> dco_decode_StreamSink_String_Sse(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    throw UnimplementedError();
+  }
+
+  @protected
+  String dco_decode_String(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return raw as String;
+  }
+
+  @protected
+  AnnouncedUser dco_decode_announced_user(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    final arr = raw as List<dynamic>;
+    if (arr.length != 3)
+      throw Exception('unexpected arr length: expect 3 but see ${arr.length}');
+    return AnnouncedUser(
+      userId: dco_decode_i_64(arr[0]),
+      publicKey: dco_decode_list_prim_u_8_strict(arr[1]),
+      publicId: dco_decode_i_64(arr[2]),
+    );
+  }
+
+  @protected
+  bool dco_decode_bool(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return raw as bool;
+  }
+
+  @protected
+  AnnouncedUser dco_decode_box_autoadd_announced_user(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return dco_decode_announced_user(raw);
+  }
+
+  @protected
+  PlatformInt64 dco_decode_box_autoadd_i_64(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return dco_decode_i_64(raw);
+  }
+
+  @protected
+  TwonlyConfig dco_decode_box_autoadd_twonly_config(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return dco_decode_twonly_config(raw);
+  }
+
+  @protected
+  FlutterUserDiscovery dco_decode_flutter_user_discovery(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    final arr = raw as List<dynamic>;
+    if (arr.length != 0)
+      throw Exception('unexpected arr length: expect 0 but see ${arr.length}');
+    return FlutterUserDiscovery();
+  }
+
+  @protected
+  PlatformInt64 dco_decode_i_64(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return dcoDecodeI64(raw);
+  }
+
+  @protected
+  PlatformInt64 dco_decode_isize(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return dcoDecodeI64(raw);
+  }
+
+  @protected
+  List<Uint8List> dco_decode_list_list_prim_u_8_strict(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return (raw as List<dynamic>).map(dco_decode_list_prim_u_8_strict).toList();
+  }
+
+  @protected
+  List<OtherPromotion> dco_decode_list_other_promotion(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return (raw as List<dynamic>).map(dco_decode_other_promotion).toList();
+  }
+
+  @protected
+  List<int> dco_decode_list_prim_u_8_loose(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return raw as List<int>;
+  }
+
+  @protected
+  Uint8List dco_decode_list_prim_u_8_strict(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return raw as Uint8List;
+  }
+
+  @protected
+  AnnouncedUser? dco_decode_opt_box_autoadd_announced_user(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return raw == null ? null : dco_decode_box_autoadd_announced_user(raw);
+  }
+
+  @protected
+  PlatformInt64? dco_decode_opt_box_autoadd_i_64(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return raw == null ? null : dco_decode_box_autoadd_i_64(raw);
+  }
+
+  @protected
+  List<Uint8List>? dco_decode_opt_list_list_prim_u_8_strict(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return raw == null ? null : dco_decode_list_list_prim_u_8_strict(raw);
+  }
+
+  @protected
+  List<OtherPromotion>? dco_decode_opt_list_other_promotion(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return raw == null ? null : dco_decode_list_other_promotion(raw);
+  }
+
+  @protected
+  Uint8List? dco_decode_opt_list_prim_u_8_strict(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return raw == null ? null : dco_decode_list_prim_u_8_strict(raw);
+  }
+
+  @protected
+  OtherPromotion dco_decode_other_promotion(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    final arr = raw as List<dynamic>;
+    if (arr.length != 6)
+      throw Exception('unexpected arr length: expect 6 but see ${arr.length}');
+    return OtherPromotion(
+      promotionId: dco_decode_u_32(arr[0]),
+      publicId: dco_decode_i_64(arr[1]),
+      fromContactId: dco_decode_i_64(arr[2]),
+      threshold: dco_decode_u_8(arr[3]),
+      announcementShare: dco_decode_list_prim_u_8_strict(arr[4]),
+      publicKeyVerifiedTimestamp: dco_decode_opt_box_autoadd_i_64(arr[5]),
+    );
+  }
+
+  @protected
+  TwonlyConfig dco_decode_twonly_config(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    final arr = raw as List<dynamic>;
+    if (arr.length != 2)
+      throw Exception('unexpected arr length: expect 2 but see ${arr.length}');
+    return TwonlyConfig(
+      databasePath: dco_decode_String(arr[0]),
+      dataDirectory: dco_decode_String(arr[1]),
+    );
+  }
+
+  @protected
+  int dco_decode_u_32(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return raw as int;
+  }
+
+  @protected
+  int dco_decode_u_8(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return raw as int;
+  }
+
+  @protected
+  void dco_decode_unit(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return;
+  }
+
+  @protected
+  BigInt dco_decode_usize(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return dcoDecodeU64(raw);
+  }
+
+  @protected
+  AnyhowException sse_decode_AnyhowException(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    var inner = sse_decode_String(deserializer);
+    return AnyhowException(inner);
+  }
+
+  @protected
+  Object sse_decode_DartOpaque(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    var inner = sse_decode_isize(deserializer);
+    return decodeDartOpaque(inner, generalizedFrbRustBinding);
+  }
+
+  @protected
+  RustStreamSink<String> sse_decode_StreamSink_String_Sse(
+    SseDeserializer deserializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    throw UnimplementedError('Unreachable ()');
+  }
+
+  @protected
+  String sse_decode_String(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    var inner = sse_decode_list_prim_u_8_strict(deserializer);
+    return utf8.decoder.convert(inner);
+  }
+
+  @protected
+  AnnouncedUser sse_decode_announced_user(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    var var_userId = sse_decode_i_64(deserializer);
+    var var_publicKey = sse_decode_list_prim_u_8_strict(deserializer);
+    var var_publicId = sse_decode_i_64(deserializer);
+    return AnnouncedUser(
+      userId: var_userId,
+      publicKey: var_publicKey,
+      publicId: var_publicId,
+    );
+  }
+
+  @protected
+  bool sse_decode_bool(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    return deserializer.buffer.getUint8() != 0;
+  }
+
+  @protected
+  AnnouncedUser sse_decode_box_autoadd_announced_user(
+    SseDeserializer deserializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    return (sse_decode_announced_user(deserializer));
+  }
+
+  @protected
+  PlatformInt64 sse_decode_box_autoadd_i_64(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    return (sse_decode_i_64(deserializer));
+  }
+
+  @protected
+  TwonlyConfig sse_decode_box_autoadd_twonly_config(
+    SseDeserializer deserializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    return (sse_decode_twonly_config(deserializer));
+  }
+
+  @protected
+  FlutterUserDiscovery sse_decode_flutter_user_discovery(
+    SseDeserializer deserializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    return FlutterUserDiscovery();
+  }
+
+  @protected
+  PlatformInt64 sse_decode_i_64(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    return deserializer.buffer.getPlatformInt64();
+  }
+
+  @protected
+  PlatformInt64 sse_decode_isize(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    return deserializer.buffer.getPlatformInt64();
+  }
+
+  @protected
+  List<Uint8List> sse_decode_list_list_prim_u_8_strict(
+    SseDeserializer deserializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+
+    var len_ = sse_decode_i_32(deserializer);
+    var ans_ = <Uint8List>[];
+    for (var idx_ = 0; idx_ < len_; ++idx_) {
+      ans_.add(sse_decode_list_prim_u_8_strict(deserializer));
+    }
+    return ans_;
+  }
+
+  @protected
+  List<OtherPromotion> sse_decode_list_other_promotion(
+    SseDeserializer deserializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+
+    var len_ = sse_decode_i_32(deserializer);
+    var ans_ = <OtherPromotion>[];
+    for (var idx_ = 0; idx_ < len_; ++idx_) {
+      ans_.add(sse_decode_other_promotion(deserializer));
+    }
+    return ans_;
+  }
+
+  @protected
+  List<int> sse_decode_list_prim_u_8_loose(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    var len_ = sse_decode_i_32(deserializer);
+    return deserializer.buffer.getUint8List(len_);
+  }
+
+  @protected
+  Uint8List sse_decode_list_prim_u_8_strict(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    var len_ = sse_decode_i_32(deserializer);
+    return deserializer.buffer.getUint8List(len_);
+  }
+
+  @protected
+  AnnouncedUser? sse_decode_opt_box_autoadd_announced_user(
+    SseDeserializer deserializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+
+    if (sse_decode_bool(deserializer)) {
+      return (sse_decode_box_autoadd_announced_user(deserializer));
+    } else {
+      return null;
+    }
+  }
+
+  @protected
+  PlatformInt64? sse_decode_opt_box_autoadd_i_64(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+
+    if (sse_decode_bool(deserializer)) {
+      return (sse_decode_box_autoadd_i_64(deserializer));
+    } else {
+      return null;
+    }
+  }
+
+  @protected
+  List<Uint8List>? sse_decode_opt_list_list_prim_u_8_strict(
+    SseDeserializer deserializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+
+    if (sse_decode_bool(deserializer)) {
+      return (sse_decode_list_list_prim_u_8_strict(deserializer));
+    } else {
+      return null;
+    }
+  }
+
+  @protected
+  List<OtherPromotion>? sse_decode_opt_list_other_promotion(
+    SseDeserializer deserializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+
+    if (sse_decode_bool(deserializer)) {
+      return (sse_decode_list_other_promotion(deserializer));
+    } else {
+      return null;
+    }
+  }
+
+  @protected
+  Uint8List? sse_decode_opt_list_prim_u_8_strict(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+
+    if (sse_decode_bool(deserializer)) {
+      return (sse_decode_list_prim_u_8_strict(deserializer));
+    } else {
+      return null;
+    }
+  }
+
+  @protected
+  OtherPromotion sse_decode_other_promotion(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    var var_promotionId = sse_decode_u_32(deserializer);
+    var var_publicId = sse_decode_i_64(deserializer);
+    var var_fromContactId = sse_decode_i_64(deserializer);
+    var var_threshold = sse_decode_u_8(deserializer);
+    var var_announcementShare = sse_decode_list_prim_u_8_strict(deserializer);
+    var var_publicKeyVerifiedTimestamp = sse_decode_opt_box_autoadd_i_64(
+      deserializer,
+    );
+    return OtherPromotion(
+      promotionId: var_promotionId,
+      publicId: var_publicId,
+      fromContactId: var_fromContactId,
+      threshold: var_threshold,
+      announcementShare: var_announcementShare,
+      publicKeyVerifiedTimestamp: var_publicKeyVerifiedTimestamp,
+    );
+  }
+
+  @protected
+  TwonlyConfig sse_decode_twonly_config(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    var var_databasePath = sse_decode_String(deserializer);
+    var var_dataDirectory = sse_decode_String(deserializer);
+    return TwonlyConfig(
+      databasePath: var_databasePath,
+      dataDirectory: var_dataDirectory,
+    );
+  }
+
+  @protected
+  int sse_decode_u_32(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    return deserializer.buffer.getUint32();
+  }
+
+  @protected
+  int sse_decode_u_8(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    return deserializer.buffer.getUint8();
+  }
+
+  @protected
+  void sse_decode_unit(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+  }
+
+  @protected
+  BigInt sse_decode_usize(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    return deserializer.buffer.getBigUint64();
+  }
+
+  @protected
+  int sse_decode_i_32(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    return deserializer.buffer.getInt32();
+  }
+
+  @protected
+  void sse_encode_AnyhowException(
+    AnyhowException self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_String(self.message, serializer);
+  }
+
+  @protected
+  void sse_encode_DartFn_Inputs__Output_StreamSink_String_Sse_AnyhowException(
+    FutureOr<RustStreamSink<String>> Function() self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_DartOpaque(
+      encode_DartFn_Inputs__Output_StreamSink_String_Sse_AnyhowException(self),
+      serializer,
+    );
+  }
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_i_64_Output_opt_box_autoadd_announced_user_AnyhowException(
+    FutureOr<AnnouncedUser?> Function(PlatformInt64) self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_DartOpaque(
+      encode_DartFn_Inputs_i_64_Output_opt_box_autoadd_announced_user_AnyhowException(
+        self,
+      ),
+      serializer,
+    );
+  }
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_i_64_Output_opt_list_list_prim_u_8_strict_AnyhowException(
+    FutureOr<List<Uint8List>?> Function(PlatformInt64) self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_DartOpaque(
+      encode_DartFn_Inputs_i_64_Output_opt_list_list_prim_u_8_strict_AnyhowException(
+        self,
+      ),
+      serializer,
+    );
+  }
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_i_64_Output_opt_list_other_promotion_AnyhowException(
+    FutureOr<List<OtherPromotion>?> Function(PlatformInt64) self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_DartOpaque(
+      encode_DartFn_Inputs_i_64_Output_opt_list_other_promotion_AnyhowException(
+        self,
+      ),
+      serializer,
+    );
+  }
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_i_64_Output_opt_list_prim_u_8_strict_AnyhowException(
+    FutureOr<Uint8List?> Function(PlatformInt64) self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_DartOpaque(
+      encode_DartFn_Inputs_i_64_Output_opt_list_prim_u_8_strict_AnyhowException(
+        self,
+      ),
+      serializer,
+    );
+  }
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_i_64_announced_user_opt_box_autoadd_i_64_Output_bool_AnyhowException(
+    FutureOr<bool> Function(PlatformInt64, AnnouncedUser, PlatformInt64?) self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_DartOpaque(
+      encode_DartFn_Inputs_i_64_announced_user_opt_box_autoadd_i_64_Output_bool_AnyhowException(
+        self,
+      ),
+      serializer,
+    );
+  }
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_i_64_i_64_list_prim_u_8_strict_Output_bool_AnyhowException(
+    FutureOr<bool> Function(PlatformInt64, PlatformInt64, Uint8List) self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_DartOpaque(
+      encode_DartFn_Inputs_i_64_i_64_list_prim_u_8_strict_Output_bool_AnyhowException(
+        self,
+      ),
+      serializer,
+    );
+  }
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_i_64_list_prim_u_8_strict_Output_bool_AnyhowException(
+    FutureOr<bool> Function(PlatformInt64, Uint8List) self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_DartOpaque(
+      encode_DartFn_Inputs_i_64_list_prim_u_8_strict_Output_bool_AnyhowException(
+        self,
+      ),
+      serializer,
+    );
+  }
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_list_list_prim_u_8_strict_Output_bool_AnyhowException(
+    FutureOr<bool> Function(List<Uint8List>) self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_DartOpaque(
+      encode_DartFn_Inputs_list_list_prim_u_8_strict_Output_bool_AnyhowException(
+        self,
+      ),
+      serializer,
+    );
+  }
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_list_prim_u_8_strict_Output_opt_list_prim_u_8_strict_AnyhowException(
+    FutureOr<Uint8List?> Function(Uint8List) self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_DartOpaque(
+      encode_DartFn_Inputs_list_prim_u_8_strict_Output_opt_list_prim_u_8_strict_AnyhowException(
+        self,
+      ),
+      serializer,
+    );
+  }
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_list_prim_u_8_strict_list_prim_u_8_strict_list_prim_u_8_strict_Output_bool_AnyhowException(
+    FutureOr<bool> Function(Uint8List, Uint8List, Uint8List) self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_DartOpaque(
+      encode_DartFn_Inputs_list_prim_u_8_strict_list_prim_u_8_strict_list_prim_u_8_strict_Output_bool_AnyhowException(
+        self,
+      ),
+      serializer,
+    );
+  }
+
+  @protected
+  void sse_encode_DartFn_Inputs_other_promotion_Output_bool_AnyhowException(
+    FutureOr<bool> Function(OtherPromotion) self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_DartOpaque(
+      encode_DartFn_Inputs_other_promotion_Output_bool_AnyhowException(self),
+      serializer,
+    );
+  }
+
+  @protected
+  void sse_encode_DartOpaque(Object self, SseSerializer serializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_isize(
+      PlatformPointerUtil.ptrToPlatformInt64(
+        encodeDartOpaque(
+          self,
+          portManager.dartHandlerPort,
+          generalizedFrbRustBinding,
+        ),
+      ),
+      serializer,
+    );
+  }
+
+  @protected
+  void sse_encode_StreamSink_String_Sse(
+    RustStreamSink<String> self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_String(
+      self.setupAndSerialize(
+        codec: SseCodec(
+          decodeSuccessData: sse_decode_String,
+          decodeErrorData: sse_decode_AnyhowException,
+        ),
+      ),
+      serializer,
+    );
+  }
+
+  @protected
+  void sse_encode_String(String self, SseSerializer serializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_list_prim_u_8_strict(utf8.encoder.convert(self), serializer);
+  }
+
+  @protected
+  void sse_encode_announced_user(AnnouncedUser self, SseSerializer serializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_i_64(self.userId, serializer);
+    sse_encode_list_prim_u_8_strict(self.publicKey, serializer);
+    sse_encode_i_64(self.publicId, serializer);
+  }
+
+  @protected
+  void sse_encode_bool(bool self, SseSerializer serializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    serializer.buffer.putUint8(self ? 1 : 0);
+  }
+
+  @protected
+  void sse_encode_box_autoadd_announced_user(
+    AnnouncedUser self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_announced_user(self, serializer);
+  }
+
+  @protected
+  void sse_encode_box_autoadd_i_64(
+    PlatformInt64 self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_i_64(self, serializer);
+  }
+
+  @protected
+  void sse_encode_box_autoadd_twonly_config(
+    TwonlyConfig self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_twonly_config(self, serializer);
+  }
+
+  @protected
+  void sse_encode_flutter_user_discovery(
+    FlutterUserDiscovery self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+  }
+
+  @protected
+  void sse_encode_i_64(PlatformInt64 self, SseSerializer serializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    serializer.buffer.putPlatformInt64(self);
+  }
+
+  @protected
+  void sse_encode_isize(PlatformInt64 self, SseSerializer serializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    serializer.buffer.putPlatformInt64(self);
+  }
+
+  @protected
+  void sse_encode_list_list_prim_u_8_strict(
+    List<Uint8List> self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_i_32(self.length, serializer);
+    for (final item in self) {
+      sse_encode_list_prim_u_8_strict(item, serializer);
+    }
+  }
+
+  @protected
+  void sse_encode_list_other_promotion(
+    List<OtherPromotion> self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_i_32(self.length, serializer);
+    for (final item in self) {
+      sse_encode_other_promotion(item, serializer);
+    }
+  }
+
+  @protected
+  void sse_encode_list_prim_u_8_loose(
+    List<int> self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_i_32(self.length, serializer);
+    serializer.buffer.putUint8List(
+      self is Uint8List ? self : Uint8List.fromList(self),
+    );
+  }
+
+  @protected
+  void sse_encode_list_prim_u_8_strict(
+    Uint8List self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_i_32(self.length, serializer);
+    serializer.buffer.putUint8List(self);
+  }
+
+  @protected
+  void sse_encode_opt_box_autoadd_announced_user(
+    AnnouncedUser? self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+
+    sse_encode_bool(self != null, serializer);
+    if (self != null) {
+      sse_encode_box_autoadd_announced_user(self, serializer);
+    }
+  }
+
+  @protected
+  void sse_encode_opt_box_autoadd_i_64(
+    PlatformInt64? self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+
+    sse_encode_bool(self != null, serializer);
+    if (self != null) {
+      sse_encode_box_autoadd_i_64(self, serializer);
+    }
+  }
+
+  @protected
+  void sse_encode_opt_list_list_prim_u_8_strict(
+    List<Uint8List>? self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+
+    sse_encode_bool(self != null, serializer);
+    if (self != null) {
+      sse_encode_list_list_prim_u_8_strict(self, serializer);
+    }
+  }
+
+  @protected
+  void sse_encode_opt_list_other_promotion(
+    List<OtherPromotion>? self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+
+    sse_encode_bool(self != null, serializer);
+    if (self != null) {
+      sse_encode_list_other_promotion(self, serializer);
+    }
+  }
+
+  @protected
+  void sse_encode_opt_list_prim_u_8_strict(
+    Uint8List? self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+
+    sse_encode_bool(self != null, serializer);
+    if (self != null) {
+      sse_encode_list_prim_u_8_strict(self, serializer);
+    }
+  }
+
+  @protected
+  void sse_encode_other_promotion(
+    OtherPromotion self,
+    SseSerializer serializer,
+  ) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_u_32(self.promotionId, serializer);
+    sse_encode_i_64(self.publicId, serializer);
+    sse_encode_i_64(self.fromContactId, serializer);
+    sse_encode_u_8(self.threshold, serializer);
+    sse_encode_list_prim_u_8_strict(self.announcementShare, serializer);
+    sse_encode_opt_box_autoadd_i_64(
+      self.publicKeyVerifiedTimestamp,
+      serializer,
+    );
+  }
+
+  @protected
+  void sse_encode_twonly_config(TwonlyConfig self, SseSerializer serializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_String(self.databasePath, serializer);
+    sse_encode_String(self.dataDirectory, serializer);
+  }
+
+  @protected
+  void sse_encode_u_32(int self, SseSerializer serializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    serializer.buffer.putUint32(self);
+  }
+
+  @protected
+  void sse_encode_u_8(int self, SseSerializer serializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    serializer.buffer.putUint8(self);
+  }
+
+  @protected
+  void sse_encode_unit(void self, SseSerializer serializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+  }
+
+  @protected
+  void sse_encode_usize(BigInt self, SseSerializer serializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    serializer.buffer.putBigUint64(self);
+  }
+
+  @protected
+  void sse_encode_i_32(int self, SseSerializer serializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    serializer.buffer.putInt32(self);
+  }
+}
diff --git a/lib/core/frb_generated.io.dart b/lib/core/frb_generated.io.dart
new file mode 100644
index 00000000..e5c71e93
--- /dev/null
+++ b/lib/core/frb_generated.io.dart
@@ -0,0 +1,503 @@
+// This file is automatically generated, so please do not edit it.
+// @generated by `flutter_rust_bridge`@ 2.12.0.
+
+// ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field
+
+import 'bridge.dart';
+import 'bridge/callbacks.dart';
+import 'bridge/wrapper/user_discovery.dart';
+import 'dart:async';
+import 'dart:convert';
+import 'dart:ffi' as ffi;
+import 'frb_generated.dart';
+import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated_io.dart';
+
+abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
+  RustLibApiImplPlatform({
+    required super.handler,
+    required super.wire,
+    required super.generalizedFrbRustBinding,
+    required super.portManager,
+  });
+
+  @protected
+  AnyhowException dco_decode_AnyhowException(dynamic raw);
+
+  @protected
+  FutureOr<RustStreamSink<String>> Function()
+  dco_decode_DartFn_Inputs__Output_StreamSink_String_Sse_AnyhowException(
+    dynamic raw,
+  );
+
+  @protected
+  FutureOr<AnnouncedUser?> Function(PlatformInt64)
+  dco_decode_DartFn_Inputs_i_64_Output_opt_box_autoadd_announced_user_AnyhowException(
+    dynamic raw,
+  );
+
+  @protected
+  FutureOr<List<Uint8List>?> Function(PlatformInt64)
+  dco_decode_DartFn_Inputs_i_64_Output_opt_list_list_prim_u_8_strict_AnyhowException(
+    dynamic raw,
+  );
+
+  @protected
+  FutureOr<List<OtherPromotion>?> Function(PlatformInt64)
+  dco_decode_DartFn_Inputs_i_64_Output_opt_list_other_promotion_AnyhowException(
+    dynamic raw,
+  );
+
+  @protected
+  FutureOr<Uint8List?> Function(PlatformInt64)
+  dco_decode_DartFn_Inputs_i_64_Output_opt_list_prim_u_8_strict_AnyhowException(
+    dynamic raw,
+  );
+
+  @protected
+  FutureOr<bool> Function(PlatformInt64, AnnouncedUser, PlatformInt64?)
+  dco_decode_DartFn_Inputs_i_64_announced_user_opt_box_autoadd_i_64_Output_bool_AnyhowException(
+    dynamic raw,
+  );
+
+  @protected
+  FutureOr<bool> Function(PlatformInt64, PlatformInt64, Uint8List)
+  dco_decode_DartFn_Inputs_i_64_i_64_list_prim_u_8_strict_Output_bool_AnyhowException(
+    dynamic raw,
+  );
+
+  @protected
+  FutureOr<bool> Function(PlatformInt64, Uint8List)
+  dco_decode_DartFn_Inputs_i_64_list_prim_u_8_strict_Output_bool_AnyhowException(
+    dynamic raw,
+  );
+
+  @protected
+  FutureOr<bool> Function(List<Uint8List>)
+  dco_decode_DartFn_Inputs_list_list_prim_u_8_strict_Output_bool_AnyhowException(
+    dynamic raw,
+  );
+
+  @protected
+  FutureOr<Uint8List?> Function(Uint8List)
+  dco_decode_DartFn_Inputs_list_prim_u_8_strict_Output_opt_list_prim_u_8_strict_AnyhowException(
+    dynamic raw,
+  );
+
+  @protected
+  FutureOr<bool> Function(Uint8List, Uint8List, Uint8List)
+  dco_decode_DartFn_Inputs_list_prim_u_8_strict_list_prim_u_8_strict_list_prim_u_8_strict_Output_bool_AnyhowException(
+    dynamic raw,
+  );
+
+  @protected
+  FutureOr<bool> Function(OtherPromotion)
+  dco_decode_DartFn_Inputs_other_promotion_Output_bool_AnyhowException(
+    dynamic raw,
+  );
+
+  @protected
+  Object dco_decode_DartOpaque(dynamic raw);
+
+  @protected
+  RustStreamSink<String> dco_decode_StreamSink_String_Sse(dynamic raw);
+
+  @protected
+  String dco_decode_String(dynamic raw);
+
+  @protected
+  AnnouncedUser dco_decode_announced_user(dynamic raw);
+
+  @protected
+  bool dco_decode_bool(dynamic raw);
+
+  @protected
+  AnnouncedUser dco_decode_box_autoadd_announced_user(dynamic raw);
+
+  @protected
+  PlatformInt64 dco_decode_box_autoadd_i_64(dynamic raw);
+
+  @protected
+  TwonlyConfig dco_decode_box_autoadd_twonly_config(dynamic raw);
+
+  @protected
+  FlutterUserDiscovery dco_decode_flutter_user_discovery(dynamic raw);
+
+  @protected
+  PlatformInt64 dco_decode_i_64(dynamic raw);
+
+  @protected
+  PlatformInt64 dco_decode_isize(dynamic raw);
+
+  @protected
+  List<Uint8List> dco_decode_list_list_prim_u_8_strict(dynamic raw);
+
+  @protected
+  List<OtherPromotion> dco_decode_list_other_promotion(dynamic raw);
+
+  @protected
+  List<int> dco_decode_list_prim_u_8_loose(dynamic raw);
+
+  @protected
+  Uint8List dco_decode_list_prim_u_8_strict(dynamic raw);
+
+  @protected
+  AnnouncedUser? dco_decode_opt_box_autoadd_announced_user(dynamic raw);
+
+  @protected
+  PlatformInt64? dco_decode_opt_box_autoadd_i_64(dynamic raw);
+
+  @protected
+  List<Uint8List>? dco_decode_opt_list_list_prim_u_8_strict(dynamic raw);
+
+  @protected
+  List<OtherPromotion>? dco_decode_opt_list_other_promotion(dynamic raw);
+
+  @protected
+  Uint8List? dco_decode_opt_list_prim_u_8_strict(dynamic raw);
+
+  @protected
+  OtherPromotion dco_decode_other_promotion(dynamic raw);
+
+  @protected
+  TwonlyConfig dco_decode_twonly_config(dynamic raw);
+
+  @protected
+  int dco_decode_u_32(dynamic raw);
+
+  @protected
+  int dco_decode_u_8(dynamic raw);
+
+  @protected
+  void dco_decode_unit(dynamic raw);
+
+  @protected
+  BigInt dco_decode_usize(dynamic raw);
+
+  @protected
+  AnyhowException sse_decode_AnyhowException(SseDeserializer deserializer);
+
+  @protected
+  Object sse_decode_DartOpaque(SseDeserializer deserializer);
+
+  @protected
+  RustStreamSink<String> sse_decode_StreamSink_String_Sse(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  String sse_decode_String(SseDeserializer deserializer);
+
+  @protected
+  AnnouncedUser sse_decode_announced_user(SseDeserializer deserializer);
+
+  @protected
+  bool sse_decode_bool(SseDeserializer deserializer);
+
+  @protected
+  AnnouncedUser sse_decode_box_autoadd_announced_user(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  PlatformInt64 sse_decode_box_autoadd_i_64(SseDeserializer deserializer);
+
+  @protected
+  TwonlyConfig sse_decode_box_autoadd_twonly_config(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  FlutterUserDiscovery sse_decode_flutter_user_discovery(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  PlatformInt64 sse_decode_i_64(SseDeserializer deserializer);
+
+  @protected
+  PlatformInt64 sse_decode_isize(SseDeserializer deserializer);
+
+  @protected
+  List<Uint8List> sse_decode_list_list_prim_u_8_strict(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  List<OtherPromotion> sse_decode_list_other_promotion(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  List<int> sse_decode_list_prim_u_8_loose(SseDeserializer deserializer);
+
+  @protected
+  Uint8List sse_decode_list_prim_u_8_strict(SseDeserializer deserializer);
+
+  @protected
+  AnnouncedUser? sse_decode_opt_box_autoadd_announced_user(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  PlatformInt64? sse_decode_opt_box_autoadd_i_64(SseDeserializer deserializer);
+
+  @protected
+  List<Uint8List>? sse_decode_opt_list_list_prim_u_8_strict(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  List<OtherPromotion>? sse_decode_opt_list_other_promotion(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  Uint8List? sse_decode_opt_list_prim_u_8_strict(SseDeserializer deserializer);
+
+  @protected
+  OtherPromotion sse_decode_other_promotion(SseDeserializer deserializer);
+
+  @protected
+  TwonlyConfig sse_decode_twonly_config(SseDeserializer deserializer);
+
+  @protected
+  int sse_decode_u_32(SseDeserializer deserializer);
+
+  @protected
+  int sse_decode_u_8(SseDeserializer deserializer);
+
+  @protected
+  void sse_decode_unit(SseDeserializer deserializer);
+
+  @protected
+  BigInt sse_decode_usize(SseDeserializer deserializer);
+
+  @protected
+  int sse_decode_i_32(SseDeserializer deserializer);
+
+  @protected
+  void sse_encode_AnyhowException(
+    AnyhowException self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_DartFn_Inputs__Output_StreamSink_String_Sse_AnyhowException(
+    FutureOr<RustStreamSink<String>> Function() self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_i_64_Output_opt_box_autoadd_announced_user_AnyhowException(
+    FutureOr<AnnouncedUser?> Function(PlatformInt64) self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_i_64_Output_opt_list_list_prim_u_8_strict_AnyhowException(
+    FutureOr<List<Uint8List>?> Function(PlatformInt64) self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_i_64_Output_opt_list_other_promotion_AnyhowException(
+    FutureOr<List<OtherPromotion>?> Function(PlatformInt64) self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_i_64_Output_opt_list_prim_u_8_strict_AnyhowException(
+    FutureOr<Uint8List?> Function(PlatformInt64) self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_i_64_announced_user_opt_box_autoadd_i_64_Output_bool_AnyhowException(
+    FutureOr<bool> Function(PlatformInt64, AnnouncedUser, PlatformInt64?) self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_i_64_i_64_list_prim_u_8_strict_Output_bool_AnyhowException(
+    FutureOr<bool> Function(PlatformInt64, PlatformInt64, Uint8List) self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_i_64_list_prim_u_8_strict_Output_bool_AnyhowException(
+    FutureOr<bool> Function(PlatformInt64, Uint8List) self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_list_list_prim_u_8_strict_Output_bool_AnyhowException(
+    FutureOr<bool> Function(List<Uint8List>) self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_list_prim_u_8_strict_Output_opt_list_prim_u_8_strict_AnyhowException(
+    FutureOr<Uint8List?> Function(Uint8List) self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_list_prim_u_8_strict_list_prim_u_8_strict_list_prim_u_8_strict_Output_bool_AnyhowException(
+    FutureOr<bool> Function(Uint8List, Uint8List, Uint8List) self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_DartFn_Inputs_other_promotion_Output_bool_AnyhowException(
+    FutureOr<bool> Function(OtherPromotion) self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_DartOpaque(Object self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_StreamSink_String_Sse(
+    RustStreamSink<String> self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_String(String self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_announced_user(AnnouncedUser self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_bool(bool self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_box_autoadd_announced_user(
+    AnnouncedUser self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_box_autoadd_i_64(
+    PlatformInt64 self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_box_autoadd_twonly_config(
+    TwonlyConfig self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_flutter_user_discovery(
+    FlutterUserDiscovery self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_i_64(PlatformInt64 self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_isize(PlatformInt64 self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_list_list_prim_u_8_strict(
+    List<Uint8List> self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_list_other_promotion(
+    List<OtherPromotion> self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_list_prim_u_8_loose(List<int> self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_list_prim_u_8_strict(
+    Uint8List self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_opt_box_autoadd_announced_user(
+    AnnouncedUser? self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_opt_box_autoadd_i_64(
+    PlatformInt64? self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_opt_list_list_prim_u_8_strict(
+    List<Uint8List>? self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_opt_list_other_promotion(
+    List<OtherPromotion>? self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_opt_list_prim_u_8_strict(
+    Uint8List? self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_other_promotion(
+    OtherPromotion self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_twonly_config(TwonlyConfig self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_u_32(int self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_u_8(int self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_unit(void self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_usize(BigInt self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_i_32(int self, SseSerializer serializer);
+}
+
+// Section: wire_class
+
+class RustLibWire implements BaseWire {
+  factory RustLibWire.fromExternalLibrary(ExternalLibrary lib) =>
+      RustLibWire(lib.ffiDynamicLibrary);
+
+  /// Holds the symbol lookup function.
+  final ffi.Pointer<T> Function<T extends ffi.NativeType>(String symbolName)
+  _lookup;
+
+  /// The symbols are looked up in [dynamicLibrary].
+  RustLibWire(ffi.DynamicLibrary dynamicLibrary)
+    : _lookup = dynamicLibrary.lookup;
+}
diff --git a/lib/core/frb_generated.web.dart b/lib/core/frb_generated.web.dart
new file mode 100644
index 00000000..8c2f83d1
--- /dev/null
+++ b/lib/core/frb_generated.web.dart
@@ -0,0 +1,503 @@
+// This file is automatically generated, so please do not edit it.
+// @generated by `flutter_rust_bridge`@ 2.12.0.
+
+// ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field
+
+// Static analysis wrongly picks the IO variant, thus ignore this
+// ignore_for_file: argument_type_not_assignable
+
+import 'bridge.dart';
+import 'bridge/callbacks.dart';
+import 'bridge/wrapper/user_discovery.dart';
+import 'dart:async';
+import 'dart:convert';
+import 'frb_generated.dart';
+import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated_web.dart';
+
+abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
+  RustLibApiImplPlatform({
+    required super.handler,
+    required super.wire,
+    required super.generalizedFrbRustBinding,
+    required super.portManager,
+  });
+
+  @protected
+  AnyhowException dco_decode_AnyhowException(dynamic raw);
+
+  @protected
+  FutureOr<RustStreamSink<String>> Function()
+  dco_decode_DartFn_Inputs__Output_StreamSink_String_Sse_AnyhowException(
+    dynamic raw,
+  );
+
+  @protected
+  FutureOr<AnnouncedUser?> Function(PlatformInt64)
+  dco_decode_DartFn_Inputs_i_64_Output_opt_box_autoadd_announced_user_AnyhowException(
+    dynamic raw,
+  );
+
+  @protected
+  FutureOr<List<Uint8List>?> Function(PlatformInt64)
+  dco_decode_DartFn_Inputs_i_64_Output_opt_list_list_prim_u_8_strict_AnyhowException(
+    dynamic raw,
+  );
+
+  @protected
+  FutureOr<List<OtherPromotion>?> Function(PlatformInt64)
+  dco_decode_DartFn_Inputs_i_64_Output_opt_list_other_promotion_AnyhowException(
+    dynamic raw,
+  );
+
+  @protected
+  FutureOr<Uint8List?> Function(PlatformInt64)
+  dco_decode_DartFn_Inputs_i_64_Output_opt_list_prim_u_8_strict_AnyhowException(
+    dynamic raw,
+  );
+
+  @protected
+  FutureOr<bool> Function(PlatformInt64, AnnouncedUser, PlatformInt64?)
+  dco_decode_DartFn_Inputs_i_64_announced_user_opt_box_autoadd_i_64_Output_bool_AnyhowException(
+    dynamic raw,
+  );
+
+  @protected
+  FutureOr<bool> Function(PlatformInt64, PlatformInt64, Uint8List)
+  dco_decode_DartFn_Inputs_i_64_i_64_list_prim_u_8_strict_Output_bool_AnyhowException(
+    dynamic raw,
+  );
+
+  @protected
+  FutureOr<bool> Function(PlatformInt64, Uint8List)
+  dco_decode_DartFn_Inputs_i_64_list_prim_u_8_strict_Output_bool_AnyhowException(
+    dynamic raw,
+  );
+
+  @protected
+  FutureOr<bool> Function(List<Uint8List>)
+  dco_decode_DartFn_Inputs_list_list_prim_u_8_strict_Output_bool_AnyhowException(
+    dynamic raw,
+  );
+
+  @protected
+  FutureOr<Uint8List?> Function(Uint8List)
+  dco_decode_DartFn_Inputs_list_prim_u_8_strict_Output_opt_list_prim_u_8_strict_AnyhowException(
+    dynamic raw,
+  );
+
+  @protected
+  FutureOr<bool> Function(Uint8List, Uint8List, Uint8List)
+  dco_decode_DartFn_Inputs_list_prim_u_8_strict_list_prim_u_8_strict_list_prim_u_8_strict_Output_bool_AnyhowException(
+    dynamic raw,
+  );
+
+  @protected
+  FutureOr<bool> Function(OtherPromotion)
+  dco_decode_DartFn_Inputs_other_promotion_Output_bool_AnyhowException(
+    dynamic raw,
+  );
+
+  @protected
+  Object dco_decode_DartOpaque(dynamic raw);
+
+  @protected
+  RustStreamSink<String> dco_decode_StreamSink_String_Sse(dynamic raw);
+
+  @protected
+  String dco_decode_String(dynamic raw);
+
+  @protected
+  AnnouncedUser dco_decode_announced_user(dynamic raw);
+
+  @protected
+  bool dco_decode_bool(dynamic raw);
+
+  @protected
+  AnnouncedUser dco_decode_box_autoadd_announced_user(dynamic raw);
+
+  @protected
+  PlatformInt64 dco_decode_box_autoadd_i_64(dynamic raw);
+
+  @protected
+  TwonlyConfig dco_decode_box_autoadd_twonly_config(dynamic raw);
+
+  @protected
+  FlutterUserDiscovery dco_decode_flutter_user_discovery(dynamic raw);
+
+  @protected
+  PlatformInt64 dco_decode_i_64(dynamic raw);
+
+  @protected
+  PlatformInt64 dco_decode_isize(dynamic raw);
+
+  @protected
+  List<Uint8List> dco_decode_list_list_prim_u_8_strict(dynamic raw);
+
+  @protected
+  List<OtherPromotion> dco_decode_list_other_promotion(dynamic raw);
+
+  @protected
+  List<int> dco_decode_list_prim_u_8_loose(dynamic raw);
+
+  @protected
+  Uint8List dco_decode_list_prim_u_8_strict(dynamic raw);
+
+  @protected
+  AnnouncedUser? dco_decode_opt_box_autoadd_announced_user(dynamic raw);
+
+  @protected
+  PlatformInt64? dco_decode_opt_box_autoadd_i_64(dynamic raw);
+
+  @protected
+  List<Uint8List>? dco_decode_opt_list_list_prim_u_8_strict(dynamic raw);
+
+  @protected
+  List<OtherPromotion>? dco_decode_opt_list_other_promotion(dynamic raw);
+
+  @protected
+  Uint8List? dco_decode_opt_list_prim_u_8_strict(dynamic raw);
+
+  @protected
+  OtherPromotion dco_decode_other_promotion(dynamic raw);
+
+  @protected
+  TwonlyConfig dco_decode_twonly_config(dynamic raw);
+
+  @protected
+  int dco_decode_u_32(dynamic raw);
+
+  @protected
+  int dco_decode_u_8(dynamic raw);
+
+  @protected
+  void dco_decode_unit(dynamic raw);
+
+  @protected
+  BigInt dco_decode_usize(dynamic raw);
+
+  @protected
+  AnyhowException sse_decode_AnyhowException(SseDeserializer deserializer);
+
+  @protected
+  Object sse_decode_DartOpaque(SseDeserializer deserializer);
+
+  @protected
+  RustStreamSink<String> sse_decode_StreamSink_String_Sse(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  String sse_decode_String(SseDeserializer deserializer);
+
+  @protected
+  AnnouncedUser sse_decode_announced_user(SseDeserializer deserializer);
+
+  @protected
+  bool sse_decode_bool(SseDeserializer deserializer);
+
+  @protected
+  AnnouncedUser sse_decode_box_autoadd_announced_user(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  PlatformInt64 sse_decode_box_autoadd_i_64(SseDeserializer deserializer);
+
+  @protected
+  TwonlyConfig sse_decode_box_autoadd_twonly_config(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  FlutterUserDiscovery sse_decode_flutter_user_discovery(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  PlatformInt64 sse_decode_i_64(SseDeserializer deserializer);
+
+  @protected
+  PlatformInt64 sse_decode_isize(SseDeserializer deserializer);
+
+  @protected
+  List<Uint8List> sse_decode_list_list_prim_u_8_strict(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  List<OtherPromotion> sse_decode_list_other_promotion(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  List<int> sse_decode_list_prim_u_8_loose(SseDeserializer deserializer);
+
+  @protected
+  Uint8List sse_decode_list_prim_u_8_strict(SseDeserializer deserializer);
+
+  @protected
+  AnnouncedUser? sse_decode_opt_box_autoadd_announced_user(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  PlatformInt64? sse_decode_opt_box_autoadd_i_64(SseDeserializer deserializer);
+
+  @protected
+  List<Uint8List>? sse_decode_opt_list_list_prim_u_8_strict(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  List<OtherPromotion>? sse_decode_opt_list_other_promotion(
+    SseDeserializer deserializer,
+  );
+
+  @protected
+  Uint8List? sse_decode_opt_list_prim_u_8_strict(SseDeserializer deserializer);
+
+  @protected
+  OtherPromotion sse_decode_other_promotion(SseDeserializer deserializer);
+
+  @protected
+  TwonlyConfig sse_decode_twonly_config(SseDeserializer deserializer);
+
+  @protected
+  int sse_decode_u_32(SseDeserializer deserializer);
+
+  @protected
+  int sse_decode_u_8(SseDeserializer deserializer);
+
+  @protected
+  void sse_decode_unit(SseDeserializer deserializer);
+
+  @protected
+  BigInt sse_decode_usize(SseDeserializer deserializer);
+
+  @protected
+  int sse_decode_i_32(SseDeserializer deserializer);
+
+  @protected
+  void sse_encode_AnyhowException(
+    AnyhowException self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_DartFn_Inputs__Output_StreamSink_String_Sse_AnyhowException(
+    FutureOr<RustStreamSink<String>> Function() self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_i_64_Output_opt_box_autoadd_announced_user_AnyhowException(
+    FutureOr<AnnouncedUser?> Function(PlatformInt64) self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_i_64_Output_opt_list_list_prim_u_8_strict_AnyhowException(
+    FutureOr<List<Uint8List>?> Function(PlatformInt64) self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_i_64_Output_opt_list_other_promotion_AnyhowException(
+    FutureOr<List<OtherPromotion>?> Function(PlatformInt64) self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_i_64_Output_opt_list_prim_u_8_strict_AnyhowException(
+    FutureOr<Uint8List?> Function(PlatformInt64) self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_i_64_announced_user_opt_box_autoadd_i_64_Output_bool_AnyhowException(
+    FutureOr<bool> Function(PlatformInt64, AnnouncedUser, PlatformInt64?) self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_i_64_i_64_list_prim_u_8_strict_Output_bool_AnyhowException(
+    FutureOr<bool> Function(PlatformInt64, PlatformInt64, Uint8List) self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_i_64_list_prim_u_8_strict_Output_bool_AnyhowException(
+    FutureOr<bool> Function(PlatformInt64, Uint8List) self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_list_list_prim_u_8_strict_Output_bool_AnyhowException(
+    FutureOr<bool> Function(List<Uint8List>) self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_list_prim_u_8_strict_Output_opt_list_prim_u_8_strict_AnyhowException(
+    FutureOr<Uint8List?> Function(Uint8List) self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void
+  sse_encode_DartFn_Inputs_list_prim_u_8_strict_list_prim_u_8_strict_list_prim_u_8_strict_Output_bool_AnyhowException(
+    FutureOr<bool> Function(Uint8List, Uint8List, Uint8List) self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_DartFn_Inputs_other_promotion_Output_bool_AnyhowException(
+    FutureOr<bool> Function(OtherPromotion) self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_DartOpaque(Object self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_StreamSink_String_Sse(
+    RustStreamSink<String> self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_String(String self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_announced_user(AnnouncedUser self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_bool(bool self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_box_autoadd_announced_user(
+    AnnouncedUser self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_box_autoadd_i_64(
+    PlatformInt64 self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_box_autoadd_twonly_config(
+    TwonlyConfig self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_flutter_user_discovery(
+    FlutterUserDiscovery self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_i_64(PlatformInt64 self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_isize(PlatformInt64 self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_list_list_prim_u_8_strict(
+    List<Uint8List> self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_list_other_promotion(
+    List<OtherPromotion> self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_list_prim_u_8_loose(List<int> self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_list_prim_u_8_strict(
+    Uint8List self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_opt_box_autoadd_announced_user(
+    AnnouncedUser? self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_opt_box_autoadd_i_64(
+    PlatformInt64? self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_opt_list_list_prim_u_8_strict(
+    List<Uint8List>? self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_opt_list_other_promotion(
+    List<OtherPromotion>? self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_opt_list_prim_u_8_strict(
+    Uint8List? self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_other_promotion(
+    OtherPromotion self,
+    SseSerializer serializer,
+  );
+
+  @protected
+  void sse_encode_twonly_config(TwonlyConfig self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_u_32(int self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_u_8(int self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_unit(void self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_usize(BigInt self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_i_32(int self, SseSerializer serializer);
+}
+
+// Section: wire_class
+
+class RustLibWire implements BaseWire {
+  RustLibWire.fromExternalLibrary(ExternalLibrary lib);
+}
+
+@JS('wasm_bindgen')
+external RustLibWasmModule get wasmModule;
+
+@JS()
+@anonymous
+extension type RustLibWasmModule._(JSObject _) implements JSObject {}
diff --git a/lib/globals.dart b/lib/globals.dart
index f446d5a0..e5d728df 100644
--- a/lib/globals.dart
+++ b/lib/globals.dart
@@ -1,43 +1,35 @@
+import 'dart:async';
+
 import 'package:camera/camera.dart';
 import 'package:flutter/material.dart';
-import 'package:twonly/src/database/twonly.db.dart';
-import 'package:twonly/src/model/json/userdata.dart';
-import 'package:twonly/src/services/api.service.dart';
-import 'package:twonly/src/services/subscription.service.dart';
+import 'package:path_provider/path_provider.dart';
 
-late ApiService apiService;
+class AppEnvironment {
+  static late final String cacheDir;
+  static late final String supportDir;
 
-// uses for background notification
-late TwonlyDB twonlyDB;
+  // will be loaded in the main_camera_controller.dart
+  static List<CameraDescription> cameras = [];
 
-List<CameraDescription> gCameras = <CameraDescription>[];
+  static Future<void> init() async {
+    cacheDir = (await getApplicationCacheDirectory()).path;
+    supportDir = (await getApplicationSupportDirectory()).path;
+  }
 
-// Cached UserData in the memory. Every time the user data is changed the `updateUserdata` function is called,
-// which will update this global variable. The variable is set in the main.dart and after the user has registered in the register.view.dart
-late UserData gUser;
+  static void initTesting() {
+    cacheDir = '/tmp/twonly_cache';
+    supportDir = '/tmp/twonly_support';
+  }
+}
 
-// The following global function can be called from anywhere to update
-// the UI when something changed. The callbacks will be set by
-// App widget.
+class AppState {
+  static bool isAppInBackground = true;
+  static bool isInBackgroundTask = false;
+  static bool allowErrorTrackingViaSentry = false;
+  static bool gotMessageFromServer = false;
+  static int latestAppVersionId = 110;
+}
 
-// This callback called by the apiProvider
-void Function({required bool isConnected}) globalCallbackConnectionState =
-    ({
-      required isConnected,
-    }) {};
-void Function() globalCallbackAppIsOutdated = () {};
-void Function() globalCallbackNewDeviceRegistered = () {};
-void Function(SubscriptionPlan plan) globalCallbackUpdatePlan = (plan) {};
-
-Map<String, VoidCallback> globalUserDataChangedCallBack = {};
-
-bool globalIsAppInBackground = true;
-bool globalIsInBackgroundTask = false;
-bool globalAllowErrorTrackingViaSentry = false;
-bool globalGotMessageFromServer = false;
-
-late String globalApplicationCacheDirectory;
-late String globalApplicationSupportDirectory;
-
-final GlobalKey<ScaffoldMessengerState> globalRootScaffoldMessengerKey =
-    GlobalKey<ScaffoldMessengerState>();
+class AppGlobalKeys {
+  static final scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
+}
diff --git a/lib/locator.dart b/lib/locator.dart
new file mode 100644
index 00000000..a9333733
--- /dev/null
+++ b/lib/locator.dart
@@ -0,0 +1,17 @@
+import 'package:get_it/get_it.dart';
+import 'package:twonly/src/database/twonly.db.dart';
+import 'package:twonly/src/services/api.service.dart';
+import 'package:twonly/src/services/user.service.dart';
+
+final GetIt locator = GetIt.instance;
+
+void setupLocator() {
+  locator
+    ..registerLazySingleton<UserService>(UserService.new)
+    ..registerLazySingleton<ApiService>(ApiService.new)
+    ..registerLazySingleton<TwonlyDB>(TwonlyDB.new);
+}
+
+UserService get userService => locator<UserService>();
+ApiService get apiService => locator<ApiService>();
+TwonlyDB get twonlyDB => locator<TwonlyDB>();
diff --git a/lib/main.dart b/lib/main.dart
index bfc9b380..86ac2d78 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,59 +1,91 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:camera/camera.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:path_provider/path_provider.dart';
 import 'package:provider/provider.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:twonly/app.dart';
+import 'package:twonly/core/bridge.dart' as bridge;
+import 'package:twonly/core/frb_generated.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/database/twonly.db.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/callbacks/callbacks.dart';
+import 'package:twonly/src/database/tables/contacts.table.dart';
 import 'package:twonly/src/providers/connection.provider.dart';
 import 'package:twonly/src/providers/image_editor.provider.dart';
 import 'package:twonly/src/providers/purchases.provider.dart';
 import 'package:twonly/src/providers/settings.provider.dart';
-import 'package:twonly/src/services/api.service.dart';
-import 'package:twonly/src/services/api/mediafiles/download.service.dart';
-import 'package:twonly/src/services/api/mediafiles/media_background.service.dart';
-import 'package:twonly/src/services/api/mediafiles/upload.service.dart';
+import 'package:twonly/src/services/api/mediafiles/download.api.dart';
+import 'package:twonly/src/services/api/mediafiles/media_background.api.dart';
+import 'package:twonly/src/services/api/mediafiles/upload.api.dart';
 import 'package:twonly/src/services/background/callback_dispatcher.background.dart';
 import 'package:twonly/src/services/backup/create.backup.dart';
 import 'package:twonly/src/services/mediafiles/mediafile.service.dart';
 import 'package:twonly/src/services/notifications/fcm.notifications.dart';
 import 'package:twonly/src/services/notifications/setup.notifications.dart';
+import 'package:twonly/src/services/user.service.dart';
+import 'package:twonly/src/services/user_discovery.service.dart';
 import 'package:twonly/src/utils/avatars.dart';
 import 'package:twonly/src/utils/log.dart';
-import 'package:twonly/src/utils/storage.dart';
+import 'package:twonly/src/utils/secure_storage.dart';
+import 'package:twonly/src/visual/views/onboarding/setup.view.dart';
 
-void main() async {
+/// This function is used to initialized the absolute minimum so it
+/// can also be used by the backend without the UI was loaded.
+Future<void> twonlyMinimumInitialization() async {
   SentryWidgetsFlutterBinding.ensureInitialized();
 
-  globalApplicationCacheDirectory = (await getApplicationCacheDirectory()).path;
-  globalApplicationSupportDirectory =
-      (await getApplicationSupportDirectory()).path;
+  await AppEnvironment.init();
+  Log.init();
+  setupLocator();
 
-  initLogger();
-  await initFCMService();
+  await RustLib.init();
 
-  var user = await getUser();
+  await initFlutterCallbacksForRust();
 
-  if (Platform.isIOS && user != null) {
-    final db = File('$globalApplicationSupportDirectory/twonly.sqlite');
-    if (!db.existsSync()) {
+  await bridge.initializeTwonlyFlutter(
+    config: bridge.TwonlyConfig(
+      databasePath: '${AppEnvironment.supportDir}/twonly.sqlite',
+      dataDirectory: AppEnvironment.supportDir,
+    ),
+  );
+}
+
+void main() async {
+  await twonlyMinimumInitialization();
+
+  unawaited(initFCMService());
+
+  var userExists = false;
+  var storageError = false;
+
+  try {
+    userExists = await userService.tryInit();
+  } catch (e) {
+    Log.error('Failed to initialize user session due to storage error: $e');
+    storageError = true;
+  }
+
+  final dbExists = File(
+    '${AppEnvironment.supportDir}/twonly.sqlite',
+  ).existsSync();
+
+  if (Platform.isIOS && userExists) {
+    if (!dbExists) {
       Log.error('[twonly] IOS: App was removed and then reinstalled again...');
-      await const FlutterSecureStorage().deleteAll();
-      user = await getUser();
+      await SecureStorage.instance.deleteAll();
+      userExists = false;
     }
   }
 
-  if (user != null) {
-    gUser = user;
+  final settingsController = SettingsChangeProvider()..loadSettings();
+  await SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+  await initFileDownloader();
 
-    if (user.allowErrorTrackingViaSentry) {
-      globalAllowErrorTrackingViaSentry = true;
+  if (userExists) {
+    if (userService.currentUser.allowErrorTrackingViaSentry) {
+      AppState.allowErrorTrackingViaSentry = true;
       await SentryFlutter.init(
         (options) => options
           ..dsn =
@@ -63,52 +95,23 @@ void main() async {
       );
     }
 
+    await runMigrations();
+
+    await twonlyDB.messagesDao.purgeMessageTable();
+    await twonlyDB.receiptsDao.purgeReceivedReceipts();
+    await UserDiscoveryService.removeDeletedContacts();
+
+    unawaited(MediaFileService.purgeTempFolder());
+
+    unawaited(setupPushNotification());
+    unawaited(finishStartedPreprocessing());
+    unawaited(createPushAvatars());
     unawaited(performTwonlySafeBackup());
     unawaited(initializeBackgroundTaskManager());
-  } else {
-    Log.info('User is not yet register. Ensure all local data is removed.');
-    await deleteLocalUserData();
   }
 
-  final settingsController = SettingsChangeProvider();
-
-  await settingsController.loadSettings();
-  await SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
-
-  unawaited(setupPushNotification());
-
-  gCameras = await availableCameras();
-
-  apiService = ApiService();
-  twonlyDB = TwonlyDB();
-
-  if (user != null) {
-    if (gUser.appVersion < 90) {
-      // BUG: Requested media files for reupload where not reuploaded because the wrong state...
-      await twonlyDB.mediaFilesDao.updateAllRetransmissionUploadingState();
-      await updateUserdata((u) {
-        u.appVersion = 90;
-        return u;
-      });
-    }
-    if (gUser.appVersion < 91) {
-      // BUG: Requested media files for reupload where not reuploaded because the wrong state...
-      await makeMigrationToVersion91();
-      await updateUserdata((u) {
-        u.appVersion = 91;
-        return u;
-      });
-    }
-  }
-
-  await twonlyDB.messagesDao.purgeMessageTable();
-  await twonlyDB.receiptsDao.purgeReceivedReceipts();
-  unawaited(MediaFileService.purgeTempFolder());
-
-  await initFileDownloader();
-  unawaited(finishStartedPreprocessing());
-
-  unawaited(createPushAvatars());
+  await apiService.listenToNetworkChanges();
+  unawaited(apiService.connect());
 
   runApp(
     MultiProvider(
@@ -118,7 +121,43 @@ void main() async {
         ChangeNotifierProvider(create: (_) => ImageEditorProvider()),
         ChangeNotifierProvider(create: (_) => PurchasesProvider()),
       ],
-      child: const App(),
+      child: App(storageError: storageError),
     ),
   );
 }
+
+Future<void> runMigrations() async {
+  if (userService.currentUser.appVersion < 90) {
+    // BUG: Requested media files for reupload where not reuploaded because the wrong state...
+    await twonlyDB.mediaFilesDao.updateAllRetransmissionUploadingState();
+    await UserService.update((u) => u.appVersion = 90);
+  }
+
+  if (userService.currentUser.appVersion < 91) {
+    // BUG: Requested media files for reupload where not reuploaded because the wrong state...
+    await makeMigrationToVersion91();
+    await UserService.update((u) => u.appVersion = 91);
+  }
+
+  if (userService.currentUser.appVersion < 109) {
+    final contacts = await twonlyDB.contactsDao.getAllContacts();
+    for (final contact in contacts) {
+      if (contact.verified) {
+        await twonlyDB.keyVerificationDao.addKeyVerification(
+          contact.userId,
+          VerificationType.migratedFromOldVersion,
+        );
+      }
+    }
+    await UserService.update((u) {
+      u
+        ..appVersion = 109
+        ..skipSetupPages = true;
+      if (u.avatarSvg == null) {
+        u.currentSetupPage = SetupPages.profile.name;
+      } else {
+        u.currentSetupPage = SetupPages.shareYourFriends.name;
+      }
+    });
+  }
+}
diff --git a/lib/src/callbacks/callbacks.dart b/lib/src/callbacks/callbacks.dart
new file mode 100644
index 00000000..07862ace
--- /dev/null
+++ b/lib/src/callbacks/callbacks.dart
@@ -0,0 +1,31 @@
+import 'package:twonly/core/bridge/callbacks.dart';
+import 'package:twonly/src/callbacks/logging.callbacks.dart';
+import 'package:twonly/src/callbacks/user_discovery.callbacks.dart';
+
+Future<void> initFlutterCallbacksForRust() async {
+  await initFlutterCallbacks(
+    loggingGetStreamSink: LoggingCallbacks.getStreamSink,
+    userDiscoverySetShares: UserDiscoveryCallbacks.setShares,
+    userDiscoveryGetShareForContact:
+        UserDiscoveryCallbacks.userDiscoveryGetShareForContact,
+    userDiscoveryPushOwnPromotionAndClearOldVersion:
+        UserDiscoveryCallbacks.userDiscoveryPushOwnPromotionAndClearOldVersion,
+    userDiscoveryPushNewUserRelation:
+        UserDiscoveryCallbacks.pushNewUserRelation,
+    userDiscoveryGetOwnPromotionsAfterVersion:
+        UserDiscoveryCallbacks.getOwnPromotionsAfterVersion,
+    userDiscoveryStoreOtherPromotion:
+        UserDiscoveryCallbacks.storeOtherPromotion,
+    userDiscoveryGetOtherPromotionsByPublicId:
+        UserDiscoveryCallbacks.getOtherPromotionsByPublicId,
+    userDiscoveryGetAnnouncedUserByPublicId:
+        UserDiscoveryCallbacks.getAnnouncedUserByPublicId,
+    userDiscoveryGetContactVersion: UserDiscoveryCallbacks.getContactVersion,
+    userDiscoverySetContactVersion: UserDiscoveryCallbacks.setContactVersion,
+    userDiscoverySignData: UserDiscoveryCallbacks.signData,
+    userDiscoveryVerifySignature: UserDiscoveryCallbacks.verifySignature,
+    userDiscoveryVerifyStoredPubkey: UserDiscoveryCallbacks.verifyStoredPubKey,
+    userDiscoveryGetContactPromotion:
+        UserDiscoveryCallbacks.getContactPromotion,
+  );
+}
diff --git a/lib/src/callbacks/logging.callbacks.dart b/lib/src/callbacks/logging.callbacks.dart
new file mode 100644
index 00000000..dff9b1ad
--- /dev/null
+++ b/lib/src/callbacks/logging.callbacks.dart
@@ -0,0 +1,32 @@
+import 'dart:async';
+import 'package:flutter/foundation.dart';
+import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
+import 'package:twonly/src/utils/log.dart';
+
+class LoggingCallbacks {
+  static Future<RustStreamSink<String>> getStreamSink() async {
+    final dartLogSink = RustStreamSink<String>();
+
+    Timer.periodic(const Duration(milliseconds: 100), (timer) {
+      try {
+        dartLogSink.stream.listen(
+          (log) {
+            if (log.contains('INFO ')) {
+              Log.info(log.split('INFO ')[1]);
+            } else if (log.contains('DEBUG ')) {
+              Log.info(log.split('DEBUG ')[1]);
+            } else if (kDebugMode) {
+              print(log);
+            }
+          },
+          onDone: () => Log.info('Log stream closed'),
+        );
+        timer.cancel();
+      } catch (e) {
+        // stream not yet initialized
+      }
+    });
+
+    return dartLogSink;
+  }
+}
diff --git a/lib/src/callbacks/user_discovery.callbacks.dart b/lib/src/callbacks/user_discovery.callbacks.dart
new file mode 100644
index 00000000..8542616b
--- /dev/null
+++ b/lib/src/callbacks/user_discovery.callbacks.dart
@@ -0,0 +1,313 @@
+import 'package:collection/collection.dart';
+import 'package:drift/drift.dart';
+import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart'
+    show Curve, IdentityKey;
+// ignore: implementation_imports
+import 'package:libsignal_protocol_dart/src/ecc/ed25519.dart';
+import 'package:twonly/core/bridge.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/database/twonly.db.dart';
+import 'package:twonly/src/services/signal/identity.signal.dart';
+import 'package:twonly/src/services/signal/session.signal.dart';
+import 'package:twonly/src/utils/log.dart';
+import 'package:twonly/src/utils/misc.dart';
+
+class UserDiscoveryCallbacks {
+  static Future<Uint8List?> signData(
+    Uint8List inputData,
+  ) async {
+    var privKey = (await getSignalIdentityKeyPair())?.getPrivateKey();
+    if (privKey == null) return null;
+    final random = getRandomUint8List(32);
+    final signature = sign(
+      privKey.serialize(),
+      inputData,
+      random,
+    );
+    privKey = null;
+    return signature;
+  }
+
+  static Future<bool> verifySignature(
+    Uint8List inputData,
+    Uint8List pubKey,
+    Uint8List signature,
+  ) async {
+    return Curve.verifySignature(
+      IdentityKey.fromBytes(pubKey, 0).publicKey,
+      inputData,
+      signature,
+    );
+  }
+
+  static Future<bool> verifyStoredPubKey(
+    int contactId,
+    Uint8List pubKey,
+  ) async {
+    final storedPublicKey = await getPublicKeyFromContact(contactId);
+    if (storedPublicKey != null) {
+      return storedPublicKey.equals(pubKey);
+    } else {
+      return false;
+    }
+  }
+
+  static Future<bool> setShares(List<Uint8List> shares) async {
+    try {
+      // First remove all old shares then insert all the new shares
+      await twonlyDB.delete(twonlyDB.userDiscoveryShares).go();
+      await twonlyDB.batch((b) {
+        b.insertAll(
+          twonlyDB.userDiscoveryShares,
+          shares
+              .map((s) => UserDiscoverySharesCompanion(share: Value(s)))
+              .toList(),
+        );
+      });
+      return true;
+    } catch (e) {
+      Log.error(e);
+      return false;
+    }
+  }
+
+  static Future<Uint8List?> userDiscoveryGetShareForContact(
+    int contactId,
+  ) async {
+    return twonlyDB.transaction(() async {
+      // 1. Check if this contact already has a share assigned
+      final existing =
+          await (twonlyDB.select(twonlyDB.userDiscoveryShares)
+                ..where((tbl) => tbl.contactId.equals(contactId))
+                ..limit(1))
+              .getSingleOrNull();
+
+      if (existing != null) {
+        return existing.share;
+      }
+
+      // 2. No share found. Find an available one (where contactId is null)
+      final available =
+          await (twonlyDB.select(twonlyDB.userDiscoveryShares)
+                ..where((tbl) => tbl.contactId.isNull())
+                ..limit(1))
+              .getSingleOrNull();
+
+      if (available != null) {
+        // 3. Assign the contactId to this available share
+        await (twonlyDB.update(
+          twonlyDB.userDiscoveryShares,
+        )..where((tbl) => tbl.shareId.equals(available.shareId))).write(
+          UserDiscoverySharesCompanion(
+            contactId: Value(contactId),
+          ),
+        );
+
+        return available.share;
+      }
+
+      return null; // 4. No existing or available shares found
+    });
+  }
+
+  static Future<bool> userDiscoveryPushOwnPromotionAndClearOldVersion(
+    int contactId,
+    int version,
+    Uint8List promotion,
+  ) async {
+    try {
+      // Old promotions from this users should be removed...
+      await (twonlyDB.update(
+        twonlyDB.userDiscoveryOwnPromotions,
+      )..where((t) => t.contactId.equals(contactId))).write(
+        UserDiscoveryOwnPromotionsCompanion(promotion: Value(Uint8List(0))),
+      );
+      await twonlyDB
+          .into(twonlyDB.userDiscoveryOwnPromotions)
+          .insert(
+            UserDiscoveryOwnPromotionsCompanion.insert(
+              contactId: contactId,
+              promotion: promotion,
+            ),
+          );
+      return true;
+    } catch (e) {
+      Log.error(e);
+      return false;
+    }
+  }
+
+  static Future<List<Uint8List>> getOwnPromotionsAfterVersion(
+    int version,
+  ) async {
+    final query = twonlyDB.select(twonlyDB.userDiscoveryOwnPromotions)
+      ..where((tbl) => tbl.versionId.isBiggerThanValue(version));
+
+    final rows = await query.get();
+    return rows.map((r) => r.promotion).toList();
+  }
+
+  static Future<bool> storeOtherPromotion(
+    OtherPromotion promotion,
+  ) async {
+    try {
+      await twonlyDB
+          .into(twonlyDB.userDiscoveryOtherPromotions)
+          .insertOnConflictUpdate(
+            UserDiscoveryOtherPromotionsCompanion(
+              promotionId: Value(promotion.promotionId),
+              publicId: Value(promotion.publicId),
+              fromContactId: Value(promotion.fromContactId),
+              threshold: Value(promotion.threshold),
+              announcementShare: Value(promotion.announcementShare),
+              publicKeyVerifiedTimestamp: Value(
+                promotion.publicKeyVerifiedTimestamp == null
+                    ? null
+                    : DateTime.fromMillisecondsSinceEpoch(
+                        promotion.publicKeyVerifiedTimestamp!,
+                      ),
+              ),
+            ),
+          );
+      return true;
+    } catch (e) {
+      Log.error(e);
+      return false;
+    }
+  }
+
+  static Future<List<OtherPromotion>> getOtherPromotionsByPublicId(
+    int publicId,
+  ) async {
+    final rows = await (twonlyDB.select(
+      twonlyDB.userDiscoveryOtherPromotions,
+    )..where((tbl) => tbl.publicId.equals(publicId))).get();
+
+    return rows
+        .map(
+          (row) => OtherPromotion(
+            promotionId: row.promotionId,
+            publicId: row.publicId,
+            fromContactId: row.fromContactId,
+            threshold: row.threshold,
+            announcementShare: row.announcementShare,
+            publicKeyVerifiedTimestamp:
+                row.publicKeyVerifiedTimestamp?.millisecondsSinceEpoch,
+          ),
+        )
+        .toList();
+  }
+
+  static Future<AnnouncedUser?> getAnnouncedUserByPublicId(
+    int publicId,
+  ) async {
+    final row = await (twonlyDB.select(
+      twonlyDB.userDiscoveryAnnouncedUsers,
+    )..where((tbl) => tbl.publicId.equals(publicId))).getSingleOrNull();
+    if (row == null) return null;
+    return AnnouncedUser(
+      userId: row.announcedUserId,
+      publicKey: row.announcedPublicKey,
+      publicId: row.publicId,
+    );
+  }
+
+  static Future<bool> pushNewUserRelation(
+    int fromContactId,
+    AnnouncedUser announcedUser,
+    int? publicKeyVerifiedTimestamp,
+  ) async {
+    try {
+      await twonlyDB.transaction(() async {
+        // 1. Ensure the user exists in the AnnouncedUsers table
+        await twonlyDB
+            .into(twonlyDB.userDiscoveryAnnouncedUsers)
+            .insertOnConflictUpdate(
+              UserDiscoveryAnnouncedUsersCompanion(
+                announcedUserId: Value(announcedUser.userId),
+                announcedPublicKey: Value(announcedUser.publicKey),
+                publicId: Value(announcedUser.publicId),
+              ),
+            );
+
+        // 2. Insert or update the relation
+        await twonlyDB
+            .into(twonlyDB.userDiscoveryUserRelations)
+            .insertOnConflictUpdate(
+              UserDiscoveryUserRelationsCompanion.insert(
+                announcedUserId: announcedUser.userId,
+                fromContactId: fromContactId,
+                publicKeyVerifiedTimestamp: Value(
+                  publicKeyVerifiedTimestamp != null
+                      ? DateTime.fromMillisecondsSinceEpoch(
+                          publicKeyVerifiedTimestamp,
+                        )
+                      : null,
+                ),
+              ),
+            );
+      });
+      return true;
+    } catch (e) {
+      Log.error(e);
+      return false;
+    }
+  }
+
+  // static Future<Map<AnnouncedUser, List<(int, DateTime?)>>>
+  // getAllAnnouncedUsers() async {
+  //   final query = twonlyDB.select(twonlyDB.userDiscoveryAnnouncedUsers).join([
+  //     innerJoin(
+  //       twonlyDB.userDiscoveryUserRelations,
+  //       twonlyDB.userDiscoveryUserRelations.announcedUserId.equalsExp(
+  //         twonlyDB.userDiscoveryAnnouncedUsers.announcedUserId,
+  //       ),
+  //     ),
+  //   ]);
+
+  //   final results = await query.get();
+  //   final map = <UserDiscoveryAnnouncedUser, List<(int, DateTime?)>>{};
+
+  //   for (final row in results) {
+  //     final user = row.readTable(twonlyDB.userDiscoveryAnnouncedUsers);
+  //     final relation = row.readTable(twonlyDB.userDiscoveryUserRelations);
+
+  //     map.putIfAbsent(user, () => []).add(
+  //       (relation.fromContactId, relation.publicKeyVerifiedTimestamp),
+  //     );
+  //   }
+
+  //   return map;
+  // }
+
+  static Future<Uint8List?> getContactVersion(int contactId) async {
+    final row = await (twonlyDB.select(
+      twonlyDB.contacts,
+    )..where((tbl) => tbl.userId.equals(contactId))).getSingleOrNull();
+    return row?.userDiscoveryVersion;
+  }
+
+  static Future<bool> setContactVersion(int contactId, Uint8List update) async {
+    try {
+      await (twonlyDB.update(twonlyDB.contacts)
+            ..where((tbl) => tbl.userId.equals(contactId)))
+          .write(ContactsCompanion(userDiscoveryVersion: Value(update)));
+      return true;
+    } catch (e) {
+      Log.error(e);
+      return false;
+    }
+  }
+
+  static Future<Uint8List?> getContactPromotion(int contactId) async {
+    try {
+      final row = await (twonlyDB.select(
+        twonlyDB.userDiscoveryOwnPromotions,
+      )..where((tbl) => tbl.contactId.equals(contactId))).getSingleOrNull();
+      return row?.promotion;
+    } catch (e) {
+      Log.error(e);
+      return null;
+    }
+  }
+}
diff --git a/lib/src/constants/routes.keys.dart b/lib/src/constants/routes.keys.dart
index 157c27da..66a1fabb 100644
--- a/lib/src/constants/routes.keys.dart
+++ b/lib/src/constants/routes.keys.dart
@@ -34,6 +34,8 @@ class Routes {
   static const String settingsPrivacy = '/settings/privacy';
   static const String settingsPrivacyBlockUsers =
       '/settings/privacy/block_users';
+  static const String settingsPrivacyUserDiscovery =
+      '/settings/privacy/user_discovery';
   static const String settingsNotification = '/settings/notification';
   static const String settingsStorage = '/settings/storage_data';
   static const String settingsStorageImport = '/settings/storage_data/import';
diff --git a/lib/src/constants/secure_storage_keys.dart b/lib/src/constants/secure_storage.keys.dart
similarity index 100%
rename from lib/src/constants/secure_storage_keys.dart
rename to lib/src/constants/secure_storage.keys.dart
diff --git a/lib/src/database/daos/contacts.dao.dart b/lib/src/database/daos/contacts.dao.dart
index ce26eb2a..9258e637 100644
--- a/lib/src/database/daos/contacts.dao.dart
+++ b/lib/src/database/daos/contacts.dao.dart
@@ -1,5 +1,5 @@
 import 'package:drift/drift.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/tables/contacts.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/services/notifications/pushkeys.notifications.dart';
@@ -7,7 +7,7 @@ import 'package:twonly/src/utils/log.dart';
 
 part 'contacts.dao.g.dart';
 
-@DriftAccessor(tables: [Contacts])
+@DriftAccessor(tables: [Contacts, KeyVerifications])
 class ContactsDao extends DatabaseAccessor<TwonlyDB> with _$ContactsDaoMixin {
   // this constructor is required so that the main database can create an instance
   // of this object.
@@ -134,6 +134,44 @@ class ContactsDao extends DatabaseAccessor<TwonlyDB> with _$ContactsDaoMixin {
         .watch();
   }
 
+  Stream<List<Contact>> watchContactsAnnouncedViaUserDiscovery() {
+    return (select(contacts)..where((t) {
+          var expr =
+              t.userDiscoveryVersion.isNotNull() &
+              t.userDiscoveryExcluded.equals(false) &
+              t.accountDeleted.equals(false) &
+              t.mediaSendCounter.isBiggerOrEqualValue(
+                userService.currentUser.requiredSendImages,
+              );
+
+          if (userService.currentUser.userDiscoveryRequiresManualApproval) {
+            expr = expr & t.userDiscoveryManualApproved.equals(true);
+          }
+
+          return expr;
+        }))
+        .watch();
+  }
+
+  Future<List<Contact>> getContactsAnnouncedViaUserDiscovery() async {
+    return (select(contacts)..where((t) {
+          var expr =
+              t.userDiscoveryVersion.isNotNull() &
+              t.userDiscoveryExcluded.equals(false) &
+              t.accountDeleted.equals(false) &
+              t.mediaSendCounter.isBiggerOrEqualValue(
+                userService.currentUser.requiredSendImages,
+              );
+
+          if (userService.currentUser.userDiscoveryRequiresManualApproval) {
+            expr = expr & t.userDiscoveryManualApproved.equals(true);
+          }
+
+          return expr;
+        }))
+        .get();
+  }
+
   Stream<List<Contact>> watchAllContacts() {
     return select(contacts).watch();
   }
diff --git a/lib/src/database/daos/contacts.dao.g.dart b/lib/src/database/daos/contacts.dao.g.dart
index f76b6079..b5ce2db1 100644
--- a/lib/src/database/daos/contacts.dao.g.dart
+++ b/lib/src/database/daos/contacts.dao.g.dart
@@ -5,6 +5,8 @@ part of 'contacts.dao.dart';
 // ignore_for_file: type=lint
 mixin _$ContactsDaoMixin on DatabaseAccessor<TwonlyDB> {
   $ContactsTable get contacts => attachedDatabase.contacts;
+  $KeyVerificationsTable get keyVerifications =>
+      attachedDatabase.keyVerifications;
   ContactsDaoManager get managers => ContactsDaoManager(this);
 }
 
@@ -13,4 +15,9 @@ class ContactsDaoManager {
   ContactsDaoManager(this._db);
   $$ContactsTableTableManager get contacts =>
       $$ContactsTableTableManager(_db.attachedDatabase, _db.contacts);
+  $$KeyVerificationsTableTableManager get keyVerifications =>
+      $$KeyVerificationsTableTableManager(
+        _db.attachedDatabase,
+        _db.keyVerifications,
+      );
 }
diff --git a/lib/src/database/daos/groups.dao.dart b/lib/src/database/daos/groups.dao.dart
index 144e21cb..67812253 100644
--- a/lib/src/database/daos/groups.dao.dart
+++ b/lib/src/database/daos/groups.dao.dart
@@ -1,6 +1,6 @@
 import 'package:drift/drift.dart';
 import 'package:hashlib/random.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/tables/groups.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/services/flame.service.dart';
@@ -113,7 +113,10 @@ class GroupsDao extends DatabaseAccessor<TwonlyDB> with _$GroupsDaoMixin {
     int contactId,
     GroupsCompanion group,
   ) async {
-    final groupIdDirectChat = getUUIDforDirectChat(contactId, gUser.userId);
+    final groupIdDirectChat = getUUIDforDirectChat(
+      contactId,
+      userService.currentUser.userId,
+    );
     final insertGroup = group.copyWith(
       groupId: Value(groupIdDirectChat),
       isDirectChat: const Value(true),
@@ -209,7 +212,10 @@ class GroupsDao extends DatabaseAccessor<TwonlyDB> with _$GroupsDaoMixin {
   }
 
   Stream<Group?> watchDirectChat(int contactId) {
-    final groupId = getUUIDforDirectChat(contactId, gUser.userId);
+    final groupId = getUUIDforDirectChat(
+      contactId,
+      userService.currentUser.userId,
+    );
     return (select(
       groups,
     )..where((t) => t.groupId.equals(groupId))).watchSingleOrNull();
@@ -235,7 +241,7 @@ class GroupsDao extends DatabaseAccessor<TwonlyDB> with _$GroupsDaoMixin {
     )..where((t) => t.groupId.equals(groupId))).getSingleOrNull();
   }
 
-  Stream<int> watchFlameCounter(String groupId) {
+  Stream<({int counter, bool isExpiring})> watchFlameCounter(String groupId) {
     return (select(groups)..where(
           (u) =>
               u.groupId.equals(groupId) &
@@ -243,7 +249,7 @@ class GroupsDao extends DatabaseAccessor<TwonlyDB> with _$GroupsDaoMixin {
               u.lastMessageSend.isNotNull(),
         ))
         .watchSingleOrNull()
-        .asyncMap(getFlameCounterFromGroup);
+        .map(getFlameCounterFromGroup);
   }
 
   Future<List<Group>> getAllDirectChats() {
@@ -311,4 +317,19 @@ class GroupsDao extends DatabaseAccessor<TwonlyDB> with _$GroupsDaoMixin {
         ))
         .write(GroupsCompanion(lastMessageExchange: Value(newLastMessage)));
   }
+
+  Stream<List<Group>> watchNonDirectGroupsForMember(int contactId) {
+    final query =
+        select(groups).join([
+          innerJoin(
+            groupMembers,
+            groupMembers.groupId.equalsExp(groups.groupId),
+          ),
+        ])..where(
+          groups.isDirectChat.equals(false) &
+              groupMembers.contactId.equals(contactId),
+        );
+
+    return query.map((row) => row.readTable(groups)).watch();
+  }
 }
diff --git a/lib/src/database/daos/key_verification.dao.dart b/lib/src/database/daos/key_verification.dao.dart
new file mode 100644
index 00000000..f4693ff4
--- /dev/null
+++ b/lib/src/database/daos/key_verification.dao.dart
@@ -0,0 +1,170 @@
+import 'package:clock/clock.dart';
+import 'package:drift/drift.dart';
+import 'package:twonly/core/bridge/wrapper/user_discovery.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/database/tables/contacts.table.dart';
+import 'package:twonly/src/database/tables/groups.table.dart';
+import 'package:twonly/src/database/tables/user_discovery.table.dart';
+import 'package:twonly/src/database/twonly.db.dart';
+
+part 'key_verification.dao.g.dart';
+
+enum VerificationStatus { trusted, partialTrusted, notTrusted }
+
+@DriftAccessor(
+  tables: [
+    Contacts,
+    VerificationTokens,
+    KeyVerifications,
+    GroupMembers,
+    UserDiscoveryUserRelations,
+  ],
+)
+class KeyVerificationDao extends DatabaseAccessor<TwonlyDB>
+    with _$KeyVerificationDaoMixin {
+  // ignore: matching_super_parameters
+  KeyVerificationDao(super.db);
+
+  Future<List<VerificationToken>> getRecentVerificationTokens() {
+    final cutoff = DateTime.now().subtract(const Duration(hours: 24));
+    return (select(
+      verificationTokens,
+    )..where((t) => t.createdAt.isBiggerOrEqualValue(cutoff))).get();
+  }
+
+  Future<int> insertVerificationToken(Uint8List token) {
+    return into(verificationTokens).insert(
+      VerificationTokensCompanion.insert(token: token),
+    );
+  }
+
+  /// Returns a map of contactId → the verification type of the earliest
+  /// [KeyVerification] row for that contact.
+  Future<Map<int, VerificationType>>
+  getFirstVerificationTypeByContacts() async {
+    final rows = await (select(
+      keyVerifications,
+    )..orderBy([(kv) => OrderingTerm.asc(kv.createdAt)])).get();
+
+    final result = <int, VerificationType>{};
+    for (final row in rows) {
+      result.putIfAbsent(row.contactId, () => row.type);
+    }
+    return result;
+  }
+
+  Future<bool> isContactVerified(int contactId) async {
+    final row =
+        await (select(keyVerifications)
+              ..where((kv) => kv.contactId.equals(contactId))
+              ..limit(1))
+            .getSingleOrNull();
+    return row != null;
+  }
+
+  Stream<List<KeyVerification>> watchContactVerification(int contactId) {
+    return (select(
+      keyVerifications,
+    )..where((kv) => kv.contactId.equals(contactId))).watch();
+  }
+
+  Future<List<KeyVerification>> getContactVerification(int contactId) async {
+    return (select(
+      keyVerifications,
+    )..where((kv) => kv.contactId.equals(contactId))).get();
+  }
+
+  Stream<List<(Contact, DateTime)>> watchTransferredTrustVerifications(
+    int contactId,
+  ) {
+    final kv = keyVerifications;
+    final ur = userDiscoveryUserRelations;
+
+    final query =
+        (select(contacts)..where((u) => u.userId.equals(contactId).not())).join(
+          [
+            innerJoin(
+              ur,
+              ur.fromContactId.equalsExp(contacts.userId),
+            ),
+            innerJoin(kv, kv.contactId.equalsExp(ur.fromContactId)),
+          ],
+        )..where(
+          ur.announcedUserId.equals(contactId) &
+              ur.publicKeyVerifiedTimestamp.isNotNull(),
+        );
+
+    return query.watch().map((rows) {
+      return rows.map((row) {
+        final contact = row.readTable(contacts);
+        final timestamp = row.readTable(ur).publicKeyVerifiedTimestamp!;
+        return (contact, timestamp);
+      }).toList();
+    });
+  }
+
+  Stream<VerificationStatus> watchAllGroupMembersVerified(String groupId) {
+    final gm = groupMembers;
+    final directKv = alias(keyVerifications, 'directKv');
+    final ur = userDiscoveryUserRelations;
+    final verifierKv = alias(keyVerifications, 'verifierKv');
+
+    final query = select(gm).join([
+      leftOuterJoin(directKv, directKv.contactId.equalsExp(gm.contactId)),
+      leftOuterJoin(
+        ur,
+        ur.announcedUserId.equalsExp(gm.contactId) &
+            ur.publicKeyVerifiedTimestamp.isNotNull() &
+            ur.fromContactId.equalsExp(gm.contactId).not(),
+      ),
+      leftOuterJoin(
+        verifierKv,
+        verifierKv.contactId.equalsExp(ur.fromContactId),
+      ),
+    ])..where(gm.groupId.equals(groupId));
+
+    return query.watch().map((rows) {
+      if (rows.isEmpty) return VerificationStatus.notTrusted;
+
+      final memberTrustMap = <int, ({bool direct, bool partial})>{};
+
+      for (final row in rows) {
+        final contactId = row.readTable(gm).contactId;
+        final isDirect = row.readTableOrNull(directKv) != null;
+        final isPartial = row.readTableOrNull(verifierKv) != null;
+
+        final current =
+            memberTrustMap[contactId] ?? (direct: false, partial: false);
+        memberTrustMap[contactId] = (
+          direct: current.direct || isDirect,
+          partial: current.partial || isPartial,
+        );
+      }
+
+      final allDirect = memberTrustMap.values.every((m) => m.direct);
+      if (allDirect) return VerificationStatus.trusted;
+
+      final allAtLeastPartial = memberTrustMap.values.every(
+        (m) => m.direct || m.partial,
+      );
+      if (allAtLeastPartial) return VerificationStatus.partialTrusted;
+
+      return VerificationStatus.notTrusted;
+    });
+  }
+
+  Future<void> addKeyVerification(int contactId, VerificationType type) async {
+    await into(keyVerifications).insertOnConflictUpdate(
+      KeyVerificationsCompanion(
+        contactId: Value(contactId),
+        type: Value(type),
+      ),
+    );
+    if (userService.currentUser.isUserDiscoveryEnabled) {
+      await FlutterUserDiscovery.updateVerificationStateForUser(
+        contactId: contactId,
+        publicKeyVerifiedTimestamp: clock.now().millisecondsSinceEpoch,
+      );
+    }
+  }
+}
diff --git a/lib/src/database/daos/key_verification.dao.g.dart b/lib/src/database/daos/key_verification.dao.g.dart
new file mode 100644
index 00000000..816c44c3
--- /dev/null
+++ b/lib/src/database/daos/key_verification.dao.g.dart
@@ -0,0 +1,52 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'key_verification.dao.dart';
+
+// ignore_for_file: type=lint
+mixin _$KeyVerificationDaoMixin on DatabaseAccessor<TwonlyDB> {
+  $ContactsTable get contacts => attachedDatabase.contacts;
+  $VerificationTokensTable get verificationTokens =>
+      attachedDatabase.verificationTokens;
+  $KeyVerificationsTable get keyVerifications =>
+      attachedDatabase.keyVerifications;
+  $GroupsTable get groups => attachedDatabase.groups;
+  $GroupMembersTable get groupMembers => attachedDatabase.groupMembers;
+  $UserDiscoveryAnnouncedUsersTable get userDiscoveryAnnouncedUsers =>
+      attachedDatabase.userDiscoveryAnnouncedUsers;
+  $UserDiscoveryUserRelationsTable get userDiscoveryUserRelations =>
+      attachedDatabase.userDiscoveryUserRelations;
+  KeyVerificationDaoManager get managers => KeyVerificationDaoManager(this);
+}
+
+class KeyVerificationDaoManager {
+  final _$KeyVerificationDaoMixin _db;
+  KeyVerificationDaoManager(this._db);
+  $$ContactsTableTableManager get contacts =>
+      $$ContactsTableTableManager(_db.attachedDatabase, _db.contacts);
+  $$VerificationTokensTableTableManager get verificationTokens =>
+      $$VerificationTokensTableTableManager(
+        _db.attachedDatabase,
+        _db.verificationTokens,
+      );
+  $$KeyVerificationsTableTableManager get keyVerifications =>
+      $$KeyVerificationsTableTableManager(
+        _db.attachedDatabase,
+        _db.keyVerifications,
+      );
+  $$GroupsTableTableManager get groups =>
+      $$GroupsTableTableManager(_db.attachedDatabase, _db.groups);
+  $$GroupMembersTableTableManager get groupMembers =>
+      $$GroupMembersTableTableManager(_db.attachedDatabase, _db.groupMembers);
+  $$UserDiscoveryAnnouncedUsersTableTableManager
+  get userDiscoveryAnnouncedUsers =>
+      $$UserDiscoveryAnnouncedUsersTableTableManager(
+        _db.attachedDatabase,
+        _db.userDiscoveryAnnouncedUsers,
+      );
+  $$UserDiscoveryUserRelationsTableTableManager
+  get userDiscoveryUserRelations =>
+      $$UserDiscoveryUserRelationsTableTableManager(
+        _db.attachedDatabase,
+        _db.userDiscoveryUserRelations,
+      );
+}
diff --git a/lib/src/database/daos/messages.dao.dart b/lib/src/database/daos/messages.dao.dart
index b056ff4b..29edbc03 100644
--- a/lib/src/database/daos/messages.dao.dart
+++ b/lib/src/database/daos/messages.dao.dart
@@ -1,7 +1,7 @@
 import 'package:clock/clock.dart';
 import 'package:drift/drift.dart';
 import 'package:hashlib/random.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/tables/contacts.table.dart';
 import 'package:twonly/src/database/tables/groups.table.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
@@ -161,18 +161,6 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
     }
   }
 
-  Future<void> openedAllTextMessages(String groupId) {
-    final updates = MessagesCompanion(openedAt: Value(clock.now()));
-    return (update(messages)..where(
-          (t) =>
-              t.groupId.equals(groupId) &
-              t.senderId.isNotNull() &
-              t.openedAt.isNull() &
-              t.type.equals(MessageType.text.name),
-        ))
-        .write(updates);
-  }
-
   Future<void> handleMessageDeletion(
     int? contactId,
     String messageId,
@@ -184,20 +172,35 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
       return;
     }
     if (msg.mediaId != null && contactId != null) {
-      // contactId -> When a image is send to multiple and one message is delete the image should be still available...
-      await (delete(
-        mediaFiles,
-      )..where((t) => t.mediaId.equals(msg.mediaId!))).go();
+      final otherMessagesWithSameMedia =
+          await (select(messages)..where(
+                (t) =>
+                    t.mediaId.equals(msg.mediaId!) &
+                    t.messageId.equals(messageId).not(),
+              ))
+              .get();
 
-      final mediaService = await MediaFileService.fromMediaId(msg.mediaId!);
-      if (mediaService != null) {
-        mediaService.fullMediaRemoval();
+      if (otherMessagesWithSameMedia.isEmpty) {
+        await (delete(
+          mediaFiles,
+        )..where((t) => t.mediaId.equals(msg.mediaId!))).go();
+
+        final mediaService = await MediaFileService.fromMediaId(msg.mediaId!);
+        if (mediaService != null) {
+          mediaService.fullMediaRemoval();
+        }
+      } else {
+        Log.info(
+          'Media ${msg.mediaId} is still used by ${otherMessagesWithSameMedia.length} other messages. Skipping physical deletion.',
+        );
       }
     }
     await (delete(
       messageHistories,
     )..where((t) => t.messageId.equals(messageId))).go();
 
+    await twonlyDB.receiptsDao.deleteReceiptsByMessageId(messageId);
+
     await (update(messages)..where(
           (t) => t.messageId.equals(messageId),
         ))
@@ -344,7 +347,7 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
         );
       }
 
-      final rowId = await into(messages).insertOnConflictUpdate(insertMessage);
+      await into(messages).insertOnConflictUpdate(insertMessage);
 
       await twonlyDB.groupsDao.updateGroup(
         message.groupId.value,
@@ -365,9 +368,11 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
         );
       }
 
+      final messageId = insertMessage.messageId.value;
+
       return await (select(
         messages,
-      )..where((t) => t.rowId.equals(rowId))).getSingle();
+      )..where((t) => t.messageId.equals(messageId))).getSingle();
     } catch (e) {
       Log.error('Could not insert message: $e');
       return null;
diff --git a/lib/src/database/daos/reactions.dao.dart b/lib/src/database/daos/reactions.dao.dart
index a5819908..bd1405b3 100644
--- a/lib/src/database/daos/reactions.dao.dart
+++ b/lib/src/database/daos/reactions.dao.dart
@@ -1,10 +1,10 @@
 import 'package:drift/drift.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/tables/contacts.table.dart';
 import 'package:twonly/src/database/tables/reactions.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/utils/log.dart';
-import 'package:twonly/src/views/components/animate_icon.dart';
+import 'package:twonly/src/visual/components/animate_icon.comp.dart';
 
 part 'reactions.dao.g.dart';
 
diff --git a/lib/src/database/daos/receipts.dao.dart b/lib/src/database/daos/receipts.dao.dart
index 34b9a7a7..ee966fa8 100644
--- a/lib/src/database/daos/receipts.dao.dart
+++ b/lib/src/database/daos/receipts.dao.dart
@@ -5,7 +5,7 @@ import 'package:twonly/src/database/tables/contacts.table.dart';
 import 'package:twonly/src/database/tables/messages.table.dart';
 import 'package:twonly/src/database/tables/receipts.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
-import 'package:twonly/src/services/api/mediafiles/upload.service.dart';
+import 'package:twonly/src/services/api/mediafiles/upload.api.dart';
 import 'package:twonly/src/utils/log.dart';
 
 part 'receipts.dao.g.dart';
@@ -53,6 +53,13 @@ class ReceiptsDao extends DatabaseAccessor<TwonlyDB> with _$ReceiptsDaoMixin {
         ))
         .go();
   }
+  
+  Future<void> deleteReceiptsByMessageId(String messageId) async {
+    await (delete(receipts)..where(
+          (t) => t.messageId.equals(messageId),
+        ))
+        .go();
+  }
 
   Future<void> deleteReceiptForUser(int contactId) async {
     await (delete(receipts)..where(
@@ -91,10 +98,11 @@ class ReceiptsDao extends DatabaseAccessor<TwonlyDB> with _$ReceiptsDaoMixin {
           receiptId: Value(uuid.v4()),
         );
       }
-      final id = await into(receipts).insert(insertEntry);
+      await into(receipts).insert(insertEntry);
+      final receiptId = insertEntry.receiptId.value;
       return await (select(
         receipts,
-      )..where((t) => t.rowId.equals(id))).getSingle();
+      )..where((t) => t.receiptId.equals(receiptId))).getSingle();
     } catch (e) {
       // ignore error, receipts is already in the database...
       return null;
diff --git a/lib/src/database/daos/user_discovery.dao.dart b/lib/src/database/daos/user_discovery.dao.dart
new file mode 100644
index 00000000..d2ab5b26
--- /dev/null
+++ b/lib/src/database/daos/user_discovery.dao.dart
@@ -0,0 +1,245 @@
+import 'package:drift/drift.dart';
+import 'package:twonly/src/database/tables/contacts.table.dart';
+import 'package:twonly/src/database/tables/user_discovery.table.dart';
+import 'package:twonly/src/database/twonly.db.dart';
+import 'package:twonly/src/utils/log.dart';
+
+part 'user_discovery.dao.g.dart';
+
+typedef AnnouncedUsersWithRelations =
+    Map<UserDiscoveryAnnouncedUser, List<(Contact, DateTime?)>>;
+
+@DriftAccessor(
+  tables: [
+    UserDiscoveryAnnouncedUsers,
+    UserDiscoveryUserRelations,
+    UserDiscoveryOwnPromotions,
+    UserDiscoveryOtherPromotions,
+    UserDiscoveryShares,
+    Contacts,
+  ],
+)
+class UserDiscoveryDao extends DatabaseAccessor<TwonlyDB>
+    with _$UserDiscoveryDaoMixin {
+  // this constructor is required so that the main database can create an instance
+  // of this object.
+  // ignore: matching_super_parameters
+  UserDiscoveryDao(super.db);
+
+  /// 1. Get count for contacts which are in announced but not in the contacts table
+
+  /// Returns all users which are not yet in the contacts table but have no data loaded (e.g. Avatar, username and display name)
+  Future<List<UserDiscoveryAnnouncedUser>>
+  getNewAnnouncementsWithoutData() async {
+    final query =
+        select(userDiscoveryAnnouncedUsers).join([
+            leftOuterJoin(
+              contacts,
+              contacts.userId.equalsExp(
+                userDiscoveryAnnouncedUsers.announcedUserId,
+              ),
+            ),
+          ])
+          // Apply filters:
+          // 1. The user must NOT exist in the contacts table
+          // 2. The username must be null
+          ..where(
+            contacts.userId.isNull() &
+                userDiscoveryAnnouncedUsers.username.isNull(),
+          );
+
+    return (await query.get())
+        .map((row) => row.readTable(userDiscoveryAnnouncedUsers))
+        .toList();
+  }
+
+  Future<AnnouncedUsersWithRelations>
+  getAllAnnouncedUsersWithRelations() async {
+    final query = select(userDiscoveryAnnouncedUsers).join([
+      innerJoin(
+        userDiscoveryUserRelations,
+        userDiscoveryUserRelations.announcedUserId.equalsExp(
+          userDiscoveryAnnouncedUsers.announcedUserId,
+        ),
+      ),
+      innerJoin(
+        contacts,
+        contacts.userId.equalsExp(
+          userDiscoveryUserRelations.fromContactId,
+        ),
+      ),
+    ])..where(userDiscoveryAnnouncedUsers.username.isNotNull());
+
+    final rows = await query.get();
+    // ignore: omit_local_variable_types
+    final AnnouncedUsersWithRelations results = {};
+
+    for (final row in rows) {
+      final user = row.readTable(userDiscoveryAnnouncedUsers);
+      final relation = row.readTable(userDiscoveryUserRelations);
+      final contact = row.readTable(contacts);
+
+      final relationData = (
+        contact,
+        relation.publicKeyVerifiedTimestamp,
+      );
+
+      if (!results.containsKey(user)) {
+        results[user] = [];
+      }
+      results[user]!.add(relationData);
+    }
+
+    return results;
+  }
+
+  Stream<AnnouncedUsersWithRelations> watchAllAnnouncedUsersWithRelations() {
+    final query = select(userDiscoveryAnnouncedUsers).join([
+      innerJoin(
+        userDiscoveryUserRelations,
+        userDiscoveryUserRelations.announcedUserId.equalsExp(
+          userDiscoveryAnnouncedUsers.announcedUserId,
+        ),
+      ),
+      innerJoin(
+        contacts,
+        contacts.userId.equalsExp(
+          userDiscoveryUserRelations.fromContactId,
+        ),
+      ),
+    ])..where(userDiscoveryAnnouncedUsers.username.isNotNull());
+
+    return query.watch().map((rows) {
+      // ignore: omit_local_variable_types
+      final AnnouncedUsersWithRelations results = {};
+
+      for (final row in rows) {
+        final user = row.readTable(userDiscoveryAnnouncedUsers);
+        final relation = row.readTable(userDiscoveryUserRelations);
+        final contact = row.readTable(contacts);
+
+        final relationData = (
+          contact,
+          relation.publicKeyVerifiedTimestamp,
+        );
+
+        if (!results.containsKey(user)) {
+          results[user] = [];
+        }
+        results[user]!.add(relationData);
+      }
+
+      Log.info('results = ${results.length}');
+
+      return results;
+    });
+  }
+
+  Stream<AnnouncedUsersWithRelations> watchNewAnnouncedUsersWithRelations() {
+    final announcedContact = alias(contacts, 'announcedContact');
+    final query =
+        select(userDiscoveryAnnouncedUsers).join([
+          innerJoin(
+            userDiscoveryUserRelations,
+            userDiscoveryUserRelations.announcedUserId.equalsExp(
+              userDiscoveryAnnouncedUsers.announcedUserId,
+            ),
+          ),
+          innerJoin(
+            contacts,
+            contacts.userId.equalsExp(
+              userDiscoveryUserRelations.fromContactId,
+            ),
+          ),
+          leftOuterJoin(
+            announcedContact,
+            announcedContact.userId.equalsExp(
+              userDiscoveryAnnouncedUsers.announcedUserId,
+            ),
+          ),
+        ])..where(
+          userDiscoveryAnnouncedUsers.username.isNotNull() &
+              userDiscoveryAnnouncedUsers.isHidden.equals(false) &
+              (announcedContact.userId.isNull() |
+                  announcedContact.deletedByUser.equals(true)),
+        );
+
+    return query.watch().map((rows) {
+      // ignore: omit_local_variable_types
+      final AnnouncedUsersWithRelations results = {};
+
+      for (final row in rows) {
+        final user = row.readTable(userDiscoveryAnnouncedUsers);
+        final relation = row.readTable(userDiscoveryUserRelations);
+        final contact = row.readTable(contacts);
+
+        final relationData = (
+          contact,
+          relation.publicKeyVerifiedTimestamp,
+        );
+
+        if (!results.containsKey(user)) {
+          results[user] = [];
+        }
+        results[user]!.add(relationData);
+      }
+
+      return results;
+    });
+  }
+
+  Stream<int> watchNewAnnouncementsWithDataCount() {
+    final countExp = userDiscoveryAnnouncedUsers.announcedUserId.count();
+
+    final query = selectOnly(userDiscoveryAnnouncedUsers)
+      ..addColumns([countExp])
+      ..where(
+        // Filters: Has a username AND has not been shown to the user yet
+        userDiscoveryAnnouncedUsers.username.isNotNull() &
+            userDiscoveryAnnouncedUsers.wasShownToTheUser.equals(false) &
+            userDiscoveryAnnouncedUsers.isHidden.equals(false),
+      );
+
+    return query.watchSingle().map((row) => row.read(countExp) ?? 0);
+  }
+
+  Future<void> markAllValidAnnouncedUsersAsShown() async {
+    await (update(userDiscoveryAnnouncedUsers)..where(
+          (t) =>
+              t.username.isNotNull() &
+              t.wasShownToTheUser.equals(false) &
+              t.isHidden.equals(false),
+        ))
+        .write(
+          const UserDiscoveryAnnouncedUsersCompanion(
+            wasShownToTheUser: Value(true),
+          ),
+        );
+  }
+
+  Future<void> updateAnnouncedUser(
+    int announcedUserId,
+    UserDiscoveryAnnouncedUsersCompanion updatedValues,
+  ) async {
+    await (update(
+      userDiscoveryAnnouncedUsers,
+    )..where((c) => c.announcedUserId.equals(announcedUserId))).write(
+      updatedValues,
+    );
+  }
+
+  Stream<List<UserDiscoveryAnnouncedUser>> watchAllAnnouncedUsers() =>
+      select(userDiscoveryAnnouncedUsers).watch();
+
+  Stream<List<UserDiscoveryUserRelation>> watchAllUserRelations() =>
+      select(userDiscoveryUserRelations).watch();
+
+  Stream<List<UserDiscoveryOwnPromotion>> watchAllOwnPromotions() =>
+      select(userDiscoveryOwnPromotions).watch();
+
+  Stream<List<UserDiscoveryOtherPromotion>> watchAllOtherPromotions() =>
+      select(userDiscoveryOtherPromotions).watch();
+
+  Stream<List<UserDiscoveryShare>> watchAllShares() =>
+      select(userDiscoveryShares).watch();
+}
diff --git a/lib/src/database/daos/user_discovery.dao.g.dart b/lib/src/database/daos/user_discovery.dao.g.dart
new file mode 100644
index 00000000..ef38cf62
--- /dev/null
+++ b/lib/src/database/daos/user_discovery.dao.g.dart
@@ -0,0 +1,55 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'user_discovery.dao.dart';
+
+// ignore_for_file: type=lint
+mixin _$UserDiscoveryDaoMixin on DatabaseAccessor<TwonlyDB> {
+  $UserDiscoveryAnnouncedUsersTable get userDiscoveryAnnouncedUsers =>
+      attachedDatabase.userDiscoveryAnnouncedUsers;
+  $ContactsTable get contacts => attachedDatabase.contacts;
+  $UserDiscoveryUserRelationsTable get userDiscoveryUserRelations =>
+      attachedDatabase.userDiscoveryUserRelations;
+  $UserDiscoveryOwnPromotionsTable get userDiscoveryOwnPromotions =>
+      attachedDatabase.userDiscoveryOwnPromotions;
+  $UserDiscoveryOtherPromotionsTable get userDiscoveryOtherPromotions =>
+      attachedDatabase.userDiscoveryOtherPromotions;
+  $UserDiscoverySharesTable get userDiscoveryShares =>
+      attachedDatabase.userDiscoveryShares;
+  UserDiscoveryDaoManager get managers => UserDiscoveryDaoManager(this);
+}
+
+class UserDiscoveryDaoManager {
+  final _$UserDiscoveryDaoMixin _db;
+  UserDiscoveryDaoManager(this._db);
+  $$UserDiscoveryAnnouncedUsersTableTableManager
+  get userDiscoveryAnnouncedUsers =>
+      $$UserDiscoveryAnnouncedUsersTableTableManager(
+        _db.attachedDatabase,
+        _db.userDiscoveryAnnouncedUsers,
+      );
+  $$ContactsTableTableManager get contacts =>
+      $$ContactsTableTableManager(_db.attachedDatabase, _db.contacts);
+  $$UserDiscoveryUserRelationsTableTableManager
+  get userDiscoveryUserRelations =>
+      $$UserDiscoveryUserRelationsTableTableManager(
+        _db.attachedDatabase,
+        _db.userDiscoveryUserRelations,
+      );
+  $$UserDiscoveryOwnPromotionsTableTableManager
+  get userDiscoveryOwnPromotions =>
+      $$UserDiscoveryOwnPromotionsTableTableManager(
+        _db.attachedDatabase,
+        _db.userDiscoveryOwnPromotions,
+      );
+  $$UserDiscoveryOtherPromotionsTableTableManager
+  get userDiscoveryOtherPromotions =>
+      $$UserDiscoveryOtherPromotionsTableTableManager(
+        _db.attachedDatabase,
+        _db.userDiscoveryOtherPromotions,
+      );
+  $$UserDiscoverySharesTableTableManager get userDiscoveryShares =>
+      $$UserDiscoverySharesTableTableManager(
+        _db.attachedDatabase,
+        _db.userDiscoveryShares,
+      );
+}
diff --git a/lib/src/database/schemas/twonly_db/drift_schema_v12.json b/lib/src/database/schemas/twonly_db/drift_schema_v12.json
new file mode 100644
index 00000000..b6e128cf
--- /dev/null
+++ b/lib/src/database/schemas/twonly_db/drift_schema_v12.json
@@ -0,0 +1,2754 @@
+{
+  "_meta": {
+    "description": "This file contains a serialized version of schema entities for drift.",
+    "version": "1.3.0"
+  },
+  "options": {
+    "store_date_time_values_as_text": false
+  },
+  "entities": [
+    {
+      "id": 0,
+      "references": [],
+      "type": "table",
+      "data": {
+        "name": "contacts",
+        "was_declared_in_moor": false,
+        "columns": [
+          {
+            "name": "user_id",
+            "getter_name": "userId",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "username",
+            "getter_name": "username",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "display_name",
+            "getter_name": "displayName",
+            "moor_type": "string",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "nick_name",
+            "getter_name": "nickName",
+            "moor_type": "string",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "avatar_svg_compressed",
+            "getter_name": "avatarSvgCompressed",
+            "moor_type": "blob",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "sender_profile_counter",
+            "getter_name": "senderProfileCounter",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "accepted",
+            "getter_name": "accepted",
+            "moor_type": "bool",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"accepted\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"accepted\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "deleted_by_user",
+            "getter_name": "deletedByUser",
+            "moor_type": "bool",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"deleted_by_user\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"deleted_by_user\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "requested",
+            "getter_name": "requested",
+            "moor_type": "bool",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"requested\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"requested\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "blocked",
+            "getter_name": "blocked",
+            "moor_type": "bool",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"blocked\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"blocked\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "verified",
+            "getter_name": "verified",
+            "moor_type": "bool",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"verified\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"verified\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "account_deleted",
+            "getter_name": "accountDeleted",
+            "moor_type": "bool",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"account_deleted\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"account_deleted\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "created_at",
+            "getter_name": "createdAt",
+            "moor_type": "dateTime",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "user_discovery_version",
+            "getter_name": "userDiscoveryVersion",
+            "moor_type": "blob",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "user_discovery_excluded",
+            "getter_name": "userDiscoveryExcluded",
+            "moor_type": "bool",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"user_discovery_excluded\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"user_discovery_excluded\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "user_discovery_manual_approved",
+            "getter_name": "userDiscoveryManualApproved",
+            "moor_type": "bool",
+            "nullable": true,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"user_discovery_manual_approved\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"user_discovery_manual_approved\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "media_send_counter",
+            "getter_name": "mediaSendCounter",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "media_received_counter",
+            "getter_name": "mediaReceivedCounter",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": false,
+        "constraints": [],
+        "explicit_pk": [
+          "user_id"
+        ]
+      }
+    },
+    {
+      "id": 1,
+      "references": [],
+      "type": "table",
+      "data": {
+        "name": "groups",
+        "was_declared_in_moor": false,
+        "columns": [
+          {
+            "name": "group_id",
+            "getter_name": "groupId",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "is_group_admin",
+            "getter_name": "isGroupAdmin",
+            "moor_type": "bool",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"is_group_admin\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"is_group_admin\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "is_direct_chat",
+            "getter_name": "isDirectChat",
+            "moor_type": "bool",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"is_direct_chat\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"is_direct_chat\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "pinned",
+            "getter_name": "pinned",
+            "moor_type": "bool",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"pinned\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"pinned\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "archived",
+            "getter_name": "archived",
+            "moor_type": "bool",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"archived\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"archived\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "joined_group",
+            "getter_name": "joinedGroup",
+            "moor_type": "bool",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"joined_group\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"joined_group\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "left_group",
+            "getter_name": "leftGroup",
+            "moor_type": "bool",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"left_group\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"left_group\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "deleted_content",
+            "getter_name": "deletedContent",
+            "moor_type": "bool",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"deleted_content\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"deleted_content\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "state_version_id",
+            "getter_name": "stateVersionId",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "state_encryption_key",
+            "getter_name": "stateEncryptionKey",
+            "moor_type": "blob",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "my_group_private_key",
+            "getter_name": "myGroupPrivateKey",
+            "moor_type": "blob",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "group_name",
+            "getter_name": "groupName",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "draft_message",
+            "getter_name": "draftMessage",
+            "moor_type": "string",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "total_media_counter",
+            "getter_name": "totalMediaCounter",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "also_best_friend",
+            "getter_name": "alsoBestFriend",
+            "moor_type": "bool",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"also_best_friend\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"also_best_friend\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "delete_messages_after_milliseconds",
+            "getter_name": "deleteMessagesAfterMilliseconds",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('86400000')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "created_at",
+            "getter_name": "createdAt",
+            "moor_type": "dateTime",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "last_message_send",
+            "getter_name": "lastMessageSend",
+            "moor_type": "dateTime",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "last_message_received",
+            "getter_name": "lastMessageReceived",
+            "moor_type": "dateTime",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "last_flame_counter_change",
+            "getter_name": "lastFlameCounterChange",
+            "moor_type": "dateTime",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "last_flame_sync",
+            "getter_name": "lastFlameSync",
+            "moor_type": "dateTime",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "flame_counter",
+            "getter_name": "flameCounter",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "max_flame_counter",
+            "getter_name": "maxFlameCounter",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "max_flame_counter_from",
+            "getter_name": "maxFlameCounterFrom",
+            "moor_type": "dateTime",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "last_message_exchange",
+            "getter_name": "lastMessageExchange",
+            "moor_type": "dateTime",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')",
+            "default_client_dart": null,
+            "dsl_features": []
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": false,
+        "constraints": [],
+        "explicit_pk": [
+          "group_id"
+        ]
+      }
+    },
+    {
+      "id": 2,
+      "references": [],
+      "type": "table",
+      "data": {
+        "name": "media_files",
+        "was_declared_in_moor": false,
+        "columns": [
+          {
+            "name": "media_id",
+            "getter_name": "mediaId",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "type",
+            "getter_name": "type",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [],
+            "type_converter": {
+              "dart_expr": "const EnumNameConverter<MediaType>(MediaType.values)",
+              "dart_type_name": "MediaType"
+            }
+          },
+          {
+            "name": "upload_state",
+            "getter_name": "uploadState",
+            "moor_type": "string",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [],
+            "type_converter": {
+              "dart_expr": "const EnumNameConverter<UploadState>(UploadState.values)",
+              "dart_type_name": "UploadState"
+            }
+          },
+          {
+            "name": "download_state",
+            "getter_name": "downloadState",
+            "moor_type": "string",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [],
+            "type_converter": {
+              "dart_expr": "const EnumNameConverter<DownloadState>(DownloadState.values)",
+              "dart_type_name": "DownloadState"
+            }
+          },
+          {
+            "name": "requires_authentication",
+            "getter_name": "requiresAuthentication",
+            "moor_type": "bool",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"requires_authentication\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"requires_authentication\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "stored",
+            "getter_name": "stored",
+            "moor_type": "bool",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"stored\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"stored\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "is_draft_media",
+            "getter_name": "isDraftMedia",
+            "moor_type": "bool",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"is_draft_media\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"is_draft_media\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "pre_progressing_process",
+            "getter_name": "preProgressingProcess",
+            "moor_type": "int",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "reupload_requested_by",
+            "getter_name": "reuploadRequestedBy",
+            "moor_type": "string",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [],
+            "type_converter": {
+              "dart_expr": "IntListTypeConverter()",
+              "dart_type_name": "List<int>"
+            }
+          },
+          {
+            "name": "display_limit_in_milliseconds",
+            "getter_name": "displayLimitInMilliseconds",
+            "moor_type": "int",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "remove_audio",
+            "getter_name": "removeAudio",
+            "moor_type": "bool",
+            "nullable": true,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"remove_audio\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"remove_audio\" IN (0, 1))"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "download_token",
+            "getter_name": "downloadToken",
+            "moor_type": "blob",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "encryption_key",
+            "getter_name": "encryptionKey",
+            "moor_type": "blob",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "encryption_mac",
+            "getter_name": "encryptionMac",
+            "moor_type": "blob",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "encryption_nonce",
+            "getter_name": "encryptionNonce",
+            "moor_type": "blob",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "stored_file_hash",
+            "getter_name": "storedFileHash",
+            "moor_type": "blob",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "created_at",
+            "getter_name": "createdAt",
+            "moor_type": "dateTime",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')",
+            "default_client_dart": null,
+            "dsl_features": []
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": false,
+        "constraints": [],
+        "explicit_pk": [
+          "media_id"
+        ]
+      }
+    },
+    {
+      "id": 3,
+      "references": [
+        1,
+        0,
+        2
+      ],
+      "type": "table",
+      "data": {
+        "name": "messages",
+        "was_declared_in_moor": false,
+        "columns": [
+          {
+            "name": "group_id",
+            "getter_name": "groupId",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "REFERENCES \"groups\" (group_id) ON DELETE CASCADE",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "REFERENCES \"groups\" (group_id) ON DELETE CASCADE"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              {
+                "foreign_key": {
+                  "to": {
+                    "table": "groups",
+                    "column": "group_id"
+                  },
+                  "initially_deferred": false,
+                  "on_update": null,
+                  "on_delete": "cascade"
+                }
+              }
+            ]
+          },
+          {
+            "name": "message_id",
+            "getter_name": "messageId",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "sender_id",
+            "getter_name": "senderId",
+            "moor_type": "int",
+            "nullable": true,
+            "customConstraints": null,
+            "defaultConstraints": "REFERENCES contacts (user_id)",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "REFERENCES contacts (user_id)"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              {
+                "foreign_key": {
+                  "to": {
+                    "table": "contacts",
+                    "column": "user_id"
+                  },
+                  "initially_deferred": false,
+                  "on_update": null,
+                  "on_delete": null
+                }
+              }
+            ]
+          },
+          {
+            "name": "type",
+            "getter_name": "type",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "content",
+            "getter_name": "content",
+            "moor_type": "string",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "media_id",
+            "getter_name": "mediaId",
+            "moor_type": "string",
+            "nullable": true,
+            "customConstraints": null,
+            "defaultConstraints": "REFERENCES media_files (media_id) ON DELETE SET NULL",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "REFERENCES media_files (media_id) ON DELETE SET NULL"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              {
+                "foreign_key": {
+                  "to": {
+                    "table": "media_files",
+                    "column": "media_id"
+                  },
+                  "initially_deferred": false,
+                  "on_update": null,
+                  "on_delete": "setNull"
+                }
+              }
+            ]
+          },
+          {
+            "name": "additional_message_data",
+            "getter_name": "additionalMessageData",
+            "moor_type": "blob",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "media_stored",
+            "getter_name": "mediaStored",
+            "moor_type": "bool",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"media_stored\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"media_stored\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "media_reopened",
+            "getter_name": "mediaReopened",
+            "moor_type": "bool",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"media_reopened\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"media_reopened\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "download_token",
+            "getter_name": "downloadToken",
+            "moor_type": "blob",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "quotes_message_id",
+            "getter_name": "quotesMessageId",
+            "moor_type": "string",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "is_deleted_from_sender",
+            "getter_name": "isDeletedFromSender",
+            "moor_type": "bool",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"is_deleted_from_sender\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"is_deleted_from_sender\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "opened_at",
+            "getter_name": "openedAt",
+            "moor_type": "dateTime",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "opened_by_all",
+            "getter_name": "openedByAll",
+            "moor_type": "dateTime",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "created_at",
+            "getter_name": "createdAt",
+            "moor_type": "dateTime",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "modified_at",
+            "getter_name": "modifiedAt",
+            "moor_type": "dateTime",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "ack_by_user",
+            "getter_name": "ackByUser",
+            "moor_type": "dateTime",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "ack_by_server",
+            "getter_name": "ackByServer",
+            "moor_type": "dateTime",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": false,
+        "constraints": [],
+        "explicit_pk": [
+          "message_id"
+        ]
+      }
+    },
+    {
+      "id": 4,
+      "references": [
+        3,
+        0
+      ],
+      "type": "table",
+      "data": {
+        "name": "message_histories",
+        "was_declared_in_moor": false,
+        "columns": [
+          {
+            "name": "id",
+            "getter_name": "id",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "PRIMARY KEY AUTOINCREMENT",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "PRIMARY KEY AUTOINCREMENT"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              "auto-increment"
+            ]
+          },
+          {
+            "name": "message_id",
+            "getter_name": "messageId",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "REFERENCES messages (message_id) ON DELETE CASCADE",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "REFERENCES messages (message_id) ON DELETE CASCADE"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              {
+                "foreign_key": {
+                  "to": {
+                    "table": "messages",
+                    "column": "message_id"
+                  },
+                  "initially_deferred": false,
+                  "on_update": null,
+                  "on_delete": "cascade"
+                }
+              }
+            ]
+          },
+          {
+            "name": "contact_id",
+            "getter_name": "contactId",
+            "moor_type": "int",
+            "nullable": true,
+            "customConstraints": null,
+            "defaultConstraints": "REFERENCES contacts (user_id) ON DELETE CASCADE",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "REFERENCES contacts (user_id) ON DELETE CASCADE"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              {
+                "foreign_key": {
+                  "to": {
+                    "table": "contacts",
+                    "column": "user_id"
+                  },
+                  "initially_deferred": false,
+                  "on_update": null,
+                  "on_delete": "cascade"
+                }
+              }
+            ]
+          },
+          {
+            "name": "content",
+            "getter_name": "content",
+            "moor_type": "string",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "created_at",
+            "getter_name": "createdAt",
+            "moor_type": "dateTime",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')",
+            "default_client_dart": null,
+            "dsl_features": []
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": false,
+        "constraints": []
+      }
+    },
+    {
+      "id": 5,
+      "references": [
+        3,
+        0
+      ],
+      "type": "table",
+      "data": {
+        "name": "reactions",
+        "was_declared_in_moor": false,
+        "columns": [
+          {
+            "name": "message_id",
+            "getter_name": "messageId",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "REFERENCES messages (message_id) ON DELETE CASCADE",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "REFERENCES messages (message_id) ON DELETE CASCADE"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              {
+                "foreign_key": {
+                  "to": {
+                    "table": "messages",
+                    "column": "message_id"
+                  },
+                  "initially_deferred": false,
+                  "on_update": null,
+                  "on_delete": "cascade"
+                }
+              }
+            ]
+          },
+          {
+            "name": "emoji",
+            "getter_name": "emoji",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "sender_id",
+            "getter_name": "senderId",
+            "moor_type": "int",
+            "nullable": true,
+            "customConstraints": null,
+            "defaultConstraints": "REFERENCES contacts (user_id) ON DELETE CASCADE",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "REFERENCES contacts (user_id) ON DELETE CASCADE"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              {
+                "foreign_key": {
+                  "to": {
+                    "table": "contacts",
+                    "column": "user_id"
+                  },
+                  "initially_deferred": false,
+                  "on_update": null,
+                  "on_delete": "cascade"
+                }
+              }
+            ]
+          },
+          {
+            "name": "created_at",
+            "getter_name": "createdAt",
+            "moor_type": "dateTime",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')",
+            "default_client_dart": null,
+            "dsl_features": []
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": false,
+        "constraints": [],
+        "explicit_pk": [
+          "message_id",
+          "sender_id",
+          "emoji"
+        ]
+      }
+    },
+    {
+      "id": 6,
+      "references": [
+        1,
+        0
+      ],
+      "type": "table",
+      "data": {
+        "name": "group_members",
+        "was_declared_in_moor": false,
+        "columns": [
+          {
+            "name": "group_id",
+            "getter_name": "groupId",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "REFERENCES \"groups\" (group_id) ON DELETE CASCADE",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "REFERENCES \"groups\" (group_id) ON DELETE CASCADE"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              {
+                "foreign_key": {
+                  "to": {
+                    "table": "groups",
+                    "column": "group_id"
+                  },
+                  "initially_deferred": false,
+                  "on_update": null,
+                  "on_delete": "cascade"
+                }
+              }
+            ]
+          },
+          {
+            "name": "contact_id",
+            "getter_name": "contactId",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "REFERENCES contacts (user_id)",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "REFERENCES contacts (user_id)"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              {
+                "foreign_key": {
+                  "to": {
+                    "table": "contacts",
+                    "column": "user_id"
+                  },
+                  "initially_deferred": false,
+                  "on_update": null,
+                  "on_delete": null
+                }
+              }
+            ]
+          },
+          {
+            "name": "member_state",
+            "getter_name": "memberState",
+            "moor_type": "string",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [],
+            "type_converter": {
+              "dart_expr": "const EnumNameConverter<MemberState>(MemberState.values)",
+              "dart_type_name": "MemberState"
+            }
+          },
+          {
+            "name": "group_public_key",
+            "getter_name": "groupPublicKey",
+            "moor_type": "blob",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "last_chat_opened",
+            "getter_name": "lastChatOpened",
+            "moor_type": "dateTime",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "last_type_indicator",
+            "getter_name": "lastTypeIndicator",
+            "moor_type": "dateTime",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "last_message",
+            "getter_name": "lastMessage",
+            "moor_type": "dateTime",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "created_at",
+            "getter_name": "createdAt",
+            "moor_type": "dateTime",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')",
+            "default_client_dart": null,
+            "dsl_features": []
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": false,
+        "constraints": [],
+        "explicit_pk": [
+          "group_id",
+          "contact_id"
+        ]
+      }
+    },
+    {
+      "id": 7,
+      "references": [
+        0,
+        3
+      ],
+      "type": "table",
+      "data": {
+        "name": "receipts",
+        "was_declared_in_moor": false,
+        "columns": [
+          {
+            "name": "receipt_id",
+            "getter_name": "receiptId",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "contact_id",
+            "getter_name": "contactId",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "REFERENCES contacts (user_id) ON DELETE CASCADE",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "REFERENCES contacts (user_id) ON DELETE CASCADE"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              {
+                "foreign_key": {
+                  "to": {
+                    "table": "contacts",
+                    "column": "user_id"
+                  },
+                  "initially_deferred": false,
+                  "on_update": null,
+                  "on_delete": "cascade"
+                }
+              }
+            ]
+          },
+          {
+            "name": "message_id",
+            "getter_name": "messageId",
+            "moor_type": "string",
+            "nullable": true,
+            "customConstraints": null,
+            "defaultConstraints": "REFERENCES messages (message_id) ON DELETE CASCADE",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "REFERENCES messages (message_id) ON DELETE CASCADE"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              {
+                "foreign_key": {
+                  "to": {
+                    "table": "messages",
+                    "column": "message_id"
+                  },
+                  "initially_deferred": false,
+                  "on_update": null,
+                  "on_delete": "cascade"
+                }
+              }
+            ]
+          },
+          {
+            "name": "message",
+            "getter_name": "message",
+            "moor_type": "blob",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "contact_will_sends_receipt",
+            "getter_name": "contactWillSendsReceipt",
+            "moor_type": "bool",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"contact_will_sends_receipt\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"contact_will_sends_receipt\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('1')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "will_be_retried_by_media_upload",
+            "getter_name": "willBeRetriedByMediaUpload",
+            "moor_type": "bool",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"will_be_retried_by_media_upload\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"will_be_retried_by_media_upload\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "mark_for_retry",
+            "getter_name": "markForRetry",
+            "moor_type": "dateTime",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "mark_for_retry_after_accepted",
+            "getter_name": "markForRetryAfterAccepted",
+            "moor_type": "dateTime",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "ack_by_server_at",
+            "getter_name": "ackByServerAt",
+            "moor_type": "dateTime",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "retry_count",
+            "getter_name": "retryCount",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "last_retry",
+            "getter_name": "lastRetry",
+            "moor_type": "dateTime",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "created_at",
+            "getter_name": "createdAt",
+            "moor_type": "dateTime",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')",
+            "default_client_dart": null,
+            "dsl_features": []
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": false,
+        "constraints": [],
+        "explicit_pk": [
+          "receipt_id"
+        ]
+      }
+    },
+    {
+      "id": 8,
+      "references": [],
+      "type": "table",
+      "data": {
+        "name": "received_receipts",
+        "was_declared_in_moor": false,
+        "columns": [
+          {
+            "name": "receipt_id",
+            "getter_name": "receiptId",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "created_at",
+            "getter_name": "createdAt",
+            "moor_type": "dateTime",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')",
+            "default_client_dart": null,
+            "dsl_features": []
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": false,
+        "constraints": [],
+        "explicit_pk": [
+          "receipt_id"
+        ]
+      }
+    },
+    {
+      "id": 9,
+      "references": [],
+      "type": "table",
+      "data": {
+        "name": "signal_identity_key_stores",
+        "was_declared_in_moor": false,
+        "columns": [
+          {
+            "name": "device_id",
+            "getter_name": "deviceId",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "name",
+            "getter_name": "name",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "identity_key",
+            "getter_name": "identityKey",
+            "moor_type": "blob",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "created_at",
+            "getter_name": "createdAt",
+            "moor_type": "dateTime",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')",
+            "default_client_dart": null,
+            "dsl_features": []
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": false,
+        "constraints": [],
+        "explicit_pk": [
+          "device_id",
+          "name"
+        ]
+      }
+    },
+    {
+      "id": 10,
+      "references": [],
+      "type": "table",
+      "data": {
+        "name": "signal_pre_key_stores",
+        "was_declared_in_moor": false,
+        "columns": [
+          {
+            "name": "pre_key_id",
+            "getter_name": "preKeyId",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "pre_key",
+            "getter_name": "preKey",
+            "moor_type": "blob",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "created_at",
+            "getter_name": "createdAt",
+            "moor_type": "dateTime",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')",
+            "default_client_dart": null,
+            "dsl_features": []
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": false,
+        "constraints": [],
+        "explicit_pk": [
+          "pre_key_id"
+        ]
+      }
+    },
+    {
+      "id": 11,
+      "references": [],
+      "type": "table",
+      "data": {
+        "name": "signal_sender_key_stores",
+        "was_declared_in_moor": false,
+        "columns": [
+          {
+            "name": "sender_key_name",
+            "getter_name": "senderKeyName",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "sender_key",
+            "getter_name": "senderKey",
+            "moor_type": "blob",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": false,
+        "constraints": [],
+        "explicit_pk": [
+          "sender_key_name"
+        ]
+      }
+    },
+    {
+      "id": 12,
+      "references": [],
+      "type": "table",
+      "data": {
+        "name": "signal_session_stores",
+        "was_declared_in_moor": false,
+        "columns": [
+          {
+            "name": "device_id",
+            "getter_name": "deviceId",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "name",
+            "getter_name": "name",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "session_record",
+            "getter_name": "sessionRecord",
+            "moor_type": "blob",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "created_at",
+            "getter_name": "createdAt",
+            "moor_type": "dateTime",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')",
+            "default_client_dart": null,
+            "dsl_features": []
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": false,
+        "constraints": [],
+        "explicit_pk": [
+          "device_id",
+          "name"
+        ]
+      }
+    },
+    {
+      "id": 13,
+      "references": [
+        3,
+        0
+      ],
+      "type": "table",
+      "data": {
+        "name": "message_actions",
+        "was_declared_in_moor": false,
+        "columns": [
+          {
+            "name": "message_id",
+            "getter_name": "messageId",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "REFERENCES messages (message_id) ON DELETE CASCADE",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "REFERENCES messages (message_id) ON DELETE CASCADE"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              {
+                "foreign_key": {
+                  "to": {
+                    "table": "messages",
+                    "column": "message_id"
+                  },
+                  "initially_deferred": false,
+                  "on_update": null,
+                  "on_delete": "cascade"
+                }
+              }
+            ]
+          },
+          {
+            "name": "contact_id",
+            "getter_name": "contactId",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "REFERENCES contacts (user_id) ON DELETE CASCADE",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "REFERENCES contacts (user_id) ON DELETE CASCADE"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              {
+                "foreign_key": {
+                  "to": {
+                    "table": "contacts",
+                    "column": "user_id"
+                  },
+                  "initially_deferred": false,
+                  "on_update": null,
+                  "on_delete": "cascade"
+                }
+              }
+            ]
+          },
+          {
+            "name": "type",
+            "getter_name": "type",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [],
+            "type_converter": {
+              "dart_expr": "const EnumNameConverter<MessageActionType>(MessageActionType.values)",
+              "dart_type_name": "MessageActionType"
+            }
+          },
+          {
+            "name": "action_at",
+            "getter_name": "actionAt",
+            "moor_type": "dateTime",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')",
+            "default_client_dart": null,
+            "dsl_features": []
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": false,
+        "constraints": [],
+        "explicit_pk": [
+          "message_id",
+          "contact_id",
+          "type"
+        ]
+      }
+    },
+    {
+      "id": 14,
+      "references": [
+        1,
+        0
+      ],
+      "type": "table",
+      "data": {
+        "name": "group_histories",
+        "was_declared_in_moor": false,
+        "columns": [
+          {
+            "name": "group_history_id",
+            "getter_name": "groupHistoryId",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "group_id",
+            "getter_name": "groupId",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "REFERENCES \"groups\" (group_id) ON DELETE CASCADE",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "REFERENCES \"groups\" (group_id) ON DELETE CASCADE"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              {
+                "foreign_key": {
+                  "to": {
+                    "table": "groups",
+                    "column": "group_id"
+                  },
+                  "initially_deferred": false,
+                  "on_update": null,
+                  "on_delete": "cascade"
+                }
+              }
+            ]
+          },
+          {
+            "name": "contact_id",
+            "getter_name": "contactId",
+            "moor_type": "int",
+            "nullable": true,
+            "customConstraints": null,
+            "defaultConstraints": "REFERENCES contacts (user_id)",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "REFERENCES contacts (user_id)"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              {
+                "foreign_key": {
+                  "to": {
+                    "table": "contacts",
+                    "column": "user_id"
+                  },
+                  "initially_deferred": false,
+                  "on_update": null,
+                  "on_delete": null
+                }
+              }
+            ]
+          },
+          {
+            "name": "affected_contact_id",
+            "getter_name": "affectedContactId",
+            "moor_type": "int",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "old_group_name",
+            "getter_name": "oldGroupName",
+            "moor_type": "string",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "new_group_name",
+            "getter_name": "newGroupName",
+            "moor_type": "string",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "new_delete_messages_after_milliseconds",
+            "getter_name": "newDeleteMessagesAfterMilliseconds",
+            "moor_type": "int",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "type",
+            "getter_name": "type",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [],
+            "type_converter": {
+              "dart_expr": "const EnumNameConverter<GroupActionType>(GroupActionType.values)",
+              "dart_type_name": "GroupActionType"
+            }
+          },
+          {
+            "name": "action_at",
+            "getter_name": "actionAt",
+            "moor_type": "dateTime",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')",
+            "default_client_dart": null,
+            "dsl_features": []
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": false,
+        "constraints": [],
+        "explicit_pk": [
+          "group_history_id"
+        ]
+      }
+    },
+    {
+      "id": 15,
+      "references": [
+        0
+      ],
+      "type": "table",
+      "data": {
+        "name": "key_verifications",
+        "was_declared_in_moor": false,
+        "columns": [
+          {
+            "name": "verification_id",
+            "getter_name": "verificationId",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "PRIMARY KEY AUTOINCREMENT",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "PRIMARY KEY AUTOINCREMENT"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              "auto-increment"
+            ]
+          },
+          {
+            "name": "contact_id",
+            "getter_name": "contactId",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "REFERENCES contacts (user_id) ON DELETE CASCADE",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "REFERENCES contacts (user_id) ON DELETE CASCADE"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              {
+                "foreign_key": {
+                  "to": {
+                    "table": "contacts",
+                    "column": "user_id"
+                  },
+                  "initially_deferred": false,
+                  "on_update": null,
+                  "on_delete": "cascade"
+                }
+              }
+            ]
+          },
+          {
+            "name": "type",
+            "getter_name": "type",
+            "moor_type": "string",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [],
+            "type_converter": {
+              "dart_expr": "const EnumNameConverter<VerificationType>(VerificationType.values)",
+              "dart_type_name": "VerificationType"
+            }
+          },
+          {
+            "name": "created_at",
+            "getter_name": "createdAt",
+            "moor_type": "dateTime",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')",
+            "default_client_dart": null,
+            "dsl_features": []
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": false,
+        "constraints": []
+      }
+    },
+    {
+      "id": 16,
+      "references": [],
+      "type": "table",
+      "data": {
+        "name": "verification_tokens",
+        "was_declared_in_moor": false,
+        "columns": [
+          {
+            "name": "token_id",
+            "getter_name": "tokenId",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "PRIMARY KEY AUTOINCREMENT",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "PRIMARY KEY AUTOINCREMENT"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              "auto-increment"
+            ]
+          },
+          {
+            "name": "token",
+            "getter_name": "token",
+            "moor_type": "blob",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "created_at",
+            "getter_name": "createdAt",
+            "moor_type": "dateTime",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": "const CustomExpression('CAST(strftime(\\'%s\\', CURRENT_TIMESTAMP) AS INTEGER)')",
+            "default_client_dart": null,
+            "dsl_features": []
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": false,
+        "constraints": []
+      }
+    },
+    {
+      "id": 17,
+      "references": [],
+      "type": "table",
+      "data": {
+        "name": "user_discovery_announced_users",
+        "was_declared_in_moor": false,
+        "columns": [
+          {
+            "name": "announced_user_id",
+            "getter_name": "announcedUserId",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "announced_public_key",
+            "getter_name": "announcedPublicKey",
+            "moor_type": "blob",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "public_id",
+            "getter_name": "publicId",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "UNIQUE",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "UNIQUE"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              "unique"
+            ]
+          },
+          {
+            "name": "username",
+            "getter_name": "username",
+            "moor_type": "string",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "was_shown_to_the_user",
+            "getter_name": "wasShownToTheUser",
+            "moor_type": "bool",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"was_shown_to_the_user\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"was_shown_to_the_user\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "is_hidden",
+            "getter_name": "isHidden",
+            "moor_type": "bool",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "CHECK (\"is_hidden\" IN (0, 1))",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "CHECK (\"is_hidden\" IN (0, 1))"
+            },
+            "default_dart": "const CustomExpression('0')",
+            "default_client_dart": null,
+            "dsl_features": []
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": false,
+        "constraints": [],
+        "explicit_pk": [
+          "announced_user_id"
+        ]
+      }
+    },
+    {
+      "id": 18,
+      "references": [
+        17,
+        0
+      ],
+      "type": "table",
+      "data": {
+        "name": "user_discovery_user_relations",
+        "was_declared_in_moor": false,
+        "columns": [
+          {
+            "name": "announced_user_id",
+            "getter_name": "announcedUserId",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "REFERENCES user_discovery_announced_users (announced_user_id) ON DELETE CASCADE",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "REFERENCES user_discovery_announced_users (announced_user_id) ON DELETE CASCADE"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              {
+                "foreign_key": {
+                  "to": {
+                    "table": "user_discovery_announced_users",
+                    "column": "announced_user_id"
+                  },
+                  "initially_deferred": false,
+                  "on_update": null,
+                  "on_delete": "cascade"
+                }
+              }
+            ]
+          },
+          {
+            "name": "from_contact_id",
+            "getter_name": "fromContactId",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "REFERENCES contacts (user_id) ON DELETE CASCADE",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "REFERENCES contacts (user_id) ON DELETE CASCADE"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              {
+                "foreign_key": {
+                  "to": {
+                    "table": "contacts",
+                    "column": "user_id"
+                  },
+                  "initially_deferred": false,
+                  "on_update": null,
+                  "on_delete": "cascade"
+                }
+              }
+            ]
+          },
+          {
+            "name": "public_key_verified_timestamp",
+            "getter_name": "publicKeyVerifiedTimestamp",
+            "moor_type": "dateTime",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": false,
+        "constraints": [],
+        "explicit_pk": [
+          "announced_user_id",
+          "from_contact_id"
+        ]
+      }
+    },
+    {
+      "id": 19,
+      "references": [
+        0
+      ],
+      "type": "table",
+      "data": {
+        "name": "user_discovery_other_promotions",
+        "was_declared_in_moor": false,
+        "columns": [
+          {
+            "name": "from_contact_id",
+            "getter_name": "fromContactId",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "REFERENCES contacts (user_id) ON DELETE CASCADE",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "REFERENCES contacts (user_id) ON DELETE CASCADE"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              {
+                "foreign_key": {
+                  "to": {
+                    "table": "contacts",
+                    "column": "user_id"
+                  },
+                  "initially_deferred": false,
+                  "on_update": null,
+                  "on_delete": "cascade"
+                }
+              }
+            ]
+          },
+          {
+            "name": "promotion_id",
+            "getter_name": "promotionId",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "public_id",
+            "getter_name": "publicId",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "threshold",
+            "getter_name": "threshold",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "announcement_share",
+            "getter_name": "announcementShare",
+            "moor_type": "blob",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "public_key_verified_timestamp",
+            "getter_name": "publicKeyVerifiedTimestamp",
+            "moor_type": "dateTime",
+            "nullable": true,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": false,
+        "constraints": [],
+        "explicit_pk": [
+          "from_contact_id",
+          "public_id"
+        ]
+      }
+    },
+    {
+      "id": 20,
+      "references": [
+        0
+      ],
+      "type": "table",
+      "data": {
+        "name": "user_discovery_own_promotions",
+        "was_declared_in_moor": false,
+        "columns": [
+          {
+            "name": "version_id",
+            "getter_name": "versionId",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "PRIMARY KEY AUTOINCREMENT",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "PRIMARY KEY AUTOINCREMENT"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              "auto-increment"
+            ]
+          },
+          {
+            "name": "contact_id",
+            "getter_name": "contactId",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "REFERENCES contacts (user_id) ON DELETE CASCADE",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "REFERENCES contacts (user_id) ON DELETE CASCADE"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              {
+                "foreign_key": {
+                  "to": {
+                    "table": "contacts",
+                    "column": "user_id"
+                  },
+                  "initially_deferred": false,
+                  "on_update": null,
+                  "on_delete": "cascade"
+                }
+              }
+            ]
+          },
+          {
+            "name": "promotion",
+            "getter_name": "promotion",
+            "moor_type": "blob",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": false,
+        "constraints": []
+      }
+    },
+    {
+      "id": 21,
+      "references": [
+        0
+      ],
+      "type": "table",
+      "data": {
+        "name": "user_discovery_shares",
+        "was_declared_in_moor": false,
+        "columns": [
+          {
+            "name": "share_id",
+            "getter_name": "shareId",
+            "moor_type": "int",
+            "nullable": false,
+            "customConstraints": null,
+            "defaultConstraints": "PRIMARY KEY AUTOINCREMENT",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "PRIMARY KEY AUTOINCREMENT"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              "auto-increment"
+            ]
+          },
+          {
+            "name": "share",
+            "getter_name": "share",
+            "moor_type": "blob",
+            "nullable": false,
+            "customConstraints": null,
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": []
+          },
+          {
+            "name": "contact_id",
+            "getter_name": "contactId",
+            "moor_type": "int",
+            "nullable": true,
+            "customConstraints": null,
+            "defaultConstraints": "REFERENCES contacts (user_id) ON DELETE CASCADE",
+            "dialectAwareDefaultConstraints": {
+              "sqlite": "REFERENCES contacts (user_id) ON DELETE CASCADE"
+            },
+            "default_dart": null,
+            "default_client_dart": null,
+            "dsl_features": [
+              {
+                "foreign_key": {
+                  "to": {
+                    "table": "contacts",
+                    "column": "user_id"
+                  },
+                  "initially_deferred": false,
+                  "on_update": null,
+                  "on_delete": "cascade"
+                }
+              }
+            ]
+          }
+        ],
+        "is_virtual": false,
+        "without_rowid": false,
+        "constraints": []
+      }
+    }
+  ],
+  "fixed_sql": [
+    {
+      "name": "contacts",
+      "sql": [
+        {
+          "dialect": "sqlite",
+          "sql": "CREATE TABLE IF NOT EXISTS \"contacts\" (\"user_id\" INTEGER NOT NULL, \"username\" TEXT NOT NULL, \"display_name\" TEXT NULL, \"nick_name\" TEXT NULL, \"avatar_svg_compressed\" BLOB NULL, \"sender_profile_counter\" INTEGER NOT NULL DEFAULT 0, \"accepted\" INTEGER NOT NULL DEFAULT 0 CHECK (\"accepted\" IN (0, 1)), \"deleted_by_user\" INTEGER NOT NULL DEFAULT 0 CHECK (\"deleted_by_user\" IN (0, 1)), \"requested\" INTEGER NOT NULL DEFAULT 0 CHECK (\"requested\" IN (0, 1)), \"blocked\" INTEGER NOT NULL DEFAULT 0 CHECK (\"blocked\" IN (0, 1)), \"verified\" INTEGER NOT NULL DEFAULT 0 CHECK (\"verified\" IN (0, 1)), \"account_deleted\" INTEGER NOT NULL DEFAULT 0 CHECK (\"account_deleted\" IN (0, 1)), \"created_at\" INTEGER NOT NULL DEFAULT (CAST(strftime('%s', CURRENT_TIMESTAMP) AS INTEGER)), \"user_discovery_version\" BLOB NULL, \"user_discovery_excluded\" INTEGER NOT NULL DEFAULT 0 CHECK (\"user_discovery_excluded\" IN (0, 1)), \"user_discovery_manual_approved\" INTEGER NULL DEFAULT 0 CHECK (\"user_discovery_manual_approved\" IN (0, 1)), \"media_send_counter\" INTEGER NOT NULL DEFAULT 0, \"media_received_counter\" INTEGER NOT NULL DEFAULT 0, PRIMARY KEY (\"user_id\"));"
+        }
+      ]
+    },
+    {
+      "name": "groups",
+      "sql": [
+        {
+          "dialect": "sqlite",
+          "sql": "CREATE TABLE IF NOT EXISTS \"groups\" (\"group_id\" TEXT NOT NULL, \"is_group_admin\" INTEGER NOT NULL DEFAULT 0 CHECK (\"is_group_admin\" IN (0, 1)), \"is_direct_chat\" INTEGER NOT NULL DEFAULT 0 CHECK (\"is_direct_chat\" IN (0, 1)), \"pinned\" INTEGER NOT NULL DEFAULT 0 CHECK (\"pinned\" IN (0, 1)), \"archived\" INTEGER NOT NULL DEFAULT 0 CHECK (\"archived\" IN (0, 1)), \"joined_group\" INTEGER NOT NULL DEFAULT 0 CHECK (\"joined_group\" IN (0, 1)), \"left_group\" INTEGER NOT NULL DEFAULT 0 CHECK (\"left_group\" IN (0, 1)), \"deleted_content\" INTEGER NOT NULL DEFAULT 0 CHECK (\"deleted_content\" IN (0, 1)), \"state_version_id\" INTEGER NOT NULL DEFAULT 0, \"state_encryption_key\" BLOB NULL, \"my_group_private_key\" BLOB NULL, \"group_name\" TEXT NOT NULL, \"draft_message\" TEXT NULL, \"total_media_counter\" INTEGER NOT NULL DEFAULT 0, \"also_best_friend\" INTEGER NOT NULL DEFAULT 0 CHECK (\"also_best_friend\" IN (0, 1)), \"delete_messages_after_milliseconds\" INTEGER NOT NULL DEFAULT 86400000, \"created_at\" INTEGER NOT NULL DEFAULT (CAST(strftime('%s', CURRENT_TIMESTAMP) AS INTEGER)), \"last_message_send\" INTEGER NULL, \"last_message_received\" INTEGER NULL, \"last_flame_counter_change\" INTEGER NULL, \"last_flame_sync\" INTEGER NULL, \"flame_counter\" INTEGER NOT NULL DEFAULT 0, \"max_flame_counter\" INTEGER NOT NULL DEFAULT 0, \"max_flame_counter_from\" INTEGER NULL, \"last_message_exchange\" INTEGER NOT NULL DEFAULT (CAST(strftime('%s', CURRENT_TIMESTAMP) AS INTEGER)), PRIMARY KEY (\"group_id\"));"
+        }
+      ]
+    },
+    {
+      "name": "media_files",
+      "sql": [
+        {
+          "dialect": "sqlite",
+          "sql": "CREATE TABLE IF NOT EXISTS \"media_files\" (\"media_id\" TEXT NOT NULL, \"type\" TEXT NOT NULL, \"upload_state\" TEXT NULL, \"download_state\" TEXT NULL, \"requires_authentication\" INTEGER NOT NULL DEFAULT 0 CHECK (\"requires_authentication\" IN (0, 1)), \"stored\" INTEGER NOT NULL DEFAULT 0 CHECK (\"stored\" IN (0, 1)), \"is_draft_media\" INTEGER NOT NULL DEFAULT 0 CHECK (\"is_draft_media\" IN (0, 1)), \"pre_progressing_process\" INTEGER NULL, \"reupload_requested_by\" TEXT NULL, \"display_limit_in_milliseconds\" INTEGER NULL, \"remove_audio\" INTEGER NULL CHECK (\"remove_audio\" IN (0, 1)), \"download_token\" BLOB NULL, \"encryption_key\" BLOB NULL, \"encryption_mac\" BLOB NULL, \"encryption_nonce\" BLOB NULL, \"stored_file_hash\" BLOB NULL, \"created_at\" INTEGER NOT NULL DEFAULT (CAST(strftime('%s', CURRENT_TIMESTAMP) AS INTEGER)), PRIMARY KEY (\"media_id\"));"
+        }
+      ]
+    },
+    {
+      "name": "messages",
+      "sql": [
+        {
+          "dialect": "sqlite",
+          "sql": "CREATE TABLE IF NOT EXISTS \"messages\" (\"group_id\" TEXT NOT NULL REFERENCES \"groups\" (group_id) ON DELETE CASCADE, \"message_id\" TEXT NOT NULL, \"sender_id\" INTEGER NULL REFERENCES contacts (user_id), \"type\" TEXT NOT NULL, \"content\" TEXT NULL, \"media_id\" TEXT NULL REFERENCES media_files (media_id) ON DELETE SET NULL, \"additional_message_data\" BLOB NULL, \"media_stored\" INTEGER NOT NULL DEFAULT 0 CHECK (\"media_stored\" IN (0, 1)), \"media_reopened\" INTEGER NOT NULL DEFAULT 0 CHECK (\"media_reopened\" IN (0, 1)), \"download_token\" BLOB NULL, \"quotes_message_id\" TEXT NULL, \"is_deleted_from_sender\" INTEGER NOT NULL DEFAULT 0 CHECK (\"is_deleted_from_sender\" IN (0, 1)), \"opened_at\" INTEGER NULL, \"opened_by_all\" INTEGER NULL, \"created_at\" INTEGER NOT NULL DEFAULT (CAST(strftime('%s', CURRENT_TIMESTAMP) AS INTEGER)), \"modified_at\" INTEGER NULL, \"ack_by_user\" INTEGER NULL, \"ack_by_server\" INTEGER NULL, PRIMARY KEY (\"message_id\"));"
+        }
+      ]
+    },
+    {
+      "name": "message_histories",
+      "sql": [
+        {
+          "dialect": "sqlite",
+          "sql": "CREATE TABLE IF NOT EXISTS \"message_histories\" (\"id\" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, \"message_id\" TEXT NOT NULL REFERENCES messages (message_id) ON DELETE CASCADE, \"contact_id\" INTEGER NULL REFERENCES contacts (user_id) ON DELETE CASCADE, \"content\" TEXT NULL, \"created_at\" INTEGER NOT NULL DEFAULT (CAST(strftime('%s', CURRENT_TIMESTAMP) AS INTEGER)));"
+        }
+      ]
+    },
+    {
+      "name": "reactions",
+      "sql": [
+        {
+          "dialect": "sqlite",
+          "sql": "CREATE TABLE IF NOT EXISTS \"reactions\" (\"message_id\" TEXT NOT NULL REFERENCES messages (message_id) ON DELETE CASCADE, \"emoji\" TEXT NOT NULL, \"sender_id\" INTEGER NULL REFERENCES contacts (user_id) ON DELETE CASCADE, \"created_at\" INTEGER NOT NULL DEFAULT (CAST(strftime('%s', CURRENT_TIMESTAMP) AS INTEGER)), PRIMARY KEY (\"message_id\", \"sender_id\", \"emoji\"));"
+        }
+      ]
+    },
+    {
+      "name": "group_members",
+      "sql": [
+        {
+          "dialect": "sqlite",
+          "sql": "CREATE TABLE IF NOT EXISTS \"group_members\" (\"group_id\" TEXT NOT NULL REFERENCES \"groups\" (group_id) ON DELETE CASCADE, \"contact_id\" INTEGER NOT NULL REFERENCES contacts (user_id), \"member_state\" TEXT NULL, \"group_public_key\" BLOB NULL, \"last_chat_opened\" INTEGER NULL, \"last_type_indicator\" INTEGER NULL, \"last_message\" INTEGER NULL, \"created_at\" INTEGER NOT NULL DEFAULT (CAST(strftime('%s', CURRENT_TIMESTAMP) AS INTEGER)), PRIMARY KEY (\"group_id\", \"contact_id\"));"
+        }
+      ]
+    },
+    {
+      "name": "receipts",
+      "sql": [
+        {
+          "dialect": "sqlite",
+          "sql": "CREATE TABLE IF NOT EXISTS \"receipts\" (\"receipt_id\" TEXT NOT NULL, \"contact_id\" INTEGER NOT NULL REFERENCES contacts (user_id) ON DELETE CASCADE, \"message_id\" TEXT NULL REFERENCES messages (message_id) ON DELETE CASCADE, \"message\" BLOB NOT NULL, \"contact_will_sends_receipt\" INTEGER NOT NULL DEFAULT 1 CHECK (\"contact_will_sends_receipt\" IN (0, 1)), \"will_be_retried_by_media_upload\" INTEGER NOT NULL DEFAULT 0 CHECK (\"will_be_retried_by_media_upload\" IN (0, 1)), \"mark_for_retry\" INTEGER NULL, \"mark_for_retry_after_accepted\" INTEGER NULL, \"ack_by_server_at\" INTEGER NULL, \"retry_count\" INTEGER NOT NULL DEFAULT 0, \"last_retry\" INTEGER NULL, \"created_at\" INTEGER NOT NULL DEFAULT (CAST(strftime('%s', CURRENT_TIMESTAMP) AS INTEGER)), PRIMARY KEY (\"receipt_id\"));"
+        }
+      ]
+    },
+    {
+      "name": "received_receipts",
+      "sql": [
+        {
+          "dialect": "sqlite",
+          "sql": "CREATE TABLE IF NOT EXISTS \"received_receipts\" (\"receipt_id\" TEXT NOT NULL, \"created_at\" INTEGER NOT NULL DEFAULT (CAST(strftime('%s', CURRENT_TIMESTAMP) AS INTEGER)), PRIMARY KEY (\"receipt_id\"));"
+        }
+      ]
+    },
+    {
+      "name": "signal_identity_key_stores",
+      "sql": [
+        {
+          "dialect": "sqlite",
+          "sql": "CREATE TABLE IF NOT EXISTS \"signal_identity_key_stores\" (\"device_id\" INTEGER NOT NULL, \"name\" TEXT NOT NULL, \"identity_key\" BLOB NOT NULL, \"created_at\" INTEGER NOT NULL DEFAULT (CAST(strftime('%s', CURRENT_TIMESTAMP) AS INTEGER)), PRIMARY KEY (\"device_id\", \"name\"));"
+        }
+      ]
+    },
+    {
+      "name": "signal_pre_key_stores",
+      "sql": [
+        {
+          "dialect": "sqlite",
+          "sql": "CREATE TABLE IF NOT EXISTS \"signal_pre_key_stores\" (\"pre_key_id\" INTEGER NOT NULL, \"pre_key\" BLOB NOT NULL, \"created_at\" INTEGER NOT NULL DEFAULT (CAST(strftime('%s', CURRENT_TIMESTAMP) AS INTEGER)), PRIMARY KEY (\"pre_key_id\"));"
+        }
+      ]
+    },
+    {
+      "name": "signal_sender_key_stores",
+      "sql": [
+        {
+          "dialect": "sqlite",
+          "sql": "CREATE TABLE IF NOT EXISTS \"signal_sender_key_stores\" (\"sender_key_name\" TEXT NOT NULL, \"sender_key\" BLOB NOT NULL, PRIMARY KEY (\"sender_key_name\"));"
+        }
+      ]
+    },
+    {
+      "name": "signal_session_stores",
+      "sql": [
+        {
+          "dialect": "sqlite",
+          "sql": "CREATE TABLE IF NOT EXISTS \"signal_session_stores\" (\"device_id\" INTEGER NOT NULL, \"name\" TEXT NOT NULL, \"session_record\" BLOB NOT NULL, \"created_at\" INTEGER NOT NULL DEFAULT (CAST(strftime('%s', CURRENT_TIMESTAMP) AS INTEGER)), PRIMARY KEY (\"device_id\", \"name\"));"
+        }
+      ]
+    },
+    {
+      "name": "message_actions",
+      "sql": [
+        {
+          "dialect": "sqlite",
+          "sql": "CREATE TABLE IF NOT EXISTS \"message_actions\" (\"message_id\" TEXT NOT NULL REFERENCES messages (message_id) ON DELETE CASCADE, \"contact_id\" INTEGER NOT NULL REFERENCES contacts (user_id) ON DELETE CASCADE, \"type\" TEXT NOT NULL, \"action_at\" INTEGER NOT NULL DEFAULT (CAST(strftime('%s', CURRENT_TIMESTAMP) AS INTEGER)), PRIMARY KEY (\"message_id\", \"contact_id\", \"type\"));"
+        }
+      ]
+    },
+    {
+      "name": "group_histories",
+      "sql": [
+        {
+          "dialect": "sqlite",
+          "sql": "CREATE TABLE IF NOT EXISTS \"group_histories\" (\"group_history_id\" TEXT NOT NULL, \"group_id\" TEXT NOT NULL REFERENCES \"groups\" (group_id) ON DELETE CASCADE, \"contact_id\" INTEGER NULL REFERENCES contacts (user_id), \"affected_contact_id\" INTEGER NULL, \"old_group_name\" TEXT NULL, \"new_group_name\" TEXT NULL, \"new_delete_messages_after_milliseconds\" INTEGER NULL, \"type\" TEXT NOT NULL, \"action_at\" INTEGER NOT NULL DEFAULT (CAST(strftime('%s', CURRENT_TIMESTAMP) AS INTEGER)), PRIMARY KEY (\"group_history_id\"));"
+        }
+      ]
+    },
+    {
+      "name": "key_verifications",
+      "sql": [
+        {
+          "dialect": "sqlite",
+          "sql": "CREATE TABLE IF NOT EXISTS \"key_verifications\" (\"verification_id\" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, \"contact_id\" INTEGER NOT NULL REFERENCES contacts (user_id) ON DELETE CASCADE, \"type\" TEXT NOT NULL, \"created_at\" INTEGER NOT NULL DEFAULT (CAST(strftime('%s', CURRENT_TIMESTAMP) AS INTEGER)));"
+        }
+      ]
+    },
+    {
+      "name": "verification_tokens",
+      "sql": [
+        {
+          "dialect": "sqlite",
+          "sql": "CREATE TABLE IF NOT EXISTS \"verification_tokens\" (\"token_id\" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, \"token\" BLOB NOT NULL, \"created_at\" INTEGER NOT NULL DEFAULT (CAST(strftime('%s', CURRENT_TIMESTAMP) AS INTEGER)));"
+        }
+      ]
+    },
+    {
+      "name": "user_discovery_announced_users",
+      "sql": [
+        {
+          "dialect": "sqlite",
+          "sql": "CREATE TABLE IF NOT EXISTS \"user_discovery_announced_users\" (\"announced_user_id\" INTEGER NOT NULL, \"announced_public_key\" BLOB NOT NULL, \"public_id\" INTEGER NOT NULL UNIQUE, \"username\" TEXT NULL, \"was_shown_to_the_user\" INTEGER NOT NULL DEFAULT 0 CHECK (\"was_shown_to_the_user\" IN (0, 1)), \"is_hidden\" INTEGER NOT NULL DEFAULT 0 CHECK (\"is_hidden\" IN (0, 1)), PRIMARY KEY (\"announced_user_id\"));"
+        }
+      ]
+    },
+    {
+      "name": "user_discovery_user_relations",
+      "sql": [
+        {
+          "dialect": "sqlite",
+          "sql": "CREATE TABLE IF NOT EXISTS \"user_discovery_user_relations\" (\"announced_user_id\" INTEGER NOT NULL REFERENCES user_discovery_announced_users (announced_user_id) ON DELETE CASCADE, \"from_contact_id\" INTEGER NOT NULL REFERENCES contacts (user_id) ON DELETE CASCADE, \"public_key_verified_timestamp\" INTEGER NULL, PRIMARY KEY (\"announced_user_id\", \"from_contact_id\"));"
+        }
+      ]
+    },
+    {
+      "name": "user_discovery_other_promotions",
+      "sql": [
+        {
+          "dialect": "sqlite",
+          "sql": "CREATE TABLE IF NOT EXISTS \"user_discovery_other_promotions\" (\"from_contact_id\" INTEGER NOT NULL REFERENCES contacts (user_id) ON DELETE CASCADE, \"promotion_id\" INTEGER NOT NULL, \"public_id\" INTEGER NOT NULL, \"threshold\" INTEGER NOT NULL, \"announcement_share\" BLOB NOT NULL, \"public_key_verified_timestamp\" INTEGER NULL, PRIMARY KEY (\"from_contact_id\", \"public_id\"));"
+        }
+      ]
+    },
+    {
+      "name": "user_discovery_own_promotions",
+      "sql": [
+        {
+          "dialect": "sqlite",
+          "sql": "CREATE TABLE IF NOT EXISTS \"user_discovery_own_promotions\" (\"version_id\" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, \"contact_id\" INTEGER NOT NULL REFERENCES contacts (user_id) ON DELETE CASCADE, \"promotion\" BLOB NOT NULL);"
+        }
+      ]
+    },
+    {
+      "name": "user_discovery_shares",
+      "sql": [
+        {
+          "dialect": "sqlite",
+          "sql": "CREATE TABLE IF NOT EXISTS \"user_discovery_shares\" (\"share_id\" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, \"share\" BLOB NOT NULL, \"contact_id\" INTEGER NULL REFERENCES contacts (user_id) ON DELETE CASCADE);"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/lib/src/database/signal/connect_identity_key_store.dart b/lib/src/database/signal/signal_identity_key_store.dart
similarity index 93%
rename from lib/src/database/signal/connect_identity_key_store.dart
rename to lib/src/database/signal/signal_identity_key_store.dart
index 2fa8ce38..ed917656 100644
--- a/lib/src/database/signal/connect_identity_key_store.dart
+++ b/lib/src/database/signal/signal_identity_key_store.dart
@@ -1,11 +1,11 @@
 import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
 import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 
-class ConnectIdentityKeyStore extends IdentityKeyStore {
-  ConnectIdentityKeyStore(this.identityKeyPair, this.localRegistrationId);
+class SignalIdentityKeyStore extends IdentityKeyStore {
+  SignalIdentityKeyStore(this.identityKeyPair, this.localRegistrationId);
 
   final IdentityKeyPair identityKeyPair;
   final int localRegistrationId;
diff --git a/lib/src/database/signal/connect_pre_key_store.dart b/lib/src/database/signal/signal_pre_key_store.dart
similarity index 94%
rename from lib/src/database/signal/connect_pre_key_store.dart
rename to lib/src/database/signal/signal_pre_key_store.dart
index 2a49b926..10ae75c7 100644
--- a/lib/src/database/signal/connect_pre_key_store.dart
+++ b/lib/src/database/signal/signal_pre_key_store.dart
@@ -1,10 +1,10 @@
 import 'package:drift/drift.dart';
 import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/utils/log.dart';
 
-class ConnectPreKeyStore extends PreKeyStore {
+class SignalPreKeyStore extends PreKeyStore {
   @override
   Future<bool> containsPreKey(int preKeyId) async {
     final preKeyRecord = await (twonlyDB.select(
diff --git a/lib/src/database/signal/connect_signal_protocol_store.dart b/lib/src/database/signal/signal_protocol_store.dart
similarity index 83%
rename from lib/src/database/signal/connect_signal_protocol_store.dart
rename to lib/src/database/signal/signal_protocol_store.dart
index ea07739f..0c517037 100644
--- a/lib/src/database/signal/connect_signal_protocol_store.dart
+++ b/lib/src/database/signal/signal_protocol_store.dart
@@ -1,23 +1,23 @@
 import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
-import 'package:twonly/src/database/signal/connect_identity_key_store.dart';
-import 'package:twonly/src/database/signal/connect_pre_key_store.dart';
-import 'package:twonly/src/database/signal/connect_session_store.dart';
-import 'package:twonly/src/database/signal/connect_signed_pre_key_store.dart';
+import 'package:twonly/src/database/signal/signal_identity_key_store.dart';
+import 'package:twonly/src/database/signal/signal_pre_key_store.dart';
+import 'package:twonly/src/database/signal/signal_session_store.dart';
+import 'package:twonly/src/database/signal/signal_signed_pre_key_store.dart';
 
-class ConnectSignalProtocolStore implements SignalProtocolStore {
-  ConnectSignalProtocolStore(
+class SignalSignalProtocolStore implements SignalProtocolStore {
+  SignalSignalProtocolStore(
     IdentityKeyPair identityKeyPair,
     int registrationId,
   ) {
-    _identityKeyStore = ConnectIdentityKeyStore(
+    _identityKeyStore = SignalIdentityKeyStore(
       identityKeyPair,
       registrationId,
     );
   }
 
-  final preKeyStore = ConnectPreKeyStore();
-  final sessionStore = ConnectSessionStore();
-  final signedPreKeyStore = ConnectSignedPreKeyStore();
+  final preKeyStore = SignalPreKeyStore();
+  final sessionStore = SignalSessionStore();
+  final signedPreKeyStore = SignalSignedPreKeyStore();
 
   late IdentityKeyStore _identityKeyStore;
 
diff --git a/lib/src/database/signal/connect_sender_key_store.dart b/lib/src/database/signal/signal_sender_key_store.dart
similarity index 91%
rename from lib/src/database/signal/connect_sender_key_store.dart
rename to lib/src/database/signal/signal_sender_key_store.dart
index c637f880..04e082bc 100644
--- a/lib/src/database/signal/connect_sender_key_store.dart
+++ b/lib/src/database/signal/signal_sender_key_store.dart
@@ -1,9 +1,9 @@
 import 'package:drift/drift.dart';
 import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 
-class ConnectSenderKeyStore extends SenderKeyStore {
+class SignalSenderKeyStore extends SenderKeyStore {
   @override
   Future<SenderKeyRecord> loadSenderKey(SenderKeyName senderKeyName) async {
     final identity =
diff --git a/lib/src/database/signal/connect_session_store.dart b/lib/src/database/signal/signal_session_store.dart
similarity index 96%
rename from lib/src/database/signal/connect_session_store.dart
rename to lib/src/database/signal/signal_session_store.dart
index 92208e39..fce145e4 100644
--- a/lib/src/database/signal/connect_session_store.dart
+++ b/lib/src/database/signal/signal_session_store.dart
@@ -1,9 +1,9 @@
 import 'package:drift/drift.dart';
 import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 
-class ConnectSessionStore extends SessionStore {
+class SignalSessionStore extends SessionStore {
   @override
   Future<bool> containsSession(SignalProtocolAddress address) async {
     final sessions =
diff --git a/lib/src/database/signal/connect_signed_pre_key_store.dart b/lib/src/database/signal/signal_signed_pre_key_store.dart
similarity index 85%
rename from lib/src/database/signal/connect_signed_pre_key_store.dart
rename to lib/src/database/signal/signal_signed_pre_key_store.dart
index 91dcc5d0..5017230c 100644
--- a/lib/src/database/signal/connect_signed_pre_key_store.dart
+++ b/lib/src/database/signal/signal_signed_pre_key_store.dart
@@ -1,14 +1,14 @@
 import 'dart:collection';
 import 'dart:convert';
 import 'dart:typed_data';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
-import 'package:twonly/src/constants/secure_storage_keys.dart';
 
-class ConnectSignedPreKeyStore extends SignedPreKeyStore {
+import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
+import 'package:twonly/src/constants/secure_storage.keys.dart';
+import 'package:twonly/src/utils/secure_storage.dart';
+
+class SignalSignedPreKeyStore extends SignedPreKeyStore {
   Future<HashMap<int, Uint8List>> getStore() async {
-    const storage = FlutterSecureStorage();
-    final storeSerialized = await storage.read(
+    final storeSerialized = await SecureStorage.instance.read(
       key: SecureStorageKeys.signalSignedPreKey,
     );
     final store = HashMap<int, Uint8List>();
@@ -24,13 +24,12 @@ class ConnectSignedPreKeyStore extends SignedPreKeyStore {
   }
 
   Future<void> safeStore(HashMap<int, Uint8List> store) async {
-    const storage = FlutterSecureStorage();
     final storeHashMap = <List<dynamic>>[];
     for (final item in store.entries) {
       storeHashMap.add([item.key, base64Encode(item.value)]);
     }
     final storeSerialized = json.encode(storeHashMap);
-    await storage.write(
+    await SecureStorage.instance.write(
       key: SecureStorageKeys.signalSignedPreKey,
       value: storeSerialized,
     );
diff --git a/lib/src/database/tables/contacts.table.dart b/lib/src/database/tables/contacts.table.dart
index a427fad5..7388d672 100644
--- a/lib/src/database/tables/contacts.table.dart
+++ b/lib/src/database/tables/contacts.table.dart
@@ -1,5 +1,6 @@
 import 'package:drift/drift.dart';
 
+@DataClassName('Contact')
 class Contacts extends Table {
   IntColumn get userId => integer()();
 
@@ -22,6 +23,46 @@ class Contacts extends Table {
 
   DateTimeColumn get createdAt => dateTime().withDefault(currentDateAndTime)();
 
+  // contact_versions: HashMap<UserID, Vec<u8>>,
+  BlobColumn get userDiscoveryVersion => blob().nullable()();
+
+  BoolColumn get userDiscoveryExcluded =>
+      boolean().withDefault(const Constant(false))();
+
+  BoolColumn get userDiscoveryManualApproved =>
+      boolean().nullable().withDefault(const Constant(false))();
+
+  IntColumn get mediaSendCounter => integer().withDefault(const Constant(0))();
+  IntColumn get mediaReceivedCounter =>
+      integer().withDefault(const Constant(0))();
+
   @override
   Set<Column> get primaryKey => {userId};
 }
+
+enum VerificationType {
+  migratedFromOldVersion,
+  qrScanned,
+  link,
+  secretQrToken,
+  contactSharedByVerified,
+}
+
+@DataClassName('KeyVerification')
+class KeyVerifications extends Table {
+  IntColumn get verificationId => integer().autoIncrement()();
+  IntColumn get contactId => integer().references(
+    Contacts,
+    #userId,
+    onDelete: KeyAction.cascade,
+  )();
+  TextColumn get type => textEnum<VerificationType>()();
+  DateTimeColumn get createdAt => dateTime().withDefault(currentDateAndTime)();
+}
+
+@DataClassName('VerificationToken')
+class VerificationTokens extends Table {
+  IntColumn get tokenId => integer().autoIncrement()();
+  BlobColumn get token => blob()();
+  DateTimeColumn get createdAt => dateTime().withDefault(currentDateAndTime)();
+}
diff --git a/lib/src/database/tables/user_discovery.table.dart b/lib/src/database/tables/user_discovery.table.dart
new file mode 100644
index 00000000..d4cdb6ac
--- /dev/null
+++ b/lib/src/database/tables/user_discovery.table.dart
@@ -0,0 +1,87 @@
+import 'package:drift/drift.dart';
+import 'package:twonly/src/database/tables/contacts.table.dart';
+
+// config: Option<Vec<u8>>,
+
+// announced_users: HashMap<AnnouncedUser, Vec<(UserID, Option<i64>)>>,
+@DataClassName('UserDiscoveryAnnouncedUser')
+class UserDiscoveryAnnouncedUsers extends Table {
+  IntColumn get announcedUserId => integer()();
+  BlobColumn get announcedPublicKey => blob()();
+  IntColumn get publicId => integer().unique()();
+
+  // When a new user got announced this data will be requested without adding the users to the contacts...
+  TextColumn get username => text().nullable()();
+
+  BoolColumn get wasShownToTheUser =>
+      boolean().withDefault(const Constant(false))();
+  BoolColumn get isHidden => boolean().withDefault(const Constant(false))();
+
+  @override
+  Set<Column> get primaryKey => {announcedUserId};
+}
+
+// announced_users: HashMap<AnnouncedUser, Vec<(UserID, Option<i64>)>>,
+@DataClassName('UserDiscoveryUserRelation')
+class UserDiscoveryUserRelations extends Table {
+  IntColumn get announcedUserId => integer().references(
+    UserDiscoveryAnnouncedUsers,
+    #announcedUserId,
+    onDelete: KeyAction.cascade,
+  )();
+
+  IntColumn get fromContactId => integer().references(
+    Contacts,
+    #userId,
+    onDelete: KeyAction.cascade,
+  )();
+
+  DateTimeColumn get publicKeyVerifiedTimestamp => dateTime().nullable()();
+
+  @override
+  Set<Column> get primaryKey => {announcedUserId, fromContactId};
+}
+
+// own_promotions: Vec<(UserID, Vec<u8>)>,
+@DataClassName('UserDiscoveryOwnPromotion')
+class UserDiscoveryOwnPromotions extends Table {
+  IntColumn get versionId => integer().autoIncrement()();
+  IntColumn get contactId => integer().references(
+    Contacts,
+    #userId,
+    onDelete: KeyAction.cascade,
+  )();
+  BlobColumn get promotion => blob()();
+}
+
+// other_promotions: Vec<OtherPromotion>,
+@DataClassName('UserDiscoveryOtherPromotion')
+class UserDiscoveryOtherPromotions extends Table {
+  IntColumn get fromContactId => integer().references(
+    Contacts,
+    #userId,
+    onDelete: KeyAction.cascade,
+  )();
+
+  IntColumn get promotionId => integer()();
+  IntColumn get publicId => integer()();
+  IntColumn get threshold => integer()();
+  BlobColumn get announcementShare => blob()();
+  DateTimeColumn get publicKeyVerifiedTimestamp => dateTime().nullable()();
+
+  @override
+  Set<Column> get primaryKey => {fromContactId, publicId};
+}
+
+// unused_shares: Vec<Vec<u8>>,
+// used_shares: HashMap<UserID, Vec<u8>>,
+@DataClassName('UserDiscoveryShare')
+class UserDiscoveryShares extends Table {
+  IntColumn get shareId => integer().autoIncrement()();
+  BlobColumn get share => blob()();
+  IntColumn get contactId => integer().nullable().references(
+    Contacts,
+    #userId,
+    onDelete: KeyAction.cascade,
+  )();
+}
diff --git a/lib/src/database/twonly.db.dart b/lib/src/database/twonly.db.dart
index 9431a584..a53703bb 100644
--- a/lib/src/database/twonly.db.dart
+++ b/lib/src/database/twonly.db.dart
@@ -5,10 +5,12 @@ import 'package:drift_flutter/drift_flutter.dart'
 import 'package:path_provider/path_provider.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/daos/groups.dao.dart';
+import 'package:twonly/src/database/daos/key_verification.dao.dart';
 import 'package:twonly/src/database/daos/mediafiles.dao.dart';
 import 'package:twonly/src/database/daos/messages.dao.dart';
 import 'package:twonly/src/database/daos/reactions.dao.dart';
 import 'package:twonly/src/database/daos/receipts.dao.dart';
+import 'package:twonly/src/database/daos/user_discovery.dao.dart';
 import 'package:twonly/src/database/tables/contacts.table.dart';
 import 'package:twonly/src/database/tables/groups.table.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
@@ -19,6 +21,7 @@ import 'package:twonly/src/database/tables/signal_identity_key_store.table.dart'
 import 'package:twonly/src/database/tables/signal_pre_key_store.table.dart';
 import 'package:twonly/src/database/tables/signal_sender_key_store.table.dart';
 import 'package:twonly/src/database/tables/signal_session_store.table.dart';
+import 'package:twonly/src/database/tables/user_discovery.table.dart';
 import 'package:twonly/src/database/twonly.db.steps.dart';
 import 'package:twonly/src/utils/log.dart';
 
@@ -42,6 +45,13 @@ part 'twonly.db.g.dart';
     SignalSessionStores,
     MessageActions,
     GroupHistories,
+    KeyVerifications,
+    VerificationTokens,
+    UserDiscoveryAnnouncedUsers,
+    UserDiscoveryUserRelations,
+    UserDiscoveryOtherPromotions,
+    UserDiscoveryOwnPromotions,
+    UserDiscoveryShares,
   ],
   daos: [
     MessagesDao,
@@ -50,6 +60,8 @@ part 'twonly.db.g.dart';
     GroupsDao,
     ReactionsDao,
     MediaFilesDao,
+    UserDiscoveryDao,
+    KeyVerificationDao,
   ],
 )
 class TwonlyDB extends _$TwonlyDB {
@@ -62,14 +74,19 @@ class TwonlyDB extends _$TwonlyDB {
   TwonlyDB.forTesting(DatabaseConnection super.connection);
 
   @override
-  int get schemaVersion => 11;
+  int get schemaVersion => 12;
 
   static QueryExecutor _openConnection() {
     return driftDatabase(
       name: 'twonly',
-      native: const DriftNativeOptions(
+      native: DriftNativeOptions(
         databaseDirectory: getApplicationSupportDirectory,
         shareAcrossIsolates: true,
+        setup: (rawDb) {
+          rawDb
+            ..execute('PRAGMA journal_mode=WAL;')
+            ..execute('PRAGMA busy_timeout=5000;');
+        },
       ),
     );
   }
@@ -93,7 +110,6 @@ class TwonlyDB extends _$TwonlyDB {
           },
           from3To4: (m, schema) async {
             await m.alterTable(
-              // ignore: experimental_member_use
               TableMigration(
                 schema.groupHistories,
                 columnTransformer: {
@@ -126,9 +142,7 @@ class TwonlyDB extends _$TwonlyDB {
             await m.deleteTable('signal_contact_pre_keys');
             await m.deleteTable('signal_contact_signed_pre_keys');
             // For message_actions
-            // ignore: experimental_member_use
             await m.alterTable(TableMigration(schema.messageHistories));
-            // ignore: experimental_member_use
             await m.alterTable(TableMigration(schema.messageActions));
           },
           from8To9: (m, schema) async {
@@ -153,6 +167,25 @@ class TwonlyDB extends _$TwonlyDB {
               schema.groupMembers.lastTypeIndicator,
             );
           },
+          from11To12: (m, schema) async {
+            await m.createTable(schema.verificationTokens);
+            await m.createTable(schema.keyVerifications);
+            await m.createTable(schema.userDiscoveryAnnouncedUsers);
+            await m.createTable(schema.userDiscoveryOwnPromotions);
+            await m.createTable(schema.userDiscoveryOtherPromotions);
+            await m.createTable(schema.userDiscoveryShares);
+            await m.createTable(schema.userDiscoveryUserRelations);
+            final columns = [
+              schema.contacts.userDiscoveryVersion,
+              schema.contacts.mediaReceivedCounter,
+              schema.contacts.mediaSendCounter,
+              schema.contacts.userDiscoveryExcluded,
+              schema.contacts.userDiscoveryManualApproved,
+            ];
+            for (final column in columns) {
+              await m.addColumn(schema.contacts, column);
+            }
+          },
         )(m, from, to);
       },
     );
diff --git a/lib/src/database/twonly.db.g.dart b/lib/src/database/twonly.db.g.dart
index 0e860ed5..7a2f7f69 100644
--- a/lib/src/database/twonly.db.g.dart
+++ b/lib/src/database/twonly.db.g.dart
@@ -174,6 +174,70 @@ class $ContactsTable extends Contacts with TableInfo<$ContactsTable, Contact> {
     requiredDuringInsert: false,
     defaultValue: currentDateAndTime,
   );
+  static const VerificationMeta _userDiscoveryVersionMeta =
+      const VerificationMeta('userDiscoveryVersion');
+  @override
+  late final GeneratedColumn<Uint8List> userDiscoveryVersion =
+      GeneratedColumn<Uint8List>(
+        'user_discovery_version',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+      );
+  static const VerificationMeta _userDiscoveryExcludedMeta =
+      const VerificationMeta('userDiscoveryExcluded');
+  @override
+  late final GeneratedColumn<bool> userDiscoveryExcluded =
+      GeneratedColumn<bool>(
+        'user_discovery_excluded',
+        aliasedName,
+        false,
+        type: DriftSqlType.bool,
+        requiredDuringInsert: false,
+        defaultConstraints: GeneratedColumn.constraintIsAlways(
+          'CHECK ("user_discovery_excluded" IN (0, 1))',
+        ),
+        defaultValue: const Constant(false),
+      );
+  static const VerificationMeta _userDiscoveryManualApprovedMeta =
+      const VerificationMeta('userDiscoveryManualApproved');
+  @override
+  late final GeneratedColumn<bool> userDiscoveryManualApproved =
+      GeneratedColumn<bool>(
+        'user_discovery_manual_approved',
+        aliasedName,
+        true,
+        type: DriftSqlType.bool,
+        requiredDuringInsert: false,
+        defaultConstraints: GeneratedColumn.constraintIsAlways(
+          'CHECK ("user_discovery_manual_approved" IN (0, 1))',
+        ),
+        defaultValue: const Constant(false),
+      );
+  static const VerificationMeta _mediaSendCounterMeta = const VerificationMeta(
+    'mediaSendCounter',
+  );
+  @override
+  late final GeneratedColumn<int> mediaSendCounter = GeneratedColumn<int>(
+    'media_send_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultValue: const Constant(0),
+  );
+  static const VerificationMeta _mediaReceivedCounterMeta =
+      const VerificationMeta('mediaReceivedCounter');
+  @override
+  late final GeneratedColumn<int> mediaReceivedCounter = GeneratedColumn<int>(
+    'media_received_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultValue: const Constant(0),
+  );
   @override
   List<GeneratedColumn> get $columns => [
     userId,
@@ -189,6 +253,11 @@ class $ContactsTable extends Contacts with TableInfo<$ContactsTable, Contact> {
     verified,
     accountDeleted,
     createdAt,
+    userDiscoveryVersion,
+    userDiscoveryExcluded,
+    userDiscoveryManualApproved,
+    mediaSendCounter,
+    mediaReceivedCounter,
   ];
   @override
   String get aliasedName => _alias ?? actualTableName;
@@ -297,6 +366,51 @@ class $ContactsTable extends Contacts with TableInfo<$ContactsTable, Contact> {
         createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta),
       );
     }
+    if (data.containsKey('user_discovery_version')) {
+      context.handle(
+        _userDiscoveryVersionMeta,
+        userDiscoveryVersion.isAcceptableOrUnknown(
+          data['user_discovery_version']!,
+          _userDiscoveryVersionMeta,
+        ),
+      );
+    }
+    if (data.containsKey('user_discovery_excluded')) {
+      context.handle(
+        _userDiscoveryExcludedMeta,
+        userDiscoveryExcluded.isAcceptableOrUnknown(
+          data['user_discovery_excluded']!,
+          _userDiscoveryExcludedMeta,
+        ),
+      );
+    }
+    if (data.containsKey('user_discovery_manual_approved')) {
+      context.handle(
+        _userDiscoveryManualApprovedMeta,
+        userDiscoveryManualApproved.isAcceptableOrUnknown(
+          data['user_discovery_manual_approved']!,
+          _userDiscoveryManualApprovedMeta,
+        ),
+      );
+    }
+    if (data.containsKey('media_send_counter')) {
+      context.handle(
+        _mediaSendCounterMeta,
+        mediaSendCounter.isAcceptableOrUnknown(
+          data['media_send_counter']!,
+          _mediaSendCounterMeta,
+        ),
+      );
+    }
+    if (data.containsKey('media_received_counter')) {
+      context.handle(
+        _mediaReceivedCounterMeta,
+        mediaReceivedCounter.isAcceptableOrUnknown(
+          data['media_received_counter']!,
+          _mediaReceivedCounterMeta,
+        ),
+      );
+    }
     return context;
   }
 
@@ -358,6 +472,26 @@ class $ContactsTable extends Contacts with TableInfo<$ContactsTable, Contact> {
         DriftSqlType.dateTime,
         data['${effectivePrefix}created_at'],
       )!,
+      userDiscoveryVersion: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}user_discovery_version'],
+      ),
+      userDiscoveryExcluded: attachedDatabase.typeMapping.read(
+        DriftSqlType.bool,
+        data['${effectivePrefix}user_discovery_excluded'],
+      )!,
+      userDiscoveryManualApproved: attachedDatabase.typeMapping.read(
+        DriftSqlType.bool,
+        data['${effectivePrefix}user_discovery_manual_approved'],
+      ),
+      mediaSendCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}media_send_counter'],
+      )!,
+      mediaReceivedCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}media_received_counter'],
+      )!,
     );
   }
 
@@ -381,6 +515,11 @@ class Contact extends DataClass implements Insertable<Contact> {
   final bool verified;
   final bool accountDeleted;
   final DateTime createdAt;
+  final Uint8List? userDiscoveryVersion;
+  final bool userDiscoveryExcluded;
+  final bool? userDiscoveryManualApproved;
+  final int mediaSendCounter;
+  final int mediaReceivedCounter;
   const Contact({
     required this.userId,
     required this.username,
@@ -395,6 +534,11 @@ class Contact extends DataClass implements Insertable<Contact> {
     required this.verified,
     required this.accountDeleted,
     required this.createdAt,
+    this.userDiscoveryVersion,
+    required this.userDiscoveryExcluded,
+    this.userDiscoveryManualApproved,
+    required this.mediaSendCounter,
+    required this.mediaReceivedCounter,
   });
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
@@ -418,6 +562,17 @@ class Contact extends DataClass implements Insertable<Contact> {
     map['verified'] = Variable<bool>(verified);
     map['account_deleted'] = Variable<bool>(accountDeleted);
     map['created_at'] = Variable<DateTime>(createdAt);
+    if (!nullToAbsent || userDiscoveryVersion != null) {
+      map['user_discovery_version'] = Variable<Uint8List>(userDiscoveryVersion);
+    }
+    map['user_discovery_excluded'] = Variable<bool>(userDiscoveryExcluded);
+    if (!nullToAbsent || userDiscoveryManualApproved != null) {
+      map['user_discovery_manual_approved'] = Variable<bool>(
+        userDiscoveryManualApproved,
+      );
+    }
+    map['media_send_counter'] = Variable<int>(mediaSendCounter);
+    map['media_received_counter'] = Variable<int>(mediaReceivedCounter);
     return map;
   }
 
@@ -442,6 +597,16 @@ class Contact extends DataClass implements Insertable<Contact> {
       verified: Value(verified),
       accountDeleted: Value(accountDeleted),
       createdAt: Value(createdAt),
+      userDiscoveryVersion: userDiscoveryVersion == null && nullToAbsent
+          ? const Value.absent()
+          : Value(userDiscoveryVersion),
+      userDiscoveryExcluded: Value(userDiscoveryExcluded),
+      userDiscoveryManualApproved:
+          userDiscoveryManualApproved == null && nullToAbsent
+          ? const Value.absent()
+          : Value(userDiscoveryManualApproved),
+      mediaSendCounter: Value(mediaSendCounter),
+      mediaReceivedCounter: Value(mediaReceivedCounter),
     );
   }
 
@@ -468,6 +633,19 @@ class Contact extends DataClass implements Insertable<Contact> {
       verified: serializer.fromJson<bool>(json['verified']),
       accountDeleted: serializer.fromJson<bool>(json['accountDeleted']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
+      userDiscoveryVersion: serializer.fromJson<Uint8List?>(
+        json['userDiscoveryVersion'],
+      ),
+      userDiscoveryExcluded: serializer.fromJson<bool>(
+        json['userDiscoveryExcluded'],
+      ),
+      userDiscoveryManualApproved: serializer.fromJson<bool?>(
+        json['userDiscoveryManualApproved'],
+      ),
+      mediaSendCounter: serializer.fromJson<int>(json['mediaSendCounter']),
+      mediaReceivedCounter: serializer.fromJson<int>(
+        json['mediaReceivedCounter'],
+      ),
     );
   }
   @override
@@ -487,6 +665,15 @@ class Contact extends DataClass implements Insertable<Contact> {
       'verified': serializer.toJson<bool>(verified),
       'accountDeleted': serializer.toJson<bool>(accountDeleted),
       'createdAt': serializer.toJson<DateTime>(createdAt),
+      'userDiscoveryVersion': serializer.toJson<Uint8List?>(
+        userDiscoveryVersion,
+      ),
+      'userDiscoveryExcluded': serializer.toJson<bool>(userDiscoveryExcluded),
+      'userDiscoveryManualApproved': serializer.toJson<bool?>(
+        userDiscoveryManualApproved,
+      ),
+      'mediaSendCounter': serializer.toJson<int>(mediaSendCounter),
+      'mediaReceivedCounter': serializer.toJson<int>(mediaReceivedCounter),
     };
   }
 
@@ -504,6 +691,11 @@ class Contact extends DataClass implements Insertable<Contact> {
     bool? verified,
     bool? accountDeleted,
     DateTime? createdAt,
+    Value<Uint8List?> userDiscoveryVersion = const Value.absent(),
+    bool? userDiscoveryExcluded,
+    Value<bool?> userDiscoveryManualApproved = const Value.absent(),
+    int? mediaSendCounter,
+    int? mediaReceivedCounter,
   }) => Contact(
     userId: userId ?? this.userId,
     username: username ?? this.username,
@@ -520,6 +712,15 @@ class Contact extends DataClass implements Insertable<Contact> {
     verified: verified ?? this.verified,
     accountDeleted: accountDeleted ?? this.accountDeleted,
     createdAt: createdAt ?? this.createdAt,
+    userDiscoveryVersion: userDiscoveryVersion.present
+        ? userDiscoveryVersion.value
+        : this.userDiscoveryVersion,
+    userDiscoveryExcluded: userDiscoveryExcluded ?? this.userDiscoveryExcluded,
+    userDiscoveryManualApproved: userDiscoveryManualApproved.present
+        ? userDiscoveryManualApproved.value
+        : this.userDiscoveryManualApproved,
+    mediaSendCounter: mediaSendCounter ?? this.mediaSendCounter,
+    mediaReceivedCounter: mediaReceivedCounter ?? this.mediaReceivedCounter,
   );
   Contact copyWithCompanion(ContactsCompanion data) {
     return Contact(
@@ -546,6 +747,21 @@ class Contact extends DataClass implements Insertable<Contact> {
           ? data.accountDeleted.value
           : this.accountDeleted,
       createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      userDiscoveryVersion: data.userDiscoveryVersion.present
+          ? data.userDiscoveryVersion.value
+          : this.userDiscoveryVersion,
+      userDiscoveryExcluded: data.userDiscoveryExcluded.present
+          ? data.userDiscoveryExcluded.value
+          : this.userDiscoveryExcluded,
+      userDiscoveryManualApproved: data.userDiscoveryManualApproved.present
+          ? data.userDiscoveryManualApproved.value
+          : this.userDiscoveryManualApproved,
+      mediaSendCounter: data.mediaSendCounter.present
+          ? data.mediaSendCounter.value
+          : this.mediaSendCounter,
+      mediaReceivedCounter: data.mediaReceivedCounter.present
+          ? data.mediaReceivedCounter.value
+          : this.mediaReceivedCounter,
     );
   }
 
@@ -564,7 +780,12 @@ class Contact extends DataClass implements Insertable<Contact> {
           ..write('blocked: $blocked, ')
           ..write('verified: $verified, ')
           ..write('accountDeleted: $accountDeleted, ')
-          ..write('createdAt: $createdAt')
+          ..write('createdAt: $createdAt, ')
+          ..write('userDiscoveryVersion: $userDiscoveryVersion, ')
+          ..write('userDiscoveryExcluded: $userDiscoveryExcluded, ')
+          ..write('userDiscoveryManualApproved: $userDiscoveryManualApproved, ')
+          ..write('mediaSendCounter: $mediaSendCounter, ')
+          ..write('mediaReceivedCounter: $mediaReceivedCounter')
           ..write(')'))
         .toString();
   }
@@ -584,6 +805,11 @@ class Contact extends DataClass implements Insertable<Contact> {
     verified,
     accountDeleted,
     createdAt,
+    $driftBlobEquality.hash(userDiscoveryVersion),
+    userDiscoveryExcluded,
+    userDiscoveryManualApproved,
+    mediaSendCounter,
+    mediaReceivedCounter,
   );
   @override
   bool operator ==(Object other) =>
@@ -604,7 +830,16 @@ class Contact extends DataClass implements Insertable<Contact> {
           other.blocked == this.blocked &&
           other.verified == this.verified &&
           other.accountDeleted == this.accountDeleted &&
-          other.createdAt == this.createdAt);
+          other.createdAt == this.createdAt &&
+          $driftBlobEquality.equals(
+            other.userDiscoveryVersion,
+            this.userDiscoveryVersion,
+          ) &&
+          other.userDiscoveryExcluded == this.userDiscoveryExcluded &&
+          other.userDiscoveryManualApproved ==
+              this.userDiscoveryManualApproved &&
+          other.mediaSendCounter == this.mediaSendCounter &&
+          other.mediaReceivedCounter == this.mediaReceivedCounter);
 }
 
 class ContactsCompanion extends UpdateCompanion<Contact> {
@@ -621,6 +856,11 @@ class ContactsCompanion extends UpdateCompanion<Contact> {
   final Value<bool> verified;
   final Value<bool> accountDeleted;
   final Value<DateTime> createdAt;
+  final Value<Uint8List?> userDiscoveryVersion;
+  final Value<bool> userDiscoveryExcluded;
+  final Value<bool?> userDiscoveryManualApproved;
+  final Value<int> mediaSendCounter;
+  final Value<int> mediaReceivedCounter;
   const ContactsCompanion({
     this.userId = const Value.absent(),
     this.username = const Value.absent(),
@@ -635,6 +875,11 @@ class ContactsCompanion extends UpdateCompanion<Contact> {
     this.verified = const Value.absent(),
     this.accountDeleted = const Value.absent(),
     this.createdAt = const Value.absent(),
+    this.userDiscoveryVersion = const Value.absent(),
+    this.userDiscoveryExcluded = const Value.absent(),
+    this.userDiscoveryManualApproved = const Value.absent(),
+    this.mediaSendCounter = const Value.absent(),
+    this.mediaReceivedCounter = const Value.absent(),
   });
   ContactsCompanion.insert({
     this.userId = const Value.absent(),
@@ -650,6 +895,11 @@ class ContactsCompanion extends UpdateCompanion<Contact> {
     this.verified = const Value.absent(),
     this.accountDeleted = const Value.absent(),
     this.createdAt = const Value.absent(),
+    this.userDiscoveryVersion = const Value.absent(),
+    this.userDiscoveryExcluded = const Value.absent(),
+    this.userDiscoveryManualApproved = const Value.absent(),
+    this.mediaSendCounter = const Value.absent(),
+    this.mediaReceivedCounter = const Value.absent(),
   }) : username = Value(username);
   static Insertable<Contact> custom({
     Expression<int>? userId,
@@ -665,6 +915,11 @@ class ContactsCompanion extends UpdateCompanion<Contact> {
     Expression<bool>? verified,
     Expression<bool>? accountDeleted,
     Expression<DateTime>? createdAt,
+    Expression<Uint8List>? userDiscoveryVersion,
+    Expression<bool>? userDiscoveryExcluded,
+    Expression<bool>? userDiscoveryManualApproved,
+    Expression<int>? mediaSendCounter,
+    Expression<int>? mediaReceivedCounter,
   }) {
     return RawValuesInsertable({
       if (userId != null) 'user_id': userId,
@@ -682,6 +937,15 @@ class ContactsCompanion extends UpdateCompanion<Contact> {
       if (verified != null) 'verified': verified,
       if (accountDeleted != null) 'account_deleted': accountDeleted,
       if (createdAt != null) 'created_at': createdAt,
+      if (userDiscoveryVersion != null)
+        'user_discovery_version': userDiscoveryVersion,
+      if (userDiscoveryExcluded != null)
+        'user_discovery_excluded': userDiscoveryExcluded,
+      if (userDiscoveryManualApproved != null)
+        'user_discovery_manual_approved': userDiscoveryManualApproved,
+      if (mediaSendCounter != null) 'media_send_counter': mediaSendCounter,
+      if (mediaReceivedCounter != null)
+        'media_received_counter': mediaReceivedCounter,
     });
   }
 
@@ -699,6 +963,11 @@ class ContactsCompanion extends UpdateCompanion<Contact> {
     Value<bool>? verified,
     Value<bool>? accountDeleted,
     Value<DateTime>? createdAt,
+    Value<Uint8List?>? userDiscoveryVersion,
+    Value<bool>? userDiscoveryExcluded,
+    Value<bool?>? userDiscoveryManualApproved,
+    Value<int>? mediaSendCounter,
+    Value<int>? mediaReceivedCounter,
   }) {
     return ContactsCompanion(
       userId: userId ?? this.userId,
@@ -714,6 +983,13 @@ class ContactsCompanion extends UpdateCompanion<Contact> {
       verified: verified ?? this.verified,
       accountDeleted: accountDeleted ?? this.accountDeleted,
       createdAt: createdAt ?? this.createdAt,
+      userDiscoveryVersion: userDiscoveryVersion ?? this.userDiscoveryVersion,
+      userDiscoveryExcluded:
+          userDiscoveryExcluded ?? this.userDiscoveryExcluded,
+      userDiscoveryManualApproved:
+          userDiscoveryManualApproved ?? this.userDiscoveryManualApproved,
+      mediaSendCounter: mediaSendCounter ?? this.mediaSendCounter,
+      mediaReceivedCounter: mediaReceivedCounter ?? this.mediaReceivedCounter,
     );
   }
 
@@ -761,6 +1037,27 @@ class ContactsCompanion extends UpdateCompanion<Contact> {
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
     }
+    if (userDiscoveryVersion.present) {
+      map['user_discovery_version'] = Variable<Uint8List>(
+        userDiscoveryVersion.value,
+      );
+    }
+    if (userDiscoveryExcluded.present) {
+      map['user_discovery_excluded'] = Variable<bool>(
+        userDiscoveryExcluded.value,
+      );
+    }
+    if (userDiscoveryManualApproved.present) {
+      map['user_discovery_manual_approved'] = Variable<bool>(
+        userDiscoveryManualApproved.value,
+      );
+    }
+    if (mediaSendCounter.present) {
+      map['media_send_counter'] = Variable<int>(mediaSendCounter.value);
+    }
+    if (mediaReceivedCounter.present) {
+      map['media_received_counter'] = Variable<int>(mediaReceivedCounter.value);
+    }
     return map;
   }
 
@@ -779,7 +1076,12 @@ class ContactsCompanion extends UpdateCompanion<Contact> {
           ..write('blocked: $blocked, ')
           ..write('verified: $verified, ')
           ..write('accountDeleted: $accountDeleted, ')
-          ..write('createdAt: $createdAt')
+          ..write('createdAt: $createdAt, ')
+          ..write('userDiscoveryVersion: $userDiscoveryVersion, ')
+          ..write('userDiscoveryExcluded: $userDiscoveryExcluded, ')
+          ..write('userDiscoveryManualApproved: $userDiscoveryManualApproved, ')
+          ..write('mediaSendCounter: $mediaSendCounter, ')
+          ..write('mediaReceivedCounter: $mediaReceivedCounter')
           ..write(')'))
         .toString();
   }
@@ -8805,6 +9107,2355 @@ class GroupHistoriesCompanion extends UpdateCompanion<GroupHistory> {
   }
 }
 
+class $KeyVerificationsTable extends KeyVerifications
+    with TableInfo<$KeyVerificationsTable, KeyVerification> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $KeyVerificationsTable(this.attachedDatabase, [this._alias]);
+  static const VerificationMeta _verificationIdMeta = const VerificationMeta(
+    'verificationId',
+  );
+  @override
+  late final GeneratedColumn<int> verificationId = GeneratedColumn<int>(
+    'verification_id',
+    aliasedName,
+    false,
+    hasAutoIncrement: true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'PRIMARY KEY AUTOINCREMENT',
+    ),
+  );
+  static const VerificationMeta _contactIdMeta = const VerificationMeta(
+    'contactId',
+  );
+  @override
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES contacts (user_id) ON DELETE CASCADE',
+    ),
+  );
+  @override
+  late final GeneratedColumnWithTypeConverter<VerificationType, String> type =
+      GeneratedColumn<String>(
+        'type',
+        aliasedName,
+        false,
+        type: DriftSqlType.string,
+        requiredDuringInsert: true,
+      ).withConverter<VerificationType>($KeyVerificationsTable.$convertertype);
+  static const VerificationMeta _createdAtMeta = const VerificationMeta(
+    'createdAt',
+  );
+  @override
+  late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: false,
+    defaultValue: currentDateAndTime,
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    verificationId,
+    contactId,
+    type,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'key_verifications';
+  @override
+  VerificationContext validateIntegrity(
+    Insertable<KeyVerification> instance, {
+    bool isInserting = false,
+  }) {
+    final context = VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('verification_id')) {
+      context.handle(
+        _verificationIdMeta,
+        verificationId.isAcceptableOrUnknown(
+          data['verification_id']!,
+          _verificationIdMeta,
+        ),
+      );
+    }
+    if (data.containsKey('contact_id')) {
+      context.handle(
+        _contactIdMeta,
+        contactId.isAcceptableOrUnknown(data['contact_id']!, _contactIdMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_contactIdMeta);
+    }
+    if (data.containsKey('created_at')) {
+      context.handle(
+        _createdAtMeta,
+        createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta),
+      );
+    }
+    return context;
+  }
+
+  @override
+  Set<GeneratedColumn> get $primaryKey => {verificationId};
+  @override
+  KeyVerification map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return KeyVerification(
+      verificationId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}verification_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      )!,
+      type: $KeyVerificationsTable.$convertertype.fromSql(
+        attachedDatabase.typeMapping.read(
+          DriftSqlType.string,
+          data['${effectivePrefix}type'],
+        )!,
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  $KeyVerificationsTable createAlias(String alias) {
+    return $KeyVerificationsTable(attachedDatabase, alias);
+  }
+
+  static JsonTypeConverter2<VerificationType, String, String> $convertertype =
+      const EnumNameConverter<VerificationType>(VerificationType.values);
+}
+
+class KeyVerification extends DataClass implements Insertable<KeyVerification> {
+  final int verificationId;
+  final int contactId;
+  final VerificationType type;
+  final DateTime createdAt;
+  const KeyVerification({
+    required this.verificationId,
+    required this.contactId,
+    required this.type,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['verification_id'] = Variable<int>(verificationId);
+    map['contact_id'] = Variable<int>(contactId);
+    {
+      map['type'] = Variable<String>(
+        $KeyVerificationsTable.$convertertype.toSql(type),
+      );
+    }
+    map['created_at'] = Variable<DateTime>(createdAt);
+    return map;
+  }
+
+  KeyVerificationsCompanion toCompanion(bool nullToAbsent) {
+    return KeyVerificationsCompanion(
+      verificationId: Value(verificationId),
+      contactId: Value(contactId),
+      type: Value(type),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory KeyVerification.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return KeyVerification(
+      verificationId: serializer.fromJson<int>(json['verificationId']),
+      contactId: serializer.fromJson<int>(json['contactId']),
+      type: $KeyVerificationsTable.$convertertype.fromJson(
+        serializer.fromJson<String>(json['type']),
+      ),
+      createdAt: serializer.fromJson<DateTime>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'verificationId': serializer.toJson<int>(verificationId),
+      'contactId': serializer.toJson<int>(contactId),
+      'type': serializer.toJson<String>(
+        $KeyVerificationsTable.$convertertype.toJson(type),
+      ),
+      'createdAt': serializer.toJson<DateTime>(createdAt),
+    };
+  }
+
+  KeyVerification copyWith({
+    int? verificationId,
+    int? contactId,
+    VerificationType? type,
+    DateTime? createdAt,
+  }) => KeyVerification(
+    verificationId: verificationId ?? this.verificationId,
+    contactId: contactId ?? this.contactId,
+    type: type ?? this.type,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  KeyVerification copyWithCompanion(KeyVerificationsCompanion data) {
+    return KeyVerification(
+      verificationId: data.verificationId.present
+          ? data.verificationId.value
+          : this.verificationId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      type: data.type.present ? data.type.value : this.type,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('KeyVerification(')
+          ..write('verificationId: $verificationId, ')
+          ..write('contactId: $contactId, ')
+          ..write('type: $type, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(verificationId, contactId, type, createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is KeyVerification &&
+          other.verificationId == this.verificationId &&
+          other.contactId == this.contactId &&
+          other.type == this.type &&
+          other.createdAt == this.createdAt);
+}
+
+class KeyVerificationsCompanion extends UpdateCompanion<KeyVerification> {
+  final Value<int> verificationId;
+  final Value<int> contactId;
+  final Value<VerificationType> type;
+  final Value<DateTime> createdAt;
+  const KeyVerificationsCompanion({
+    this.verificationId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.type = const Value.absent(),
+    this.createdAt = const Value.absent(),
+  });
+  KeyVerificationsCompanion.insert({
+    this.verificationId = const Value.absent(),
+    required int contactId,
+    required VerificationType type,
+    this.createdAt = const Value.absent(),
+  }) : contactId = Value(contactId),
+       type = Value(type);
+  static Insertable<KeyVerification> custom({
+    Expression<int>? verificationId,
+    Expression<int>? contactId,
+    Expression<String>? type,
+    Expression<DateTime>? createdAt,
+  }) {
+    return RawValuesInsertable({
+      if (verificationId != null) 'verification_id': verificationId,
+      if (contactId != null) 'contact_id': contactId,
+      if (type != null) 'type': type,
+      if (createdAt != null) 'created_at': createdAt,
+    });
+  }
+
+  KeyVerificationsCompanion copyWith({
+    Value<int>? verificationId,
+    Value<int>? contactId,
+    Value<VerificationType>? type,
+    Value<DateTime>? createdAt,
+  }) {
+    return KeyVerificationsCompanion(
+      verificationId: verificationId ?? this.verificationId,
+      contactId: contactId ?? this.contactId,
+      type: type ?? this.type,
+      createdAt: createdAt ?? this.createdAt,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (verificationId.present) {
+      map['verification_id'] = Variable<int>(verificationId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (type.present) {
+      map['type'] = Variable<String>(
+        $KeyVerificationsTable.$convertertype.toSql(type.value),
+      );
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<DateTime>(createdAt.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('KeyVerificationsCompanion(')
+          ..write('verificationId: $verificationId, ')
+          ..write('contactId: $contactId, ')
+          ..write('type: $type, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class $VerificationTokensTable extends VerificationTokens
+    with TableInfo<$VerificationTokensTable, VerificationToken> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $VerificationTokensTable(this.attachedDatabase, [this._alias]);
+  static const VerificationMeta _tokenIdMeta = const VerificationMeta(
+    'tokenId',
+  );
+  @override
+  late final GeneratedColumn<int> tokenId = GeneratedColumn<int>(
+    'token_id',
+    aliasedName,
+    false,
+    hasAutoIncrement: true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'PRIMARY KEY AUTOINCREMENT',
+    ),
+  );
+  static const VerificationMeta _tokenMeta = const VerificationMeta('token');
+  @override
+  late final GeneratedColumn<Uint8List> token = GeneratedColumn<Uint8List>(
+    'token',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _createdAtMeta = const VerificationMeta(
+    'createdAt',
+  );
+  @override
+  late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: false,
+    defaultValue: currentDateAndTime,
+  );
+  @override
+  List<GeneratedColumn> get $columns => [tokenId, token, createdAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'verification_tokens';
+  @override
+  VerificationContext validateIntegrity(
+    Insertable<VerificationToken> instance, {
+    bool isInserting = false,
+  }) {
+    final context = VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('token_id')) {
+      context.handle(
+        _tokenIdMeta,
+        tokenId.isAcceptableOrUnknown(data['token_id']!, _tokenIdMeta),
+      );
+    }
+    if (data.containsKey('token')) {
+      context.handle(
+        _tokenMeta,
+        token.isAcceptableOrUnknown(data['token']!, _tokenMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_tokenMeta);
+    }
+    if (data.containsKey('created_at')) {
+      context.handle(
+        _createdAtMeta,
+        createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta),
+      );
+    }
+    return context;
+  }
+
+  @override
+  Set<GeneratedColumn> get $primaryKey => {tokenId};
+  @override
+  VerificationToken map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return VerificationToken(
+      tokenId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}token_id'],
+      )!,
+      token: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}token'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  $VerificationTokensTable createAlias(String alias) {
+    return $VerificationTokensTable(attachedDatabase, alias);
+  }
+}
+
+class VerificationToken extends DataClass
+    implements Insertable<VerificationToken> {
+  final int tokenId;
+  final Uint8List token;
+  final DateTime createdAt;
+  const VerificationToken({
+    required this.tokenId,
+    required this.token,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['token_id'] = Variable<int>(tokenId);
+    map['token'] = Variable<Uint8List>(token);
+    map['created_at'] = Variable<DateTime>(createdAt);
+    return map;
+  }
+
+  VerificationTokensCompanion toCompanion(bool nullToAbsent) {
+    return VerificationTokensCompanion(
+      tokenId: Value(tokenId),
+      token: Value(token),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory VerificationToken.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return VerificationToken(
+      tokenId: serializer.fromJson<int>(json['tokenId']),
+      token: serializer.fromJson<Uint8List>(json['token']),
+      createdAt: serializer.fromJson<DateTime>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'tokenId': serializer.toJson<int>(tokenId),
+      'token': serializer.toJson<Uint8List>(token),
+      'createdAt': serializer.toJson<DateTime>(createdAt),
+    };
+  }
+
+  VerificationToken copyWith({
+    int? tokenId,
+    Uint8List? token,
+    DateTime? createdAt,
+  }) => VerificationToken(
+    tokenId: tokenId ?? this.tokenId,
+    token: token ?? this.token,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  VerificationToken copyWithCompanion(VerificationTokensCompanion data) {
+    return VerificationToken(
+      tokenId: data.tokenId.present ? data.tokenId.value : this.tokenId,
+      token: data.token.present ? data.token.value : this.token,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('VerificationToken(')
+          ..write('tokenId: $tokenId, ')
+          ..write('token: $token, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(tokenId, $driftBlobEquality.hash(token), createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is VerificationToken &&
+          other.tokenId == this.tokenId &&
+          $driftBlobEquality.equals(other.token, this.token) &&
+          other.createdAt == this.createdAt);
+}
+
+class VerificationTokensCompanion extends UpdateCompanion<VerificationToken> {
+  final Value<int> tokenId;
+  final Value<Uint8List> token;
+  final Value<DateTime> createdAt;
+  const VerificationTokensCompanion({
+    this.tokenId = const Value.absent(),
+    this.token = const Value.absent(),
+    this.createdAt = const Value.absent(),
+  });
+  VerificationTokensCompanion.insert({
+    this.tokenId = const Value.absent(),
+    required Uint8List token,
+    this.createdAt = const Value.absent(),
+  }) : token = Value(token);
+  static Insertable<VerificationToken> custom({
+    Expression<int>? tokenId,
+    Expression<Uint8List>? token,
+    Expression<DateTime>? createdAt,
+  }) {
+    return RawValuesInsertable({
+      if (tokenId != null) 'token_id': tokenId,
+      if (token != null) 'token': token,
+      if (createdAt != null) 'created_at': createdAt,
+    });
+  }
+
+  VerificationTokensCompanion copyWith({
+    Value<int>? tokenId,
+    Value<Uint8List>? token,
+    Value<DateTime>? createdAt,
+  }) {
+    return VerificationTokensCompanion(
+      tokenId: tokenId ?? this.tokenId,
+      token: token ?? this.token,
+      createdAt: createdAt ?? this.createdAt,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (tokenId.present) {
+      map['token_id'] = Variable<int>(tokenId.value);
+    }
+    if (token.present) {
+      map['token'] = Variable<Uint8List>(token.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<DateTime>(createdAt.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('VerificationTokensCompanion(')
+          ..write('tokenId: $tokenId, ')
+          ..write('token: $token, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class $UserDiscoveryAnnouncedUsersTable extends UserDiscoveryAnnouncedUsers
+    with
+        TableInfo<
+          $UserDiscoveryAnnouncedUsersTable,
+          UserDiscoveryAnnouncedUser
+        > {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $UserDiscoveryAnnouncedUsersTable(this.attachedDatabase, [this._alias]);
+  static const VerificationMeta _announcedUserIdMeta = const VerificationMeta(
+    'announcedUserId',
+  );
+  @override
+  late final GeneratedColumn<int> announcedUserId = GeneratedColumn<int>(
+    'announced_user_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+  );
+  static const VerificationMeta _announcedPublicKeyMeta =
+      const VerificationMeta('announcedPublicKey');
+  @override
+  late final GeneratedColumn<Uint8List> announcedPublicKey =
+      GeneratedColumn<Uint8List>(
+        'announced_public_key',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+      );
+  static const VerificationMeta _publicIdMeta = const VerificationMeta(
+    'publicId',
+  );
+  @override
+  late final GeneratedColumn<int> publicId = GeneratedColumn<int>(
+    'public_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways('UNIQUE'),
+  );
+  static const VerificationMeta _usernameMeta = const VerificationMeta(
+    'username',
+  );
+  @override
+  late final GeneratedColumn<String> username = GeneratedColumn<String>(
+    'username',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  static const VerificationMeta _wasShownToTheUserMeta = const VerificationMeta(
+    'wasShownToTheUser',
+  );
+  @override
+  late final GeneratedColumn<bool> wasShownToTheUser = GeneratedColumn<bool>(
+    'was_shown_to_the_user',
+    aliasedName,
+    false,
+    type: DriftSqlType.bool,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'CHECK ("was_shown_to_the_user" IN (0, 1))',
+    ),
+    defaultValue: const Constant(false),
+  );
+  static const VerificationMeta _isHiddenMeta = const VerificationMeta(
+    'isHidden',
+  );
+  @override
+  late final GeneratedColumn<bool> isHidden = GeneratedColumn<bool>(
+    'is_hidden',
+    aliasedName,
+    false,
+    type: DriftSqlType.bool,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'CHECK ("is_hidden" IN (0, 1))',
+    ),
+    defaultValue: const Constant(false),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    announcedUserId,
+    announcedPublicKey,
+    publicId,
+    username,
+    wasShownToTheUser,
+    isHidden,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_discovery_announced_users';
+  @override
+  VerificationContext validateIntegrity(
+    Insertable<UserDiscoveryAnnouncedUser> instance, {
+    bool isInserting = false,
+  }) {
+    final context = VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('announced_user_id')) {
+      context.handle(
+        _announcedUserIdMeta,
+        announcedUserId.isAcceptableOrUnknown(
+          data['announced_user_id']!,
+          _announcedUserIdMeta,
+        ),
+      );
+    }
+    if (data.containsKey('announced_public_key')) {
+      context.handle(
+        _announcedPublicKeyMeta,
+        announcedPublicKey.isAcceptableOrUnknown(
+          data['announced_public_key']!,
+          _announcedPublicKeyMeta,
+        ),
+      );
+    } else if (isInserting) {
+      context.missing(_announcedPublicKeyMeta);
+    }
+    if (data.containsKey('public_id')) {
+      context.handle(
+        _publicIdMeta,
+        publicId.isAcceptableOrUnknown(data['public_id']!, _publicIdMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_publicIdMeta);
+    }
+    if (data.containsKey('username')) {
+      context.handle(
+        _usernameMeta,
+        username.isAcceptableOrUnknown(data['username']!, _usernameMeta),
+      );
+    }
+    if (data.containsKey('was_shown_to_the_user')) {
+      context.handle(
+        _wasShownToTheUserMeta,
+        wasShownToTheUser.isAcceptableOrUnknown(
+          data['was_shown_to_the_user']!,
+          _wasShownToTheUserMeta,
+        ),
+      );
+    }
+    if (data.containsKey('is_hidden')) {
+      context.handle(
+        _isHiddenMeta,
+        isHidden.isAcceptableOrUnknown(data['is_hidden']!, _isHiddenMeta),
+      );
+    }
+    return context;
+  }
+
+  @override
+  Set<GeneratedColumn> get $primaryKey => {announcedUserId};
+  @override
+  UserDiscoveryAnnouncedUser map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserDiscoveryAnnouncedUser(
+      announcedUserId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}announced_user_id'],
+      )!,
+      announcedPublicKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}announced_public_key'],
+      )!,
+      publicId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}public_id'],
+      )!,
+      username: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}username'],
+      ),
+      wasShownToTheUser: attachedDatabase.typeMapping.read(
+        DriftSqlType.bool,
+        data['${effectivePrefix}was_shown_to_the_user'],
+      )!,
+      isHidden: attachedDatabase.typeMapping.read(
+        DriftSqlType.bool,
+        data['${effectivePrefix}is_hidden'],
+      )!,
+    );
+  }
+
+  @override
+  $UserDiscoveryAnnouncedUsersTable createAlias(String alias) {
+    return $UserDiscoveryAnnouncedUsersTable(attachedDatabase, alias);
+  }
+}
+
+class UserDiscoveryAnnouncedUser extends DataClass
+    implements Insertable<UserDiscoveryAnnouncedUser> {
+  final int announcedUserId;
+  final Uint8List announcedPublicKey;
+  final int publicId;
+  final String? username;
+  final bool wasShownToTheUser;
+  final bool isHidden;
+  const UserDiscoveryAnnouncedUser({
+    required this.announcedUserId,
+    required this.announcedPublicKey,
+    required this.publicId,
+    this.username,
+    required this.wasShownToTheUser,
+    required this.isHidden,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['announced_user_id'] = Variable<int>(announcedUserId);
+    map['announced_public_key'] = Variable<Uint8List>(announcedPublicKey);
+    map['public_id'] = Variable<int>(publicId);
+    if (!nullToAbsent || username != null) {
+      map['username'] = Variable<String>(username);
+    }
+    map['was_shown_to_the_user'] = Variable<bool>(wasShownToTheUser);
+    map['is_hidden'] = Variable<bool>(isHidden);
+    return map;
+  }
+
+  UserDiscoveryAnnouncedUsersCompanion toCompanion(bool nullToAbsent) {
+    return UserDiscoveryAnnouncedUsersCompanion(
+      announcedUserId: Value(announcedUserId),
+      announcedPublicKey: Value(announcedPublicKey),
+      publicId: Value(publicId),
+      username: username == null && nullToAbsent
+          ? const Value.absent()
+          : Value(username),
+      wasShownToTheUser: Value(wasShownToTheUser),
+      isHidden: Value(isHidden),
+    );
+  }
+
+  factory UserDiscoveryAnnouncedUser.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserDiscoveryAnnouncedUser(
+      announcedUserId: serializer.fromJson<int>(json['announcedUserId']),
+      announcedPublicKey: serializer.fromJson<Uint8List>(
+        json['announcedPublicKey'],
+      ),
+      publicId: serializer.fromJson<int>(json['publicId']),
+      username: serializer.fromJson<String?>(json['username']),
+      wasShownToTheUser: serializer.fromJson<bool>(json['wasShownToTheUser']),
+      isHidden: serializer.fromJson<bool>(json['isHidden']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'announcedUserId': serializer.toJson<int>(announcedUserId),
+      'announcedPublicKey': serializer.toJson<Uint8List>(announcedPublicKey),
+      'publicId': serializer.toJson<int>(publicId),
+      'username': serializer.toJson<String?>(username),
+      'wasShownToTheUser': serializer.toJson<bool>(wasShownToTheUser),
+      'isHidden': serializer.toJson<bool>(isHidden),
+    };
+  }
+
+  UserDiscoveryAnnouncedUser copyWith({
+    int? announcedUserId,
+    Uint8List? announcedPublicKey,
+    int? publicId,
+    Value<String?> username = const Value.absent(),
+    bool? wasShownToTheUser,
+    bool? isHidden,
+  }) => UserDiscoveryAnnouncedUser(
+    announcedUserId: announcedUserId ?? this.announcedUserId,
+    announcedPublicKey: announcedPublicKey ?? this.announcedPublicKey,
+    publicId: publicId ?? this.publicId,
+    username: username.present ? username.value : this.username,
+    wasShownToTheUser: wasShownToTheUser ?? this.wasShownToTheUser,
+    isHidden: isHidden ?? this.isHidden,
+  );
+  UserDiscoveryAnnouncedUser copyWithCompanion(
+    UserDiscoveryAnnouncedUsersCompanion data,
+  ) {
+    return UserDiscoveryAnnouncedUser(
+      announcedUserId: data.announcedUserId.present
+          ? data.announcedUserId.value
+          : this.announcedUserId,
+      announcedPublicKey: data.announcedPublicKey.present
+          ? data.announcedPublicKey.value
+          : this.announcedPublicKey,
+      publicId: data.publicId.present ? data.publicId.value : this.publicId,
+      username: data.username.present ? data.username.value : this.username,
+      wasShownToTheUser: data.wasShownToTheUser.present
+          ? data.wasShownToTheUser.value
+          : this.wasShownToTheUser,
+      isHidden: data.isHidden.present ? data.isHidden.value : this.isHidden,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryAnnouncedUser(')
+          ..write('announcedUserId: $announcedUserId, ')
+          ..write('announcedPublicKey: $announcedPublicKey, ')
+          ..write('publicId: $publicId, ')
+          ..write('username: $username, ')
+          ..write('wasShownToTheUser: $wasShownToTheUser, ')
+          ..write('isHidden: $isHidden')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    announcedUserId,
+    $driftBlobEquality.hash(announcedPublicKey),
+    publicId,
+    username,
+    wasShownToTheUser,
+    isHidden,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserDiscoveryAnnouncedUser &&
+          other.announcedUserId == this.announcedUserId &&
+          $driftBlobEquality.equals(
+            other.announcedPublicKey,
+            this.announcedPublicKey,
+          ) &&
+          other.publicId == this.publicId &&
+          other.username == this.username &&
+          other.wasShownToTheUser == this.wasShownToTheUser &&
+          other.isHidden == this.isHidden);
+}
+
+class UserDiscoveryAnnouncedUsersCompanion
+    extends UpdateCompanion<UserDiscoveryAnnouncedUser> {
+  final Value<int> announcedUserId;
+  final Value<Uint8List> announcedPublicKey;
+  final Value<int> publicId;
+  final Value<String?> username;
+  final Value<bool> wasShownToTheUser;
+  final Value<bool> isHidden;
+  const UserDiscoveryAnnouncedUsersCompanion({
+    this.announcedUserId = const Value.absent(),
+    this.announcedPublicKey = const Value.absent(),
+    this.publicId = const Value.absent(),
+    this.username = const Value.absent(),
+    this.wasShownToTheUser = const Value.absent(),
+    this.isHidden = const Value.absent(),
+  });
+  UserDiscoveryAnnouncedUsersCompanion.insert({
+    this.announcedUserId = const Value.absent(),
+    required Uint8List announcedPublicKey,
+    required int publicId,
+    this.username = const Value.absent(),
+    this.wasShownToTheUser = const Value.absent(),
+    this.isHidden = const Value.absent(),
+  }) : announcedPublicKey = Value(announcedPublicKey),
+       publicId = Value(publicId);
+  static Insertable<UserDiscoveryAnnouncedUser> custom({
+    Expression<int>? announcedUserId,
+    Expression<Uint8List>? announcedPublicKey,
+    Expression<int>? publicId,
+    Expression<String>? username,
+    Expression<bool>? wasShownToTheUser,
+    Expression<bool>? isHidden,
+  }) {
+    return RawValuesInsertable({
+      if (announcedUserId != null) 'announced_user_id': announcedUserId,
+      if (announcedPublicKey != null)
+        'announced_public_key': announcedPublicKey,
+      if (publicId != null) 'public_id': publicId,
+      if (username != null) 'username': username,
+      if (wasShownToTheUser != null) 'was_shown_to_the_user': wasShownToTheUser,
+      if (isHidden != null) 'is_hidden': isHidden,
+    });
+  }
+
+  UserDiscoveryAnnouncedUsersCompanion copyWith({
+    Value<int>? announcedUserId,
+    Value<Uint8List>? announcedPublicKey,
+    Value<int>? publicId,
+    Value<String?>? username,
+    Value<bool>? wasShownToTheUser,
+    Value<bool>? isHidden,
+  }) {
+    return UserDiscoveryAnnouncedUsersCompanion(
+      announcedUserId: announcedUserId ?? this.announcedUserId,
+      announcedPublicKey: announcedPublicKey ?? this.announcedPublicKey,
+      publicId: publicId ?? this.publicId,
+      username: username ?? this.username,
+      wasShownToTheUser: wasShownToTheUser ?? this.wasShownToTheUser,
+      isHidden: isHidden ?? this.isHidden,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (announcedUserId.present) {
+      map['announced_user_id'] = Variable<int>(announcedUserId.value);
+    }
+    if (announcedPublicKey.present) {
+      map['announced_public_key'] = Variable<Uint8List>(
+        announcedPublicKey.value,
+      );
+    }
+    if (publicId.present) {
+      map['public_id'] = Variable<int>(publicId.value);
+    }
+    if (username.present) {
+      map['username'] = Variable<String>(username.value);
+    }
+    if (wasShownToTheUser.present) {
+      map['was_shown_to_the_user'] = Variable<bool>(wasShownToTheUser.value);
+    }
+    if (isHidden.present) {
+      map['is_hidden'] = Variable<bool>(isHidden.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryAnnouncedUsersCompanion(')
+          ..write('announcedUserId: $announcedUserId, ')
+          ..write('announcedPublicKey: $announcedPublicKey, ')
+          ..write('publicId: $publicId, ')
+          ..write('username: $username, ')
+          ..write('wasShownToTheUser: $wasShownToTheUser, ')
+          ..write('isHidden: $isHidden')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class $UserDiscoveryUserRelationsTable extends UserDiscoveryUserRelations
+    with
+        TableInfo<$UserDiscoveryUserRelationsTable, UserDiscoveryUserRelation> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $UserDiscoveryUserRelationsTable(this.attachedDatabase, [this._alias]);
+  static const VerificationMeta _announcedUserIdMeta = const VerificationMeta(
+    'announcedUserId',
+  );
+  @override
+  late final GeneratedColumn<int> announcedUserId = GeneratedColumn<int>(
+    'announced_user_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES user_discovery_announced_users (announced_user_id) ON DELETE CASCADE',
+    ),
+  );
+  static const VerificationMeta _fromContactIdMeta = const VerificationMeta(
+    'fromContactId',
+  );
+  @override
+  late final GeneratedColumn<int> fromContactId = GeneratedColumn<int>(
+    'from_contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES contacts (user_id) ON DELETE CASCADE',
+    ),
+  );
+  static const VerificationMeta _publicKeyVerifiedTimestampMeta =
+      const VerificationMeta('publicKeyVerifiedTimestamp');
+  @override
+  late final GeneratedColumn<DateTime> publicKeyVerifiedTimestamp =
+      GeneratedColumn<DateTime>(
+        'public_key_verified_timestamp',
+        aliasedName,
+        true,
+        type: DriftSqlType.dateTime,
+        requiredDuringInsert: false,
+      );
+  @override
+  List<GeneratedColumn> get $columns => [
+    announcedUserId,
+    fromContactId,
+    publicKeyVerifiedTimestamp,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_discovery_user_relations';
+  @override
+  VerificationContext validateIntegrity(
+    Insertable<UserDiscoveryUserRelation> instance, {
+    bool isInserting = false,
+  }) {
+    final context = VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('announced_user_id')) {
+      context.handle(
+        _announcedUserIdMeta,
+        announcedUserId.isAcceptableOrUnknown(
+          data['announced_user_id']!,
+          _announcedUserIdMeta,
+        ),
+      );
+    } else if (isInserting) {
+      context.missing(_announcedUserIdMeta);
+    }
+    if (data.containsKey('from_contact_id')) {
+      context.handle(
+        _fromContactIdMeta,
+        fromContactId.isAcceptableOrUnknown(
+          data['from_contact_id']!,
+          _fromContactIdMeta,
+        ),
+      );
+    } else if (isInserting) {
+      context.missing(_fromContactIdMeta);
+    }
+    if (data.containsKey('public_key_verified_timestamp')) {
+      context.handle(
+        _publicKeyVerifiedTimestampMeta,
+        publicKeyVerifiedTimestamp.isAcceptableOrUnknown(
+          data['public_key_verified_timestamp']!,
+          _publicKeyVerifiedTimestampMeta,
+        ),
+      );
+    }
+    return context;
+  }
+
+  @override
+  Set<GeneratedColumn> get $primaryKey => {announcedUserId, fromContactId};
+  @override
+  UserDiscoveryUserRelation map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserDiscoveryUserRelation(
+      announcedUserId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}announced_user_id'],
+      )!,
+      fromContactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}from_contact_id'],
+      )!,
+      publicKeyVerifiedTimestamp: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}public_key_verified_timestamp'],
+      ),
+    );
+  }
+
+  @override
+  $UserDiscoveryUserRelationsTable createAlias(String alias) {
+    return $UserDiscoveryUserRelationsTable(attachedDatabase, alias);
+  }
+}
+
+class UserDiscoveryUserRelation extends DataClass
+    implements Insertable<UserDiscoveryUserRelation> {
+  final int announcedUserId;
+  final int fromContactId;
+  final DateTime? publicKeyVerifiedTimestamp;
+  const UserDiscoveryUserRelation({
+    required this.announcedUserId,
+    required this.fromContactId,
+    this.publicKeyVerifiedTimestamp,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['announced_user_id'] = Variable<int>(announcedUserId);
+    map['from_contact_id'] = Variable<int>(fromContactId);
+    if (!nullToAbsent || publicKeyVerifiedTimestamp != null) {
+      map['public_key_verified_timestamp'] = Variable<DateTime>(
+        publicKeyVerifiedTimestamp,
+      );
+    }
+    return map;
+  }
+
+  UserDiscoveryUserRelationsCompanion toCompanion(bool nullToAbsent) {
+    return UserDiscoveryUserRelationsCompanion(
+      announcedUserId: Value(announcedUserId),
+      fromContactId: Value(fromContactId),
+      publicKeyVerifiedTimestamp:
+          publicKeyVerifiedTimestamp == null && nullToAbsent
+          ? const Value.absent()
+          : Value(publicKeyVerifiedTimestamp),
+    );
+  }
+
+  factory UserDiscoveryUserRelation.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserDiscoveryUserRelation(
+      announcedUserId: serializer.fromJson<int>(json['announcedUserId']),
+      fromContactId: serializer.fromJson<int>(json['fromContactId']),
+      publicKeyVerifiedTimestamp: serializer.fromJson<DateTime?>(
+        json['publicKeyVerifiedTimestamp'],
+      ),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'announcedUserId': serializer.toJson<int>(announcedUserId),
+      'fromContactId': serializer.toJson<int>(fromContactId),
+      'publicKeyVerifiedTimestamp': serializer.toJson<DateTime?>(
+        publicKeyVerifiedTimestamp,
+      ),
+    };
+  }
+
+  UserDiscoveryUserRelation copyWith({
+    int? announcedUserId,
+    int? fromContactId,
+    Value<DateTime?> publicKeyVerifiedTimestamp = const Value.absent(),
+  }) => UserDiscoveryUserRelation(
+    announcedUserId: announcedUserId ?? this.announcedUserId,
+    fromContactId: fromContactId ?? this.fromContactId,
+    publicKeyVerifiedTimestamp: publicKeyVerifiedTimestamp.present
+        ? publicKeyVerifiedTimestamp.value
+        : this.publicKeyVerifiedTimestamp,
+  );
+  UserDiscoveryUserRelation copyWithCompanion(
+    UserDiscoveryUserRelationsCompanion data,
+  ) {
+    return UserDiscoveryUserRelation(
+      announcedUserId: data.announcedUserId.present
+          ? data.announcedUserId.value
+          : this.announcedUserId,
+      fromContactId: data.fromContactId.present
+          ? data.fromContactId.value
+          : this.fromContactId,
+      publicKeyVerifiedTimestamp: data.publicKeyVerifiedTimestamp.present
+          ? data.publicKeyVerifiedTimestamp.value
+          : this.publicKeyVerifiedTimestamp,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryUserRelation(')
+          ..write('announcedUserId: $announcedUserId, ')
+          ..write('fromContactId: $fromContactId, ')
+          ..write('publicKeyVerifiedTimestamp: $publicKeyVerifiedTimestamp')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(announcedUserId, fromContactId, publicKeyVerifiedTimestamp);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserDiscoveryUserRelation &&
+          other.announcedUserId == this.announcedUserId &&
+          other.fromContactId == this.fromContactId &&
+          other.publicKeyVerifiedTimestamp == this.publicKeyVerifiedTimestamp);
+}
+
+class UserDiscoveryUserRelationsCompanion
+    extends UpdateCompanion<UserDiscoveryUserRelation> {
+  final Value<int> announcedUserId;
+  final Value<int> fromContactId;
+  final Value<DateTime?> publicKeyVerifiedTimestamp;
+  final Value<int> rowid;
+  const UserDiscoveryUserRelationsCompanion({
+    this.announcedUserId = const Value.absent(),
+    this.fromContactId = const Value.absent(),
+    this.publicKeyVerifiedTimestamp = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  UserDiscoveryUserRelationsCompanion.insert({
+    required int announcedUserId,
+    required int fromContactId,
+    this.publicKeyVerifiedTimestamp = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : announcedUserId = Value(announcedUserId),
+       fromContactId = Value(fromContactId);
+  static Insertable<UserDiscoveryUserRelation> custom({
+    Expression<int>? announcedUserId,
+    Expression<int>? fromContactId,
+    Expression<DateTime>? publicKeyVerifiedTimestamp,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (announcedUserId != null) 'announced_user_id': announcedUserId,
+      if (fromContactId != null) 'from_contact_id': fromContactId,
+      if (publicKeyVerifiedTimestamp != null)
+        'public_key_verified_timestamp': publicKeyVerifiedTimestamp,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  UserDiscoveryUserRelationsCompanion copyWith({
+    Value<int>? announcedUserId,
+    Value<int>? fromContactId,
+    Value<DateTime?>? publicKeyVerifiedTimestamp,
+    Value<int>? rowid,
+  }) {
+    return UserDiscoveryUserRelationsCompanion(
+      announcedUserId: announcedUserId ?? this.announcedUserId,
+      fromContactId: fromContactId ?? this.fromContactId,
+      publicKeyVerifiedTimestamp:
+          publicKeyVerifiedTimestamp ?? this.publicKeyVerifiedTimestamp,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (announcedUserId.present) {
+      map['announced_user_id'] = Variable<int>(announcedUserId.value);
+    }
+    if (fromContactId.present) {
+      map['from_contact_id'] = Variable<int>(fromContactId.value);
+    }
+    if (publicKeyVerifiedTimestamp.present) {
+      map['public_key_verified_timestamp'] = Variable<DateTime>(
+        publicKeyVerifiedTimestamp.value,
+      );
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryUserRelationsCompanion(')
+          ..write('announcedUserId: $announcedUserId, ')
+          ..write('fromContactId: $fromContactId, ')
+          ..write('publicKeyVerifiedTimestamp: $publicKeyVerifiedTimestamp, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class $UserDiscoveryOtherPromotionsTable extends UserDiscoveryOtherPromotions
+    with
+        TableInfo<
+          $UserDiscoveryOtherPromotionsTable,
+          UserDiscoveryOtherPromotion
+        > {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $UserDiscoveryOtherPromotionsTable(this.attachedDatabase, [this._alias]);
+  static const VerificationMeta _fromContactIdMeta = const VerificationMeta(
+    'fromContactId',
+  );
+  @override
+  late final GeneratedColumn<int> fromContactId = GeneratedColumn<int>(
+    'from_contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES contacts (user_id) ON DELETE CASCADE',
+    ),
+  );
+  static const VerificationMeta _promotionIdMeta = const VerificationMeta(
+    'promotionId',
+  );
+  @override
+  late final GeneratedColumn<int> promotionId = GeneratedColumn<int>(
+    'promotion_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _publicIdMeta = const VerificationMeta(
+    'publicId',
+  );
+  @override
+  late final GeneratedColumn<int> publicId = GeneratedColumn<int>(
+    'public_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _thresholdMeta = const VerificationMeta(
+    'threshold',
+  );
+  @override
+  late final GeneratedColumn<int> threshold = GeneratedColumn<int>(
+    'threshold',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _announcementShareMeta = const VerificationMeta(
+    'announcementShare',
+  );
+  @override
+  late final GeneratedColumn<Uint8List> announcementShare =
+      GeneratedColumn<Uint8List>(
+        'announcement_share',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+      );
+  static const VerificationMeta _publicKeyVerifiedTimestampMeta =
+      const VerificationMeta('publicKeyVerifiedTimestamp');
+  @override
+  late final GeneratedColumn<DateTime> publicKeyVerifiedTimestamp =
+      GeneratedColumn<DateTime>(
+        'public_key_verified_timestamp',
+        aliasedName,
+        true,
+        type: DriftSqlType.dateTime,
+        requiredDuringInsert: false,
+      );
+  @override
+  List<GeneratedColumn> get $columns => [
+    fromContactId,
+    promotionId,
+    publicId,
+    threshold,
+    announcementShare,
+    publicKeyVerifiedTimestamp,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_discovery_other_promotions';
+  @override
+  VerificationContext validateIntegrity(
+    Insertable<UserDiscoveryOtherPromotion> instance, {
+    bool isInserting = false,
+  }) {
+    final context = VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('from_contact_id')) {
+      context.handle(
+        _fromContactIdMeta,
+        fromContactId.isAcceptableOrUnknown(
+          data['from_contact_id']!,
+          _fromContactIdMeta,
+        ),
+      );
+    } else if (isInserting) {
+      context.missing(_fromContactIdMeta);
+    }
+    if (data.containsKey('promotion_id')) {
+      context.handle(
+        _promotionIdMeta,
+        promotionId.isAcceptableOrUnknown(
+          data['promotion_id']!,
+          _promotionIdMeta,
+        ),
+      );
+    } else if (isInserting) {
+      context.missing(_promotionIdMeta);
+    }
+    if (data.containsKey('public_id')) {
+      context.handle(
+        _publicIdMeta,
+        publicId.isAcceptableOrUnknown(data['public_id']!, _publicIdMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_publicIdMeta);
+    }
+    if (data.containsKey('threshold')) {
+      context.handle(
+        _thresholdMeta,
+        threshold.isAcceptableOrUnknown(data['threshold']!, _thresholdMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_thresholdMeta);
+    }
+    if (data.containsKey('announcement_share')) {
+      context.handle(
+        _announcementShareMeta,
+        announcementShare.isAcceptableOrUnknown(
+          data['announcement_share']!,
+          _announcementShareMeta,
+        ),
+      );
+    } else if (isInserting) {
+      context.missing(_announcementShareMeta);
+    }
+    if (data.containsKey('public_key_verified_timestamp')) {
+      context.handle(
+        _publicKeyVerifiedTimestampMeta,
+        publicKeyVerifiedTimestamp.isAcceptableOrUnknown(
+          data['public_key_verified_timestamp']!,
+          _publicKeyVerifiedTimestampMeta,
+        ),
+      );
+    }
+    return context;
+  }
+
+  @override
+  Set<GeneratedColumn> get $primaryKey => {fromContactId, publicId};
+  @override
+  UserDiscoveryOtherPromotion map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserDiscoveryOtherPromotion(
+      fromContactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}from_contact_id'],
+      )!,
+      promotionId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}promotion_id'],
+      )!,
+      publicId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}public_id'],
+      )!,
+      threshold: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}threshold'],
+      )!,
+      announcementShare: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}announcement_share'],
+      )!,
+      publicKeyVerifiedTimestamp: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}public_key_verified_timestamp'],
+      ),
+    );
+  }
+
+  @override
+  $UserDiscoveryOtherPromotionsTable createAlias(String alias) {
+    return $UserDiscoveryOtherPromotionsTable(attachedDatabase, alias);
+  }
+}
+
+class UserDiscoveryOtherPromotion extends DataClass
+    implements Insertable<UserDiscoveryOtherPromotion> {
+  final int fromContactId;
+  final int promotionId;
+  final int publicId;
+  final int threshold;
+  final Uint8List announcementShare;
+  final DateTime? publicKeyVerifiedTimestamp;
+  const UserDiscoveryOtherPromotion({
+    required this.fromContactId,
+    required this.promotionId,
+    required this.publicId,
+    required this.threshold,
+    required this.announcementShare,
+    this.publicKeyVerifiedTimestamp,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['from_contact_id'] = Variable<int>(fromContactId);
+    map['promotion_id'] = Variable<int>(promotionId);
+    map['public_id'] = Variable<int>(publicId);
+    map['threshold'] = Variable<int>(threshold);
+    map['announcement_share'] = Variable<Uint8List>(announcementShare);
+    if (!nullToAbsent || publicKeyVerifiedTimestamp != null) {
+      map['public_key_verified_timestamp'] = Variable<DateTime>(
+        publicKeyVerifiedTimestamp,
+      );
+    }
+    return map;
+  }
+
+  UserDiscoveryOtherPromotionsCompanion toCompanion(bool nullToAbsent) {
+    return UserDiscoveryOtherPromotionsCompanion(
+      fromContactId: Value(fromContactId),
+      promotionId: Value(promotionId),
+      publicId: Value(publicId),
+      threshold: Value(threshold),
+      announcementShare: Value(announcementShare),
+      publicKeyVerifiedTimestamp:
+          publicKeyVerifiedTimestamp == null && nullToAbsent
+          ? const Value.absent()
+          : Value(publicKeyVerifiedTimestamp),
+    );
+  }
+
+  factory UserDiscoveryOtherPromotion.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserDiscoveryOtherPromotion(
+      fromContactId: serializer.fromJson<int>(json['fromContactId']),
+      promotionId: serializer.fromJson<int>(json['promotionId']),
+      publicId: serializer.fromJson<int>(json['publicId']),
+      threshold: serializer.fromJson<int>(json['threshold']),
+      announcementShare: serializer.fromJson<Uint8List>(
+        json['announcementShare'],
+      ),
+      publicKeyVerifiedTimestamp: serializer.fromJson<DateTime?>(
+        json['publicKeyVerifiedTimestamp'],
+      ),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'fromContactId': serializer.toJson<int>(fromContactId),
+      'promotionId': serializer.toJson<int>(promotionId),
+      'publicId': serializer.toJson<int>(publicId),
+      'threshold': serializer.toJson<int>(threshold),
+      'announcementShare': serializer.toJson<Uint8List>(announcementShare),
+      'publicKeyVerifiedTimestamp': serializer.toJson<DateTime?>(
+        publicKeyVerifiedTimestamp,
+      ),
+    };
+  }
+
+  UserDiscoveryOtherPromotion copyWith({
+    int? fromContactId,
+    int? promotionId,
+    int? publicId,
+    int? threshold,
+    Uint8List? announcementShare,
+    Value<DateTime?> publicKeyVerifiedTimestamp = const Value.absent(),
+  }) => UserDiscoveryOtherPromotion(
+    fromContactId: fromContactId ?? this.fromContactId,
+    promotionId: promotionId ?? this.promotionId,
+    publicId: publicId ?? this.publicId,
+    threshold: threshold ?? this.threshold,
+    announcementShare: announcementShare ?? this.announcementShare,
+    publicKeyVerifiedTimestamp: publicKeyVerifiedTimestamp.present
+        ? publicKeyVerifiedTimestamp.value
+        : this.publicKeyVerifiedTimestamp,
+  );
+  UserDiscoveryOtherPromotion copyWithCompanion(
+    UserDiscoveryOtherPromotionsCompanion data,
+  ) {
+    return UserDiscoveryOtherPromotion(
+      fromContactId: data.fromContactId.present
+          ? data.fromContactId.value
+          : this.fromContactId,
+      promotionId: data.promotionId.present
+          ? data.promotionId.value
+          : this.promotionId,
+      publicId: data.publicId.present ? data.publicId.value : this.publicId,
+      threshold: data.threshold.present ? data.threshold.value : this.threshold,
+      announcementShare: data.announcementShare.present
+          ? data.announcementShare.value
+          : this.announcementShare,
+      publicKeyVerifiedTimestamp: data.publicKeyVerifiedTimestamp.present
+          ? data.publicKeyVerifiedTimestamp.value
+          : this.publicKeyVerifiedTimestamp,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryOtherPromotion(')
+          ..write('fromContactId: $fromContactId, ')
+          ..write('promotionId: $promotionId, ')
+          ..write('publicId: $publicId, ')
+          ..write('threshold: $threshold, ')
+          ..write('announcementShare: $announcementShare, ')
+          ..write('publicKeyVerifiedTimestamp: $publicKeyVerifiedTimestamp')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    fromContactId,
+    promotionId,
+    publicId,
+    threshold,
+    $driftBlobEquality.hash(announcementShare),
+    publicKeyVerifiedTimestamp,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserDiscoveryOtherPromotion &&
+          other.fromContactId == this.fromContactId &&
+          other.promotionId == this.promotionId &&
+          other.publicId == this.publicId &&
+          other.threshold == this.threshold &&
+          $driftBlobEquality.equals(
+            other.announcementShare,
+            this.announcementShare,
+          ) &&
+          other.publicKeyVerifiedTimestamp == this.publicKeyVerifiedTimestamp);
+}
+
+class UserDiscoveryOtherPromotionsCompanion
+    extends UpdateCompanion<UserDiscoveryOtherPromotion> {
+  final Value<int> fromContactId;
+  final Value<int> promotionId;
+  final Value<int> publicId;
+  final Value<int> threshold;
+  final Value<Uint8List> announcementShare;
+  final Value<DateTime?> publicKeyVerifiedTimestamp;
+  final Value<int> rowid;
+  const UserDiscoveryOtherPromotionsCompanion({
+    this.fromContactId = const Value.absent(),
+    this.promotionId = const Value.absent(),
+    this.publicId = const Value.absent(),
+    this.threshold = const Value.absent(),
+    this.announcementShare = const Value.absent(),
+    this.publicKeyVerifiedTimestamp = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  UserDiscoveryOtherPromotionsCompanion.insert({
+    required int fromContactId,
+    required int promotionId,
+    required int publicId,
+    required int threshold,
+    required Uint8List announcementShare,
+    this.publicKeyVerifiedTimestamp = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : fromContactId = Value(fromContactId),
+       promotionId = Value(promotionId),
+       publicId = Value(publicId),
+       threshold = Value(threshold),
+       announcementShare = Value(announcementShare);
+  static Insertable<UserDiscoveryOtherPromotion> custom({
+    Expression<int>? fromContactId,
+    Expression<int>? promotionId,
+    Expression<int>? publicId,
+    Expression<int>? threshold,
+    Expression<Uint8List>? announcementShare,
+    Expression<DateTime>? publicKeyVerifiedTimestamp,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (fromContactId != null) 'from_contact_id': fromContactId,
+      if (promotionId != null) 'promotion_id': promotionId,
+      if (publicId != null) 'public_id': publicId,
+      if (threshold != null) 'threshold': threshold,
+      if (announcementShare != null) 'announcement_share': announcementShare,
+      if (publicKeyVerifiedTimestamp != null)
+        'public_key_verified_timestamp': publicKeyVerifiedTimestamp,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  UserDiscoveryOtherPromotionsCompanion copyWith({
+    Value<int>? fromContactId,
+    Value<int>? promotionId,
+    Value<int>? publicId,
+    Value<int>? threshold,
+    Value<Uint8List>? announcementShare,
+    Value<DateTime?>? publicKeyVerifiedTimestamp,
+    Value<int>? rowid,
+  }) {
+    return UserDiscoveryOtherPromotionsCompanion(
+      fromContactId: fromContactId ?? this.fromContactId,
+      promotionId: promotionId ?? this.promotionId,
+      publicId: publicId ?? this.publicId,
+      threshold: threshold ?? this.threshold,
+      announcementShare: announcementShare ?? this.announcementShare,
+      publicKeyVerifiedTimestamp:
+          publicKeyVerifiedTimestamp ?? this.publicKeyVerifiedTimestamp,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (fromContactId.present) {
+      map['from_contact_id'] = Variable<int>(fromContactId.value);
+    }
+    if (promotionId.present) {
+      map['promotion_id'] = Variable<int>(promotionId.value);
+    }
+    if (publicId.present) {
+      map['public_id'] = Variable<int>(publicId.value);
+    }
+    if (threshold.present) {
+      map['threshold'] = Variable<int>(threshold.value);
+    }
+    if (announcementShare.present) {
+      map['announcement_share'] = Variable<Uint8List>(announcementShare.value);
+    }
+    if (publicKeyVerifiedTimestamp.present) {
+      map['public_key_verified_timestamp'] = Variable<DateTime>(
+        publicKeyVerifiedTimestamp.value,
+      );
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryOtherPromotionsCompanion(')
+          ..write('fromContactId: $fromContactId, ')
+          ..write('promotionId: $promotionId, ')
+          ..write('publicId: $publicId, ')
+          ..write('threshold: $threshold, ')
+          ..write('announcementShare: $announcementShare, ')
+          ..write('publicKeyVerifiedTimestamp: $publicKeyVerifiedTimestamp, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class $UserDiscoveryOwnPromotionsTable extends UserDiscoveryOwnPromotions
+    with
+        TableInfo<$UserDiscoveryOwnPromotionsTable, UserDiscoveryOwnPromotion> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $UserDiscoveryOwnPromotionsTable(this.attachedDatabase, [this._alias]);
+  static const VerificationMeta _versionIdMeta = const VerificationMeta(
+    'versionId',
+  );
+  @override
+  late final GeneratedColumn<int> versionId = GeneratedColumn<int>(
+    'version_id',
+    aliasedName,
+    false,
+    hasAutoIncrement: true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'PRIMARY KEY AUTOINCREMENT',
+    ),
+  );
+  static const VerificationMeta _contactIdMeta = const VerificationMeta(
+    'contactId',
+  );
+  @override
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES contacts (user_id) ON DELETE CASCADE',
+    ),
+  );
+  static const VerificationMeta _promotionMeta = const VerificationMeta(
+    'promotion',
+  );
+  @override
+  late final GeneratedColumn<Uint8List> promotion = GeneratedColumn<Uint8List>(
+    'promotion',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
+  @override
+  List<GeneratedColumn> get $columns => [versionId, contactId, promotion];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_discovery_own_promotions';
+  @override
+  VerificationContext validateIntegrity(
+    Insertable<UserDiscoveryOwnPromotion> instance, {
+    bool isInserting = false,
+  }) {
+    final context = VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('version_id')) {
+      context.handle(
+        _versionIdMeta,
+        versionId.isAcceptableOrUnknown(data['version_id']!, _versionIdMeta),
+      );
+    }
+    if (data.containsKey('contact_id')) {
+      context.handle(
+        _contactIdMeta,
+        contactId.isAcceptableOrUnknown(data['contact_id']!, _contactIdMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_contactIdMeta);
+    }
+    if (data.containsKey('promotion')) {
+      context.handle(
+        _promotionMeta,
+        promotion.isAcceptableOrUnknown(data['promotion']!, _promotionMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_promotionMeta);
+    }
+    return context;
+  }
+
+  @override
+  Set<GeneratedColumn> get $primaryKey => {versionId};
+  @override
+  UserDiscoveryOwnPromotion map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserDiscoveryOwnPromotion(
+      versionId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}version_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      )!,
+      promotion: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}promotion'],
+      )!,
+    );
+  }
+
+  @override
+  $UserDiscoveryOwnPromotionsTable createAlias(String alias) {
+    return $UserDiscoveryOwnPromotionsTable(attachedDatabase, alias);
+  }
+}
+
+class UserDiscoveryOwnPromotion extends DataClass
+    implements Insertable<UserDiscoveryOwnPromotion> {
+  final int versionId;
+  final int contactId;
+  final Uint8List promotion;
+  const UserDiscoveryOwnPromotion({
+    required this.versionId,
+    required this.contactId,
+    required this.promotion,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['version_id'] = Variable<int>(versionId);
+    map['contact_id'] = Variable<int>(contactId);
+    map['promotion'] = Variable<Uint8List>(promotion);
+    return map;
+  }
+
+  UserDiscoveryOwnPromotionsCompanion toCompanion(bool nullToAbsent) {
+    return UserDiscoveryOwnPromotionsCompanion(
+      versionId: Value(versionId),
+      contactId: Value(contactId),
+      promotion: Value(promotion),
+    );
+  }
+
+  factory UserDiscoveryOwnPromotion.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserDiscoveryOwnPromotion(
+      versionId: serializer.fromJson<int>(json['versionId']),
+      contactId: serializer.fromJson<int>(json['contactId']),
+      promotion: serializer.fromJson<Uint8List>(json['promotion']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'versionId': serializer.toJson<int>(versionId),
+      'contactId': serializer.toJson<int>(contactId),
+      'promotion': serializer.toJson<Uint8List>(promotion),
+    };
+  }
+
+  UserDiscoveryOwnPromotion copyWith({
+    int? versionId,
+    int? contactId,
+    Uint8List? promotion,
+  }) => UserDiscoveryOwnPromotion(
+    versionId: versionId ?? this.versionId,
+    contactId: contactId ?? this.contactId,
+    promotion: promotion ?? this.promotion,
+  );
+  UserDiscoveryOwnPromotion copyWithCompanion(
+    UserDiscoveryOwnPromotionsCompanion data,
+  ) {
+    return UserDiscoveryOwnPromotion(
+      versionId: data.versionId.present ? data.versionId.value : this.versionId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      promotion: data.promotion.present ? data.promotion.value : this.promotion,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryOwnPromotion(')
+          ..write('versionId: $versionId, ')
+          ..write('contactId: $contactId, ')
+          ..write('promotion: $promotion')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(versionId, contactId, $driftBlobEquality.hash(promotion));
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserDiscoveryOwnPromotion &&
+          other.versionId == this.versionId &&
+          other.contactId == this.contactId &&
+          $driftBlobEquality.equals(other.promotion, this.promotion));
+}
+
+class UserDiscoveryOwnPromotionsCompanion
+    extends UpdateCompanion<UserDiscoveryOwnPromotion> {
+  final Value<int> versionId;
+  final Value<int> contactId;
+  final Value<Uint8List> promotion;
+  const UserDiscoveryOwnPromotionsCompanion({
+    this.versionId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.promotion = const Value.absent(),
+  });
+  UserDiscoveryOwnPromotionsCompanion.insert({
+    this.versionId = const Value.absent(),
+    required int contactId,
+    required Uint8List promotion,
+  }) : contactId = Value(contactId),
+       promotion = Value(promotion);
+  static Insertable<UserDiscoveryOwnPromotion> custom({
+    Expression<int>? versionId,
+    Expression<int>? contactId,
+    Expression<Uint8List>? promotion,
+  }) {
+    return RawValuesInsertable({
+      if (versionId != null) 'version_id': versionId,
+      if (contactId != null) 'contact_id': contactId,
+      if (promotion != null) 'promotion': promotion,
+    });
+  }
+
+  UserDiscoveryOwnPromotionsCompanion copyWith({
+    Value<int>? versionId,
+    Value<int>? contactId,
+    Value<Uint8List>? promotion,
+  }) {
+    return UserDiscoveryOwnPromotionsCompanion(
+      versionId: versionId ?? this.versionId,
+      contactId: contactId ?? this.contactId,
+      promotion: promotion ?? this.promotion,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (versionId.present) {
+      map['version_id'] = Variable<int>(versionId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (promotion.present) {
+      map['promotion'] = Variable<Uint8List>(promotion.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryOwnPromotionsCompanion(')
+          ..write('versionId: $versionId, ')
+          ..write('contactId: $contactId, ')
+          ..write('promotion: $promotion')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class $UserDiscoverySharesTable extends UserDiscoveryShares
+    with TableInfo<$UserDiscoverySharesTable, UserDiscoveryShare> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $UserDiscoverySharesTable(this.attachedDatabase, [this._alias]);
+  static const VerificationMeta _shareIdMeta = const VerificationMeta(
+    'shareId',
+  );
+  @override
+  late final GeneratedColumn<int> shareId = GeneratedColumn<int>(
+    'share_id',
+    aliasedName,
+    false,
+    hasAutoIncrement: true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'PRIMARY KEY AUTOINCREMENT',
+    ),
+  );
+  static const VerificationMeta _shareMeta = const VerificationMeta('share');
+  @override
+  late final GeneratedColumn<Uint8List> share = GeneratedColumn<Uint8List>(
+    'share',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _contactIdMeta = const VerificationMeta(
+    'contactId',
+  );
+  @override
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES contacts (user_id) ON DELETE CASCADE',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [shareId, share, contactId];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_discovery_shares';
+  @override
+  VerificationContext validateIntegrity(
+    Insertable<UserDiscoveryShare> instance, {
+    bool isInserting = false,
+  }) {
+    final context = VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('share_id')) {
+      context.handle(
+        _shareIdMeta,
+        shareId.isAcceptableOrUnknown(data['share_id']!, _shareIdMeta),
+      );
+    }
+    if (data.containsKey('share')) {
+      context.handle(
+        _shareMeta,
+        share.isAcceptableOrUnknown(data['share']!, _shareMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_shareMeta);
+    }
+    if (data.containsKey('contact_id')) {
+      context.handle(
+        _contactIdMeta,
+        contactId.isAcceptableOrUnknown(data['contact_id']!, _contactIdMeta),
+      );
+    }
+    return context;
+  }
+
+  @override
+  Set<GeneratedColumn> get $primaryKey => {shareId};
+  @override
+  UserDiscoveryShare map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserDiscoveryShare(
+      shareId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}share_id'],
+      )!,
+      share: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}share'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      ),
+    );
+  }
+
+  @override
+  $UserDiscoverySharesTable createAlias(String alias) {
+    return $UserDiscoverySharesTable(attachedDatabase, alias);
+  }
+}
+
+class UserDiscoveryShare extends DataClass
+    implements Insertable<UserDiscoveryShare> {
+  final int shareId;
+  final Uint8List share;
+  final int? contactId;
+  const UserDiscoveryShare({
+    required this.shareId,
+    required this.share,
+    this.contactId,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['share_id'] = Variable<int>(shareId);
+    map['share'] = Variable<Uint8List>(share);
+    if (!nullToAbsent || contactId != null) {
+      map['contact_id'] = Variable<int>(contactId);
+    }
+    return map;
+  }
+
+  UserDiscoverySharesCompanion toCompanion(bool nullToAbsent) {
+    return UserDiscoverySharesCompanion(
+      shareId: Value(shareId),
+      share: Value(share),
+      contactId: contactId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(contactId),
+    );
+  }
+
+  factory UserDiscoveryShare.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserDiscoveryShare(
+      shareId: serializer.fromJson<int>(json['shareId']),
+      share: serializer.fromJson<Uint8List>(json['share']),
+      contactId: serializer.fromJson<int?>(json['contactId']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'shareId': serializer.toJson<int>(shareId),
+      'share': serializer.toJson<Uint8List>(share),
+      'contactId': serializer.toJson<int?>(contactId),
+    };
+  }
+
+  UserDiscoveryShare copyWith({
+    int? shareId,
+    Uint8List? share,
+    Value<int?> contactId = const Value.absent(),
+  }) => UserDiscoveryShare(
+    shareId: shareId ?? this.shareId,
+    share: share ?? this.share,
+    contactId: contactId.present ? contactId.value : this.contactId,
+  );
+  UserDiscoveryShare copyWithCompanion(UserDiscoverySharesCompanion data) {
+    return UserDiscoveryShare(
+      shareId: data.shareId.present ? data.shareId.value : this.shareId,
+      share: data.share.present ? data.share.value : this.share,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryShare(')
+          ..write('shareId: $shareId, ')
+          ..write('share: $share, ')
+          ..write('contactId: $contactId')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(shareId, $driftBlobEquality.hash(share), contactId);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserDiscoveryShare &&
+          other.shareId == this.shareId &&
+          $driftBlobEquality.equals(other.share, this.share) &&
+          other.contactId == this.contactId);
+}
+
+class UserDiscoverySharesCompanion extends UpdateCompanion<UserDiscoveryShare> {
+  final Value<int> shareId;
+  final Value<Uint8List> share;
+  final Value<int?> contactId;
+  const UserDiscoverySharesCompanion({
+    this.shareId = const Value.absent(),
+    this.share = const Value.absent(),
+    this.contactId = const Value.absent(),
+  });
+  UserDiscoverySharesCompanion.insert({
+    this.shareId = const Value.absent(),
+    required Uint8List share,
+    this.contactId = const Value.absent(),
+  }) : share = Value(share);
+  static Insertable<UserDiscoveryShare> custom({
+    Expression<int>? shareId,
+    Expression<Uint8List>? share,
+    Expression<int>? contactId,
+  }) {
+    return RawValuesInsertable({
+      if (shareId != null) 'share_id': shareId,
+      if (share != null) 'share': share,
+      if (contactId != null) 'contact_id': contactId,
+    });
+  }
+
+  UserDiscoverySharesCompanion copyWith({
+    Value<int>? shareId,
+    Value<Uint8List>? share,
+    Value<int?>? contactId,
+  }) {
+    return UserDiscoverySharesCompanion(
+      shareId: shareId ?? this.shareId,
+      share: share ?? this.share,
+      contactId: contactId ?? this.contactId,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (shareId.present) {
+      map['share_id'] = Variable<int>(shareId.value);
+    }
+    if (share.present) {
+      map['share'] = Variable<Uint8List>(share.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoverySharesCompanion(')
+          ..write('shareId: $shareId, ')
+          ..write('share: $share, ')
+          ..write('contactId: $contactId')
+          ..write(')'))
+        .toString();
+  }
+}
+
 abstract class _$TwonlyDB extends GeneratedDatabase {
   _$TwonlyDB(QueryExecutor e) : super(e);
   $TwonlyDBManager get managers => $TwonlyDBManager(this);
@@ -8831,12 +11482,33 @@ abstract class _$TwonlyDB extends GeneratedDatabase {
       $SignalSessionStoresTable(this);
   late final $MessageActionsTable messageActions = $MessageActionsTable(this);
   late final $GroupHistoriesTable groupHistories = $GroupHistoriesTable(this);
+  late final $KeyVerificationsTable keyVerifications = $KeyVerificationsTable(
+    this,
+  );
+  late final $VerificationTokensTable verificationTokens =
+      $VerificationTokensTable(this);
+  late final $UserDiscoveryAnnouncedUsersTable userDiscoveryAnnouncedUsers =
+      $UserDiscoveryAnnouncedUsersTable(this);
+  late final $UserDiscoveryUserRelationsTable userDiscoveryUserRelations =
+      $UserDiscoveryUserRelationsTable(this);
+  late final $UserDiscoveryOtherPromotionsTable userDiscoveryOtherPromotions =
+      $UserDiscoveryOtherPromotionsTable(this);
+  late final $UserDiscoveryOwnPromotionsTable userDiscoveryOwnPromotions =
+      $UserDiscoveryOwnPromotionsTable(this);
+  late final $UserDiscoverySharesTable userDiscoveryShares =
+      $UserDiscoverySharesTable(this);
   late final MessagesDao messagesDao = MessagesDao(this as TwonlyDB);
   late final ContactsDao contactsDao = ContactsDao(this as TwonlyDB);
   late final ReceiptsDao receiptsDao = ReceiptsDao(this as TwonlyDB);
   late final GroupsDao groupsDao = GroupsDao(this as TwonlyDB);
   late final ReactionsDao reactionsDao = ReactionsDao(this as TwonlyDB);
   late final MediaFilesDao mediaFilesDao = MediaFilesDao(this as TwonlyDB);
+  late final UserDiscoveryDao userDiscoveryDao = UserDiscoveryDao(
+    this as TwonlyDB,
+  );
+  late final KeyVerificationDao keyVerificationDao = KeyVerificationDao(
+    this as TwonlyDB,
+  );
   @override
   Iterable<TableInfo<Table, Object?>> get allTables =>
       allSchemaEntities.whereType<TableInfo<Table, Object?>>();
@@ -8857,6 +11529,13 @@ abstract class _$TwonlyDB extends GeneratedDatabase {
     signalSessionStores,
     messageActions,
     groupHistories,
+    keyVerifications,
+    verificationTokens,
+    userDiscoveryAnnouncedUsers,
+    userDiscoveryUserRelations,
+    userDiscoveryOtherPromotions,
+    userDiscoveryOwnPromotions,
+    userDiscoveryShares,
   ];
   @override
   StreamQueryUpdateRules get streamUpdateRules => const StreamQueryUpdateRules([
@@ -8944,6 +11623,56 @@ abstract class _$TwonlyDB extends GeneratedDatabase {
       ),
       result: [TableUpdate('group_histories', kind: UpdateKind.delete)],
     ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('key_verifications', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'user_discovery_announced_users',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [
+        TableUpdate('user_discovery_user_relations', kind: UpdateKind.delete),
+      ],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [
+        TableUpdate('user_discovery_user_relations', kind: UpdateKind.delete),
+      ],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [
+        TableUpdate('user_discovery_other_promotions', kind: UpdateKind.delete),
+      ],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [
+        TableUpdate('user_discovery_own_promotions', kind: UpdateKind.delete),
+      ],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('user_discovery_shares', kind: UpdateKind.delete)],
+    ),
   ]);
 }
 
@@ -8962,6 +11691,11 @@ typedef $$ContactsTableCreateCompanionBuilder =
       Value<bool> verified,
       Value<bool> accountDeleted,
       Value<DateTime> createdAt,
+      Value<Uint8List?> userDiscoveryVersion,
+      Value<bool> userDiscoveryExcluded,
+      Value<bool?> userDiscoveryManualApproved,
+      Value<int> mediaSendCounter,
+      Value<int> mediaReceivedCounter,
     });
 typedef $$ContactsTableUpdateCompanionBuilder =
     ContactsCompanion Function({
@@ -8978,6 +11712,11 @@ typedef $$ContactsTableUpdateCompanionBuilder =
       Value<bool> verified,
       Value<bool> accountDeleted,
       Value<DateTime> createdAt,
+      Value<Uint8List?> userDiscoveryVersion,
+      Value<bool> userDiscoveryExcluded,
+      Value<bool?> userDiscoveryManualApproved,
+      Value<int> mediaSendCounter,
+      Value<int> mediaReceivedCounter,
     });
 
 final class $$ContactsTableReferences
@@ -9124,6 +11863,153 @@ final class $$ContactsTableReferences
       manager.$state.copyWith(prefetchedData: cache),
     );
   }
+
+  static MultiTypedResultKey<$KeyVerificationsTable, List<KeyVerification>>
+  _keyVerificationsRefsTable(_$TwonlyDB db) => MultiTypedResultKey.fromTable(
+    db.keyVerifications,
+    aliasName: $_aliasNameGenerator(
+      db.contacts.userId,
+      db.keyVerifications.contactId,
+    ),
+  );
+
+  $$KeyVerificationsTableProcessedTableManager get keyVerificationsRefs {
+    final manager =
+        $$KeyVerificationsTableTableManager($_db, $_db.keyVerifications).filter(
+          (f) => f.contactId.userId.sqlEquals($_itemColumn<int>('user_id')!),
+        );
+
+    final cache = $_typedResult.readTableOrNull(
+      _keyVerificationsRefsTable($_db),
+    );
+    return ProcessedTableManager(
+      manager.$state.copyWith(prefetchedData: cache),
+    );
+  }
+
+  static MultiTypedResultKey<
+    $UserDiscoveryUserRelationsTable,
+    List<UserDiscoveryUserRelation>
+  >
+  _userDiscoveryUserRelationsRefsTable(_$TwonlyDB db) =>
+      MultiTypedResultKey.fromTable(
+        db.userDiscoveryUserRelations,
+        aliasName: $_aliasNameGenerator(
+          db.contacts.userId,
+          db.userDiscoveryUserRelations.fromContactId,
+        ),
+      );
+
+  $$UserDiscoveryUserRelationsTableProcessedTableManager
+  get userDiscoveryUserRelationsRefs {
+    final manager =
+        $$UserDiscoveryUserRelationsTableTableManager(
+          $_db,
+          $_db.userDiscoveryUserRelations,
+        ).filter(
+          (f) =>
+              f.fromContactId.userId.sqlEquals($_itemColumn<int>('user_id')!),
+        );
+
+    final cache = $_typedResult.readTableOrNull(
+      _userDiscoveryUserRelationsRefsTable($_db),
+    );
+    return ProcessedTableManager(
+      manager.$state.copyWith(prefetchedData: cache),
+    );
+  }
+
+  static MultiTypedResultKey<
+    $UserDiscoveryOtherPromotionsTable,
+    List<UserDiscoveryOtherPromotion>
+  >
+  _userDiscoveryOtherPromotionsRefsTable(_$TwonlyDB db) =>
+      MultiTypedResultKey.fromTable(
+        db.userDiscoveryOtherPromotions,
+        aliasName: $_aliasNameGenerator(
+          db.contacts.userId,
+          db.userDiscoveryOtherPromotions.fromContactId,
+        ),
+      );
+
+  $$UserDiscoveryOtherPromotionsTableProcessedTableManager
+  get userDiscoveryOtherPromotionsRefs {
+    final manager =
+        $$UserDiscoveryOtherPromotionsTableTableManager(
+          $_db,
+          $_db.userDiscoveryOtherPromotions,
+        ).filter(
+          (f) =>
+              f.fromContactId.userId.sqlEquals($_itemColumn<int>('user_id')!),
+        );
+
+    final cache = $_typedResult.readTableOrNull(
+      _userDiscoveryOtherPromotionsRefsTable($_db),
+    );
+    return ProcessedTableManager(
+      manager.$state.copyWith(prefetchedData: cache),
+    );
+  }
+
+  static MultiTypedResultKey<
+    $UserDiscoveryOwnPromotionsTable,
+    List<UserDiscoveryOwnPromotion>
+  >
+  _userDiscoveryOwnPromotionsRefsTable(_$TwonlyDB db) =>
+      MultiTypedResultKey.fromTable(
+        db.userDiscoveryOwnPromotions,
+        aliasName: $_aliasNameGenerator(
+          db.contacts.userId,
+          db.userDiscoveryOwnPromotions.contactId,
+        ),
+      );
+
+  $$UserDiscoveryOwnPromotionsTableProcessedTableManager
+  get userDiscoveryOwnPromotionsRefs {
+    final manager =
+        $$UserDiscoveryOwnPromotionsTableTableManager(
+          $_db,
+          $_db.userDiscoveryOwnPromotions,
+        ).filter(
+          (f) => f.contactId.userId.sqlEquals($_itemColumn<int>('user_id')!),
+        );
+
+    final cache = $_typedResult.readTableOrNull(
+      _userDiscoveryOwnPromotionsRefsTable($_db),
+    );
+    return ProcessedTableManager(
+      manager.$state.copyWith(prefetchedData: cache),
+    );
+  }
+
+  static MultiTypedResultKey<
+    $UserDiscoverySharesTable,
+    List<UserDiscoveryShare>
+  >
+  _userDiscoverySharesRefsTable(_$TwonlyDB db) => MultiTypedResultKey.fromTable(
+    db.userDiscoveryShares,
+    aliasName: $_aliasNameGenerator(
+      db.contacts.userId,
+      db.userDiscoveryShares.contactId,
+    ),
+  );
+
+  $$UserDiscoverySharesTableProcessedTableManager get userDiscoverySharesRefs {
+    final manager =
+        $$UserDiscoverySharesTableTableManager(
+          $_db,
+          $_db.userDiscoveryShares,
+        ).filter(
+          (f) => f.contactId.userId.sqlEquals($_itemColumn<int>('user_id')!),
+        );
+
+    final cache = $_typedResult.readTableOrNull(
+      _userDiscoverySharesRefsTable($_db),
+    );
+    return ProcessedTableManager(
+      manager.$state.copyWith(prefetchedData: cache),
+    );
+  }
 }
 
 class $$ContactsTableFilterComposer
@@ -9200,6 +12086,31 @@ class $$ContactsTableFilterComposer
     builder: (column) => ColumnFilters(column),
   );
 
+  ColumnFilters<Uint8List> get userDiscoveryVersion => $composableBuilder(
+    column: $table.userDiscoveryVersion,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<bool> get userDiscoveryExcluded => $composableBuilder(
+    column: $table.userDiscoveryExcluded,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<bool> get userDiscoveryManualApproved => $composableBuilder(
+    column: $table.userDiscoveryManualApproved,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<int> get mediaSendCounter => $composableBuilder(
+    column: $table.mediaSendCounter,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<int> get mediaReceivedCounter => $composableBuilder(
+    column: $table.mediaReceivedCounter,
+    builder: (column) => ColumnFilters(column),
+  );
+
   Expression<bool> messagesRefs(
     Expression<bool> Function($$MessagesTableFilterComposer f) f,
   ) {
@@ -9374,6 +12285,139 @@ class $$ContactsTableFilterComposer
     );
     return f(composer);
   }
+
+  Expression<bool> keyVerificationsRefs(
+    Expression<bool> Function($$KeyVerificationsTableFilterComposer f) f,
+  ) {
+    final $$KeyVerificationsTableFilterComposer composer = $composerBuilder(
+      composer: this,
+      getCurrentColumn: (t) => t.userId,
+      referencedTable: $db.keyVerifications,
+      getReferencedColumn: (t) => t.contactId,
+      builder:
+          (
+            joinBuilder, {
+            $addJoinBuilderToRootComposer,
+            $removeJoinBuilderFromRootComposer,
+          }) => $$KeyVerificationsTableFilterComposer(
+            $db: $db,
+            $table: $db.keyVerifications,
+            $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+            joinBuilder: joinBuilder,
+            $removeJoinBuilderFromRootComposer:
+                $removeJoinBuilderFromRootComposer,
+          ),
+    );
+    return f(composer);
+  }
+
+  Expression<bool> userDiscoveryUserRelationsRefs(
+    Expression<bool> Function($$UserDiscoveryUserRelationsTableFilterComposer f)
+    f,
+  ) {
+    final $$UserDiscoveryUserRelationsTableFilterComposer composer =
+        $composerBuilder(
+          composer: this,
+          getCurrentColumn: (t) => t.userId,
+          referencedTable: $db.userDiscoveryUserRelations,
+          getReferencedColumn: (t) => t.fromContactId,
+          builder:
+              (
+                joinBuilder, {
+                $addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer,
+              }) => $$UserDiscoveryUserRelationsTableFilterComposer(
+                $db: $db,
+                $table: $db.userDiscoveryUserRelations,
+                $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                joinBuilder: joinBuilder,
+                $removeJoinBuilderFromRootComposer:
+                    $removeJoinBuilderFromRootComposer,
+              ),
+        );
+    return f(composer);
+  }
+
+  Expression<bool> userDiscoveryOtherPromotionsRefs(
+    Expression<bool> Function(
+      $$UserDiscoveryOtherPromotionsTableFilterComposer f,
+    )
+    f,
+  ) {
+    final $$UserDiscoveryOtherPromotionsTableFilterComposer composer =
+        $composerBuilder(
+          composer: this,
+          getCurrentColumn: (t) => t.userId,
+          referencedTable: $db.userDiscoveryOtherPromotions,
+          getReferencedColumn: (t) => t.fromContactId,
+          builder:
+              (
+                joinBuilder, {
+                $addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer,
+              }) => $$UserDiscoveryOtherPromotionsTableFilterComposer(
+                $db: $db,
+                $table: $db.userDiscoveryOtherPromotions,
+                $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                joinBuilder: joinBuilder,
+                $removeJoinBuilderFromRootComposer:
+                    $removeJoinBuilderFromRootComposer,
+              ),
+        );
+    return f(composer);
+  }
+
+  Expression<bool> userDiscoveryOwnPromotionsRefs(
+    Expression<bool> Function($$UserDiscoveryOwnPromotionsTableFilterComposer f)
+    f,
+  ) {
+    final $$UserDiscoveryOwnPromotionsTableFilterComposer composer =
+        $composerBuilder(
+          composer: this,
+          getCurrentColumn: (t) => t.userId,
+          referencedTable: $db.userDiscoveryOwnPromotions,
+          getReferencedColumn: (t) => t.contactId,
+          builder:
+              (
+                joinBuilder, {
+                $addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer,
+              }) => $$UserDiscoveryOwnPromotionsTableFilterComposer(
+                $db: $db,
+                $table: $db.userDiscoveryOwnPromotions,
+                $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                joinBuilder: joinBuilder,
+                $removeJoinBuilderFromRootComposer:
+                    $removeJoinBuilderFromRootComposer,
+              ),
+        );
+    return f(composer);
+  }
+
+  Expression<bool> userDiscoverySharesRefs(
+    Expression<bool> Function($$UserDiscoverySharesTableFilterComposer f) f,
+  ) {
+    final $$UserDiscoverySharesTableFilterComposer composer = $composerBuilder(
+      composer: this,
+      getCurrentColumn: (t) => t.userId,
+      referencedTable: $db.userDiscoveryShares,
+      getReferencedColumn: (t) => t.contactId,
+      builder:
+          (
+            joinBuilder, {
+            $addJoinBuilderToRootComposer,
+            $removeJoinBuilderFromRootComposer,
+          }) => $$UserDiscoverySharesTableFilterComposer(
+            $db: $db,
+            $table: $db.userDiscoveryShares,
+            $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+            joinBuilder: joinBuilder,
+            $removeJoinBuilderFromRootComposer:
+                $removeJoinBuilderFromRootComposer,
+          ),
+    );
+    return f(composer);
+  }
 }
 
 class $$ContactsTableOrderingComposer
@@ -9449,6 +12493,31 @@ class $$ContactsTableOrderingComposer
     column: $table.createdAt,
     builder: (column) => ColumnOrderings(column),
   );
+
+  ColumnOrderings<Uint8List> get userDiscoveryVersion => $composableBuilder(
+    column: $table.userDiscoveryVersion,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<bool> get userDiscoveryExcluded => $composableBuilder(
+    column: $table.userDiscoveryExcluded,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<bool> get userDiscoveryManualApproved => $composableBuilder(
+    column: $table.userDiscoveryManualApproved,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<int> get mediaSendCounter => $composableBuilder(
+    column: $table.mediaSendCounter,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<int> get mediaReceivedCounter => $composableBuilder(
+    column: $table.mediaReceivedCounter,
+    builder: (column) => ColumnOrderings(column),
+  );
 }
 
 class $$ContactsTableAnnotationComposer
@@ -9509,6 +12578,31 @@ class $$ContactsTableAnnotationComposer
   GeneratedColumn<DateTime> get createdAt =>
       $composableBuilder(column: $table.createdAt, builder: (column) => column);
 
+  GeneratedColumn<Uint8List> get userDiscoveryVersion => $composableBuilder(
+    column: $table.userDiscoveryVersion,
+    builder: (column) => column,
+  );
+
+  GeneratedColumn<bool> get userDiscoveryExcluded => $composableBuilder(
+    column: $table.userDiscoveryExcluded,
+    builder: (column) => column,
+  );
+
+  GeneratedColumn<bool> get userDiscoveryManualApproved => $composableBuilder(
+    column: $table.userDiscoveryManualApproved,
+    builder: (column) => column,
+  );
+
+  GeneratedColumn<int> get mediaSendCounter => $composableBuilder(
+    column: $table.mediaSendCounter,
+    builder: (column) => column,
+  );
+
+  GeneratedColumn<int> get mediaReceivedCounter => $composableBuilder(
+    column: $table.mediaReceivedCounter,
+    builder: (column) => column,
+  );
+
   Expression<T> messagesRefs<T extends Object>(
     Expression<T> Function($$MessagesTableAnnotationComposer a) f,
   ) {
@@ -9683,6 +12777,144 @@ class $$ContactsTableAnnotationComposer
     );
     return f(composer);
   }
+
+  Expression<T> keyVerificationsRefs<T extends Object>(
+    Expression<T> Function($$KeyVerificationsTableAnnotationComposer a) f,
+  ) {
+    final $$KeyVerificationsTableAnnotationComposer composer = $composerBuilder(
+      composer: this,
+      getCurrentColumn: (t) => t.userId,
+      referencedTable: $db.keyVerifications,
+      getReferencedColumn: (t) => t.contactId,
+      builder:
+          (
+            joinBuilder, {
+            $addJoinBuilderToRootComposer,
+            $removeJoinBuilderFromRootComposer,
+          }) => $$KeyVerificationsTableAnnotationComposer(
+            $db: $db,
+            $table: $db.keyVerifications,
+            $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+            joinBuilder: joinBuilder,
+            $removeJoinBuilderFromRootComposer:
+                $removeJoinBuilderFromRootComposer,
+          ),
+    );
+    return f(composer);
+  }
+
+  Expression<T> userDiscoveryUserRelationsRefs<T extends Object>(
+    Expression<T> Function(
+      $$UserDiscoveryUserRelationsTableAnnotationComposer a,
+    )
+    f,
+  ) {
+    final $$UserDiscoveryUserRelationsTableAnnotationComposer composer =
+        $composerBuilder(
+          composer: this,
+          getCurrentColumn: (t) => t.userId,
+          referencedTable: $db.userDiscoveryUserRelations,
+          getReferencedColumn: (t) => t.fromContactId,
+          builder:
+              (
+                joinBuilder, {
+                $addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer,
+              }) => $$UserDiscoveryUserRelationsTableAnnotationComposer(
+                $db: $db,
+                $table: $db.userDiscoveryUserRelations,
+                $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                joinBuilder: joinBuilder,
+                $removeJoinBuilderFromRootComposer:
+                    $removeJoinBuilderFromRootComposer,
+              ),
+        );
+    return f(composer);
+  }
+
+  Expression<T> userDiscoveryOtherPromotionsRefs<T extends Object>(
+    Expression<T> Function(
+      $$UserDiscoveryOtherPromotionsTableAnnotationComposer a,
+    )
+    f,
+  ) {
+    final $$UserDiscoveryOtherPromotionsTableAnnotationComposer composer =
+        $composerBuilder(
+          composer: this,
+          getCurrentColumn: (t) => t.userId,
+          referencedTable: $db.userDiscoveryOtherPromotions,
+          getReferencedColumn: (t) => t.fromContactId,
+          builder:
+              (
+                joinBuilder, {
+                $addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer,
+              }) => $$UserDiscoveryOtherPromotionsTableAnnotationComposer(
+                $db: $db,
+                $table: $db.userDiscoveryOtherPromotions,
+                $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                joinBuilder: joinBuilder,
+                $removeJoinBuilderFromRootComposer:
+                    $removeJoinBuilderFromRootComposer,
+              ),
+        );
+    return f(composer);
+  }
+
+  Expression<T> userDiscoveryOwnPromotionsRefs<T extends Object>(
+    Expression<T> Function(
+      $$UserDiscoveryOwnPromotionsTableAnnotationComposer a,
+    )
+    f,
+  ) {
+    final $$UserDiscoveryOwnPromotionsTableAnnotationComposer composer =
+        $composerBuilder(
+          composer: this,
+          getCurrentColumn: (t) => t.userId,
+          referencedTable: $db.userDiscoveryOwnPromotions,
+          getReferencedColumn: (t) => t.contactId,
+          builder:
+              (
+                joinBuilder, {
+                $addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer,
+              }) => $$UserDiscoveryOwnPromotionsTableAnnotationComposer(
+                $db: $db,
+                $table: $db.userDiscoveryOwnPromotions,
+                $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                joinBuilder: joinBuilder,
+                $removeJoinBuilderFromRootComposer:
+                    $removeJoinBuilderFromRootComposer,
+              ),
+        );
+    return f(composer);
+  }
+
+  Expression<T> userDiscoverySharesRefs<T extends Object>(
+    Expression<T> Function($$UserDiscoverySharesTableAnnotationComposer a) f,
+  ) {
+    final $$UserDiscoverySharesTableAnnotationComposer composer =
+        $composerBuilder(
+          composer: this,
+          getCurrentColumn: (t) => t.userId,
+          referencedTable: $db.userDiscoveryShares,
+          getReferencedColumn: (t) => t.contactId,
+          builder:
+              (
+                joinBuilder, {
+                $addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer,
+              }) => $$UserDiscoverySharesTableAnnotationComposer(
+                $db: $db,
+                $table: $db.userDiscoveryShares,
+                $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                joinBuilder: joinBuilder,
+                $removeJoinBuilderFromRootComposer:
+                    $removeJoinBuilderFromRootComposer,
+              ),
+        );
+    return f(composer);
+  }
 }
 
 class $$ContactsTableTableManager
@@ -9706,6 +12938,11 @@ class $$ContactsTableTableManager
             bool receiptsRefs,
             bool messageActionsRefs,
             bool groupHistoriesRefs,
+            bool keyVerificationsRefs,
+            bool userDiscoveryUserRelationsRefs,
+            bool userDiscoveryOtherPromotionsRefs,
+            bool userDiscoveryOwnPromotionsRefs,
+            bool userDiscoverySharesRefs,
           })
         > {
   $$ContactsTableTableManager(_$TwonlyDB db, $ContactsTable table)
@@ -9734,6 +12971,11 @@ class $$ContactsTableTableManager
                 Value<bool> verified = const Value.absent(),
                 Value<bool> accountDeleted = const Value.absent(),
                 Value<DateTime> createdAt = const Value.absent(),
+                Value<Uint8List?> userDiscoveryVersion = const Value.absent(),
+                Value<bool> userDiscoveryExcluded = const Value.absent(),
+                Value<bool?> userDiscoveryManualApproved = const Value.absent(),
+                Value<int> mediaSendCounter = const Value.absent(),
+                Value<int> mediaReceivedCounter = const Value.absent(),
               }) => ContactsCompanion(
                 userId: userId,
                 username: username,
@@ -9748,6 +12990,11 @@ class $$ContactsTableTableManager
                 verified: verified,
                 accountDeleted: accountDeleted,
                 createdAt: createdAt,
+                userDiscoveryVersion: userDiscoveryVersion,
+                userDiscoveryExcluded: userDiscoveryExcluded,
+                userDiscoveryManualApproved: userDiscoveryManualApproved,
+                mediaSendCounter: mediaSendCounter,
+                mediaReceivedCounter: mediaReceivedCounter,
               ),
           createCompanionCallback:
               ({
@@ -9764,6 +13011,11 @@ class $$ContactsTableTableManager
                 Value<bool> verified = const Value.absent(),
                 Value<bool> accountDeleted = const Value.absent(),
                 Value<DateTime> createdAt = const Value.absent(),
+                Value<Uint8List?> userDiscoveryVersion = const Value.absent(),
+                Value<bool> userDiscoveryExcluded = const Value.absent(),
+                Value<bool?> userDiscoveryManualApproved = const Value.absent(),
+                Value<int> mediaSendCounter = const Value.absent(),
+                Value<int> mediaReceivedCounter = const Value.absent(),
               }) => ContactsCompanion.insert(
                 userId: userId,
                 username: username,
@@ -9778,6 +13030,11 @@ class $$ContactsTableTableManager
                 verified: verified,
                 accountDeleted: accountDeleted,
                 createdAt: createdAt,
+                userDiscoveryVersion: userDiscoveryVersion,
+                userDiscoveryExcluded: userDiscoveryExcluded,
+                userDiscoveryManualApproved: userDiscoveryManualApproved,
+                mediaSendCounter: mediaSendCounter,
+                mediaReceivedCounter: mediaReceivedCounter,
               ),
           withReferenceMapper: (p0) => p0
               .map(
@@ -9796,6 +13053,11 @@ class $$ContactsTableTableManager
                 receiptsRefs = false,
                 messageActionsRefs = false,
                 groupHistoriesRefs = false,
+                keyVerificationsRefs = false,
+                userDiscoveryUserRelationsRefs = false,
+                userDiscoveryOtherPromotionsRefs = false,
+                userDiscoveryOwnPromotionsRefs = false,
+                userDiscoverySharesRefs = false,
               }) {
                 return PrefetchHooks(
                   db: db,
@@ -9807,6 +13069,14 @@ class $$ContactsTableTableManager
                     if (receiptsRefs) db.receipts,
                     if (messageActionsRefs) db.messageActions,
                     if (groupHistoriesRefs) db.groupHistories,
+                    if (keyVerificationsRefs) db.keyVerifications,
+                    if (userDiscoveryUserRelationsRefs)
+                      db.userDiscoveryUserRelations,
+                    if (userDiscoveryOtherPromotionsRefs)
+                      db.userDiscoveryOtherPromotions,
+                    if (userDiscoveryOwnPromotionsRefs)
+                      db.userDiscoveryOwnPromotions,
+                    if (userDiscoverySharesRefs) db.userDiscoveryShares,
                   ],
                   addJoins: null,
                   getPrefetchedDataCallback: (items) async {
@@ -9958,6 +13228,111 @@ class $$ContactsTableTableManager
                               ),
                           typedResults: items,
                         ),
+                      if (keyVerificationsRefs)
+                        await $_getPrefetchedData<
+                          Contact,
+                          $ContactsTable,
+                          KeyVerification
+                        >(
+                          currentTable: table,
+                          referencedTable: $$ContactsTableReferences
+                              ._keyVerificationsRefsTable(db),
+                          managerFromTypedResult: (p0) =>
+                              $$ContactsTableReferences(
+                                db,
+                                table,
+                                p0,
+                              ).keyVerificationsRefs,
+                          referencedItemsForCurrentItem:
+                              (item, referencedItems) => referencedItems.where(
+                                (e) => e.contactId == item.userId,
+                              ),
+                          typedResults: items,
+                        ),
+                      if (userDiscoveryUserRelationsRefs)
+                        await $_getPrefetchedData<
+                          Contact,
+                          $ContactsTable,
+                          UserDiscoveryUserRelation
+                        >(
+                          currentTable: table,
+                          referencedTable: $$ContactsTableReferences
+                              ._userDiscoveryUserRelationsRefsTable(db),
+                          managerFromTypedResult: (p0) =>
+                              $$ContactsTableReferences(
+                                db,
+                                table,
+                                p0,
+                              ).userDiscoveryUserRelationsRefs,
+                          referencedItemsForCurrentItem:
+                              (item, referencedItems) => referencedItems.where(
+                                (e) => e.fromContactId == item.userId,
+                              ),
+                          typedResults: items,
+                        ),
+                      if (userDiscoveryOtherPromotionsRefs)
+                        await $_getPrefetchedData<
+                          Contact,
+                          $ContactsTable,
+                          UserDiscoveryOtherPromotion
+                        >(
+                          currentTable: table,
+                          referencedTable: $$ContactsTableReferences
+                              ._userDiscoveryOtherPromotionsRefsTable(db),
+                          managerFromTypedResult: (p0) =>
+                              $$ContactsTableReferences(
+                                db,
+                                table,
+                                p0,
+                              ).userDiscoveryOtherPromotionsRefs,
+                          referencedItemsForCurrentItem:
+                              (item, referencedItems) => referencedItems.where(
+                                (e) => e.fromContactId == item.userId,
+                              ),
+                          typedResults: items,
+                        ),
+                      if (userDiscoveryOwnPromotionsRefs)
+                        await $_getPrefetchedData<
+                          Contact,
+                          $ContactsTable,
+                          UserDiscoveryOwnPromotion
+                        >(
+                          currentTable: table,
+                          referencedTable: $$ContactsTableReferences
+                              ._userDiscoveryOwnPromotionsRefsTable(db),
+                          managerFromTypedResult: (p0) =>
+                              $$ContactsTableReferences(
+                                db,
+                                table,
+                                p0,
+                              ).userDiscoveryOwnPromotionsRefs,
+                          referencedItemsForCurrentItem:
+                              (item, referencedItems) => referencedItems.where(
+                                (e) => e.contactId == item.userId,
+                              ),
+                          typedResults: items,
+                        ),
+                      if (userDiscoverySharesRefs)
+                        await $_getPrefetchedData<
+                          Contact,
+                          $ContactsTable,
+                          UserDiscoveryShare
+                        >(
+                          currentTable: table,
+                          referencedTable: $$ContactsTableReferences
+                              ._userDiscoverySharesRefsTable(db),
+                          managerFromTypedResult: (p0) =>
+                              $$ContactsTableReferences(
+                                db,
+                                table,
+                                p0,
+                              ).userDiscoverySharesRefs,
+                          referencedItemsForCurrentItem:
+                              (item, referencedItems) => referencedItems.where(
+                                (e) => e.contactId == item.userId,
+                              ),
+                          typedResults: items,
+                        ),
                     ];
                   },
                 );
@@ -9986,6 +13361,11 @@ typedef $$ContactsTableProcessedTableManager =
         bool receiptsRefs,
         bool messageActionsRefs,
         bool groupHistoriesRefs,
+        bool keyVerificationsRefs,
+        bool userDiscoveryUserRelationsRefs,
+        bool userDiscoveryOtherPromotionsRefs,
+        bool userDiscoveryOwnPromotionsRefs,
+        bool userDiscoverySharesRefs,
       })
     >;
 typedef $$GroupsTableCreateCompanionBuilder =
@@ -16244,6 +19624,2241 @@ typedef $$GroupHistoriesTableProcessedTableManager =
       GroupHistory,
       PrefetchHooks Function({bool groupId, bool contactId})
     >;
+typedef $$KeyVerificationsTableCreateCompanionBuilder =
+    KeyVerificationsCompanion Function({
+      Value<int> verificationId,
+      required int contactId,
+      required VerificationType type,
+      Value<DateTime> createdAt,
+    });
+typedef $$KeyVerificationsTableUpdateCompanionBuilder =
+    KeyVerificationsCompanion Function({
+      Value<int> verificationId,
+      Value<int> contactId,
+      Value<VerificationType> type,
+      Value<DateTime> createdAt,
+    });
+
+final class $$KeyVerificationsTableReferences
+    extends
+        BaseReferences<_$TwonlyDB, $KeyVerificationsTable, KeyVerification> {
+  $$KeyVerificationsTableReferences(
+    super.$_db,
+    super.$_table,
+    super.$_typedResult,
+  );
+
+  static $ContactsTable _contactIdTable(_$TwonlyDB db) =>
+      db.contacts.createAlias(
+        $_aliasNameGenerator(db.keyVerifications.contactId, db.contacts.userId),
+      );
+
+  $$ContactsTableProcessedTableManager get contactId {
+    final $_column = $_itemColumn<int>('contact_id')!;
+
+    final manager = $$ContactsTableTableManager(
+      $_db,
+      $_db.contacts,
+    ).filter((f) => f.userId.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_contactIdTable($_db));
+    if (item == null) return manager;
+    return ProcessedTableManager(
+      manager.$state.copyWith(prefetchedData: [item]),
+    );
+  }
+}
+
+class $$KeyVerificationsTableFilterComposer
+    extends Composer<_$TwonlyDB, $KeyVerificationsTable> {
+  $$KeyVerificationsTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnFilters<int> get verificationId => $composableBuilder(
+    column: $table.verificationId,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnWithTypeConverterFilters<VerificationType, VerificationType, String>
+  get type => $composableBuilder(
+    column: $table.type,
+    builder: (column) => ColumnWithTypeConverterFilters(column),
+  );
+
+  ColumnFilters<DateTime> get createdAt => $composableBuilder(
+    column: $table.createdAt,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  $$ContactsTableFilterComposer get contactId {
+    final $$ContactsTableFilterComposer composer = $composerBuilder(
+      composer: this,
+      getCurrentColumn: (t) => t.contactId,
+      referencedTable: $db.contacts,
+      getReferencedColumn: (t) => t.userId,
+      builder:
+          (
+            joinBuilder, {
+            $addJoinBuilderToRootComposer,
+            $removeJoinBuilderFromRootComposer,
+          }) => $$ContactsTableFilterComposer(
+            $db: $db,
+            $table: $db.contacts,
+            $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+            joinBuilder: joinBuilder,
+            $removeJoinBuilderFromRootComposer:
+                $removeJoinBuilderFromRootComposer,
+          ),
+    );
+    return composer;
+  }
+}
+
+class $$KeyVerificationsTableOrderingComposer
+    extends Composer<_$TwonlyDB, $KeyVerificationsTable> {
+  $$KeyVerificationsTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnOrderings<int> get verificationId => $composableBuilder(
+    column: $table.verificationId,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get type => $composableBuilder(
+    column: $table.type,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<DateTime> get createdAt => $composableBuilder(
+    column: $table.createdAt,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  $$ContactsTableOrderingComposer get contactId {
+    final $$ContactsTableOrderingComposer composer = $composerBuilder(
+      composer: this,
+      getCurrentColumn: (t) => t.contactId,
+      referencedTable: $db.contacts,
+      getReferencedColumn: (t) => t.userId,
+      builder:
+          (
+            joinBuilder, {
+            $addJoinBuilderToRootComposer,
+            $removeJoinBuilderFromRootComposer,
+          }) => $$ContactsTableOrderingComposer(
+            $db: $db,
+            $table: $db.contacts,
+            $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+            joinBuilder: joinBuilder,
+            $removeJoinBuilderFromRootComposer:
+                $removeJoinBuilderFromRootComposer,
+          ),
+    );
+    return composer;
+  }
+}
+
+class $$KeyVerificationsTableAnnotationComposer
+    extends Composer<_$TwonlyDB, $KeyVerificationsTable> {
+  $$KeyVerificationsTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  GeneratedColumn<int> get verificationId => $composableBuilder(
+    column: $table.verificationId,
+    builder: (column) => column,
+  );
+
+  GeneratedColumnWithTypeConverter<VerificationType, String> get type =>
+      $composableBuilder(column: $table.type, builder: (column) => column);
+
+  GeneratedColumn<DateTime> get createdAt =>
+      $composableBuilder(column: $table.createdAt, builder: (column) => column);
+
+  $$ContactsTableAnnotationComposer get contactId {
+    final $$ContactsTableAnnotationComposer composer = $composerBuilder(
+      composer: this,
+      getCurrentColumn: (t) => t.contactId,
+      referencedTable: $db.contacts,
+      getReferencedColumn: (t) => t.userId,
+      builder:
+          (
+            joinBuilder, {
+            $addJoinBuilderToRootComposer,
+            $removeJoinBuilderFromRootComposer,
+          }) => $$ContactsTableAnnotationComposer(
+            $db: $db,
+            $table: $db.contacts,
+            $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+            joinBuilder: joinBuilder,
+            $removeJoinBuilderFromRootComposer:
+                $removeJoinBuilderFromRootComposer,
+          ),
+    );
+    return composer;
+  }
+}
+
+class $$KeyVerificationsTableTableManager
+    extends
+        RootTableManager<
+          _$TwonlyDB,
+          $KeyVerificationsTable,
+          KeyVerification,
+          $$KeyVerificationsTableFilterComposer,
+          $$KeyVerificationsTableOrderingComposer,
+          $$KeyVerificationsTableAnnotationComposer,
+          $$KeyVerificationsTableCreateCompanionBuilder,
+          $$KeyVerificationsTableUpdateCompanionBuilder,
+          (KeyVerification, $$KeyVerificationsTableReferences),
+          KeyVerification,
+          PrefetchHooks Function({bool contactId})
+        > {
+  $$KeyVerificationsTableTableManager(
+    _$TwonlyDB db,
+    $KeyVerificationsTable table,
+  ) : super(
+        TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              $$KeyVerificationsTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () =>
+              $$KeyVerificationsTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              $$KeyVerificationsTableAnnotationComposer($db: db, $table: table),
+          updateCompanionCallback:
+              ({
+                Value<int> verificationId = const Value.absent(),
+                Value<int> contactId = const Value.absent(),
+                Value<VerificationType> type = const Value.absent(),
+                Value<DateTime> createdAt = const Value.absent(),
+              }) => KeyVerificationsCompanion(
+                verificationId: verificationId,
+                contactId: contactId,
+                type: type,
+                createdAt: createdAt,
+              ),
+          createCompanionCallback:
+              ({
+                Value<int> verificationId = const Value.absent(),
+                required int contactId,
+                required VerificationType type,
+                Value<DateTime> createdAt = const Value.absent(),
+              }) => KeyVerificationsCompanion.insert(
+                verificationId: verificationId,
+                contactId: contactId,
+                type: type,
+                createdAt: createdAt,
+              ),
+          withReferenceMapper: (p0) => p0
+              .map(
+                (e) => (
+                  e.readTable(table),
+                  $$KeyVerificationsTableReferences(db, table, e),
+                ),
+              )
+              .toList(),
+          prefetchHooksCallback: ({contactId = false}) {
+            return PrefetchHooks(
+              db: db,
+              explicitlyWatchedTables: [],
+              addJoins:
+                  <
+                    T extends TableManagerState<
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic
+                    >
+                  >(state) {
+                    if (contactId) {
+                      state =
+                          state.withJoin(
+                                currentTable: table,
+                                currentColumn: table.contactId,
+                                referencedTable:
+                                    $$KeyVerificationsTableReferences
+                                        ._contactIdTable(db),
+                                referencedColumn:
+                                    $$KeyVerificationsTableReferences
+                                        ._contactIdTable(db)
+                                        .userId,
+                              )
+                              as T;
+                    }
+
+                    return state;
+                  },
+              getPrefetchedDataCallback: (items) async {
+                return [];
+              },
+            );
+          },
+        ),
+      );
+}
+
+typedef $$KeyVerificationsTableProcessedTableManager =
+    ProcessedTableManager<
+      _$TwonlyDB,
+      $KeyVerificationsTable,
+      KeyVerification,
+      $$KeyVerificationsTableFilterComposer,
+      $$KeyVerificationsTableOrderingComposer,
+      $$KeyVerificationsTableAnnotationComposer,
+      $$KeyVerificationsTableCreateCompanionBuilder,
+      $$KeyVerificationsTableUpdateCompanionBuilder,
+      (KeyVerification, $$KeyVerificationsTableReferences),
+      KeyVerification,
+      PrefetchHooks Function({bool contactId})
+    >;
+typedef $$VerificationTokensTableCreateCompanionBuilder =
+    VerificationTokensCompanion Function({
+      Value<int> tokenId,
+      required Uint8List token,
+      Value<DateTime> createdAt,
+    });
+typedef $$VerificationTokensTableUpdateCompanionBuilder =
+    VerificationTokensCompanion Function({
+      Value<int> tokenId,
+      Value<Uint8List> token,
+      Value<DateTime> createdAt,
+    });
+
+class $$VerificationTokensTableFilterComposer
+    extends Composer<_$TwonlyDB, $VerificationTokensTable> {
+  $$VerificationTokensTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnFilters<int> get tokenId => $composableBuilder(
+    column: $table.tokenId,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<Uint8List> get token => $composableBuilder(
+    column: $table.token,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<DateTime> get createdAt => $composableBuilder(
+    column: $table.createdAt,
+    builder: (column) => ColumnFilters(column),
+  );
+}
+
+class $$VerificationTokensTableOrderingComposer
+    extends Composer<_$TwonlyDB, $VerificationTokensTable> {
+  $$VerificationTokensTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnOrderings<int> get tokenId => $composableBuilder(
+    column: $table.tokenId,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<Uint8List> get token => $composableBuilder(
+    column: $table.token,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<DateTime> get createdAt => $composableBuilder(
+    column: $table.createdAt,
+    builder: (column) => ColumnOrderings(column),
+  );
+}
+
+class $$VerificationTokensTableAnnotationComposer
+    extends Composer<_$TwonlyDB, $VerificationTokensTable> {
+  $$VerificationTokensTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  GeneratedColumn<int> get tokenId =>
+      $composableBuilder(column: $table.tokenId, builder: (column) => column);
+
+  GeneratedColumn<Uint8List> get token =>
+      $composableBuilder(column: $table.token, builder: (column) => column);
+
+  GeneratedColumn<DateTime> get createdAt =>
+      $composableBuilder(column: $table.createdAt, builder: (column) => column);
+}
+
+class $$VerificationTokensTableTableManager
+    extends
+        RootTableManager<
+          _$TwonlyDB,
+          $VerificationTokensTable,
+          VerificationToken,
+          $$VerificationTokensTableFilterComposer,
+          $$VerificationTokensTableOrderingComposer,
+          $$VerificationTokensTableAnnotationComposer,
+          $$VerificationTokensTableCreateCompanionBuilder,
+          $$VerificationTokensTableUpdateCompanionBuilder,
+          (
+            VerificationToken,
+            BaseReferences<
+              _$TwonlyDB,
+              $VerificationTokensTable,
+              VerificationToken
+            >,
+          ),
+          VerificationToken,
+          PrefetchHooks Function()
+        > {
+  $$VerificationTokensTableTableManager(
+    _$TwonlyDB db,
+    $VerificationTokensTable table,
+  ) : super(
+        TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              $$VerificationTokensTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () =>
+              $$VerificationTokensTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              $$VerificationTokensTableAnnotationComposer(
+                $db: db,
+                $table: table,
+              ),
+          updateCompanionCallback:
+              ({
+                Value<int> tokenId = const Value.absent(),
+                Value<Uint8List> token = const Value.absent(),
+                Value<DateTime> createdAt = const Value.absent(),
+              }) => VerificationTokensCompanion(
+                tokenId: tokenId,
+                token: token,
+                createdAt: createdAt,
+              ),
+          createCompanionCallback:
+              ({
+                Value<int> tokenId = const Value.absent(),
+                required Uint8List token,
+                Value<DateTime> createdAt = const Value.absent(),
+              }) => VerificationTokensCompanion.insert(
+                tokenId: tokenId,
+                token: token,
+                createdAt: createdAt,
+              ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (e.readTable(table), BaseReferences(db, table, e)))
+              .toList(),
+          prefetchHooksCallback: null,
+        ),
+      );
+}
+
+typedef $$VerificationTokensTableProcessedTableManager =
+    ProcessedTableManager<
+      _$TwonlyDB,
+      $VerificationTokensTable,
+      VerificationToken,
+      $$VerificationTokensTableFilterComposer,
+      $$VerificationTokensTableOrderingComposer,
+      $$VerificationTokensTableAnnotationComposer,
+      $$VerificationTokensTableCreateCompanionBuilder,
+      $$VerificationTokensTableUpdateCompanionBuilder,
+      (
+        VerificationToken,
+        BaseReferences<_$TwonlyDB, $VerificationTokensTable, VerificationToken>,
+      ),
+      VerificationToken,
+      PrefetchHooks Function()
+    >;
+typedef $$UserDiscoveryAnnouncedUsersTableCreateCompanionBuilder =
+    UserDiscoveryAnnouncedUsersCompanion Function({
+      Value<int> announcedUserId,
+      required Uint8List announcedPublicKey,
+      required int publicId,
+      Value<String?> username,
+      Value<bool> wasShownToTheUser,
+      Value<bool> isHidden,
+    });
+typedef $$UserDiscoveryAnnouncedUsersTableUpdateCompanionBuilder =
+    UserDiscoveryAnnouncedUsersCompanion Function({
+      Value<int> announcedUserId,
+      Value<Uint8List> announcedPublicKey,
+      Value<int> publicId,
+      Value<String?> username,
+      Value<bool> wasShownToTheUser,
+      Value<bool> isHidden,
+    });
+
+final class $$UserDiscoveryAnnouncedUsersTableReferences
+    extends
+        BaseReferences<
+          _$TwonlyDB,
+          $UserDiscoveryAnnouncedUsersTable,
+          UserDiscoveryAnnouncedUser
+        > {
+  $$UserDiscoveryAnnouncedUsersTableReferences(
+    super.$_db,
+    super.$_table,
+    super.$_typedResult,
+  );
+
+  static MultiTypedResultKey<
+    $UserDiscoveryUserRelationsTable,
+    List<UserDiscoveryUserRelation>
+  >
+  _userDiscoveryUserRelationsRefsTable(_$TwonlyDB db) =>
+      MultiTypedResultKey.fromTable(
+        db.userDiscoveryUserRelations,
+        aliasName: $_aliasNameGenerator(
+          db.userDiscoveryAnnouncedUsers.announcedUserId,
+          db.userDiscoveryUserRelations.announcedUserId,
+        ),
+      );
+
+  $$UserDiscoveryUserRelationsTableProcessedTableManager
+  get userDiscoveryUserRelationsRefs {
+    final manager =
+        $$UserDiscoveryUserRelationsTableTableManager(
+          $_db,
+          $_db.userDiscoveryUserRelations,
+        ).filter(
+          (f) => f.announcedUserId.announcedUserId.sqlEquals(
+            $_itemColumn<int>('announced_user_id')!,
+          ),
+        );
+
+    final cache = $_typedResult.readTableOrNull(
+      _userDiscoveryUserRelationsRefsTable($_db),
+    );
+    return ProcessedTableManager(
+      manager.$state.copyWith(prefetchedData: cache),
+    );
+  }
+}
+
+class $$UserDiscoveryAnnouncedUsersTableFilterComposer
+    extends Composer<_$TwonlyDB, $UserDiscoveryAnnouncedUsersTable> {
+  $$UserDiscoveryAnnouncedUsersTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnFilters<int> get announcedUserId => $composableBuilder(
+    column: $table.announcedUserId,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<Uint8List> get announcedPublicKey => $composableBuilder(
+    column: $table.announcedPublicKey,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<int> get publicId => $composableBuilder(
+    column: $table.publicId,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<String> get username => $composableBuilder(
+    column: $table.username,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<bool> get wasShownToTheUser => $composableBuilder(
+    column: $table.wasShownToTheUser,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<bool> get isHidden => $composableBuilder(
+    column: $table.isHidden,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  Expression<bool> userDiscoveryUserRelationsRefs(
+    Expression<bool> Function($$UserDiscoveryUserRelationsTableFilterComposer f)
+    f,
+  ) {
+    final $$UserDiscoveryUserRelationsTableFilterComposer composer =
+        $composerBuilder(
+          composer: this,
+          getCurrentColumn: (t) => t.announcedUserId,
+          referencedTable: $db.userDiscoveryUserRelations,
+          getReferencedColumn: (t) => t.announcedUserId,
+          builder:
+              (
+                joinBuilder, {
+                $addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer,
+              }) => $$UserDiscoveryUserRelationsTableFilterComposer(
+                $db: $db,
+                $table: $db.userDiscoveryUserRelations,
+                $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                joinBuilder: joinBuilder,
+                $removeJoinBuilderFromRootComposer:
+                    $removeJoinBuilderFromRootComposer,
+              ),
+        );
+    return f(composer);
+  }
+}
+
+class $$UserDiscoveryAnnouncedUsersTableOrderingComposer
+    extends Composer<_$TwonlyDB, $UserDiscoveryAnnouncedUsersTable> {
+  $$UserDiscoveryAnnouncedUsersTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnOrderings<int> get announcedUserId => $composableBuilder(
+    column: $table.announcedUserId,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<Uint8List> get announcedPublicKey => $composableBuilder(
+    column: $table.announcedPublicKey,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<int> get publicId => $composableBuilder(
+    column: $table.publicId,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get username => $composableBuilder(
+    column: $table.username,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<bool> get wasShownToTheUser => $composableBuilder(
+    column: $table.wasShownToTheUser,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<bool> get isHidden => $composableBuilder(
+    column: $table.isHidden,
+    builder: (column) => ColumnOrderings(column),
+  );
+}
+
+class $$UserDiscoveryAnnouncedUsersTableAnnotationComposer
+    extends Composer<_$TwonlyDB, $UserDiscoveryAnnouncedUsersTable> {
+  $$UserDiscoveryAnnouncedUsersTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  GeneratedColumn<int> get announcedUserId => $composableBuilder(
+    column: $table.announcedUserId,
+    builder: (column) => column,
+  );
+
+  GeneratedColumn<Uint8List> get announcedPublicKey => $composableBuilder(
+    column: $table.announcedPublicKey,
+    builder: (column) => column,
+  );
+
+  GeneratedColumn<int> get publicId =>
+      $composableBuilder(column: $table.publicId, builder: (column) => column);
+
+  GeneratedColumn<String> get username =>
+      $composableBuilder(column: $table.username, builder: (column) => column);
+
+  GeneratedColumn<bool> get wasShownToTheUser => $composableBuilder(
+    column: $table.wasShownToTheUser,
+    builder: (column) => column,
+  );
+
+  GeneratedColumn<bool> get isHidden =>
+      $composableBuilder(column: $table.isHidden, builder: (column) => column);
+
+  Expression<T> userDiscoveryUserRelationsRefs<T extends Object>(
+    Expression<T> Function(
+      $$UserDiscoveryUserRelationsTableAnnotationComposer a,
+    )
+    f,
+  ) {
+    final $$UserDiscoveryUserRelationsTableAnnotationComposer composer =
+        $composerBuilder(
+          composer: this,
+          getCurrentColumn: (t) => t.announcedUserId,
+          referencedTable: $db.userDiscoveryUserRelations,
+          getReferencedColumn: (t) => t.announcedUserId,
+          builder:
+              (
+                joinBuilder, {
+                $addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer,
+              }) => $$UserDiscoveryUserRelationsTableAnnotationComposer(
+                $db: $db,
+                $table: $db.userDiscoveryUserRelations,
+                $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                joinBuilder: joinBuilder,
+                $removeJoinBuilderFromRootComposer:
+                    $removeJoinBuilderFromRootComposer,
+              ),
+        );
+    return f(composer);
+  }
+}
+
+class $$UserDiscoveryAnnouncedUsersTableTableManager
+    extends
+        RootTableManager<
+          _$TwonlyDB,
+          $UserDiscoveryAnnouncedUsersTable,
+          UserDiscoveryAnnouncedUser,
+          $$UserDiscoveryAnnouncedUsersTableFilterComposer,
+          $$UserDiscoveryAnnouncedUsersTableOrderingComposer,
+          $$UserDiscoveryAnnouncedUsersTableAnnotationComposer,
+          $$UserDiscoveryAnnouncedUsersTableCreateCompanionBuilder,
+          $$UserDiscoveryAnnouncedUsersTableUpdateCompanionBuilder,
+          (
+            UserDiscoveryAnnouncedUser,
+            $$UserDiscoveryAnnouncedUsersTableReferences,
+          ),
+          UserDiscoveryAnnouncedUser,
+          PrefetchHooks Function({bool userDiscoveryUserRelationsRefs})
+        > {
+  $$UserDiscoveryAnnouncedUsersTableTableManager(
+    _$TwonlyDB db,
+    $UserDiscoveryAnnouncedUsersTable table,
+  ) : super(
+        TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              $$UserDiscoveryAnnouncedUsersTableFilterComposer(
+                $db: db,
+                $table: table,
+              ),
+          createOrderingComposer: () =>
+              $$UserDiscoveryAnnouncedUsersTableOrderingComposer(
+                $db: db,
+                $table: table,
+              ),
+          createComputedFieldComposer: () =>
+              $$UserDiscoveryAnnouncedUsersTableAnnotationComposer(
+                $db: db,
+                $table: table,
+              ),
+          updateCompanionCallback:
+              ({
+                Value<int> announcedUserId = const Value.absent(),
+                Value<Uint8List> announcedPublicKey = const Value.absent(),
+                Value<int> publicId = const Value.absent(),
+                Value<String?> username = const Value.absent(),
+                Value<bool> wasShownToTheUser = const Value.absent(),
+                Value<bool> isHidden = const Value.absent(),
+              }) => UserDiscoveryAnnouncedUsersCompanion(
+                announcedUserId: announcedUserId,
+                announcedPublicKey: announcedPublicKey,
+                publicId: publicId,
+                username: username,
+                wasShownToTheUser: wasShownToTheUser,
+                isHidden: isHidden,
+              ),
+          createCompanionCallback:
+              ({
+                Value<int> announcedUserId = const Value.absent(),
+                required Uint8List announcedPublicKey,
+                required int publicId,
+                Value<String?> username = const Value.absent(),
+                Value<bool> wasShownToTheUser = const Value.absent(),
+                Value<bool> isHidden = const Value.absent(),
+              }) => UserDiscoveryAnnouncedUsersCompanion.insert(
+                announcedUserId: announcedUserId,
+                announcedPublicKey: announcedPublicKey,
+                publicId: publicId,
+                username: username,
+                wasShownToTheUser: wasShownToTheUser,
+                isHidden: isHidden,
+              ),
+          withReferenceMapper: (p0) => p0
+              .map(
+                (e) => (
+                  e.readTable(table),
+                  $$UserDiscoveryAnnouncedUsersTableReferences(db, table, e),
+                ),
+              )
+              .toList(),
+          prefetchHooksCallback: ({userDiscoveryUserRelationsRefs = false}) {
+            return PrefetchHooks(
+              db: db,
+              explicitlyWatchedTables: [
+                if (userDiscoveryUserRelationsRefs)
+                  db.userDiscoveryUserRelations,
+              ],
+              addJoins: null,
+              getPrefetchedDataCallback: (items) async {
+                return [
+                  if (userDiscoveryUserRelationsRefs)
+                    await $_getPrefetchedData<
+                      UserDiscoveryAnnouncedUser,
+                      $UserDiscoveryAnnouncedUsersTable,
+                      UserDiscoveryUserRelation
+                    >(
+                      currentTable: table,
+                      referencedTable:
+                          $$UserDiscoveryAnnouncedUsersTableReferences
+                              ._userDiscoveryUserRelationsRefsTable(db),
+                      managerFromTypedResult: (p0) =>
+                          $$UserDiscoveryAnnouncedUsersTableReferences(
+                            db,
+                            table,
+                            p0,
+                          ).userDiscoveryUserRelationsRefs,
+                      referencedItemsForCurrentItem: (item, referencedItems) =>
+                          referencedItems.where(
+                            (e) => e.announcedUserId == item.announcedUserId,
+                          ),
+                      typedResults: items,
+                    ),
+                ];
+              },
+            );
+          },
+        ),
+      );
+}
+
+typedef $$UserDiscoveryAnnouncedUsersTableProcessedTableManager =
+    ProcessedTableManager<
+      _$TwonlyDB,
+      $UserDiscoveryAnnouncedUsersTable,
+      UserDiscoveryAnnouncedUser,
+      $$UserDiscoveryAnnouncedUsersTableFilterComposer,
+      $$UserDiscoveryAnnouncedUsersTableOrderingComposer,
+      $$UserDiscoveryAnnouncedUsersTableAnnotationComposer,
+      $$UserDiscoveryAnnouncedUsersTableCreateCompanionBuilder,
+      $$UserDiscoveryAnnouncedUsersTableUpdateCompanionBuilder,
+      (
+        UserDiscoveryAnnouncedUser,
+        $$UserDiscoveryAnnouncedUsersTableReferences,
+      ),
+      UserDiscoveryAnnouncedUser,
+      PrefetchHooks Function({bool userDiscoveryUserRelationsRefs})
+    >;
+typedef $$UserDiscoveryUserRelationsTableCreateCompanionBuilder =
+    UserDiscoveryUserRelationsCompanion Function({
+      required int announcedUserId,
+      required int fromContactId,
+      Value<DateTime?> publicKeyVerifiedTimestamp,
+      Value<int> rowid,
+    });
+typedef $$UserDiscoveryUserRelationsTableUpdateCompanionBuilder =
+    UserDiscoveryUserRelationsCompanion Function({
+      Value<int> announcedUserId,
+      Value<int> fromContactId,
+      Value<DateTime?> publicKeyVerifiedTimestamp,
+      Value<int> rowid,
+    });
+
+final class $$UserDiscoveryUserRelationsTableReferences
+    extends
+        BaseReferences<
+          _$TwonlyDB,
+          $UserDiscoveryUserRelationsTable,
+          UserDiscoveryUserRelation
+        > {
+  $$UserDiscoveryUserRelationsTableReferences(
+    super.$_db,
+    super.$_table,
+    super.$_typedResult,
+  );
+
+  static $UserDiscoveryAnnouncedUsersTable _announcedUserIdTable(
+    _$TwonlyDB db,
+  ) => db.userDiscoveryAnnouncedUsers.createAlias(
+    $_aliasNameGenerator(
+      db.userDiscoveryUserRelations.announcedUserId,
+      db.userDiscoveryAnnouncedUsers.announcedUserId,
+    ),
+  );
+
+  $$UserDiscoveryAnnouncedUsersTableProcessedTableManager get announcedUserId {
+    final $_column = $_itemColumn<int>('announced_user_id')!;
+
+    final manager = $$UserDiscoveryAnnouncedUsersTableTableManager(
+      $_db,
+      $_db.userDiscoveryAnnouncedUsers,
+    ).filter((f) => f.announcedUserId.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_announcedUserIdTable($_db));
+    if (item == null) return manager;
+    return ProcessedTableManager(
+      manager.$state.copyWith(prefetchedData: [item]),
+    );
+  }
+
+  static $ContactsTable _fromContactIdTable(_$TwonlyDB db) =>
+      db.contacts.createAlias(
+        $_aliasNameGenerator(
+          db.userDiscoveryUserRelations.fromContactId,
+          db.contacts.userId,
+        ),
+      );
+
+  $$ContactsTableProcessedTableManager get fromContactId {
+    final $_column = $_itemColumn<int>('from_contact_id')!;
+
+    final manager = $$ContactsTableTableManager(
+      $_db,
+      $_db.contacts,
+    ).filter((f) => f.userId.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_fromContactIdTable($_db));
+    if (item == null) return manager;
+    return ProcessedTableManager(
+      manager.$state.copyWith(prefetchedData: [item]),
+    );
+  }
+}
+
+class $$UserDiscoveryUserRelationsTableFilterComposer
+    extends Composer<_$TwonlyDB, $UserDiscoveryUserRelationsTable> {
+  $$UserDiscoveryUserRelationsTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnFilters<DateTime> get publicKeyVerifiedTimestamp => $composableBuilder(
+    column: $table.publicKeyVerifiedTimestamp,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  $$UserDiscoveryAnnouncedUsersTableFilterComposer get announcedUserId {
+    final $$UserDiscoveryAnnouncedUsersTableFilterComposer composer =
+        $composerBuilder(
+          composer: this,
+          getCurrentColumn: (t) => t.announcedUserId,
+          referencedTable: $db.userDiscoveryAnnouncedUsers,
+          getReferencedColumn: (t) => t.announcedUserId,
+          builder:
+              (
+                joinBuilder, {
+                $addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer,
+              }) => $$UserDiscoveryAnnouncedUsersTableFilterComposer(
+                $db: $db,
+                $table: $db.userDiscoveryAnnouncedUsers,
+                $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                joinBuilder: joinBuilder,
+                $removeJoinBuilderFromRootComposer:
+                    $removeJoinBuilderFromRootComposer,
+              ),
+        );
+    return composer;
+  }
+
+  $$ContactsTableFilterComposer get fromContactId {
+    final $$ContactsTableFilterComposer composer = $composerBuilder(
+      composer: this,
+      getCurrentColumn: (t) => t.fromContactId,
+      referencedTable: $db.contacts,
+      getReferencedColumn: (t) => t.userId,
+      builder:
+          (
+            joinBuilder, {
+            $addJoinBuilderToRootComposer,
+            $removeJoinBuilderFromRootComposer,
+          }) => $$ContactsTableFilterComposer(
+            $db: $db,
+            $table: $db.contacts,
+            $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+            joinBuilder: joinBuilder,
+            $removeJoinBuilderFromRootComposer:
+                $removeJoinBuilderFromRootComposer,
+          ),
+    );
+    return composer;
+  }
+}
+
+class $$UserDiscoveryUserRelationsTableOrderingComposer
+    extends Composer<_$TwonlyDB, $UserDiscoveryUserRelationsTable> {
+  $$UserDiscoveryUserRelationsTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnOrderings<DateTime> get publicKeyVerifiedTimestamp =>
+      $composableBuilder(
+        column: $table.publicKeyVerifiedTimestamp,
+        builder: (column) => ColumnOrderings(column),
+      );
+
+  $$UserDiscoveryAnnouncedUsersTableOrderingComposer get announcedUserId {
+    final $$UserDiscoveryAnnouncedUsersTableOrderingComposer composer =
+        $composerBuilder(
+          composer: this,
+          getCurrentColumn: (t) => t.announcedUserId,
+          referencedTable: $db.userDiscoveryAnnouncedUsers,
+          getReferencedColumn: (t) => t.announcedUserId,
+          builder:
+              (
+                joinBuilder, {
+                $addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer,
+              }) => $$UserDiscoveryAnnouncedUsersTableOrderingComposer(
+                $db: $db,
+                $table: $db.userDiscoveryAnnouncedUsers,
+                $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                joinBuilder: joinBuilder,
+                $removeJoinBuilderFromRootComposer:
+                    $removeJoinBuilderFromRootComposer,
+              ),
+        );
+    return composer;
+  }
+
+  $$ContactsTableOrderingComposer get fromContactId {
+    final $$ContactsTableOrderingComposer composer = $composerBuilder(
+      composer: this,
+      getCurrentColumn: (t) => t.fromContactId,
+      referencedTable: $db.contacts,
+      getReferencedColumn: (t) => t.userId,
+      builder:
+          (
+            joinBuilder, {
+            $addJoinBuilderToRootComposer,
+            $removeJoinBuilderFromRootComposer,
+          }) => $$ContactsTableOrderingComposer(
+            $db: $db,
+            $table: $db.contacts,
+            $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+            joinBuilder: joinBuilder,
+            $removeJoinBuilderFromRootComposer:
+                $removeJoinBuilderFromRootComposer,
+          ),
+    );
+    return composer;
+  }
+}
+
+class $$UserDiscoveryUserRelationsTableAnnotationComposer
+    extends Composer<_$TwonlyDB, $UserDiscoveryUserRelationsTable> {
+  $$UserDiscoveryUserRelationsTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  GeneratedColumn<DateTime> get publicKeyVerifiedTimestamp =>
+      $composableBuilder(
+        column: $table.publicKeyVerifiedTimestamp,
+        builder: (column) => column,
+      );
+
+  $$UserDiscoveryAnnouncedUsersTableAnnotationComposer get announcedUserId {
+    final $$UserDiscoveryAnnouncedUsersTableAnnotationComposer composer =
+        $composerBuilder(
+          composer: this,
+          getCurrentColumn: (t) => t.announcedUserId,
+          referencedTable: $db.userDiscoveryAnnouncedUsers,
+          getReferencedColumn: (t) => t.announcedUserId,
+          builder:
+              (
+                joinBuilder, {
+                $addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer,
+              }) => $$UserDiscoveryAnnouncedUsersTableAnnotationComposer(
+                $db: $db,
+                $table: $db.userDiscoveryAnnouncedUsers,
+                $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                joinBuilder: joinBuilder,
+                $removeJoinBuilderFromRootComposer:
+                    $removeJoinBuilderFromRootComposer,
+              ),
+        );
+    return composer;
+  }
+
+  $$ContactsTableAnnotationComposer get fromContactId {
+    final $$ContactsTableAnnotationComposer composer = $composerBuilder(
+      composer: this,
+      getCurrentColumn: (t) => t.fromContactId,
+      referencedTable: $db.contacts,
+      getReferencedColumn: (t) => t.userId,
+      builder:
+          (
+            joinBuilder, {
+            $addJoinBuilderToRootComposer,
+            $removeJoinBuilderFromRootComposer,
+          }) => $$ContactsTableAnnotationComposer(
+            $db: $db,
+            $table: $db.contacts,
+            $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+            joinBuilder: joinBuilder,
+            $removeJoinBuilderFromRootComposer:
+                $removeJoinBuilderFromRootComposer,
+          ),
+    );
+    return composer;
+  }
+}
+
+class $$UserDiscoveryUserRelationsTableTableManager
+    extends
+        RootTableManager<
+          _$TwonlyDB,
+          $UserDiscoveryUserRelationsTable,
+          UserDiscoveryUserRelation,
+          $$UserDiscoveryUserRelationsTableFilterComposer,
+          $$UserDiscoveryUserRelationsTableOrderingComposer,
+          $$UserDiscoveryUserRelationsTableAnnotationComposer,
+          $$UserDiscoveryUserRelationsTableCreateCompanionBuilder,
+          $$UserDiscoveryUserRelationsTableUpdateCompanionBuilder,
+          (
+            UserDiscoveryUserRelation,
+            $$UserDiscoveryUserRelationsTableReferences,
+          ),
+          UserDiscoveryUserRelation,
+          PrefetchHooks Function({bool announcedUserId, bool fromContactId})
+        > {
+  $$UserDiscoveryUserRelationsTableTableManager(
+    _$TwonlyDB db,
+    $UserDiscoveryUserRelationsTable table,
+  ) : super(
+        TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              $$UserDiscoveryUserRelationsTableFilterComposer(
+                $db: db,
+                $table: table,
+              ),
+          createOrderingComposer: () =>
+              $$UserDiscoveryUserRelationsTableOrderingComposer(
+                $db: db,
+                $table: table,
+              ),
+          createComputedFieldComposer: () =>
+              $$UserDiscoveryUserRelationsTableAnnotationComposer(
+                $db: db,
+                $table: table,
+              ),
+          updateCompanionCallback:
+              ({
+                Value<int> announcedUserId = const Value.absent(),
+                Value<int> fromContactId = const Value.absent(),
+                Value<DateTime?> publicKeyVerifiedTimestamp =
+                    const Value.absent(),
+                Value<int> rowid = const Value.absent(),
+              }) => UserDiscoveryUserRelationsCompanion(
+                announcedUserId: announcedUserId,
+                fromContactId: fromContactId,
+                publicKeyVerifiedTimestamp: publicKeyVerifiedTimestamp,
+                rowid: rowid,
+              ),
+          createCompanionCallback:
+              ({
+                required int announcedUserId,
+                required int fromContactId,
+                Value<DateTime?> publicKeyVerifiedTimestamp =
+                    const Value.absent(),
+                Value<int> rowid = const Value.absent(),
+              }) => UserDiscoveryUserRelationsCompanion.insert(
+                announcedUserId: announcedUserId,
+                fromContactId: fromContactId,
+                publicKeyVerifiedTimestamp: publicKeyVerifiedTimestamp,
+                rowid: rowid,
+              ),
+          withReferenceMapper: (p0) => p0
+              .map(
+                (e) => (
+                  e.readTable(table),
+                  $$UserDiscoveryUserRelationsTableReferences(db, table, e),
+                ),
+              )
+              .toList(),
+          prefetchHooksCallback: ({announcedUserId = false, fromContactId = false}) {
+            return PrefetchHooks(
+              db: db,
+              explicitlyWatchedTables: [],
+              addJoins:
+                  <
+                    T extends TableManagerState<
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic
+                    >
+                  >(state) {
+                    if (announcedUserId) {
+                      state =
+                          state.withJoin(
+                                currentTable: table,
+                                currentColumn: table.announcedUserId,
+                                referencedTable:
+                                    $$UserDiscoveryUserRelationsTableReferences
+                                        ._announcedUserIdTable(db),
+                                referencedColumn:
+                                    $$UserDiscoveryUserRelationsTableReferences
+                                        ._announcedUserIdTable(db)
+                                        .announcedUserId,
+                              )
+                              as T;
+                    }
+                    if (fromContactId) {
+                      state =
+                          state.withJoin(
+                                currentTable: table,
+                                currentColumn: table.fromContactId,
+                                referencedTable:
+                                    $$UserDiscoveryUserRelationsTableReferences
+                                        ._fromContactIdTable(db),
+                                referencedColumn:
+                                    $$UserDiscoveryUserRelationsTableReferences
+                                        ._fromContactIdTable(db)
+                                        .userId,
+                              )
+                              as T;
+                    }
+
+                    return state;
+                  },
+              getPrefetchedDataCallback: (items) async {
+                return [];
+              },
+            );
+          },
+        ),
+      );
+}
+
+typedef $$UserDiscoveryUserRelationsTableProcessedTableManager =
+    ProcessedTableManager<
+      _$TwonlyDB,
+      $UserDiscoveryUserRelationsTable,
+      UserDiscoveryUserRelation,
+      $$UserDiscoveryUserRelationsTableFilterComposer,
+      $$UserDiscoveryUserRelationsTableOrderingComposer,
+      $$UserDiscoveryUserRelationsTableAnnotationComposer,
+      $$UserDiscoveryUserRelationsTableCreateCompanionBuilder,
+      $$UserDiscoveryUserRelationsTableUpdateCompanionBuilder,
+      (UserDiscoveryUserRelation, $$UserDiscoveryUserRelationsTableReferences),
+      UserDiscoveryUserRelation,
+      PrefetchHooks Function({bool announcedUserId, bool fromContactId})
+    >;
+typedef $$UserDiscoveryOtherPromotionsTableCreateCompanionBuilder =
+    UserDiscoveryOtherPromotionsCompanion Function({
+      required int fromContactId,
+      required int promotionId,
+      required int publicId,
+      required int threshold,
+      required Uint8List announcementShare,
+      Value<DateTime?> publicKeyVerifiedTimestamp,
+      Value<int> rowid,
+    });
+typedef $$UserDiscoveryOtherPromotionsTableUpdateCompanionBuilder =
+    UserDiscoveryOtherPromotionsCompanion Function({
+      Value<int> fromContactId,
+      Value<int> promotionId,
+      Value<int> publicId,
+      Value<int> threshold,
+      Value<Uint8List> announcementShare,
+      Value<DateTime?> publicKeyVerifiedTimestamp,
+      Value<int> rowid,
+    });
+
+final class $$UserDiscoveryOtherPromotionsTableReferences
+    extends
+        BaseReferences<
+          _$TwonlyDB,
+          $UserDiscoveryOtherPromotionsTable,
+          UserDiscoveryOtherPromotion
+        > {
+  $$UserDiscoveryOtherPromotionsTableReferences(
+    super.$_db,
+    super.$_table,
+    super.$_typedResult,
+  );
+
+  static $ContactsTable _fromContactIdTable(_$TwonlyDB db) =>
+      db.contacts.createAlias(
+        $_aliasNameGenerator(
+          db.userDiscoveryOtherPromotions.fromContactId,
+          db.contacts.userId,
+        ),
+      );
+
+  $$ContactsTableProcessedTableManager get fromContactId {
+    final $_column = $_itemColumn<int>('from_contact_id')!;
+
+    final manager = $$ContactsTableTableManager(
+      $_db,
+      $_db.contacts,
+    ).filter((f) => f.userId.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_fromContactIdTable($_db));
+    if (item == null) return manager;
+    return ProcessedTableManager(
+      manager.$state.copyWith(prefetchedData: [item]),
+    );
+  }
+}
+
+class $$UserDiscoveryOtherPromotionsTableFilterComposer
+    extends Composer<_$TwonlyDB, $UserDiscoveryOtherPromotionsTable> {
+  $$UserDiscoveryOtherPromotionsTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnFilters<int> get promotionId => $composableBuilder(
+    column: $table.promotionId,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<int> get publicId => $composableBuilder(
+    column: $table.publicId,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<int> get threshold => $composableBuilder(
+    column: $table.threshold,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<Uint8List> get announcementShare => $composableBuilder(
+    column: $table.announcementShare,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<DateTime> get publicKeyVerifiedTimestamp => $composableBuilder(
+    column: $table.publicKeyVerifiedTimestamp,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  $$ContactsTableFilterComposer get fromContactId {
+    final $$ContactsTableFilterComposer composer = $composerBuilder(
+      composer: this,
+      getCurrentColumn: (t) => t.fromContactId,
+      referencedTable: $db.contacts,
+      getReferencedColumn: (t) => t.userId,
+      builder:
+          (
+            joinBuilder, {
+            $addJoinBuilderToRootComposer,
+            $removeJoinBuilderFromRootComposer,
+          }) => $$ContactsTableFilterComposer(
+            $db: $db,
+            $table: $db.contacts,
+            $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+            joinBuilder: joinBuilder,
+            $removeJoinBuilderFromRootComposer:
+                $removeJoinBuilderFromRootComposer,
+          ),
+    );
+    return composer;
+  }
+}
+
+class $$UserDiscoveryOtherPromotionsTableOrderingComposer
+    extends Composer<_$TwonlyDB, $UserDiscoveryOtherPromotionsTable> {
+  $$UserDiscoveryOtherPromotionsTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnOrderings<int> get promotionId => $composableBuilder(
+    column: $table.promotionId,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<int> get publicId => $composableBuilder(
+    column: $table.publicId,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<int> get threshold => $composableBuilder(
+    column: $table.threshold,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<Uint8List> get announcementShare => $composableBuilder(
+    column: $table.announcementShare,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<DateTime> get publicKeyVerifiedTimestamp =>
+      $composableBuilder(
+        column: $table.publicKeyVerifiedTimestamp,
+        builder: (column) => ColumnOrderings(column),
+      );
+
+  $$ContactsTableOrderingComposer get fromContactId {
+    final $$ContactsTableOrderingComposer composer = $composerBuilder(
+      composer: this,
+      getCurrentColumn: (t) => t.fromContactId,
+      referencedTable: $db.contacts,
+      getReferencedColumn: (t) => t.userId,
+      builder:
+          (
+            joinBuilder, {
+            $addJoinBuilderToRootComposer,
+            $removeJoinBuilderFromRootComposer,
+          }) => $$ContactsTableOrderingComposer(
+            $db: $db,
+            $table: $db.contacts,
+            $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+            joinBuilder: joinBuilder,
+            $removeJoinBuilderFromRootComposer:
+                $removeJoinBuilderFromRootComposer,
+          ),
+    );
+    return composer;
+  }
+}
+
+class $$UserDiscoveryOtherPromotionsTableAnnotationComposer
+    extends Composer<_$TwonlyDB, $UserDiscoveryOtherPromotionsTable> {
+  $$UserDiscoveryOtherPromotionsTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  GeneratedColumn<int> get promotionId => $composableBuilder(
+    column: $table.promotionId,
+    builder: (column) => column,
+  );
+
+  GeneratedColumn<int> get publicId =>
+      $composableBuilder(column: $table.publicId, builder: (column) => column);
+
+  GeneratedColumn<int> get threshold =>
+      $composableBuilder(column: $table.threshold, builder: (column) => column);
+
+  GeneratedColumn<Uint8List> get announcementShare => $composableBuilder(
+    column: $table.announcementShare,
+    builder: (column) => column,
+  );
+
+  GeneratedColumn<DateTime> get publicKeyVerifiedTimestamp =>
+      $composableBuilder(
+        column: $table.publicKeyVerifiedTimestamp,
+        builder: (column) => column,
+      );
+
+  $$ContactsTableAnnotationComposer get fromContactId {
+    final $$ContactsTableAnnotationComposer composer = $composerBuilder(
+      composer: this,
+      getCurrentColumn: (t) => t.fromContactId,
+      referencedTable: $db.contacts,
+      getReferencedColumn: (t) => t.userId,
+      builder:
+          (
+            joinBuilder, {
+            $addJoinBuilderToRootComposer,
+            $removeJoinBuilderFromRootComposer,
+          }) => $$ContactsTableAnnotationComposer(
+            $db: $db,
+            $table: $db.contacts,
+            $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+            joinBuilder: joinBuilder,
+            $removeJoinBuilderFromRootComposer:
+                $removeJoinBuilderFromRootComposer,
+          ),
+    );
+    return composer;
+  }
+}
+
+class $$UserDiscoveryOtherPromotionsTableTableManager
+    extends
+        RootTableManager<
+          _$TwonlyDB,
+          $UserDiscoveryOtherPromotionsTable,
+          UserDiscoveryOtherPromotion,
+          $$UserDiscoveryOtherPromotionsTableFilterComposer,
+          $$UserDiscoveryOtherPromotionsTableOrderingComposer,
+          $$UserDiscoveryOtherPromotionsTableAnnotationComposer,
+          $$UserDiscoveryOtherPromotionsTableCreateCompanionBuilder,
+          $$UserDiscoveryOtherPromotionsTableUpdateCompanionBuilder,
+          (
+            UserDiscoveryOtherPromotion,
+            $$UserDiscoveryOtherPromotionsTableReferences,
+          ),
+          UserDiscoveryOtherPromotion,
+          PrefetchHooks Function({bool fromContactId})
+        > {
+  $$UserDiscoveryOtherPromotionsTableTableManager(
+    _$TwonlyDB db,
+    $UserDiscoveryOtherPromotionsTable table,
+  ) : super(
+        TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              $$UserDiscoveryOtherPromotionsTableFilterComposer(
+                $db: db,
+                $table: table,
+              ),
+          createOrderingComposer: () =>
+              $$UserDiscoveryOtherPromotionsTableOrderingComposer(
+                $db: db,
+                $table: table,
+              ),
+          createComputedFieldComposer: () =>
+              $$UserDiscoveryOtherPromotionsTableAnnotationComposer(
+                $db: db,
+                $table: table,
+              ),
+          updateCompanionCallback:
+              ({
+                Value<int> fromContactId = const Value.absent(),
+                Value<int> promotionId = const Value.absent(),
+                Value<int> publicId = const Value.absent(),
+                Value<int> threshold = const Value.absent(),
+                Value<Uint8List> announcementShare = const Value.absent(),
+                Value<DateTime?> publicKeyVerifiedTimestamp =
+                    const Value.absent(),
+                Value<int> rowid = const Value.absent(),
+              }) => UserDiscoveryOtherPromotionsCompanion(
+                fromContactId: fromContactId,
+                promotionId: promotionId,
+                publicId: publicId,
+                threshold: threshold,
+                announcementShare: announcementShare,
+                publicKeyVerifiedTimestamp: publicKeyVerifiedTimestamp,
+                rowid: rowid,
+              ),
+          createCompanionCallback:
+              ({
+                required int fromContactId,
+                required int promotionId,
+                required int publicId,
+                required int threshold,
+                required Uint8List announcementShare,
+                Value<DateTime?> publicKeyVerifiedTimestamp =
+                    const Value.absent(),
+                Value<int> rowid = const Value.absent(),
+              }) => UserDiscoveryOtherPromotionsCompanion.insert(
+                fromContactId: fromContactId,
+                promotionId: promotionId,
+                publicId: publicId,
+                threshold: threshold,
+                announcementShare: announcementShare,
+                publicKeyVerifiedTimestamp: publicKeyVerifiedTimestamp,
+                rowid: rowid,
+              ),
+          withReferenceMapper: (p0) => p0
+              .map(
+                (e) => (
+                  e.readTable(table),
+                  $$UserDiscoveryOtherPromotionsTableReferences(db, table, e),
+                ),
+              )
+              .toList(),
+          prefetchHooksCallback: ({fromContactId = false}) {
+            return PrefetchHooks(
+              db: db,
+              explicitlyWatchedTables: [],
+              addJoins:
+                  <
+                    T extends TableManagerState<
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic
+                    >
+                  >(state) {
+                    if (fromContactId) {
+                      state =
+                          state.withJoin(
+                                currentTable: table,
+                                currentColumn: table.fromContactId,
+                                referencedTable:
+                                    $$UserDiscoveryOtherPromotionsTableReferences
+                                        ._fromContactIdTable(db),
+                                referencedColumn:
+                                    $$UserDiscoveryOtherPromotionsTableReferences
+                                        ._fromContactIdTable(db)
+                                        .userId,
+                              )
+                              as T;
+                    }
+
+                    return state;
+                  },
+              getPrefetchedDataCallback: (items) async {
+                return [];
+              },
+            );
+          },
+        ),
+      );
+}
+
+typedef $$UserDiscoveryOtherPromotionsTableProcessedTableManager =
+    ProcessedTableManager<
+      _$TwonlyDB,
+      $UserDiscoveryOtherPromotionsTable,
+      UserDiscoveryOtherPromotion,
+      $$UserDiscoveryOtherPromotionsTableFilterComposer,
+      $$UserDiscoveryOtherPromotionsTableOrderingComposer,
+      $$UserDiscoveryOtherPromotionsTableAnnotationComposer,
+      $$UserDiscoveryOtherPromotionsTableCreateCompanionBuilder,
+      $$UserDiscoveryOtherPromotionsTableUpdateCompanionBuilder,
+      (
+        UserDiscoveryOtherPromotion,
+        $$UserDiscoveryOtherPromotionsTableReferences,
+      ),
+      UserDiscoveryOtherPromotion,
+      PrefetchHooks Function({bool fromContactId})
+    >;
+typedef $$UserDiscoveryOwnPromotionsTableCreateCompanionBuilder =
+    UserDiscoveryOwnPromotionsCompanion Function({
+      Value<int> versionId,
+      required int contactId,
+      required Uint8List promotion,
+    });
+typedef $$UserDiscoveryOwnPromotionsTableUpdateCompanionBuilder =
+    UserDiscoveryOwnPromotionsCompanion Function({
+      Value<int> versionId,
+      Value<int> contactId,
+      Value<Uint8List> promotion,
+    });
+
+final class $$UserDiscoveryOwnPromotionsTableReferences
+    extends
+        BaseReferences<
+          _$TwonlyDB,
+          $UserDiscoveryOwnPromotionsTable,
+          UserDiscoveryOwnPromotion
+        > {
+  $$UserDiscoveryOwnPromotionsTableReferences(
+    super.$_db,
+    super.$_table,
+    super.$_typedResult,
+  );
+
+  static $ContactsTable _contactIdTable(_$TwonlyDB db) =>
+      db.contacts.createAlias(
+        $_aliasNameGenerator(
+          db.userDiscoveryOwnPromotions.contactId,
+          db.contacts.userId,
+        ),
+      );
+
+  $$ContactsTableProcessedTableManager get contactId {
+    final $_column = $_itemColumn<int>('contact_id')!;
+
+    final manager = $$ContactsTableTableManager(
+      $_db,
+      $_db.contacts,
+    ).filter((f) => f.userId.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_contactIdTable($_db));
+    if (item == null) return manager;
+    return ProcessedTableManager(
+      manager.$state.copyWith(prefetchedData: [item]),
+    );
+  }
+}
+
+class $$UserDiscoveryOwnPromotionsTableFilterComposer
+    extends Composer<_$TwonlyDB, $UserDiscoveryOwnPromotionsTable> {
+  $$UserDiscoveryOwnPromotionsTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnFilters<int> get versionId => $composableBuilder(
+    column: $table.versionId,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<Uint8List> get promotion => $composableBuilder(
+    column: $table.promotion,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  $$ContactsTableFilterComposer get contactId {
+    final $$ContactsTableFilterComposer composer = $composerBuilder(
+      composer: this,
+      getCurrentColumn: (t) => t.contactId,
+      referencedTable: $db.contacts,
+      getReferencedColumn: (t) => t.userId,
+      builder:
+          (
+            joinBuilder, {
+            $addJoinBuilderToRootComposer,
+            $removeJoinBuilderFromRootComposer,
+          }) => $$ContactsTableFilterComposer(
+            $db: $db,
+            $table: $db.contacts,
+            $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+            joinBuilder: joinBuilder,
+            $removeJoinBuilderFromRootComposer:
+                $removeJoinBuilderFromRootComposer,
+          ),
+    );
+    return composer;
+  }
+}
+
+class $$UserDiscoveryOwnPromotionsTableOrderingComposer
+    extends Composer<_$TwonlyDB, $UserDiscoveryOwnPromotionsTable> {
+  $$UserDiscoveryOwnPromotionsTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnOrderings<int> get versionId => $composableBuilder(
+    column: $table.versionId,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<Uint8List> get promotion => $composableBuilder(
+    column: $table.promotion,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  $$ContactsTableOrderingComposer get contactId {
+    final $$ContactsTableOrderingComposer composer = $composerBuilder(
+      composer: this,
+      getCurrentColumn: (t) => t.contactId,
+      referencedTable: $db.contacts,
+      getReferencedColumn: (t) => t.userId,
+      builder:
+          (
+            joinBuilder, {
+            $addJoinBuilderToRootComposer,
+            $removeJoinBuilderFromRootComposer,
+          }) => $$ContactsTableOrderingComposer(
+            $db: $db,
+            $table: $db.contacts,
+            $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+            joinBuilder: joinBuilder,
+            $removeJoinBuilderFromRootComposer:
+                $removeJoinBuilderFromRootComposer,
+          ),
+    );
+    return composer;
+  }
+}
+
+class $$UserDiscoveryOwnPromotionsTableAnnotationComposer
+    extends Composer<_$TwonlyDB, $UserDiscoveryOwnPromotionsTable> {
+  $$UserDiscoveryOwnPromotionsTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  GeneratedColumn<int> get versionId =>
+      $composableBuilder(column: $table.versionId, builder: (column) => column);
+
+  GeneratedColumn<Uint8List> get promotion =>
+      $composableBuilder(column: $table.promotion, builder: (column) => column);
+
+  $$ContactsTableAnnotationComposer get contactId {
+    final $$ContactsTableAnnotationComposer composer = $composerBuilder(
+      composer: this,
+      getCurrentColumn: (t) => t.contactId,
+      referencedTable: $db.contacts,
+      getReferencedColumn: (t) => t.userId,
+      builder:
+          (
+            joinBuilder, {
+            $addJoinBuilderToRootComposer,
+            $removeJoinBuilderFromRootComposer,
+          }) => $$ContactsTableAnnotationComposer(
+            $db: $db,
+            $table: $db.contacts,
+            $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+            joinBuilder: joinBuilder,
+            $removeJoinBuilderFromRootComposer:
+                $removeJoinBuilderFromRootComposer,
+          ),
+    );
+    return composer;
+  }
+}
+
+class $$UserDiscoveryOwnPromotionsTableTableManager
+    extends
+        RootTableManager<
+          _$TwonlyDB,
+          $UserDiscoveryOwnPromotionsTable,
+          UserDiscoveryOwnPromotion,
+          $$UserDiscoveryOwnPromotionsTableFilterComposer,
+          $$UserDiscoveryOwnPromotionsTableOrderingComposer,
+          $$UserDiscoveryOwnPromotionsTableAnnotationComposer,
+          $$UserDiscoveryOwnPromotionsTableCreateCompanionBuilder,
+          $$UserDiscoveryOwnPromotionsTableUpdateCompanionBuilder,
+          (
+            UserDiscoveryOwnPromotion,
+            $$UserDiscoveryOwnPromotionsTableReferences,
+          ),
+          UserDiscoveryOwnPromotion,
+          PrefetchHooks Function({bool contactId})
+        > {
+  $$UserDiscoveryOwnPromotionsTableTableManager(
+    _$TwonlyDB db,
+    $UserDiscoveryOwnPromotionsTable table,
+  ) : super(
+        TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              $$UserDiscoveryOwnPromotionsTableFilterComposer(
+                $db: db,
+                $table: table,
+              ),
+          createOrderingComposer: () =>
+              $$UserDiscoveryOwnPromotionsTableOrderingComposer(
+                $db: db,
+                $table: table,
+              ),
+          createComputedFieldComposer: () =>
+              $$UserDiscoveryOwnPromotionsTableAnnotationComposer(
+                $db: db,
+                $table: table,
+              ),
+          updateCompanionCallback:
+              ({
+                Value<int> versionId = const Value.absent(),
+                Value<int> contactId = const Value.absent(),
+                Value<Uint8List> promotion = const Value.absent(),
+              }) => UserDiscoveryOwnPromotionsCompanion(
+                versionId: versionId,
+                contactId: contactId,
+                promotion: promotion,
+              ),
+          createCompanionCallback:
+              ({
+                Value<int> versionId = const Value.absent(),
+                required int contactId,
+                required Uint8List promotion,
+              }) => UserDiscoveryOwnPromotionsCompanion.insert(
+                versionId: versionId,
+                contactId: contactId,
+                promotion: promotion,
+              ),
+          withReferenceMapper: (p0) => p0
+              .map(
+                (e) => (
+                  e.readTable(table),
+                  $$UserDiscoveryOwnPromotionsTableReferences(db, table, e),
+                ),
+              )
+              .toList(),
+          prefetchHooksCallback: ({contactId = false}) {
+            return PrefetchHooks(
+              db: db,
+              explicitlyWatchedTables: [],
+              addJoins:
+                  <
+                    T extends TableManagerState<
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic
+                    >
+                  >(state) {
+                    if (contactId) {
+                      state =
+                          state.withJoin(
+                                currentTable: table,
+                                currentColumn: table.contactId,
+                                referencedTable:
+                                    $$UserDiscoveryOwnPromotionsTableReferences
+                                        ._contactIdTable(db),
+                                referencedColumn:
+                                    $$UserDiscoveryOwnPromotionsTableReferences
+                                        ._contactIdTable(db)
+                                        .userId,
+                              )
+                              as T;
+                    }
+
+                    return state;
+                  },
+              getPrefetchedDataCallback: (items) async {
+                return [];
+              },
+            );
+          },
+        ),
+      );
+}
+
+typedef $$UserDiscoveryOwnPromotionsTableProcessedTableManager =
+    ProcessedTableManager<
+      _$TwonlyDB,
+      $UserDiscoveryOwnPromotionsTable,
+      UserDiscoveryOwnPromotion,
+      $$UserDiscoveryOwnPromotionsTableFilterComposer,
+      $$UserDiscoveryOwnPromotionsTableOrderingComposer,
+      $$UserDiscoveryOwnPromotionsTableAnnotationComposer,
+      $$UserDiscoveryOwnPromotionsTableCreateCompanionBuilder,
+      $$UserDiscoveryOwnPromotionsTableUpdateCompanionBuilder,
+      (UserDiscoveryOwnPromotion, $$UserDiscoveryOwnPromotionsTableReferences),
+      UserDiscoveryOwnPromotion,
+      PrefetchHooks Function({bool contactId})
+    >;
+typedef $$UserDiscoverySharesTableCreateCompanionBuilder =
+    UserDiscoverySharesCompanion Function({
+      Value<int> shareId,
+      required Uint8List share,
+      Value<int?> contactId,
+    });
+typedef $$UserDiscoverySharesTableUpdateCompanionBuilder =
+    UserDiscoverySharesCompanion Function({
+      Value<int> shareId,
+      Value<Uint8List> share,
+      Value<int?> contactId,
+    });
+
+final class $$UserDiscoverySharesTableReferences
+    extends
+        BaseReferences<
+          _$TwonlyDB,
+          $UserDiscoverySharesTable,
+          UserDiscoveryShare
+        > {
+  $$UserDiscoverySharesTableReferences(
+    super.$_db,
+    super.$_table,
+    super.$_typedResult,
+  );
+
+  static $ContactsTable _contactIdTable(_$TwonlyDB db) =>
+      db.contacts.createAlias(
+        $_aliasNameGenerator(
+          db.userDiscoveryShares.contactId,
+          db.contacts.userId,
+        ),
+      );
+
+  $$ContactsTableProcessedTableManager? get contactId {
+    final $_column = $_itemColumn<int>('contact_id');
+    if ($_column == null) return null;
+    final manager = $$ContactsTableTableManager(
+      $_db,
+      $_db.contacts,
+    ).filter((f) => f.userId.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_contactIdTable($_db));
+    if (item == null) return manager;
+    return ProcessedTableManager(
+      manager.$state.copyWith(prefetchedData: [item]),
+    );
+  }
+}
+
+class $$UserDiscoverySharesTableFilterComposer
+    extends Composer<_$TwonlyDB, $UserDiscoverySharesTable> {
+  $$UserDiscoverySharesTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnFilters<int> get shareId => $composableBuilder(
+    column: $table.shareId,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<Uint8List> get share => $composableBuilder(
+    column: $table.share,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  $$ContactsTableFilterComposer get contactId {
+    final $$ContactsTableFilterComposer composer = $composerBuilder(
+      composer: this,
+      getCurrentColumn: (t) => t.contactId,
+      referencedTable: $db.contacts,
+      getReferencedColumn: (t) => t.userId,
+      builder:
+          (
+            joinBuilder, {
+            $addJoinBuilderToRootComposer,
+            $removeJoinBuilderFromRootComposer,
+          }) => $$ContactsTableFilterComposer(
+            $db: $db,
+            $table: $db.contacts,
+            $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+            joinBuilder: joinBuilder,
+            $removeJoinBuilderFromRootComposer:
+                $removeJoinBuilderFromRootComposer,
+          ),
+    );
+    return composer;
+  }
+}
+
+class $$UserDiscoverySharesTableOrderingComposer
+    extends Composer<_$TwonlyDB, $UserDiscoverySharesTable> {
+  $$UserDiscoverySharesTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnOrderings<int> get shareId => $composableBuilder(
+    column: $table.shareId,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<Uint8List> get share => $composableBuilder(
+    column: $table.share,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  $$ContactsTableOrderingComposer get contactId {
+    final $$ContactsTableOrderingComposer composer = $composerBuilder(
+      composer: this,
+      getCurrentColumn: (t) => t.contactId,
+      referencedTable: $db.contacts,
+      getReferencedColumn: (t) => t.userId,
+      builder:
+          (
+            joinBuilder, {
+            $addJoinBuilderToRootComposer,
+            $removeJoinBuilderFromRootComposer,
+          }) => $$ContactsTableOrderingComposer(
+            $db: $db,
+            $table: $db.contacts,
+            $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+            joinBuilder: joinBuilder,
+            $removeJoinBuilderFromRootComposer:
+                $removeJoinBuilderFromRootComposer,
+          ),
+    );
+    return composer;
+  }
+}
+
+class $$UserDiscoverySharesTableAnnotationComposer
+    extends Composer<_$TwonlyDB, $UserDiscoverySharesTable> {
+  $$UserDiscoverySharesTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  GeneratedColumn<int> get shareId =>
+      $composableBuilder(column: $table.shareId, builder: (column) => column);
+
+  GeneratedColumn<Uint8List> get share =>
+      $composableBuilder(column: $table.share, builder: (column) => column);
+
+  $$ContactsTableAnnotationComposer get contactId {
+    final $$ContactsTableAnnotationComposer composer = $composerBuilder(
+      composer: this,
+      getCurrentColumn: (t) => t.contactId,
+      referencedTable: $db.contacts,
+      getReferencedColumn: (t) => t.userId,
+      builder:
+          (
+            joinBuilder, {
+            $addJoinBuilderToRootComposer,
+            $removeJoinBuilderFromRootComposer,
+          }) => $$ContactsTableAnnotationComposer(
+            $db: $db,
+            $table: $db.contacts,
+            $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+            joinBuilder: joinBuilder,
+            $removeJoinBuilderFromRootComposer:
+                $removeJoinBuilderFromRootComposer,
+          ),
+    );
+    return composer;
+  }
+}
+
+class $$UserDiscoverySharesTableTableManager
+    extends
+        RootTableManager<
+          _$TwonlyDB,
+          $UserDiscoverySharesTable,
+          UserDiscoveryShare,
+          $$UserDiscoverySharesTableFilterComposer,
+          $$UserDiscoverySharesTableOrderingComposer,
+          $$UserDiscoverySharesTableAnnotationComposer,
+          $$UserDiscoverySharesTableCreateCompanionBuilder,
+          $$UserDiscoverySharesTableUpdateCompanionBuilder,
+          (UserDiscoveryShare, $$UserDiscoverySharesTableReferences),
+          UserDiscoveryShare,
+          PrefetchHooks Function({bool contactId})
+        > {
+  $$UserDiscoverySharesTableTableManager(
+    _$TwonlyDB db,
+    $UserDiscoverySharesTable table,
+  ) : super(
+        TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              $$UserDiscoverySharesTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () =>
+              $$UserDiscoverySharesTableOrderingComposer(
+                $db: db,
+                $table: table,
+              ),
+          createComputedFieldComposer: () =>
+              $$UserDiscoverySharesTableAnnotationComposer(
+                $db: db,
+                $table: table,
+              ),
+          updateCompanionCallback:
+              ({
+                Value<int> shareId = const Value.absent(),
+                Value<Uint8List> share = const Value.absent(),
+                Value<int?> contactId = const Value.absent(),
+              }) => UserDiscoverySharesCompanion(
+                shareId: shareId,
+                share: share,
+                contactId: contactId,
+              ),
+          createCompanionCallback:
+              ({
+                Value<int> shareId = const Value.absent(),
+                required Uint8List share,
+                Value<int?> contactId = const Value.absent(),
+              }) => UserDiscoverySharesCompanion.insert(
+                shareId: shareId,
+                share: share,
+                contactId: contactId,
+              ),
+          withReferenceMapper: (p0) => p0
+              .map(
+                (e) => (
+                  e.readTable(table),
+                  $$UserDiscoverySharesTableReferences(db, table, e),
+                ),
+              )
+              .toList(),
+          prefetchHooksCallback: ({contactId = false}) {
+            return PrefetchHooks(
+              db: db,
+              explicitlyWatchedTables: [],
+              addJoins:
+                  <
+                    T extends TableManagerState<
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic
+                    >
+                  >(state) {
+                    if (contactId) {
+                      state =
+                          state.withJoin(
+                                currentTable: table,
+                                currentColumn: table.contactId,
+                                referencedTable:
+                                    $$UserDiscoverySharesTableReferences
+                                        ._contactIdTable(db),
+                                referencedColumn:
+                                    $$UserDiscoverySharesTableReferences
+                                        ._contactIdTable(db)
+                                        .userId,
+                              )
+                              as T;
+                    }
+
+                    return state;
+                  },
+              getPrefetchedDataCallback: (items) async {
+                return [];
+              },
+            );
+          },
+        ),
+      );
+}
+
+typedef $$UserDiscoverySharesTableProcessedTableManager =
+    ProcessedTableManager<
+      _$TwonlyDB,
+      $UserDiscoverySharesTable,
+      UserDiscoveryShare,
+      $$UserDiscoverySharesTableFilterComposer,
+      $$UserDiscoverySharesTableOrderingComposer,
+      $$UserDiscoverySharesTableAnnotationComposer,
+      $$UserDiscoverySharesTableCreateCompanionBuilder,
+      $$UserDiscoverySharesTableUpdateCompanionBuilder,
+      (UserDiscoveryShare, $$UserDiscoverySharesTableReferences),
+      UserDiscoveryShare,
+      PrefetchHooks Function({bool contactId})
+    >;
 
 class $TwonlyDBManager {
   final _$TwonlyDB _db;
@@ -16281,4 +21896,34 @@ class $TwonlyDBManager {
       $$MessageActionsTableTableManager(_db, _db.messageActions);
   $$GroupHistoriesTableTableManager get groupHistories =>
       $$GroupHistoriesTableTableManager(_db, _db.groupHistories);
+  $$KeyVerificationsTableTableManager get keyVerifications =>
+      $$KeyVerificationsTableTableManager(_db, _db.keyVerifications);
+  $$VerificationTokensTableTableManager get verificationTokens =>
+      $$VerificationTokensTableTableManager(_db, _db.verificationTokens);
+  $$UserDiscoveryAnnouncedUsersTableTableManager
+  get userDiscoveryAnnouncedUsers =>
+      $$UserDiscoveryAnnouncedUsersTableTableManager(
+        _db,
+        _db.userDiscoveryAnnouncedUsers,
+      );
+  $$UserDiscoveryUserRelationsTableTableManager
+  get userDiscoveryUserRelations =>
+      $$UserDiscoveryUserRelationsTableTableManager(
+        _db,
+        _db.userDiscoveryUserRelations,
+      );
+  $$UserDiscoveryOtherPromotionsTableTableManager
+  get userDiscoveryOtherPromotions =>
+      $$UserDiscoveryOtherPromotionsTableTableManager(
+        _db,
+        _db.userDiscoveryOtherPromotions,
+      );
+  $$UserDiscoveryOwnPromotionsTableTableManager
+  get userDiscoveryOwnPromotions =>
+      $$UserDiscoveryOwnPromotionsTableTableManager(
+        _db,
+        _db.userDiscoveryOwnPromotions,
+      );
+  $$UserDiscoverySharesTableTableManager get userDiscoveryShares =>
+      $$UserDiscoverySharesTableTableManager(_db, _db.userDiscoveryShares);
 }
diff --git a/lib/src/database/twonly.db.steps.dart b/lib/src/database/twonly.db.steps.dart
index d07f9b2b..4f8306bc 100644
--- a/lib/src/database/twonly.db.steps.dart
+++ b/lib/src/database/twonly.db.steps.dart
@@ -5823,6 +5823,765 @@ i1.GeneratedColumn<int> _column_210(String aliasedName) =>
       type: i1.DriftSqlType.int,
       $customConstraints: 'NULL',
     );
+
+final class Schema12 extends i0.VersionedSchema {
+  Schema12({required super.database}) : super(version: 12);
+  @override
+  late final List<i1.DatabaseSchemaEntity> entities = [
+    contacts,
+    groups,
+    mediaFiles,
+    messages,
+    messageHistories,
+    reactions,
+    groupMembers,
+    receipts,
+    receivedReceipts,
+    signalIdentityKeyStores,
+    signalPreKeyStores,
+    signalSenderKeyStores,
+    signalSessionStores,
+    messageActions,
+    groupHistories,
+    keyVerifications,
+    verificationTokens,
+    userDiscoveryAnnouncedUsers,
+    userDiscoveryUserRelations,
+    userDiscoveryOtherPromotions,
+    userDiscoveryOwnPromotions,
+    userDiscoveryShares,
+  ];
+  late final Shape39 contacts = Shape39(
+    source: i0.VersionedTable(
+      entityName: 'contacts',
+      withoutRowId: false,
+      isStrict: false,
+      tableConstraints: ['PRIMARY KEY(user_id)'],
+      columns: [
+        _column_106,
+        _column_107,
+        _column_108,
+        _column_109,
+        _column_110,
+        _column_111,
+        _column_112,
+        _column_113,
+        _column_114,
+        _column_115,
+        _column_116,
+        _column_117,
+        _column_118,
+        _column_211,
+        _column_212,
+        _column_213,
+        _column_214,
+        _column_215,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape23 groups = Shape23(
+    source: i0.VersionedTable(
+      entityName: 'groups',
+      withoutRowId: false,
+      isStrict: false,
+      tableConstraints: ['PRIMARY KEY(group_id)'],
+      columns: [
+        _column_119,
+        _column_120,
+        _column_121,
+        _column_122,
+        _column_123,
+        _column_124,
+        _column_125,
+        _column_126,
+        _column_127,
+        _column_128,
+        _column_129,
+        _column_130,
+        _column_131,
+        _column_132,
+        _column_133,
+        _column_134,
+        _column_118,
+        _column_135,
+        _column_136,
+        _column_137,
+        _column_138,
+        _column_139,
+        _column_140,
+        _column_141,
+        _column_142,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape36 mediaFiles = Shape36(
+    source: i0.VersionedTable(
+      entityName: 'media_files',
+      withoutRowId: false,
+      isStrict: false,
+      tableConstraints: ['PRIMARY KEY(media_id)'],
+      columns: [
+        _column_143,
+        _column_144,
+        _column_145,
+        _column_146,
+        _column_147,
+        _column_148,
+        _column_149,
+        _column_207,
+        _column_150,
+        _column_151,
+        _column_152,
+        _column_153,
+        _column_154,
+        _column_155,
+        _column_156,
+        _column_157,
+        _column_118,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape25 messages = Shape25(
+    source: i0.VersionedTable(
+      entityName: 'messages',
+      withoutRowId: false,
+      isStrict: false,
+      tableConstraints: ['PRIMARY KEY(message_id)'],
+      columns: [
+        _column_158,
+        _column_159,
+        _column_160,
+        _column_144,
+        _column_161,
+        _column_162,
+        _column_163,
+        _column_164,
+        _column_165,
+        _column_153,
+        _column_166,
+        _column_167,
+        _column_168,
+        _column_169,
+        _column_118,
+        _column_170,
+        _column_171,
+        _column_172,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape26 messageHistories = Shape26(
+    source: i0.VersionedTable(
+      entityName: 'message_histories',
+      withoutRowId: false,
+      isStrict: false,
+      tableConstraints: [],
+      columns: [
+        _column_173,
+        _column_174,
+        _column_175,
+        _column_161,
+        _column_118,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape27 reactions = Shape27(
+    source: i0.VersionedTable(
+      entityName: 'reactions',
+      withoutRowId: false,
+      isStrict: false,
+      tableConstraints: ['PRIMARY KEY(message_id, sender_id, emoji)'],
+      columns: [_column_174, _column_176, _column_177, _column_118],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape38 groupMembers = Shape38(
+    source: i0.VersionedTable(
+      entityName: 'group_members',
+      withoutRowId: false,
+      isStrict: false,
+      tableConstraints: ['PRIMARY KEY(group_id, contact_id)'],
+      columns: [
+        _column_158,
+        _column_178,
+        _column_179,
+        _column_180,
+        _column_209,
+        _column_210,
+        _column_181,
+        _column_118,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape37 receipts = Shape37(
+    source: i0.VersionedTable(
+      entityName: 'receipts',
+      withoutRowId: false,
+      isStrict: false,
+      tableConstraints: ['PRIMARY KEY(receipt_id)'],
+      columns: [
+        _column_182,
+        _column_183,
+        _column_184,
+        _column_185,
+        _column_186,
+        _column_208,
+        _column_187,
+        _column_188,
+        _column_189,
+        _column_190,
+        _column_191,
+        _column_118,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape30 receivedReceipts = Shape30(
+    source: i0.VersionedTable(
+      entityName: 'received_receipts',
+      withoutRowId: false,
+      isStrict: false,
+      tableConstraints: ['PRIMARY KEY(receipt_id)'],
+      columns: [_column_182, _column_118],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape31 signalIdentityKeyStores = Shape31(
+    source: i0.VersionedTable(
+      entityName: 'signal_identity_key_stores',
+      withoutRowId: false,
+      isStrict: false,
+      tableConstraints: ['PRIMARY KEY(device_id, name)'],
+      columns: [_column_192, _column_193, _column_194, _column_118],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape32 signalPreKeyStores = Shape32(
+    source: i0.VersionedTable(
+      entityName: 'signal_pre_key_stores',
+      withoutRowId: false,
+      isStrict: false,
+      tableConstraints: ['PRIMARY KEY(pre_key_id)'],
+      columns: [_column_195, _column_196, _column_118],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape11 signalSenderKeyStores = Shape11(
+    source: i0.VersionedTable(
+      entityName: 'signal_sender_key_stores',
+      withoutRowId: false,
+      isStrict: false,
+      tableConstraints: ['PRIMARY KEY(sender_key_name)'],
+      columns: [_column_197, _column_198],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape33 signalSessionStores = Shape33(
+    source: i0.VersionedTable(
+      entityName: 'signal_session_stores',
+      withoutRowId: false,
+      isStrict: false,
+      tableConstraints: ['PRIMARY KEY(device_id, name)'],
+      columns: [_column_192, _column_193, _column_199, _column_118],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape34 messageActions = Shape34(
+    source: i0.VersionedTable(
+      entityName: 'message_actions',
+      withoutRowId: false,
+      isStrict: false,
+      tableConstraints: ['PRIMARY KEY(message_id, contact_id, type)'],
+      columns: [_column_174, _column_183, _column_144, _column_200],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape35 groupHistories = Shape35(
+    source: i0.VersionedTable(
+      entityName: 'group_histories',
+      withoutRowId: false,
+      isStrict: false,
+      tableConstraints: ['PRIMARY KEY(group_history_id)'],
+      columns: [
+        _column_201,
+        _column_158,
+        _column_202,
+        _column_203,
+        _column_204,
+        _column_205,
+        _column_206,
+        _column_144,
+        _column_200,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape40 keyVerifications = Shape40(
+    source: i0.VersionedTable(
+      entityName: 'key_verifications',
+      withoutRowId: false,
+      isStrict: false,
+      tableConstraints: [],
+      columns: [_column_216, _column_183, _column_144, _column_118],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape41 verificationTokens = Shape41(
+    source: i0.VersionedTable(
+      entityName: 'verification_tokens',
+      withoutRowId: false,
+      isStrict: false,
+      tableConstraints: [],
+      columns: [_column_217, _column_218, _column_118],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape42 userDiscoveryAnnouncedUsers = Shape42(
+    source: i0.VersionedTable(
+      entityName: 'user_discovery_announced_users',
+      withoutRowId: false,
+      isStrict: false,
+      tableConstraints: ['PRIMARY KEY(announced_user_id)'],
+      columns: [
+        _column_219,
+        _column_220,
+        _column_221,
+        _column_222,
+        _column_223,
+        _column_224,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape43 userDiscoveryUserRelations = Shape43(
+    source: i0.VersionedTable(
+      entityName: 'user_discovery_user_relations',
+      withoutRowId: false,
+      isStrict: false,
+      tableConstraints: ['PRIMARY KEY(announced_user_id, from_contact_id)'],
+      columns: [_column_225, _column_226, _column_227],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape44 userDiscoveryOtherPromotions = Shape44(
+    source: i0.VersionedTable(
+      entityName: 'user_discovery_other_promotions',
+      withoutRowId: false,
+      isStrict: false,
+      tableConstraints: ['PRIMARY KEY(from_contact_id, public_id)'],
+      columns: [
+        _column_226,
+        _column_228,
+        _column_229,
+        _column_230,
+        _column_231,
+        _column_227,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape45 userDiscoveryOwnPromotions = Shape45(
+    source: i0.VersionedTable(
+      entityName: 'user_discovery_own_promotions',
+      withoutRowId: false,
+      isStrict: false,
+      tableConstraints: [],
+      columns: [_column_232, _column_183, _column_233],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape46 userDiscoveryShares = Shape46(
+    source: i0.VersionedTable(
+      entityName: 'user_discovery_shares',
+      withoutRowId: false,
+      isStrict: false,
+      tableConstraints: [],
+      columns: [_column_234, _column_235, _column_175],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+}
+
+class Shape39 extends i0.VersionedTable {
+  Shape39({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<int> get userId =>
+      columnsByName['user_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get username =>
+      columnsByName['username']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get displayName =>
+      columnsByName['display_name']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get nickName =>
+      columnsByName['nick_name']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<i2.Uint8List> get avatarSvgCompressed =>
+      columnsByName['avatar_svg_compressed']!
+          as i1.GeneratedColumn<i2.Uint8List>;
+  i1.GeneratedColumn<int> get senderProfileCounter =>
+      columnsByName['sender_profile_counter']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get accepted =>
+      columnsByName['accepted']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get deletedByUser =>
+      columnsByName['deleted_by_user']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get requested =>
+      columnsByName['requested']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get blocked =>
+      columnsByName['blocked']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get verified =>
+      columnsByName['verified']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get accountDeleted =>
+      columnsByName['account_deleted']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get createdAt =>
+      columnsByName['created_at']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<i2.Uint8List> get userDiscoveryVersion =>
+      columnsByName['user_discovery_version']!
+          as i1.GeneratedColumn<i2.Uint8List>;
+  i1.GeneratedColumn<int> get userDiscoveryExcluded =>
+      columnsByName['user_discovery_excluded']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get userDiscoveryManualApproved =>
+      columnsByName['user_discovery_manual_approved']!
+          as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get mediaSendCounter =>
+      columnsByName['media_send_counter']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get mediaReceivedCounter =>
+      columnsByName['media_received_counter']! as i1.GeneratedColumn<int>;
+}
+
+i1.GeneratedColumn<i2.Uint8List> _column_211(String aliasedName) =>
+    i1.GeneratedColumn<i2.Uint8List>(
+      'user_discovery_version',
+      aliasedName,
+      true,
+      type: i1.DriftSqlType.blob,
+      $customConstraints: 'NULL',
+    );
+i1.GeneratedColumn<int> _column_212(String aliasedName) =>
+    i1.GeneratedColumn<int>(
+      'user_discovery_excluded',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.int,
+      $customConstraints:
+          'NOT NULL DEFAULT 0 CHECK (user_discovery_excluded IN (0, 1))',
+      defaultValue: const i1.CustomExpression('0'),
+    );
+i1.GeneratedColumn<int> _column_213(String aliasedName) =>
+    i1.GeneratedColumn<int>(
+      'user_discovery_manual_approved',
+      aliasedName,
+      true,
+      type: i1.DriftSqlType.int,
+      $customConstraints:
+          'NULL DEFAULT 0 CHECK (user_discovery_manual_approved IN (0, 1))',
+      defaultValue: const i1.CustomExpression('0'),
+    );
+i1.GeneratedColumn<int> _column_214(String aliasedName) =>
+    i1.GeneratedColumn<int>(
+      'media_send_counter',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.int,
+      $customConstraints: 'NOT NULL DEFAULT 0',
+      defaultValue: const i1.CustomExpression('0'),
+    );
+i1.GeneratedColumn<int> _column_215(String aliasedName) =>
+    i1.GeneratedColumn<int>(
+      'media_received_counter',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.int,
+      $customConstraints: 'NOT NULL DEFAULT 0',
+      defaultValue: const i1.CustomExpression('0'),
+    );
+
+class Shape40 extends i0.VersionedTable {
+  Shape40({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<int> get verificationId =>
+      columnsByName['verification_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get contactId =>
+      columnsByName['contact_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get type =>
+      columnsByName['type']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get createdAt =>
+      columnsByName['created_at']! as i1.GeneratedColumn<int>;
+}
+
+i1.GeneratedColumn<int> _column_216(String aliasedName) =>
+    i1.GeneratedColumn<int>(
+      'verification_id',
+      aliasedName,
+      false,
+      hasAutoIncrement: true,
+      type: i1.DriftSqlType.int,
+      $customConstraints: 'NOT NULL PRIMARY KEY AUTOINCREMENT',
+    );
+
+class Shape41 extends i0.VersionedTable {
+  Shape41({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<int> get tokenId =>
+      columnsByName['token_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<i2.Uint8List> get token =>
+      columnsByName['token']! as i1.GeneratedColumn<i2.Uint8List>;
+  i1.GeneratedColumn<int> get createdAt =>
+      columnsByName['created_at']! as i1.GeneratedColumn<int>;
+}
+
+i1.GeneratedColumn<int> _column_217(String aliasedName) =>
+    i1.GeneratedColumn<int>(
+      'token_id',
+      aliasedName,
+      false,
+      hasAutoIncrement: true,
+      type: i1.DriftSqlType.int,
+      $customConstraints: 'NOT NULL PRIMARY KEY AUTOINCREMENT',
+    );
+i1.GeneratedColumn<i2.Uint8List> _column_218(String aliasedName) =>
+    i1.GeneratedColumn<i2.Uint8List>(
+      'token',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.blob,
+      $customConstraints: 'NOT NULL',
+    );
+
+class Shape42 extends i0.VersionedTable {
+  Shape42({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<int> get announcedUserId =>
+      columnsByName['announced_user_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<i2.Uint8List> get announcedPublicKey =>
+      columnsByName['announced_public_key']!
+          as i1.GeneratedColumn<i2.Uint8List>;
+  i1.GeneratedColumn<int> get publicId =>
+      columnsByName['public_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get username =>
+      columnsByName['username']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get wasShownToTheUser =>
+      columnsByName['was_shown_to_the_user']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get isHidden =>
+      columnsByName['is_hidden']! as i1.GeneratedColumn<int>;
+}
+
+i1.GeneratedColumn<int> _column_219(String aliasedName) =>
+    i1.GeneratedColumn<int>(
+      'announced_user_id',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.int,
+      $customConstraints: 'NOT NULL',
+    );
+i1.GeneratedColumn<i2.Uint8List> _column_220(String aliasedName) =>
+    i1.GeneratedColumn<i2.Uint8List>(
+      'announced_public_key',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.blob,
+      $customConstraints: 'NOT NULL',
+    );
+i1.GeneratedColumn<int> _column_221(String aliasedName) =>
+    i1.GeneratedColumn<int>(
+      'public_id',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.int,
+      $customConstraints: 'NOT NULL UNIQUE',
+    );
+i1.GeneratedColumn<String> _column_222(String aliasedName) =>
+    i1.GeneratedColumn<String>(
+      'username',
+      aliasedName,
+      true,
+      type: i1.DriftSqlType.string,
+      $customConstraints: 'NULL',
+    );
+i1.GeneratedColumn<int> _column_223(String aliasedName) =>
+    i1.GeneratedColumn<int>(
+      'was_shown_to_the_user',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.int,
+      $customConstraints:
+          'NOT NULL DEFAULT 0 CHECK (was_shown_to_the_user IN (0, 1))',
+      defaultValue: const i1.CustomExpression('0'),
+    );
+i1.GeneratedColumn<int> _column_224(String aliasedName) =>
+    i1.GeneratedColumn<int>(
+      'is_hidden',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.int,
+      $customConstraints: 'NOT NULL DEFAULT 0 CHECK (is_hidden IN (0, 1))',
+      defaultValue: const i1.CustomExpression('0'),
+    );
+
+class Shape43 extends i0.VersionedTable {
+  Shape43({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<int> get announcedUserId =>
+      columnsByName['announced_user_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get fromContactId =>
+      columnsByName['from_contact_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get publicKeyVerifiedTimestamp =>
+      columnsByName['public_key_verified_timestamp']!
+          as i1.GeneratedColumn<int>;
+}
+
+i1.GeneratedColumn<int> _column_225(
+  String aliasedName,
+) => i1.GeneratedColumn<int>(
+  'announced_user_id',
+  aliasedName,
+  false,
+  type: i1.DriftSqlType.int,
+  $customConstraints:
+      'NOT NULL REFERENCES user_discovery_announced_users(announced_user_id)ON DELETE CASCADE',
+);
+i1.GeneratedColumn<int> _column_226(String aliasedName) =>
+    i1.GeneratedColumn<int>(
+      'from_contact_id',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.int,
+      $customConstraints:
+          'NOT NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+    );
+i1.GeneratedColumn<int> _column_227(String aliasedName) =>
+    i1.GeneratedColumn<int>(
+      'public_key_verified_timestamp',
+      aliasedName,
+      true,
+      type: i1.DriftSqlType.int,
+      $customConstraints: 'NULL',
+    );
+
+class Shape44 extends i0.VersionedTable {
+  Shape44({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<int> get fromContactId =>
+      columnsByName['from_contact_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get promotionId =>
+      columnsByName['promotion_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get publicId =>
+      columnsByName['public_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get threshold =>
+      columnsByName['threshold']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<i2.Uint8List> get announcementShare =>
+      columnsByName['announcement_share']! as i1.GeneratedColumn<i2.Uint8List>;
+  i1.GeneratedColumn<int> get publicKeyVerifiedTimestamp =>
+      columnsByName['public_key_verified_timestamp']!
+          as i1.GeneratedColumn<int>;
+}
+
+i1.GeneratedColumn<int> _column_228(String aliasedName) =>
+    i1.GeneratedColumn<int>(
+      'promotion_id',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.int,
+      $customConstraints: 'NOT NULL',
+    );
+i1.GeneratedColumn<int> _column_229(String aliasedName) =>
+    i1.GeneratedColumn<int>(
+      'public_id',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.int,
+      $customConstraints: 'NOT NULL',
+    );
+i1.GeneratedColumn<int> _column_230(String aliasedName) =>
+    i1.GeneratedColumn<int>(
+      'threshold',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.int,
+      $customConstraints: 'NOT NULL',
+    );
+i1.GeneratedColumn<i2.Uint8List> _column_231(String aliasedName) =>
+    i1.GeneratedColumn<i2.Uint8List>(
+      'announcement_share',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.blob,
+      $customConstraints: 'NOT NULL',
+    );
+
+class Shape45 extends i0.VersionedTable {
+  Shape45({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<int> get versionId =>
+      columnsByName['version_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get contactId =>
+      columnsByName['contact_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<i2.Uint8List> get promotion =>
+      columnsByName['promotion']! as i1.GeneratedColumn<i2.Uint8List>;
+}
+
+i1.GeneratedColumn<int> _column_232(String aliasedName) =>
+    i1.GeneratedColumn<int>(
+      'version_id',
+      aliasedName,
+      false,
+      hasAutoIncrement: true,
+      type: i1.DriftSqlType.int,
+      $customConstraints: 'NOT NULL PRIMARY KEY AUTOINCREMENT',
+    );
+i1.GeneratedColumn<i2.Uint8List> _column_233(String aliasedName) =>
+    i1.GeneratedColumn<i2.Uint8List>(
+      'promotion',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.blob,
+      $customConstraints: 'NOT NULL',
+    );
+
+class Shape46 extends i0.VersionedTable {
+  Shape46({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<int> get shareId =>
+      columnsByName['share_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<i2.Uint8List> get share =>
+      columnsByName['share']! as i1.GeneratedColumn<i2.Uint8List>;
+  i1.GeneratedColumn<int> get contactId =>
+      columnsByName['contact_id']! as i1.GeneratedColumn<int>;
+}
+
+i1.GeneratedColumn<int> _column_234(String aliasedName) =>
+    i1.GeneratedColumn<int>(
+      'share_id',
+      aliasedName,
+      false,
+      hasAutoIncrement: true,
+      type: i1.DriftSqlType.int,
+      $customConstraints: 'NOT NULL PRIMARY KEY AUTOINCREMENT',
+    );
+i1.GeneratedColumn<i2.Uint8List> _column_235(String aliasedName) =>
+    i1.GeneratedColumn<i2.Uint8List>(
+      'share',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.blob,
+      $customConstraints: 'NOT NULL',
+    );
 i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
   required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -5834,6 +6593,7 @@ i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema9 schema) from8To9,
   required Future<void> Function(i1.Migrator m, Schema10 schema) from9To10,
   required Future<void> Function(i1.Migrator m, Schema11 schema) from10To11,
+  required Future<void> Function(i1.Migrator m, Schema12 schema) from11To12,
 }) {
   return (currentVersion, database) async {
     switch (currentVersion) {
@@ -5887,6 +6647,11 @@ i0.MigrationStepWithVersion migrationSteps({
         final migrator = i1.Migrator(database, schema);
         await from10To11(migrator, schema);
         return 11;
+      case 11:
+        final schema = Schema12(database: database);
+        final migrator = i1.Migrator(database, schema);
+        await from11To12(migrator, schema);
+        return 12;
       default:
         throw ArgumentError.value('Unknown migration from $currentVersion');
     }
@@ -5904,6 +6669,7 @@ i1.OnUpgrade stepByStep({
   required Future<void> Function(i1.Migrator m, Schema9 schema) from8To9,
   required Future<void> Function(i1.Migrator m, Schema10 schema) from9To10,
   required Future<void> Function(i1.Migrator m, Schema11 schema) from10To11,
+  required Future<void> Function(i1.Migrator m, Schema12 schema) from11To12,
 }) => i0.VersionedSchema.stepByStepHelper(
   step: migrationSteps(
     from1To2: from1To2,
@@ -5916,5 +6682,6 @@ i1.OnUpgrade stepByStep({
     from8To9: from8To9,
     from9To10: from9To10,
     from10To11: from10To11,
+    from11To12: from11To12,
   ),
 );
diff --git a/lib/src/localization/generated/app_localizations.dart b/lib/src/localization/generated/app_localizations.dart
index afda143b..47f5438e 100644
--- a/lib/src/localization/generated/app_localizations.dart
+++ b/lib/src/localization/generated/app_localizations.dart
@@ -7,7 +7,6 @@ import 'package:intl/intl.dart' as intl;
 
 import 'app_localizations_de.dart';
 import 'app_localizations_en.dart';
-import 'app_localizations_sv.dart';
 
 // ignore_for_file: type=lint
 
@@ -97,7 +96,6 @@ abstract class AppLocalizations {
   static const List<Locale> supportedLocales = <Locale>[
     Locale('de'),
     Locale('en'),
-    Locale('sv'),
   ];
 
   /// No description provided for @registerTitle.
@@ -172,36 +170,12 @@ abstract class AppLocalizations {
   /// **'twonly is financed by donations and an optional subscription. Your data will never be sold.'**
   String get onboardingNotProductBody;
 
-  /// No description provided for @onboardingBuyOneGetTwoTitle.
-  ///
-  /// In en, this message translates to:
-  /// **'Buy one get two'**
-  String get onboardingBuyOneGetTwoTitle;
-
-  /// No description provided for @onboardingBuyOneGetTwoBody.
-  ///
-  /// In en, this message translates to:
-  /// **'twonly always requires at least two people, which is why you receive a second free license for your twonly partner with your purchase.'**
-  String get onboardingBuyOneGetTwoBody;
-
   /// No description provided for @onboardingGetStartedTitle.
   ///
   /// In en, this message translates to:
   /// **'Let\'s go!'**
   String get onboardingGetStartedTitle;
 
-  /// No description provided for @onboardingGetStartedBody.
-  ///
-  /// In en, this message translates to:
-  /// **'You can test twonly free of charge in preview mode. In this mode you can be found by others and receive pictures or videos but you cannot send any yourself.'**
-  String get onboardingGetStartedBody;
-
-  /// No description provided for @onboardingTryForFree.
-  ///
-  /// In en, this message translates to:
-  /// **'Try for free'**
-  String get onboardingTryForFree;
-
   /// No description provided for @registerUsernameSlogan.
   ///
   /// In en, this message translates to:
@@ -232,24 +206,6 @@ abstract class AppLocalizations {
   /// **'Register now!'**
   String get registerSubmitButton;
 
-  /// No description provided for @registerTwonlyCodeText.
-  ///
-  /// In en, this message translates to:
-  /// **'Have you received a twonly code? Then redeem it either directly here or later!'**
-  String get registerTwonlyCodeText;
-
-  /// No description provided for @registerTwonlyCodeLabel.
-  ///
-  /// In en, this message translates to:
-  /// **'twonly-Code'**
-  String get registerTwonlyCodeLabel;
-
-  /// No description provided for @newMessageTitle.
-  ///
-  /// In en, this message translates to:
-  /// **'New message'**
-  String get newMessageTitle;
-
   /// No description provided for @chatsTapToSend.
   ///
   /// In en, this message translates to:
@@ -334,36 +290,12 @@ abstract class AppLocalizations {
   /// **'New Contact'**
   String get startNewChatNewContact;
 
-  /// No description provided for @startNewChatYourContacts.
-  ///
-  /// In en, this message translates to:
-  /// **'Your Contacts'**
-  String get startNewChatYourContacts;
-
   /// No description provided for @shareImageAllUsers.
   ///
   /// In en, this message translates to:
   /// **'All contacts'**
   String get shareImageAllUsers;
 
-  /// No description provided for @shareImageAllTwonlyWarning.
-  ///
-  /// In en, this message translates to:
-  /// **'twonlies can only be send to verified contacts!'**
-  String get shareImageAllTwonlyWarning;
-
-  /// No description provided for @shareImageUserNotVerified.
-  ///
-  /// In en, this message translates to:
-  /// **'User is not verified'**
-  String get shareImageUserNotVerified;
-
-  /// No description provided for @shareImageUserNotVerifiedDesc.
-  ///
-  /// In en, this message translates to:
-  /// **'twonlies can only be sent to verified users. To verify a user, go to their profile and to verify security number.'**
-  String get shareImageUserNotVerifiedDesc;
-
   /// No description provided for @shareImageShowArchived.
   ///
   /// In en, this message translates to:
@@ -382,18 +314,6 @@ abstract class AppLocalizations {
   /// **'Add friends'**
   String get addFriendTitle;
 
-  /// No description provided for @searchUserNamePreview.
-  ///
-  /// In en, this message translates to:
-  /// **'To protect you and other twonly users from spam and abuse, it is not possible to search for other people in preview mode. Other users can find you and their requests will be displayed here!'**
-  String get searchUserNamePreview;
-
-  /// No description provided for @selectSubscription.
-  ///
-  /// In en, this message translates to:
-  /// **'Select subscription'**
-  String get selectSubscription;
-
   /// No description provided for @searchUserNamePending.
   ///
   /// In en, this message translates to:
@@ -418,24 +338,12 @@ abstract class AppLocalizations {
   /// **'Open requests'**
   String get searchUsernameNewFollowerTitle;
 
-  /// No description provided for @searchUsernameQrCodeBtn.
-  ///
-  /// In en, this message translates to:
-  /// **'Scan QR code'**
-  String get searchUsernameQrCodeBtn;
-
   /// No description provided for @chatListViewSearchUserNameBtn.
   ///
   /// In en, this message translates to:
   /// **'Add your first twonly contact!'**
   String get chatListViewSearchUserNameBtn;
 
-  /// No description provided for @chatListViewSendFirstTwonly.
-  ///
-  /// In en, this message translates to:
-  /// **'Send your first twonly!'**
-  String get chatListViewSendFirstTwonly;
-
   /// No description provided for @chatListDetailInput.
   ///
   /// In en, this message translates to:
@@ -454,12 +362,6 @@ abstract class AppLocalizations {
   /// **'User profile'**
   String get contextMenuUserProfile;
 
-  /// No description provided for @contextMenuVerifyUser.
-  ///
-  /// In en, this message translates to:
-  /// **'Verify'**
-  String get contextMenuVerifyUser;
-
   /// No description provided for @contextMenuArchiveUser.
   ///
   /// In en, this message translates to:
@@ -916,24 +818,12 @@ abstract class AppLocalizations {
   /// **'Delete account'**
   String get settingsAccountDeleteAccount;
 
-  /// No description provided for @settingsAccountDeleteAccountWithBallance.
-  ///
-  /// In en, this message translates to:
-  /// **'In the next step, you can select what you want to to with the remaining credit ({credit}).'**
-  String settingsAccountDeleteAccountWithBallance(Object credit);
-
   /// No description provided for @settingsAccountDeleteAccountNoBallance.
   ///
   /// In en, this message translates to:
   /// **'Once you delete your account, there is no going back.'**
   String get settingsAccountDeleteAccountNoBallance;
 
-  /// No description provided for @settingsAccountDeleteAccountNoInternet.
-  ///
-  /// In en, this message translates to:
-  /// **'An Internet connection is required to delete your account.'**
-  String get settingsAccountDeleteAccountNoInternet;
-
   /// No description provided for @settingsAccountDeleteModalTitle.
   ///
   /// In en, this message translates to:
@@ -952,29 +842,47 @@ abstract class AppLocalizations {
   /// **'Verify contact'**
   String get contactVerifyNumberTitle;
 
-  /// No description provided for @contactVerifyNumberTapToScan.
+  /// No description provided for @userVerifiedTitle.
   ///
   /// In en, this message translates to:
-  /// **'Tap to scan'**
-  String get contactVerifyNumberTapToScan;
+  /// **'User verified'**
+  String get userVerifiedTitle;
 
-  /// No description provided for @contactVerifyNumberMarkAsVerified.
+  /// No description provided for @contactVerifiedBy.
   ///
   /// In en, this message translates to:
-  /// **'Mark as verified'**
-  String get contactVerifyNumberMarkAsVerified;
+  /// **'Verified by {username}'**
+  String contactVerifiedBy(Object username);
 
-  /// No description provided for @contactVerifyNumberClearVerification.
+  /// No description provided for @verificationTypeQrScanned.
   ///
   /// In en, this message translates to:
-  /// **'Clear verification'**
-  String get contactVerifyNumberClearVerification;
+  /// **'You scanned their QR code.'**
+  String get verificationTypeQrScanned;
 
-  /// No description provided for @contactVerifyNumberLongDesc.
+  /// No description provided for @verificationTypeSecretQrToken.
   ///
   /// In en, this message translates to:
-  /// **'To verify the end-to-end encryption with {username}, compare the numbers with their device. The person can also scan your code with their device.'**
-  String contactVerifyNumberLongDesc(Object username);
+  /// **'The other person scanned your QR code.'**
+  String get verificationTypeSecretQrToken;
+
+  /// No description provided for @verificationTypeLink.
+  ///
+  /// In en, this message translates to:
+  /// **'Verified via link.'**
+  String get verificationTypeLink;
+
+  /// No description provided for @verificationTypeContactSharedByVerified.
+  ///
+  /// In en, this message translates to:
+  /// **'Contact received from a verified contact.'**
+  String get verificationTypeContactSharedByVerified;
+
+  /// No description provided for @verificationTypeMigratedFromOldVersion.
+  ///
+  /// In en, this message translates to:
+  /// **'Migrated from old version.'**
+  String get verificationTypeMigratedFromOldVersion;
 
   /// No description provided for @contactViewMessage.
   ///
@@ -994,18 +902,6 @@ abstract class AppLocalizations {
   /// **'New nickname'**
   String get contactNicknameNew;
 
-  /// No description provided for @deleteAllContactMessages.
-  ///
-  /// In en, this message translates to:
-  /// **'Delete all text-messages'**
-  String get deleteAllContactMessages;
-
-  /// No description provided for @deleteAllContactMessagesBody.
-  ///
-  /// In en, this message translates to:
-  /// **'This will remove all messages, except stored media files, in your chat with {username}. This will NOT delete the messages stored at {username}\'s device!'**
-  String deleteAllContactMessagesBody(Object username);
-
   /// No description provided for @contactBlock.
   ///
   /// In en, this message translates to:
@@ -1060,6 +956,12 @@ abstract class AppLocalizations {
   /// **'Next'**
   String get next;
 
+  /// No description provided for @finishSetup.
+  ///
+  /// In en, this message translates to:
+  /// **'Complete setup'**
+  String get finishSetup;
+
   /// No description provided for @submit.
   ///
   /// In en, this message translates to:
@@ -1198,12 +1100,6 @@ abstract class AppLocalizations {
   /// **'Toggle the flash light'**
   String get toggleFlashLight;
 
-  /// No description provided for @toggleHighQuality.
-  ///
-  /// In en, this message translates to:
-  /// **'Toggle better resolution'**
-  String get toggleHighQuality;
-
   /// No description provided for @userFound.
   ///
   /// In en, this message translates to:
@@ -1216,30 +1112,6 @@ abstract class AppLocalizations {
   /// **'Do you want to create a follow request?'**
   String get userFoundBody;
 
-  /// No description provided for @searchUsernameNotFoundLong.
-  ///
-  /// In en, this message translates to:
-  /// **'\"{username}\" is not a twonly user. Please check the username and try again.'**
-  String searchUsernameNotFoundLong(Object username);
-
-  /// No description provided for @errorUnknown.
-  ///
-  /// In en, this message translates to:
-  /// **'An unexpected error has occurred. Please try again later.'**
-  String get errorUnknown;
-
-  /// No description provided for @errorBadRequest.
-  ///
-  /// In en, this message translates to:
-  /// **'The request could not be understood by the server due to malformed syntax. Please check your input and try again.'**
-  String get errorBadRequest;
-
-  /// No description provided for @errorTooManyRequests.
-  ///
-  /// In en, this message translates to:
-  /// **'You have made too many requests in a short period. Please wait a moment before trying again.'**
-  String get errorTooManyRequests;
-
   /// No description provided for @errorInternalError.
   ///
   /// In en, this message translates to:
@@ -1258,48 +1130,12 @@ abstract class AppLocalizations {
   /// **'The username is already taken.'**
   String get errorUsernameAlreadyTaken;
 
-  /// No description provided for @errorSignatureNotValid.
-  ///
-  /// In en, this message translates to:
-  /// **'The provided signature is not valid. Please check your credentials and try again.'**
-  String get errorSignatureNotValid;
-
-  /// No description provided for @errorUsernameNotFound.
-  ///
-  /// In en, this message translates to:
-  /// **'The username you entered does not exist. Please check the spelling or create a new account.'**
-  String get errorUsernameNotFound;
-
   /// No description provided for @errorUsernameNotValid.
   ///
   /// In en, this message translates to:
   /// **'The username you provided does not meet the required criteria. Please choose a valid username.'**
   String get errorUsernameNotValid;
 
-  /// No description provided for @errorInvalidPublicKey.
-  ///
-  /// In en, this message translates to:
-  /// **'The public key you provided is invalid. Please check the key and try again.'**
-  String get errorInvalidPublicKey;
-
-  /// No description provided for @errorSessionAlreadyAuthenticated.
-  ///
-  /// In en, this message translates to:
-  /// **'You are already logged in. Please log out if you want to log in with a different account.'**
-  String get errorSessionAlreadyAuthenticated;
-
-  /// No description provided for @errorSessionNotAuthenticated.
-  ///
-  /// In en, this message translates to:
-  /// **'Your session is not authenticated. Please log in to continue.'**
-  String get errorSessionNotAuthenticated;
-
-  /// No description provided for @errorOnlyOneSessionAllowed.
-  ///
-  /// In en, this message translates to:
-  /// **'Only one active session is allowed per user. Please log out from other devices to continue.'**
-  String get errorOnlyOneSessionAllowed;
-
   /// No description provided for @errorNotEnoughCredit.
   ///
   /// In en, this message translates to:
@@ -1438,30 +1274,6 @@ abstract class AppLocalizations {
   /// **'✓ Additional features (coming-soon)'**
   String get plusFeature2;
 
-  /// No description provided for @transactionHistory.
-  ///
-  /// In en, this message translates to:
-  /// **'Your transaction history'**
-  String get transactionHistory;
-
-  /// No description provided for @manageSubscription.
-  ///
-  /// In en, this message translates to:
-  /// **'Manage subscription'**
-  String get manageSubscription;
-
-  /// No description provided for @nextPayment.
-  ///
-  /// In en, this message translates to:
-  /// **'Next payment'**
-  String get nextPayment;
-
-  /// No description provided for @currentBalance.
-  ///
-  /// In en, this message translates to:
-  /// **'Current balance'**
-  String get currentBalance;
-
   /// No description provided for @manageAdditionalUsers.
   ///
   /// In en, this message translates to:
@@ -1474,234 +1286,36 @@ abstract class AppLocalizations {
   /// **'Open'**
   String get open;
 
-  /// No description provided for @createOrRedeemVoucher.
-  ///
-  /// In en, this message translates to:
-  /// **'Buy or redeem voucher'**
-  String get createOrRedeemVoucher;
-
   /// No description provided for @createVoucher.
   ///
   /// In en, this message translates to:
   /// **'Buy voucher'**
   String get createVoucher;
 
-  /// No description provided for @createVoucherDesc.
-  ///
-  /// In en, this message translates to:
-  /// **'Choose the value of the voucher. The value of the voucher will be deducted from your twonly balance.'**
-  String get createVoucherDesc;
-
   /// No description provided for @redeemVoucher.
   ///
   /// In en, this message translates to:
   /// **'Redeem voucher'**
   String get redeemVoucher;
 
-  /// No description provided for @openVouchers.
-  ///
-  /// In en, this message translates to:
-  /// **'Open vouchers'**
-  String get openVouchers;
-
-  /// No description provided for @voucherCreated.
-  ///
-  /// In en, this message translates to:
-  /// **'Voucher created'**
-  String get voucherCreated;
-
-  /// No description provided for @voucherRedeemed.
-  ///
-  /// In en, this message translates to:
-  /// **'Voucher redeemed'**
-  String get voucherRedeemed;
-
-  /// No description provided for @enterVoucherCode.
-  ///
-  /// In en, this message translates to:
-  /// **'Enter Voucher Code'**
-  String get enterVoucherCode;
-
-  /// No description provided for @requestedVouchers.
-  ///
-  /// In en, this message translates to:
-  /// **'Requested vouchers'**
-  String get requestedVouchers;
-
-  /// No description provided for @redeemedVouchers.
-  ///
-  /// In en, this message translates to:
-  /// **'Redeemed vouchers'**
-  String get redeemedVouchers;
-
   /// No description provided for @buy.
   ///
   /// In en, this message translates to:
   /// **'Buy'**
   String get buy;
 
-  /// No description provided for @subscriptionRefund.
-  ///
-  /// In en, this message translates to:
-  /// **'When you upgrade, you will receive a refund of {refund} for your current subscription.'**
-  String subscriptionRefund(Object refund);
-
-  /// No description provided for @transactionCash.
-  ///
-  /// In en, this message translates to:
-  /// **'Cash transaction'**
-  String get transactionCash;
-
-  /// No description provided for @transactionPlanUpgrade.
-  ///
-  /// In en, this message translates to:
-  /// **'Plan upgrade'**
-  String get transactionPlanUpgrade;
-
-  /// No description provided for @transactionRefund.
-  ///
-  /// In en, this message translates to:
-  /// **'Refund transaction'**
-  String get transactionRefund;
-
-  /// No description provided for @transactionThanksForTesting.
-  ///
-  /// In en, this message translates to:
-  /// **'Thank you for testing'**
-  String get transactionThanksForTesting;
-
-  /// No description provided for @transactionUnknown.
-  ///
-  /// In en, this message translates to:
-  /// **'Unknown transaction'**
-  String get transactionUnknown;
-
-  /// No description provided for @transactionVoucherCreated.
-  ///
-  /// In en, this message translates to:
-  /// **'Voucher created'**
-  String get transactionVoucherCreated;
-
-  /// No description provided for @transactionVoucherRedeemed.
-  ///
-  /// In en, this message translates to:
-  /// **'Voucher redeemed'**
-  String get transactionVoucherRedeemed;
-
-  /// No description provided for @transactionAutoRenewal.
-  ///
-  /// In en, this message translates to:
-  /// **'Automatic renewal'**
-  String get transactionAutoRenewal;
-
-  /// No description provided for @checkoutOptions.
-  ///
-  /// In en, this message translates to:
-  /// **'Options'**
-  String get checkoutOptions;
-
-  /// No description provided for @refund.
-  ///
-  /// In en, this message translates to:
-  /// **'Refund'**
-  String get refund;
-
-  /// No description provided for @checkoutPayYearly.
-  ///
-  /// In en, this message translates to:
-  /// **'Pay yearly'**
-  String get checkoutPayYearly;
-
-  /// No description provided for @checkoutTotal.
-  ///
-  /// In en, this message translates to:
-  /// **'Total'**
-  String get checkoutTotal;
-
-  /// No description provided for @selectPaymentMethod.
-  ///
-  /// In en, this message translates to:
-  /// **'Select Payment Method'**
-  String get selectPaymentMethod;
-
-  /// No description provided for @twonlyCredit.
-  ///
-  /// In en, this message translates to:
-  /// **'twonly-Credit'**
-  String get twonlyCredit;
-
-  /// No description provided for @notEnoughCredit.
-  ///
-  /// In en, this message translates to:
-  /// **'You do not have enough credit!'**
-  String get notEnoughCredit;
-
-  /// No description provided for @chargeCredit.
-  ///
-  /// In en, this message translates to:
-  /// **'Charge credit'**
-  String get chargeCredit;
-
   /// No description provided for @autoRenewal.
   ///
   /// In en, this message translates to:
   /// **'Auto renewal'**
   String get autoRenewal;
 
-  /// No description provided for @autoRenewalDesc.
-  ///
-  /// In en, this message translates to:
-  /// **'You can change this at any time.'**
-  String get autoRenewalDesc;
-
-  /// No description provided for @autoRenewalLongDesc.
-  ///
-  /// In en, this message translates to:
-  /// **'When your subscription expires, you will automatically be downgraded to the Preview plan. If you activate the automatic renewal, please make sure that you have enough credit for the automatic renewal. We will notify you in good time before the automatic renewal.'**
-  String get autoRenewalLongDesc;
-
-  /// No description provided for @planSuccessUpgraded.
-  ///
-  /// In en, this message translates to:
-  /// **'Successfully upgraded your plan.'**
-  String get planSuccessUpgraded;
-
-  /// No description provided for @checkoutSubmit.
-  ///
-  /// In en, this message translates to:
-  /// **'Order with a fee.'**
-  String get checkoutSubmit;
-
   /// No description provided for @additionalUsersList.
   ///
   /// In en, this message translates to:
   /// **'Your additional users'**
   String get additionalUsersList;
 
-  /// No description provided for @additionalUsersPlusTokens.
-  ///
-  /// In en, this message translates to:
-  /// **'twonly-codes for \"Plus\" user'**
-  String get additionalUsersPlusTokens;
-
-  /// No description provided for @additionalUsersFreeTokens.
-  ///
-  /// In en, this message translates to:
-  /// **'twonly-codes for \"Free\" user'**
-  String get additionalUsersFreeTokens;
-
-  /// No description provided for @planLimitReached.
-  ///
-  /// In en, this message translates to:
-  /// **'You have reached your plan limit for today. Upgrade your plan now to send the media file.'**
-  String get planLimitReached;
-
-  /// No description provided for @planNotAllowed.
-  ///
-  /// In en, this message translates to:
-  /// **'You cannot send media files with your current tariff. Upgrade your plan now to send the media file.'**
-  String get planNotAllowed;
-
   /// No description provided for @galleryDelete.
   ///
   /// In en, this message translates to:
@@ -1726,72 +1340,6 @@ abstract class AppLocalizations {
   /// **'Successfully saved in the Gallery.'**
   String get galleryExportSuccess;
 
-  /// No description provided for @settingsResetTutorials.
-  ///
-  /// In en, this message translates to:
-  /// **'Show tutorials again'**
-  String get settingsResetTutorials;
-
-  /// No description provided for @settingsResetTutorialsDesc.
-  ///
-  /// In en, this message translates to:
-  /// **'Click here to show already displayed tutorials again.'**
-  String get settingsResetTutorialsDesc;
-
-  /// No description provided for @settingsResetTutorialsSuccess.
-  ///
-  /// In en, this message translates to:
-  /// **'Tutorials will be displayed again.'**
-  String get settingsResetTutorialsSuccess;
-
-  /// No description provided for @tutorialChatListSearchUsersTitle.
-  ///
-  /// In en, this message translates to:
-  /// **'Find Friends and Manage Friend Requests'**
-  String get tutorialChatListSearchUsersTitle;
-
-  /// No description provided for @tutorialChatListSearchUsersDesc.
-  ///
-  /// In en, this message translates to:
-  /// **'If you know your friends\' usernames, you can search for them here and send a friend request. You will also see all requests from other users that you can accept or block.'**
-  String get tutorialChatListSearchUsersDesc;
-
-  /// No description provided for @tutorialChatListContextMenuTitle.
-  ///
-  /// In en, this message translates to:
-  /// **'Long press on the contact to open the context menu.'**
-  String get tutorialChatListContextMenuTitle;
-
-  /// No description provided for @tutorialChatListContextMenuDesc.
-  ///
-  /// In en, this message translates to:
-  /// **'With the context menu, you can pin, archive, and perform various actions on your contacts. Simply long press the contact and then move your finger to the desired option or tap directly on it.'**
-  String get tutorialChatListContextMenuDesc;
-
-  /// No description provided for @tutorialChatMessagesVerifyShieldTitle.
-  ///
-  /// In en, this message translates to:
-  /// **'Verify your contacts!'**
-  String get tutorialChatMessagesVerifyShieldTitle;
-
-  /// No description provided for @tutorialChatMessagesVerifyShieldDesc.
-  ///
-  /// In en, this message translates to:
-  /// **'twonly uses the Signal protocol for secure end-to-end encryption. When you first contact someone, their public identity key is downloaded. To ensure that this key has not been tampered with by third parties, you should compare it with your friend when you meet in person. Once you have verified the user, you can also enable the twonly mode when sending images and videos.'**
-  String get tutorialChatMessagesVerifyShieldDesc;
-
-  /// No description provided for @tutorialChatMessagesReopenMessageTitle.
-  ///
-  /// In en, this message translates to:
-  /// **'Reopen Images and Videos'**
-  String get tutorialChatMessagesReopenMessageTitle;
-
-  /// No description provided for @tutorialChatMessagesReopenMessageDesc.
-  ///
-  /// In en, this message translates to:
-  /// **'If your friend has sent you a picture or video with infinite display time, you can open it again at any time until you restart the app. To do this, simply double-click on the message. Your friend will then receive a notification that you have viewed the picture again.'**
-  String get tutorialChatMessagesReopenMessageDesc;
-
   /// No description provided for @memoriesEmpty.
   ///
   /// In en, this message translates to:
@@ -1834,30 +1382,6 @@ abstract class AppLocalizations {
   /// **'Backup'**
   String get settingsBackup;
 
-  /// No description provided for @backupNoticeTitle.
-  ///
-  /// In en, this message translates to:
-  /// **'No backup configured'**
-  String get backupNoticeTitle;
-
-  /// No description provided for @backupNoticeDesc.
-  ///
-  /// In en, this message translates to:
-  /// **'If you change or lose your device, no one can restore your account without a backup. Therefore, back up your data.'**
-  String get backupNoticeDesc;
-
-  /// No description provided for @backupNoticeLater.
-  ///
-  /// In en, this message translates to:
-  /// **'Remind later'**
-  String get backupNoticeLater;
-
-  /// No description provided for @backupNoticeOpenBackup.
-  ///
-  /// In en, this message translates to:
-  /// **'Create backup'**
-  String get backupNoticeOpenBackup;
-
   /// No description provided for @backupPending.
   ///
   /// In en, this message translates to:
@@ -1924,30 +1448,12 @@ abstract class AppLocalizations {
   /// **'Result'**
   String get backupLastBackupResult;
 
-  /// No description provided for @deleteBackupTitle.
-  ///
-  /// In en, this message translates to:
-  /// **'Are you sure?'**
-  String get deleteBackupTitle;
-
-  /// No description provided for @deleteBackupBody.
-  ///
-  /// In en, this message translates to:
-  /// **'Without an backup, you can not restore your user account.'**
-  String get deleteBackupBody;
-
   /// No description provided for @backupData.
   ///
   /// In en, this message translates to:
   /// **'Data-Backup'**
   String get backupData;
 
-  /// No description provided for @backupDataDesc.
-  ///
-  /// In en, this message translates to:
-  /// **'This backup contains besides of your twonly-Identity also all of your media files. This backup will is also encrypted but stored locally. You then have to ensure to manually copy it onto your laptop or device of your choice.'**
-  String get backupDataDesc;
-
   /// No description provided for @backupInsecurePassword.
   ///
   /// In en, this message translates to:
@@ -2122,12 +1628,6 @@ abstract class AppLocalizations {
   /// **'Retransmission requested'**
   String get retransmissionRequested;
 
-  /// No description provided for @testPaymentMethod.
-  ///
-  /// In en, this message translates to:
-  /// **'Thanks for the interest in a paid plan. Currently the paid plans are still deactivated. But they will be activated soon!'**
-  String get testPaymentMethod;
-
   /// No description provided for @openChangeLog.
   ///
   /// In en, this message translates to:
@@ -2836,6 +2336,150 @@ abstract class AppLocalizations {
   /// **'Skip for now'**
   String get skipForNow;
 
+  /// No description provided for @finishSetupCardTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Complete your profile'**
+  String get finishSetupCardTitle;
+
+  /// No description provided for @finishSetupCardDesc.
+  ///
+  /// In en, this message translates to:
+  /// **'You are almost there! Finish setting up your account to get the most out of twonly.'**
+  String get finishSetupCardDesc;
+
+  /// No description provided for @finishSetupCardAction.
+  ///
+  /// In en, this message translates to:
+  /// **'Resume Setup'**
+  String get finishSetupCardAction;
+
+  /// No description provided for @onboardingFinishLater.
+  ///
+  /// In en, this message translates to:
+  /// **'Finish later'**
+  String get onboardingFinishLater;
+
+  /// No description provided for @onboardingProfileTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Choose your look'**
+  String get onboardingProfileTitle;
+
+  /// No description provided for @onboardingProfileBody.
+  ///
+  /// In en, this message translates to:
+  /// **'Select an avatar and a display name that friends will see.'**
+  String get onboardingProfileBody;
+
+  /// No description provided for @onboardingBackupBody.
+  ///
+  /// In en, this message translates to:
+  /// **'Back up your twonly identity, as this is the only way to restore your account if you uninstall the app or lose your phone.'**
+  String get onboardingBackupBody;
+
+  /// No description provided for @onboardingVerificationBadgeTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Verification Badge'**
+  String get onboardingVerificationBadgeTitle;
+
+  /// No description provided for @onboardingUserDiscoveryShareFriends.
+  ///
+  /// In en, this message translates to:
+  /// **'Share your friends'**
+  String get onboardingUserDiscoveryShareFriends;
+
+  /// No description provided for @onboardingUserDiscoveryShareFriendsDesc.
+  ///
+  /// In en, this message translates to:
+  /// **'Share with your friends who you know and who you have verified. Friends can *only see mutual friends* from your friend list. You can change your mind at *any time* or *hide specific people*.'**
+  String get onboardingUserDiscoveryShareFriendsDesc;
+
+  /// No description provided for @onboardingUserDiscoveryContactsVerifiedBadge.
+  ///
+  /// In en, this message translates to:
+  /// **'Contacts verified by your friends get a badge'**
+  String get onboardingUserDiscoveryContactsVerifiedBadge;
+
+  /// No description provided for @onboardingUserDiscoveryWhoIsRequesting.
+  ///
+  /// In en, this message translates to:
+  /// **'Be informed about who is requesting'**
+  String get onboardingUserDiscoveryWhoIsRequesting;
+
+  /// No description provided for @userDiscoverySettingsManualApproval.
+  ///
+  /// In en, this message translates to:
+  /// **'Manual approval'**
+  String get userDiscoverySettingsManualApproval;
+
+  /// No description provided for @userDiscoverySettingsManualApprovalDesc.
+  ///
+  /// In en, this message translates to:
+  /// **'Before someone is shared, you\'ll be asked first.'**
+  String get userDiscoverySettingsManualApprovalDesc;
+
+  /// No description provided for @onboardingUserDiscoveryLetFriendsFindYou.
+  ///
+  /// In en, this message translates to:
+  /// **'Let your friends find you'**
+  String get onboardingUserDiscoveryLetFriendsFindYou;
+
+  /// No description provided for @onboardingUserDiscoveryBeRecommended.
+  ///
+  /// In en, this message translates to:
+  /// **'Be recommended to others'**
+  String get onboardingUserDiscoveryBeRecommended;
+
+  /// No description provided for @onboardingUserDiscoveryWhatOthersSee.
+  ///
+  /// In en, this message translates to:
+  /// **'What others will see'**
+  String get onboardingUserDiscoveryWhatOthersSee;
+
+  /// No description provided for @onboardingUserDiscoveryWhatYouSee.
+  ///
+  /// In en, this message translates to:
+  /// **'If requested, that\'s what you will see'**
+  String get onboardingUserDiscoveryWhatYouSee;
+
+  /// No description provided for @onboardingAddContactsTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Add new contacts'**
+  String get onboardingAddContactsTitle;
+
+  /// No description provided for @onboardingAddContactsAcceptDesc.
+  ///
+  /// In en, this message translates to:
+  /// **'In twonly, every contact must first be accepted before you can communicate.'**
+  String get onboardingAddContactsAcceptDesc;
+
+  /// No description provided for @onboardingAddContactsMethodHeading.
+  ///
+  /// In en, this message translates to:
+  /// **'Add contacts'**
+  String get onboardingAddContactsMethodHeading;
+
+  /// No description provided for @onboardingAddContactsMethodScan.
+  ///
+  /// In en, this message translates to:
+  /// **'Scan the contact\'s QR code.'**
+  String get onboardingAddContactsMethodScan;
+
+  /// No description provided for @onboardingAddContactsMethodSearch.
+  ///
+  /// In en, this message translates to:
+  /// **'Search for the username.'**
+  String get onboardingAddContactsMethodSearch;
+
+  /// No description provided for @onboardingAddContactsMethodShare.
+  ///
+  /// In en, this message translates to:
+  /// **'Share a contact in chats.'**
+  String get onboardingAddContactsMethodShare;
+
   /// No description provided for @linkFromUsername.
   ///
   /// In en, this message translates to:
@@ -3031,25 +2675,25 @@ abstract class AppLocalizations {
   /// No description provided for @verificationBadgeGeneralDesc.
   ///
   /// In en, this message translates to:
-  /// **'The green checkmark gives you the certainty that you are messaging the right person.'**
+  /// **'The checkmark gives you the certainty that you are messaging the right person. Scan the contact\'s QR code to verify it.'**
   String get verificationBadgeGeneralDesc;
 
   /// No description provided for @verificationBadgeGreenDesc.
   ///
   /// In en, this message translates to:
-  /// **'Contact that you have personally verified via QR code. This also verified their public key.'**
+  /// **'A contact you have *personally* verified.'**
   String get verificationBadgeGreenDesc;
 
   /// No description provided for @verificationBadgeYellowDesc.
   ///
   /// In en, this message translates to:
-  /// **'(Coming soon) Contact whose QR code was scanned by one of your personally verified contacts.'**
+  /// **'A contact who has been verified by at least one of *your contacts*.'**
   String get verificationBadgeYellowDesc;
 
   /// No description provided for @verificationBadgeRedDesc.
   ///
   /// In en, this message translates to:
-  /// **'Unknown contact whose identity has not yet been verified.'**
+  /// **'A contact whose identity has *not* yet been verified.'**
   String get verificationBadgeRedDesc;
 
   /// No description provided for @chatEntryFlameRestored.
@@ -3142,12 +2786,6 @@ abstract class AppLocalizations {
   /// **'Accept'**
   String get contactActionAccept;
 
-  /// No description provided for @userDiscoverySettingsMinImages.
-  ///
-  /// In en, this message translates to:
-  /// **'Choose the minimum number of images you must have exchanged with a person before you securely share your friends with them.'**
-  String get userDiscoverySettingsMinImages;
-
   /// No description provided for @userDiscoverySettingsMutualFriends.
   ///
   /// In en, this message translates to:
@@ -3163,7 +2801,7 @@ abstract class AppLocalizations {
   /// No description provided for @userDiscoveryEnabledDisableWarning.
   ///
   /// In en, this message translates to:
-  /// **'If you disable the \"Find friends\" feature, you will no longer see suggestions. You will also stop sharing your friends with new contacts.'**
+  /// **'If you disable the \"Mutual Friends\" feature, you will no longer see suggestions. You will also stop sharing your friends with new contacts.'**
   String get userDiscoveryEnabledDisableWarning;
 
   /// No description provided for @userDiscoveryEnabledChangeSettings.
@@ -3175,63 +2813,21 @@ abstract class AppLocalizations {
   /// No description provided for @userDiscoveryEnabledFaq.
   ///
   /// In en, this message translates to:
-  /// **'In our FAQ we explain how the \"Find friends\" feature works.'**
+  /// **'In our FAQ we explain how the \"Mutual Friends\" feature works.'**
   String get userDiscoveryEnabledFaq;
 
   /// No description provided for @userDiscoveryDisabledIntro.
   ///
   /// In en, this message translates to:
-  /// **'twonly doesn\'t use phone numbers, so we suggest friends based on mutual contacts instead – securely and privately.'**
+  /// **'twonly does *not* collect your phone number or needs access to your contacts. Instead, twonly can *find your friends through mutual friends*.'**
   String get userDiscoveryDisabledIntro;
 
-  /// No description provided for @userDiscoveryDisabledInvisible.
-  ///
-  /// In en, this message translates to:
-  /// **'Your friend list is *completely invisible to strangers*. Only your friends can see parts of it – and only those people with whom they have *mutual friends* themselves.'**
-  String get userDiscoveryDisabledInvisible;
-
-  /// No description provided for @userDiscoveryDisabledDecide.
-  ///
-  /// In en, this message translates to:
-  /// **'Decide for yourself who can see your friends. You can change your mind at any time or hide specific people.'**
-  String get userDiscoveryDisabledDecide;
-
   /// No description provided for @userDiscoverySettingsTitle.
   ///
   /// In en, this message translates to:
-  /// **'Find friends'**
+  /// **'Mutual Friends'**
   String get userDiscoverySettingsTitle;
 
-  /// No description provided for @userDiscoverySettingsMinImagesTitle.
-  ///
-  /// In en, this message translates to:
-  /// **'Number of shared images'**
-  String get userDiscoverySettingsMinImagesTitle;
-
-  /// No description provided for @userDiscoverySettingsMutualFriendsTitle.
-  ///
-  /// In en, this message translates to:
-  /// **'Number of mutual friends'**
-  String get userDiscoverySettingsMutualFriendsTitle;
-
-  /// No description provided for @userDiscoveryDisabledYouHaveControl.
-  ///
-  /// In en, this message translates to:
-  /// **'You are in control'**
-  String get userDiscoveryDisabledYouHaveControl;
-
-  /// No description provided for @userDiscoveryDisabledEnableWithDefault.
-  ///
-  /// In en, this message translates to:
-  /// **'Enable with default settings'**
-  String get userDiscoveryDisabledEnableWithDefault;
-
-  /// No description provided for @userDiscoveryDisabledCustomizeSettings.
-  ///
-  /// In en, this message translates to:
-  /// **'Customize settings'**
-  String get userDiscoveryDisabledCustomizeSettings;
-
   /// No description provided for @userDiscoveryDisabledLearnMore.
   ///
   /// In en, this message translates to:
@@ -3256,6 +2852,12 @@ abstract class AppLocalizations {
   /// **'You only share friends who have also activated this feature and who have reached the threshold you set.'**
   String get userDiscoveryEnabledFriendsSharedDesc;
 
+  /// No description provided for @userDiscoverySettingsCurrentlyDisabled.
+  ///
+  /// In en, this message translates to:
+  /// **'The feature \"Mutual Friends\" is currently disabled.'**
+  String get userDiscoverySettingsCurrentlyDisabled;
+
   /// No description provided for @userDiscoveryEnabledNoFriendsShared.
   ///
   /// In en, this message translates to:
@@ -3321,6 +2923,48 @@ abstract class AppLocalizations {
   /// In en, this message translates to:
   /// **'Stop sharing'**
   String get userDiscoveryEnabledStopSharing;
+
+  /// No description provided for @userDiscoveryManualApprovalReachedThreshold.
+  ///
+  /// In en, this message translates to:
+  /// **'Would you like to share {username} with your friends?'**
+  String userDiscoveryManualApprovalReachedThreshold(Object username);
+
+  /// No description provided for @userDiscoveryManualApprovalHideContact.
+  ///
+  /// In en, this message translates to:
+  /// **'Hide contact'**
+  String get userDiscoveryManualApprovalHideContact;
+
+  /// No description provided for @userDiscoveryManualApprovalShareContact.
+  ///
+  /// In en, this message translates to:
+  /// **'Share contact'**
+  String get userDiscoveryManualApprovalShareContact;
+
+  /// No description provided for @onboardingSetupCompleteTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'You\'re all set, {username}!'**
+  String onboardingSetupCompleteTitle(Object username);
+
+  /// No description provided for @onboardingSetupCompleteDesc.
+  ///
+  /// In en, this message translates to:
+  /// **'You can now share your moments with your friends securely without distractions like ads.'**
+  String get onboardingSetupCompleteDesc;
+
+  /// No description provided for @contactUserDiscoveryManualApprovalPending.
+  ///
+  /// In en, this message translates to:
+  /// **'Contact was not yet manually approved.'**
+  String get contactUserDiscoveryManualApprovalPending;
+
+  /// No description provided for @contactUserDiscoveryManualApprovalApprove.
+  ///
+  /// In en, this message translates to:
+  /// **'Approve'**
+  String get contactUserDiscoveryManualApprovalApprove;
 }
 
 class _AppLocalizationsDelegate
@@ -3334,7 +2978,7 @@ class _AppLocalizationsDelegate
 
   @override
   bool isSupported(Locale locale) =>
-      <String>['de', 'en', 'sv'].contains(locale.languageCode);
+      <String>['de', 'en'].contains(locale.languageCode);
 
   @override
   bool shouldReload(_AppLocalizationsDelegate old) => false;
@@ -3347,8 +2991,6 @@ AppLocalizations lookupAppLocalizations(Locale locale) {
       return AppLocalizationsDe();
     case 'en':
       return AppLocalizationsEn();
-    case 'sv':
-      return AppLocalizationsSv();
   }
 
   throw FlutterError(
diff --git a/lib/src/localization/generated/app_localizations_de.dart b/lib/src/localization/generated/app_localizations_de.dart
index 33e14ff5..4e247819 100644
--- a/lib/src/localization/generated/app_localizations_de.dart
+++ b/lib/src/localization/generated/app_localizations_de.dart
@@ -51,23 +51,9 @@ class AppLocalizationsDe extends AppLocalizations {
   String get onboardingNotProductBody =>
       'twonly wird durch Spenden und ein optionales Abonnement finanziert. Deine Daten werden niemals verkauft.';
 
-  @override
-  String get onboardingBuyOneGetTwoTitle => 'Kaufe eins, bekomme zwei';
-
-  @override
-  String get onboardingBuyOneGetTwoBody =>
-      'twonly benötigt immer mindestens zwei Personen, daher erhältst du beim Kauf eine zweite kostenlose Lizenz für deinen twonly-Partner.';
-
   @override
   String get onboardingGetStartedTitle => 'Auf geht\'s';
 
-  @override
-  String get onboardingGetStartedBody =>
-      'Du kannst twonly kostenlos im Preview-Modus testen. In diesem Modus kannst du von anderen gefunden werden und Bilder oder Videos empfangen, aber du kannst selbst keine senden.';
-
-  @override
-  String get onboardingTryForFree => 'Jetzt registrieren';
-
   @override
   String get registerUsernameSlogan =>
       'Bitte wähle einen Benutzernamen, damit dich andere finden können!';
@@ -86,16 +72,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get registerSubmitButton => 'Jetzt registrieren!';
 
-  @override
-  String get registerTwonlyCodeText =>
-      'Hast du einen twonly-Code erhalten? Dann löse ihn entweder direkt hier oder später ein!';
-
-  @override
-  String get registerTwonlyCodeLabel => 'twonly-Code';
-
-  @override
-  String get newMessageTitle => 'Neue Nachricht';
-
   @override
   String get chatsTapToSend => 'Klicke, um dein erstes Bild zu teilen.';
 
@@ -138,23 +114,9 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get startNewChatNewContact => 'Neuer Kontakt';
 
-  @override
-  String get startNewChatYourContacts => 'Deine Kontakte';
-
   @override
   String get shareImageAllUsers => 'Alle Kontakte';
 
-  @override
-  String get shareImageAllTwonlyWarning =>
-      'twonlies können nur an verifizierte Kontakte gesendet werden!';
-
-  @override
-  String get shareImageUserNotVerified => 'Benutzer ist nicht verifiziert';
-
-  @override
-  String get shareImageUserNotVerifiedDesc =>
-      'twonlies können nur an verifizierte Nutzer gesendet werden. Um einen Nutzer zu verifizieren, gehe auf deren Profil und auf „Sicherheitsnummer verifizieren“.';
-
   @override
   String get shareImageShowArchived => 'Archivierte Benutzer anzeigen';
 
@@ -164,13 +126,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get addFriendTitle => 'Freunde hinzufügen';
 
-  @override
-  String get searchUserNamePreview =>
-      'Um dich und andere twonly Benutzer vor Spam und Missbrauch zu schützen, ist es nicht möglich, im Preview-Modus nach anderen Personen zu suchen. Andere Benutzer können dich finden und deren Anfragen werden dann hier angezeigt!';
-
-  @override
-  String get selectSubscription => 'Abo auswählen';
-
   @override
   String get searchUserNamePending => 'Anfrage ausstehend';
 
@@ -185,16 +140,10 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get searchUsernameNewFollowerTitle => 'Offene Anfragen';
 
-  @override
-  String get searchUsernameQrCodeBtn => 'QR-Code scannen';
-
   @override
   String get chatListViewSearchUserNameBtn =>
       'Füge deinen ersten twonly-Kontakt hinzu!';
 
-  @override
-  String get chatListViewSendFirstTwonly => 'Sende dein erstes twonly!';
-
   @override
   String get chatListDetailInput => 'Nachricht eingeben';
 
@@ -204,9 +153,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get contextMenuUserProfile => 'Userprofil';
 
-  @override
-  String get contextMenuVerifyUser => 'Verifizieren';
-
   @override
   String get contextMenuArchiveUser => 'Archivieren';
 
@@ -450,19 +396,10 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get settingsAccountDeleteAccount => 'Konto löschen';
 
-  @override
-  String settingsAccountDeleteAccountWithBallance(Object credit) {
-    return 'Im nächsten Schritt kannst du auswählen, was du mit dem Restguthaben ($credit) machen willst.';
-  }
-
   @override
   String get settingsAccountDeleteAccountNoBallance =>
       'Wenn du dein Konto gelöscht hast, gibt es keinen Weg zurück.';
 
-  @override
-  String get settingsAccountDeleteAccountNoInternet =>
-      'Zum Löschen deines Accounts ist eine Internetverbindung erforderlich.';
-
   @override
   String get settingsAccountDeleteModalTitle => 'Bist du sicher?';
 
@@ -474,19 +411,31 @@ class AppLocalizationsDe extends AppLocalizations {
   String get contactVerifyNumberTitle => 'Benutzer verifizieren';
 
   @override
-  String get contactVerifyNumberTapToScan => 'Zum Scannen tippen';
+  String get userVerifiedTitle => 'Benutzer verifiziert';
 
   @override
-  String get contactVerifyNumberMarkAsVerified => 'Als verifiziert markieren';
-
-  @override
-  String get contactVerifyNumberClearVerification => 'Verifizierung aufheben';
-
-  @override
-  String contactVerifyNumberLongDesc(Object username) {
-    return 'Um die Ende-zu-Ende-Verschlüsselung mit $username zu verifizieren, vergleiche die Zahlen mit deren Gerät. Die Person kann auch deinen Code mit deren Gerät scannen.';
+  String contactVerifiedBy(Object username) {
+    return 'Verifiziert von $username';
   }
 
+  @override
+  String get verificationTypeQrScanned => 'Du hast den QR-Code gescannt.';
+
+  @override
+  String get verificationTypeSecretQrToken =>
+      'Die andere Person hat deinen QR-Code gescannt.';
+
+  @override
+  String get verificationTypeLink => 'Per Link verifiziert.';
+
+  @override
+  String get verificationTypeContactSharedByVerified =>
+      'Von einem verifizierten Kontakt geteilt bekommen.';
+
+  @override
+  String get verificationTypeMigratedFromOldVersion =>
+      'Von alter Version migriert';
+
   @override
   String get contactViewMessage => 'Nachricht';
 
@@ -496,14 +445,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get contactNicknameNew => 'Neuer Spitzname';
 
-  @override
-  String get deleteAllContactMessages => 'Textnachrichten löschen';
-
-  @override
-  String deleteAllContactMessagesBody(Object username) {
-    return 'Dadurch werden alle Nachrichten, ausgenommen gespeicherte Mediendateien, in deinem Chat mit $username gelöscht. Dies löscht NICHT die auf dem Gerät von $username gespeicherten Nachrichten!';
-  }
-
   @override
   String get contactBlock => 'Blockieren';
 
@@ -537,6 +478,9 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get next => 'Weiter';
 
+  @override
+  String get finishSetup => 'Setup abschließen';
+
   @override
   String get submit => 'Abschicken';
 
@@ -607,9 +551,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get toggleFlashLight => 'Taschenlampe umschalten';
 
-  @override
-  String get toggleHighQuality => 'Bessere Auflösung umschalten';
-
   @override
   String userFound(Object username) {
     return '$username gefunden';
@@ -618,23 +559,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get userFoundBody => 'Möchtest du eine Folgeanfrage stellen?';
 
-  @override
-  String searchUsernameNotFoundLong(Object username) {
-    return '\"$username\" ist kein twonly-Benutzer. Bitte überprüfe den Benutzernamen und versuche es erneut.';
-  }
-
-  @override
-  String get errorUnknown =>
-      'Ein unerwarteter Fehler ist aufgetreten. Bitte versuche es später erneut.';
-
-  @override
-  String get errorBadRequest =>
-      'Die Anfrage konnte vom Server aufgrund einer fehlerhaften Syntax nicht verstanden werden. Bitte überprüfe deine Eingabe und versuche es erneut.';
-
-  @override
-  String get errorTooManyRequests =>
-      'Du hast in kurzer Zeit zu viele Anfragen gestellt. Bitte warte einen Moment, bevor du es erneut versuchst.';
-
   @override
   String get errorInternalError =>
       'Der Server ist derzeit nicht verfügbar. Bitte versuche es später erneut.';
@@ -647,34 +571,10 @@ class AppLocalizationsDe extends AppLocalizations {
   String get errorUsernameAlreadyTaken =>
       'Der Benutzername ist bereits vergeben.';
 
-  @override
-  String get errorSignatureNotValid =>
-      'Die bereitgestellte Signatur ist nicht gültig. Bitte überprüfe deine Anmeldeinformationen und versuche es erneut.';
-
-  @override
-  String get errorUsernameNotFound =>
-      'Der eingegebene Benutzername existiert nicht. Bitte überprüfe die Schreibweise oder erstelle ein neues Konto.';
-
   @override
   String get errorUsernameNotValid =>
       'Der von dir angegebene Benutzername entspricht nicht den erforderlichen Kriterien. Bitte wähle einen gültigen Benutzernamen.';
 
-  @override
-  String get errorInvalidPublicKey =>
-      'Der von dir angegebene öffentliche Schlüssel ist ungültig. Bitte überprüfe den Schlüssel und versuche es erneut.';
-
-  @override
-  String get errorSessionAlreadyAuthenticated =>
-      'Du bist bereits angemeldet. Bitte melde dich ab, wenn du dich mit einem anderen Konto anmelden möchtest.';
-
-  @override
-  String get errorSessionNotAuthenticated =>
-      'Deine Sitzung ist nicht authentifiziert. Bitte melde dich an, um fortzufahren.';
-
-  @override
-  String get errorOnlyOneSessionAllowed =>
-      'Es ist nur eine aktive Sitzung pro Benutzer erlaubt. Bitte melde dich von anderen Geräten ab, um fortzufahren.';
-
   @override
   String get errorNotEnoughCredit => 'Du hast nicht genügend twonly-Guthaben.';
 
@@ -752,144 +652,27 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get plusFeature2 => '✓ Zusatzfunktionen (coming-soon)';
 
-  @override
-  String get transactionHistory => 'Transaktionshistorie';
-
-  @override
-  String get manageSubscription => 'Abonnement verwalten';
-
-  @override
-  String get nextPayment => 'Nächste Zahlung';
-
-  @override
-  String get currentBalance => 'Dein Guthaben';
-
   @override
   String get manageAdditionalUsers => 'Zusätzliche Benutzer verwalten';
 
   @override
   String get open => 'Offene';
 
-  @override
-  String get createOrRedeemVoucher => 'Gutschein erstellen oder einlösen';
-
   @override
   String get createVoucher => 'Gutschein kaufen';
 
-  @override
-  String get createVoucherDesc =>
-      'Wähle den Wert des Gutscheins. Der Wert des Gutschein wird von deinem twonly-Guthaben abgezogen.';
-
   @override
   String get redeemVoucher => 'Gutschein einlösen';
 
-  @override
-  String get openVouchers => 'Offene Gutscheine';
-
-  @override
-  String get voucherCreated => 'Gutschein wurde erstellt';
-
-  @override
-  String get voucherRedeemed => 'Gutschein eingelöst';
-
-  @override
-  String get enterVoucherCode => 'Gutschein Code eingeben';
-
-  @override
-  String get requestedVouchers => 'Beantragte Gutscheine';
-
-  @override
-  String get redeemedVouchers => 'Eingelöste Gutscheine';
-
   @override
   String get buy => 'Kaufen';
 
-  @override
-  String subscriptionRefund(Object refund) {
-    return 'Wenn du ein Upgrade durchführst, erhältst du eine Rückerstattung von $refund für dein aktuelles Abonnement.';
-  }
-
-  @override
-  String get transactionCash => 'Bargeldtransaktion';
-
-  @override
-  String get transactionPlanUpgrade => 'Planupgrade';
-
-  @override
-  String get transactionRefund => 'Rückerstattung';
-
-  @override
-  String get transactionThanksForTesting => 'Danke fürs Testen';
-
-  @override
-  String get transactionUnknown => 'Unbekannte Transaktion';
-
-  @override
-  String get transactionVoucherCreated => 'Gutschein erstellt';
-
-  @override
-  String get transactionVoucherRedeemed => 'Gutschein eingelöst';
-
-  @override
-  String get transactionAutoRenewal => 'Automatische Verlängerung';
-
-  @override
-  String get checkoutOptions => 'Optionen';
-
-  @override
-  String get refund => 'Rückerstattung';
-
-  @override
-  String get checkoutPayYearly => 'Jährlich bezahlen';
-
-  @override
-  String get checkoutTotal => 'Gesamt';
-
-  @override
-  String get selectPaymentMethod => 'Zahlungsmethode auswählen';
-
-  @override
-  String get twonlyCredit => 'twonly-Guthaben';
-
-  @override
-  String get notEnoughCredit => 'Du hast nicht genügend Guthaben!';
-
-  @override
-  String get chargeCredit => 'Guthaben aufladen';
-
   @override
   String get autoRenewal => 'Automatische Verlängerung';
 
-  @override
-  String get autoRenewalDesc => 'Du kannst dies jederzeit ändern.';
-
-  @override
-  String get autoRenewalLongDesc =>
-      'Wenn dein Abonnement ausläuft, wirst du automatisch auf den Preview-Plan zurückgestuft. Wenn du die automatische Verlängerung aktivierst, vergewissere dich bitte, dass du über genügend Guthaben für die automatische Erneuerung verfügst. Wir werden dich rechtzeitig vor der automatischen Erneuerung benachrichtigen.';
-
-  @override
-  String get planSuccessUpgraded => 'Dein Plan wurde erfolgreich aktualisiert.';
-
-  @override
-  String get checkoutSubmit => 'Kostenpflichtig bestellen';
-
   @override
   String get additionalUsersList => 'Deine zusätzlichen Benutzer';
 
-  @override
-  String get additionalUsersPlusTokens => 'twonly-Codes für \"Plus\"-Benutzer';
-
-  @override
-  String get additionalUsersFreeTokens => 'twonly-Codes für \"Free\"-Benutzer';
-
-  @override
-  String get planLimitReached =>
-      'Du hast dein Planlimit für heute erreicht. Aktualisiere deinen Plan jetzt, um die Mediendatei zu senden.';
-
-  @override
-  String get planNotAllowed =>
-      'In deinem aktuellen Plan kannst du keine Mediendateien versenden. Aktualisiere deinen Plan jetzt, um die Mediendatei zu senden.';
-
   @override
   String get galleryDelete => 'Datei löschen';
 
@@ -902,49 +685,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get galleryExportSuccess => 'Erfolgreich in der Gallery gespeichert.';
 
-  @override
-  String get settingsResetTutorials => 'Tutorials erneut anzeigen';
-
-  @override
-  String get settingsResetTutorialsDesc =>
-      'Klicke hier, um bereits angezeigte Tutorials erneut anzuzeigen.';
-
-  @override
-  String get settingsResetTutorialsSuccess =>
-      'Tutorials werden erneut angezeigt.';
-
-  @override
-  String get tutorialChatListSearchUsersTitle =>
-      'Freunde finden und Freundschaftsanfragen verwalten';
-
-  @override
-  String get tutorialChatListSearchUsersDesc =>
-      'Wenn du die Benutzernamen deiner Freunde kennst, kannst du sie hier suchen und eine Freundschaftsanfrage senden. Außerdem siehst du hier alle Anfragen von anderen Nutzern, die du annehmen oder blockieren kannst.';
-
-  @override
-  String get tutorialChatListContextMenuTitle =>
-      'Klicke lange auf den Kontakt, um das Kontextmenü zu öffnen.';
-
-  @override
-  String get tutorialChatListContextMenuDesc =>
-      'Mit dem Kontextmenü kannst du deine Kontakte anheften, archivieren und verschiedene Aktionen durchführen. Halte dazu einfach den Kontakt lange gedrückt und bewege dann deinen Finger auf die gewünschte Option oder tippe direkt darauf.';
-
-  @override
-  String get tutorialChatMessagesVerifyShieldTitle =>
-      'Verifiziere deine Kontakte!';
-
-  @override
-  String get tutorialChatMessagesVerifyShieldDesc =>
-      'twonly nutzt das Signal-Protokoll für eine sichere Ende-zu-Ende Verschlüsselung. Bei der ersten Kontaktaufnahme wird dafür der öffentliche Identitätsschlüssel von deinem Kontakt heruntergeladen. Um sicherzustellen, dass dieser Schlüssel nicht von Dritten ausgetauscht wurde, solltest du ihn mit deinem Freund vergleichen, wenn ihr euch persönlich trefft. Sobald du den Benutzer verifiziert hast, kannst du auch beim verschicken von Bildern und Videos den twonly-Modus aktivieren.';
-
-  @override
-  String get tutorialChatMessagesReopenMessageTitle =>
-      'Bilder und Videos erneut öffnen';
-
-  @override
-  String get tutorialChatMessagesReopenMessageDesc =>
-      'Wenn dein Freund dir ein Bild oder Video mit unendlicher Anzeigezeit gesendet hat, kannst du es bis zum Neustart der App jederzeit erneut öffnen. Um dies zu tun, musst du einfach doppelt auf die Nachricht klicken. Dein Freund erhält dann eine Benachrichtigung, dass du das Bild erneut angesehen hast.';
-
   @override
   String get memoriesEmpty =>
       'Sobald du Bilder oder Videos speicherst, landen sie hier in deinen Erinnerungen.';
@@ -967,19 +707,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get settingsBackup => 'Backup';
 
-  @override
-  String get backupNoticeTitle => 'Kein Backup konfiguriert';
-
-  @override
-  String get backupNoticeDesc =>
-      'Wenn du dein Gerät wechselst oder verlierst, kann ohne Backup niemand dein Account wiederherstellen. Sichere deshalb deine Daten.';
-
-  @override
-  String get backupNoticeLater => 'Später erinnern';
-
-  @override
-  String get backupNoticeOpenBackup => 'Backup erstellen';
-
   @override
   String get backupPending => 'Ausstehend';
 
@@ -1015,20 +742,9 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get backupLastBackupResult => 'Ergebnis';
 
-  @override
-  String get deleteBackupTitle => 'Bist du sicher?';
-
-  @override
-  String get deleteBackupBody =>
-      'Ohne ein Backup kannst du dein Benutzerkonto nicht wiederherstellen.';
-
   @override
   String get backupData => 'Daten-Backup';
 
-  @override
-  String get backupDataDesc =>
-      'Das Daten-Backup enthält neben deiner twonly-Identität auch alle deine Mediendateien. Dieses Backup ist ebenfalls verschlüsselt, wird jedoch lokal gespeichert. Du musst es dann manuell auf deinen Laptop oder ein Gerät deiner Wahl kopieren.';
-
   @override
   String get backupInsecurePassword => 'Unsicheres Passwort';
 
@@ -1125,10 +841,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get retransmissionRequested => 'Wird erneut versucht.';
 
-  @override
-  String get testPaymentMethod =>
-      'Vielen Dank für dein Interesse an einem kostenpflichtigen Tarif. Die kostenpflichtigen Pläne sind derzeit noch deaktiviert. Sie werden aber bald aktiviert!';
-
   @override
   String get openChangeLog => 'Changelog automatisch öffnen';
 
@@ -1562,6 +1274,92 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get skipForNow => 'Vorerst überspringen';
 
+  @override
+  String get finishSetupCardTitle => 'Profil vervollständigen';
+
+  @override
+  String get finishSetupCardDesc =>
+      'Du hast es fast geschafft! Schließe die Einrichtung deines Kontos ab, um twonly optimal zu nutzen.';
+
+  @override
+  String get finishSetupCardAction => 'Setup fortsetzen';
+
+  @override
+  String get onboardingFinishLater => 'Später abschließen';
+
+  @override
+  String get onboardingProfileTitle => 'Wähle deinen Look';
+
+  @override
+  String get onboardingProfileBody =>
+      'Wähle einen Avatar und einen Anzeigenamen, den deine Freunde sehen werden.';
+
+  @override
+  String get onboardingBackupBody =>
+      'Sichere deine twonly-Identität, da dies die einzige Möglichkeit ist, dein Konto wiederherzustellen, wenn du die App deinstallierst oder dein Handy verlierst.';
+
+  @override
+  String get onboardingVerificationBadgeTitle => 'Verifizierungs-Haken';
+
+  @override
+  String get onboardingUserDiscoveryShareFriends => 'Freunde teilen';
+
+  @override
+  String get onboardingUserDiscoveryShareFriendsDesc =>
+      'Teile deinen Freunden mit, wen du kennst und wen du verifiziert hast. Freunde können von deiner Freundesliste *nur gemeinsame Freunde sehen*.';
+
+  @override
+  String get onboardingUserDiscoveryContactsVerifiedBadge =>
+      'Von Freunden verifizierte Kontakte erhalten einen Haken';
+
+  @override
+  String get onboardingUserDiscoveryWhoIsRequesting =>
+      'Erfahre, wer dich anfragt';
+
+  @override
+  String get userDiscoverySettingsManualApproval => 'Manuelle Zustimmung';
+
+  @override
+  String get userDiscoverySettingsManualApprovalDesc =>
+      'Bevor jemand geteilt wird, wirst du zuerst gefragt.';
+
+  @override
+  String get onboardingUserDiscoveryLetFriendsFindYou =>
+      'Lass dich von deinen Freunden finden';
+
+  @override
+  String get onboardingUserDiscoveryBeRecommended =>
+      'Anderen vorgeschlagen werden';
+
+  @override
+  String get onboardingUserDiscoveryWhatOthersSee => 'Was andere sehen werden';
+
+  @override
+  String get onboardingUserDiscoveryWhatYouSee =>
+      'Wenn du angefragt wirst, wirst du das sehen';
+
+  @override
+  String get onboardingAddContactsTitle => 'Neue Kontakte hinzufügen';
+
+  @override
+  String get onboardingAddContactsAcceptDesc =>
+      'In twonly muss jeder Kontakt zuerst akzeptiert werden, bevor ihr kommunizieren könnt.';
+
+  @override
+  String get onboardingAddContactsMethodHeading => 'Kontakte hinzufügen';
+
+  @override
+  String get onboardingAddContactsMethodScan =>
+      'Den QR-Code des Kontaktes scannen.';
+
+  @override
+  String get onboardingAddContactsMethodSearch =>
+      'Nach dem Benutzernamen suchen.';
+
+  @override
+  String get onboardingAddContactsMethodShare =>
+      'Einen Kontakt in den Chats teilen.';
+
   @override
   String linkFromUsername(Object username) {
     return 'Ist der Link von $username?';
@@ -1691,19 +1489,19 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get verificationBadgeGeneralDesc =>
-      'Der grüne Haken gibt dir die Sicherheit, dass du mit der richtigen Person schreibst.';
+      'Der Haken gibt dir die Sicherheit, dass du mit der richtigen Person schreibst. Scanne einen Kontakt, um diesen zu verifizieren.';
 
   @override
   String get verificationBadgeGreenDesc =>
-      'Kontakt, den du durch den QR-Code persönlich verifiziert hast. Dadurch wurde auch deren öffentlicher Schlüssel überprüft.';
+      'Ein Kontakt, den du *persönlich verifiziert* hast.';
 
   @override
   String get verificationBadgeYellowDesc =>
-      '(Coming soon) Kontakt, dessen QR-Code von einem deiner persönlich verifizierten Kontakte gescannt wurde.';
+      'Ein Kontakt, der von mind. einem *deiner Kontakte verifiziert* wurde.';
 
   @override
   String get verificationBadgeRedDesc =>
-      'Unbekannter Kontakt, dessen Identität bisher nicht verifiziert wurde.';
+      'Ein Kontakt, dessen Identität noch *nicht überprüft* wurde.';
 
   @override
   String chatEntryFlameRestored(Object count) {
@@ -1759,10 +1557,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get contactActionAccept => 'Annehmen';
 
-  @override
-  String get userDiscoverySettingsMinImages =>
-      'Wähle die Mindestanzahl an Bildern, die du mit einer Person ausgetauscht haben musst, bevor du ihr deine Freunde sicher teilst.';
-
   @override
   String get userDiscoverySettingsMutualFriends =>
       'Wähle aus, wie viele gemeinsame Freunde eine Person haben muss, damit du ihr vorgeschlagen wirst.';
@@ -1772,47 +1566,21 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get userDiscoveryEnabledDisableWarning =>
-      'Wenn du das Feature „Freunde finden“ deaktivierst, werden dir keine Vorschläge mehr angezeigt. Du teilst neuen Kontakten dann auch nicht mehr deine Freunde.';
+      'Wenn du das Feature „Gemeinsame Freunde“ deaktivierst, werden dir keine Vorschläge mehr angezeigt. Du teilst neuen Kontakten dann auch nicht mehr deine Freunde.';
 
   @override
   String get userDiscoveryEnabledChangeSettings => 'Einstellungen ändern';
 
   @override
   String get userDiscoveryEnabledFaq =>
-      'In unserem FAQ erklären wir dir wie das Feature \"Freunde finden\" funktioniert.';
+      'In unserem FAQ erklären wir dir wie das Feature \"Gemeinsame Freunde\" funktioniert.';
 
   @override
   String get userDiscoveryDisabledIntro =>
-      'twonly verzichten auf Telefonnummern, daher schlagen wir dir Freunde stattdessen über gemeinsame Kontakte vor – sicher und privat.';
+      'twonly kann *ohne Telefonnummer* oder den Zugriff auf dein Adressbuch verwendet werden. Stattdessen kannst du *deine Freunde über gemeinsame Freunde* finden.';
 
   @override
-  String get userDiscoveryDisabledInvisible =>
-      'Deine Freundesliste ist für *Fremde komplett unsichtbar*. Nur deine Freunde können Teile davon sehen – und zwar nur die Personen, mit denen sie selbst *gemeinsame Freunde* haben.';
-
-  @override
-  String get userDiscoveryDisabledDecide =>
-      'Entscheide selbst, wer deine Freunde sehen darf. Du kannst deine Meinung jederzeit ändern oder bestimmte Personen verstecken.';
-
-  @override
-  String get userDiscoverySettingsTitle => 'Freunde finden';
-
-  @override
-  String get userDiscoverySettingsMinImagesTitle =>
-      'Anzahl an geteilten Bildern';
-
-  @override
-  String get userDiscoverySettingsMutualFriendsTitle =>
-      'Anzahl an gemeinsame Freunde';
-
-  @override
-  String get userDiscoveryDisabledYouHaveControl => 'Du hast die Kontrolle';
-
-  @override
-  String get userDiscoveryDisabledEnableWithDefault =>
-      'Mit Standardeinstellungen aktivieren';
-
-  @override
-  String get userDiscoveryDisabledCustomizeSettings => 'Einstellungen anpassen';
+  String get userDiscoverySettingsTitle => 'Gemeinsame Freunde';
 
   @override
   String get userDiscoveryDisabledLearnMore => 'Mehr erfahren';
@@ -1827,6 +1595,10 @@ class AppLocalizationsDe extends AppLocalizations {
   String get userDiscoveryEnabledFriendsSharedDesc =>
       'Du teilst nur Freunde, die diese Funktion ebenfalls aktiviert haben und die den von dir festgelegten Schwellenwert erreicht haben.';
 
+  @override
+  String get userDiscoverySettingsCurrentlyDisabled =>
+      'Das Feature \"Gemeinsame Freunde\" ist derzeit deaktiviert.';
+
   @override
   String get userDiscoveryEnabledNoFriendsShared =>
       'Bisher teilst du noch niemanden.';
@@ -1870,4 +1642,31 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get userDiscoveryEnabledStopSharing => 'Nicht mehr teilen';
+
+  @override
+  String userDiscoveryManualApprovalReachedThreshold(Object username) {
+    return 'Möchtes du $username mit deinen Freunden teilen?';
+  }
+
+  @override
+  String get userDiscoveryManualApprovalHideContact => 'Kontakt verbergen';
+
+  @override
+  String get userDiscoveryManualApprovalShareContact => 'Kontakt teilen';
+
+  @override
+  String onboardingSetupCompleteTitle(Object username) {
+    return 'Du bist startklar, $username!';
+  }
+
+  @override
+  String get onboardingSetupCompleteDesc =>
+      'Du kannst jetzt deine Momente sicher mit deinen Freunden teilen, ohne Ablenkungen wie Werbung.';
+
+  @override
+  String get contactUserDiscoveryManualApprovalPending =>
+      'Der Kontakt wurde noch nicht manuell freigegeben.';
+
+  @override
+  String get contactUserDiscoveryManualApprovalApprove => 'Freigeben';
 }
diff --git a/lib/src/localization/generated/app_localizations_en.dart b/lib/src/localization/generated/app_localizations_en.dart
index 095695fd..0f4bf7fa 100644
--- a/lib/src/localization/generated/app_localizations_en.dart
+++ b/lib/src/localization/generated/app_localizations_en.dart
@@ -50,23 +50,9 @@ class AppLocalizationsEn extends AppLocalizations {
   String get onboardingNotProductBody =>
       'twonly is financed by donations and an optional subscription. Your data will never be sold.';
 
-  @override
-  String get onboardingBuyOneGetTwoTitle => 'Buy one get two';
-
-  @override
-  String get onboardingBuyOneGetTwoBody =>
-      'twonly always requires at least two people, which is why you receive a second free license for your twonly partner with your purchase.';
-
   @override
   String get onboardingGetStartedTitle => 'Let\'s go!';
 
-  @override
-  String get onboardingGetStartedBody =>
-      'You can test twonly free of charge in preview mode. In this mode you can be found by others and receive pictures or videos but you cannot send any yourself.';
-
-  @override
-  String get onboardingTryForFree => 'Try for free';
-
   @override
   String get registerUsernameSlogan =>
       'Please select a username so others can find you!';
@@ -85,16 +71,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get registerSubmitButton => 'Register now!';
 
-  @override
-  String get registerTwonlyCodeText =>
-      'Have you received a twonly code? Then redeem it either directly here or later!';
-
-  @override
-  String get registerTwonlyCodeLabel => 'twonly-Code';
-
-  @override
-  String get newMessageTitle => 'New message';
-
   @override
   String get chatsTapToSend => 'Click to send your first image';
 
@@ -137,23 +113,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get startNewChatNewContact => 'New Contact';
 
-  @override
-  String get startNewChatYourContacts => 'Your Contacts';
-
   @override
   String get shareImageAllUsers => 'All contacts';
 
-  @override
-  String get shareImageAllTwonlyWarning =>
-      'twonlies can only be send to verified contacts!';
-
-  @override
-  String get shareImageUserNotVerified => 'User is not verified';
-
-  @override
-  String get shareImageUserNotVerifiedDesc =>
-      'twonlies can only be sent to verified users. To verify a user, go to their profile and to verify security number.';
-
   @override
   String get shareImageShowArchived => 'Show archived users';
 
@@ -163,13 +125,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get addFriendTitle => 'Add friends';
 
-  @override
-  String get searchUserNamePreview =>
-      'To protect you and other twonly users from spam and abuse, it is not possible to search for other people in preview mode. Other users can find you and their requests will be displayed here!';
-
-  @override
-  String get selectSubscription => 'Select subscription';
-
   @override
   String get searchUserNamePending => 'Request pending';
 
@@ -184,15 +139,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get searchUsernameNewFollowerTitle => 'Open requests';
 
-  @override
-  String get searchUsernameQrCodeBtn => 'Scan QR code';
-
   @override
   String get chatListViewSearchUserNameBtn => 'Add your first twonly contact!';
 
-  @override
-  String get chatListViewSendFirstTwonly => 'Send your first twonly!';
-
   @override
   String get chatListDetailInput => 'Type a message';
 
@@ -202,9 +151,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get contextMenuUserProfile => 'User profile';
 
-  @override
-  String get contextMenuVerifyUser => 'Verify';
-
   @override
   String get contextMenuArchiveUser => 'Archive';
 
@@ -445,19 +391,10 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get settingsAccountDeleteAccount => 'Delete account';
 
-  @override
-  String settingsAccountDeleteAccountWithBallance(Object credit) {
-    return 'In the next step, you can select what you want to to with the remaining credit ($credit).';
-  }
-
   @override
   String get settingsAccountDeleteAccountNoBallance =>
       'Once you delete your account, there is no going back.';
 
-  @override
-  String get settingsAccountDeleteAccountNoInternet =>
-      'An Internet connection is required to delete your account.';
-
   @override
   String get settingsAccountDeleteModalTitle => 'Are you sure?';
 
@@ -469,19 +406,31 @@ class AppLocalizationsEn extends AppLocalizations {
   String get contactVerifyNumberTitle => 'Verify contact';
 
   @override
-  String get contactVerifyNumberTapToScan => 'Tap to scan';
+  String get userVerifiedTitle => 'User verified';
 
   @override
-  String get contactVerifyNumberMarkAsVerified => 'Mark as verified';
-
-  @override
-  String get contactVerifyNumberClearVerification => 'Clear verification';
-
-  @override
-  String contactVerifyNumberLongDesc(Object username) {
-    return 'To verify the end-to-end encryption with $username, compare the numbers with their device. The person can also scan your code with their device.';
+  String contactVerifiedBy(Object username) {
+    return 'Verified by $username';
   }
 
+  @override
+  String get verificationTypeQrScanned => 'You scanned their QR code.';
+
+  @override
+  String get verificationTypeSecretQrToken =>
+      'The other person scanned your QR code.';
+
+  @override
+  String get verificationTypeLink => 'Verified via link.';
+
+  @override
+  String get verificationTypeContactSharedByVerified =>
+      'Contact received from a verified contact.';
+
+  @override
+  String get verificationTypeMigratedFromOldVersion =>
+      'Migrated from old version.';
+
   @override
   String get contactViewMessage => 'Message';
 
@@ -491,14 +440,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get contactNicknameNew => 'New nickname';
 
-  @override
-  String get deleteAllContactMessages => 'Delete all text-messages';
-
-  @override
-  String deleteAllContactMessagesBody(Object username) {
-    return 'This will remove all messages, except stored media files, in your chat with $username. This will NOT delete the messages stored at $username\'s device!';
-  }
-
   @override
   String get contactBlock => 'Block';
 
@@ -532,6 +473,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get next => 'Next';
 
+  @override
+  String get finishSetup => 'Complete setup';
+
   @override
   String get submit => 'Submit';
 
@@ -602,9 +546,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get toggleFlashLight => 'Toggle the flash light';
 
-  @override
-  String get toggleHighQuality => 'Toggle better resolution';
-
   @override
   String userFound(Object username) {
     return '$username found';
@@ -613,23 +554,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get userFoundBody => 'Do you want to create a follow request?';
 
-  @override
-  String searchUsernameNotFoundLong(Object username) {
-    return '\"$username\" is not a twonly user. Please check the username and try again.';
-  }
-
-  @override
-  String get errorUnknown =>
-      'An unexpected error has occurred. Please try again later.';
-
-  @override
-  String get errorBadRequest =>
-      'The request could not be understood by the server due to malformed syntax. Please check your input and try again.';
-
-  @override
-  String get errorTooManyRequests =>
-      'You have made too many requests in a short period. Please wait a moment before trying again.';
-
   @override
   String get errorInternalError =>
       'The server is currently not available. Please try again later.';
@@ -641,34 +565,10 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get errorUsernameAlreadyTaken => 'The username is already taken.';
 
-  @override
-  String get errorSignatureNotValid =>
-      'The provided signature is not valid. Please check your credentials and try again.';
-
-  @override
-  String get errorUsernameNotFound =>
-      'The username you entered does not exist. Please check the spelling or create a new account.';
-
   @override
   String get errorUsernameNotValid =>
       'The username you provided does not meet the required criteria. Please choose a valid username.';
 
-  @override
-  String get errorInvalidPublicKey =>
-      'The public key you provided is invalid. Please check the key and try again.';
-
-  @override
-  String get errorSessionAlreadyAuthenticated =>
-      'You are already logged in. Please log out if you want to log in with a different account.';
-
-  @override
-  String get errorSessionNotAuthenticated =>
-      'Your session is not authenticated. Please log in to continue.';
-
-  @override
-  String get errorOnlyOneSessionAllowed =>
-      'Only one active session is allowed per user. Please log out from other devices to continue.';
-
   @override
   String get errorNotEnoughCredit => 'You do not have enough twonly-credit.';
 
@@ -746,144 +646,27 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get plusFeature2 => '✓ Additional features (coming-soon)';
 
-  @override
-  String get transactionHistory => 'Your transaction history';
-
-  @override
-  String get manageSubscription => 'Manage subscription';
-
-  @override
-  String get nextPayment => 'Next payment';
-
-  @override
-  String get currentBalance => 'Current balance';
-
   @override
   String get manageAdditionalUsers => 'Manage additional users';
 
   @override
   String get open => 'Open';
 
-  @override
-  String get createOrRedeemVoucher => 'Buy or redeem voucher';
-
   @override
   String get createVoucher => 'Buy voucher';
 
-  @override
-  String get createVoucherDesc =>
-      'Choose the value of the voucher. The value of the voucher will be deducted from your twonly balance.';
-
   @override
   String get redeemVoucher => 'Redeem voucher';
 
-  @override
-  String get openVouchers => 'Open vouchers';
-
-  @override
-  String get voucherCreated => 'Voucher created';
-
-  @override
-  String get voucherRedeemed => 'Voucher redeemed';
-
-  @override
-  String get enterVoucherCode => 'Enter Voucher Code';
-
-  @override
-  String get requestedVouchers => 'Requested vouchers';
-
-  @override
-  String get redeemedVouchers => 'Redeemed vouchers';
-
   @override
   String get buy => 'Buy';
 
-  @override
-  String subscriptionRefund(Object refund) {
-    return 'When you upgrade, you will receive a refund of $refund for your current subscription.';
-  }
-
-  @override
-  String get transactionCash => 'Cash transaction';
-
-  @override
-  String get transactionPlanUpgrade => 'Plan upgrade';
-
-  @override
-  String get transactionRefund => 'Refund transaction';
-
-  @override
-  String get transactionThanksForTesting => 'Thank you for testing';
-
-  @override
-  String get transactionUnknown => 'Unknown transaction';
-
-  @override
-  String get transactionVoucherCreated => 'Voucher created';
-
-  @override
-  String get transactionVoucherRedeemed => 'Voucher redeemed';
-
-  @override
-  String get transactionAutoRenewal => 'Automatic renewal';
-
-  @override
-  String get checkoutOptions => 'Options';
-
-  @override
-  String get refund => 'Refund';
-
-  @override
-  String get checkoutPayYearly => 'Pay yearly';
-
-  @override
-  String get checkoutTotal => 'Total';
-
-  @override
-  String get selectPaymentMethod => 'Select Payment Method';
-
-  @override
-  String get twonlyCredit => 'twonly-Credit';
-
-  @override
-  String get notEnoughCredit => 'You do not have enough credit!';
-
-  @override
-  String get chargeCredit => 'Charge credit';
-
   @override
   String get autoRenewal => 'Auto renewal';
 
-  @override
-  String get autoRenewalDesc => 'You can change this at any time.';
-
-  @override
-  String get autoRenewalLongDesc =>
-      'When your subscription expires, you will automatically be downgraded to the Preview plan. If you activate the automatic renewal, please make sure that you have enough credit for the automatic renewal. We will notify you in good time before the automatic renewal.';
-
-  @override
-  String get planSuccessUpgraded => 'Successfully upgraded your plan.';
-
-  @override
-  String get checkoutSubmit => 'Order with a fee.';
-
   @override
   String get additionalUsersList => 'Your additional users';
 
-  @override
-  String get additionalUsersPlusTokens => 'twonly-codes for \"Plus\" user';
-
-  @override
-  String get additionalUsersFreeTokens => 'twonly-codes for \"Free\" user';
-
-  @override
-  String get planLimitReached =>
-      'You have reached your plan limit for today. Upgrade your plan now to send the media file.';
-
-  @override
-  String get planNotAllowed =>
-      'You cannot send media files with your current tariff. Upgrade your plan now to send the media file.';
-
   @override
   String get galleryDelete => 'Delete file';
 
@@ -896,48 +679,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get galleryExportSuccess => 'Successfully saved in the Gallery.';
 
-  @override
-  String get settingsResetTutorials => 'Show tutorials again';
-
-  @override
-  String get settingsResetTutorialsDesc =>
-      'Click here to show already displayed tutorials again.';
-
-  @override
-  String get settingsResetTutorialsSuccess =>
-      'Tutorials will be displayed again.';
-
-  @override
-  String get tutorialChatListSearchUsersTitle =>
-      'Find Friends and Manage Friend Requests';
-
-  @override
-  String get tutorialChatListSearchUsersDesc =>
-      'If you know your friends\' usernames, you can search for them here and send a friend request. You will also see all requests from other users that you can accept or block.';
-
-  @override
-  String get tutorialChatListContextMenuTitle =>
-      'Long press on the contact to open the context menu.';
-
-  @override
-  String get tutorialChatListContextMenuDesc =>
-      'With the context menu, you can pin, archive, and perform various actions on your contacts. Simply long press the contact and then move your finger to the desired option or tap directly on it.';
-
-  @override
-  String get tutorialChatMessagesVerifyShieldTitle => 'Verify your contacts!';
-
-  @override
-  String get tutorialChatMessagesVerifyShieldDesc =>
-      'twonly uses the Signal protocol for secure end-to-end encryption. When you first contact someone, their public identity key is downloaded. To ensure that this key has not been tampered with by third parties, you should compare it with your friend when you meet in person. Once you have verified the user, you can also enable the twonly mode when sending images and videos.';
-
-  @override
-  String get tutorialChatMessagesReopenMessageTitle =>
-      'Reopen Images and Videos';
-
-  @override
-  String get tutorialChatMessagesReopenMessageDesc =>
-      'If your friend has sent you a picture or video with infinite display time, you can open it again at any time until you restart the app. To do this, simply double-click on the message. Your friend will then receive a notification that you have viewed the picture again.';
-
   @override
   String get memoriesEmpty =>
       'As soon as you save pictures or videos, they end up here in your memories.';
@@ -960,19 +701,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get settingsBackup => 'Backup';
 
-  @override
-  String get backupNoticeTitle => 'No backup configured';
-
-  @override
-  String get backupNoticeDesc =>
-      'If you change or lose your device, no one can restore your account without a backup. Therefore, back up your data.';
-
-  @override
-  String get backupNoticeLater => 'Remind later';
-
-  @override
-  String get backupNoticeOpenBackup => 'Create backup';
-
   @override
   String get backupPending => 'Pending';
 
@@ -1008,20 +736,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get backupLastBackupResult => 'Result';
 
-  @override
-  String get deleteBackupTitle => 'Are you sure?';
-
-  @override
-  String get deleteBackupBody =>
-      'Without an backup, you can not restore your user account.';
-
   @override
   String get backupData => 'Data-Backup';
 
-  @override
-  String get backupDataDesc =>
-      'This backup contains besides of your twonly-Identity also all of your media files. This backup will is also encrypted but stored locally. You then have to ensure to manually copy it onto your laptop or device of your choice.';
-
   @override
   String get backupInsecurePassword => 'Insecure password';
 
@@ -1118,10 +835,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get retransmissionRequested => 'Retransmission requested';
 
-  @override
-  String get testPaymentMethod =>
-      'Thanks for the interest in a paid plan. Currently the paid plans are still deactivated. But they will be activated soon!';
-
   @override
   String get openChangeLog => 'Open changelog automatically';
 
@@ -1552,6 +1265,88 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get skipForNow => 'Skip for now';
 
+  @override
+  String get finishSetupCardTitle => 'Complete your profile';
+
+  @override
+  String get finishSetupCardDesc =>
+      'You are almost there! Finish setting up your account to get the most out of twonly.';
+
+  @override
+  String get finishSetupCardAction => 'Resume Setup';
+
+  @override
+  String get onboardingFinishLater => 'Finish later';
+
+  @override
+  String get onboardingProfileTitle => 'Choose your look';
+
+  @override
+  String get onboardingProfileBody =>
+      'Select an avatar and a display name that friends will see.';
+
+  @override
+  String get onboardingBackupBody =>
+      'Back up your twonly identity, as this is the only way to restore your account if you uninstall the app or lose your phone.';
+
+  @override
+  String get onboardingVerificationBadgeTitle => 'Verification Badge';
+
+  @override
+  String get onboardingUserDiscoveryShareFriends => 'Share your friends';
+
+  @override
+  String get onboardingUserDiscoveryShareFriendsDesc =>
+      'Share with your friends who you know and who you have verified. Friends can *only see mutual friends* from your friend list. You can change your mind at *any time* or *hide specific people*.';
+
+  @override
+  String get onboardingUserDiscoveryContactsVerifiedBadge =>
+      'Contacts verified by your friends get a badge';
+
+  @override
+  String get onboardingUserDiscoveryWhoIsRequesting =>
+      'Be informed about who is requesting';
+
+  @override
+  String get userDiscoverySettingsManualApproval => 'Manual approval';
+
+  @override
+  String get userDiscoverySettingsManualApprovalDesc =>
+      'Before someone is shared, you\'ll be asked first.';
+
+  @override
+  String get onboardingUserDiscoveryLetFriendsFindYou =>
+      'Let your friends find you';
+
+  @override
+  String get onboardingUserDiscoveryBeRecommended => 'Be recommended to others';
+
+  @override
+  String get onboardingUserDiscoveryWhatOthersSee => 'What others will see';
+
+  @override
+  String get onboardingUserDiscoveryWhatYouSee =>
+      'If requested, that\'s what you will see';
+
+  @override
+  String get onboardingAddContactsTitle => 'Add new contacts';
+
+  @override
+  String get onboardingAddContactsAcceptDesc =>
+      'In twonly, every contact must first be accepted before you can communicate.';
+
+  @override
+  String get onboardingAddContactsMethodHeading => 'Add contacts';
+
+  @override
+  String get onboardingAddContactsMethodScan => 'Scan the contact\'s QR code.';
+
+  @override
+  String get onboardingAddContactsMethodSearch => 'Search for the username.';
+
+  @override
+  String get onboardingAddContactsMethodShare => 'Share a contact in chats.';
+
   @override
   String linkFromUsername(Object username) {
     return 'Is the link from $username?';
@@ -1679,19 +1474,19 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get verificationBadgeGeneralDesc =>
-      'The green checkmark gives you the certainty that you are messaging the right person.';
+      'The checkmark gives you the certainty that you are messaging the right person. Scan the contact\'s QR code to verify it.';
 
   @override
   String get verificationBadgeGreenDesc =>
-      'Contact that you have personally verified via QR code. This also verified their public key.';
+      'A contact you have *personally* verified.';
 
   @override
   String get verificationBadgeYellowDesc =>
-      '(Coming soon) Contact whose QR code was scanned by one of your personally verified contacts.';
+      'A contact who has been verified by at least one of *your contacts*.';
 
   @override
   String get verificationBadgeRedDesc =>
-      'Unknown contact whose identity has not yet been verified.';
+      'A contact whose identity has *not* yet been verified.';
 
   @override
   String chatEntryFlameRestored(Object count) {
@@ -1747,10 +1542,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get contactActionAccept => 'Accept';
 
-  @override
-  String get userDiscoverySettingsMinImages =>
-      'Choose the minimum number of images you must have exchanged with a person before you securely share your friends with them.';
-
   @override
   String get userDiscoverySettingsMutualFriends =>
       'Choose how many mutual friends a person must have for you to be suggested to them.';
@@ -1760,46 +1551,21 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get userDiscoveryEnabledDisableWarning =>
-      'If you disable the \"Find friends\" feature, you will no longer see suggestions. You will also stop sharing your friends with new contacts.';
+      'If you disable the \"Mutual Friends\" feature, you will no longer see suggestions. You will also stop sharing your friends with new contacts.';
 
   @override
   String get userDiscoveryEnabledChangeSettings => 'Change settings';
 
   @override
   String get userDiscoveryEnabledFaq =>
-      'In our FAQ we explain how the \"Find friends\" feature works.';
+      'In our FAQ we explain how the \"Mutual Friends\" feature works.';
 
   @override
   String get userDiscoveryDisabledIntro =>
-      'twonly doesn\'t use phone numbers, so we suggest friends based on mutual contacts instead – securely and privately.';
+      'twonly does *not* collect your phone number or needs access to your contacts. Instead, twonly can *find your friends through mutual friends*.';
 
   @override
-  String get userDiscoveryDisabledInvisible =>
-      'Your friend list is *completely invisible to strangers*. Only your friends can see parts of it – and only those people with whom they have *mutual friends* themselves.';
-
-  @override
-  String get userDiscoveryDisabledDecide =>
-      'Decide for yourself who can see your friends. You can change your mind at any time or hide specific people.';
-
-  @override
-  String get userDiscoverySettingsTitle => 'Find friends';
-
-  @override
-  String get userDiscoverySettingsMinImagesTitle => 'Number of shared images';
-
-  @override
-  String get userDiscoverySettingsMutualFriendsTitle =>
-      'Number of mutual friends';
-
-  @override
-  String get userDiscoveryDisabledYouHaveControl => 'You are in control';
-
-  @override
-  String get userDiscoveryDisabledEnableWithDefault =>
-      'Enable with default settings';
-
-  @override
-  String get userDiscoveryDisabledCustomizeSettings => 'Customize settings';
+  String get userDiscoverySettingsTitle => 'Mutual Friends';
 
   @override
   String get userDiscoveryDisabledLearnMore => 'Learn more';
@@ -1814,6 +1580,10 @@ class AppLocalizationsEn extends AppLocalizations {
   String get userDiscoveryEnabledFriendsSharedDesc =>
       'You only share friends who have also activated this feature and who have reached the threshold you set.';
 
+  @override
+  String get userDiscoverySettingsCurrentlyDisabled =>
+      'The feature \"Mutual Friends\" is currently disabled.';
+
   @override
   String get userDiscoveryEnabledNoFriendsShared =>
       'You are not sharing anyone yet.';
@@ -1857,4 +1627,31 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get userDiscoveryEnabledStopSharing => 'Stop sharing';
+
+  @override
+  String userDiscoveryManualApprovalReachedThreshold(Object username) {
+    return 'Would you like to share $username with your friends?';
+  }
+
+  @override
+  String get userDiscoveryManualApprovalHideContact => 'Hide contact';
+
+  @override
+  String get userDiscoveryManualApprovalShareContact => 'Share contact';
+
+  @override
+  String onboardingSetupCompleteTitle(Object username) {
+    return 'You\'re all set, $username!';
+  }
+
+  @override
+  String get onboardingSetupCompleteDesc =>
+      'You can now share your moments with your friends securely without distractions like ads.';
+
+  @override
+  String get contactUserDiscoveryManualApprovalPending =>
+      'Contact was not yet manually approved.';
+
+  @override
+  String get contactUserDiscoveryManualApprovalApprove => 'Approve';
 }
diff --git a/lib/src/localization/generated/app_localizations_sv.dart b/lib/src/localization/generated/app_localizations_sv.dart
deleted file mode 100644
index 2dc1d800..00000000
--- a/lib/src/localization/generated/app_localizations_sv.dart
+++ /dev/null
@@ -1,1860 +0,0 @@
-// ignore: unused_import
-import 'package:intl/intl.dart' as intl;
-import 'app_localizations.dart';
-
-// ignore_for_file: type=lint
-
-/// The translations for Swedish (`sv`).
-class AppLocalizationsSv extends AppLocalizations {
-  AppLocalizationsSv([String locale = 'sv']) : super(locale);
-
-  @override
-  String get registerTitle => 'Welcome to twonly!';
-
-  @override
-  String get registerSlogan =>
-      'twonly, a privacy friendly way to connect with friends through secure, spontaneous image sharing';
-
-  @override
-  String get onboardingWelcomeTitle => 'Welcome to twonly!';
-
-  @override
-  String get onboardingWelcomeBody =>
-      'Experience a private and secure way to stay in touch with friends by sharing instant pictures.';
-
-  @override
-  String get onboardingE2eTitle => 'Carefree sharing';
-
-  @override
-  String get onboardingE2eBody =>
-      'With end-to-end encryption, enjoy the peace of mind that only you and your friends can see the moments you share.';
-
-  @override
-  String get onboardingFocusTitle => 'Focus on sharing moments';
-
-  @override
-  String get onboardingFocusBody =>
-      'Say goodbye to addictive features! twonly was created for sharing moments, free from useless distractions or ads.';
-
-  @override
-  String get onboardingSendTwonliesTitle => 'Send twonlies';
-
-  @override
-  String get onboardingSendTwonliesBody =>
-      'Share moments securely with your partner. twonly ensures that only your partner can open it, keeping your moments with your partner a two(o)nly thing!';
-
-  @override
-  String get onboardingNotProductTitle => 'You are not the product!';
-
-  @override
-  String get onboardingNotProductBody =>
-      'twonly is financed by donations and an optional subscription. Your data will never be sold.';
-
-  @override
-  String get onboardingBuyOneGetTwoTitle => 'Buy one get two';
-
-  @override
-  String get onboardingBuyOneGetTwoBody =>
-      'twonly always requires at least two people, which is why you receive a second free license for your twonly partner with your purchase.';
-
-  @override
-  String get onboardingGetStartedTitle => 'Let\'s go!';
-
-  @override
-  String get onboardingGetStartedBody =>
-      'You can test twonly free of charge in preview mode. In this mode you can be found by others and receive pictures or videos but you cannot send any yourself.';
-
-  @override
-  String get onboardingTryForFree => 'Try for free';
-
-  @override
-  String get registerUsernameSlogan =>
-      'Please select a username so others can find you!';
-
-  @override
-  String get registerUsernameDecoration => 'Username';
-
-  @override
-  String get registerUsernameLimits =>
-      'Your username must be at least 3 characters long.';
-
-  @override
-  String get registerProofOfWorkFailed =>
-      'There was an issue with the captcha test. Please try again.';
-
-  @override
-  String get registerSubmitButton => 'Register now!';
-
-  @override
-  String get registerTwonlyCodeText =>
-      'Have you received a twonly code? Then redeem it either directly here or later!';
-
-  @override
-  String get registerTwonlyCodeLabel => 'twonly-Code';
-
-  @override
-  String get newMessageTitle => 'New message';
-
-  @override
-  String get chatsTapToSend => 'Click to send your first image';
-
-  @override
-  String get cameraPreviewSendTo => 'Send to';
-
-  @override
-  String get shareImageTitle => 'Share with';
-
-  @override
-  String get shareImageBestFriends => 'Best friends';
-
-  @override
-  String get shareImagePinnedContacts => 'Pinnded';
-
-  @override
-  String get shareImagedEditorSendImage => 'Send';
-
-  @override
-  String get shareImagedEditorShareWith => 'Share with';
-
-  @override
-  String get shareImagedEditorSaveImage => 'Save';
-
-  @override
-  String get shareImagedEditorSavedImage => 'Saved';
-
-  @override
-  String get shareImageSearchAllContacts => 'Search all contacts';
-
-  @override
-  String get startNewChatSearchHint => 'Name, username or groupname';
-
-  @override
-  String get shareImagedSelectAll => 'Select all';
-
-  @override
-  String get startNewChatTitle => 'Select Contact';
-
-  @override
-  String get startNewChatNewContact => 'New Contact';
-
-  @override
-  String get startNewChatYourContacts => 'Your Contacts';
-
-  @override
-  String get shareImageAllUsers => 'All contacts';
-
-  @override
-  String get shareImageAllTwonlyWarning =>
-      'twonlies can only be send to verified contacts!';
-
-  @override
-  String get shareImageUserNotVerified => 'User is not verified';
-
-  @override
-  String get shareImageUserNotVerifiedDesc =>
-      'twonlies can only be sent to verified users. To verify a user, go to their profile and to verify security number.';
-
-  @override
-  String get shareImageShowArchived => 'Show archived users';
-
-  @override
-  String get searchUsernameInput => 'Username';
-
-  @override
-  String get addFriendTitle => 'Add friends';
-
-  @override
-  String get searchUserNamePreview =>
-      'To protect you and other twonly users from spam and abuse, it is not possible to search for other people in preview mode. Other users can find you and their requests will be displayed here!';
-
-  @override
-  String get selectSubscription => 'Select subscription';
-
-  @override
-  String get searchUserNamePending => 'Request pending';
-
-  @override
-  String get searchUsernameNotFound => 'Username not found';
-
-  @override
-  String searchUsernameNotFoundBody(Object username) {
-    return 'There is no user with the username \"$username\" registered';
-  }
-
-  @override
-  String get searchUsernameNewFollowerTitle => 'Open requests';
-
-  @override
-  String get searchUsernameQrCodeBtn => 'Scan QR code';
-
-  @override
-  String get chatListViewSearchUserNameBtn => 'Add your first twonly contact!';
-
-  @override
-  String get chatListViewSendFirstTwonly => 'Send your first twonly!';
-
-  @override
-  String get chatListDetailInput => 'Type a message';
-
-  @override
-  String get userDeletedAccount => 'The user has deleted their account.';
-
-  @override
-  String get contextMenuUserProfile => 'User profile';
-
-  @override
-  String get contextMenuVerifyUser => 'Verify';
-
-  @override
-  String get contextMenuArchiveUser => 'Archive';
-
-  @override
-  String get contextMenuUndoArchiveUser => 'Undo archiving';
-
-  @override
-  String get contextMenuOpenChat => 'Open chat';
-
-  @override
-  String get contextMenuPin => 'Pin';
-
-  @override
-  String get contextMenuUnpin => 'Unpin';
-
-  @override
-  String get contextMenuViewAgain => 'View again';
-
-  @override
-  String get mediaViewerAuthReason => 'Please authenticate to see this twonly!';
-
-  @override
-  String get mediaViewerTwonlyTapToOpen => 'Tap to open your twonly!';
-
-  @override
-  String get messageSendState_Received => 'Received';
-
-  @override
-  String get messageSendState_Opened => 'Opened';
-
-  @override
-  String get messageSendState_Send => 'Sent';
-
-  @override
-  String get messageSendState_Sending => 'Sending';
-
-  @override
-  String get messageSendState_TapToLoad => 'Tap to load';
-
-  @override
-  String get messageSendState_Loading => 'Downloading';
-
-  @override
-  String get messageStoredInGallery => 'Stored in gallery';
-
-  @override
-  String get messageReopened => 'Re-opened';
-
-  @override
-  String get imageEditorDrawOk => 'Take drawing';
-
-  @override
-  String get settingsTitle => 'Settings';
-
-  @override
-  String get settingsChats => 'Chats';
-
-  @override
-  String get settingsPreSelectedReactions => 'Preselected reaction emojis';
-
-  @override
-  String get settingsPreSelectedReactionsError =>
-      'A maximum of 12 reactions can be selected.';
-
-  @override
-  String get settingsProfile => 'Profile';
-
-  @override
-  String get settingsStorageData => 'Data and storage';
-
-  @override
-  String get settingsStorageDataStoreInGTitle => 'Store in Gallery';
-
-  @override
-  String get settingsStorageDataStoreInGSubtitle =>
-      'Store saved images additional in the systems gallery.';
-
-  @override
-  String get settingsStorageDataMediaAutoDownload => 'Media auto-download';
-
-  @override
-  String get settingsStorageDataAutoDownMobile => 'When using mobile data';
-
-  @override
-  String get settingsStorageDataAutoDownWifi => 'When using WI-FI';
-
-  @override
-  String get settingsProfileCustomizeAvatar => 'Customize your avatar';
-
-  @override
-  String get settingsProfileEditDisplayName => 'Displayname';
-
-  @override
-  String get settingsProfileEditDisplayNameNew => 'New Displayname';
-
-  @override
-  String get settingsAccount => 'Account';
-
-  @override
-  String get settingsSubscription => 'Subscription';
-
-  @override
-  String get settingsAppearance => 'Appearance';
-
-  @override
-  String get settingsPrivacy => 'Privacy & Security';
-
-  @override
-  String get settingsPrivacyBlockUsers => 'Block users';
-
-  @override
-  String get settingsPrivacyBlockUsersDesc =>
-      'Blocked users will not be able to communicate with you. You can unblock a blocked user at any time.';
-
-  @override
-  String settingsPrivacyBlockUsersCount(Object len) {
-    return '$len contact(s)';
-  }
-
-  @override
-  String get settingsNotification => 'Notification';
-
-  @override
-  String get settingsNotifyTroubleshooting => 'Troubleshooting';
-
-  @override
-  String get settingsNotifyTroubleshootingDesc =>
-      'Click here if you have problems receiving push notifications.';
-
-  @override
-  String get settingsNotifyTroubleshootingNoProblem => 'No problem detected';
-
-  @override
-  String get settingsNotifyTroubleshootingNoProblemDesc =>
-      'Press OK to receive a test notification. If you do not receive the test notification, please click on the new menu item that appears after you click “OK”.';
-
-  @override
-  String get settingsNotifyResetTitle => 'Didn\'t receive a test notification?';
-
-  @override
-  String get settingsNotifyResetTitleSubtitle =>
-      'If you haven\'t received any test notifications, click here to reset your notification tokens.';
-
-  @override
-  String get settingsNotifyResetTitleReset =>
-      'Your notification tokens have been reset.';
-
-  @override
-  String get settingsNotifyResetTitleResetDesc =>
-      'If the problem persists, please send us your debug log via Settings > Help so we can investigate the issue.';
-
-  @override
-  String get settingsHelp => 'Help';
-
-  @override
-  String get settingsHelpDiagnostics => 'Diagnostic protocol';
-
-  @override
-  String get settingsHelpFAQ => 'FAQ';
-
-  @override
-  String get feedbackTooltip => 'Give Feedback to improve twonly.';
-
-  @override
-  String get settingsHelpContactUs => 'Contact us';
-
-  @override
-  String get settingsHelpVersion => 'Version';
-
-  @override
-  String get settingsHelpLicenses => 'Licenses (Source-Code)';
-
-  @override
-  String get settingsHelpCredits => 'Licenses (Images)';
-
-  @override
-  String get settingsHelpImprint => 'Imprint & Privacy Policy';
-
-  @override
-  String get contactUsFaq => 'Have you read our FAQ yet?';
-
-  @override
-  String get contactUsEmojis => 'How do you feel? (optional)';
-
-  @override
-  String get contactUsSelectOption => 'Please select an option';
-
-  @override
-  String get contactUsReason => 'Tell us why you\'re reaching out';
-
-  @override
-  String get contactUsMessage =>
-      'If you want to receive an answer, please add your e-mail address so we can contact you.';
-
-  @override
-  String get contactUsYourMessage => 'Your message';
-
-  @override
-  String get contactUsMessageTitle => 'Tell us what\'s going on';
-
-  @override
-  String get contactUsReasonNotWorking => 'Something\'s not working';
-
-  @override
-  String get contactUsReasonFeatureRequest => 'Feature request';
-
-  @override
-  String get contactUsReasonQuestion => 'Question';
-
-  @override
-  String get contactUsReasonFeedback => 'Feedback';
-
-  @override
-  String get contactUsReasonOther => 'Other';
-
-  @override
-  String get contactUsIncludeLog => 'Include debug log';
-
-  @override
-  String get contactUsWhatsThat => 'What\'s that?';
-
-  @override
-  String get contactUsLastWarning =>
-      'This are the information\'s which will be send to us. Please verify them and then press submit.';
-
-  @override
-  String get contactUsSuccess => 'Feedback submitted successfully!';
-
-  @override
-  String get contactUsShortcut => 'Hide Feedback Icon';
-
-  @override
-  String get settingsHelpTerms => 'Terms of Service';
-
-  @override
-  String get settingsAppearanceTheme => 'Theme';
-
-  @override
-  String get settingsAccountDeleteAccount => 'Delete account';
-
-  @override
-  String settingsAccountDeleteAccountWithBallance(Object credit) {
-    return 'In the next step, you can select what you want to to with the remaining credit ($credit).';
-  }
-
-  @override
-  String get settingsAccountDeleteAccountNoBallance =>
-      'Once you delete your account, there is no going back.';
-
-  @override
-  String get settingsAccountDeleteAccountNoInternet =>
-      'An Internet connection is required to delete your account.';
-
-  @override
-  String get settingsAccountDeleteModalTitle => 'Are you sure?';
-
-  @override
-  String get settingsAccountDeleteModalBody =>
-      'Your account will be deleted. There is no change to restore it.';
-
-  @override
-  String get contactVerifyNumberTitle => 'Verify contact';
-
-  @override
-  String get contactVerifyNumberTapToScan => 'Tap to scan';
-
-  @override
-  String get contactVerifyNumberMarkAsVerified => 'Mark as verified';
-
-  @override
-  String get contactVerifyNumberClearVerification => 'Clear verification';
-
-  @override
-  String contactVerifyNumberLongDesc(Object username) {
-    return 'To verify the end-to-end encryption with $username, compare the numbers with their device. The person can also scan your code with their device.';
-  }
-
-  @override
-  String get contactViewMessage => 'Message';
-
-  @override
-  String get contactNickname => 'Nickname';
-
-  @override
-  String get contactNicknameNew => 'New nickname';
-
-  @override
-  String get deleteAllContactMessages => 'Delete all text-messages';
-
-  @override
-  String deleteAllContactMessagesBody(Object username) {
-    return 'This will remove all messages, except stored media files, in your chat with $username. This will NOT delete the messages stored at $username\'s device!';
-  }
-
-  @override
-  String get contactBlock => 'Block';
-
-  @override
-  String contactBlockTitle(Object username) {
-    return 'Block $username';
-  }
-
-  @override
-  String get contactBlockBody =>
-      'A blocked user will no longer be able to send you messages and their profile will be hidden from view. To unblock a user, simply navigate to Settings > Privacy > Blocked Users.';
-
-  @override
-  String get contactRemove => 'Remove user';
-
-  @override
-  String contactRemoveTitle(Object username) {
-    return 'Remove $username';
-  }
-
-  @override
-  String get contactRemoveBody =>
-      'Permanently remove the user. If the user tries to send you a new message, you will have to accept the user again first.';
-
-  @override
-  String get undo => 'Undo';
-
-  @override
-  String get redo => 'Redo';
-
-  @override
-  String get next => 'Next';
-
-  @override
-  String get submit => 'Submit';
-
-  @override
-  String get close => 'Close';
-
-  @override
-  String get disable => 'Disable';
-
-  @override
-  String get enable => 'Enable';
-
-  @override
-  String get cancel => 'Cancel';
-
-  @override
-  String get now => 'Now';
-
-  @override
-  String get you => 'You';
-
-  @override
-  String get minutesShort => 'min.';
-
-  @override
-  String get image => 'Image';
-
-  @override
-  String get video => 'Video';
-
-  @override
-  String get react => 'React';
-
-  @override
-  String get reply => 'Reply';
-
-  @override
-  String get copy => 'Copy';
-
-  @override
-  String get edit => 'Edit';
-
-  @override
-  String get delete => 'Delete';
-
-  @override
-  String get info => 'Info';
-
-  @override
-  String get ok => 'Ok';
-
-  @override
-  String get switchFrontAndBackCamera =>
-      'Switch between front and back camera.';
-
-  @override
-  String get addTextItem => 'Text';
-
-  @override
-  String get protectAsARealTwonly => 'Send as real twonly!';
-
-  @override
-  String get addDrawing => 'Drawing';
-
-  @override
-  String get addEmoji => 'Emoji';
-
-  @override
-  String get toggleFlashLight => 'Toggle the flash light';
-
-  @override
-  String get toggleHighQuality => 'Toggle better resolution';
-
-  @override
-  String userFound(Object username) {
-    return '$username found';
-  }
-
-  @override
-  String get userFoundBody => 'Do you want to create a follow request?';
-
-  @override
-  String searchUsernameNotFoundLong(Object username) {
-    return '\"$username\" is not a twonly user. Please check the username and try again.';
-  }
-
-  @override
-  String get errorUnknown =>
-      'An unexpected error has occurred. Please try again later.';
-
-  @override
-  String get errorBadRequest =>
-      'The request could not be understood by the server due to malformed syntax. Please check your input and try again.';
-
-  @override
-  String get errorTooManyRequests =>
-      'You have made too many requests in a short period. Please wait a moment before trying again.';
-
-  @override
-  String get errorInternalError =>
-      'The server is currently not available. Please try again later.';
-
-  @override
-  String get errorInvalidInvitationCode =>
-      'The invitation code you provided is invalid. Please check the code and try again.';
-
-  @override
-  String get errorUsernameAlreadyTaken => 'The username is already taken.';
-
-  @override
-  String get errorSignatureNotValid =>
-      'The provided signature is not valid. Please check your credentials and try again.';
-
-  @override
-  String get errorUsernameNotFound =>
-      'The username you entered does not exist. Please check the spelling or create a new account.';
-
-  @override
-  String get errorUsernameNotValid =>
-      'The username you provided does not meet the required criteria. Please choose a valid username.';
-
-  @override
-  String get errorInvalidPublicKey =>
-      'The public key you provided is invalid. Please check the key and try again.';
-
-  @override
-  String get errorSessionAlreadyAuthenticated =>
-      'You are already logged in. Please log out if you want to log in with a different account.';
-
-  @override
-  String get errorSessionNotAuthenticated =>
-      'Your session is not authenticated. Please log in to continue.';
-
-  @override
-  String get errorOnlyOneSessionAllowed =>
-      'Only one active session is allowed per user. Please log out from other devices to continue.';
-
-  @override
-  String get errorNotEnoughCredit => 'You do not have enough twonly-credit.';
-
-  @override
-  String get errorVoucherInvalid =>
-      'The voucher code you entered is not valid.';
-
-  @override
-  String get errorPlanLimitReached =>
-      'You have reached your plans limit. Please upgrade your plan.';
-
-  @override
-  String get errorPlanNotAllowed =>
-      'This feature is not available in your current plan.';
-
-  @override
-  String get errorPlanUpgradeNotYearly =>
-      'The plan upgrade must be paid for annually, as the current plan is also billed annually.';
-
-  @override
-  String get upgradeToPaidPlan => 'Upgrade to a paid plan.';
-
-  @override
-  String upgradeToPaidPlanButton(Object planId, Object sufix) {
-    return 'Upgrade to $planId$sufix';
-  }
-
-  @override
-  String partOfPaidPlanOf(Object username) {
-    return 'You are part of the paid plan of $username!';
-  }
-
-  @override
-  String get year => 'year';
-
-  @override
-  String get yearly => 'Yearly';
-
-  @override
-  String get month => 'month';
-
-  @override
-  String get monthly => 'Monthly';
-
-  @override
-  String get proFeature1 => '✓ Unlimited media file uploads';
-
-  @override
-  String get proFeature2 => '✓ 1 additional Plus user';
-
-  @override
-  String get proFeature3 => '✓ Restore flames';
-
-  @override
-  String get proFeature4 => '✓ Support twonly';
-
-  @override
-  String get familyFeature1 => '✓ Unlimited media file uploads';
-
-  @override
-  String get familyFeature2 => '✓ 4 additional Plus user';
-
-  @override
-  String get familyFeature3 => '✓ Restore flames';
-
-  @override
-  String get familyFeature4 => '✓ Support twonly';
-
-  @override
-  String get freeFeature1 => '✓ 10 Media file uploads per day';
-
-  @override
-  String get plusFeature1 => '✓ Unlimited media file uploads';
-
-  @override
-  String get plusFeature2 => '✓ Additional features (coming-soon)';
-
-  @override
-  String get transactionHistory => 'Your transaction history';
-
-  @override
-  String get manageSubscription => 'Manage subscription';
-
-  @override
-  String get nextPayment => 'Next payment';
-
-  @override
-  String get currentBalance => 'Current balance';
-
-  @override
-  String get manageAdditionalUsers => 'Manage additional users';
-
-  @override
-  String get open => 'Open';
-
-  @override
-  String get createOrRedeemVoucher => 'Buy or redeem voucher';
-
-  @override
-  String get createVoucher => 'Buy voucher';
-
-  @override
-  String get createVoucherDesc =>
-      'Choose the value of the voucher. The value of the voucher will be deducted from your twonly balance.';
-
-  @override
-  String get redeemVoucher => 'Redeem voucher';
-
-  @override
-  String get openVouchers => 'Open vouchers';
-
-  @override
-  String get voucherCreated => 'Voucher created';
-
-  @override
-  String get voucherRedeemed => 'Voucher redeemed';
-
-  @override
-  String get enterVoucherCode => 'Enter Voucher Code';
-
-  @override
-  String get requestedVouchers => 'Requested vouchers';
-
-  @override
-  String get redeemedVouchers => 'Redeemed vouchers';
-
-  @override
-  String get buy => 'Buy';
-
-  @override
-  String subscriptionRefund(Object refund) {
-    return 'When you upgrade, you will receive a refund of $refund for your current subscription.';
-  }
-
-  @override
-  String get transactionCash => 'Cash transaction';
-
-  @override
-  String get transactionPlanUpgrade => 'Plan upgrade';
-
-  @override
-  String get transactionRefund => 'Refund transaction';
-
-  @override
-  String get transactionThanksForTesting => 'Thank you for testing';
-
-  @override
-  String get transactionUnknown => 'Unknown transaction';
-
-  @override
-  String get transactionVoucherCreated => 'Voucher created';
-
-  @override
-  String get transactionVoucherRedeemed => 'Voucher redeemed';
-
-  @override
-  String get transactionAutoRenewal => 'Automatic renewal';
-
-  @override
-  String get checkoutOptions => 'Options';
-
-  @override
-  String get refund => 'Refund';
-
-  @override
-  String get checkoutPayYearly => 'Pay yearly';
-
-  @override
-  String get checkoutTotal => 'Total';
-
-  @override
-  String get selectPaymentMethod => 'Select Payment Method';
-
-  @override
-  String get twonlyCredit => 'twonly-Credit';
-
-  @override
-  String get notEnoughCredit => 'You do not have enough credit!';
-
-  @override
-  String get chargeCredit => 'Charge credit';
-
-  @override
-  String get autoRenewal => 'Auto renewal';
-
-  @override
-  String get autoRenewalDesc => 'You can change this at any time.';
-
-  @override
-  String get autoRenewalLongDesc =>
-      'When your subscription expires, you will automatically be downgraded to the Preview plan. If you activate the automatic renewal, please make sure that you have enough credit for the automatic renewal. We will notify you in good time before the automatic renewal.';
-
-  @override
-  String get planSuccessUpgraded => 'Successfully upgraded your plan.';
-
-  @override
-  String get checkoutSubmit => 'Order with a fee.';
-
-  @override
-  String get additionalUsersList => 'Your additional users';
-
-  @override
-  String get additionalUsersPlusTokens => 'twonly-codes for \"Plus\" user';
-
-  @override
-  String get additionalUsersFreeTokens => 'twonly-codes for \"Free\" user';
-
-  @override
-  String get planLimitReached =>
-      'You have reached your plan limit for today. Upgrade your plan now to send the media file.';
-
-  @override
-  String get planNotAllowed =>
-      'You cannot send media files with your current tariff. Upgrade your plan now to send the media file.';
-
-  @override
-  String get galleryDelete => 'Delete file';
-
-  @override
-  String get galleryDetails => 'Show details';
-
-  @override
-  String get galleryExport => 'Export to gallery';
-
-  @override
-  String get galleryExportSuccess => 'Successfully saved in the Gallery.';
-
-  @override
-  String get settingsResetTutorials => 'Show tutorials again';
-
-  @override
-  String get settingsResetTutorialsDesc =>
-      'Click here to show already displayed tutorials again.';
-
-  @override
-  String get settingsResetTutorialsSuccess =>
-      'Tutorials will be displayed again.';
-
-  @override
-  String get tutorialChatListSearchUsersTitle =>
-      'Find Friends and Manage Friend Requests';
-
-  @override
-  String get tutorialChatListSearchUsersDesc =>
-      'If you know your friends\' usernames, you can search for them here and send a friend request. You will also see all requests from other users that you can accept or block.';
-
-  @override
-  String get tutorialChatListContextMenuTitle =>
-      'Long press on the contact to open the context menu.';
-
-  @override
-  String get tutorialChatListContextMenuDesc =>
-      'With the context menu, you can pin, archive, and perform various actions on your contacts. Simply long press the contact and then move your finger to the desired option or tap directly on it.';
-
-  @override
-  String get tutorialChatMessagesVerifyShieldTitle => 'Verify your contacts!';
-
-  @override
-  String get tutorialChatMessagesVerifyShieldDesc =>
-      'twonly uses the Signal protocol for secure end-to-end encryption. When you first contact someone, their public identity key is downloaded. To ensure that this key has not been tampered with by third parties, you should compare it with your friend when you meet in person. Once you have verified the user, you can also enable the twonly mode when sending images and videos.';
-
-  @override
-  String get tutorialChatMessagesReopenMessageTitle =>
-      'Reopen Images and Videos';
-
-  @override
-  String get tutorialChatMessagesReopenMessageDesc =>
-      'If your friend has sent you a picture or video with infinite display time, you can open it again at any time until you restart the app. To do this, simply double-click on the message. Your friend will then receive a notification that you have viewed the picture again.';
-
-  @override
-  String get memoriesEmpty =>
-      'As soon as you save pictures or videos, they end up here in your memories.';
-
-  @override
-  String get deleteTitle => 'Are you sure?';
-
-  @override
-  String get deleteOkBtnForAll => 'Delete for all';
-
-  @override
-  String get deleteOkBtnForMe => 'Delete for me';
-
-  @override
-  String get deleteImageTitle => 'Are you sure?';
-
-  @override
-  String get deleteImageBody => 'The image will be irrevocably deleted.';
-
-  @override
-  String get settingsBackup => 'Backup';
-
-  @override
-  String get backupNoticeTitle => 'No backup configured';
-
-  @override
-  String get backupNoticeDesc =>
-      'If you change or lose your device, no one can restore your account without a backup. Therefore, back up your data.';
-
-  @override
-  String get backupNoticeLater => 'Remind later';
-
-  @override
-  String get backupNoticeOpenBackup => 'Create backup';
-
-  @override
-  String get backupPending => 'Pending';
-
-  @override
-  String get backupFailed => 'Failed';
-
-  @override
-  String get backupSuccess => 'Success';
-
-  @override
-  String get backupTwonlySafeDesc =>
-      'Back up your twonly identity, as this is the only way to restore your account if you uninstall the app or lose your phone.';
-
-  @override
-  String get backupNoPasswordRecovery =>
-      'Due to twonly\'s security system, there is (currently) no password recovery function. Therefore, you must remember your password or, better yet, write it down.';
-
-  @override
-  String get backupServer => 'Server';
-
-  @override
-  String get backupMaxBackupSize => 'max. backup size';
-
-  @override
-  String get backupStorageRetention => 'Storage retention';
-
-  @override
-  String get backupLastBackupDate => 'Last backup';
-
-  @override
-  String get backupLastBackupSize => 'Backup size';
-
-  @override
-  String get backupLastBackupResult => 'Result';
-
-  @override
-  String get deleteBackupTitle => 'Are you sure?';
-
-  @override
-  String get deleteBackupBody =>
-      'Without an backup, you can not restore your user account.';
-
-  @override
-  String get backupData => 'Data-Backup';
-
-  @override
-  String get backupDataDesc =>
-      'This backup contains besides of your twonly-Identity also all of your media files. This backup will is also encrypted but stored locally. You then have to ensure to manually copy it onto your laptop or device of your choice.';
-
-  @override
-  String get backupInsecurePassword => 'Insecure password';
-
-  @override
-  String get backupInsecurePasswordDesc =>
-      'The chosen password is very insecure and can therefore easily be guessed by attackers. Please choose a secure password.';
-
-  @override
-  String get backupInsecurePasswordOk => 'Continue anyway';
-
-  @override
-  String get backupInsecurePasswordCancel => 'Try again';
-
-  @override
-  String get backupTwonlySafeLongDesc =>
-      'twonly does not have any central user accounts. A key pair is created during installation, which consists of a public and a private key. The private key is only stored on your device to protect it from unauthorized access. The public key is uploaded to the server and linked to your chosen username so that others can find you.\n\ntwonly Backup regularly creates an encrypted, anonymous backup of your private key together with your contacts and settings. Your username and chosen password are enough to restore this data on another device.';
-
-  @override
-  String get backupSelectStrongPassword =>
-      'Choose a secure password. This is required if you want to restore your twonly Backup.';
-
-  @override
-  String get password => 'Password';
-
-  @override
-  String get passwordRepeated => 'Repeat password';
-
-  @override
-  String get passwordRepeatedNotEqual => 'Passwords do not match.';
-
-  @override
-  String get backupPasswordRequirement =>
-      'Password must be at least 8 characters long.';
-
-  @override
-  String get backupExpertSettings => 'Expert settings';
-
-  @override
-  String get backupEnableBackup => 'Activate automatic backup';
-
-  @override
-  String get backupOwnServerDesc =>
-      'Save your twonly Backup at twonly or on any server of your choice.';
-
-  @override
-  String get backupUseOwnServer => 'Use server';
-
-  @override
-  String get backupResetServer => 'Use standard server';
-
-  @override
-  String get backupTwonlySaveNow => 'Save now';
-
-  @override
-  String get backupChangePassword => 'Change password';
-
-  @override
-  String get twonlySafeRecoverTitle => 'Recovery';
-
-  @override
-  String get twonlySafeRecoverDesc =>
-      'If you have created a backup with twonly Backup, you can restore it here.';
-
-  @override
-  String get twonlySafeRecoverBtn => 'Restore backup';
-
-  @override
-  String get inviteFriends => 'Invite your friends';
-
-  @override
-  String get inviteFriendsShareBtn => 'Share';
-
-  @override
-  String inviteFriendsShareText(Object url) {
-    return 'Let\'s switch to twonly: $url';
-  }
-
-  @override
-  String get appOutdated => 'Your version of twonly is out of date.';
-
-  @override
-  String get appOutdatedBtn => 'Update Now';
-
-  @override
-  String get doubleClickToReopen => 'Double-click\nto open again';
-
-  @override
-  String get uploadLimitReached =>
-      'The upload limit has\nbeen reached. Upgrade to Pro\nor wait until tomorrow.';
-
-  @override
-  String get fileLimitReached => 'Maximum file size\nexceeded';
-
-  @override
-  String get retransmissionRequested => 'Retransmission requested';
-
-  @override
-  String get testPaymentMethod =>
-      'Thanks for the interest in a paid plan. Currently the paid plans are still deactivated. But they will be activated soon!';
-
-  @override
-  String get openChangeLog => 'Open changelog automatically';
-
-  @override
-  String reportUserTitle(Object username) {
-    return 'Report $username';
-  }
-
-  @override
-  String get reportUserReason => 'Reporting reason';
-
-  @override
-  String get reportUser => 'Report user';
-
-  @override
-  String get newDeviceRegistered =>
-      'You have logged in on another device. You have therefore been logged out here.';
-
-  @override
-  String get tabToRemoveEmoji => 'Tab to remove';
-
-  @override
-  String get quotedMessageWasDeleted => 'The quoted message has been deleted.';
-
-  @override
-  String get messageWasDeleted => 'Message has been deleted.';
-
-  @override
-  String get messageWasDeletedShort => 'Deleted';
-
-  @override
-  String get sent => 'Delivered';
-
-  @override
-  String get sentTo => 'Delivered to';
-
-  @override
-  String get received => 'Received';
-
-  @override
-  String get opened => 'Opened';
-
-  @override
-  String get waitingForInternet => 'Waiting for internet';
-
-  @override
-  String get editHistory => 'Edit history';
-
-  @override
-  String get archivedChats => 'Archived chats';
-
-  @override
-  String get durationShortSecond => 'Sec.';
-
-  @override
-  String get durationShortMinute => 'Min.';
-
-  @override
-  String get durationShortHour => 'Hrs.';
-
-  @override
-  String durationShortDays(num count) {
-    String _temp0 = intl.Intl.pluralLogic(
-      count,
-      locale: localeName,
-      other: '$count Days',
-      one: '1 Day',
-    );
-    return '$_temp0';
-  }
-
-  @override
-  String get contacts => 'Contacts';
-
-  @override
-  String get groups => 'Groups';
-
-  @override
-  String get newGroup => 'New group';
-
-  @override
-  String get selectMembers => 'Select members';
-
-  @override
-  String get selectGroupName => 'Select group name';
-
-  @override
-  String get groupNameInput => 'Group name';
-
-  @override
-  String get groupMembers => 'Members';
-
-  @override
-  String get addMember => 'Add member';
-
-  @override
-  String get createGroup => 'Create group';
-
-  @override
-  String get leaveGroup => 'Leave group';
-
-  @override
-  String get createContactRequest => 'Create contact request';
-
-  @override
-  String get contactRequestSend => 'Contact request send';
-
-  @override
-  String get makeAdmin => 'Make admin';
-
-  @override
-  String get removeAdmin => 'Remove as admin';
-
-  @override
-  String get removeFromGroup => 'Remove from group';
-
-  @override
-  String get admin => 'Admin';
-
-  @override
-  String revokeAdminRightsTitle(Object username) {
-    return 'Revoke $username\'s admin rights?';
-  }
-
-  @override
-  String get revokeAdminRightsOkBtn => 'Remove as admin';
-
-  @override
-  String makeAdminRightsTitle(Object username) {
-    return 'Make $username an admin?';
-  }
-
-  @override
-  String makeAdminRightsBody(Object username) {
-    return '$username will be able to edit this group and its members.';
-  }
-
-  @override
-  String get makeAdminRightsOkBtn => 'Make admin';
-
-  @override
-  String get updateGroup => 'Update group';
-
-  @override
-  String get alreadyInGroup => 'Already in Group';
-
-  @override
-  String removeContactFromGroupTitle(Object username) {
-    return 'Remove $username from this group?';
-  }
-
-  @override
-  String youChangedGroupName(Object newGroupName) {
-    return 'You have changed the group name to \"$newGroupName\".';
-  }
-
-  @override
-  String makerChangedGroupName(Object maker, Object newGroupName) {
-    return '$maker has changed the group name to \"$newGroupName\".';
-  }
-
-  @override
-  String get youCreatedGroup => 'You have created the group.';
-
-  @override
-  String makerCreatedGroup(Object maker) {
-    return '$maker has created the group.';
-  }
-
-  @override
-  String youRemovedMember(Object affected) {
-    return 'You have removed $affected from the group.';
-  }
-
-  @override
-  String makerRemovedMember(Object affected, Object maker) {
-    return '$maker has removed $affected from the group.';
-  }
-
-  @override
-  String youAddedMember(Object affected) {
-    return 'You have added $affected to the group.';
-  }
-
-  @override
-  String makerAddedMember(Object affected, Object maker) {
-    return '$maker has added $affected to the group.';
-  }
-
-  @override
-  String youMadeAdmin(Object affected) {
-    return 'You made $affected an admin.';
-  }
-
-  @override
-  String makerMadeAdmin(Object affected, Object maker) {
-    return '$maker made $affected an admin.';
-  }
-
-  @override
-  String youRevokedAdminRights(Object affectedR) {
-    return 'You revoked $affectedR\'s admin rights.';
-  }
-
-  @override
-  String makerRevokedAdminRights(Object affectedR, Object maker) {
-    return '$maker revoked $affectedR\'s admin rights.';
-  }
-
-  @override
-  String get youLeftGroup => 'You have left the group.';
-
-  @override
-  String makerLeftGroup(Object maker) {
-    return '$maker has left the group.';
-  }
-
-  @override
-  String get groupActionYou => 'you';
-
-  @override
-  String get groupActionYour => 'your';
-
-  @override
-  String get notificationFillerIn => 'in';
-
-  @override
-  String notificationText(Object inGroup) {
-    return 'sent a message$inGroup.';
-  }
-
-  @override
-  String notificationTwonly(Object inGroup) {
-    return 'sent a twonly$inGroup.';
-  }
-
-  @override
-  String notificationVideo(Object inGroup) {
-    return 'sent a video$inGroup.';
-  }
-
-  @override
-  String notificationImage(Object inGroup) {
-    return 'sent an image$inGroup.';
-  }
-
-  @override
-  String notificationAudio(Object inGroup) {
-    return 'sent a voice message$inGroup.';
-  }
-
-  @override
-  String notificationAddedToGroup(Object groupname) {
-    return 'has added you to \"$groupname\"';
-  }
-
-  @override
-  String get notificationContactRequest => 'wants to connect with you.';
-
-  @override
-  String get notificationContactRequestUnknownUser =>
-      'have received a new contact request.';
-
-  @override
-  String get notificationAcceptRequest => 'is now connected with you.';
-
-  @override
-  String get notificationStoredMediaFile => 'has stored your image.';
-
-  @override
-  String get notificationReaction => 'has reacted to your image.';
-
-  @override
-  String get notificationReopenedMedia => 'has reopened your image.';
-
-  @override
-  String notificationReactionToVideo(Object reaction) {
-    return 'has reacted with $reaction to your video.';
-  }
-
-  @override
-  String notificationReactionToText(Object reaction) {
-    return 'has reacted with $reaction to your message.';
-  }
-
-  @override
-  String notificationReactionToImage(Object reaction) {
-    return 'has reacted with $reaction to your image.';
-  }
-
-  @override
-  String notificationReactionToAudio(Object reaction) {
-    return 'has reacted with $reaction to your audio message.';
-  }
-
-  @override
-  String notificationResponse(Object inGroup) {
-    return 'has responded$inGroup.';
-  }
-
-  @override
-  String get notificationTitleUnknown => 'You have a new message.';
-
-  @override
-  String get notificationBodyUnknown => 'Open twonly to learn more.';
-
-  @override
-  String get notificationCategoryMessageTitle => 'Messages';
-
-  @override
-  String get notificationCategoryMessageDesc => 'Messages from other users.';
-
-  @override
-  String get groupContextMenuDeleteGroup =>
-      'This will permanently delete all messages in this chat.';
-
-  @override
-  String get groupYouAreNowLongerAMember =>
-      'You are no longer part of this group.';
-
-  @override
-  String get groupNetworkIssue => 'Network issue. Try again later.';
-
-  @override
-  String get leaveGroupSelectOtherAdminTitle => 'Select another admin';
-
-  @override
-  String get leaveGroupSelectOtherAdminBody =>
-      'To leave the group, you must first select a new administrator.';
-
-  @override
-  String get leaveGroupSureTitle => 'Leave group';
-
-  @override
-  String get leaveGroupSureBody => 'Do you really want to leave the group?';
-
-  @override
-  String get leaveGroupSureOkBtn => 'Leave group';
-
-  @override
-  String changeDisplayMaxTime(Object time, Object username) {
-    return 'Chats will now be deleted after $time ($username).';
-  }
-
-  @override
-  String youChangedDisplayMaxTime(Object time) {
-    return 'Chats will now be deleted after $time.';
-  }
-
-  @override
-  String get userGotReported => 'User has been reported.';
-
-  @override
-  String get deleteChatAfter => 'Delete chat after...';
-
-  @override
-  String get deleteChatAfterAnHour => 'one hour.';
-
-  @override
-  String get deleteChatAfterADay => 'one day.';
-
-  @override
-  String get deleteChatAfterAWeek => 'one week.';
-
-  @override
-  String get deleteChatAfterAMonth => 'one month.';
-
-  @override
-  String get deleteChatAfterAYear => 'one year.';
-
-  @override
-  String get yourTwonlyScore => 'Your twonly-Score';
-
-  @override
-  String get registrationClosed =>
-      'Due to the current high volume of registrations, we have temporarily disabled registration to ensure that the service remains reliable. Please try again in a few days.';
-
-  @override
-  String get dialogAskDeleteMediaFilePopTitle =>
-      'Are you sure you want to delete your masterpiece?';
-
-  @override
-  String get dialogAskDeleteMediaFilePopDelete => 'Delete';
-
-  @override
-  String get allowErrorTracking => 'Share errors and crashes with us';
-
-  @override
-  String get allowErrorTrackingSubtitle =>
-      'If twonly crashes or errors occur, these are automatically reported to our self-hosted Glitchtip instance. Personal data such as messages or images are never uploaded.';
-
-  @override
-  String get avatarSaveChanges => 'Would you like to save the changes?';
-
-  @override
-  String get avatarSaveChangesStore => 'Save';
-
-  @override
-  String get avatarSaveChangesDiscard => 'Discard';
-
-  @override
-  String get inProcess => 'In process';
-
-  @override
-  String get draftMessage => 'Draft';
-
-  @override
-  String get exportMemories => 'Export memories (Beta)';
-
-  @override
-  String get importMemories => 'Import memories (Beta)';
-
-  @override
-  String get voiceMessageSlideToCancel => 'Slide to cancel';
-
-  @override
-  String get voiceMessageCancel => 'Cancel';
-
-  @override
-  String get shareYourProfile => 'Share your profile';
-
-  @override
-  String get scanOtherProfile => 'Scan other profile';
-
-  @override
-  String get openYourOwnQRcode => 'Open your own QR code';
-
-  @override
-  String get skipForNow => 'Skip for now';
-
-  @override
-  String linkFromUsername(Object username) {
-    return 'Is the link from $username?';
-  }
-
-  @override
-  String get linkFromUsernameLong =>
-      'If you received the link from your friend, you can mark the user as verified, as the public key in the link matches the public key already stored for that user?';
-
-  @override
-  String get gotLinkFromFriend => 'Yes, I got the link from my friend!';
-
-  @override
-  String couldNotVerifyUsername(Object username) {
-    return 'Could not verify $username';
-  }
-
-  @override
-  String get linkPubkeyDoesNotMatch =>
-      'The public key in the link does not match the public key stored for this contact. Try to meet your friend in person and scan the QR code directly!';
-
-  @override
-  String get startWithCameraOpen => 'Start with camera open';
-
-  @override
-  String get showImagePreviewWhenSending =>
-      'Display image preview when selecting recipients';
-
-  @override
-  String verifiedPublicKey(Object username) {
-    return 'The public key of $username has been verified and is valid.';
-  }
-
-  @override
-  String get memoriesAYearAgo => 'One year ago';
-
-  @override
-  String memoriesXYearsAgo(Object years) {
-    return '$years years ago';
-  }
-
-  @override
-  String migrationOfMemories(Object open) {
-    return 'Migration of media files: $open still to be processed.';
-  }
-
-  @override
-  String get autoStoreAllSendUnlimitedMediaFiles => 'Save all sent media';
-
-  @override
-  String get autoStoreAllSendUnlimitedMediaFilesSubtitle =>
-      'If you enable this option, all images you send will be saved as long as they were sent with an infinite countdown and not in twonly mode.';
-
-  @override
-  String get termsOfService => 'Terms of service';
-
-  @override
-  String get privacyPolicy => 'Privacy policy';
-
-  @override
-  String additionalUserAddError(Object username) {
-    return '$username could not be added, please try again later.';
-  }
-
-  @override
-  String additionalUserAddErrorNotInFreePlan(Object username) {
-    return '$username is already on a paid plan and therefore could not be added.';
-  }
-
-  @override
-  String additionalUserAddButton(Object limit, Object used) {
-    return 'Add additional user ($used/$limit)';
-  }
-
-  @override
-  String get additionalUserRemoveTitle => 'Remove this additional user';
-
-  @override
-  String get additionalUserRemoveDesc =>
-      'After removal, the additional user will automatically be downgraded to the free plan, and you can add another person.';
-
-  @override
-  String get additionalUserSelectTitle => 'Select additional users';
-
-  @override
-  String additionalUserSelectButton(Object limit, Object used) {
-    return 'Select users ($used/$limit)';
-  }
-
-  @override
-  String get storeAsDefault => 'Store as default';
-
-  @override
-  String get deleteUserErrorMessage =>
-      'You can only delete the contact once the direct chat has been deleted and the contact is no longer a member of a group.';
-
-  @override
-  String groupSizeLimitError(Object size) {
-    return 'Currently, group size is limited to $size people!';
-  }
-
-  @override
-  String get authRequestReopenImage =>
-      'You must authenticate to reopen the image.';
-
-  @override
-  String get shareContactsMenu => 'Contact';
-
-  @override
-  String get shareContactsTitle => 'Select contacts';
-
-  @override
-  String get shareContactsSubmit => 'Share now';
-
-  @override
-  String get updateTwonlyMessage =>
-      'To see this message, you need to update twonly.';
-
-  @override
-  String get verificationBadgeNote =>
-      'You can verify your friends by scanning their public QR code. Click to learn more.';
-
-  @override
-  String get verificationBadgeTitle => 'Verification';
-
-  @override
-  String get verificationBadgeGeneralDesc =>
-      'The green checkmark gives you the certainty that you are messaging the right person.';
-
-  @override
-  String get verificationBadgeGreenDesc =>
-      'Contact that you have personally verified via QR code. This also verified their public key.';
-
-  @override
-  String get verificationBadgeYellowDesc =>
-      '(Coming soon) Contact whose QR code was scanned by one of your personally verified contacts.';
-
-  @override
-  String get verificationBadgeRedDesc =>
-      'Unknown contact whose identity has not yet been verified.';
-
-  @override
-  String chatEntryFlameRestored(Object count) {
-    return '$count flames restored';
-  }
-
-  @override
-  String requestedUserToastText(Object username) {
-    return '$username was successfully requested.';
-  }
-
-  @override
-  String get profileYourQrCode => 'Your QR code';
-
-  @override
-  String get settingsScreenLock => 'Screen lock';
-
-  @override
-  String get settingsScreenLockSubtitle =>
-      'To open twonly, you\'ll need to use your smartphone\'s unlock feature.';
-
-  @override
-  String get settingsScreenLockAuthMessageEnable =>
-      'Use the screen lock from twonly.';
-
-  @override
-  String get settingsScreenLockAuthMessageDisable =>
-      'Disable the screen lock from twonly.';
-
-  @override
-  String get unlockTwonly => 'Unlock twonly';
-
-  @override
-  String get unlockTwonlyTryAgain => 'Try again';
-
-  @override
-  String get unlockTwonlyDesc =>
-      'Use your phone\'s unlock settings to unlock twonly';
-
-  @override
-  String get settingsTypingIndication => 'Typing Indicators';
-
-  @override
-  String get settingsTypingIndicationSubtitle =>
-      'When the typing indicator is turned off, you can\'t see when others are typing a message.';
-
-  @override
-  String get scanQrOrShow => 'Scan / Show QR';
-
-  @override
-  String get contactActionBlock => 'Block';
-
-  @override
-  String get contactActionAccept => 'Accept';
-
-  @override
-  String get userDiscoverySettingsMinImages =>
-      'Choose the minimum number of images you must have exchanged with a person before you securely share your friends with them.';
-
-  @override
-  String get userDiscoverySettingsMutualFriends =>
-      'Choose how many mutual friends a person must have for you to be suggested to them.';
-
-  @override
-  String get userDiscoverySettingsApply => 'Apply changes';
-
-  @override
-  String get userDiscoveryEnabledDisableWarning =>
-      'If you disable the \"Find friends\" feature, you will no longer see suggestions. You will also stop sharing your friends with new contacts.';
-
-  @override
-  String get userDiscoveryEnabledChangeSettings => 'Change settings';
-
-  @override
-  String get userDiscoveryEnabledFaq =>
-      'In our FAQ we explain how the \"Find friends\" feature works.';
-
-  @override
-  String get userDiscoveryDisabledIntro =>
-      'twonly doesn\'t use phone numbers, so we suggest friends based on mutual contacts instead – securely and privately.';
-
-  @override
-  String get userDiscoveryDisabledInvisible =>
-      'Your friend list is *completely invisible to strangers*. Only your friends can see parts of it – and only those people with whom they have *mutual friends* themselves.';
-
-  @override
-  String get userDiscoveryDisabledDecide =>
-      'Decide for yourself who can see your friends. You can change your mind at any time or hide specific people.';
-
-  @override
-  String get userDiscoverySettingsTitle => 'Find friends';
-
-  @override
-  String get userDiscoverySettingsMinImagesTitle => 'Number of shared images';
-
-  @override
-  String get userDiscoverySettingsMutualFriendsTitle =>
-      'Number of mutual friends';
-
-  @override
-  String get userDiscoveryDisabledYouHaveControl => 'You are in control';
-
-  @override
-  String get userDiscoveryDisabledEnableWithDefault =>
-      'Enable with default settings';
-
-  @override
-  String get userDiscoveryDisabledCustomizeSettings => 'Customize settings';
-
-  @override
-  String get userDiscoveryDisabledLearnMore => 'Learn more';
-
-  @override
-  String get userDiscoveryEnabledDialogTitle => 'Really disable?';
-
-  @override
-  String get userDiscoveryEnabledFriendsShared => 'Friends you share';
-
-  @override
-  String get userDiscoveryEnabledFriendsSharedDesc =>
-      'You only share friends who have also activated this feature and who have reached the threshold you set.';
-
-  @override
-  String get userDiscoveryEnabledNoFriendsShared =>
-      'You are not sharing anyone yet.';
-
-  @override
-  String get userDiscoveryActionDisable => 'Disable';
-
-  @override
-  String get friendSuggestionsTitle => 'Friend suggestions';
-
-  @override
-  String get andWord => 'and';
-
-  @override
-  String friendSuggestionsFriendsWith(Object friends) {
-    return 'Friends with $friends.';
-  }
-
-  @override
-  String friendSuggestionsGroupMemberIn(Object groups) {
-    return ' Group member in $groups.';
-  }
-
-  @override
-  String get friendSuggestionsRequest => 'Request';
-
-  @override
-  String contactUserDiscoveryImagesLeft(Object imagesLeft, Object username) {
-    return '$imagesLeft more images are needed until your friends are shared with $username.';
-  }
-
-  @override
-  String userDiscoveryEnabledVersion(Object version) {
-    return 'Version: $version';
-  }
-
-  @override
-  String userDiscoveryEnabledYourVersion(Object version) {
-    return 'Your version: $version';
-  }
-
-  @override
-  String get userDiscoveryEnabledStopSharing => 'Stop sharing';
-}
diff --git a/lib/src/localization/translations b/lib/src/localization/translations
index 57ec5129..03bf2204 160000
--- a/lib/src/localization/translations
+++ b/lib/src/localization/translations
@@ -1 +1 @@
-Subproject commit 57ec512977e514fca6413622bb4a7e03701f09a0
+Subproject commit 03bf220400bf35002c77e153768bd0f963a97d89
diff --git a/lib/src/model/json/faq.model.dart b/lib/src/model/json/faq.model.dart
new file mode 100644
index 00000000..79bf4e62
--- /dev/null
+++ b/lib/src/model/json/faq.model.dart
@@ -0,0 +1,89 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'faq.model.g.dart';
+
+@JsonSerializable()
+class FaqData {
+  const FaqData({required this.languages});
+
+  factory FaqData.fromJson(Map<String, dynamic> json) {
+    return FaqData(
+      languages: json.map(
+        (key, value) => MapEntry(
+          key,
+          (value as Map<String, dynamic>).map(
+            (catKey, catValue) => MapEntry(
+              catKey,
+              FaqCategory.fromJson(catValue as Map<String, dynamic>),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  final Map<String, Map<String, FaqCategory>> languages;
+
+  Map<String, dynamic> toJson() => languages.map(
+    (key, value) => MapEntry(
+      key,
+      value.map((catKey, catValue) => MapEntry(catKey, catValue.toJson())),
+    ),
+  );
+}
+
+@JsonSerializable()
+class FaqCategory {
+  const FaqCategory({
+    required this.meta,
+    required this.questions,
+  });
+
+  factory FaqCategory.fromJson(Map<String, dynamic> json) =>
+      _$FaqCategoryFromJson(json);
+
+  final FaqMeta meta;
+  final List<FaqQuestion> questions;
+
+  Map<String, dynamic> toJson() => _$FaqCategoryToJson(this);
+}
+
+@JsonSerializable()
+class FaqMeta {
+  const FaqMeta({
+    required this.title,
+    required this.desc,
+    this.priority = 0,
+  });
+
+  factory FaqMeta.fromJson(Map<String, dynamic> json) =>
+      _$FaqMetaFromJson(json);
+
+  final String title;
+  final String desc;
+
+  @JsonKey(defaultValue: 0)
+  final int priority;
+
+  Map<String, dynamic> toJson() => _$FaqMetaToJson(this);
+}
+
+@JsonSerializable()
+class FaqQuestion {
+  const FaqQuestion({
+    required this.id,
+    required this.title,
+    required this.body,
+    required this.path,
+  });
+
+  factory FaqQuestion.fromJson(Map<String, dynamic> json) =>
+      _$FaqQuestionFromJson(json);
+
+  final String id;
+  final String title;
+  final String body;
+  final String path;
+
+  Map<String, dynamic> toJson() => _$FaqQuestionToJson(this);
+}
diff --git a/lib/src/model/json/faq.model.g.dart b/lib/src/model/json/faq.model.g.dart
new file mode 100644
index 00000000..8432ff2b
--- /dev/null
+++ b/lib/src/model/json/faq.model.g.dart
@@ -0,0 +1,59 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'faq.model.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+FaqData _$FaqDataFromJson(Map<String, dynamic> json) => FaqData(
+  languages: (json['languages'] as Map<String, dynamic>).map(
+    (k, e) => MapEntry(
+      k,
+      (e as Map<String, dynamic>).map(
+        (k, e) => MapEntry(k, FaqCategory.fromJson(e as Map<String, dynamic>)),
+      ),
+    ),
+  ),
+);
+
+Map<String, dynamic> _$FaqDataToJson(FaqData instance) => <String, dynamic>{
+  'languages': instance.languages,
+};
+
+FaqCategory _$FaqCategoryFromJson(Map<String, dynamic> json) => FaqCategory(
+  meta: FaqMeta.fromJson(json['meta'] as Map<String, dynamic>),
+  questions: (json['questions'] as List<dynamic>)
+      .map((e) => FaqQuestion.fromJson(e as Map<String, dynamic>))
+      .toList(),
+);
+
+Map<String, dynamic> _$FaqCategoryToJson(FaqCategory instance) =>
+    <String, dynamic>{'meta': instance.meta, 'questions': instance.questions};
+
+FaqMeta _$FaqMetaFromJson(Map<String, dynamic> json) => FaqMeta(
+  title: json['title'] as String,
+  desc: json['desc'] as String,
+  priority: (json['priority'] as num?)?.toInt() ?? 0,
+);
+
+Map<String, dynamic> _$FaqMetaToJson(FaqMeta instance) => <String, dynamic>{
+  'title': instance.title,
+  'desc': instance.desc,
+  'priority': instance.priority,
+};
+
+FaqQuestion _$FaqQuestionFromJson(Map<String, dynamic> json) => FaqQuestion(
+  id: json['id'] as String,
+  title: json['title'] as String,
+  body: json['body'] as String,
+  path: json['path'] as String,
+);
+
+Map<String, dynamic> _$FaqQuestionToJson(FaqQuestion instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'title': instance.title,
+      'body': instance.body,
+      'path': instance.path,
+    };
diff --git a/lib/src/model/json/signal_identity.dart b/lib/src/model/json/signal_identity.model.dart
similarity index 95%
rename from lib/src/model/json/signal_identity.dart
rename to lib/src/model/json/signal_identity.model.dart
index d4558877..bc01d334 100644
--- a/lib/src/model/json/signal_identity.dart
+++ b/lib/src/model/json/signal_identity.model.dart
@@ -3,7 +3,7 @@ import 'dart:typed_data';
 
 import 'package:json_annotation/json_annotation.dart';
 
-part 'signal_identity.g.dart';
+part 'signal_identity.model.g.dart';
 
 @JsonSerializable()
 class SignalIdentity {
diff --git a/lib/src/model/json/signal_identity.g.dart b/lib/src/model/json/signal_identity.model.g.dart
similarity index 95%
rename from lib/src/model/json/signal_identity.g.dart
rename to lib/src/model/json/signal_identity.model.g.dart
index 61a2742e..e80049e6 100644
--- a/lib/src/model/json/signal_identity.g.dart
+++ b/lib/src/model/json/signal_identity.model.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'signal_identity.dart';
+part of 'signal_identity.model.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator
diff --git a/lib/src/model/json/userdata.dart b/lib/src/model/json/userdata.model.dart
similarity index 86%
rename from lib/src/model/json/userdata.dart
rename to lib/src/model/json/userdata.model.dart
index 21789624..07a44b81 100644
--- a/lib/src/model/json/userdata.dart
+++ b/lib/src/model/json/userdata.model.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:json_annotation/json_annotation.dart';
-part 'userdata.g.dart';
+part 'userdata.model.g.dart';
 
 @JsonSerializable()
 class UserData {
@@ -9,6 +9,7 @@ class UserData {
     required this.username,
     required this.displayName,
     required this.subscriptionPlan,
+    required this.currentSetupPage,
   });
   factory UserData.fromJson(Map<String, dynamic> json) =>
       _$UserDataFromJson(json);
@@ -43,6 +44,9 @@ class UserData {
   DateTime? lastImageSend;
   int? todaysImageCounter;
 
+  String? lastPlanBallance;
+  String? additionalUserInvites;
+
   // --- SETTINGS ---
 
   @JsonKey(defaultValue: ThemeMode.system)
@@ -78,11 +82,6 @@ class UserData {
   @JsonKey(defaultValue: true)
   bool typingIndicators = true;
 
-  String? lastPlanBallance;
-  String? additionalUserInvites;
-
-  List<String>? tutorialDisplayed;
-
   String? myBestFriendGroupId;
 
   DateTime? signalLastSignedPreKeyUpdated;
@@ -93,6 +92,23 @@ class UserData {
   @JsonKey(defaultValue: false)
   bool screenLockEnabled = false;
 
+  // > User Discovery Configurations
+
+  @JsonKey(defaultValue: false)
+  bool isUserDiscoveryEnabled = false;
+
+  @JsonKey(defaultValue: 4)
+  int requiredSendImages = 4;
+
+  @JsonKey(defaultValue: 2)
+  int userDiscoveryThreshold = 2;
+
+  @JsonKey(defaultValue: false)
+  bool userDiscoveryRequiresManualApproval = false;
+
+  @JsonKey(defaultValue: true)
+  bool userDiscoverySharePromotion = true;
+
   //  -- Custom DATA --
 
   @JsonKey(defaultValue: 100_000)
@@ -124,9 +140,17 @@ class UserData {
   // So update data can be assigned. If set the user choose to participate.
   String? userStudyParticipantsToken;
 
+  @JsonKey(defaultValue: 0)
+  int userStudyCountNewFriendsViaSuggestion = 0;
+
   // Once a day the anonymous data is collected and send to the server
   DateTime? lastUserStudyDataUpload;
 
+  String? currentSetupPage;
+
+  @JsonKey(defaultValue: false)
+  bool skipSetupPages = false;
+
   Map<String, dynamic> toJson() => _$UserDataToJson(this);
 }
 
diff --git a/lib/src/model/json/userdata.g.dart b/lib/src/model/json/userdata.model.g.dart
similarity index 86%
rename from lib/src/model/json/userdata.g.dart
rename to lib/src/model/json/userdata.model.g.dart
index 911b53f3..3b028b00 100644
--- a/lib/src/model/json/userdata.g.dart
+++ b/lib/src/model/json/userdata.model.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'userdata.dart';
+part of 'userdata.model.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator
@@ -12,6 +12,7 @@ UserData _$UserDataFromJson(Map<String, dynamic> json) =>
         username: json['username'] as String,
         displayName: json['displayName'] as String,
         subscriptionPlan: json['subscriptionPlan'] as String? ?? 'Free',
+        currentSetupPage: json['currentSetupPage'] as String?,
       )
       ..avatarSvg = json['avatarSvg'] as String?
       ..avatarJson = json['avatarJson'] as String?
@@ -24,6 +25,8 @@ UserData _$UserDataFromJson(Map<String, dynamic> json) =>
           ? null
           : DateTime.parse(json['lastImageSend'] as String)
       ..todaysImageCounter = (json['todaysImageCounter'] as num?)?.toInt()
+      ..lastPlanBallance = json['lastPlanBallance'] as String?
+      ..additionalUserInvites = json['additionalUserInvites'] as String?
       ..themeMode =
           $enumDecodeNullable(_$ThemeModeEnumMap, json['themeMode']) ??
           ThemeMode.system
@@ -51,11 +54,6 @@ UserData _$UserDataFromJson(Map<String, dynamic> json) =>
       ..autoStoreAllSendUnlimitedMediaFiles =
           json['autoStoreAllSendUnlimitedMediaFiles'] as bool? ?? false
       ..typingIndicators = json['typingIndicators'] as bool? ?? true
-      ..lastPlanBallance = json['lastPlanBallance'] as String?
-      ..additionalUserInvites = json['additionalUserInvites'] as String?
-      ..tutorialDisplayed = (json['tutorialDisplayed'] as List<dynamic>?)
-          ?.map((e) => e as String)
-          .toList()
       ..myBestFriendGroupId = json['myBestFriendGroupId'] as String?
       ..signalLastSignedPreKeyUpdated =
           json['signalLastSignedPreKeyUpdated'] == null
@@ -64,6 +62,15 @@ UserData _$UserDataFromJson(Map<String, dynamic> json) =>
       ..allowErrorTrackingViaSentry =
           json['allowErrorTrackingViaSentry'] as bool? ?? false
       ..screenLockEnabled = json['screenLockEnabled'] as bool? ?? false
+      ..isUserDiscoveryEnabled =
+          json['isUserDiscoveryEnabled'] as bool? ?? false
+      ..requiredSendImages = (json['requiredSendImages'] as num?)?.toInt() ?? 4
+      ..userDiscoveryThreshold =
+          (json['userDiscoveryThreshold'] as num?)?.toInt() ?? 2
+      ..userDiscoveryRequiresManualApproval =
+          json['userDiscoveryRequiresManualApproval'] as bool? ?? false
+      ..userDiscoverySharePromotion =
+          json['userDiscoverySharePromotion'] as bool? ?? true
       ..currentPreKeyIndexStart =
           (json['currentPreKeyIndexStart'] as num?)?.toInt() ?? 100000
       ..currentSignedPreKeyIndexStart =
@@ -88,9 +95,12 @@ UserData _$UserDataFromJson(Map<String, dynamic> json) =>
           json['askedForUserStudyPermission'] as bool? ?? false
       ..userStudyParticipantsToken =
           json['userStudyParticipantsToken'] as String?
+      ..userStudyCountNewFriendsViaSuggestion =
+          (json['userStudyCountNewFriendsViaSuggestion'] as num?)?.toInt() ?? 0
       ..lastUserStudyDataUpload = json['lastUserStudyDataUpload'] == null
           ? null
-          : DateTime.parse(json['lastUserStudyDataUpload'] as String);
+          : DateTime.parse(json['lastUserStudyDataUpload'] as String)
+      ..skipSetupPages = json['skipSetupPages'] as bool? ?? false;
 
 Map<String, dynamic> _$UserDataToJson(UserData instance) => <String, dynamic>{
   'userId': instance.userId,
@@ -106,6 +116,8 @@ Map<String, dynamic> _$UserDataToJson(UserData instance) => <String, dynamic>{
   'subscriptionPlanIdStore': instance.subscriptionPlanIdStore,
   'lastImageSend': instance.lastImageSend?.toIso8601String(),
   'todaysImageCounter': instance.todaysImageCounter,
+  'lastPlanBallance': instance.lastPlanBallance,
+  'additionalUserInvites': instance.additionalUserInvites,
   'themeMode': _$ThemeModeEnumMap[instance.themeMode]!,
   'defaultShowTime': instance.defaultShowTime,
   'requestedAudioPermission': instance.requestedAudioPermission,
@@ -119,14 +131,17 @@ Map<String, dynamic> _$UserDataToJson(UserData instance) => <String, dynamic>{
   'autoStoreAllSendUnlimitedMediaFiles':
       instance.autoStoreAllSendUnlimitedMediaFiles,
   'typingIndicators': instance.typingIndicators,
-  'lastPlanBallance': instance.lastPlanBallance,
-  'additionalUserInvites': instance.additionalUserInvites,
-  'tutorialDisplayed': instance.tutorialDisplayed,
   'myBestFriendGroupId': instance.myBestFriendGroupId,
   'signalLastSignedPreKeyUpdated': instance.signalLastSignedPreKeyUpdated
       ?.toIso8601String(),
   'allowErrorTrackingViaSentry': instance.allowErrorTrackingViaSentry,
   'screenLockEnabled': instance.screenLockEnabled,
+  'isUserDiscoveryEnabled': instance.isUserDiscoveryEnabled,
+  'requiredSendImages': instance.requiredSendImages,
+  'userDiscoveryThreshold': instance.userDiscoveryThreshold,
+  'userDiscoveryRequiresManualApproval':
+      instance.userDiscoveryRequiresManualApproval,
+  'userDiscoverySharePromotion': instance.userDiscoverySharePromotion,
   'currentPreKeyIndexStart': instance.currentPreKeyIndexStart,
   'currentSignedPreKeyIndexStart': instance.currentSignedPreKeyIndexStart,
   'lastChangeLogHash': instance.lastChangeLogHash,
@@ -138,8 +153,12 @@ Map<String, dynamic> _$UserDataToJson(UserData instance) => <String, dynamic>{
   'twonlySafeBackup': instance.twonlySafeBackup,
   'askedForUserStudyPermission': instance.askedForUserStudyPermission,
   'userStudyParticipantsToken': instance.userStudyParticipantsToken,
+  'userStudyCountNewFriendsViaSuggestion':
+      instance.userStudyCountNewFriendsViaSuggestion,
   'lastUserStudyDataUpload': instance.lastUserStudyDataUpload
       ?.toIso8601String(),
+  'currentSetupPage': instance.currentSetupPage,
+  'skipSetupPages': instance.skipSetupPages,
 };
 
 const _$ThemeModeEnumMap = {
diff --git a/lib/src/model/protobuf/api/http/http_requests.pb.dart b/lib/src/model/protobuf/api/http/http_requests.pb.dart
index 7a552502..c2283af1 100644
--- a/lib/src/model/protobuf/api/http/http_requests.pb.dart
+++ b/lib/src/model/protobuf/api/http/http_requests.pb.dart
@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
@@ -51,7 +51,7 @@ class TextMessage extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  TextMessage clone() => TextMessage()..mergeFromMessage(this);
+  TextMessage clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   TextMessage copyWith(void Function(TextMessage) updates) =>
       super.copyWith((message) => updates(message as TextMessage))
@@ -64,7 +64,6 @@ class TextMessage extends $pb.GeneratedMessage {
   static TextMessage create() => TextMessage._();
   @$core.override
   TextMessage createEmptyInstance() => create();
-  static $pb.PbList<TextMessage> createRepeated() => $pb.PbList<TextMessage>();
   @$core.pragma('dart2js:noInline')
   static TextMessage getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<TextMessage>(create);
@@ -129,13 +128,12 @@ class UploadRequest extends $pb.GeneratedMessage {
         1, _omitFieldNames ? '' : 'encryptedData', $pb.PbFieldType.OY)
     ..p<$core.List<$core.int>>(
         2, _omitFieldNames ? '' : 'downloadTokens', $pb.PbFieldType.PY)
-    ..pc<TextMessage>(
-        3, _omitFieldNames ? '' : 'messagesOnSuccess', $pb.PbFieldType.PM,
+    ..pPM<TextMessage>(3, _omitFieldNames ? '' : 'messagesOnSuccess',
         subBuilder: TextMessage.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  UploadRequest clone() => UploadRequest()..mergeFromMessage(this);
+  UploadRequest clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   UploadRequest copyWith(void Function(UploadRequest) updates) =>
       super.copyWith((message) => updates(message as UploadRequest))
@@ -148,8 +146,6 @@ class UploadRequest extends $pb.GeneratedMessage {
   static UploadRequest create() => UploadRequest._();
   @$core.override
   UploadRequest createEmptyInstance() => create();
-  static $pb.PbList<UploadRequest> createRepeated() =>
-      $pb.PbList<UploadRequest>();
   @$core.pragma('dart2js:noInline')
   static UploadRequest getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<UploadRequest>(create);
@@ -220,8 +216,7 @@ class UpdateGroupState_UpdateTBS extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  UpdateGroupState_UpdateTBS clone() =>
-      UpdateGroupState_UpdateTBS()..mergeFromMessage(this);
+  UpdateGroupState_UpdateTBS clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   UpdateGroupState_UpdateTBS copyWith(
           void Function(UpdateGroupState_UpdateTBS) updates) =>
@@ -236,8 +231,6 @@ class UpdateGroupState_UpdateTBS extends $pb.GeneratedMessage {
   static UpdateGroupState_UpdateTBS create() => UpdateGroupState_UpdateTBS._();
   @$core.override
   UpdateGroupState_UpdateTBS createEmptyInstance() => create();
-  static $pb.PbList<UpdateGroupState_UpdateTBS> createRepeated() =>
-      $pb.PbList<UpdateGroupState_UpdateTBS>();
   @$core.pragma('dart2js:noInline')
   static UpdateGroupState_UpdateTBS getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<UpdateGroupState_UpdateTBS>(create);
@@ -331,7 +324,7 @@ class UpdateGroupState extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  UpdateGroupState clone() => UpdateGroupState()..mergeFromMessage(this);
+  UpdateGroupState clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   UpdateGroupState copyWith(void Function(UpdateGroupState) updates) =>
       super.copyWith((message) => updates(message as UpdateGroupState))
@@ -344,8 +337,6 @@ class UpdateGroupState extends $pb.GeneratedMessage {
   static UpdateGroupState create() => UpdateGroupState._();
   @$core.override
   UpdateGroupState createEmptyInstance() => create();
-  static $pb.PbList<UpdateGroupState> createRepeated() =>
-      $pb.PbList<UpdateGroupState>();
   @$core.pragma('dart2js:noInline')
   static UpdateGroupState getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<UpdateGroupState>(create);
@@ -412,7 +403,7 @@ class NewGroupState extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  NewGroupState clone() => NewGroupState()..mergeFromMessage(this);
+  NewGroupState clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   NewGroupState copyWith(void Function(NewGroupState) updates) =>
       super.copyWith((message) => updates(message as NewGroupState))
@@ -425,8 +416,6 @@ class NewGroupState extends $pb.GeneratedMessage {
   static NewGroupState create() => NewGroupState._();
   @$core.override
   NewGroupState createEmptyInstance() => create();
-  static $pb.PbList<NewGroupState> createRepeated() =>
-      $pb.PbList<NewGroupState>();
   @$core.pragma('dart2js:noInline')
   static NewGroupState getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<NewGroupState>(create);
@@ -508,8 +497,7 @@ class AppendGroupState_AppendTBS extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AppendGroupState_AppendTBS clone() =>
-      AppendGroupState_AppendTBS()..mergeFromMessage(this);
+  AppendGroupState_AppendTBS clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   AppendGroupState_AppendTBS copyWith(
           void Function(AppendGroupState_AppendTBS) updates) =>
@@ -524,8 +512,6 @@ class AppendGroupState_AppendTBS extends $pb.GeneratedMessage {
   static AppendGroupState_AppendTBS create() => AppendGroupState_AppendTBS._();
   @$core.override
   AppendGroupState_AppendTBS createEmptyInstance() => create();
-  static $pb.PbList<AppendGroupState_AppendTBS> createRepeated() =>
-      $pb.PbList<AppendGroupState_AppendTBS>();
   @$core.pragma('dart2js:noInline')
   static AppendGroupState_AppendTBS getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<AppendGroupState_AppendTBS>(create);
@@ -605,7 +591,7 @@ class AppendGroupState extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AppendGroupState clone() => AppendGroupState()..mergeFromMessage(this);
+  AppendGroupState clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   AppendGroupState copyWith(void Function(AppendGroupState) updates) =>
       super.copyWith((message) => updates(message as AppendGroupState))
@@ -618,8 +604,6 @@ class AppendGroupState extends $pb.GeneratedMessage {
   static AppendGroupState create() => AppendGroupState._();
   @$core.override
   AppendGroupState createEmptyInstance() => create();
-  static $pb.PbList<AppendGroupState> createRepeated() =>
-      $pb.PbList<AppendGroupState>();
   @$core.pragma('dart2js:noInline')
   static AppendGroupState getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<AppendGroupState>(create);
@@ -688,13 +672,12 @@ class GroupState extends $pb.GeneratedMessage {
         defaultOrMaker: $fixnum.Int64.ZERO)
     ..a<$core.List<$core.int>>(
         2, _omitFieldNames ? '' : 'encryptedGroupState', $pb.PbFieldType.OY)
-    ..pc<AppendGroupState>(
-        3, _omitFieldNames ? '' : 'appendedGroupStates', $pb.PbFieldType.PM,
+    ..pPM<AppendGroupState>(3, _omitFieldNames ? '' : 'appendedGroupStates',
         subBuilder: AppendGroupState.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  GroupState clone() => GroupState()..mergeFromMessage(this);
+  GroupState clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   GroupState copyWith(void Function(GroupState) updates) =>
       super.copyWith((message) => updates(message as GroupState)) as GroupState;
@@ -706,7 +689,6 @@ class GroupState extends $pb.GeneratedMessage {
   static GroupState create() => GroupState._();
   @$core.override
   GroupState createEmptyInstance() => create();
-  static $pb.PbList<GroupState> createRepeated() => $pb.PbList<GroupState>();
   @$core.pragma('dart2js:noInline')
   static GroupState getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<GroupState>(create);
@@ -758,14 +740,12 @@ class AppendGroupStateHelper extends $pb.GeneratedMessage {
       _omitMessageNames ? '' : 'AppendGroupStateHelper',
       package: const $pb.PackageName(_omitMessageNames ? '' : 'http_requests'),
       createEmptyInstance: create)
-    ..pc<AppendGroupState>(
-        1, _omitFieldNames ? '' : 'appendedGroupStates', $pb.PbFieldType.PM,
+    ..pPM<AppendGroupState>(1, _omitFieldNames ? '' : 'appendedGroupStates',
         subBuilder: AppendGroupState.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AppendGroupStateHelper clone() =>
-      AppendGroupStateHelper()..mergeFromMessage(this);
+  AppendGroupStateHelper clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   AppendGroupStateHelper copyWith(
           void Function(AppendGroupStateHelper) updates) =>
@@ -779,8 +759,6 @@ class AppendGroupStateHelper extends $pb.GeneratedMessage {
   static AppendGroupStateHelper create() => AppendGroupStateHelper._();
   @$core.override
   AppendGroupStateHelper createEmptyInstance() => create();
-  static $pb.PbList<AppendGroupStateHelper> createRepeated() =>
-      $pb.PbList<AppendGroupStateHelper>();
   @$core.pragma('dart2js:noInline')
   static AppendGroupStateHelper getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<AppendGroupStateHelper>(create);
diff --git a/lib/src/model/protobuf/api/http/http_requests.pbenum.dart b/lib/src/model/protobuf/api/http/http_requests.pbenum.dart
index 968f4627..6b32edfe 100644
--- a/lib/src/model/protobuf/api/http/http_requests.pbenum.dart
+++ b/lib/src/model/protobuf/api/http/http_requests.pbenum.dart
@@ -8,4 +8,4 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
diff --git a/lib/src/model/protobuf/api/http/http_requests.pbjson.dart b/lib/src/model/protobuf/api/http/http_requests.pbjson.dart
index d16c52db..bc6c1336 100644
--- a/lib/src/model/protobuf/api/http/http_requests.pbjson.dart
+++ b/lib/src/model/protobuf/api/http/http_requests.pbjson.dart
@@ -8,7 +8,8 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
diff --git a/lib/src/model/protobuf/api/websocket/client_to_server.pb.dart b/lib/src/model/protobuf/api/websocket/client_to_server.pb.dart
index 5012b753..f5547c51 100644
--- a/lib/src/model/protobuf/api/websocket/client_to_server.pb.dart
+++ b/lib/src/model/protobuf/api/websocket/client_to_server.pb.dart
@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
@@ -54,7 +54,7 @@ class ClientToServer extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ClientToServer clone() => ClientToServer()..mergeFromMessage(this);
+  ClientToServer clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ClientToServer copyWith(void Function(ClientToServer) updates) =>
       super.copyWith((message) => updates(message as ClientToServer))
@@ -67,14 +67,14 @@ class ClientToServer extends $pb.GeneratedMessage {
   static ClientToServer create() => ClientToServer._();
   @$core.override
   ClientToServer createEmptyInstance() => create();
-  static $pb.PbList<ClientToServer> createRepeated() =>
-      $pb.PbList<ClientToServer>();
   @$core.pragma('dart2js:noInline')
   static ClientToServer getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ClientToServer>(create);
   static ClientToServer? _defaultInstance;
 
+  @$pb.TagNumber(1)
   ClientToServer_V whichV() => _ClientToServer_VByTag[$_whichOneof(0)]!;
+  @$pb.TagNumber(1)
   void clearV() => $_clearField($_whichOneof(0));
 
   @$pb.TagNumber(1)
@@ -138,7 +138,7 @@ class V0 extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  V0 clone() => V0()..mergeFromMessage(this);
+  V0 clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   V0 copyWith(void Function(V0) updates) =>
       super.copyWith((message) => updates(message as V0)) as V0;
@@ -150,13 +150,18 @@ class V0 extends $pb.GeneratedMessage {
   static V0 create() => V0._();
   @$core.override
   V0 createEmptyInstance() => create();
-  static $pb.PbList<V0> createRepeated() => $pb.PbList<V0>();
   @$core.pragma('dart2js:noInline')
   static V0 getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<V0>(create);
   static V0? _defaultInstance;
 
+  @$pb.TagNumber(2)
+  @$pb.TagNumber(3)
+  @$pb.TagNumber(4)
   V0_Kind whichKind() => _V0_KindByTag[$_whichOneof(0)]!;
+  @$pb.TagNumber(2)
+  @$pb.TagNumber(3)
+  @$pb.TagNumber(4)
   void clearKind() => $_clearField($_whichOneof(0));
 
   @$pb.TagNumber(1)
@@ -222,8 +227,7 @@ class Handshake_RequestPOW extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Handshake_RequestPOW clone() =>
-      Handshake_RequestPOW()..mergeFromMessage(this);
+  Handshake_RequestPOW clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Handshake_RequestPOW copyWith(void Function(Handshake_RequestPOW) updates) =>
       super.copyWith((message) => updates(message as Handshake_RequestPOW))
@@ -236,8 +240,6 @@ class Handshake_RequestPOW extends $pb.GeneratedMessage {
   static Handshake_RequestPOW create() => Handshake_RequestPOW._();
   @$core.override
   Handshake_RequestPOW createEmptyInstance() => create();
-  static $pb.PbList<Handshake_RequestPOW> createRepeated() =>
-      $pb.PbList<Handshake_RequestPOW>();
   @$core.pragma('dart2js:noInline')
   static Handshake_RequestPOW getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Handshake_RequestPOW>(create);
@@ -302,7 +304,7 @@ class Handshake_Register extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Handshake_Register clone() => Handshake_Register()..mergeFromMessage(this);
+  Handshake_Register clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Handshake_Register copyWith(void Function(Handshake_Register) updates) =>
       super.copyWith((message) => updates(message as Handshake_Register))
@@ -315,8 +317,6 @@ class Handshake_Register extends $pb.GeneratedMessage {
   static Handshake_Register create() => Handshake_Register._();
   @$core.override
   Handshake_Register createEmptyInstance() => create();
-  static $pb.PbList<Handshake_Register> createRepeated() =>
-      $pb.PbList<Handshake_Register>();
   @$core.pragma('dart2js:noInline')
   static Handshake_Register getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Handshake_Register>(create);
@@ -434,8 +434,7 @@ class Handshake_GetAuthChallenge extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Handshake_GetAuthChallenge clone() =>
-      Handshake_GetAuthChallenge()..mergeFromMessage(this);
+  Handshake_GetAuthChallenge clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Handshake_GetAuthChallenge copyWith(
           void Function(Handshake_GetAuthChallenge) updates) =>
@@ -450,8 +449,6 @@ class Handshake_GetAuthChallenge extends $pb.GeneratedMessage {
   static Handshake_GetAuthChallenge create() => Handshake_GetAuthChallenge._();
   @$core.override
   Handshake_GetAuthChallenge createEmptyInstance() => create();
-  static $pb.PbList<Handshake_GetAuthChallenge> createRepeated() =>
-      $pb.PbList<Handshake_GetAuthChallenge>();
   @$core.pragma('dart2js:noInline')
   static Handshake_GetAuthChallenge getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Handshake_GetAuthChallenge>(create);
@@ -489,8 +486,7 @@ class Handshake_GetAuthToken extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Handshake_GetAuthToken clone() =>
-      Handshake_GetAuthToken()..mergeFromMessage(this);
+  Handshake_GetAuthToken clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Handshake_GetAuthToken copyWith(
           void Function(Handshake_GetAuthToken) updates) =>
@@ -504,8 +500,6 @@ class Handshake_GetAuthToken extends $pb.GeneratedMessage {
   static Handshake_GetAuthToken create() => Handshake_GetAuthToken._();
   @$core.override
   Handshake_GetAuthToken createEmptyInstance() => create();
-  static $pb.PbList<Handshake_GetAuthToken> createRepeated() =>
-      $pb.PbList<Handshake_GetAuthToken>();
   @$core.pragma('dart2js:noInline')
   static Handshake_GetAuthToken getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Handshake_GetAuthToken>(create);
@@ -570,8 +564,7 @@ class Handshake_Authenticate extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Handshake_Authenticate clone() =>
-      Handshake_Authenticate()..mergeFromMessage(this);
+  Handshake_Authenticate clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Handshake_Authenticate copyWith(
           void Function(Handshake_Authenticate) updates) =>
@@ -585,8 +578,6 @@ class Handshake_Authenticate extends $pb.GeneratedMessage {
   static Handshake_Authenticate create() => Handshake_Authenticate._();
   @$core.override
   Handshake_Authenticate createEmptyInstance() => create();
-  static $pb.PbList<Handshake_Authenticate> createRepeated() =>
-      $pb.PbList<Handshake_Authenticate>();
   @$core.pragma('dart2js:noInline')
   static Handshake_Authenticate getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Handshake_Authenticate>(create);
@@ -703,7 +694,7 @@ class Handshake extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Handshake clone() => Handshake()..mergeFromMessage(this);
+  Handshake clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Handshake copyWith(void Function(Handshake) updates) =>
       super.copyWith((message) => updates(message as Handshake)) as Handshake;
@@ -715,14 +706,23 @@ class Handshake extends $pb.GeneratedMessage {
   static Handshake create() => Handshake._();
   @$core.override
   Handshake createEmptyInstance() => create();
-  static $pb.PbList<Handshake> createRepeated() => $pb.PbList<Handshake>();
   @$core.pragma('dart2js:noInline')
   static Handshake getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Handshake>(create);
   static Handshake? _defaultInstance;
 
+  @$pb.TagNumber(1)
+  @$pb.TagNumber(2)
+  @$pb.TagNumber(3)
+  @$pb.TagNumber(4)
+  @$pb.TagNumber(5)
   Handshake_Handshake whichHandshake() =>
       _Handshake_HandshakeByTag[$_whichOneof(0)]!;
+  @$pb.TagNumber(1)
+  @$pb.TagNumber(2)
+  @$pb.TagNumber(3)
+  @$pb.TagNumber(4)
+  @$pb.TagNumber(5)
   void clearHandshake() => $_clearField($_whichOneof(0));
 
   @$pb.TagNumber(1)
@@ -817,8 +817,7 @@ class ApplicationData_TextMessage extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_TextMessage clone() =>
-      ApplicationData_TextMessage()..mergeFromMessage(this);
+  ApplicationData_TextMessage clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_TextMessage copyWith(
           void Function(ApplicationData_TextMessage) updates) =>
@@ -834,8 +833,6 @@ class ApplicationData_TextMessage extends $pb.GeneratedMessage {
       ApplicationData_TextMessage._();
   @$core.override
   ApplicationData_TextMessage createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_TextMessage> createRepeated() =>
-      $pb.PbList<ApplicationData_TextMessage>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_TextMessage getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_TextMessage>(create);
@@ -897,8 +894,7 @@ class ApplicationData_GetUserByUsername extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_GetUserByUsername clone() =>
-      ApplicationData_GetUserByUsername()..mergeFromMessage(this);
+  ApplicationData_GetUserByUsername clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_GetUserByUsername copyWith(
           void Function(ApplicationData_GetUserByUsername) updates) =>
@@ -914,8 +910,6 @@ class ApplicationData_GetUserByUsername extends $pb.GeneratedMessage {
       ApplicationData_GetUserByUsername._();
   @$core.override
   ApplicationData_GetUserByUsername createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_GetUserByUsername> createRepeated() =>
-      $pb.PbList<ApplicationData_GetUserByUsername>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_GetUserByUsername getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_GetUserByUsername>(
@@ -959,8 +953,7 @@ class ApplicationData_ChangeUsername extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_ChangeUsername clone() =>
-      ApplicationData_ChangeUsername()..mergeFromMessage(this);
+  ApplicationData_ChangeUsername clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_ChangeUsername copyWith(
           void Function(ApplicationData_ChangeUsername) updates) =>
@@ -976,8 +969,6 @@ class ApplicationData_ChangeUsername extends $pb.GeneratedMessage {
       ApplicationData_ChangeUsername._();
   @$core.override
   ApplicationData_ChangeUsername createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_ChangeUsername> createRepeated() =>
-      $pb.PbList<ApplicationData_ChangeUsername>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_ChangeUsername getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_ChangeUsername>(create);
@@ -1021,8 +1012,7 @@ class ApplicationData_UpdateGoogleFcmToken extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_UpdateGoogleFcmToken clone() =>
-      ApplicationData_UpdateGoogleFcmToken()..mergeFromMessage(this);
+  ApplicationData_UpdateGoogleFcmToken clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_UpdateGoogleFcmToken copyWith(
           void Function(ApplicationData_UpdateGoogleFcmToken) updates) =>
@@ -1038,8 +1028,6 @@ class ApplicationData_UpdateGoogleFcmToken extends $pb.GeneratedMessage {
       ApplicationData_UpdateGoogleFcmToken._();
   @$core.override
   ApplicationData_UpdateGoogleFcmToken createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_UpdateGoogleFcmToken> createRepeated() =>
-      $pb.PbList<ApplicationData_UpdateGoogleFcmToken>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_UpdateGoogleFcmToken getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -1083,8 +1071,7 @@ class ApplicationData_GetUserById extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_GetUserById clone() =>
-      ApplicationData_GetUserById()..mergeFromMessage(this);
+  ApplicationData_GetUserById clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_GetUserById copyWith(
           void Function(ApplicationData_GetUserById) updates) =>
@@ -1100,8 +1087,6 @@ class ApplicationData_GetUserById extends $pb.GeneratedMessage {
       ApplicationData_GetUserById._();
   @$core.override
   ApplicationData_GetUserById createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_GetUserById> createRepeated() =>
-      $pb.PbList<ApplicationData_GetUserById>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_GetUserById getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_GetUserById>(create);
@@ -1144,8 +1129,7 @@ class ApplicationData_RedeemVoucher extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_RedeemVoucher clone() =>
-      ApplicationData_RedeemVoucher()..mergeFromMessage(this);
+  ApplicationData_RedeemVoucher clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_RedeemVoucher copyWith(
           void Function(ApplicationData_RedeemVoucher) updates) =>
@@ -1161,8 +1145,6 @@ class ApplicationData_RedeemVoucher extends $pb.GeneratedMessage {
       ApplicationData_RedeemVoucher._();
   @$core.override
   ApplicationData_RedeemVoucher createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_RedeemVoucher> createRepeated() =>
-      $pb.PbList<ApplicationData_RedeemVoucher>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_RedeemVoucher getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_RedeemVoucher>(create);
@@ -1212,8 +1194,7 @@ class ApplicationData_SwitchToPayedPlan extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_SwitchToPayedPlan clone() =>
-      ApplicationData_SwitchToPayedPlan()..mergeFromMessage(this);
+  ApplicationData_SwitchToPayedPlan clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_SwitchToPayedPlan copyWith(
           void Function(ApplicationData_SwitchToPayedPlan) updates) =>
@@ -1229,8 +1210,6 @@ class ApplicationData_SwitchToPayedPlan extends $pb.GeneratedMessage {
       ApplicationData_SwitchToPayedPlan._();
   @$core.override
   ApplicationData_SwitchToPayedPlan createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_SwitchToPayedPlan> createRepeated() =>
-      $pb.PbList<ApplicationData_SwitchToPayedPlan>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_SwitchToPayedPlan getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_SwitchToPayedPlan>(
@@ -1293,8 +1272,7 @@ class ApplicationData_UpdatePlanOptions extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_UpdatePlanOptions clone() =>
-      ApplicationData_UpdatePlanOptions()..mergeFromMessage(this);
+  ApplicationData_UpdatePlanOptions clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_UpdatePlanOptions copyWith(
           void Function(ApplicationData_UpdatePlanOptions) updates) =>
@@ -1310,8 +1288,6 @@ class ApplicationData_UpdatePlanOptions extends $pb.GeneratedMessage {
       ApplicationData_UpdatePlanOptions._();
   @$core.override
   ApplicationData_UpdatePlanOptions createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_UpdatePlanOptions> createRepeated() =>
-      $pb.PbList<ApplicationData_UpdatePlanOptions>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_UpdatePlanOptions getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_UpdatePlanOptions>(
@@ -1351,12 +1327,11 @@ class ApplicationData_CreateVoucher extends $pb.GeneratedMessage {
       package:
           const $pb.PackageName(_omitMessageNames ? '' : 'client_to_server'),
       createEmptyInstance: create)
-    ..a<$core.int>(1, _omitFieldNames ? '' : 'valueCents', $pb.PbFieldType.OU3)
+    ..aI(1, _omitFieldNames ? '' : 'valueCents', fieldType: $pb.PbFieldType.OU3)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_CreateVoucher clone() =>
-      ApplicationData_CreateVoucher()..mergeFromMessage(this);
+  ApplicationData_CreateVoucher clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_CreateVoucher copyWith(
           void Function(ApplicationData_CreateVoucher) updates) =>
@@ -1372,8 +1347,6 @@ class ApplicationData_CreateVoucher extends $pb.GeneratedMessage {
       ApplicationData_CreateVoucher._();
   @$core.override
   ApplicationData_CreateVoucher createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_CreateVoucher> createRepeated() =>
-      $pb.PbList<ApplicationData_CreateVoucher>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_CreateVoucher getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_CreateVoucher>(create);
@@ -1409,8 +1382,7 @@ class ApplicationData_GetLocation extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_GetLocation clone() =>
-      ApplicationData_GetLocation()..mergeFromMessage(this);
+  ApplicationData_GetLocation clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_GetLocation copyWith(
           void Function(ApplicationData_GetLocation) updates) =>
@@ -1426,8 +1398,6 @@ class ApplicationData_GetLocation extends $pb.GeneratedMessage {
       ApplicationData_GetLocation._();
   @$core.override
   ApplicationData_GetLocation createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_GetLocation> createRepeated() =>
-      $pb.PbList<ApplicationData_GetLocation>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_GetLocation getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_GetLocation>(create);
@@ -1454,8 +1424,7 @@ class ApplicationData_GetVouchers extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_GetVouchers clone() =>
-      ApplicationData_GetVouchers()..mergeFromMessage(this);
+  ApplicationData_GetVouchers clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_GetVouchers copyWith(
           void Function(ApplicationData_GetVouchers) updates) =>
@@ -1471,8 +1440,6 @@ class ApplicationData_GetVouchers extends $pb.GeneratedMessage {
       ApplicationData_GetVouchers._();
   @$core.override
   ApplicationData_GetVouchers createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_GetVouchers> createRepeated() =>
-      $pb.PbList<ApplicationData_GetVouchers>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_GetVouchers getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_GetVouchers>(create);
@@ -1500,8 +1467,7 @@ class ApplicationData_GetAvailablePlans extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_GetAvailablePlans clone() =>
-      ApplicationData_GetAvailablePlans()..mergeFromMessage(this);
+  ApplicationData_GetAvailablePlans clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_GetAvailablePlans copyWith(
           void Function(ApplicationData_GetAvailablePlans) updates) =>
@@ -1517,8 +1483,6 @@ class ApplicationData_GetAvailablePlans extends $pb.GeneratedMessage {
       ApplicationData_GetAvailablePlans._();
   @$core.override
   ApplicationData_GetAvailablePlans createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_GetAvailablePlans> createRepeated() =>
-      $pb.PbList<ApplicationData_GetAvailablePlans>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_GetAvailablePlans getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_GetAvailablePlans>(
@@ -1547,8 +1511,7 @@ class ApplicationData_GetAddAccountsInvites extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_GetAddAccountsInvites clone() =>
-      ApplicationData_GetAddAccountsInvites()..mergeFromMessage(this);
+  ApplicationData_GetAddAccountsInvites clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_GetAddAccountsInvites copyWith(
           void Function(ApplicationData_GetAddAccountsInvites) updates) =>
@@ -1564,8 +1527,6 @@ class ApplicationData_GetAddAccountsInvites extends $pb.GeneratedMessage {
       ApplicationData_GetAddAccountsInvites._();
   @$core.override
   ApplicationData_GetAddAccountsInvites createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_GetAddAccountsInvites> createRepeated() =>
-      $pb.PbList<ApplicationData_GetAddAccountsInvites>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_GetAddAccountsInvites getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -1594,8 +1555,7 @@ class ApplicationData_GetCurrentPlanInfos extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_GetCurrentPlanInfos clone() =>
-      ApplicationData_GetCurrentPlanInfos()..mergeFromMessage(this);
+  ApplicationData_GetCurrentPlanInfos clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_GetCurrentPlanInfos copyWith(
           void Function(ApplicationData_GetCurrentPlanInfos) updates) =>
@@ -1611,8 +1571,6 @@ class ApplicationData_GetCurrentPlanInfos extends $pb.GeneratedMessage {
       ApplicationData_GetCurrentPlanInfos._();
   @$core.override
   ApplicationData_GetCurrentPlanInfos createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_GetCurrentPlanInfos> createRepeated() =>
-      $pb.PbList<ApplicationData_GetCurrentPlanInfos>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_GetCurrentPlanInfos getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -1648,8 +1606,7 @@ class ApplicationData_RedeemAdditionalCode extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_RedeemAdditionalCode clone() =>
-      ApplicationData_RedeemAdditionalCode()..mergeFromMessage(this);
+  ApplicationData_RedeemAdditionalCode clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_RedeemAdditionalCode copyWith(
           void Function(ApplicationData_RedeemAdditionalCode) updates) =>
@@ -1665,8 +1622,6 @@ class ApplicationData_RedeemAdditionalCode extends $pb.GeneratedMessage {
       ApplicationData_RedeemAdditionalCode._();
   @$core.override
   ApplicationData_RedeemAdditionalCode createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_RedeemAdditionalCode> createRepeated() =>
-      $pb.PbList<ApplicationData_RedeemAdditionalCode>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_RedeemAdditionalCode getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -1711,8 +1666,7 @@ class ApplicationData_RemoveAdditionalUser extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_RemoveAdditionalUser clone() =>
-      ApplicationData_RemoveAdditionalUser()..mergeFromMessage(this);
+  ApplicationData_RemoveAdditionalUser clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_RemoveAdditionalUser copyWith(
           void Function(ApplicationData_RemoveAdditionalUser) updates) =>
@@ -1728,8 +1682,6 @@ class ApplicationData_RemoveAdditionalUser extends $pb.GeneratedMessage {
       ApplicationData_RemoveAdditionalUser._();
   @$core.override
   ApplicationData_RemoveAdditionalUser createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_RemoveAdditionalUser> createRepeated() =>
-      $pb.PbList<ApplicationData_RemoveAdditionalUser>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_RemoveAdditionalUser getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -1774,8 +1726,7 @@ class ApplicationData_GetPrekeysByUserId extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_GetPrekeysByUserId clone() =>
-      ApplicationData_GetPrekeysByUserId()..mergeFromMessage(this);
+  ApplicationData_GetPrekeysByUserId clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_GetPrekeysByUserId copyWith(
           void Function(ApplicationData_GetPrekeysByUserId) updates) =>
@@ -1791,8 +1742,6 @@ class ApplicationData_GetPrekeysByUserId extends $pb.GeneratedMessage {
       ApplicationData_GetPrekeysByUserId._();
   @$core.override
   ApplicationData_GetPrekeysByUserId createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_GetPrekeysByUserId> createRepeated() =>
-      $pb.PbList<ApplicationData_GetPrekeysByUserId>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_GetPrekeysByUserId getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_GetPrekeysByUserId>(
@@ -1837,8 +1786,7 @@ class ApplicationData_GetSignedPreKeyByUserId extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_GetSignedPreKeyByUserId clone() =>
-      ApplicationData_GetSignedPreKeyByUserId()..mergeFromMessage(this);
+  ApplicationData_GetSignedPreKeyByUserId clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_GetSignedPreKeyByUserId copyWith(
           void Function(ApplicationData_GetSignedPreKeyByUserId) updates) =>
@@ -1854,8 +1802,6 @@ class ApplicationData_GetSignedPreKeyByUserId extends $pb.GeneratedMessage {
       ApplicationData_GetSignedPreKeyByUserId._();
   @$core.override
   ApplicationData_GetSignedPreKeyByUserId createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_GetSignedPreKeyByUserId> createRepeated() =>
-      $pb.PbList<ApplicationData_GetSignedPreKeyByUserId>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_GetSignedPreKeyByUserId getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -1909,8 +1855,7 @@ class ApplicationData_UpdateSignedPreKey extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_UpdateSignedPreKey clone() =>
-      ApplicationData_UpdateSignedPreKey()..mergeFromMessage(this);
+  ApplicationData_UpdateSignedPreKey clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_UpdateSignedPreKey copyWith(
           void Function(ApplicationData_UpdateSignedPreKey) updates) =>
@@ -1926,8 +1871,6 @@ class ApplicationData_UpdateSignedPreKey extends $pb.GeneratedMessage {
       ApplicationData_UpdateSignedPreKey._();
   @$core.override
   ApplicationData_UpdateSignedPreKey createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_UpdateSignedPreKey> createRepeated() =>
-      $pb.PbList<ApplicationData_UpdateSignedPreKey>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_UpdateSignedPreKey getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_UpdateSignedPreKey>(
@@ -1991,8 +1934,7 @@ class ApplicationData_DownloadDone extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_DownloadDone clone() =>
-      ApplicationData_DownloadDone()..mergeFromMessage(this);
+  ApplicationData_DownloadDone clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_DownloadDone copyWith(
           void Function(ApplicationData_DownloadDone) updates) =>
@@ -2008,8 +1950,6 @@ class ApplicationData_DownloadDone extends $pb.GeneratedMessage {
       ApplicationData_DownloadDone._();
   @$core.override
   ApplicationData_DownloadDone createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_DownloadDone> createRepeated() =>
-      $pb.PbList<ApplicationData_DownloadDone>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_DownloadDone getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_DownloadDone>(create);
@@ -2055,8 +1995,7 @@ class ApplicationData_ReportUser extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_ReportUser clone() =>
-      ApplicationData_ReportUser()..mergeFromMessage(this);
+  ApplicationData_ReportUser clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_ReportUser copyWith(
           void Function(ApplicationData_ReportUser) updates) =>
@@ -2071,8 +2010,6 @@ class ApplicationData_ReportUser extends $pb.GeneratedMessage {
   static ApplicationData_ReportUser create() => ApplicationData_ReportUser._();
   @$core.override
   ApplicationData_ReportUser createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_ReportUser> createRepeated() =>
-      $pb.PbList<ApplicationData_ReportUser>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_ReportUser getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_ReportUser>(create);
@@ -2130,8 +2067,7 @@ class ApplicationData_IPAPurchase extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_IPAPurchase clone() =>
-      ApplicationData_IPAPurchase()..mergeFromMessage(this);
+  ApplicationData_IPAPurchase clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_IPAPurchase copyWith(
           void Function(ApplicationData_IPAPurchase) updates) =>
@@ -2147,8 +2083,6 @@ class ApplicationData_IPAPurchase extends $pb.GeneratedMessage {
       ApplicationData_IPAPurchase._();
   @$core.override
   ApplicationData_IPAPurchase createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_IPAPurchase> createRepeated() =>
-      $pb.PbList<ApplicationData_IPAPurchase>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_IPAPurchase getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_IPAPurchase>(create);
@@ -2202,8 +2136,7 @@ class ApplicationData_IPAForceCheck extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_IPAForceCheck clone() =>
-      ApplicationData_IPAForceCheck()..mergeFromMessage(this);
+  ApplicationData_IPAForceCheck clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_IPAForceCheck copyWith(
           void Function(ApplicationData_IPAForceCheck) updates) =>
@@ -2219,8 +2152,6 @@ class ApplicationData_IPAForceCheck extends $pb.GeneratedMessage {
       ApplicationData_IPAForceCheck._();
   @$core.override
   ApplicationData_IPAForceCheck createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_IPAForceCheck> createRepeated() =>
-      $pb.PbList<ApplicationData_IPAForceCheck>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_IPAForceCheck getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_IPAForceCheck>(create);
@@ -2247,8 +2178,7 @@ class ApplicationData_DeleteAccount extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_DeleteAccount clone() =>
-      ApplicationData_DeleteAccount()..mergeFromMessage(this);
+  ApplicationData_DeleteAccount clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_DeleteAccount copyWith(
           void Function(ApplicationData_DeleteAccount) updates) =>
@@ -2264,8 +2194,6 @@ class ApplicationData_DeleteAccount extends $pb.GeneratedMessage {
       ApplicationData_DeleteAccount._();
   @$core.override
   ApplicationData_DeleteAccount createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_DeleteAccount> createRepeated() =>
-      $pb.PbList<ApplicationData_DeleteAccount>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_DeleteAccount getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_DeleteAccount>(create);
@@ -2300,8 +2228,7 @@ class ApplicationData_AddAdditionalUser extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData_AddAdditionalUser clone() =>
-      ApplicationData_AddAdditionalUser()..mergeFromMessage(this);
+  ApplicationData_AddAdditionalUser clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData_AddAdditionalUser copyWith(
           void Function(ApplicationData_AddAdditionalUser) updates) =>
@@ -2317,8 +2244,6 @@ class ApplicationData_AddAdditionalUser extends $pb.GeneratedMessage {
       ApplicationData_AddAdditionalUser._();
   @$core.override
   ApplicationData_AddAdditionalUser createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData_AddAdditionalUser> createRepeated() =>
-      $pb.PbList<ApplicationData_AddAdditionalUser>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData_AddAdditionalUser getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData_AddAdditionalUser>(
@@ -2595,7 +2520,7 @@ class ApplicationData extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ApplicationData clone() => ApplicationData()..mergeFromMessage(this);
+  ApplicationData clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ApplicationData copyWith(void Function(ApplicationData) updates) =>
       super.copyWith((message) => updates(message as ApplicationData))
@@ -2608,15 +2533,63 @@ class ApplicationData extends $pb.GeneratedMessage {
   static ApplicationData create() => ApplicationData._();
   @$core.override
   ApplicationData createEmptyInstance() => create();
-  static $pb.PbList<ApplicationData> createRepeated() =>
-      $pb.PbList<ApplicationData>();
   @$core.pragma('dart2js:noInline')
   static ApplicationData getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ApplicationData>(create);
   static ApplicationData? _defaultInstance;
 
+  @$pb.TagNumber(1)
+  @$pb.TagNumber(2)
+  @$pb.TagNumber(3)
+  @$pb.TagNumber(6)
+  @$pb.TagNumber(8)
+  @$pb.TagNumber(9)
+  @$pb.TagNumber(10)
+  @$pb.TagNumber(11)
+  @$pb.TagNumber(12)
+  @$pb.TagNumber(13)
+  @$pb.TagNumber(14)
+  @$pb.TagNumber(15)
+  @$pb.TagNumber(16)
+  @$pb.TagNumber(17)
+  @$pb.TagNumber(18)
+  @$pb.TagNumber(19)
+  @$pb.TagNumber(20)
+  @$pb.TagNumber(22)
+  @$pb.TagNumber(23)
+  @$pb.TagNumber(24)
+  @$pb.TagNumber(25)
+  @$pb.TagNumber(26)
+  @$pb.TagNumber(27)
+  @$pb.TagNumber(28)
+  @$pb.TagNumber(29)
   ApplicationData_ApplicationData whichApplicationData() =>
       _ApplicationData_ApplicationDataByTag[$_whichOneof(0)]!;
+  @$pb.TagNumber(1)
+  @$pb.TagNumber(2)
+  @$pb.TagNumber(3)
+  @$pb.TagNumber(6)
+  @$pb.TagNumber(8)
+  @$pb.TagNumber(9)
+  @$pb.TagNumber(10)
+  @$pb.TagNumber(11)
+  @$pb.TagNumber(12)
+  @$pb.TagNumber(13)
+  @$pb.TagNumber(14)
+  @$pb.TagNumber(15)
+  @$pb.TagNumber(16)
+  @$pb.TagNumber(17)
+  @$pb.TagNumber(18)
+  @$pb.TagNumber(19)
+  @$pb.TagNumber(20)
+  @$pb.TagNumber(22)
+  @$pb.TagNumber(23)
+  @$pb.TagNumber(24)
+  @$pb.TagNumber(25)
+  @$pb.TagNumber(26)
+  @$pb.TagNumber(27)
+  @$pb.TagNumber(28)
+  @$pb.TagNumber(29)
   void clearApplicationData() => $_clearField($_whichOneof(0));
 
   @$pb.TagNumber(1)
@@ -2951,7 +2924,7 @@ class Response_PreKey extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_PreKey clone() => Response_PreKey()..mergeFromMessage(this);
+  Response_PreKey clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_PreKey copyWith(void Function(Response_PreKey) updates) =>
       super.copyWith((message) => updates(message as Response_PreKey))
@@ -2964,8 +2937,6 @@ class Response_PreKey extends $pb.GeneratedMessage {
   static Response_PreKey create() => Response_PreKey._();
   @$core.override
   Response_PreKey createEmptyInstance() => create();
-  static $pb.PbList<Response_PreKey> createRepeated() =>
-      $pb.PbList<Response_PreKey>();
   @$core.pragma('dart2js:noInline')
   static Response_PreKey getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_PreKey>(create);
@@ -3013,13 +2984,12 @@ class Response_Prekeys extends $pb.GeneratedMessage {
       package:
           const $pb.PackageName(_omitMessageNames ? '' : 'client_to_server'),
       createEmptyInstance: create)
-    ..pc<Response_PreKey>(
-        1, _omitFieldNames ? '' : 'prekeys', $pb.PbFieldType.PM,
+    ..pPM<Response_PreKey>(1, _omitFieldNames ? '' : 'prekeys',
         subBuilder: Response_PreKey.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_Prekeys clone() => Response_Prekeys()..mergeFromMessage(this);
+  Response_Prekeys clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_Prekeys copyWith(void Function(Response_Prekeys) updates) =>
       super.copyWith((message) => updates(message as Response_Prekeys))
@@ -3032,8 +3002,6 @@ class Response_Prekeys extends $pb.GeneratedMessage {
   static Response_Prekeys create() => Response_Prekeys._();
   @$core.override
   Response_Prekeys createEmptyInstance() => create();
-  static $pb.PbList<Response_Prekeys> createRepeated() =>
-      $pb.PbList<Response_Prekeys>();
   @$core.pragma('dart2js:noInline')
   static Response_Prekeys getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_Prekeys>(create);
@@ -3082,7 +3050,7 @@ class Response_Ok extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_Ok clone() => Response_Ok()..mergeFromMessage(this);
+  Response_Ok clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_Ok copyWith(void Function(Response_Ok) updates) =>
       super.copyWith((message) => updates(message as Response_Ok))
@@ -3095,13 +3063,16 @@ class Response_Ok extends $pb.GeneratedMessage {
   static Response_Ok create() => Response_Ok._();
   @$core.override
   Response_Ok createEmptyInstance() => create();
-  static $pb.PbList<Response_Ok> createRepeated() => $pb.PbList<Response_Ok>();
   @$core.pragma('dart2js:noInline')
   static Response_Ok getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_Ok>(create);
   static Response_Ok? _defaultInstance;
 
+  @$pb.TagNumber(1)
+  @$pb.TagNumber(2)
   Response_Ok_Ok whichOk() => _Response_Ok_OkByTag[$_whichOneof(0)]!;
+  @$pb.TagNumber(1)
+  @$pb.TagNumber(2)
   void clearOk() => $_clearField($_whichOneof(0));
 
   @$pb.TagNumber(1)
@@ -3161,14 +3132,12 @@ class Response extends $pb.GeneratedMessage {
     ..oo(0, [1, 2])
     ..aOM<Response_Ok>(1, _omitFieldNames ? '' : 'ok',
         subBuilder: Response_Ok.create)
-    ..e<$0.ErrorCode>(2, _omitFieldNames ? '' : 'error', $pb.PbFieldType.OE,
-        defaultOrMaker: $0.ErrorCode.Unknown,
-        valueOf: $0.ErrorCode.valueOf,
+    ..aE<$0.ErrorCode>(2, _omitFieldNames ? '' : 'error',
         enumValues: $0.ErrorCode.values)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response clone() => Response()..mergeFromMessage(this);
+  Response clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response copyWith(void Function(Response) updates) =>
       super.copyWith((message) => updates(message as Response)) as Response;
@@ -3180,14 +3149,17 @@ class Response extends $pb.GeneratedMessage {
   static Response create() => Response._();
   @$core.override
   Response createEmptyInstance() => create();
-  static $pb.PbList<Response> createRepeated() => $pb.PbList<Response>();
   @$core.pragma('dart2js:noInline')
   static Response getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Response>(create);
   static Response? _defaultInstance;
 
+  @$pb.TagNumber(1)
+  @$pb.TagNumber(2)
   Response_Response whichResponse() =>
       _Response_ResponseByTag[$_whichOneof(0)]!;
+  @$pb.TagNumber(1)
+  @$pb.TagNumber(2)
   void clearResponse() => $_clearField($_whichOneof(0));
 
   @$pb.TagNumber(1)
diff --git a/lib/src/model/protobuf/api/websocket/client_to_server.pbenum.dart b/lib/src/model/protobuf/api/websocket/client_to_server.pbenum.dart
index 69f2c043..72ce89f0 100644
--- a/lib/src/model/protobuf/api/websocket/client_to_server.pbenum.dart
+++ b/lib/src/model/protobuf/api/websocket/client_to_server.pbenum.dart
@@ -8,4 +8,4 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
diff --git a/lib/src/model/protobuf/api/websocket/client_to_server.pbjson.dart b/lib/src/model/protobuf/api/websocket/client_to_server.pbjson.dart
index 5a5620ff..a0b6812a 100644
--- a/lib/src/model/protobuf/api/websocket/client_to_server.pbjson.dart
+++ b/lib/src/model/protobuf/api/websocket/client_to_server.pbjson.dart
@@ -8,7 +8,8 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
diff --git a/lib/src/model/protobuf/api/websocket/error.pb.dart b/lib/src/model/protobuf/api/websocket/error.pb.dart
index 8bb10e07..9986e70c 100644
--- a/lib/src/model/protobuf/api/websocket/error.pb.dart
+++ b/lib/src/model/protobuf/api/websocket/error.pb.dart
@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
diff --git a/lib/src/model/protobuf/api/websocket/error.pbenum.dart b/lib/src/model/protobuf/api/websocket/error.pbenum.dart
index d8847c7e..6b30ef0a 100644
--- a/lib/src/model/protobuf/api/websocket/error.pbenum.dart
+++ b/lib/src/model/protobuf/api/websocket/error.pbenum.dart
@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
diff --git a/lib/src/model/protobuf/api/websocket/error.pbjson.dart b/lib/src/model/protobuf/api/websocket/error.pbjson.dart
index 8b5c4802..4f58fd73 100644
--- a/lib/src/model/protobuf/api/websocket/error.pbjson.dart
+++ b/lib/src/model/protobuf/api/websocket/error.pbjson.dart
@@ -8,7 +8,8 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
diff --git a/lib/src/model/protobuf/api/websocket/server_to_client.pb.dart b/lib/src/model/protobuf/api/websocket/server_to_client.pb.dart
index ce1e526d..499450f2 100644
--- a/lib/src/model/protobuf/api/websocket/server_to_client.pb.dart
+++ b/lib/src/model/protobuf/api/websocket/server_to_client.pb.dart
@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
@@ -57,7 +57,7 @@ class ServerToClient extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  ServerToClient clone() => ServerToClient()..mergeFromMessage(this);
+  ServerToClient clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   ServerToClient copyWith(void Function(ServerToClient) updates) =>
       super.copyWith((message) => updates(message as ServerToClient))
@@ -70,14 +70,14 @@ class ServerToClient extends $pb.GeneratedMessage {
   static ServerToClient create() => ServerToClient._();
   @$core.override
   ServerToClient createEmptyInstance() => create();
-  static $pb.PbList<ServerToClient> createRepeated() =>
-      $pb.PbList<ServerToClient>();
   @$core.pragma('dart2js:noInline')
   static ServerToClient getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<ServerToClient>(create);
   static ServerToClient? _defaultInstance;
 
+  @$pb.TagNumber(1)
   ServerToClient_V whichV() => _ServerToClient_VByTag[$_whichOneof(0)]!;
+  @$pb.TagNumber(1)
   void clearV() => $_clearField($_whichOneof(0));
 
   @$pb.TagNumber(1)
@@ -151,16 +151,14 @@ class V0 extends $pb.GeneratedMessage {
         protoName: 'newMessage', subBuilder: NewMessage.create)
     ..aOB(4, _omitFieldNames ? '' : 'RequestNewPreKeys',
         protoName: 'RequestNewPreKeys')
-    ..e<$0.ErrorCode>(6, _omitFieldNames ? '' : 'error', $pb.PbFieldType.OE,
-        defaultOrMaker: $0.ErrorCode.Unknown,
-        valueOf: $0.ErrorCode.valueOf,
+    ..aE<$0.ErrorCode>(6, _omitFieldNames ? '' : 'error',
         enumValues: $0.ErrorCode.values)
     ..aOM<NewMessages>(7, _omitFieldNames ? '' : 'newMessages',
         protoName: 'newMessages', subBuilder: NewMessages.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  V0 clone() => V0()..mergeFromMessage(this);
+  V0 clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   V0 copyWith(void Function(V0) updates) =>
       super.copyWith((message) => updates(message as V0)) as V0;
@@ -172,13 +170,22 @@ class V0 extends $pb.GeneratedMessage {
   static V0 create() => V0._();
   @$core.override
   V0 createEmptyInstance() => create();
-  static $pb.PbList<V0> createRepeated() => $pb.PbList<V0>();
   @$core.pragma('dart2js:noInline')
   static V0 getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<V0>(create);
   static V0? _defaultInstance;
 
+  @$pb.TagNumber(2)
+  @$pb.TagNumber(3)
+  @$pb.TagNumber(4)
+  @$pb.TagNumber(6)
+  @$pb.TagNumber(7)
   V0_Kind whichKind() => _V0_KindByTag[$_whichOneof(0)]!;
+  @$pb.TagNumber(2)
+  @$pb.TagNumber(3)
+  @$pb.TagNumber(4)
+  @$pb.TagNumber(6)
+  @$pb.TagNumber(7)
   void clearKind() => $_clearField($_whichOneof(0));
 
   @$pb.TagNumber(1)
@@ -273,7 +280,7 @@ class NewMessage extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  NewMessage clone() => NewMessage()..mergeFromMessage(this);
+  NewMessage clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   NewMessage copyWith(void Function(NewMessage) updates) =>
       super.copyWith((message) => updates(message as NewMessage)) as NewMessage;
@@ -285,7 +292,6 @@ class NewMessage extends $pb.GeneratedMessage {
   static NewMessage create() => NewMessage._();
   @$core.override
   NewMessage createEmptyInstance() => create();
-  static $pb.PbList<NewMessage> createRepeated() => $pb.PbList<NewMessage>();
   @$core.pragma('dart2js:noInline')
   static NewMessage getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<NewMessage>(create);
@@ -333,13 +339,12 @@ class NewMessages extends $pb.GeneratedMessage {
       package:
           const $pb.PackageName(_omitMessageNames ? '' : 'server_to_client'),
       createEmptyInstance: create)
-    ..pc<NewMessage>(
-        1, _omitFieldNames ? '' : 'newMessages', $pb.PbFieldType.PM,
+    ..pPM<NewMessage>(1, _omitFieldNames ? '' : 'newMessages',
         protoName: 'newMessages', subBuilder: NewMessage.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  NewMessages clone() => NewMessages()..mergeFromMessage(this);
+  NewMessages clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   NewMessages copyWith(void Function(NewMessages) updates) =>
       super.copyWith((message) => updates(message as NewMessages))
@@ -352,7 +357,6 @@ class NewMessages extends $pb.GeneratedMessage {
   static NewMessages create() => NewMessages._();
   @$core.override
   NewMessages createEmptyInstance() => create();
-  static $pb.PbList<NewMessages> createRepeated() => $pb.PbList<NewMessages>();
   @$core.pragma('dart2js:noInline')
   static NewMessages getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<NewMessages>(create);
@@ -389,8 +393,7 @@ class Response_Authenticated extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_Authenticated clone() =>
-      Response_Authenticated()..mergeFromMessage(this);
+  Response_Authenticated clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_Authenticated copyWith(
           void Function(Response_Authenticated) updates) =>
@@ -404,8 +407,6 @@ class Response_Authenticated extends $pb.GeneratedMessage {
   static Response_Authenticated create() => Response_Authenticated._();
   @$core.override
   Response_Authenticated createEmptyInstance() => create();
-  static $pb.PbList<Response_Authenticated> createRepeated() =>
-      $pb.PbList<Response_Authenticated>();
   @$core.pragma('dart2js:noInline')
   static Response_Authenticated getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_Authenticated>(create);
@@ -478,7 +479,7 @@ class Response_Plan extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_Plan clone() => Response_Plan()..mergeFromMessage(this);
+  Response_Plan clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_Plan copyWith(void Function(Response_Plan) updates) =>
       super.copyWith((message) => updates(message as Response_Plan))
@@ -491,8 +492,6 @@ class Response_Plan extends $pb.GeneratedMessage {
   static Response_Plan create() => Response_Plan._();
   @$core.override
   Response_Plan createEmptyInstance() => create();
-  static $pb.PbList<Response_Plan> createRepeated() =>
-      $pb.PbList<Response_Plan>();
   @$core.pragma('dart2js:noInline')
   static Response_Plan getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_Plan>(create);
@@ -604,12 +603,12 @@ class Response_Plans extends $pb.GeneratedMessage {
       package:
           const $pb.PackageName(_omitMessageNames ? '' : 'server_to_client'),
       createEmptyInstance: create)
-    ..pc<Response_Plan>(1, _omitFieldNames ? '' : 'plans', $pb.PbFieldType.PM,
+    ..pPM<Response_Plan>(1, _omitFieldNames ? '' : 'plans',
         subBuilder: Response_Plan.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_Plans clone() => Response_Plans()..mergeFromMessage(this);
+  Response_Plans clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_Plans copyWith(void Function(Response_Plans) updates) =>
       super.copyWith((message) => updates(message as Response_Plans))
@@ -622,8 +621,6 @@ class Response_Plans extends $pb.GeneratedMessage {
   static Response_Plans create() => Response_Plans._();
   @$core.override
   Response_Plans createEmptyInstance() => create();
-  static $pb.PbList<Response_Plans> createRepeated() =>
-      $pb.PbList<Response_Plans>();
   @$core.pragma('dart2js:noInline')
   static Response_Plans getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_Plans>(create);
@@ -663,8 +660,7 @@ class Response_AddAccountsInvite extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_AddAccountsInvite clone() =>
-      Response_AddAccountsInvite()..mergeFromMessage(this);
+  Response_AddAccountsInvite clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_AddAccountsInvite copyWith(
           void Function(Response_AddAccountsInvite) updates) =>
@@ -679,8 +675,6 @@ class Response_AddAccountsInvite extends $pb.GeneratedMessage {
   static Response_AddAccountsInvite create() => Response_AddAccountsInvite._();
   @$core.override
   Response_AddAccountsInvite createEmptyInstance() => create();
-  static $pb.PbList<Response_AddAccountsInvite> createRepeated() =>
-      $pb.PbList<Response_AddAccountsInvite>();
   @$core.pragma('dart2js:noInline')
   static Response_AddAccountsInvite getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_AddAccountsInvite>(create);
@@ -728,14 +722,12 @@ class Response_AddAccountsInvites extends $pb.GeneratedMessage {
       package:
           const $pb.PackageName(_omitMessageNames ? '' : 'server_to_client'),
       createEmptyInstance: create)
-    ..pc<Response_AddAccountsInvite>(
-        1, _omitFieldNames ? '' : 'invites', $pb.PbFieldType.PM,
+    ..pPM<Response_AddAccountsInvite>(1, _omitFieldNames ? '' : 'invites',
         subBuilder: Response_AddAccountsInvite.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_AddAccountsInvites clone() =>
-      Response_AddAccountsInvites()..mergeFromMessage(this);
+  Response_AddAccountsInvites clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_AddAccountsInvites copyWith(
           void Function(Response_AddAccountsInvites) updates) =>
@@ -751,8 +743,6 @@ class Response_AddAccountsInvites extends $pb.GeneratedMessage {
       Response_AddAccountsInvites._();
   @$core.override
   Response_AddAccountsInvites createEmptyInstance() => create();
-  static $pb.PbList<Response_AddAccountsInvites> createRepeated() =>
-      $pb.PbList<Response_AddAccountsInvites>();
   @$core.pragma('dart2js:noInline')
   static Response_AddAccountsInvites getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_AddAccountsInvites>(create);
@@ -791,17 +781,13 @@ class Response_Transaction extends $pb.GeneratedMessage {
           const $pb.PackageName(_omitMessageNames ? '' : 'server_to_client'),
       createEmptyInstance: create)
     ..aInt64(1, _omitFieldNames ? '' : 'depositCents')
-    ..e<Response_TransactionTypes>(
-        2, _omitFieldNames ? '' : 'transactionType', $pb.PbFieldType.OE,
-        defaultOrMaker: Response_TransactionTypes.Refund,
-        valueOf: Response_TransactionTypes.valueOf,
+    ..aE<Response_TransactionTypes>(2, _omitFieldNames ? '' : 'transactionType',
         enumValues: Response_TransactionTypes.values)
     ..aInt64(3, _omitFieldNames ? '' : 'createdAtUnixTimestamp')
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_Transaction clone() =>
-      Response_Transaction()..mergeFromMessage(this);
+  Response_Transaction clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_Transaction copyWith(void Function(Response_Transaction) updates) =>
       super.copyWith((message) => updates(message as Response_Transaction))
@@ -814,8 +800,6 @@ class Response_Transaction extends $pb.GeneratedMessage {
   static Response_Transaction create() => Response_Transaction._();
   @$core.override
   Response_Transaction createEmptyInstance() => create();
-  static $pb.PbList<Response_Transaction> createRepeated() =>
-      $pb.PbList<Response_Transaction>();
   @$core.pragma('dart2js:noInline')
   static Response_Transaction getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_Transaction>(create);
@@ -882,8 +866,7 @@ class Response_AdditionalAccount extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_AdditionalAccount clone() =>
-      Response_AdditionalAccount()..mergeFromMessage(this);
+  Response_AdditionalAccount clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_AdditionalAccount copyWith(
           void Function(Response_AdditionalAccount) updates) =>
@@ -898,8 +881,6 @@ class Response_AdditionalAccount extends $pb.GeneratedMessage {
   static Response_AdditionalAccount create() => Response_AdditionalAccount._();
   @$core.override
   Response_AdditionalAccount createEmptyInstance() => create();
-  static $pb.PbList<Response_AdditionalAccount> createRepeated() =>
-      $pb.PbList<Response_AdditionalAccount>();
   @$core.pragma('dart2js:noInline')
   static Response_AdditionalAccount getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_AdditionalAccount>(create);
@@ -964,7 +945,7 @@ class Response_Voucher extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_Voucher clone() => Response_Voucher()..mergeFromMessage(this);
+  Response_Voucher clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_Voucher copyWith(void Function(Response_Voucher) updates) =>
       super.copyWith((message) => updates(message as Response_Voucher))
@@ -977,8 +958,6 @@ class Response_Voucher extends $pb.GeneratedMessage {
   static Response_Voucher create() => Response_Voucher._();
   @$core.override
   Response_Voucher createEmptyInstance() => create();
-  static $pb.PbList<Response_Voucher> createRepeated() =>
-      $pb.PbList<Response_Voucher>();
   @$core.pragma('dart2js:noInline')
   static Response_Voucher getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_Voucher>(create);
@@ -1053,13 +1032,12 @@ class Response_Vouchers extends $pb.GeneratedMessage {
       package:
           const $pb.PackageName(_omitMessageNames ? '' : 'server_to_client'),
       createEmptyInstance: create)
-    ..pc<Response_Voucher>(
-        1, _omitFieldNames ? '' : 'vouchers', $pb.PbFieldType.PM,
+    ..pPM<Response_Voucher>(1, _omitFieldNames ? '' : 'vouchers',
         subBuilder: Response_Voucher.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_Vouchers clone() => Response_Vouchers()..mergeFromMessage(this);
+  Response_Vouchers clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_Vouchers copyWith(void Function(Response_Vouchers) updates) =>
       super.copyWith((message) => updates(message as Response_Vouchers))
@@ -1072,8 +1050,6 @@ class Response_Vouchers extends $pb.GeneratedMessage {
   static Response_Vouchers create() => Response_Vouchers._();
   @$core.override
   Response_Vouchers createEmptyInstance() => create();
-  static $pb.PbList<Response_Vouchers> createRepeated() =>
-      $pb.PbList<Response_Vouchers>();
   @$core.pragma('dart2js:noInline')
   static Response_Vouchers getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_Vouchers>(create);
@@ -1129,19 +1105,17 @@ class Response_PlanBallance extends $pb.GeneratedMessage {
     ..aInt64(2, _omitFieldNames ? '' : 'usedUploadMediaSizeLimit')
     ..aInt64(3, _omitFieldNames ? '' : 'paymentPeriodDays')
     ..aInt64(4, _omitFieldNames ? '' : 'lastPaymentDoneUnixTimestamp')
-    ..pc<Response_Transaction>(
-        5, _omitFieldNames ? '' : 'transactions', $pb.PbFieldType.PM,
+    ..pPM<Response_Transaction>(5, _omitFieldNames ? '' : 'transactions',
         subBuilder: Response_Transaction.create)
-    ..pc<Response_AdditionalAccount>(
-        6, _omitFieldNames ? '' : 'additionalAccounts', $pb.PbFieldType.PM,
+    ..pPM<Response_AdditionalAccount>(
+        6, _omitFieldNames ? '' : 'additionalAccounts',
         subBuilder: Response_AdditionalAccount.create)
     ..aOB(7, _omitFieldNames ? '' : 'autoRenewal')
     ..aInt64(8, _omitFieldNames ? '' : 'additionalAccountOwnerId')
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_PlanBallance clone() =>
-      Response_PlanBallance()..mergeFromMessage(this);
+  Response_PlanBallance clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_PlanBallance copyWith(
           void Function(Response_PlanBallance) updates) =>
@@ -1155,8 +1129,6 @@ class Response_PlanBallance extends $pb.GeneratedMessage {
   static Response_PlanBallance create() => Response_PlanBallance._();
   @$core.override
   Response_PlanBallance createEmptyInstance() => create();
-  static $pb.PbList<Response_PlanBallance> createRepeated() =>
-      $pb.PbList<Response_PlanBallance>();
   @$core.pragma('dart2js:noInline')
   static Response_PlanBallance getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_PlanBallance>(create);
@@ -1256,7 +1228,7 @@ class Response_Location extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_Location clone() => Response_Location()..mergeFromMessage(this);
+  Response_Location clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_Location copyWith(void Function(Response_Location) updates) =>
       super.copyWith((message) => updates(message as Response_Location))
@@ -1269,8 +1241,6 @@ class Response_Location extends $pb.GeneratedMessage {
   static Response_Location create() => Response_Location._();
   @$core.override
   Response_Location createEmptyInstance() => create();
-  static $pb.PbList<Response_Location> createRepeated() =>
-      $pb.PbList<Response_Location>();
   @$core.pragma('dart2js:noInline')
   static Response_Location getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_Location>(create);
@@ -1335,7 +1305,7 @@ class Response_PreKey extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_PreKey clone() => Response_PreKey()..mergeFromMessage(this);
+  Response_PreKey clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_PreKey copyWith(void Function(Response_PreKey) updates) =>
       super.copyWith((message) => updates(message as Response_PreKey))
@@ -1348,8 +1318,6 @@ class Response_PreKey extends $pb.GeneratedMessage {
   static Response_PreKey create() => Response_PreKey._();
   @$core.override
   Response_PreKey createEmptyInstance() => create();
-  static $pb.PbList<Response_PreKey> createRepeated() =>
-      $pb.PbList<Response_PreKey>();
   @$core.pragma('dart2js:noInline')
   static Response_PreKey getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_PreKey>(create);
@@ -1410,8 +1378,7 @@ class Response_SignedPreKey extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_SignedPreKey clone() =>
-      Response_SignedPreKey()..mergeFromMessage(this);
+  Response_SignedPreKey clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_SignedPreKey copyWith(
           void Function(Response_SignedPreKey) updates) =>
@@ -1425,8 +1392,6 @@ class Response_SignedPreKey extends $pb.GeneratedMessage {
   static Response_SignedPreKey create() => Response_SignedPreKey._();
   @$core.override
   Response_SignedPreKey createEmptyInstance() => create();
-  static $pb.PbList<Response_SignedPreKey> createRepeated() =>
-      $pb.PbList<Response_SignedPreKey>();
   @$core.pragma('dart2js:noInline')
   static Response_SignedPreKey getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_SignedPreKey>(create);
@@ -1500,8 +1465,7 @@ class Response_UserData extends $pb.GeneratedMessage {
           const $pb.PackageName(_omitMessageNames ? '' : 'server_to_client'),
       createEmptyInstance: create)
     ..aInt64(1, _omitFieldNames ? '' : 'userId')
-    ..pc<Response_PreKey>(
-        2, _omitFieldNames ? '' : 'prekeys', $pb.PbFieldType.PM,
+    ..pPM<Response_PreKey>(2, _omitFieldNames ? '' : 'prekeys',
         subBuilder: Response_PreKey.create)
     ..a<$core.List<$core.int>>(
         3, _omitFieldNames ? '' : 'publicIdentityKey', $pb.PbFieldType.OY)
@@ -1516,7 +1480,7 @@ class Response_UserData extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_UserData clone() => Response_UserData()..mergeFromMessage(this);
+  Response_UserData clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_UserData copyWith(void Function(Response_UserData) updates) =>
       super.copyWith((message) => updates(message as Response_UserData))
@@ -1529,8 +1493,6 @@ class Response_UserData extends $pb.GeneratedMessage {
   static Response_UserData create() => Response_UserData._();
   @$core.override
   Response_UserData createEmptyInstance() => create();
-  static $pb.PbList<Response_UserData> createRepeated() =>
-      $pb.PbList<Response_UserData>();
   @$core.pragma('dart2js:noInline')
   static Response_UserData getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_UserData>(create);
@@ -1636,8 +1598,7 @@ class Response_UploadToken extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_UploadToken clone() =>
-      Response_UploadToken()..mergeFromMessage(this);
+  Response_UploadToken clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_UploadToken copyWith(void Function(Response_UploadToken) updates) =>
       super.copyWith((message) => updates(message as Response_UploadToken))
@@ -1650,8 +1611,6 @@ class Response_UploadToken extends $pb.GeneratedMessage {
   static Response_UploadToken create() => Response_UploadToken._();
   @$core.override
   Response_UploadToken createEmptyInstance() => create();
-  static $pb.PbList<Response_UploadToken> createRepeated() =>
-      $pb.PbList<Response_UploadToken>();
   @$core.pragma('dart2js:noInline')
   static Response_UploadToken getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_UploadToken>(create);
@@ -1698,8 +1657,7 @@ class Response_DownloadTokens extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_DownloadTokens clone() =>
-      Response_DownloadTokens()..mergeFromMessage(this);
+  Response_DownloadTokens clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_DownloadTokens copyWith(
           void Function(Response_DownloadTokens) updates) =>
@@ -1713,8 +1671,6 @@ class Response_DownloadTokens extends $pb.GeneratedMessage {
   static Response_DownloadTokens create() => Response_DownloadTokens._();
   @$core.override
   Response_DownloadTokens createEmptyInstance() => create();
-  static $pb.PbList<Response_DownloadTokens> createRepeated() =>
-      $pb.PbList<Response_DownloadTokens>();
   @$core.pragma('dart2js:noInline')
   static Response_DownloadTokens getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_DownloadTokens>(create);
@@ -1754,8 +1710,7 @@ class Response_ProofOfWork extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_ProofOfWork clone() =>
-      Response_ProofOfWork()..mergeFromMessage(this);
+  Response_ProofOfWork clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_ProofOfWork copyWith(void Function(Response_ProofOfWork) updates) =>
       super.copyWith((message) => updates(message as Response_ProofOfWork))
@@ -1768,8 +1723,6 @@ class Response_ProofOfWork extends $pb.GeneratedMessage {
   static Response_ProofOfWork create() => Response_ProofOfWork._();
   @$core.override
   Response_ProofOfWork createEmptyInstance() => create();
-  static $pb.PbList<Response_ProofOfWork> createRepeated() =>
-      $pb.PbList<Response_ProofOfWork>();
   @$core.pragma('dart2js:noInline')
   static Response_ProofOfWork getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_ProofOfWork>(create);
@@ -1916,7 +1869,7 @@ class Response_Ok extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response_Ok clone() => Response_Ok()..mergeFromMessage(this);
+  Response_Ok clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response_Ok copyWith(void Function(Response_Ok) updates) =>
       super.copyWith((message) => updates(message as Response_Ok))
@@ -1929,13 +1882,42 @@ class Response_Ok extends $pb.GeneratedMessage {
   static Response_Ok create() => Response_Ok._();
   @$core.override
   Response_Ok createEmptyInstance() => create();
-  static $pb.PbList<Response_Ok> createRepeated() => $pb.PbList<Response_Ok>();
   @$core.pragma('dart2js:noInline')
   static Response_Ok getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<Response_Ok>(create);
   static Response_Ok? _defaultInstance;
 
+  @$pb.TagNumber(1)
+  @$pb.TagNumber(2)
+  @$pb.TagNumber(3)
+  @$pb.TagNumber(4)
+  @$pb.TagNumber(5)
+  @$pb.TagNumber(6)
+  @$pb.TagNumber(7)
+  @$pb.TagNumber(8)
+  @$pb.TagNumber(9)
+  @$pb.TagNumber(10)
+  @$pb.TagNumber(11)
+  @$pb.TagNumber(12)
+  @$pb.TagNumber(13)
+  @$pb.TagNumber(14)
+  @$pb.TagNumber(15)
   Response_Ok_Ok whichOk() => _Response_Ok_OkByTag[$_whichOneof(0)]!;
+  @$pb.TagNumber(1)
+  @$pb.TagNumber(2)
+  @$pb.TagNumber(3)
+  @$pb.TagNumber(4)
+  @$pb.TagNumber(5)
+  @$pb.TagNumber(6)
+  @$pb.TagNumber(7)
+  @$pb.TagNumber(8)
+  @$pb.TagNumber(9)
+  @$pb.TagNumber(10)
+  @$pb.TagNumber(11)
+  @$pb.TagNumber(12)
+  @$pb.TagNumber(13)
+  @$pb.TagNumber(14)
+  @$pb.TagNumber(15)
   void clearOk() => $_clearField($_whichOneof(0));
 
   @$pb.TagNumber(1)
@@ -2133,14 +2115,12 @@ class Response extends $pb.GeneratedMessage {
     ..oo(0, [1, 2])
     ..aOM<Response_Ok>(1, _omitFieldNames ? '' : 'ok',
         subBuilder: Response_Ok.create)
-    ..e<$0.ErrorCode>(2, _omitFieldNames ? '' : 'error', $pb.PbFieldType.OE,
-        defaultOrMaker: $0.ErrorCode.Unknown,
-        valueOf: $0.ErrorCode.valueOf,
+    ..aE<$0.ErrorCode>(2, _omitFieldNames ? '' : 'error',
         enumValues: $0.ErrorCode.values)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Response clone() => Response()..mergeFromMessage(this);
+  Response clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Response copyWith(void Function(Response) updates) =>
       super.copyWith((message) => updates(message as Response)) as Response;
@@ -2152,14 +2132,17 @@ class Response extends $pb.GeneratedMessage {
   static Response create() => Response._();
   @$core.override
   Response createEmptyInstance() => create();
-  static $pb.PbList<Response> createRepeated() => $pb.PbList<Response>();
   @$core.pragma('dart2js:noInline')
   static Response getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Response>(create);
   static Response? _defaultInstance;
 
+  @$pb.TagNumber(1)
+  @$pb.TagNumber(2)
   Response_Response whichResponse() =>
       _Response_ResponseByTag[$_whichOneof(0)]!;
+  @$pb.TagNumber(1)
+  @$pb.TagNumber(2)
   void clearResponse() => $_clearField($_whichOneof(0));
 
   @$pb.TagNumber(1)
diff --git a/lib/src/model/protobuf/api/websocket/server_to_client.pbenum.dart b/lib/src/model/protobuf/api/websocket/server_to_client.pbenum.dart
index 768895f1..6f9554a5 100644
--- a/lib/src/model/protobuf/api/websocket/server_to_client.pbenum.dart
+++ b/lib/src/model/protobuf/api/websocket/server_to_client.pbenum.dart
@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
diff --git a/lib/src/model/protobuf/api/websocket/server_to_client.pbjson.dart b/lib/src/model/protobuf/api/websocket/server_to_client.pbjson.dart
index 8139c89f..d71c7ea1 100644
--- a/lib/src/model/protobuf/api/websocket/server_to_client.pbjson.dart
+++ b/lib/src/model/protobuf/api/websocket/server_to_client.pbjson.dart
@@ -8,7 +8,8 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
diff --git a/lib/src/model/protobuf/client/backup.proto b/lib/src/model/protobuf/client/backup.proto
index 0a09bfd3..e3fa952c 100644
--- a/lib/src/model/protobuf/client/backup.proto
+++ b/lib/src/model/protobuf/client/backup.proto
@@ -1,12 +1,12 @@
 syntax = "proto3";
 
 message TwonlySafeBackupContent {
-    string secureStorageJson = 1;
-    bytes twonlyDatabase = 2;
+  string secure_storage_json = 1;
+  bytes  twonly_database     = 2;
 }
 
 message TwonlySafeBackupEncrypted {
-    bytes mac = 1;
-    bytes nonce = 2;
-    bytes cipherText = 3;
+  bytes mac         = 1;
+  bytes nonce       = 2;
+  bytes cipher_text = 3;
 }
\ No newline at end of file
diff --git a/lib/src/model/protobuf/client/generated/backup.pb.dart b/lib/src/model/protobuf/client/generated/backup.pb.dart
index 7f8b1140..576ea5c1 100644
--- a/lib/src/model/protobuf/client/generated/backup.pb.dart
+++ b/lib/src/model/protobuf/client/generated/backup.pb.dart
@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
@@ -39,16 +39,13 @@ class TwonlySafeBackupContent extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'TwonlySafeBackupContent',
       createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'secureStorageJson',
-        protoName: 'secureStorageJson')
+    ..aOS(1, _omitFieldNames ? '' : 'secureStorageJson')
     ..a<$core.List<$core.int>>(
-        2, _omitFieldNames ? '' : 'twonlyDatabase', $pb.PbFieldType.OY,
-        protoName: 'twonlyDatabase')
+        2, _omitFieldNames ? '' : 'twonlyDatabase', $pb.PbFieldType.OY)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  TwonlySafeBackupContent clone() =>
-      TwonlySafeBackupContent()..mergeFromMessage(this);
+  TwonlySafeBackupContent clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   TwonlySafeBackupContent copyWith(
           void Function(TwonlySafeBackupContent) updates) =>
@@ -62,8 +59,6 @@ class TwonlySafeBackupContent extends $pb.GeneratedMessage {
   static TwonlySafeBackupContent create() => TwonlySafeBackupContent._();
   @$core.override
   TwonlySafeBackupContent createEmptyInstance() => create();
-  static $pb.PbList<TwonlySafeBackupContent> createRepeated() =>
-      $pb.PbList<TwonlySafeBackupContent>();
   @$core.pragma('dart2js:noInline')
   static TwonlySafeBackupContent getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<TwonlySafeBackupContent>(create);
@@ -118,13 +113,11 @@ class TwonlySafeBackupEncrypted extends $pb.GeneratedMessage {
     ..a<$core.List<$core.int>>(
         2, _omitFieldNames ? '' : 'nonce', $pb.PbFieldType.OY)
     ..a<$core.List<$core.int>>(
-        3, _omitFieldNames ? '' : 'cipherText', $pb.PbFieldType.OY,
-        protoName: 'cipherText')
+        3, _omitFieldNames ? '' : 'cipherText', $pb.PbFieldType.OY)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  TwonlySafeBackupEncrypted clone() =>
-      TwonlySafeBackupEncrypted()..mergeFromMessage(this);
+  TwonlySafeBackupEncrypted clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   TwonlySafeBackupEncrypted copyWith(
           void Function(TwonlySafeBackupEncrypted) updates) =>
@@ -138,8 +131,6 @@ class TwonlySafeBackupEncrypted extends $pb.GeneratedMessage {
   static TwonlySafeBackupEncrypted create() => TwonlySafeBackupEncrypted._();
   @$core.override
   TwonlySafeBackupEncrypted createEmptyInstance() => create();
-  static $pb.PbList<TwonlySafeBackupEncrypted> createRepeated() =>
-      $pb.PbList<TwonlySafeBackupEncrypted>();
   @$core.pragma('dart2js:noInline')
   static TwonlySafeBackupEncrypted getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<TwonlySafeBackupEncrypted>(create);
diff --git a/lib/src/model/protobuf/client/generated/backup.pbenum.dart b/lib/src/model/protobuf/client/generated/backup.pbenum.dart
index 14777307..ba33923e 100644
--- a/lib/src/model/protobuf/client/generated/backup.pbenum.dart
+++ b/lib/src/model/protobuf/client/generated/backup.pbenum.dart
@@ -8,4 +8,4 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
diff --git a/lib/src/model/protobuf/client/generated/backup.pbjson.dart b/lib/src/model/protobuf/client/generated/backup.pbjson.dart
index d084021e..ad11d857 100644
--- a/lib/src/model/protobuf/client/generated/backup.pbjson.dart
+++ b/lib/src/model/protobuf/client/generated/backup.pbjson.dart
@@ -8,7 +8,8 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -19,20 +20,21 @@ const TwonlySafeBackupContent$json = {
   '1': 'TwonlySafeBackupContent',
   '2': [
     {
-      '1': 'secureStorageJson',
+      '1': 'secure_storage_json',
       '3': 1,
       '4': 1,
       '5': 9,
       '10': 'secureStorageJson'
     },
-    {'1': 'twonlyDatabase', '3': 2, '4': 1, '5': 12, '10': 'twonlyDatabase'},
+    {'1': 'twonly_database', '3': 2, '4': 1, '5': 12, '10': 'twonlyDatabase'},
   ],
 };
 
 /// Descriptor for `TwonlySafeBackupContent`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List twonlySafeBackupContentDescriptor = $convert.base64Decode(
-    'ChdUd29ubHlTYWZlQmFja3VwQ29udGVudBIsChFzZWN1cmVTdG9yYWdlSnNvbhgBIAEoCVIRc2'
-    'VjdXJlU3RvcmFnZUpzb24SJgoOdHdvbmx5RGF0YWJhc2UYAiABKAxSDnR3b25seURhdGFiYXNl');
+    'ChdUd29ubHlTYWZlQmFja3VwQ29udGVudBIuChNzZWN1cmVfc3RvcmFnZV9qc29uGAEgASgJUh'
+    'FzZWN1cmVTdG9yYWdlSnNvbhInCg90d29ubHlfZGF0YWJhc2UYAiABKAxSDnR3b25seURhdGFi'
+    'YXNl');
 
 @$core.Deprecated('Use twonlySafeBackupEncryptedDescriptor instead')
 const TwonlySafeBackupEncrypted$json = {
@@ -40,7 +42,7 @@ const TwonlySafeBackupEncrypted$json = {
   '2': [
     {'1': 'mac', '3': 1, '4': 1, '5': 12, '10': 'mac'},
     {'1': 'nonce', '3': 2, '4': 1, '5': 12, '10': 'nonce'},
-    {'1': 'cipherText', '3': 3, '4': 1, '5': 12, '10': 'cipherText'},
+    {'1': 'cipher_text', '3': 3, '4': 1, '5': 12, '10': 'cipherText'},
   ],
 };
 
@@ -48,4 +50,4 @@ const TwonlySafeBackupEncrypted$json = {
 final $typed_data.Uint8List twonlySafeBackupEncryptedDescriptor =
     $convert.base64Decode(
         'ChlUd29ubHlTYWZlQmFja3VwRW5jcnlwdGVkEhAKA21hYxgBIAEoDFIDbWFjEhQKBW5vbmNlGA'
-        'IgASgMUgVub25jZRIeCgpjaXBoZXJUZXh0GAMgASgMUgpjaXBoZXJUZXh0');
+        'IgASgMUgVub25jZRIfCgtjaXBoZXJfdGV4dBgDIAEoDFIKY2lwaGVyVGV4dA==');
diff --git a/lib/src/model/protobuf/client/generated/data.pb.dart b/lib/src/model/protobuf/client/generated/data.pb.dart
index d58a51eb..eef79ac2 100644
--- a/lib/src/model/protobuf/client/generated/data.pb.dart
+++ b/lib/src/model/protobuf/client/generated/data.pb.dart
@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
@@ -53,7 +53,7 @@ class SharedContact extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  SharedContact clone() => SharedContact()..mergeFromMessage(this);
+  SharedContact clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   SharedContact copyWith(void Function(SharedContact) updates) =>
       super.copyWith((message) => updates(message as SharedContact))
@@ -66,8 +66,6 @@ class SharedContact extends $pb.GeneratedMessage {
   static SharedContact create() => SharedContact._();
   @$core.override
   SharedContact createEmptyInstance() => create();
-  static $pb.PbList<SharedContact> createRepeated() =>
-      $pb.PbList<SharedContact>();
   @$core.pragma('dart2js:noInline')
   static SharedContact getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<SharedContact>(create);
@@ -129,21 +127,16 @@ class AdditionalMessageData extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'AdditionalMessageData',
       createEmptyInstance: create)
-    ..e<AdditionalMessageData_Type>(
-        1, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
-        defaultOrMaker: AdditionalMessageData_Type.LINK,
-        valueOf: AdditionalMessageData_Type.valueOf,
+    ..aE<AdditionalMessageData_Type>(1, _omitFieldNames ? '' : 'type',
         enumValues: AdditionalMessageData_Type.values)
     ..aOS(2, _omitFieldNames ? '' : 'link')
-    ..pc<SharedContact>(
-        3, _omitFieldNames ? '' : 'contacts', $pb.PbFieldType.PM,
+    ..pPM<SharedContact>(3, _omitFieldNames ? '' : 'contacts',
         subBuilder: SharedContact.create)
     ..aInt64(4, _omitFieldNames ? '' : 'restoredFlameCounter')
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  AdditionalMessageData clone() =>
-      AdditionalMessageData()..mergeFromMessage(this);
+  AdditionalMessageData clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   AdditionalMessageData copyWith(
           void Function(AdditionalMessageData) updates) =>
@@ -157,8 +150,6 @@ class AdditionalMessageData extends $pb.GeneratedMessage {
   static AdditionalMessageData create() => AdditionalMessageData._();
   @$core.override
   AdditionalMessageData createEmptyInstance() => create();
-  static $pb.PbList<AdditionalMessageData> createRepeated() =>
-      $pb.PbList<AdditionalMessageData>();
   @$core.pragma('dart2js:noInline')
   static AdditionalMessageData getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<AdditionalMessageData>(create);
diff --git a/lib/src/model/protobuf/client/generated/data.pbenum.dart b/lib/src/model/protobuf/client/generated/data.pbenum.dart
index 1296541b..b579b9a8 100644
--- a/lib/src/model/protobuf/client/generated/data.pbenum.dart
+++ b/lib/src/model/protobuf/client/generated/data.pbenum.dart
@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
diff --git a/lib/src/model/protobuf/client/generated/data.pbjson.dart b/lib/src/model/protobuf/client/generated/data.pbjson.dart
index 1457a2ff..399acdee 100644
--- a/lib/src/model/protobuf/client/generated/data.pbjson.dart
+++ b/lib/src/model/protobuf/client/generated/data.pbjson.dart
@@ -8,7 +8,8 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
diff --git a/lib/src/model/protobuf/client/generated/groups.pb.dart b/lib/src/model/protobuf/client/generated/groups.pb.dart
index 96883f47..0f0c82fa 100644
--- a/lib/src/model/protobuf/client/generated/groups.pb.dart
+++ b/lib/src/model/protobuf/client/generated/groups.pb.dart
@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
@@ -53,19 +53,16 @@ class EncryptedGroupState extends $pb.GeneratedMessage {
       _omitMessageNames ? '' : 'EncryptedGroupState',
       createEmptyInstance: create)
     ..p<$fixnum.Int64>(
-        1, _omitFieldNames ? '' : 'memberIds', $pb.PbFieldType.K6,
-        protoName: 'memberIds')
-    ..p<$fixnum.Int64>(2, _omitFieldNames ? '' : 'adminIds', $pb.PbFieldType.K6,
-        protoName: 'adminIds')
-    ..aOS(3, _omitFieldNames ? '' : 'groupName', protoName: 'groupName')
-    ..aInt64(4, _omitFieldNames ? '' : 'deleteMessagesAfterMilliseconds',
-        protoName: 'deleteMessagesAfterMilliseconds')
+        1, _omitFieldNames ? '' : 'memberIds', $pb.PbFieldType.K6)
+    ..p<$fixnum.Int64>(2, _omitFieldNames ? '' : 'adminIds', $pb.PbFieldType.K6)
+    ..aOS(3, _omitFieldNames ? '' : 'groupName')
+    ..aInt64(4, _omitFieldNames ? '' : 'deleteMessagesAfterMilliseconds')
     ..a<$core.List<$core.int>>(
         5, _omitFieldNames ? '' : 'padding', $pb.PbFieldType.OY)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedGroupState clone() => EncryptedGroupState()..mergeFromMessage(this);
+  EncryptedGroupState clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedGroupState copyWith(void Function(EncryptedGroupState) updates) =>
       super.copyWith((message) => updates(message as EncryptedGroupState))
@@ -78,8 +75,6 @@ class EncryptedGroupState extends $pb.GeneratedMessage {
   static EncryptedGroupState create() => EncryptedGroupState._();
   @$core.override
   EncryptedGroupState createEmptyInstance() => create();
-  static $pb.PbList<EncryptedGroupState> createRepeated() =>
-      $pb.PbList<EncryptedGroupState>();
   @$core.pragma('dart2js:noInline')
   static EncryptedGroupState getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedGroupState>(create);
@@ -141,16 +136,12 @@ class EncryptedAppendedGroupState extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'EncryptedAppendedGroupState',
       createEmptyInstance: create)
-    ..e<EncryptedAppendedGroupState_Type>(
-        1, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
-        defaultOrMaker: EncryptedAppendedGroupState_Type.LEFT_GROUP,
-        valueOf: EncryptedAppendedGroupState_Type.valueOf,
+    ..aE<EncryptedAppendedGroupState_Type>(1, _omitFieldNames ? '' : 'type',
         enumValues: EncryptedAppendedGroupState_Type.values)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedAppendedGroupState clone() =>
-      EncryptedAppendedGroupState()..mergeFromMessage(this);
+  EncryptedAppendedGroupState clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedAppendedGroupState copyWith(
           void Function(EncryptedAppendedGroupState) updates) =>
@@ -166,8 +157,6 @@ class EncryptedAppendedGroupState extends $pb.GeneratedMessage {
       EncryptedAppendedGroupState._();
   @$core.override
   EncryptedAppendedGroupState createEmptyInstance() => create();
-  static $pb.PbList<EncryptedAppendedGroupState> createRepeated() =>
-      $pb.PbList<EncryptedAppendedGroupState>();
   @$core.pragma('dart2js:noInline')
   static EncryptedAppendedGroupState getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedAppendedGroupState>(create);
@@ -212,15 +201,13 @@ class EncryptedGroupStateEnvelop extends $pb.GeneratedMessage {
     ..a<$core.List<$core.int>>(
         1, _omitFieldNames ? '' : 'nonce', $pb.PbFieldType.OY)
     ..a<$core.List<$core.int>>(
-        2, _omitFieldNames ? '' : 'encryptedGroupState', $pb.PbFieldType.OY,
-        protoName: 'encryptedGroupState')
+        2, _omitFieldNames ? '' : 'encryptedGroupState', $pb.PbFieldType.OY)
     ..a<$core.List<$core.int>>(
         3, _omitFieldNames ? '' : 'mac', $pb.PbFieldType.OY)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedGroupStateEnvelop clone() =>
-      EncryptedGroupStateEnvelop()..mergeFromMessage(this);
+  EncryptedGroupStateEnvelop clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedGroupStateEnvelop copyWith(
           void Function(EncryptedGroupStateEnvelop) updates) =>
@@ -235,8 +222,6 @@ class EncryptedGroupStateEnvelop extends $pb.GeneratedMessage {
   static EncryptedGroupStateEnvelop create() => EncryptedGroupStateEnvelop._();
   @$core.override
   EncryptedGroupStateEnvelop createEmptyInstance() => create();
-  static $pb.PbList<EncryptedGroupStateEnvelop> createRepeated() =>
-      $pb.PbList<EncryptedGroupStateEnvelop>();
   @$core.pragma('dart2js:noInline')
   static EncryptedGroupStateEnvelop getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedGroupStateEnvelop>(create);
diff --git a/lib/src/model/protobuf/client/generated/groups.pbenum.dart b/lib/src/model/protobuf/client/generated/groups.pbenum.dart
index f96c1163..7d19a932 100644
--- a/lib/src/model/protobuf/client/generated/groups.pbenum.dart
+++ b/lib/src/model/protobuf/client/generated/groups.pbenum.dart
@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
diff --git a/lib/src/model/protobuf/client/generated/groups.pbjson.dart b/lib/src/model/protobuf/client/generated/groups.pbjson.dart
index 7fa61ef1..ba32065f 100644
--- a/lib/src/model/protobuf/client/generated/groups.pbjson.dart
+++ b/lib/src/model/protobuf/client/generated/groups.pbjson.dart
@@ -8,7 +8,8 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -18,11 +19,11 @@ import 'dart:typed_data' as $typed_data;
 const EncryptedGroupState$json = {
   '1': 'EncryptedGroupState',
   '2': [
-    {'1': 'memberIds', '3': 1, '4': 3, '5': 3, '10': 'memberIds'},
-    {'1': 'adminIds', '3': 2, '4': 3, '5': 3, '10': 'adminIds'},
-    {'1': 'groupName', '3': 3, '4': 1, '5': 9, '10': 'groupName'},
+    {'1': 'member_ids', '3': 1, '4': 3, '5': 3, '10': 'memberIds'},
+    {'1': 'admin_ids', '3': 2, '4': 3, '5': 3, '10': 'adminIds'},
+    {'1': 'group_name', '3': 3, '4': 1, '5': 9, '10': 'groupName'},
     {
-      '1': 'deleteMessagesAfterMilliseconds',
+      '1': 'delete_messages_after_milliseconds',
       '3': 4,
       '4': 1,
       '5': 3,
@@ -33,17 +34,17 @@ const EncryptedGroupState$json = {
     {'1': 'padding', '3': 5, '4': 1, '5': 12, '10': 'padding'},
   ],
   '8': [
-    {'1': '_deleteMessagesAfterMilliseconds'},
+    {'1': '_delete_messages_after_milliseconds'},
   ],
 };
 
 /// Descriptor for `EncryptedGroupState`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List encryptedGroupStateDescriptor = $convert.base64Decode(
-    'ChNFbmNyeXB0ZWRHcm91cFN0YXRlEhwKCW1lbWJlcklkcxgBIAMoA1IJbWVtYmVySWRzEhoKCG'
-    'FkbWluSWRzGAIgAygDUghhZG1pbklkcxIcCglncm91cE5hbWUYAyABKAlSCWdyb3VwTmFtZRJN'
-    'Ch9kZWxldGVNZXNzYWdlc0FmdGVyTWlsbGlzZWNvbmRzGAQgASgDSABSH2RlbGV0ZU1lc3NhZ2'
-    'VzQWZ0ZXJNaWxsaXNlY29uZHOIAQESGAoHcGFkZGluZxgFIAEoDFIHcGFkZGluZ0IiCiBfZGVs'
-    'ZXRlTWVzc2FnZXNBZnRlck1pbGxpc2Vjb25kcw==');
+    'ChNFbmNyeXB0ZWRHcm91cFN0YXRlEh0KCm1lbWJlcl9pZHMYASADKANSCW1lbWJlcklkcxIbCg'
+    'lhZG1pbl9pZHMYAiADKANSCGFkbWluSWRzEh0KCmdyb3VwX25hbWUYAyABKAlSCWdyb3VwTmFt'
+    'ZRJQCiJkZWxldGVfbWVzc2FnZXNfYWZ0ZXJfbWlsbGlzZWNvbmRzGAQgASgDSABSH2RlbGV0ZU'
+    '1lc3NhZ2VzQWZ0ZXJNaWxsaXNlY29uZHOIAQESGAoHcGFkZGluZxgFIAEoDFIHcGFkZGluZ0Il'
+    'CiNfZGVsZXRlX21lc3NhZ2VzX2FmdGVyX21pbGxpc2Vjb25kcw==');
 
 @$core.Deprecated('Use encryptedAppendedGroupStateDescriptor instead')
 const EncryptedAppendedGroupState$json = {
@@ -81,7 +82,7 @@ const EncryptedGroupStateEnvelop$json = {
   '2': [
     {'1': 'nonce', '3': 1, '4': 1, '5': 12, '10': 'nonce'},
     {
-      '1': 'encryptedGroupState',
+      '1': 'encrypted_group_state',
       '3': 2,
       '4': 1,
       '5': 12,
@@ -94,6 +95,6 @@ const EncryptedGroupStateEnvelop$json = {
 /// Descriptor for `EncryptedGroupStateEnvelop`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List encryptedGroupStateEnvelopDescriptor =
     $convert.base64Decode(
-        'ChpFbmNyeXB0ZWRHcm91cFN0YXRlRW52ZWxvcBIUCgVub25jZRgBIAEoDFIFbm9uY2USMAoTZW'
-        '5jcnlwdGVkR3JvdXBTdGF0ZRgCIAEoDFITZW5jcnlwdGVkR3JvdXBTdGF0ZRIQCgNtYWMYAyAB'
-        'KAxSA21hYw==');
+        'ChpFbmNyeXB0ZWRHcm91cFN0YXRlRW52ZWxvcBIUCgVub25jZRgBIAEoDFIFbm9uY2USMgoVZW'
+        '5jcnlwdGVkX2dyb3VwX3N0YXRlGAIgASgMUhNlbmNyeXB0ZWRHcm91cFN0YXRlEhAKA21hYxgD'
+        'IAEoDFIDbWFj');
diff --git a/lib/src/model/protobuf/client/generated/messages.pb.dart b/lib/src/model/protobuf/client/generated/messages.pb.dart
index e14d7101..2a9a165d 100644
--- a/lib/src/model/protobuf/client/generated/messages.pb.dart
+++ b/lib/src/model/protobuf/client/generated/messages.pb.dart
@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
@@ -48,20 +48,17 @@ class Message extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'Message',
       createEmptyInstance: create)
-    ..e<Message_Type>(1, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
-        defaultOrMaker: Message_Type.SENDER_DELIVERY_RECEIPT,
-        valueOf: Message_Type.valueOf,
+    ..aE<Message_Type>(1, _omitFieldNames ? '' : 'type',
         enumValues: Message_Type.values)
-    ..aOS(2, _omitFieldNames ? '' : 'receiptId', protoName: 'receiptId')
+    ..aOS(2, _omitFieldNames ? '' : 'receiptId')
     ..a<$core.List<$core.int>>(
-        3, _omitFieldNames ? '' : 'encryptedContent', $pb.PbFieldType.OY,
-        protoName: 'encryptedContent')
+        3, _omitFieldNames ? '' : 'encryptedContent', $pb.PbFieldType.OY)
     ..aOM<PlaintextContent>(4, _omitFieldNames ? '' : 'plaintextContent',
-        protoName: 'plaintextContent', subBuilder: PlaintextContent.create)
+        subBuilder: PlaintextContent.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  Message clone() => Message()..mergeFromMessage(this);
+  Message clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   Message copyWith(void Function(Message) updates) =>
       super.copyWith((message) => updates(message as Message)) as Message;
@@ -73,7 +70,6 @@ class Message extends $pb.GeneratedMessage {
   static Message create() => Message._();
   @$core.override
   Message createEmptyInstance() => create();
-  static $pb.PbList<Message> createRepeated() => $pb.PbList<Message>();
   @$core.pragma('dart2js:noInline')
   static Message getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Message>(create);
@@ -137,8 +133,7 @@ class PlaintextContent_RetryErrorMessage extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  PlaintextContent_RetryErrorMessage clone() =>
-      PlaintextContent_RetryErrorMessage()..mergeFromMessage(this);
+  PlaintextContent_RetryErrorMessage clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   PlaintextContent_RetryErrorMessage copyWith(
           void Function(PlaintextContent_RetryErrorMessage) updates) =>
@@ -154,8 +149,6 @@ class PlaintextContent_RetryErrorMessage extends $pb.GeneratedMessage {
       PlaintextContent_RetryErrorMessage._();
   @$core.override
   PlaintextContent_RetryErrorMessage createEmptyInstance() => create();
-  static $pb.PbList<PlaintextContent_RetryErrorMessage> createRepeated() =>
-      $pb.PbList<PlaintextContent_RetryErrorMessage>();
   @$core.pragma('dart2js:noInline')
   static PlaintextContent_RetryErrorMessage getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<PlaintextContent_RetryErrorMessage>(
@@ -185,16 +178,13 @@ class PlaintextContent_DecryptionErrorMessage extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'PlaintextContent.DecryptionErrorMessage',
       createEmptyInstance: create)
-    ..e<PlaintextContent_DecryptionErrorMessage_Type>(
-        1, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
-        defaultOrMaker: PlaintextContent_DecryptionErrorMessage_Type.UNKNOWN,
-        valueOf: PlaintextContent_DecryptionErrorMessage_Type.valueOf,
+    ..aE<PlaintextContent_DecryptionErrorMessage_Type>(
+        1, _omitFieldNames ? '' : 'type',
         enumValues: PlaintextContent_DecryptionErrorMessage_Type.values)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  PlaintextContent_DecryptionErrorMessage clone() =>
-      PlaintextContent_DecryptionErrorMessage()..mergeFromMessage(this);
+  PlaintextContent_DecryptionErrorMessage clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   PlaintextContent_DecryptionErrorMessage copyWith(
           void Function(PlaintextContent_DecryptionErrorMessage) updates) =>
@@ -210,8 +200,6 @@ class PlaintextContent_DecryptionErrorMessage extends $pb.GeneratedMessage {
       PlaintextContent_DecryptionErrorMessage._();
   @$core.override
   PlaintextContent_DecryptionErrorMessage createEmptyInstance() => create();
-  static $pb.PbList<PlaintextContent_DecryptionErrorMessage> createRepeated() =>
-      $pb.PbList<PlaintextContent_DecryptionErrorMessage>();
   @$core.pragma('dart2js:noInline')
   static PlaintextContent_DecryptionErrorMessage getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -255,16 +243,14 @@ class PlaintextContent extends $pb.GeneratedMessage {
       createEmptyInstance: create)
     ..aOM<PlaintextContent_DecryptionErrorMessage>(
         1, _omitFieldNames ? '' : 'decryptionErrorMessage',
-        protoName: 'decryptionErrorMessage',
         subBuilder: PlaintextContent_DecryptionErrorMessage.create)
     ..aOM<PlaintextContent_RetryErrorMessage>(
         2, _omitFieldNames ? '' : 'retryControlError',
-        protoName: 'retryControlError',
         subBuilder: PlaintextContent_RetryErrorMessage.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  PlaintextContent clone() => PlaintextContent()..mergeFromMessage(this);
+  PlaintextContent clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   PlaintextContent copyWith(void Function(PlaintextContent) updates) =>
       super.copyWith((message) => updates(message as PlaintextContent))
@@ -277,8 +263,6 @@ class PlaintextContent extends $pb.GeneratedMessage {
   static PlaintextContent create() => PlaintextContent._();
   @$core.override
   PlaintextContent createEmptyInstance() => create();
-  static $pb.PbList<PlaintextContent> createRepeated() =>
-      $pb.PbList<PlaintextContent>();
   @$core.pragma('dart2js:noInline')
   static PlaintextContent getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<PlaintextContent>(create);
@@ -334,18 +318,13 @@ class EncryptedContent_ErrorMessages extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'EncryptedContent.ErrorMessages',
       createEmptyInstance: create)
-    ..e<EncryptedContent_ErrorMessages_Type>(
-        1, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
-        defaultOrMaker: EncryptedContent_ErrorMessages_Type
-            .ERROR_PROCESSING_MESSAGE_CREATED_ACCOUNT_REQUEST_INSTEAD,
-        valueOf: EncryptedContent_ErrorMessages_Type.valueOf,
+    ..aE<EncryptedContent_ErrorMessages_Type>(1, _omitFieldNames ? '' : 'type',
         enumValues: EncryptedContent_ErrorMessages_Type.values)
     ..aOS(2, _omitFieldNames ? '' : 'relatedReceiptId')
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_ErrorMessages clone() =>
-      EncryptedContent_ErrorMessages()..mergeFromMessage(this);
+  EncryptedContent_ErrorMessages clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_ErrorMessages copyWith(
           void Function(EncryptedContent_ErrorMessages) updates) =>
@@ -361,8 +340,6 @@ class EncryptedContent_ErrorMessages extends $pb.GeneratedMessage {
       EncryptedContent_ErrorMessages._();
   @$core.override
   EncryptedContent_ErrorMessages createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_ErrorMessages> createRepeated() =>
-      $pb.PbList<EncryptedContent_ErrorMessages>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_ErrorMessages getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_ErrorMessages>(create);
@@ -411,16 +388,13 @@ class EncryptedContent_GroupCreate extends $pb.GeneratedMessage {
       _omitMessageNames ? '' : 'EncryptedContent.GroupCreate',
       createEmptyInstance: create)
     ..a<$core.List<$core.int>>(
-        3, _omitFieldNames ? '' : 'stateKey', $pb.PbFieldType.OY,
-        protoName: 'stateKey')
+        3, _omitFieldNames ? '' : 'stateKey', $pb.PbFieldType.OY)
     ..a<$core.List<$core.int>>(
-        4, _omitFieldNames ? '' : 'groupPublicKey', $pb.PbFieldType.OY,
-        protoName: 'groupPublicKey')
+        4, _omitFieldNames ? '' : 'groupPublicKey', $pb.PbFieldType.OY)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_GroupCreate clone() =>
-      EncryptedContent_GroupCreate()..mergeFromMessage(this);
+  EncryptedContent_GroupCreate clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_GroupCreate copyWith(
           void Function(EncryptedContent_GroupCreate) updates) =>
@@ -436,8 +410,6 @@ class EncryptedContent_GroupCreate extends $pb.GeneratedMessage {
       EncryptedContent_GroupCreate._();
   @$core.override
   EncryptedContent_GroupCreate createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_GroupCreate> createRepeated() =>
-      $pb.PbList<EncryptedContent_GroupCreate>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_GroupCreate getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_GroupCreate>(create);
@@ -485,13 +457,11 @@ class EncryptedContent_GroupJoin extends $pb.GeneratedMessage {
       _omitMessageNames ? '' : 'EncryptedContent.GroupJoin',
       createEmptyInstance: create)
     ..a<$core.List<$core.int>>(
-        1, _omitFieldNames ? '' : 'groupPublicKey', $pb.PbFieldType.OY,
-        protoName: 'groupPublicKey')
+        1, _omitFieldNames ? '' : 'groupPublicKey', $pb.PbFieldType.OY)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_GroupJoin clone() =>
-      EncryptedContent_GroupJoin()..mergeFromMessage(this);
+  EncryptedContent_GroupJoin clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_GroupJoin copyWith(
           void Function(EncryptedContent_GroupJoin) updates) =>
@@ -506,8 +476,6 @@ class EncryptedContent_GroupJoin extends $pb.GeneratedMessage {
   static EncryptedContent_GroupJoin create() => EncryptedContent_GroupJoin._();
   @$core.override
   EncryptedContent_GroupJoin createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_GroupJoin> createRepeated() =>
-      $pb.PbList<EncryptedContent_GroupJoin>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_GroupJoin getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_GroupJoin>(create);
@@ -543,8 +511,7 @@ class EncryptedContent_ResendGroupPublicKey extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_ResendGroupPublicKey clone() =>
-      EncryptedContent_ResendGroupPublicKey()..mergeFromMessage(this);
+  EncryptedContent_ResendGroupPublicKey clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_ResendGroupPublicKey copyWith(
           void Function(EncryptedContent_ResendGroupPublicKey) updates) =>
@@ -560,8 +527,6 @@ class EncryptedContent_ResendGroupPublicKey extends $pb.GeneratedMessage {
       EncryptedContent_ResendGroupPublicKey._();
   @$core.override
   EncryptedContent_ResendGroupPublicKey createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_ResendGroupPublicKey> createRepeated() =>
-      $pb.PbList<EncryptedContent_ResendGroupPublicKey>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_ResendGroupPublicKey getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -598,18 +563,14 @@ class EncryptedContent_GroupUpdate extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'EncryptedContent.GroupUpdate',
       createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'groupActionType',
-        protoName: 'groupActionType')
-    ..aInt64(2, _omitFieldNames ? '' : 'affectedContactId',
-        protoName: 'affectedContactId')
-    ..aOS(3, _omitFieldNames ? '' : 'newGroupName', protoName: 'newGroupName')
-    ..aInt64(4, _omitFieldNames ? '' : 'newDeleteMessagesAfterMilliseconds',
-        protoName: 'newDeleteMessagesAfterMilliseconds')
+    ..aOS(1, _omitFieldNames ? '' : 'groupActionType')
+    ..aInt64(2, _omitFieldNames ? '' : 'affectedContactId')
+    ..aOS(3, _omitFieldNames ? '' : 'newGroupName')
+    ..aInt64(4, _omitFieldNames ? '' : 'newDeleteMessagesAfterMilliseconds')
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_GroupUpdate clone() =>
-      EncryptedContent_GroupUpdate()..mergeFromMessage(this);
+  EncryptedContent_GroupUpdate clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_GroupUpdate copyWith(
           void Function(EncryptedContent_GroupUpdate) updates) =>
@@ -625,8 +586,6 @@ class EncryptedContent_GroupUpdate extends $pb.GeneratedMessage {
       EncryptedContent_GroupUpdate._();
   @$core.override
   EncryptedContent_GroupUpdate createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_GroupUpdate> createRepeated() =>
-      $pb.PbList<EncryptedContent_GroupUpdate>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_GroupUpdate getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_GroupUpdate>(create);
@@ -697,17 +656,14 @@ class EncryptedContent_TextMessage extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'EncryptedContent.TextMessage',
       createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'senderMessageId',
-        protoName: 'senderMessageId')
+    ..aOS(1, _omitFieldNames ? '' : 'senderMessageId')
     ..aOS(2, _omitFieldNames ? '' : 'text')
     ..aInt64(3, _omitFieldNames ? '' : 'timestamp')
-    ..aOS(4, _omitFieldNames ? '' : 'quoteMessageId',
-        protoName: 'quoteMessageId')
+    ..aOS(4, _omitFieldNames ? '' : 'quoteMessageId')
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_TextMessage clone() =>
-      EncryptedContent_TextMessage()..mergeFromMessage(this);
+  EncryptedContent_TextMessage clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_TextMessage copyWith(
           void Function(EncryptedContent_TextMessage) updates) =>
@@ -723,8 +679,6 @@ class EncryptedContent_TextMessage extends $pb.GeneratedMessage {
       EncryptedContent_TextMessage._();
   @$core.override
   EncryptedContent_TextMessage createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_TextMessage> createRepeated() =>
-      $pb.PbList<EncryptedContent_TextMessage>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_TextMessage getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_TextMessage>(create);
@@ -804,8 +758,7 @@ class EncryptedContent_AdditionalDataMessage extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_AdditionalDataMessage clone() =>
-      EncryptedContent_AdditionalDataMessage()..mergeFromMessage(this);
+  EncryptedContent_AdditionalDataMessage clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_AdditionalDataMessage copyWith(
           void Function(EncryptedContent_AdditionalDataMessage) updates) =>
@@ -821,8 +774,6 @@ class EncryptedContent_AdditionalDataMessage extends $pb.GeneratedMessage {
       EncryptedContent_AdditionalDataMessage._();
   @$core.override
   EncryptedContent_AdditionalDataMessage createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_AdditionalDataMessage> createRepeated() =>
-      $pb.PbList<EncryptedContent_AdditionalDataMessage>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_AdditionalDataMessage getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
@@ -892,15 +843,13 @@ class EncryptedContent_Reaction extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'EncryptedContent.Reaction',
       createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'targetMessageId',
-        protoName: 'targetMessageId')
+    ..aOS(1, _omitFieldNames ? '' : 'targetMessageId')
     ..aOS(2, _omitFieldNames ? '' : 'emoji')
     ..aOB(3, _omitFieldNames ? '' : 'remove')
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_Reaction clone() =>
-      EncryptedContent_Reaction()..mergeFromMessage(this);
+  EncryptedContent_Reaction clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_Reaction copyWith(
           void Function(EncryptedContent_Reaction) updates) =>
@@ -914,8 +863,6 @@ class EncryptedContent_Reaction extends $pb.GeneratedMessage {
   static EncryptedContent_Reaction create() => EncryptedContent_Reaction._();
   @$core.override
   EncryptedContent_Reaction createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_Reaction> createRepeated() =>
-      $pb.PbList<EncryptedContent_Reaction>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_Reaction getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_Reaction>(create);
@@ -979,22 +926,16 @@ class EncryptedContent_MessageUpdate extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'EncryptedContent.MessageUpdate',
       createEmptyInstance: create)
-    ..e<EncryptedContent_MessageUpdate_Type>(
-        1, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
-        defaultOrMaker: EncryptedContent_MessageUpdate_Type.DELETE,
-        valueOf: EncryptedContent_MessageUpdate_Type.valueOf,
+    ..aE<EncryptedContent_MessageUpdate_Type>(1, _omitFieldNames ? '' : 'type',
         enumValues: EncryptedContent_MessageUpdate_Type.values)
-    ..aOS(2, _omitFieldNames ? '' : 'senderMessageId',
-        protoName: 'senderMessageId')
-    ..pPS(3, _omitFieldNames ? '' : 'multipleTargetMessageIds',
-        protoName: 'multipleTargetMessageIds')
+    ..aOS(2, _omitFieldNames ? '' : 'senderMessageId')
+    ..pPS(3, _omitFieldNames ? '' : 'multipleTargetMessageIds')
     ..aOS(4, _omitFieldNames ? '' : 'text')
     ..aInt64(5, _omitFieldNames ? '' : 'timestamp')
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_MessageUpdate clone() =>
-      EncryptedContent_MessageUpdate()..mergeFromMessage(this);
+  EncryptedContent_MessageUpdate clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_MessageUpdate copyWith(
           void Function(EncryptedContent_MessageUpdate) updates) =>
@@ -1010,8 +951,6 @@ class EncryptedContent_MessageUpdate extends $pb.GeneratedMessage {
       EncryptedContent_MessageUpdate._();
   @$core.override
   EncryptedContent_MessageUpdate createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_MessageUpdate> createRepeated() =>
-      $pb.PbList<EncryptedContent_MessageUpdate>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_MessageUpdate getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_MessageUpdate>(create);
@@ -1101,39 +1040,27 @@ class EncryptedContent_Media extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'EncryptedContent.Media',
       createEmptyInstance: create)
-    ..aOS(1, _omitFieldNames ? '' : 'senderMessageId',
-        protoName: 'senderMessageId')
-    ..e<EncryptedContent_Media_Type>(
-        2, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
-        defaultOrMaker: EncryptedContent_Media_Type.REUPLOAD,
-        valueOf: EncryptedContent_Media_Type.valueOf,
+    ..aOS(1, _omitFieldNames ? '' : 'senderMessageId')
+    ..aE<EncryptedContent_Media_Type>(2, _omitFieldNames ? '' : 'type',
         enumValues: EncryptedContent_Media_Type.values)
-    ..aInt64(3, _omitFieldNames ? '' : 'displayLimitInMilliseconds',
-        protoName: 'displayLimitInMilliseconds')
-    ..aOB(4, _omitFieldNames ? '' : 'requiresAuthentication',
-        protoName: 'requiresAuthentication')
+    ..aInt64(3, _omitFieldNames ? '' : 'displayLimitInMilliseconds')
+    ..aOB(4, _omitFieldNames ? '' : 'requiresAuthentication')
     ..aInt64(5, _omitFieldNames ? '' : 'timestamp')
-    ..aOS(6, _omitFieldNames ? '' : 'quoteMessageId',
-        protoName: 'quoteMessageId')
+    ..aOS(6, _omitFieldNames ? '' : 'quoteMessageId')
     ..a<$core.List<$core.int>>(
-        7, _omitFieldNames ? '' : 'downloadToken', $pb.PbFieldType.OY,
-        protoName: 'downloadToken')
+        7, _omitFieldNames ? '' : 'downloadToken', $pb.PbFieldType.OY)
     ..a<$core.List<$core.int>>(
-        8, _omitFieldNames ? '' : 'encryptionKey', $pb.PbFieldType.OY,
-        protoName: 'encryptionKey')
+        8, _omitFieldNames ? '' : 'encryptionKey', $pb.PbFieldType.OY)
     ..a<$core.List<$core.int>>(
-        9, _omitFieldNames ? '' : 'encryptionMac', $pb.PbFieldType.OY,
-        protoName: 'encryptionMac')
+        9, _omitFieldNames ? '' : 'encryptionMac', $pb.PbFieldType.OY)
     ..a<$core.List<$core.int>>(
-        10, _omitFieldNames ? '' : 'encryptionNonce', $pb.PbFieldType.OY,
-        protoName: 'encryptionNonce')
+        10, _omitFieldNames ? '' : 'encryptionNonce', $pb.PbFieldType.OY)
     ..a<$core.List<$core.int>>(
         11, _omitFieldNames ? '' : 'additionalMessageData', $pb.PbFieldType.OY)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_Media clone() =>
-      EncryptedContent_Media()..mergeFromMessage(this);
+  EncryptedContent_Media clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_Media copyWith(
           void Function(EncryptedContent_Media) updates) =>
@@ -1147,8 +1074,6 @@ class EncryptedContent_Media extends $pb.GeneratedMessage {
   static EncryptedContent_Media create() => EncryptedContent_Media._();
   @$core.override
   EncryptedContent_Media createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_Media> createRepeated() =>
-      $pb.PbList<EncryptedContent_Media>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_Media getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_Media>(create);
@@ -1278,18 +1203,13 @@ class EncryptedContent_MediaUpdate extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'EncryptedContent.MediaUpdate',
       createEmptyInstance: create)
-    ..e<EncryptedContent_MediaUpdate_Type>(
-        1, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
-        defaultOrMaker: EncryptedContent_MediaUpdate_Type.REOPENED,
-        valueOf: EncryptedContent_MediaUpdate_Type.valueOf,
+    ..aE<EncryptedContent_MediaUpdate_Type>(1, _omitFieldNames ? '' : 'type',
         enumValues: EncryptedContent_MediaUpdate_Type.values)
-    ..aOS(2, _omitFieldNames ? '' : 'targetMessageId',
-        protoName: 'targetMessageId')
+    ..aOS(2, _omitFieldNames ? '' : 'targetMessageId')
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_MediaUpdate clone() =>
-      EncryptedContent_MediaUpdate()..mergeFromMessage(this);
+  EncryptedContent_MediaUpdate clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_MediaUpdate copyWith(
           void Function(EncryptedContent_MediaUpdate) updates) =>
@@ -1305,8 +1225,6 @@ class EncryptedContent_MediaUpdate extends $pb.GeneratedMessage {
       EncryptedContent_MediaUpdate._();
   @$core.override
   EncryptedContent_MediaUpdate createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_MediaUpdate> createRepeated() =>
-      $pb.PbList<EncryptedContent_MediaUpdate>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_MediaUpdate getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_MediaUpdate>(create);
@@ -1352,16 +1270,12 @@ class EncryptedContent_ContactRequest extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'EncryptedContent.ContactRequest',
       createEmptyInstance: create)
-    ..e<EncryptedContent_ContactRequest_Type>(
-        1, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
-        defaultOrMaker: EncryptedContent_ContactRequest_Type.REQUEST,
-        valueOf: EncryptedContent_ContactRequest_Type.valueOf,
+    ..aE<EncryptedContent_ContactRequest_Type>(1, _omitFieldNames ? '' : 'type',
         enumValues: EncryptedContent_ContactRequest_Type.values)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_ContactRequest clone() =>
-      EncryptedContent_ContactRequest()..mergeFromMessage(this);
+  EncryptedContent_ContactRequest clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_ContactRequest copyWith(
           void Function(EncryptedContent_ContactRequest) updates) =>
@@ -1377,8 +1291,6 @@ class EncryptedContent_ContactRequest extends $pb.GeneratedMessage {
       EncryptedContent_ContactRequest._();
   @$core.override
   EncryptedContent_ContactRequest createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_ContactRequest> createRepeated() =>
-      $pb.PbList<EncryptedContent_ContactRequest>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_ContactRequest getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_ContactRequest>(
@@ -1423,21 +1335,16 @@ class EncryptedContent_ContactUpdate extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'EncryptedContent.ContactUpdate',
       createEmptyInstance: create)
-    ..e<EncryptedContent_ContactUpdate_Type>(
-        1, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
-        defaultOrMaker: EncryptedContent_ContactUpdate_Type.REQUEST,
-        valueOf: EncryptedContent_ContactUpdate_Type.valueOf,
+    ..aE<EncryptedContent_ContactUpdate_Type>(1, _omitFieldNames ? '' : 'type',
         enumValues: EncryptedContent_ContactUpdate_Type.values)
     ..a<$core.List<$core.int>>(
-        2, _omitFieldNames ? '' : 'avatarSvgCompressed', $pb.PbFieldType.OY,
-        protoName: 'avatarSvgCompressed')
+        2, _omitFieldNames ? '' : 'avatarSvgCompressed', $pb.PbFieldType.OY)
     ..aOS(3, _omitFieldNames ? '' : 'username')
-    ..aOS(4, _omitFieldNames ? '' : 'displayName', protoName: 'displayName')
+    ..aOS(4, _omitFieldNames ? '' : 'displayName')
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_ContactUpdate clone() =>
-      EncryptedContent_ContactUpdate()..mergeFromMessage(this);
+  EncryptedContent_ContactUpdate clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_ContactUpdate copyWith(
           void Function(EncryptedContent_ContactUpdate) updates) =>
@@ -1453,8 +1360,6 @@ class EncryptedContent_ContactUpdate extends $pb.GeneratedMessage {
       EncryptedContent_ContactUpdate._();
   @$core.override
   EncryptedContent_ContactUpdate createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_ContactUpdate> createRepeated() =>
-      $pb.PbList<EncryptedContent_ContactUpdate>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_ContactUpdate getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_ContactUpdate>(create);
@@ -1524,20 +1429,16 @@ class EncryptedContent_PushKeys extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'EncryptedContent.PushKeys',
       createEmptyInstance: create)
-    ..e<EncryptedContent_PushKeys_Type>(
-        1, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
-        defaultOrMaker: EncryptedContent_PushKeys_Type.REQUEST,
-        valueOf: EncryptedContent_PushKeys_Type.valueOf,
+    ..aE<EncryptedContent_PushKeys_Type>(1, _omitFieldNames ? '' : 'type',
         enumValues: EncryptedContent_PushKeys_Type.values)
-    ..aInt64(2, _omitFieldNames ? '' : 'keyId', protoName: 'keyId')
+    ..aInt64(2, _omitFieldNames ? '' : 'keyId')
     ..a<$core.List<$core.int>>(
         3, _omitFieldNames ? '' : 'key', $pb.PbFieldType.OY)
-    ..aInt64(4, _omitFieldNames ? '' : 'createdAt', protoName: 'createdAt')
+    ..aInt64(4, _omitFieldNames ? '' : 'createdAt')
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_PushKeys clone() =>
-      EncryptedContent_PushKeys()..mergeFromMessage(this);
+  EncryptedContent_PushKeys clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_PushKeys copyWith(
           void Function(EncryptedContent_PushKeys) updates) =>
@@ -1551,8 +1452,6 @@ class EncryptedContent_PushKeys extends $pb.GeneratedMessage {
   static EncryptedContent_PushKeys create() => EncryptedContent_PushKeys._();
   @$core.override
   EncryptedContent_PushKeys createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_PushKeys> createRepeated() =>
-      $pb.PbList<EncryptedContent_PushKeys>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_PushKeys getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_PushKeys>(create);
@@ -1623,17 +1522,14 @@ class EncryptedContent_FlameSync extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'EncryptedContent.FlameSync',
       createEmptyInstance: create)
-    ..aInt64(1, _omitFieldNames ? '' : 'flameCounter',
-        protoName: 'flameCounter')
-    ..aInt64(2, _omitFieldNames ? '' : 'lastFlameCounterChange',
-        protoName: 'lastFlameCounterChange')
-    ..aOB(3, _omitFieldNames ? '' : 'bestFriend', protoName: 'bestFriend')
-    ..aOB(4, _omitFieldNames ? '' : 'forceUpdate', protoName: 'forceUpdate')
+    ..aInt64(1, _omitFieldNames ? '' : 'flameCounter')
+    ..aInt64(2, _omitFieldNames ? '' : 'lastFlameCounterChange')
+    ..aOB(3, _omitFieldNames ? '' : 'bestFriend')
+    ..aOB(4, _omitFieldNames ? '' : 'forceUpdate')
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_FlameSync clone() =>
-      EncryptedContent_FlameSync()..mergeFromMessage(this);
+  EncryptedContent_FlameSync clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_FlameSync copyWith(
           void Function(EncryptedContent_FlameSync) updates) =>
@@ -1648,8 +1544,6 @@ class EncryptedContent_FlameSync extends $pb.GeneratedMessage {
   static EncryptedContent_FlameSync create() => EncryptedContent_FlameSync._();
   @$core.override
   EncryptedContent_FlameSync createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_FlameSync> createRepeated() =>
-      $pb.PbList<EncryptedContent_FlameSync>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_FlameSync getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_FlameSync>(create);
@@ -1721,8 +1615,7 @@ class EncryptedContent_TypingIndicator extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent_TypingIndicator clone() =>
-      EncryptedContent_TypingIndicator()..mergeFromMessage(this);
+  EncryptedContent_TypingIndicator clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent_TypingIndicator copyWith(
           void Function(EncryptedContent_TypingIndicator) updates) =>
@@ -1738,8 +1631,6 @@ class EncryptedContent_TypingIndicator extends $pb.GeneratedMessage {
       EncryptedContent_TypingIndicator._();
   @$core.override
   EncryptedContent_TypingIndicator createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent_TypingIndicator> createRepeated() =>
-      $pb.PbList<EncryptedContent_TypingIndicator>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent_TypingIndicator getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent_TypingIndicator>(
@@ -1765,6 +1656,177 @@ class EncryptedContent_TypingIndicator extends $pb.GeneratedMessage {
   void clearCreatedAt() => $_clearField(2);
 }
 
+class EncryptedContent_UserDiscoveryRequest extends $pb.GeneratedMessage {
+  factory EncryptedContent_UserDiscoveryRequest({
+    $core.List<$core.int>? currentVersion,
+  }) {
+    final result = create();
+    if (currentVersion != null) result.currentVersion = currentVersion;
+    return result;
+  }
+
+  EncryptedContent_UserDiscoveryRequest._();
+
+  factory EncryptedContent_UserDiscoveryRequest.fromBuffer(
+          $core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory EncryptedContent_UserDiscoveryRequest.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'EncryptedContent.UserDiscoveryRequest',
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'currentVersion', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  EncryptedContent_UserDiscoveryRequest clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  EncryptedContent_UserDiscoveryRequest copyWith(
+          void Function(EncryptedContent_UserDiscoveryRequest) updates) =>
+      super.copyWith((message) =>
+              updates(message as EncryptedContent_UserDiscoveryRequest))
+          as EncryptedContent_UserDiscoveryRequest;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static EncryptedContent_UserDiscoveryRequest create() =>
+      EncryptedContent_UserDiscoveryRequest._();
+  @$core.override
+  EncryptedContent_UserDiscoveryRequest createEmptyInstance() => create();
+  @$core.pragma('dart2js:noInline')
+  static EncryptedContent_UserDiscoveryRequest getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
+          EncryptedContent_UserDiscoveryRequest>(create);
+  static EncryptedContent_UserDiscoveryRequest? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.List<$core.int> get currentVersion => $_getN(0);
+  @$pb.TagNumber(1)
+  set currentVersion($core.List<$core.int> value) => $_setBytes(0, value);
+  @$pb.TagNumber(1)
+  $core.bool hasCurrentVersion() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearCurrentVersion() => $_clearField(1);
+}
+
+class EncryptedContent_UserDiscoveryUpdate extends $pb.GeneratedMessage {
+  factory EncryptedContent_UserDiscoveryUpdate({
+    $core.Iterable<$core.List<$core.int>>? messages,
+  }) {
+    final result = create();
+    if (messages != null) result.messages.addAll(messages);
+    return result;
+  }
+
+  EncryptedContent_UserDiscoveryUpdate._();
+
+  factory EncryptedContent_UserDiscoveryUpdate.fromBuffer(
+          $core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory EncryptedContent_UserDiscoveryUpdate.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'EncryptedContent.UserDiscoveryUpdate',
+      createEmptyInstance: create)
+    ..p<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'messages', $pb.PbFieldType.PY)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  EncryptedContent_UserDiscoveryUpdate clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  EncryptedContent_UserDiscoveryUpdate copyWith(
+          void Function(EncryptedContent_UserDiscoveryUpdate) updates) =>
+      super.copyWith((message) =>
+              updates(message as EncryptedContent_UserDiscoveryUpdate))
+          as EncryptedContent_UserDiscoveryUpdate;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static EncryptedContent_UserDiscoveryUpdate create() =>
+      EncryptedContent_UserDiscoveryUpdate._();
+  @$core.override
+  EncryptedContent_UserDiscoveryUpdate createEmptyInstance() => create();
+  @$core.pragma('dart2js:noInline')
+  static EncryptedContent_UserDiscoveryUpdate getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
+          EncryptedContent_UserDiscoveryUpdate>(create);
+  static EncryptedContent_UserDiscoveryUpdate? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $pb.PbList<$core.List<$core.int>> get messages => $_getList(0);
+}
+
+class EncryptedContent_KeyVerificationProof extends $pb.GeneratedMessage {
+  factory EncryptedContent_KeyVerificationProof({
+    $core.List<$core.int>? calculatedMac,
+  }) {
+    final result = create();
+    if (calculatedMac != null) result.calculatedMac = calculatedMac;
+    return result;
+  }
+
+  EncryptedContent_KeyVerificationProof._();
+
+  factory EncryptedContent_KeyVerificationProof.fromBuffer(
+          $core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory EncryptedContent_KeyVerificationProof.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'EncryptedContent.KeyVerificationProof',
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'calculatedMac', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  EncryptedContent_KeyVerificationProof clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  EncryptedContent_KeyVerificationProof copyWith(
+          void Function(EncryptedContent_KeyVerificationProof) updates) =>
+      super.copyWith((message) =>
+              updates(message as EncryptedContent_KeyVerificationProof))
+          as EncryptedContent_KeyVerificationProof;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static EncryptedContent_KeyVerificationProof create() =>
+      EncryptedContent_KeyVerificationProof._();
+  @$core.override
+  EncryptedContent_KeyVerificationProof createEmptyInstance() => create();
+  @$core.pragma('dart2js:noInline')
+  static EncryptedContent_KeyVerificationProof getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
+          EncryptedContent_KeyVerificationProof>(create);
+  static EncryptedContent_KeyVerificationProof? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.List<$core.int> get calculatedMac => $_getN(0);
+  @$pb.TagNumber(1)
+  set calculatedMac($core.List<$core.int> value) => $_setBytes(0, value);
+  @$pb.TagNumber(1)
+  $core.bool hasCalculatedMac() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearCalculatedMac() => $_clearField(1);
+}
+
 class EncryptedContent extends $pb.GeneratedMessage {
   factory EncryptedContent({
     $core.String? groupId,
@@ -1786,6 +1848,10 @@ class EncryptedContent extends $pb.GeneratedMessage {
     EncryptedContent_ErrorMessages? errorMessages,
     EncryptedContent_AdditionalDataMessage? additionalDataMessage,
     EncryptedContent_TypingIndicator? typingIndicator,
+    $core.List<$core.int>? senderUserDiscoveryVersion,
+    EncryptedContent_UserDiscoveryRequest? userDiscoveryRequest,
+    EncryptedContent_UserDiscoveryUpdate? userDiscoveryUpdate,
+    EncryptedContent_KeyVerificationProof? keyVerificationProof,
   }) {
     final result = create();
     if (groupId != null) result.groupId = groupId;
@@ -1810,6 +1876,14 @@ class EncryptedContent extends $pb.GeneratedMessage {
     if (additionalDataMessage != null)
       result.additionalDataMessage = additionalDataMessage;
     if (typingIndicator != null) result.typingIndicator = typingIndicator;
+    if (senderUserDiscoveryVersion != null)
+      result.senderUserDiscoveryVersion = senderUserDiscoveryVersion;
+    if (userDiscoveryRequest != null)
+      result.userDiscoveryRequest = userDiscoveryRequest;
+    if (userDiscoveryUpdate != null)
+      result.userDiscoveryUpdate = userDiscoveryUpdate;
+    if (keyVerificationProof != null)
+      result.keyVerificationProof = keyVerificationProof;
     return result;
   }
 
@@ -1825,50 +1899,41 @@ class EncryptedContent extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'EncryptedContent',
       createEmptyInstance: create)
-    ..aOS(2, _omitFieldNames ? '' : 'groupId', protoName: 'groupId')
-    ..aOB(3, _omitFieldNames ? '' : 'isDirectChat', protoName: 'isDirectChat')
-    ..aInt64(4, _omitFieldNames ? '' : 'senderProfileCounter',
-        protoName: 'senderProfileCounter')
+    ..aOS(2, _omitFieldNames ? '' : 'groupId')
+    ..aOB(3, _omitFieldNames ? '' : 'isDirectChat')
+    ..aInt64(4, _omitFieldNames ? '' : 'senderProfileCounter')
     ..aOM<EncryptedContent_MessageUpdate>(
         5, _omitFieldNames ? '' : 'messageUpdate',
-        protoName: 'messageUpdate',
         subBuilder: EncryptedContent_MessageUpdate.create)
     ..aOM<EncryptedContent_Media>(6, _omitFieldNames ? '' : 'media',
         subBuilder: EncryptedContent_Media.create)
     ..aOM<EncryptedContent_MediaUpdate>(7, _omitFieldNames ? '' : 'mediaUpdate',
-        protoName: 'mediaUpdate',
         subBuilder: EncryptedContent_MediaUpdate.create)
     ..aOM<EncryptedContent_ContactUpdate>(
         8, _omitFieldNames ? '' : 'contactUpdate',
-        protoName: 'contactUpdate',
         subBuilder: EncryptedContent_ContactUpdate.create)
     ..aOM<EncryptedContent_ContactRequest>(
         9, _omitFieldNames ? '' : 'contactRequest',
-        protoName: 'contactRequest',
         subBuilder: EncryptedContent_ContactRequest.create)
     ..aOM<EncryptedContent_FlameSync>(10, _omitFieldNames ? '' : 'flameSync',
-        protoName: 'flameSync', subBuilder: EncryptedContent_FlameSync.create)
+        subBuilder: EncryptedContent_FlameSync.create)
     ..aOM<EncryptedContent_PushKeys>(11, _omitFieldNames ? '' : 'pushKeys',
-        protoName: 'pushKeys', subBuilder: EncryptedContent_PushKeys.create)
+        subBuilder: EncryptedContent_PushKeys.create)
     ..aOM<EncryptedContent_Reaction>(12, _omitFieldNames ? '' : 'reaction',
         subBuilder: EncryptedContent_Reaction.create)
     ..aOM<EncryptedContent_TextMessage>(
         13, _omitFieldNames ? '' : 'textMessage',
-        protoName: 'textMessage',
         subBuilder: EncryptedContent_TextMessage.create)
     ..aOM<EncryptedContent_GroupCreate>(
         14, _omitFieldNames ? '' : 'groupCreate',
-        protoName: 'groupCreate',
         subBuilder: EncryptedContent_GroupCreate.create)
     ..aOM<EncryptedContent_GroupJoin>(15, _omitFieldNames ? '' : 'groupJoin',
-        protoName: 'groupJoin', subBuilder: EncryptedContent_GroupJoin.create)
+        subBuilder: EncryptedContent_GroupJoin.create)
     ..aOM<EncryptedContent_GroupUpdate>(
         16, _omitFieldNames ? '' : 'groupUpdate',
-        protoName: 'groupUpdate',
         subBuilder: EncryptedContent_GroupUpdate.create)
     ..aOM<EncryptedContent_ResendGroupPublicKey>(
         17, _omitFieldNames ? '' : 'resendGroupPublicKey',
-        protoName: 'resendGroupPublicKey',
         subBuilder: EncryptedContent_ResendGroupPublicKey.create)
     ..aOM<EncryptedContent_ErrorMessages>(
         18, _omitFieldNames ? '' : 'errorMessages',
@@ -1879,10 +1944,21 @@ class EncryptedContent extends $pb.GeneratedMessage {
     ..aOM<EncryptedContent_TypingIndicator>(
         20, _omitFieldNames ? '' : 'typingIndicator',
         subBuilder: EncryptedContent_TypingIndicator.create)
+    ..a<$core.List<$core.int>>(21,
+        _omitFieldNames ? '' : 'senderUserDiscoveryVersion', $pb.PbFieldType.OY)
+    ..aOM<EncryptedContent_UserDiscoveryRequest>(
+        22, _omitFieldNames ? '' : 'userDiscoveryRequest',
+        subBuilder: EncryptedContent_UserDiscoveryRequest.create)
+    ..aOM<EncryptedContent_UserDiscoveryUpdate>(
+        23, _omitFieldNames ? '' : 'userDiscoveryUpdate',
+        subBuilder: EncryptedContent_UserDiscoveryUpdate.create)
+    ..aOM<EncryptedContent_KeyVerificationProof>(
+        24, _omitFieldNames ? '' : 'keyVerificationProof',
+        subBuilder: EncryptedContent_KeyVerificationProof.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedContent clone() => EncryptedContent()..mergeFromMessage(this);
+  EncryptedContent clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedContent copyWith(void Function(EncryptedContent) updates) =>
       super.copyWith((message) => updates(message as EncryptedContent))
@@ -1895,8 +1971,6 @@ class EncryptedContent extends $pb.GeneratedMessage {
   static EncryptedContent create() => EncryptedContent._();
   @$core.override
   EncryptedContent createEmptyInstance() => create();
-  static $pb.PbList<EncryptedContent> createRepeated() =>
-      $pb.PbList<EncryptedContent>();
   @$core.pragma('dart2js:noInline')
   static EncryptedContent getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedContent>(create);
@@ -2115,6 +2189,55 @@ class EncryptedContent extends $pb.GeneratedMessage {
   void clearTypingIndicator() => $_clearField(20);
   @$pb.TagNumber(20)
   EncryptedContent_TypingIndicator ensureTypingIndicator() => $_ensure(18);
+
+  @$pb.TagNumber(21)
+  $core.List<$core.int> get senderUserDiscoveryVersion => $_getN(19);
+  @$pb.TagNumber(21)
+  set senderUserDiscoveryVersion($core.List<$core.int> value) =>
+      $_setBytes(19, value);
+  @$pb.TagNumber(21)
+  $core.bool hasSenderUserDiscoveryVersion() => $_has(19);
+  @$pb.TagNumber(21)
+  void clearSenderUserDiscoveryVersion() => $_clearField(21);
+
+  @$pb.TagNumber(22)
+  EncryptedContent_UserDiscoveryRequest get userDiscoveryRequest => $_getN(20);
+  @$pb.TagNumber(22)
+  set userDiscoveryRequest(EncryptedContent_UserDiscoveryRequest value) =>
+      $_setField(22, value);
+  @$pb.TagNumber(22)
+  $core.bool hasUserDiscoveryRequest() => $_has(20);
+  @$pb.TagNumber(22)
+  void clearUserDiscoveryRequest() => $_clearField(22);
+  @$pb.TagNumber(22)
+  EncryptedContent_UserDiscoveryRequest ensureUserDiscoveryRequest() =>
+      $_ensure(20);
+
+  @$pb.TagNumber(23)
+  EncryptedContent_UserDiscoveryUpdate get userDiscoveryUpdate => $_getN(21);
+  @$pb.TagNumber(23)
+  set userDiscoveryUpdate(EncryptedContent_UserDiscoveryUpdate value) =>
+      $_setField(23, value);
+  @$pb.TagNumber(23)
+  $core.bool hasUserDiscoveryUpdate() => $_has(21);
+  @$pb.TagNumber(23)
+  void clearUserDiscoveryUpdate() => $_clearField(23);
+  @$pb.TagNumber(23)
+  EncryptedContent_UserDiscoveryUpdate ensureUserDiscoveryUpdate() =>
+      $_ensure(21);
+
+  @$pb.TagNumber(24)
+  EncryptedContent_KeyVerificationProof get keyVerificationProof => $_getN(22);
+  @$pb.TagNumber(24)
+  set keyVerificationProof(EncryptedContent_KeyVerificationProof value) =>
+      $_setField(24, value);
+  @$pb.TagNumber(24)
+  $core.bool hasKeyVerificationProof() => $_has(22);
+  @$pb.TagNumber(24)
+  void clearKeyVerificationProof() => $_clearField(24);
+  @$pb.TagNumber(24)
+  EncryptedContent_KeyVerificationProof ensureKeyVerificationProof() =>
+      $_ensure(22);
 }
 
 const $core.bool _omitFieldNames =
diff --git a/lib/src/model/protobuf/client/generated/messages.pbenum.dart b/lib/src/model/protobuf/client/generated/messages.pbenum.dart
index a8d9e869..31f04f9b 100644
--- a/lib/src/model/protobuf/client/generated/messages.pbenum.dart
+++ b/lib/src/model/protobuf/client/generated/messages.pbenum.dart
@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
diff --git a/lib/src/model/protobuf/client/generated/messages.pbjson.dart b/lib/src/model/protobuf/client/generated/messages.pbjson.dart
index fe0555c6..006b465a 100644
--- a/lib/src/model/protobuf/client/generated/messages.pbjson.dart
+++ b/lib/src/model/protobuf/client/generated/messages.pbjson.dart
@@ -8,7 +8,8 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -19,9 +20,9 @@ const Message$json = {
   '1': 'Message',
   '2': [
     {'1': 'type', '3': 1, '4': 1, '5': 14, '6': '.Message.Type', '10': 'type'},
-    {'1': 'receiptId', '3': 2, '4': 1, '5': 9, '10': 'receiptId'},
+    {'1': 'receipt_id', '3': 2, '4': 1, '5': 9, '10': 'receiptId'},
     {
-      '1': 'encryptedContent',
+      '1': 'encrypted_content',
       '3': 3,
       '4': 1,
       '5': 12,
@@ -30,7 +31,7 @@ const Message$json = {
       '17': true
     },
     {
-      '1': 'plaintextContent',
+      '1': 'plaintext_content',
       '3': 4,
       '4': 1,
       '5': 11,
@@ -42,8 +43,8 @@ const Message$json = {
   ],
   '4': [Message_Type$json],
   '8': [
-    {'1': '_encryptedContent'},
-    {'1': '_plaintextContent'},
+    {'1': '_encrypted_content'},
+    {'1': '_plaintext_content'},
   ],
 };
 
@@ -61,20 +62,20 @@ const Message_Type$json = {
 
 /// Descriptor for `Message`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List messageDescriptor = $convert.base64Decode(
-    'CgdNZXNzYWdlEiEKBHR5cGUYASABKA4yDS5NZXNzYWdlLlR5cGVSBHR5cGUSHAoJcmVjZWlwdE'
-    'lkGAIgASgJUglyZWNlaXB0SWQSLwoQZW5jcnlwdGVkQ29udGVudBgDIAEoDEgAUhBlbmNyeXB0'
-    'ZWRDb250ZW50iAEBEkIKEHBsYWludGV4dENvbnRlbnQYBCABKAsyES5QbGFpbnRleHRDb250ZW'
-    '50SAFSEHBsYWludGV4dENvbnRlbnSIAQEidAoEVHlwZRIbChdTRU5ERVJfREVMSVZFUllfUkVD'
-    'RUlQVBAAEhUKEVBMQUlOVEVYVF9DT05URU5UEAESDgoKQ0lQSEVSVEVYVBACEhEKDVBSRUtFWV'
-    '9CVU5ETEUQAxIVChFURVNUX05PVElGSUNBVElPThAEQhMKEV9lbmNyeXB0ZWRDb250ZW50QhMK'
-    'EV9wbGFpbnRleHRDb250ZW50');
+    'CgdNZXNzYWdlEiEKBHR5cGUYASABKA4yDS5NZXNzYWdlLlR5cGVSBHR5cGUSHQoKcmVjZWlwdF'
+    '9pZBgCIAEoCVIJcmVjZWlwdElkEjAKEWVuY3J5cHRlZF9jb250ZW50GAMgASgMSABSEGVuY3J5'
+    'cHRlZENvbnRlbnSIAQESQwoRcGxhaW50ZXh0X2NvbnRlbnQYBCABKAsyES5QbGFpbnRleHRDb2'
+    '50ZW50SAFSEHBsYWludGV4dENvbnRlbnSIAQEidAoEVHlwZRIbChdTRU5ERVJfREVMSVZFUllf'
+    'UkVDRUlQVBAAEhUKEVBMQUlOVEVYVF9DT05URU5UEAESDgoKQ0lQSEVSVEVYVBACEhEKDVBSRU'
+    'tFWV9CVU5ETEUQAxIVChFURVNUX05PVElGSUNBVElPThAEQhQKEl9lbmNyeXB0ZWRfY29udGVu'
+    'dEIUChJfcGxhaW50ZXh0X2NvbnRlbnQ=');
 
 @$core.Deprecated('Use plaintextContentDescriptor instead')
 const PlaintextContent$json = {
   '1': 'PlaintextContent',
   '2': [
     {
-      '1': 'decryptionErrorMessage',
+      '1': 'decryption_error_message',
       '3': 1,
       '4': 1,
       '5': 11,
@@ -84,7 +85,7 @@ const PlaintextContent$json = {
       '17': true
     },
     {
-      '1': 'retryControlError',
+      '1': 'retry_control_error',
       '3': 2,
       '4': 1,
       '5': 11,
@@ -99,8 +100,8 @@ const PlaintextContent$json = {
     PlaintextContent_DecryptionErrorMessage$json
   ],
   '8': [
-    {'1': '_decryptionErrorMessage'},
-    {'1': '_retryControlError'},
+    {'1': '_decryption_error_message'},
+    {'1': '_retry_control_error'},
   ],
 };
 
@@ -136,21 +137,21 @@ const PlaintextContent_DecryptionErrorMessage_Type$json = {
 
 /// Descriptor for `PlaintextContent`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List plaintextContentDescriptor = $convert.base64Decode(
-    'ChBQbGFpbnRleHRDb250ZW50EmUKFmRlY3J5cHRpb25FcnJvck1lc3NhZ2UYASABKAsyKC5QbG'
-    'FpbnRleHRDb250ZW50LkRlY3J5cHRpb25FcnJvck1lc3NhZ2VIAFIWZGVjcnlwdGlvbkVycm9y'
-    'TWVzc2FnZYgBARJWChFyZXRyeUNvbnRyb2xFcnJvchgCIAEoCzIjLlBsYWludGV4dENvbnRlbn'
-    'QuUmV0cnlFcnJvck1lc3NhZ2VIAVIRcmV0cnlDb250cm9sRXJyb3KIAQEaEwoRUmV0cnlFcnJv'
-    'ck1lc3NhZ2UahAEKFkRlY3J5cHRpb25FcnJvck1lc3NhZ2USQQoEdHlwZRgBIAEoDjItLlBsYW'
-    'ludGV4dENvbnRlbnQuRGVjcnlwdGlvbkVycm9yTWVzc2FnZS5UeXBlUgR0eXBlIicKBFR5cGUS'
-    'CwoHVU5LTk9XThAAEhIKDlBSRUtFWV9VTktOT1dOEAFCGQoXX2RlY3J5cHRpb25FcnJvck1lc3'
-    'NhZ2VCFAoSX3JldHJ5Q29udHJvbEVycm9y');
+    'ChBQbGFpbnRleHRDb250ZW50EmcKGGRlY3J5cHRpb25fZXJyb3JfbWVzc2FnZRgBIAEoCzIoLl'
+    'BsYWludGV4dENvbnRlbnQuRGVjcnlwdGlvbkVycm9yTWVzc2FnZUgAUhZkZWNyeXB0aW9uRXJy'
+    'b3JNZXNzYWdliAEBElgKE3JldHJ5X2NvbnRyb2xfZXJyb3IYAiABKAsyIy5QbGFpbnRleHRDb2'
+    '50ZW50LlJldHJ5RXJyb3JNZXNzYWdlSAFSEXJldHJ5Q29udHJvbEVycm9yiAEBGhMKEVJldHJ5'
+    'RXJyb3JNZXNzYWdlGoQBChZEZWNyeXB0aW9uRXJyb3JNZXNzYWdlEkEKBHR5cGUYASABKA4yLS'
+    '5QbGFpbnRleHRDb250ZW50LkRlY3J5cHRpb25FcnJvck1lc3NhZ2UuVHlwZVIEdHlwZSInCgRU'
+    'eXBlEgsKB1VOS05PV04QABISCg5QUkVLRVlfVU5LTk9XThABQhsKGV9kZWNyeXB0aW9uX2Vycm'
+    '9yX21lc3NhZ2VCFgoUX3JldHJ5X2NvbnRyb2xfZXJyb3I=');
 
 @$core.Deprecated('Use encryptedContentDescriptor instead')
 const EncryptedContent$json = {
   '1': 'EncryptedContent',
   '2': [
     {
-      '1': 'groupId',
+      '1': 'group_id',
       '3': 2,
       '4': 1,
       '5': 9,
@@ -159,7 +160,7 @@ const EncryptedContent$json = {
       '17': true
     },
     {
-      '1': 'isDirectChat',
+      '1': 'is_direct_chat',
       '3': 3,
       '4': 1,
       '5': 8,
@@ -168,7 +169,7 @@ const EncryptedContent$json = {
       '17': true
     },
     {
-      '1': 'senderProfileCounter',
+      '1': 'sender_profile_counter',
       '3': 4,
       '4': 1,
       '5': 3,
@@ -177,12 +178,21 @@ const EncryptedContent$json = {
       '17': true
     },
     {
-      '1': 'messageUpdate',
+      '1': 'sender_user_discovery_version',
+      '3': 21,
+      '4': 1,
+      '5': 12,
+      '9': 3,
+      '10': 'senderUserDiscoveryVersion',
+      '17': true
+    },
+    {
+      '1': 'message_update',
       '3': 5,
       '4': 1,
       '5': 11,
       '6': '.EncryptedContent.MessageUpdate',
-      '9': 3,
+      '9': 4,
       '10': 'messageUpdate',
       '17': true
     },
@@ -192,57 +202,57 @@ const EncryptedContent$json = {
       '4': 1,
       '5': 11,
       '6': '.EncryptedContent.Media',
-      '9': 4,
+      '9': 5,
       '10': 'media',
       '17': true
     },
     {
-      '1': 'mediaUpdate',
+      '1': 'media_update',
       '3': 7,
       '4': 1,
       '5': 11,
       '6': '.EncryptedContent.MediaUpdate',
-      '9': 5,
+      '9': 6,
       '10': 'mediaUpdate',
       '17': true
     },
     {
-      '1': 'contactUpdate',
+      '1': 'contact_update',
       '3': 8,
       '4': 1,
       '5': 11,
       '6': '.EncryptedContent.ContactUpdate',
-      '9': 6,
+      '9': 7,
       '10': 'contactUpdate',
       '17': true
     },
     {
-      '1': 'contactRequest',
+      '1': 'contact_request',
       '3': 9,
       '4': 1,
       '5': 11,
       '6': '.EncryptedContent.ContactRequest',
-      '9': 7,
+      '9': 8,
       '10': 'contactRequest',
       '17': true
     },
     {
-      '1': 'flameSync',
+      '1': 'flame_sync',
       '3': 10,
       '4': 1,
       '5': 11,
       '6': '.EncryptedContent.FlameSync',
-      '9': 8,
+      '9': 9,
       '10': 'flameSync',
       '17': true
     },
     {
-      '1': 'pushKeys',
+      '1': 'push_keys',
       '3': 11,
       '4': 1,
       '5': 11,
       '6': '.EncryptedContent.PushKeys',
-      '9': 9,
+      '9': 10,
       '10': 'pushKeys',
       '17': true
     },
@@ -252,57 +262,57 @@ const EncryptedContent$json = {
       '4': 1,
       '5': 11,
       '6': '.EncryptedContent.Reaction',
-      '9': 10,
+      '9': 11,
       '10': 'reaction',
       '17': true
     },
     {
-      '1': 'textMessage',
+      '1': 'text_message',
       '3': 13,
       '4': 1,
       '5': 11,
       '6': '.EncryptedContent.TextMessage',
-      '9': 11,
+      '9': 12,
       '10': 'textMessage',
       '17': true
     },
     {
-      '1': 'groupCreate',
+      '1': 'group_create',
       '3': 14,
       '4': 1,
       '5': 11,
       '6': '.EncryptedContent.GroupCreate',
-      '9': 12,
+      '9': 13,
       '10': 'groupCreate',
       '17': true
     },
     {
-      '1': 'groupJoin',
+      '1': 'group_join',
       '3': 15,
       '4': 1,
       '5': 11,
       '6': '.EncryptedContent.GroupJoin',
-      '9': 13,
+      '9': 14,
       '10': 'groupJoin',
       '17': true
     },
     {
-      '1': 'groupUpdate',
+      '1': 'group_update',
       '3': 16,
       '4': 1,
       '5': 11,
       '6': '.EncryptedContent.GroupUpdate',
-      '9': 14,
+      '9': 15,
       '10': 'groupUpdate',
       '17': true
     },
     {
-      '1': 'resendGroupPublicKey',
+      '1': 'resend_group_public_key',
       '3': 17,
       '4': 1,
       '5': 11,
       '6': '.EncryptedContent.ResendGroupPublicKey',
-      '9': 15,
+      '9': 16,
       '10': 'resendGroupPublicKey',
       '17': true
     },
@@ -312,7 +322,7 @@ const EncryptedContent$json = {
       '4': 1,
       '5': 11,
       '6': '.EncryptedContent.ErrorMessages',
-      '9': 16,
+      '9': 17,
       '10': 'errorMessages',
       '17': true
     },
@@ -322,7 +332,7 @@ const EncryptedContent$json = {
       '4': 1,
       '5': 11,
       '6': '.EncryptedContent.AdditionalDataMessage',
-      '9': 17,
+      '9': 18,
       '10': 'additionalDataMessage',
       '17': true
     },
@@ -332,10 +342,40 @@ const EncryptedContent$json = {
       '4': 1,
       '5': 11,
       '6': '.EncryptedContent.TypingIndicator',
-      '9': 18,
+      '9': 19,
       '10': 'typingIndicator',
       '17': true
     },
+    {
+      '1': 'user_discovery_request',
+      '3': 22,
+      '4': 1,
+      '5': 11,
+      '6': '.EncryptedContent.UserDiscoveryRequest',
+      '9': 20,
+      '10': 'userDiscoveryRequest',
+      '17': true
+    },
+    {
+      '1': 'user_discovery_update',
+      '3': 23,
+      '4': 1,
+      '5': 11,
+      '6': '.EncryptedContent.UserDiscoveryUpdate',
+      '9': 21,
+      '10': 'userDiscoveryUpdate',
+      '17': true
+    },
+    {
+      '1': 'key_verification_proof',
+      '3': 24,
+      '4': 1,
+      '5': 11,
+      '6': '.EncryptedContent.KeyVerificationProof',
+      '9': 22,
+      '10': 'keyVerificationProof',
+      '17': true
+    },
   ],
   '3': [
     EncryptedContent_ErrorMessages$json,
@@ -353,28 +393,35 @@ const EncryptedContent$json = {
     EncryptedContent_ContactUpdate$json,
     EncryptedContent_PushKeys$json,
     EncryptedContent_FlameSync$json,
-    EncryptedContent_TypingIndicator$json
+    EncryptedContent_TypingIndicator$json,
+    EncryptedContent_UserDiscoveryRequest$json,
+    EncryptedContent_UserDiscoveryUpdate$json,
+    EncryptedContent_KeyVerificationProof$json
   ],
   '8': [
-    {'1': '_groupId'},
-    {'1': '_isDirectChat'},
-    {'1': '_senderProfileCounter'},
-    {'1': '_messageUpdate'},
+    {'1': '_group_id'},
+    {'1': '_is_direct_chat'},
+    {'1': '_sender_profile_counter'},
+    {'1': '_sender_user_discovery_version'},
+    {'1': '_message_update'},
     {'1': '_media'},
-    {'1': '_mediaUpdate'},
-    {'1': '_contactUpdate'},
-    {'1': '_contactRequest'},
-    {'1': '_flameSync'},
-    {'1': '_pushKeys'},
+    {'1': '_media_update'},
+    {'1': '_contact_update'},
+    {'1': '_contact_request'},
+    {'1': '_flame_sync'},
+    {'1': '_push_keys'},
     {'1': '_reaction'},
-    {'1': '_textMessage'},
-    {'1': '_groupCreate'},
-    {'1': '_groupJoin'},
-    {'1': '_groupUpdate'},
-    {'1': '_resendGroupPublicKey'},
+    {'1': '_text_message'},
+    {'1': '_group_create'},
+    {'1': '_group_join'},
+    {'1': '_group_update'},
+    {'1': '_resend_group_public_key'},
     {'1': '_error_messages'},
     {'1': '_additional_data_message'},
     {'1': '_typing_indicator'},
+    {'1': '_user_discovery_request'},
+    {'1': '_user_discovery_update'},
+    {'1': '_key_verification_proof'},
   ],
 };
 
@@ -415,8 +462,8 @@ const EncryptedContent_ErrorMessages_Type$json = {
 const EncryptedContent_GroupCreate$json = {
   '1': 'GroupCreate',
   '2': [
-    {'1': 'stateKey', '3': 3, '4': 1, '5': 12, '10': 'stateKey'},
-    {'1': 'groupPublicKey', '3': 4, '4': 1, '5': 12, '10': 'groupPublicKey'},
+    {'1': 'state_key', '3': 3, '4': 1, '5': 12, '10': 'stateKey'},
+    {'1': 'group_public_key', '3': 4, '4': 1, '5': 12, '10': 'groupPublicKey'},
   ],
 };
 
@@ -424,7 +471,7 @@ const EncryptedContent_GroupCreate$json = {
 const EncryptedContent_GroupJoin$json = {
   '1': 'GroupJoin',
   '2': [
-    {'1': 'groupPublicKey', '3': 1, '4': 1, '5': 12, '10': 'groupPublicKey'},
+    {'1': 'group_public_key', '3': 1, '4': 1, '5': 12, '10': 'groupPublicKey'},
   ],
 };
 
@@ -437,9 +484,9 @@ const EncryptedContent_ResendGroupPublicKey$json = {
 const EncryptedContent_GroupUpdate$json = {
   '1': 'GroupUpdate',
   '2': [
-    {'1': 'groupActionType', '3': 1, '4': 1, '5': 9, '10': 'groupActionType'},
+    {'1': 'group_action_type', '3': 1, '4': 1, '5': 9, '10': 'groupActionType'},
     {
-      '1': 'affectedContactId',
+      '1': 'affected_contact_id',
       '3': 2,
       '4': 1,
       '5': 3,
@@ -448,7 +495,7 @@ const EncryptedContent_GroupUpdate$json = {
       '17': true
     },
     {
-      '1': 'newGroupName',
+      '1': 'new_group_name',
       '3': 3,
       '4': 1,
       '5': 9,
@@ -457,7 +504,7 @@ const EncryptedContent_GroupUpdate$json = {
       '17': true
     },
     {
-      '1': 'newDeleteMessagesAfterMilliseconds',
+      '1': 'new_delete_messages_after_milliseconds',
       '3': 4,
       '4': 1,
       '5': 3,
@@ -467,9 +514,9 @@ const EncryptedContent_GroupUpdate$json = {
     },
   ],
   '8': [
-    {'1': '_affectedContactId'},
-    {'1': '_newGroupName'},
-    {'1': '_newDeleteMessagesAfterMilliseconds'},
+    {'1': '_affected_contact_id'},
+    {'1': '_new_group_name'},
+    {'1': '_new_delete_messages_after_milliseconds'},
   ],
 };
 
@@ -477,11 +524,11 @@ const EncryptedContent_GroupUpdate$json = {
 const EncryptedContent_TextMessage$json = {
   '1': 'TextMessage',
   '2': [
-    {'1': 'senderMessageId', '3': 1, '4': 1, '5': 9, '10': 'senderMessageId'},
+    {'1': 'sender_message_id', '3': 1, '4': 1, '5': 9, '10': 'senderMessageId'},
     {'1': 'text', '3': 2, '4': 1, '5': 9, '10': 'text'},
     {'1': 'timestamp', '3': 3, '4': 1, '5': 3, '10': 'timestamp'},
     {
-      '1': 'quoteMessageId',
+      '1': 'quote_message_id',
       '3': 4,
       '4': 1,
       '5': 9,
@@ -491,7 +538,7 @@ const EncryptedContent_TextMessage$json = {
     },
   ],
   '8': [
-    {'1': '_quoteMessageId'},
+    {'1': '_quote_message_id'},
   ],
 };
 
@@ -521,7 +568,7 @@ const EncryptedContent_AdditionalDataMessage$json = {
 const EncryptedContent_Reaction$json = {
   '1': 'Reaction',
   '2': [
-    {'1': 'targetMessageId', '3': 1, '4': 1, '5': 9, '10': 'targetMessageId'},
+    {'1': 'target_message_id', '3': 1, '4': 1, '5': 9, '10': 'targetMessageId'},
     {'1': 'emoji', '3': 2, '4': 1, '5': 9, '10': 'emoji'},
     {'1': 'remove', '3': 3, '4': 1, '5': 8, '10': 'remove'},
   ],
@@ -540,7 +587,7 @@ const EncryptedContent_MessageUpdate$json = {
       '10': 'type'
     },
     {
-      '1': 'senderMessageId',
+      '1': 'sender_message_id',
       '3': 2,
       '4': 1,
       '5': 9,
@@ -549,7 +596,7 @@ const EncryptedContent_MessageUpdate$json = {
       '17': true
     },
     {
-      '1': 'multipleTargetMessageIds',
+      '1': 'multiple_target_message_ids',
       '3': 3,
       '4': 3,
       '5': 9,
@@ -560,7 +607,7 @@ const EncryptedContent_MessageUpdate$json = {
   ],
   '4': [EncryptedContent_MessageUpdate_Type$json],
   '8': [
-    {'1': '_senderMessageId'},
+    {'1': '_sender_message_id'},
     {'1': '_text'},
   ],
 };
@@ -579,7 +626,7 @@ const EncryptedContent_MessageUpdate_Type$json = {
 const EncryptedContent_Media$json = {
   '1': 'Media',
   '2': [
-    {'1': 'senderMessageId', '3': 1, '4': 1, '5': 9, '10': 'senderMessageId'},
+    {'1': 'sender_message_id', '3': 1, '4': 1, '5': 9, '10': 'senderMessageId'},
     {
       '1': 'type',
       '3': 2,
@@ -589,7 +636,7 @@ const EncryptedContent_Media$json = {
       '10': 'type'
     },
     {
-      '1': 'displayLimitInMilliseconds',
+      '1': 'display_limit_in_milliseconds',
       '3': 3,
       '4': 1,
       '5': 3,
@@ -598,7 +645,7 @@ const EncryptedContent_Media$json = {
       '17': true
     },
     {
-      '1': 'requiresAuthentication',
+      '1': 'requires_authentication',
       '3': 4,
       '4': 1,
       '5': 8,
@@ -606,7 +653,7 @@ const EncryptedContent_Media$json = {
     },
     {'1': 'timestamp', '3': 5, '4': 1, '5': 3, '10': 'timestamp'},
     {
-      '1': 'quoteMessageId',
+      '1': 'quote_message_id',
       '3': 6,
       '4': 1,
       '5': 9,
@@ -615,7 +662,7 @@ const EncryptedContent_Media$json = {
       '17': true
     },
     {
-      '1': 'downloadToken',
+      '1': 'download_token',
       '3': 7,
       '4': 1,
       '5': 12,
@@ -624,7 +671,7 @@ const EncryptedContent_Media$json = {
       '17': true
     },
     {
-      '1': 'encryptionKey',
+      '1': 'encryption_key',
       '3': 8,
       '4': 1,
       '5': 12,
@@ -633,7 +680,7 @@ const EncryptedContent_Media$json = {
       '17': true
     },
     {
-      '1': 'encryptionMac',
+      '1': 'encryption_mac',
       '3': 9,
       '4': 1,
       '5': 12,
@@ -642,7 +689,7 @@ const EncryptedContent_Media$json = {
       '17': true
     },
     {
-      '1': 'encryptionNonce',
+      '1': 'encryption_nonce',
       '3': 10,
       '4': 1,
       '5': 12,
@@ -662,12 +709,12 @@ const EncryptedContent_Media$json = {
   ],
   '4': [EncryptedContent_Media_Type$json],
   '8': [
-    {'1': '_displayLimitInMilliseconds'},
-    {'1': '_quoteMessageId'},
-    {'1': '_downloadToken'},
-    {'1': '_encryptionKey'},
-    {'1': '_encryptionMac'},
-    {'1': '_encryptionNonce'},
+    {'1': '_display_limit_in_milliseconds'},
+    {'1': '_quote_message_id'},
+    {'1': '_download_token'},
+    {'1': '_encryption_key'},
+    {'1': '_encryption_mac'},
+    {'1': '_encryption_nonce'},
     {'1': '_additional_message_data'},
   ],
 };
@@ -696,7 +743,7 @@ const EncryptedContent_MediaUpdate$json = {
       '6': '.EncryptedContent.MediaUpdate.Type',
       '10': 'type'
     },
-    {'1': 'targetMessageId', '3': 2, '4': 1, '5': 9, '10': 'targetMessageId'},
+    {'1': 'target_message_id', '3': 2, '4': 1, '5': 9, '10': 'targetMessageId'},
   ],
   '4': [EncryptedContent_MediaUpdate_Type$json],
 };
@@ -750,7 +797,7 @@ const EncryptedContent_ContactUpdate$json = {
       '10': 'type'
     },
     {
-      '1': 'avatarSvgCompressed',
+      '1': 'avatar_svg_compressed',
       '3': 2,
       '4': 1,
       '5': 12,
@@ -768,7 +815,7 @@ const EncryptedContent_ContactUpdate$json = {
       '17': true
     },
     {
-      '1': 'displayName',
+      '1': 'display_name',
       '3': 4,
       '4': 1,
       '5': 9,
@@ -779,9 +826,9 @@ const EncryptedContent_ContactUpdate$json = {
   ],
   '4': [EncryptedContent_ContactUpdate_Type$json],
   '8': [
-    {'1': '_avatarSvgCompressed'},
+    {'1': '_avatar_svg_compressed'},
     {'1': '_username'},
-    {'1': '_displayName'},
+    {'1': '_display_name'},
   ],
 };
 
@@ -806,10 +853,10 @@ const EncryptedContent_PushKeys$json = {
       '6': '.EncryptedContent.PushKeys.Type',
       '10': 'type'
     },
-    {'1': 'keyId', '3': 2, '4': 1, '5': 3, '9': 0, '10': 'keyId', '17': true},
+    {'1': 'key_id', '3': 2, '4': 1, '5': 3, '9': 0, '10': 'keyId', '17': true},
     {'1': 'key', '3': 3, '4': 1, '5': 12, '9': 1, '10': 'key', '17': true},
     {
-      '1': 'createdAt',
+      '1': 'created_at',
       '3': 4,
       '4': 1,
       '5': 3,
@@ -820,9 +867,9 @@ const EncryptedContent_PushKeys$json = {
   ],
   '4': [EncryptedContent_PushKeys_Type$json],
   '8': [
-    {'1': '_keyId'},
+    {'1': '_key_id'},
     {'1': '_key'},
-    {'1': '_createdAt'},
+    {'1': '_created_at'},
   ],
 };
 
@@ -839,16 +886,16 @@ const EncryptedContent_PushKeys_Type$json = {
 const EncryptedContent_FlameSync$json = {
   '1': 'FlameSync',
   '2': [
-    {'1': 'flameCounter', '3': 1, '4': 1, '5': 3, '10': 'flameCounter'},
+    {'1': 'flame_counter', '3': 1, '4': 1, '5': 3, '10': 'flameCounter'},
     {
-      '1': 'lastFlameCounterChange',
+      '1': 'last_flame_counter_change',
       '3': 2,
       '4': 1,
       '5': 3,
       '10': 'lastFlameCounterChange'
     },
-    {'1': 'bestFriend', '3': 3, '4': 1, '5': 8, '10': 'bestFriend'},
-    {'1': 'forceUpdate', '3': 4, '4': 1, '5': 8, '10': 'forceUpdate'},
+    {'1': 'best_friend', '3': 3, '4': 1, '5': 8, '10': 'bestFriend'},
+    {'1': 'force_update', '3': 4, '4': 1, '5': 8, '10': 'forceUpdate'},
   ],
 };
 
@@ -861,95 +908,133 @@ const EncryptedContent_TypingIndicator$json = {
   ],
 };
 
+@$core.Deprecated('Use encryptedContentDescriptor instead')
+const EncryptedContent_UserDiscoveryRequest$json = {
+  '1': 'UserDiscoveryRequest',
+  '2': [
+    {'1': 'current_version', '3': 1, '4': 1, '5': 12, '10': 'currentVersion'},
+  ],
+};
+
+@$core.Deprecated('Use encryptedContentDescriptor instead')
+const EncryptedContent_UserDiscoveryUpdate$json = {
+  '1': 'UserDiscoveryUpdate',
+  '2': [
+    {'1': 'messages', '3': 1, '4': 3, '5': 12, '10': 'messages'},
+  ],
+};
+
+@$core.Deprecated('Use encryptedContentDescriptor instead')
+const EncryptedContent_KeyVerificationProof$json = {
+  '1': 'KeyVerificationProof',
+  '2': [
+    {'1': 'calculated_mac', '3': 1, '4': 1, '5': 12, '10': 'calculatedMac'},
+  ],
+};
+
 /// Descriptor for `EncryptedContent`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List encryptedContentDescriptor = $convert.base64Decode(
-    'ChBFbmNyeXB0ZWRDb250ZW50Eh0KB2dyb3VwSWQYAiABKAlIAFIHZ3JvdXBJZIgBARInCgxpc0'
-    'RpcmVjdENoYXQYAyABKAhIAVIMaXNEaXJlY3RDaGF0iAEBEjcKFHNlbmRlclByb2ZpbGVDb3Vu'
-    'dGVyGAQgASgDSAJSFHNlbmRlclByb2ZpbGVDb3VudGVyiAEBEkoKDW1lc3NhZ2VVcGRhdGUYBS'
-    'ABKAsyHy5FbmNyeXB0ZWRDb250ZW50Lk1lc3NhZ2VVcGRhdGVIA1INbWVzc2FnZVVwZGF0ZYgB'
-    'ARIyCgVtZWRpYRgGIAEoCzIXLkVuY3J5cHRlZENvbnRlbnQuTWVkaWFIBFIFbWVkaWGIAQESRA'
-    'oLbWVkaWFVcGRhdGUYByABKAsyHS5FbmNyeXB0ZWRDb250ZW50Lk1lZGlhVXBkYXRlSAVSC21l'
-    'ZGlhVXBkYXRliAEBEkoKDWNvbnRhY3RVcGRhdGUYCCABKAsyHy5FbmNyeXB0ZWRDb250ZW50Lk'
-    'NvbnRhY3RVcGRhdGVIBlINY29udGFjdFVwZGF0ZYgBARJNCg5jb250YWN0UmVxdWVzdBgJIAEo'
-    'CzIgLkVuY3J5cHRlZENvbnRlbnQuQ29udGFjdFJlcXVlc3RIB1IOY29udGFjdFJlcXVlc3SIAQ'
-    'ESPgoJZmxhbWVTeW5jGAogASgLMhsuRW5jcnlwdGVkQ29udGVudC5GbGFtZVN5bmNICFIJZmxh'
-    'bWVTeW5jiAEBEjsKCHB1c2hLZXlzGAsgASgLMhouRW5jcnlwdGVkQ29udGVudC5QdXNoS2V5c0'
-    'gJUghwdXNoS2V5c4gBARI7CghyZWFjdGlvbhgMIAEoCzIaLkVuY3J5cHRlZENvbnRlbnQuUmVh'
-    'Y3Rpb25IClIIcmVhY3Rpb26IAQESRAoLdGV4dE1lc3NhZ2UYDSABKAsyHS5FbmNyeXB0ZWRDb2'
-    '50ZW50LlRleHRNZXNzYWdlSAtSC3RleHRNZXNzYWdliAEBEkQKC2dyb3VwQ3JlYXRlGA4gASgL'
-    'Mh0uRW5jcnlwdGVkQ29udGVudC5Hcm91cENyZWF0ZUgMUgtncm91cENyZWF0ZYgBARI+Cglncm'
-    '91cEpvaW4YDyABKAsyGy5FbmNyeXB0ZWRDb250ZW50Lkdyb3VwSm9pbkgNUglncm91cEpvaW6I'
-    'AQESRAoLZ3JvdXBVcGRhdGUYECABKAsyHS5FbmNyeXB0ZWRDb250ZW50Lkdyb3VwVXBkYXRlSA'
-    '5SC2dyb3VwVXBkYXRliAEBEl8KFHJlc2VuZEdyb3VwUHVibGljS2V5GBEgASgLMiYuRW5jcnlw'
-    'dGVkQ29udGVudC5SZXNlbmRHcm91cFB1YmxpY0tleUgPUhRyZXNlbmRHcm91cFB1YmxpY0tleY'
-    'gBARJLCg5lcnJvcl9tZXNzYWdlcxgSIAEoCzIfLkVuY3J5cHRlZENvbnRlbnQuRXJyb3JNZXNz'
-    'YWdlc0gQUg1lcnJvck1lc3NhZ2VziAEBEmQKF2FkZGl0aW9uYWxfZGF0YV9tZXNzYWdlGBMgAS'
-    'gLMicuRW5jcnlwdGVkQ29udGVudC5BZGRpdGlvbmFsRGF0YU1lc3NhZ2VIEVIVYWRkaXRpb25h'
-    'bERhdGFNZXNzYWdliAEBElEKEHR5cGluZ19pbmRpY2F0b3IYFCABKAsyIS5FbmNyeXB0ZWRDb2'
-    '50ZW50LlR5cGluZ0luZGljYXRvckgSUg90eXBpbmdJbmRpY2F0b3KIAQEa8AEKDUVycm9yTWVz'
-    'c2FnZXMSOAoEdHlwZRgBIAEoDjIkLkVuY3J5cHRlZENvbnRlbnQuRXJyb3JNZXNzYWdlcy5UeX'
-    'BlUgR0eXBlEiwKEnJlbGF0ZWRfcmVjZWlwdF9pZBgCIAEoCVIQcmVsYXRlZFJlY2VpcHRJZCJ3'
-    'CgRUeXBlEjwKOEVSUk9SX1BST0NFU1NJTkdfTUVTU0FHRV9DUkVBVEVEX0FDQ09VTlRfUkVRVU'
-    'VTVF9JTlNURUFEEAASGAoUVU5LTk9XTl9NRVNTQUdFX1RZUEUQAhIXChNTRVNTSU9OX09VVF9P'
-    'Rl9TWU5DEAMaUQoLR3JvdXBDcmVhdGUSGgoIc3RhdGVLZXkYAyABKAxSCHN0YXRlS2V5EiYKDm'
-    'dyb3VwUHVibGljS2V5GAQgASgMUg5ncm91cFB1YmxpY0tleRozCglHcm91cEpvaW4SJgoOZ3Jv'
-    'dXBQdWJsaWNLZXkYASABKAxSDmdyb3VwUHVibGljS2V5GhYKFFJlc2VuZEdyb3VwUHVibGljS2'
-    'V5GrYCCgtHcm91cFVwZGF0ZRIoCg9ncm91cEFjdGlvblR5cGUYASABKAlSD2dyb3VwQWN0aW9u'
-    'VHlwZRIxChFhZmZlY3RlZENvbnRhY3RJZBgCIAEoA0gAUhFhZmZlY3RlZENvbnRhY3RJZIgBAR'
-    'InCgxuZXdHcm91cE5hbWUYAyABKAlIAVIMbmV3R3JvdXBOYW1liAEBElMKIm5ld0RlbGV0ZU1l'
-    'c3NhZ2VzQWZ0ZXJNaWxsaXNlY29uZHMYBCABKANIAlIibmV3RGVsZXRlTWVzc2FnZXNBZnRlck'
-    '1pbGxpc2Vjb25kc4gBAUIUChJfYWZmZWN0ZWRDb250YWN0SWRCDwoNX25ld0dyb3VwTmFtZUIl'
-    'CiNfbmV3RGVsZXRlTWVzc2FnZXNBZnRlck1pbGxpc2Vjb25kcxqpAQoLVGV4dE1lc3NhZ2USKA'
-    'oPc2VuZGVyTWVzc2FnZUlkGAEgASgJUg9zZW5kZXJNZXNzYWdlSWQSEgoEdGV4dBgCIAEoCVIE'
-    'dGV4dBIcCgl0aW1lc3RhbXAYAyABKANSCXRpbWVzdGFtcBIrCg5xdW90ZU1lc3NhZ2VJZBgEIA'
-    'EoCUgAUg5xdW90ZU1lc3NhZ2VJZIgBAUIRCg9fcXVvdGVNZXNzYWdlSWQazgEKFUFkZGl0aW9u'
-    'YWxEYXRhTWVzc2FnZRIqChFzZW5kZXJfbWVzc2FnZV9pZBgBIAEoCVIPc2VuZGVyTWVzc2FnZU'
-    'lkEhwKCXRpbWVzdGFtcBgCIAEoA1IJdGltZXN0YW1wEhIKBHR5cGUYAyABKAlSBHR5cGUSOwoX'
-    'YWRkaXRpb25hbF9tZXNzYWdlX2RhdGEYBCABKAxIAFIVYWRkaXRpb25hbE1lc3NhZ2VEYXRhiA'
-    'EBQhoKGF9hZGRpdGlvbmFsX21lc3NhZ2VfZGF0YRpiCghSZWFjdGlvbhIoCg90YXJnZXRNZXNz'
-    'YWdlSWQYASABKAlSD3RhcmdldE1lc3NhZ2VJZBIUCgVlbW9qaRgCIAEoCVIFZW1vamkSFgoGcm'
-    'Vtb3ZlGAMgASgIUgZyZW1vdmUatwIKDU1lc3NhZ2VVcGRhdGUSOAoEdHlwZRgBIAEoDjIkLkVu'
-    'Y3J5cHRlZENvbnRlbnQuTWVzc2FnZVVwZGF0ZS5UeXBlUgR0eXBlEi0KD3NlbmRlck1lc3NhZ2'
-    'VJZBgCIAEoCUgAUg9zZW5kZXJNZXNzYWdlSWSIAQESOgoYbXVsdGlwbGVUYXJnZXRNZXNzYWdl'
-    'SWRzGAMgAygJUhhtdWx0aXBsZVRhcmdldE1lc3NhZ2VJZHMSFwoEdGV4dBgEIAEoCUgBUgR0ZX'
-    'h0iAEBEhwKCXRpbWVzdGFtcBgFIAEoA1IJdGltZXN0YW1wIi0KBFR5cGUSCgoGREVMRVRFEAAS'
-    'DQoJRURJVF9URVhUEAESCgoGT1BFTkVEEAJCEgoQX3NlbmRlck1lc3NhZ2VJZEIHCgVfdGV4dB'
-    'rwBQoFTWVkaWESKAoPc2VuZGVyTWVzc2FnZUlkGAEgASgJUg9zZW5kZXJNZXNzYWdlSWQSMAoE'
-    'dHlwZRgCIAEoDjIcLkVuY3J5cHRlZENvbnRlbnQuTWVkaWEuVHlwZVIEdHlwZRJDChpkaXNwbG'
-    'F5TGltaXRJbk1pbGxpc2Vjb25kcxgDIAEoA0gAUhpkaXNwbGF5TGltaXRJbk1pbGxpc2Vjb25k'
-    'c4gBARI2ChZyZXF1aXJlc0F1dGhlbnRpY2F0aW9uGAQgASgIUhZyZXF1aXJlc0F1dGhlbnRpY2'
-    'F0aW9uEhwKCXRpbWVzdGFtcBgFIAEoA1IJdGltZXN0YW1wEisKDnF1b3RlTWVzc2FnZUlkGAYg'
-    'ASgJSAFSDnF1b3RlTWVzc2FnZUlkiAEBEikKDWRvd25sb2FkVG9rZW4YByABKAxIAlINZG93bm'
-    'xvYWRUb2tlbogBARIpCg1lbmNyeXB0aW9uS2V5GAggASgMSANSDWVuY3J5cHRpb25LZXmIAQES'
-    'KQoNZW5jcnlwdGlvbk1hYxgJIAEoDEgEUg1lbmNyeXB0aW9uTWFjiAEBEi0KD2VuY3J5cHRpb2'
-    '5Ob25jZRgKIAEoDEgFUg9lbmNyeXB0aW9uTm9uY2WIAQESOwoXYWRkaXRpb25hbF9tZXNzYWdl'
-    'X2RhdGEYCyABKAxIBlIVYWRkaXRpb25hbE1lc3NhZ2VEYXRhiAEBIj4KBFR5cGUSDAoIUkVVUE'
-    'xPQUQQABIJCgVJTUFHRRABEgkKBVZJREVPEAISBwoDR0lGEAMSCQoFQVVESU8QBEIdChtfZGlz'
-    'cGxheUxpbWl0SW5NaWxsaXNlY29uZHNCEQoPX3F1b3RlTWVzc2FnZUlkQhAKDl9kb3dubG9hZF'
-    'Rva2VuQhAKDl9lbmNyeXB0aW9uS2V5QhAKDl9lbmNyeXB0aW9uTWFjQhIKEF9lbmNyeXB0aW9u'
-    'Tm9uY2VCGgoYX2FkZGl0aW9uYWxfbWVzc2FnZV9kYXRhGqcBCgtNZWRpYVVwZGF0ZRI2CgR0eX'
-    'BlGAEgASgOMiIuRW5jcnlwdGVkQ29udGVudC5NZWRpYVVwZGF0ZS5UeXBlUgR0eXBlEigKD3Rh'
-    'cmdldE1lc3NhZ2VJZBgCIAEoCVIPdGFyZ2V0TWVzc2FnZUlkIjYKBFR5cGUSDAoIUkVPUEVORU'
-    'QQABIKCgZTVE9SRUQQARIUChBERUNSWVBUSU9OX0VSUk9SEAIaeAoOQ29udGFjdFJlcXVlc3QS'
-    'OQoEdHlwZRgBIAEoDjIlLkVuY3J5cHRlZENvbnRlbnQuQ29udGFjdFJlcXVlc3QuVHlwZVIEdH'
-    'lwZSIrCgRUeXBlEgsKB1JFUVVFU1QQABIKCgZSRUpFQ1QQARIKCgZBQ0NFUFQQAhqeAgoNQ29u'
-    'dGFjdFVwZGF0ZRI4CgR0eXBlGAEgASgOMiQuRW5jcnlwdGVkQ29udGVudC5Db250YWN0VXBkYX'
-    'RlLlR5cGVSBHR5cGUSNQoTYXZhdGFyU3ZnQ29tcHJlc3NlZBgCIAEoDEgAUhNhdmF0YXJTdmdD'
-    'b21wcmVzc2VkiAEBEh8KCHVzZXJuYW1lGAMgASgJSAFSCHVzZXJuYW1liAEBEiUKC2Rpc3BsYX'
-    'lOYW1lGAQgASgJSAJSC2Rpc3BsYXlOYW1liAEBIh8KBFR5cGUSCwoHUkVRVUVTVBAAEgoKBlVQ'
-    'REFURRABQhYKFF9hdmF0YXJTdmdDb21wcmVzc2VkQgsKCV91c2VybmFtZUIOCgxfZGlzcGxheU'
-    '5hbWUa1QEKCFB1c2hLZXlzEjMKBHR5cGUYASABKA4yHy5FbmNyeXB0ZWRDb250ZW50LlB1c2hL'
-    'ZXlzLlR5cGVSBHR5cGUSGQoFa2V5SWQYAiABKANIAFIFa2V5SWSIAQESFQoDa2V5GAMgASgMSA'
-    'FSA2tleYgBARIhCgljcmVhdGVkQXQYBCABKANIAlIJY3JlYXRlZEF0iAEBIh8KBFR5cGUSCwoH'
-    'UkVRVUVTVBAAEgoKBlVQREFURRABQggKBl9rZXlJZEIGCgRfa2V5QgwKCl9jcmVhdGVkQXQaqQ'
-    'EKCUZsYW1lU3luYxIiCgxmbGFtZUNvdW50ZXIYASABKANSDGZsYW1lQ291bnRlchI2ChZsYXN0'
-    'RmxhbWVDb3VudGVyQ2hhbmdlGAIgASgDUhZsYXN0RmxhbWVDb3VudGVyQ2hhbmdlEh4KCmJlc3'
-    'RGcmllbmQYAyABKAhSCmJlc3RGcmllbmQSIAoLZm9yY2VVcGRhdGUYBCABKAhSC2ZvcmNlVXBk'
-    'YXRlGk0KD1R5cGluZ0luZGljYXRvchIbCglpc190eXBpbmcYASABKAhSCGlzVHlwaW5nEh0KCm'
-    'NyZWF0ZWRfYXQYAiABKANSCWNyZWF0ZWRBdEIKCghfZ3JvdXBJZEIPCg1faXNEaXJlY3RDaGF0'
-    'QhcKFV9zZW5kZXJQcm9maWxlQ291bnRlckIQCg5fbWVzc2FnZVVwZGF0ZUIICgZfbWVkaWFCDg'
-    'oMX21lZGlhVXBkYXRlQhAKDl9jb250YWN0VXBkYXRlQhEKD19jb250YWN0UmVxdWVzdEIMCgpf'
-    'ZmxhbWVTeW5jQgsKCV9wdXNoS2V5c0ILCglfcmVhY3Rpb25CDgoMX3RleHRNZXNzYWdlQg4KDF'
-    '9ncm91cENyZWF0ZUIMCgpfZ3JvdXBKb2luQg4KDF9ncm91cFVwZGF0ZUIXChVfcmVzZW5kR3Jv'
-    'dXBQdWJsaWNLZXlCEQoPX2Vycm9yX21lc3NhZ2VzQhoKGF9hZGRpdGlvbmFsX2RhdGFfbWVzc2'
-    'FnZUITChFfdHlwaW5nX2luZGljYXRvcg==');
+    'ChBFbmNyeXB0ZWRDb250ZW50Eh4KCGdyb3VwX2lkGAIgASgJSABSB2dyb3VwSWSIAQESKQoOaX'
+    'NfZGlyZWN0X2NoYXQYAyABKAhIAVIMaXNEaXJlY3RDaGF0iAEBEjkKFnNlbmRlcl9wcm9maWxl'
+    'X2NvdW50ZXIYBCABKANIAlIUc2VuZGVyUHJvZmlsZUNvdW50ZXKIAQESRgodc2VuZGVyX3VzZX'
+    'JfZGlzY292ZXJ5X3ZlcnNpb24YFSABKAxIA1Iac2VuZGVyVXNlckRpc2NvdmVyeVZlcnNpb26I'
+    'AQESSwoObWVzc2FnZV91cGRhdGUYBSABKAsyHy5FbmNyeXB0ZWRDb250ZW50Lk1lc3NhZ2VVcG'
+    'RhdGVIBFINbWVzc2FnZVVwZGF0ZYgBARIyCgVtZWRpYRgGIAEoCzIXLkVuY3J5cHRlZENvbnRl'
+    'bnQuTWVkaWFIBVIFbWVkaWGIAQESRQoMbWVkaWFfdXBkYXRlGAcgASgLMh0uRW5jcnlwdGVkQ2'
+    '9udGVudC5NZWRpYVVwZGF0ZUgGUgttZWRpYVVwZGF0ZYgBARJLCg5jb250YWN0X3VwZGF0ZRgI'
+    'IAEoCzIfLkVuY3J5cHRlZENvbnRlbnQuQ29udGFjdFVwZGF0ZUgHUg1jb250YWN0VXBkYXRliA'
+    'EBEk4KD2NvbnRhY3RfcmVxdWVzdBgJIAEoCzIgLkVuY3J5cHRlZENvbnRlbnQuQ29udGFjdFJl'
+    'cXVlc3RICFIOY29udGFjdFJlcXVlc3SIAQESPwoKZmxhbWVfc3luYxgKIAEoCzIbLkVuY3J5cH'
+    'RlZENvbnRlbnQuRmxhbWVTeW5jSAlSCWZsYW1lU3luY4gBARI8CglwdXNoX2tleXMYCyABKAsy'
+    'Gi5FbmNyeXB0ZWRDb250ZW50LlB1c2hLZXlzSApSCHB1c2hLZXlziAEBEjsKCHJlYWN0aW9uGA'
+    'wgASgLMhouRW5jcnlwdGVkQ29udGVudC5SZWFjdGlvbkgLUghyZWFjdGlvbogBARJFCgx0ZXh0'
+    'X21lc3NhZ2UYDSABKAsyHS5FbmNyeXB0ZWRDb250ZW50LlRleHRNZXNzYWdlSAxSC3RleHRNZX'
+    'NzYWdliAEBEkUKDGdyb3VwX2NyZWF0ZRgOIAEoCzIdLkVuY3J5cHRlZENvbnRlbnQuR3JvdXBD'
+    'cmVhdGVIDVILZ3JvdXBDcmVhdGWIAQESPwoKZ3JvdXBfam9pbhgPIAEoCzIbLkVuY3J5cHRlZE'
+    'NvbnRlbnQuR3JvdXBKb2luSA5SCWdyb3VwSm9pbogBARJFCgxncm91cF91cGRhdGUYECABKAsy'
+    'HS5FbmNyeXB0ZWRDb250ZW50Lkdyb3VwVXBkYXRlSA9SC2dyb3VwVXBkYXRliAEBEmIKF3Jlc2'
+    'VuZF9ncm91cF9wdWJsaWNfa2V5GBEgASgLMiYuRW5jcnlwdGVkQ29udGVudC5SZXNlbmRHcm91'
+    'cFB1YmxpY0tleUgQUhRyZXNlbmRHcm91cFB1YmxpY0tleYgBARJLCg5lcnJvcl9tZXNzYWdlcx'
+    'gSIAEoCzIfLkVuY3J5cHRlZENvbnRlbnQuRXJyb3JNZXNzYWdlc0gRUg1lcnJvck1lc3NhZ2Vz'
+    'iAEBEmQKF2FkZGl0aW9uYWxfZGF0YV9tZXNzYWdlGBMgASgLMicuRW5jcnlwdGVkQ29udGVudC'
+    '5BZGRpdGlvbmFsRGF0YU1lc3NhZ2VIElIVYWRkaXRpb25hbERhdGFNZXNzYWdliAEBElEKEHR5'
+    'cGluZ19pbmRpY2F0b3IYFCABKAsyIS5FbmNyeXB0ZWRDb250ZW50LlR5cGluZ0luZGljYXRvck'
+    'gTUg90eXBpbmdJbmRpY2F0b3KIAQESYQoWdXNlcl9kaXNjb3ZlcnlfcmVxdWVzdBgWIAEoCzIm'
+    'LkVuY3J5cHRlZENvbnRlbnQuVXNlckRpc2NvdmVyeVJlcXVlc3RIFFIUdXNlckRpc2NvdmVyeV'
+    'JlcXVlc3SIAQESXgoVdXNlcl9kaXNjb3ZlcnlfdXBkYXRlGBcgASgLMiUuRW5jcnlwdGVkQ29u'
+    'dGVudC5Vc2VyRGlzY292ZXJ5VXBkYXRlSBVSE3VzZXJEaXNjb3ZlcnlVcGRhdGWIAQESYQoWa2'
+    'V5X3ZlcmlmaWNhdGlvbl9wcm9vZhgYIAEoCzImLkVuY3J5cHRlZENvbnRlbnQuS2V5VmVyaWZp'
+    'Y2F0aW9uUHJvb2ZIFlIUa2V5VmVyaWZpY2F0aW9uUHJvb2aIAQEa8AEKDUVycm9yTWVzc2FnZX'
+    'MSOAoEdHlwZRgBIAEoDjIkLkVuY3J5cHRlZENvbnRlbnQuRXJyb3JNZXNzYWdlcy5UeXBlUgR0'
+    'eXBlEiwKEnJlbGF0ZWRfcmVjZWlwdF9pZBgCIAEoCVIQcmVsYXRlZFJlY2VpcHRJZCJ3CgRUeX'
+    'BlEjwKOEVSUk9SX1BST0NFU1NJTkdfTUVTU0FHRV9DUkVBVEVEX0FDQ09VTlRfUkVRVUVTVF9J'
+    'TlNURUFEEAASGAoUVU5LTk9XTl9NRVNTQUdFX1RZUEUQAhIXChNTRVNTSU9OX09VVF9PRl9TWU'
+    '5DEAMaVAoLR3JvdXBDcmVhdGUSGwoJc3RhdGVfa2V5GAMgASgMUghzdGF0ZUtleRIoChBncm91'
+    'cF9wdWJsaWNfa2V5GAQgASgMUg5ncm91cFB1YmxpY0tleRo1CglHcm91cEpvaW4SKAoQZ3JvdX'
+    'BfcHVibGljX2tleRgBIAEoDFIOZ3JvdXBQdWJsaWNLZXkaFgoUUmVzZW5kR3JvdXBQdWJsaWNL'
+    'ZXkayAIKC0dyb3VwVXBkYXRlEioKEWdyb3VwX2FjdGlvbl90eXBlGAEgASgJUg9ncm91cEFjdG'
+    'lvblR5cGUSMwoTYWZmZWN0ZWRfY29udGFjdF9pZBgCIAEoA0gAUhFhZmZlY3RlZENvbnRhY3RJ'
+    'ZIgBARIpCg5uZXdfZ3JvdXBfbmFtZRgDIAEoCUgBUgxuZXdHcm91cE5hbWWIAQESVwombmV3X2'
+    'RlbGV0ZV9tZXNzYWdlc19hZnRlcl9taWxsaXNlY29uZHMYBCABKANIAlIibmV3RGVsZXRlTWVz'
+    'c2FnZXNBZnRlck1pbGxpc2Vjb25kc4gBAUIWChRfYWZmZWN0ZWRfY29udGFjdF9pZEIRCg9fbm'
+    'V3X2dyb3VwX25hbWVCKQonX25ld19kZWxldGVfbWVzc2FnZXNfYWZ0ZXJfbWlsbGlzZWNvbmRz'
+    'Gq8BCgtUZXh0TWVzc2FnZRIqChFzZW5kZXJfbWVzc2FnZV9pZBgBIAEoCVIPc2VuZGVyTWVzc2'
+    'FnZUlkEhIKBHRleHQYAiABKAlSBHRleHQSHAoJdGltZXN0YW1wGAMgASgDUgl0aW1lc3RhbXAS'
+    'LQoQcXVvdGVfbWVzc2FnZV9pZBgEIAEoCUgAUg5xdW90ZU1lc3NhZ2VJZIgBAUITChFfcXVvdG'
+    'VfbWVzc2FnZV9pZBrOAQoVQWRkaXRpb25hbERhdGFNZXNzYWdlEioKEXNlbmRlcl9tZXNzYWdl'
+    'X2lkGAEgASgJUg9zZW5kZXJNZXNzYWdlSWQSHAoJdGltZXN0YW1wGAIgASgDUgl0aW1lc3RhbX'
+    'ASEgoEdHlwZRgDIAEoCVIEdHlwZRI7ChdhZGRpdGlvbmFsX21lc3NhZ2VfZGF0YRgEIAEoDEgA'
+    'UhVhZGRpdGlvbmFsTWVzc2FnZURhdGGIAQFCGgoYX2FkZGl0aW9uYWxfbWVzc2FnZV9kYXRhGm'
+    'QKCFJlYWN0aW9uEioKEXRhcmdldF9tZXNzYWdlX2lkGAEgASgJUg90YXJnZXRNZXNzYWdlSWQS'
+    'FAoFZW1vamkYAiABKAlSBWVtb2ppEhYKBnJlbW92ZRgDIAEoCFIGcmVtb3ZlGr4CCg1NZXNzYW'
+    'dlVXBkYXRlEjgKBHR5cGUYASABKA4yJC5FbmNyeXB0ZWRDb250ZW50Lk1lc3NhZ2VVcGRhdGUu'
+    'VHlwZVIEdHlwZRIvChFzZW5kZXJfbWVzc2FnZV9pZBgCIAEoCUgAUg9zZW5kZXJNZXNzYWdlSW'
+    'SIAQESPQobbXVsdGlwbGVfdGFyZ2V0X21lc3NhZ2VfaWRzGAMgAygJUhhtdWx0aXBsZVRhcmdl'
+    'dE1lc3NhZ2VJZHMSFwoEdGV4dBgEIAEoCUgBUgR0ZXh0iAEBEhwKCXRpbWVzdGFtcBgFIAEoA1'
+    'IJdGltZXN0YW1wIi0KBFR5cGUSCgoGREVMRVRFEAASDQoJRURJVF9URVhUEAESCgoGT1BFTkVE'
+    'EAJCFAoSX3NlbmRlcl9tZXNzYWdlX2lkQgcKBV90ZXh0GoUGCgVNZWRpYRIqChFzZW5kZXJfbW'
+    'Vzc2FnZV9pZBgBIAEoCVIPc2VuZGVyTWVzc2FnZUlkEjAKBHR5cGUYAiABKA4yHC5FbmNyeXB0'
+    'ZWRDb250ZW50Lk1lZGlhLlR5cGVSBHR5cGUSRgodZGlzcGxheV9saW1pdF9pbl9taWxsaXNlY2'
+    '9uZHMYAyABKANIAFIaZGlzcGxheUxpbWl0SW5NaWxsaXNlY29uZHOIAQESNwoXcmVxdWlyZXNf'
+    'YXV0aGVudGljYXRpb24YBCABKAhSFnJlcXVpcmVzQXV0aGVudGljYXRpb24SHAoJdGltZXN0YW'
+    '1wGAUgASgDUgl0aW1lc3RhbXASLQoQcXVvdGVfbWVzc2FnZV9pZBgGIAEoCUgBUg5xdW90ZU1l'
+    'c3NhZ2VJZIgBARIqCg5kb3dubG9hZF90b2tlbhgHIAEoDEgCUg1kb3dubG9hZFRva2VuiAEBEi'
+    'oKDmVuY3J5cHRpb25fa2V5GAggASgMSANSDWVuY3J5cHRpb25LZXmIAQESKgoOZW5jcnlwdGlv'
+    'bl9tYWMYCSABKAxIBFINZW5jcnlwdGlvbk1hY4gBARIuChBlbmNyeXB0aW9uX25vbmNlGAogAS'
+    'gMSAVSD2VuY3J5cHRpb25Ob25jZYgBARI7ChdhZGRpdGlvbmFsX21lc3NhZ2VfZGF0YRgLIAEo'
+    'DEgGUhVhZGRpdGlvbmFsTWVzc2FnZURhdGGIAQEiPgoEVHlwZRIMCghSRVVQTE9BRBAAEgkKBU'
+    'lNQUdFEAESCQoFVklERU8QAhIHCgNHSUYQAxIJCgVBVURJTxAEQiAKHl9kaXNwbGF5X2xpbWl0'
+    'X2luX21pbGxpc2Vjb25kc0ITChFfcXVvdGVfbWVzc2FnZV9pZEIRCg9fZG93bmxvYWRfdG9rZW'
+    '5CEQoPX2VuY3J5cHRpb25fa2V5QhEKD19lbmNyeXB0aW9uX21hY0ITChFfZW5jcnlwdGlvbl9u'
+    'b25jZUIaChhfYWRkaXRpb25hbF9tZXNzYWdlX2RhdGEaqQEKC01lZGlhVXBkYXRlEjYKBHR5cG'
+    'UYASABKA4yIi5FbmNyeXB0ZWRDb250ZW50Lk1lZGlhVXBkYXRlLlR5cGVSBHR5cGUSKgoRdGFy'
+    'Z2V0X21lc3NhZ2VfaWQYAiABKAlSD3RhcmdldE1lc3NhZ2VJZCI2CgRUeXBlEgwKCFJFT1BFTk'
+    'VEEAASCgoGU1RPUkVEEAESFAoQREVDUllQVElPTl9FUlJPUhACGngKDkNvbnRhY3RSZXF1ZXN0'
+    'EjkKBHR5cGUYASABKA4yJS5FbmNyeXB0ZWRDb250ZW50LkNvbnRhY3RSZXF1ZXN0LlR5cGVSBH'
+    'R5cGUiKwoEVHlwZRILCgdSRVFVRVNUEAASCgoGUkVKRUNUEAESCgoGQUNDRVBUEAIapAIKDUNv'
+    'bnRhY3RVcGRhdGUSOAoEdHlwZRgBIAEoDjIkLkVuY3J5cHRlZENvbnRlbnQuQ29udGFjdFVwZG'
+    'F0ZS5UeXBlUgR0eXBlEjcKFWF2YXRhcl9zdmdfY29tcHJlc3NlZBgCIAEoDEgAUhNhdmF0YXJT'
+    'dmdDb21wcmVzc2VkiAEBEh8KCHVzZXJuYW1lGAMgASgJSAFSCHVzZXJuYW1liAEBEiYKDGRpc3'
+    'BsYXlfbmFtZRgEIAEoCUgCUgtkaXNwbGF5TmFtZYgBASIfCgRUeXBlEgsKB1JFUVVFU1QQABIK'
+    'CgZVUERBVEUQAUIYChZfYXZhdGFyX3N2Z19jb21wcmVzc2VkQgsKCV91c2VybmFtZUIPCg1fZG'
+    'lzcGxheV9uYW1lGtkBCghQdXNoS2V5cxIzCgR0eXBlGAEgASgOMh8uRW5jcnlwdGVkQ29udGVu'
+    'dC5QdXNoS2V5cy5UeXBlUgR0eXBlEhoKBmtleV9pZBgCIAEoA0gAUgVrZXlJZIgBARIVCgNrZX'
+    'kYAyABKAxIAVIDa2V5iAEBEiIKCmNyZWF0ZWRfYXQYBCABKANIAlIJY3JlYXRlZEF0iAEBIh8K'
+    'BFR5cGUSCwoHUkVRVUVTVBAAEgoKBlVQREFURRABQgkKB19rZXlfaWRCBgoEX2tleUINCgtfY3'
+    'JlYXRlZF9hdBqvAQoJRmxhbWVTeW5jEiMKDWZsYW1lX2NvdW50ZXIYASABKANSDGZsYW1lQ291'
+    'bnRlchI5ChlsYXN0X2ZsYW1lX2NvdW50ZXJfY2hhbmdlGAIgASgDUhZsYXN0RmxhbWVDb3VudG'
+    'VyQ2hhbmdlEh8KC2Jlc3RfZnJpZW5kGAMgASgIUgpiZXN0RnJpZW5kEiEKDGZvcmNlX3VwZGF0'
+    'ZRgEIAEoCFILZm9yY2VVcGRhdGUaTQoPVHlwaW5nSW5kaWNhdG9yEhsKCWlzX3R5cGluZxgBIA'
+    'EoCFIIaXNUeXBpbmcSHQoKY3JlYXRlZF9hdBgCIAEoA1IJY3JlYXRlZEF0Gj8KFFVzZXJEaXNj'
+    'b3ZlcnlSZXF1ZXN0EicKD2N1cnJlbnRfdmVyc2lvbhgBIAEoDFIOY3VycmVudFZlcnNpb24aMQ'
+    'oTVXNlckRpc2NvdmVyeVVwZGF0ZRIaCghtZXNzYWdlcxgBIAMoDFIIbWVzc2FnZXMaPQoUS2V5'
+    'VmVyaWZpY2F0aW9uUHJvb2YSJQoOY2FsY3VsYXRlZF9tYWMYASABKAxSDWNhbGN1bGF0ZWRNYW'
+    'NCCwoJX2dyb3VwX2lkQhEKD19pc19kaXJlY3RfY2hhdEIZChdfc2VuZGVyX3Byb2ZpbGVfY291'
+    'bnRlckIgCh5fc2VuZGVyX3VzZXJfZGlzY292ZXJ5X3ZlcnNpb25CEQoPX21lc3NhZ2VfdXBkYX'
+    'RlQggKBl9tZWRpYUIPCg1fbWVkaWFfdXBkYXRlQhEKD19jb250YWN0X3VwZGF0ZUISChBfY29u'
+    'dGFjdF9yZXF1ZXN0Qg0KC19mbGFtZV9zeW5jQgwKCl9wdXNoX2tleXNCCwoJX3JlYWN0aW9uQg'
+    '8KDV90ZXh0X21lc3NhZ2VCDwoNX2dyb3VwX2NyZWF0ZUINCgtfZ3JvdXBfam9pbkIPCg1fZ3Jv'
+    'dXBfdXBkYXRlQhoKGF9yZXNlbmRfZ3JvdXBfcHVibGljX2tleUIRCg9fZXJyb3JfbWVzc2FnZX'
+    'NCGgoYX2FkZGl0aW9uYWxfZGF0YV9tZXNzYWdlQhMKEV90eXBpbmdfaW5kaWNhdG9yQhkKF191'
+    'c2VyX2Rpc2NvdmVyeV9yZXF1ZXN0QhgKFl91c2VyX2Rpc2NvdmVyeV91cGRhdGVCGQoXX2tleV'
+    '92ZXJpZmljYXRpb25fcHJvb2Y=');
diff --git a/lib/src/model/protobuf/client/generated/push_notification.pb.dart b/lib/src/model/protobuf/client/generated/push_notification.pb.dart
index 8bff1bb7..009928ee 100644
--- a/lib/src/model/protobuf/client/generated/push_notification.pb.dart
+++ b/lib/src/model/protobuf/client/generated/push_notification.pb.dart
@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
@@ -48,7 +48,7 @@ class EncryptedPushNotification extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'EncryptedPushNotification',
       createEmptyInstance: create)
-    ..aInt64(1, _omitFieldNames ? '' : 'keyId', protoName: 'keyId')
+    ..aInt64(1, _omitFieldNames ? '' : 'keyId')
     ..a<$core.List<$core.int>>(
         2, _omitFieldNames ? '' : 'nonce', $pb.PbFieldType.OY)
     ..a<$core.List<$core.int>>(
@@ -58,8 +58,7 @@ class EncryptedPushNotification extends $pb.GeneratedMessage {
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  EncryptedPushNotification clone() =>
-      EncryptedPushNotification()..mergeFromMessage(this);
+  EncryptedPushNotification clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   EncryptedPushNotification copyWith(
           void Function(EncryptedPushNotification) updates) =>
@@ -73,8 +72,6 @@ class EncryptedPushNotification extends $pb.GeneratedMessage {
   static EncryptedPushNotification create() => EncryptedPushNotification._();
   @$core.override
   EncryptedPushNotification createEmptyInstance() => create();
-  static $pb.PbList<EncryptedPushNotification> createRepeated() =>
-      $pb.PbList<EncryptedPushNotification>();
   @$core.pragma('dart2js:noInline')
   static EncryptedPushNotification getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<EncryptedPushNotification>(create);
@@ -142,17 +139,14 @@ class PushNotification extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'PushNotification',
       createEmptyInstance: create)
-    ..e<PushKind>(1, _omitFieldNames ? '' : 'kind', $pb.PbFieldType.OE,
-        defaultOrMaker: PushKind.reaction,
-        valueOf: PushKind.valueOf,
+    ..aE<PushKind>(1, _omitFieldNames ? '' : 'kind',
         enumValues: PushKind.values)
-    ..aOS(2, _omitFieldNames ? '' : 'messageId', protoName: 'messageId')
-    ..aOS(3, _omitFieldNames ? '' : 'additionalContent',
-        protoName: 'additionalContent')
+    ..aOS(2, _omitFieldNames ? '' : 'messageId')
+    ..aOS(3, _omitFieldNames ? '' : 'additionalContent')
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  PushNotification clone() => PushNotification()..mergeFromMessage(this);
+  PushNotification clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   PushNotification copyWith(void Function(PushNotification) updates) =>
       super.copyWith((message) => updates(message as PushNotification))
@@ -165,8 +159,6 @@ class PushNotification extends $pb.GeneratedMessage {
   static PushNotification create() => PushNotification._();
   @$core.override
   PushNotification createEmptyInstance() => create();
-  static $pb.PbList<PushNotification> createRepeated() =>
-      $pb.PbList<PushNotification>();
   @$core.pragma('dart2js:noInline')
   static PushNotification getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<PushNotification>(create);
@@ -221,12 +213,12 @@ class PushUsers extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'PushUsers',
       createEmptyInstance: create)
-    ..pc<PushUser>(1, _omitFieldNames ? '' : 'users', $pb.PbFieldType.PM,
+    ..pPM<PushUser>(1, _omitFieldNames ? '' : 'users',
         subBuilder: PushUser.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  PushUsers clone() => PushUsers()..mergeFromMessage(this);
+  PushUsers clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   PushUsers copyWith(void Function(PushUsers) updates) =>
       super.copyWith((message) => updates(message as PushUsers)) as PushUsers;
@@ -238,7 +230,6 @@ class PushUsers extends $pb.GeneratedMessage {
   static PushUsers create() => PushUsers._();
   @$core.override
   PushUsers createEmptyInstance() => create();
-  static $pb.PbList<PushUsers> createRepeated() => $pb.PbList<PushUsers>();
   @$core.pragma('dart2js:noInline')
   static PushUsers getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PushUsers>(create);
@@ -277,16 +268,16 @@ class PushUser extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'PushUser',
       createEmptyInstance: create)
-    ..aInt64(1, _omitFieldNames ? '' : 'userId', protoName: 'userId')
-    ..aOS(2, _omitFieldNames ? '' : 'displayName', protoName: 'displayName')
+    ..aInt64(1, _omitFieldNames ? '' : 'userId')
+    ..aOS(2, _omitFieldNames ? '' : 'displayName')
     ..aOB(3, _omitFieldNames ? '' : 'blocked')
-    ..aOS(4, _omitFieldNames ? '' : 'lastMessageId', protoName: 'lastMessageId')
-    ..pc<PushKey>(5, _omitFieldNames ? '' : 'pushKeys', $pb.PbFieldType.PM,
-        protoName: 'pushKeys', subBuilder: PushKey.create)
+    ..aOS(4, _omitFieldNames ? '' : 'lastMessageId')
+    ..pPM<PushKey>(5, _omitFieldNames ? '' : 'pushKeys',
+        subBuilder: PushKey.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  PushUser clone() => PushUser()..mergeFromMessage(this);
+  PushUser clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   PushUser copyWith(void Function(PushUser) updates) =>
       super.copyWith((message) => updates(message as PushUser)) as PushUser;
@@ -298,7 +289,6 @@ class PushUser extends $pb.GeneratedMessage {
   static PushUser create() => PushUser._();
   @$core.override
   PushUser createEmptyInstance() => create();
-  static $pb.PbList<PushUser> createRepeated() => $pb.PbList<PushUser>();
   @$core.pragma('dart2js:noInline')
   static PushUser getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PushUser>(create);
@@ -373,12 +363,11 @@ class PushKey extends $pb.GeneratedMessage {
     ..aInt64(1, _omitFieldNames ? '' : 'id')
     ..a<$core.List<$core.int>>(
         2, _omitFieldNames ? '' : 'key', $pb.PbFieldType.OY)
-    ..aInt64(3, _omitFieldNames ? '' : 'createdAtUnixTimestamp',
-        protoName: 'createdAtUnixTimestamp')
+    ..aInt64(3, _omitFieldNames ? '' : 'createdAtUnixTimestamp')
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  PushKey clone() => PushKey()..mergeFromMessage(this);
+  PushKey clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   PushKey copyWith(void Function(PushKey) updates) =>
       super.copyWith((message) => updates(message as PushKey)) as PushKey;
@@ -390,7 +379,6 @@ class PushKey extends $pb.GeneratedMessage {
   static PushKey create() => PushKey._();
   @$core.override
   PushKey createEmptyInstance() => create();
-  static $pb.PbList<PushKey> createRepeated() => $pb.PbList<PushKey>();
   @$core.pragma('dart2js:noInline')
   static PushKey getDefault() =>
       _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PushKey>(create);
diff --git a/lib/src/model/protobuf/client/generated/push_notification.pbenum.dart b/lib/src/model/protobuf/client/generated/push_notification.pbenum.dart
index a315a3b8..f205a976 100644
--- a/lib/src/model/protobuf/client/generated/push_notification.pbenum.dart
+++ b/lib/src/model/protobuf/client/generated/push_notification.pbenum.dart
@@ -8,61 +8,61 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
 class PushKind extends $pb.ProtobufEnum {
-  static const PushKind reaction =
-      PushKind._(0, _omitEnumNames ? '' : 'reaction');
-  static const PushKind response =
-      PushKind._(1, _omitEnumNames ? '' : 'response');
-  static const PushKind text = PushKind._(2, _omitEnumNames ? '' : 'text');
-  static const PushKind video = PushKind._(3, _omitEnumNames ? '' : 'video');
-  static const PushKind twonly = PushKind._(4, _omitEnumNames ? '' : 'twonly');
-  static const PushKind image = PushKind._(5, _omitEnumNames ? '' : 'image');
-  static const PushKind contactRequest =
-      PushKind._(6, _omitEnumNames ? '' : 'contactRequest');
-  static const PushKind acceptRequest =
-      PushKind._(7, _omitEnumNames ? '' : 'acceptRequest');
-  static const PushKind storedMediaFile =
-      PushKind._(8, _omitEnumNames ? '' : 'storedMediaFile');
-  static const PushKind testNotification =
-      PushKind._(9, _omitEnumNames ? '' : 'testNotification');
-  static const PushKind reopenedMedia =
-      PushKind._(10, _omitEnumNames ? '' : 'reopenedMedia');
-  static const PushKind reactionToVideo =
-      PushKind._(11, _omitEnumNames ? '' : 'reactionToVideo');
-  static const PushKind reactionToText =
-      PushKind._(12, _omitEnumNames ? '' : 'reactionToText');
-  static const PushKind reactionToImage =
-      PushKind._(13, _omitEnumNames ? '' : 'reactionToImage');
-  static const PushKind reactionToAudio =
-      PushKind._(14, _omitEnumNames ? '' : 'reactionToAudio');
-  static const PushKind addedToGroup =
-      PushKind._(15, _omitEnumNames ? '' : 'addedToGroup');
-  static const PushKind audio = PushKind._(16, _omitEnumNames ? '' : 'audio');
+  static const PushKind REACTION =
+      PushKind._(0, _omitEnumNames ? '' : 'REACTION');
+  static const PushKind RESPONSE =
+      PushKind._(1, _omitEnumNames ? '' : 'RESPONSE');
+  static const PushKind TEXT = PushKind._(2, _omitEnumNames ? '' : 'TEXT');
+  static const PushKind VIDEO = PushKind._(3, _omitEnumNames ? '' : 'VIDEO');
+  static const PushKind TWONLY = PushKind._(4, _omitEnumNames ? '' : 'TWONLY');
+  static const PushKind IMAGE = PushKind._(5, _omitEnumNames ? '' : 'IMAGE');
+  static const PushKind CONTACT_REQUEST =
+      PushKind._(6, _omitEnumNames ? '' : 'CONTACT_REQUEST');
+  static const PushKind ACCEPT_REQUEST =
+      PushKind._(7, _omitEnumNames ? '' : 'ACCEPT_REQUEST');
+  static const PushKind STORED_MEDIA_FILE =
+      PushKind._(8, _omitEnumNames ? '' : 'STORED_MEDIA_FILE');
+  static const PushKind TEST_NOTIFICATION =
+      PushKind._(9, _omitEnumNames ? '' : 'TEST_NOTIFICATION');
+  static const PushKind REOPENED_MEDIA =
+      PushKind._(10, _omitEnumNames ? '' : 'REOPENED_MEDIA');
+  static const PushKind REACTION_TO_VIDEO =
+      PushKind._(11, _omitEnumNames ? '' : 'REACTION_TO_VIDEO');
+  static const PushKind REACTION_TO_TEXT =
+      PushKind._(12, _omitEnumNames ? '' : 'REACTION_TO_TEXT');
+  static const PushKind REACTION_TO_IMAGE =
+      PushKind._(13, _omitEnumNames ? '' : 'REACTION_TO_IMAGE');
+  static const PushKind REACTION_TO_AUDIO =
+      PushKind._(14, _omitEnumNames ? '' : 'REACTION_TO_AUDIO');
+  static const PushKind ADDED_TO_GROUP =
+      PushKind._(15, _omitEnumNames ? '' : 'ADDED_TO_GROUP');
+  static const PushKind AUDIO = PushKind._(16, _omitEnumNames ? '' : 'AUDIO');
 
   static const $core.List<PushKind> values = <PushKind>[
-    reaction,
-    response,
-    text,
-    video,
-    twonly,
-    image,
-    contactRequest,
-    acceptRequest,
-    storedMediaFile,
-    testNotification,
-    reopenedMedia,
-    reactionToVideo,
-    reactionToText,
-    reactionToImage,
-    reactionToAudio,
-    addedToGroup,
-    audio,
+    REACTION,
+    RESPONSE,
+    TEXT,
+    VIDEO,
+    TWONLY,
+    IMAGE,
+    CONTACT_REQUEST,
+    ACCEPT_REQUEST,
+    STORED_MEDIA_FILE,
+    TEST_NOTIFICATION,
+    REOPENED_MEDIA,
+    REACTION_TO_VIDEO,
+    REACTION_TO_TEXT,
+    REACTION_TO_IMAGE,
+    REACTION_TO_AUDIO,
+    ADDED_TO_GROUP,
+    AUDIO,
   ];
 
   static final $core.List<PushKind?> _byValue =
diff --git a/lib/src/model/protobuf/client/generated/push_notification.pbjson.dart b/lib/src/model/protobuf/client/generated/push_notification.pbjson.dart
index d756e6f0..2baf2fd6 100644
--- a/lib/src/model/protobuf/client/generated/push_notification.pbjson.dart
+++ b/lib/src/model/protobuf/client/generated/push_notification.pbjson.dart
@@ -8,7 +8,8 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -18,40 +19,40 @@ import 'dart:typed_data' as $typed_data;
 const PushKind$json = {
   '1': 'PushKind',
   '2': [
-    {'1': 'reaction', '2': 0},
-    {'1': 'response', '2': 1},
-    {'1': 'text', '2': 2},
-    {'1': 'video', '2': 3},
-    {'1': 'twonly', '2': 4},
-    {'1': 'image', '2': 5},
-    {'1': 'contactRequest', '2': 6},
-    {'1': 'acceptRequest', '2': 7},
-    {'1': 'storedMediaFile', '2': 8},
-    {'1': 'testNotification', '2': 9},
-    {'1': 'reopenedMedia', '2': 10},
-    {'1': 'reactionToVideo', '2': 11},
-    {'1': 'reactionToText', '2': 12},
-    {'1': 'reactionToImage', '2': 13},
-    {'1': 'reactionToAudio', '2': 14},
-    {'1': 'addedToGroup', '2': 15},
-    {'1': 'audio', '2': 16},
+    {'1': 'REACTION', '2': 0},
+    {'1': 'RESPONSE', '2': 1},
+    {'1': 'TEXT', '2': 2},
+    {'1': 'VIDEO', '2': 3},
+    {'1': 'TWONLY', '2': 4},
+    {'1': 'IMAGE', '2': 5},
+    {'1': 'CONTACT_REQUEST', '2': 6},
+    {'1': 'ACCEPT_REQUEST', '2': 7},
+    {'1': 'STORED_MEDIA_FILE', '2': 8},
+    {'1': 'TEST_NOTIFICATION', '2': 9},
+    {'1': 'REOPENED_MEDIA', '2': 10},
+    {'1': 'REACTION_TO_VIDEO', '2': 11},
+    {'1': 'REACTION_TO_TEXT', '2': 12},
+    {'1': 'REACTION_TO_IMAGE', '2': 13},
+    {'1': 'REACTION_TO_AUDIO', '2': 14},
+    {'1': 'ADDED_TO_GROUP', '2': 15},
+    {'1': 'AUDIO', '2': 16},
   ],
 };
 
 /// Descriptor for `PushKind`. Decode as a `google.protobuf.EnumDescriptorProto`.
 final $typed_data.Uint8List pushKindDescriptor = $convert.base64Decode(
-    'CghQdXNoS2luZBIMCghyZWFjdGlvbhAAEgwKCHJlc3BvbnNlEAESCAoEdGV4dBACEgkKBXZpZG'
-    'VvEAMSCgoGdHdvbmx5EAQSCQoFaW1hZ2UQBRISCg5jb250YWN0UmVxdWVzdBAGEhEKDWFjY2Vw'
-    'dFJlcXVlc3QQBxITCg9zdG9yZWRNZWRpYUZpbGUQCBIUChB0ZXN0Tm90aWZpY2F0aW9uEAkSEQ'
-    'oNcmVvcGVuZWRNZWRpYRAKEhMKD3JlYWN0aW9uVG9WaWRlbxALEhIKDnJlYWN0aW9uVG9UZXh0'
-    'EAwSEwoPcmVhY3Rpb25Ub0ltYWdlEA0SEwoPcmVhY3Rpb25Ub0F1ZGlvEA4SEAoMYWRkZWRUb0'
-    'dyb3VwEA8SCQoFYXVkaW8QEA==');
+    'CghQdXNoS2luZBIMCghSRUFDVElPThAAEgwKCFJFU1BPTlNFEAESCAoEVEVYVBACEgkKBVZJRE'
+    'VPEAMSCgoGVFdPTkxZEAQSCQoFSU1BR0UQBRITCg9DT05UQUNUX1JFUVVFU1QQBhISCg5BQ0NF'
+    'UFRfUkVRVUVTVBAHEhUKEVNUT1JFRF9NRURJQV9GSUxFEAgSFQoRVEVTVF9OT1RJRklDQVRJT0'
+    '4QCRISCg5SRU9QRU5FRF9NRURJQRAKEhUKEVJFQUNUSU9OX1RPX1ZJREVPEAsSFAoQUkVBQ1RJ'
+    'T05fVE9fVEVYVBAMEhUKEVJFQUNUSU9OX1RPX0lNQUdFEA0SFQoRUkVBQ1RJT05fVE9fQVVESU'
+    '8QDhISCg5BRERFRF9UT19HUk9VUBAPEgkKBUFVRElPEBA=');
 
 @$core.Deprecated('Use encryptedPushNotificationDescriptor instead')
 const EncryptedPushNotification$json = {
   '1': 'EncryptedPushNotification',
   '2': [
-    {'1': 'keyId', '3': 1, '4': 1, '5': 3, '10': 'keyId'},
+    {'1': 'key_id', '3': 1, '4': 1, '5': 3, '10': 'keyId'},
     {'1': 'nonce', '3': 2, '4': 1, '5': 12, '10': 'nonce'},
     {'1': 'ciphertext', '3': 3, '4': 1, '5': 12, '10': 'ciphertext'},
     {'1': 'mac', '3': 4, '4': 1, '5': 12, '10': 'mac'},
@@ -60,9 +61,9 @@ const EncryptedPushNotification$json = {
 
 /// Descriptor for `EncryptedPushNotification`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List encryptedPushNotificationDescriptor = $convert.base64Decode(
-    'ChlFbmNyeXB0ZWRQdXNoTm90aWZpY2F0aW9uEhQKBWtleUlkGAEgASgDUgVrZXlJZBIUCgVub2'
-    '5jZRgCIAEoDFIFbm9uY2USHgoKY2lwaGVydGV4dBgDIAEoDFIKY2lwaGVydGV4dBIQCgNtYWMY'
-    'BCABKAxSA21hYw==');
+    'ChlFbmNyeXB0ZWRQdXNoTm90aWZpY2F0aW9uEhUKBmtleV9pZBgBIAEoA1IFa2V5SWQSFAoFbm'
+    '9uY2UYAiABKAxSBW5vbmNlEh4KCmNpcGhlcnRleHQYAyABKAxSCmNpcGhlcnRleHQSEAoDbWFj'
+    'GAQgASgMUgNtYWM=');
 
 @$core.Deprecated('Use pushNotificationDescriptor instead')
 const PushNotification$json = {
@@ -70,7 +71,7 @@ const PushNotification$json = {
   '2': [
     {'1': 'kind', '3': 1, '4': 1, '5': 14, '6': '.PushKind', '10': 'kind'},
     {
-      '1': 'messageId',
+      '1': 'message_id',
       '3': 2,
       '4': 1,
       '5': 9,
@@ -79,7 +80,7 @@ const PushNotification$json = {
       '17': true
     },
     {
-      '1': 'additionalContent',
+      '1': 'additional_content',
       '3': 3,
       '4': 1,
       '5': 9,
@@ -89,17 +90,17 @@ const PushNotification$json = {
     },
   ],
   '8': [
-    {'1': '_messageId'},
-    {'1': '_additionalContent'},
+    {'1': '_message_id'},
+    {'1': '_additional_content'},
   ],
 };
 
 /// Descriptor for `PushNotification`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List pushNotificationDescriptor = $convert.base64Decode(
-    'ChBQdXNoTm90aWZpY2F0aW9uEh0KBGtpbmQYASABKA4yCS5QdXNoS2luZFIEa2luZBIhCgltZX'
-    'NzYWdlSWQYAiABKAlIAFIJbWVzc2FnZUlkiAEBEjEKEWFkZGl0aW9uYWxDb250ZW50GAMgASgJ'
-    'SAFSEWFkZGl0aW9uYWxDb250ZW50iAEBQgwKCl9tZXNzYWdlSWRCFAoSX2FkZGl0aW9uYWxDb2'
-    '50ZW50');
+    'ChBQdXNoTm90aWZpY2F0aW9uEh0KBGtpbmQYASABKA4yCS5QdXNoS2luZFIEa2luZBIiCgptZX'
+    'NzYWdlX2lkGAIgASgJSABSCW1lc3NhZ2VJZIgBARIyChJhZGRpdGlvbmFsX2NvbnRlbnQYAyAB'
+    'KAlIAVIRYWRkaXRpb25hbENvbnRlbnSIAQFCDQoLX21lc3NhZ2VfaWRCFQoTX2FkZGl0aW9uYW'
+    'xfY29udGVudA==');
 
 @$core.Deprecated('Use pushUsersDescriptor instead')
 const PushUsers$json = {
@@ -117,11 +118,11 @@ final $typed_data.Uint8List pushUsersDescriptor = $convert.base64Decode(
 const PushUser$json = {
   '1': 'PushUser',
   '2': [
-    {'1': 'userId', '3': 1, '4': 1, '5': 3, '10': 'userId'},
-    {'1': 'displayName', '3': 2, '4': 1, '5': 9, '10': 'displayName'},
+    {'1': 'user_id', '3': 1, '4': 1, '5': 3, '10': 'userId'},
+    {'1': 'display_name', '3': 2, '4': 1, '5': 9, '10': 'displayName'},
     {'1': 'blocked', '3': 3, '4': 1, '5': 8, '10': 'blocked'},
     {
-      '1': 'lastMessageId',
+      '1': 'last_message_id',
       '3': 4,
       '4': 1,
       '5': 9,
@@ -130,7 +131,7 @@ const PushUser$json = {
       '17': true
     },
     {
-      '1': 'pushKeys',
+      '1': 'push_keys',
       '3': 5,
       '4': 3,
       '5': 11,
@@ -139,16 +140,16 @@ const PushUser$json = {
     },
   ],
   '8': [
-    {'1': '_lastMessageId'},
+    {'1': '_last_message_id'},
   ],
 };
 
 /// Descriptor for `PushUser`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List pushUserDescriptor = $convert.base64Decode(
-    'CghQdXNoVXNlchIWCgZ1c2VySWQYASABKANSBnVzZXJJZBIgCgtkaXNwbGF5TmFtZRgCIAEoCV'
-    'ILZGlzcGxheU5hbWUSGAoHYmxvY2tlZBgDIAEoCFIHYmxvY2tlZBIpCg1sYXN0TWVzc2FnZUlk'
-    'GAQgASgJSABSDWxhc3RNZXNzYWdlSWSIAQESJAoIcHVzaEtleXMYBSADKAsyCC5QdXNoS2V5Ug'
-    'hwdXNoS2V5c0IQCg5fbGFzdE1lc3NhZ2VJZA==');
+    'CghQdXNoVXNlchIXCgd1c2VyX2lkGAEgASgDUgZ1c2VySWQSIQoMZGlzcGxheV9uYW1lGAIgAS'
+    'gJUgtkaXNwbGF5TmFtZRIYCgdibG9ja2VkGAMgASgIUgdibG9ja2VkEisKD2xhc3RfbWVzc2Fn'
+    'ZV9pZBgEIAEoCUgAUg1sYXN0TWVzc2FnZUlkiAEBEiUKCXB1c2hfa2V5cxgFIAMoCzIILlB1c2'
+    'hLZXlSCHB1c2hLZXlzQhIKEF9sYXN0X21lc3NhZ2VfaWQ=');
 
 @$core.Deprecated('Use pushKeyDescriptor instead')
 const PushKey$json = {
@@ -157,7 +158,7 @@ const PushKey$json = {
     {'1': 'id', '3': 1, '4': 1, '5': 3, '10': 'id'},
     {'1': 'key', '3': 2, '4': 1, '5': 12, '10': 'key'},
     {
-      '1': 'createdAtUnixTimestamp',
+      '1': 'created_at_unix_timestamp',
       '3': 3,
       '4': 1,
       '5': 3,
@@ -168,5 +169,5 @@ const PushKey$json = {
 
 /// Descriptor for `PushKey`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List pushKeyDescriptor = $convert.base64Decode(
-    'CgdQdXNoS2V5Eg4KAmlkGAEgASgDUgJpZBIQCgNrZXkYAiABKAxSA2tleRI2ChZjcmVhdGVkQX'
-    'RVbml4VGltZXN0YW1wGAMgASgDUhZjcmVhdGVkQXRVbml4VGltZXN0YW1w');
+    'CgdQdXNoS2V5Eg4KAmlkGAEgASgDUgJpZBIQCgNrZXkYAiABKAxSA2tleRI5ChljcmVhdGVkX2'
+    'F0X3VuaXhfdGltZXN0YW1wGAMgASgDUhZjcmVhdGVkQXRVbml4VGltZXN0YW1w');
diff --git a/lib/src/model/protobuf/client/generated/qr.pb.dart b/lib/src/model/protobuf/client/generated/qr.pb.dart
index f4e4cfa9..60000fcc 100644
--- a/lib/src/model/protobuf/client/generated/qr.pb.dart
+++ b/lib/src/model/protobuf/client/generated/qr.pb.dart
@@ -8,7 +8,7 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
@@ -44,16 +44,14 @@ class QREnvelope extends $pb.GeneratedMessage {
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(
       _omitMessageNames ? '' : 'QREnvelope',
       createEmptyInstance: create)
-    ..e<QREnvelope_Type>(2, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE,
-        defaultOrMaker: QREnvelope_Type.PublicProfile,
-        valueOf: QREnvelope_Type.valueOf,
+    ..aE<QREnvelope_Type>(2, _omitFieldNames ? '' : 'type',
         enumValues: QREnvelope_Type.values)
     ..a<$core.List<$core.int>>(
         3, _omitFieldNames ? '' : 'data', $pb.PbFieldType.OY)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  QREnvelope clone() => QREnvelope()..mergeFromMessage(this);
+  QREnvelope clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   QREnvelope copyWith(void Function(QREnvelope) updates) =>
       super.copyWith((message) => updates(message as QREnvelope)) as QREnvelope;
@@ -65,7 +63,6 @@ class QREnvelope extends $pb.GeneratedMessage {
   static QREnvelope create() => QREnvelope._();
   @$core.override
   QREnvelope createEmptyInstance() => create();
-  static $pb.PbList<QREnvelope> createRepeated() => $pb.PbList<QREnvelope>();
   @$core.pragma('dart2js:noInline')
   static QREnvelope getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<QREnvelope>(create);
@@ -99,6 +96,7 @@ class PublicProfile extends $pb.GeneratedMessage {
     $fixnum.Int64? registrationId,
     $core.List<$core.int>? signedPrekeySignature,
     $fixnum.Int64? signedPrekeyId,
+    $core.List<$core.int>? secretVerificationToken,
   }) {
     final result = create();
     if (userId != null) result.userId = userId;
@@ -109,6 +107,8 @@ class PublicProfile extends $pb.GeneratedMessage {
     if (signedPrekeySignature != null)
       result.signedPrekeySignature = signedPrekeySignature;
     if (signedPrekeyId != null) result.signedPrekeyId = signedPrekeyId;
+    if (secretVerificationToken != null)
+      result.secretVerificationToken = secretVerificationToken;
     return result;
   }
 
@@ -134,10 +134,12 @@ class PublicProfile extends $pb.GeneratedMessage {
     ..a<$core.List<$core.int>>(
         6, _omitFieldNames ? '' : 'signedPrekeySignature', $pb.PbFieldType.OY)
     ..aInt64(7, _omitFieldNames ? '' : 'signedPrekeyId')
+    ..a<$core.List<$core.int>>(
+        8, _omitFieldNames ? '' : 'secretVerificationToken', $pb.PbFieldType.OY)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
-  PublicProfile clone() => PublicProfile()..mergeFromMessage(this);
+  PublicProfile clone() => deepCopy();
   @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
   PublicProfile copyWith(void Function(PublicProfile) updates) =>
       super.copyWith((message) => updates(message as PublicProfile))
@@ -150,8 +152,6 @@ class PublicProfile extends $pb.GeneratedMessage {
   static PublicProfile create() => PublicProfile._();
   @$core.override
   PublicProfile createEmptyInstance() => create();
-  static $pb.PbList<PublicProfile> createRepeated() =>
-      $pb.PbList<PublicProfile>();
   @$core.pragma('dart2js:noInline')
   static PublicProfile getDefault() => _defaultInstance ??=
       $pb.GeneratedMessage.$_defaultFor<PublicProfile>(create);
@@ -220,6 +220,16 @@ class PublicProfile extends $pb.GeneratedMessage {
   $core.bool hasSignedPrekeyId() => $_has(6);
   @$pb.TagNumber(7)
   void clearSignedPrekeyId() => $_clearField(7);
+
+  @$pb.TagNumber(8)
+  $core.List<$core.int> get secretVerificationToken => $_getN(7);
+  @$pb.TagNumber(8)
+  set secretVerificationToken($core.List<$core.int> value) =>
+      $_setBytes(7, value);
+  @$pb.TagNumber(8)
+  $core.bool hasSecretVerificationToken() => $_has(7);
+  @$pb.TagNumber(8)
+  void clearSecretVerificationToken() => $_clearField(8);
 }
 
 const $core.bool _omitFieldNames =
diff --git a/lib/src/model/protobuf/client/generated/qr.pbenum.dart b/lib/src/model/protobuf/client/generated/qr.pbenum.dart
index ea18fd02..e87023bc 100644
--- a/lib/src/model/protobuf/client/generated/qr.pbenum.dart
+++ b/lib/src/model/protobuf/client/generated/qr.pbenum.dart
@@ -8,18 +8,18 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
 
 import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
 class QREnvelope_Type extends $pb.ProtobufEnum {
-  static const QREnvelope_Type PublicProfile =
-      QREnvelope_Type._(0, _omitEnumNames ? '' : 'PublicProfile');
+  static const QREnvelope_Type PUBLIC_PROFILE =
+      QREnvelope_Type._(0, _omitEnumNames ? '' : 'PUBLIC_PROFILE');
 
   static const $core.List<QREnvelope_Type> values = <QREnvelope_Type>[
-    PublicProfile,
+    PUBLIC_PROFILE,
   ];
 
   static final $core.List<QREnvelope_Type?> _byValue =
diff --git a/lib/src/model/protobuf/client/generated/qr.pbjson.dart b/lib/src/model/protobuf/client/generated/qr.pbjson.dart
index 40bc65e4..16c3c2cd 100644
--- a/lib/src/model/protobuf/client/generated/qr.pbjson.dart
+++ b/lib/src/model/protobuf/client/generated/qr.pbjson.dart
@@ -8,7 +8,8 @@
 // ignore_for_file: constant_identifier_names
 // ignore_for_file: curly_braces_in_flow_control_structures
 // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, unused_import
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
 
 import 'dart:convert' as $convert;
 import 'dart:core' as $core;
@@ -35,14 +36,14 @@ const QREnvelope$json = {
 const QREnvelope_Type$json = {
   '1': 'Type',
   '2': [
-    {'1': 'PublicProfile', '2': 0},
+    {'1': 'PUBLIC_PROFILE', '2': 0},
   ],
 };
 
 /// Descriptor for `QREnvelope`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List qREnvelopeDescriptor = $convert.base64Decode(
     'CgpRUkVudmVsb3BlEiQKBHR5cGUYAiABKA4yEC5RUkVudmVsb3BlLlR5cGVSBHR5cGUSEgoEZG'
-    'F0YRgDIAEoDFIEZGF0YSIZCgRUeXBlEhEKDVB1YmxpY1Byb2ZpbGUQAA==');
+    'F0YRgDIAEoDFIEZGF0YSIaCgRUeXBlEhIKDlBVQkxJQ19QUk9GSUxFEAA=');
 
 @$core.Deprecated('Use publicProfileDescriptor instead')
 const PublicProfile$json = {
@@ -67,6 +68,18 @@ const PublicProfile$json = {
       '10': 'signedPrekeySignature'
     },
     {'1': 'signed_prekey_id', '3': 7, '4': 1, '5': 3, '10': 'signedPrekeyId'},
+    {
+      '1': 'secret_verification_token',
+      '3': 8,
+      '4': 1,
+      '5': 12,
+      '9': 0,
+      '10': 'secretVerificationToken',
+      '17': true
+    },
+  ],
+  '8': [
+    {'1': '_secret_verification_token'},
   ],
 };
 
@@ -77,4 +90,5 @@ final $typed_data.Uint8List publicProfileDescriptor = $convert.base64Decode(
     'dHlLZXkSIwoNc2lnbmVkX3ByZWtleRgEIAEoDFIMc2lnbmVkUHJla2V5EicKD3JlZ2lzdHJhdG'
     'lvbl9pZBgFIAEoA1IOcmVnaXN0cmF0aW9uSWQSNgoXc2lnbmVkX3ByZWtleV9zaWduYXR1cmUY'
     'BiABKAxSFXNpZ25lZFByZWtleVNpZ25hdHVyZRIoChBzaWduZWRfcHJla2V5X2lkGAcgASgDUg'
-    '5zaWduZWRQcmVrZXlJZA==');
+    '5zaWduZWRQcmVrZXlJZBI/ChlzZWNyZXRfdmVyaWZpY2F0aW9uX3Rva2VuGAggASgMSABSF3Nl'
+    'Y3JldFZlcmlmaWNhdGlvblRva2VuiAEBQhwKGl9zZWNyZXRfdmVyaWZpY2F0aW9uX3Rva2Vu');
diff --git a/lib/src/model/protobuf/client/generated/user_discovery/types.pb.dart b/lib/src/model/protobuf/client/generated/user_discovery/types.pb.dart
new file mode 100644
index 00000000..ea8cf9be
--- /dev/null
+++ b/lib/src/model/protobuf/client/generated/user_discovery/types.pb.dart
@@ -0,0 +1,678 @@
+// This is a generated file - do not edit.
+//
+// Generated from types.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+
+import 'dart:core' as $core;
+
+import 'package:fixnum/fixnum.dart' as $fixnum;
+import 'package:protobuf/protobuf.dart' as $pb;
+
+export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions;
+
+class UserDiscoveryVersion extends $pb.GeneratedMessage {
+  factory UserDiscoveryVersion({
+    $core.int? announcement,
+    $core.int? promotion,
+  }) {
+    final result = create();
+    if (announcement != null) result.announcement = announcement;
+    if (promotion != null) result.promotion = promotion;
+    return result;
+  }
+
+  UserDiscoveryVersion._();
+
+  factory UserDiscoveryVersion.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory UserDiscoveryVersion.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'UserDiscoveryVersion',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'user_discovery'),
+      createEmptyInstance: create)
+    ..aI(1, _omitFieldNames ? '' : 'announcement',
+        fieldType: $pb.PbFieldType.OU3)
+    ..aI(2, _omitFieldNames ? '' : 'promotion', fieldType: $pb.PbFieldType.OU3)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  UserDiscoveryVersion clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  UserDiscoveryVersion copyWith(void Function(UserDiscoveryVersion) updates) =>
+      super.copyWith((message) => updates(message as UserDiscoveryVersion))
+          as UserDiscoveryVersion;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static UserDiscoveryVersion create() => UserDiscoveryVersion._();
+  @$core.override
+  UserDiscoveryVersion createEmptyInstance() => create();
+  @$core.pragma('dart2js:noInline')
+  static UserDiscoveryVersion getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<UserDiscoveryVersion>(create);
+  static UserDiscoveryVersion? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get announcement => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set announcement($core.int value) => $_setUnsignedInt32(0, value);
+  @$pb.TagNumber(1)
+  $core.bool hasAnnouncement() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearAnnouncement() => $_clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.int get promotion => $_getIZ(1);
+  @$pb.TagNumber(2)
+  set promotion($core.int value) => $_setUnsignedInt32(1, value);
+  @$pb.TagNumber(2)
+  $core.bool hasPromotion() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearPromotion() => $_clearField(2);
+}
+
+class UserDiscoveryMessage_UserDiscoveryAnnouncement
+    extends $pb.GeneratedMessage {
+  factory UserDiscoveryMessage_UserDiscoveryAnnouncement({
+    $fixnum.Int64? publicId,
+    $core.int? threshold,
+    $core.List<$core.int>? announcementShare,
+    $core.bool? sharePromotion,
+    $core.Iterable<$core.List<$core.int>>? verificationShares,
+  }) {
+    final result = create();
+    if (publicId != null) result.publicId = publicId;
+    if (threshold != null) result.threshold = threshold;
+    if (announcementShare != null) result.announcementShare = announcementShare;
+    if (sharePromotion != null) result.sharePromotion = sharePromotion;
+    if (verificationShares != null)
+      result.verificationShares.addAll(verificationShares);
+    return result;
+  }
+
+  UserDiscoveryMessage_UserDiscoveryAnnouncement._();
+
+  factory UserDiscoveryMessage_UserDiscoveryAnnouncement.fromBuffer(
+          $core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory UserDiscoveryMessage_UserDiscoveryAnnouncement.fromJson(
+          $core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'UserDiscoveryMessage.UserDiscoveryAnnouncement',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'user_discovery'),
+      createEmptyInstance: create)
+    ..aInt64(1, _omitFieldNames ? '' : 'publicId')
+    ..aI(2, _omitFieldNames ? '' : 'threshold', fieldType: $pb.PbFieldType.OU3)
+    ..a<$core.List<$core.int>>(
+        3, _omitFieldNames ? '' : 'announcementShare', $pb.PbFieldType.OY)
+    ..aOB(4, _omitFieldNames ? '' : 'sharePromotion')
+    ..p<$core.List<$core.int>>(
+        5, _omitFieldNames ? '' : 'verificationShares', $pb.PbFieldType.PY)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  UserDiscoveryMessage_UserDiscoveryAnnouncement clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  UserDiscoveryMessage_UserDiscoveryAnnouncement copyWith(
+          void Function(UserDiscoveryMessage_UserDiscoveryAnnouncement)
+              updates) =>
+      super.copyWith((message) => updates(
+              message as UserDiscoveryMessage_UserDiscoveryAnnouncement))
+          as UserDiscoveryMessage_UserDiscoveryAnnouncement;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static UserDiscoveryMessage_UserDiscoveryAnnouncement create() =>
+      UserDiscoveryMessage_UserDiscoveryAnnouncement._();
+  @$core.override
+  UserDiscoveryMessage_UserDiscoveryAnnouncement createEmptyInstance() =>
+      create();
+  @$core.pragma('dart2js:noInline')
+  static UserDiscoveryMessage_UserDiscoveryAnnouncement getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
+          UserDiscoveryMessage_UserDiscoveryAnnouncement>(create);
+  static UserDiscoveryMessage_UserDiscoveryAnnouncement? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $fixnum.Int64 get publicId => $_getI64(0);
+  @$pb.TagNumber(1)
+  set publicId($fixnum.Int64 value) => $_setInt64(0, value);
+  @$pb.TagNumber(1)
+  $core.bool hasPublicId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearPublicId() => $_clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.int get threshold => $_getIZ(1);
+  @$pb.TagNumber(2)
+  set threshold($core.int value) => $_setUnsignedInt32(1, value);
+  @$pb.TagNumber(2)
+  $core.bool hasThreshold() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearThreshold() => $_clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.List<$core.int> get announcementShare => $_getN(2);
+  @$pb.TagNumber(3)
+  set announcementShare($core.List<$core.int> value) => $_setBytes(2, value);
+  @$pb.TagNumber(3)
+  $core.bool hasAnnouncementShare() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearAnnouncementShare() => $_clearField(3);
+
+  @$pb.TagNumber(4)
+  $core.bool get sharePromotion => $_getBF(3);
+  @$pb.TagNumber(4)
+  set sharePromotion($core.bool value) => $_setBool(3, value);
+  @$pb.TagNumber(4)
+  $core.bool hasSharePromotion() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearSharePromotion() => $_clearField(4);
+
+  @$pb.TagNumber(5)
+  $pb.PbList<$core.List<$core.int>> get verificationShares => $_getList(4);
+}
+
+class UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData
+    extends $pb.GeneratedMessage {
+  factory UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData({
+    $fixnum.Int64? publicId,
+    $fixnum.Int64? userId,
+    $core.List<$core.int>? publicKey,
+  }) {
+    final result = create();
+    if (publicId != null) result.publicId = publicId;
+    if (userId != null) result.userId = userId;
+    if (publicKey != null) result.publicKey = publicKey;
+    return result;
+  }
+
+  UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData._();
+
+  factory UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData.fromBuffer(
+          $core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData.fromJson(
+          $core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames
+          ? ''
+          : 'UserDiscoveryMessage.UserDiscoveryPromotion.AnnouncementShareDecrypted.SignedData',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'user_discovery'),
+      createEmptyInstance: create)
+    ..aInt64(1, _omitFieldNames ? '' : 'publicId')
+    ..aInt64(2, _omitFieldNames ? '' : 'userId')
+    ..a<$core.List<$core.int>>(
+        3, _omitFieldNames ? '' : 'publicKey', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData
+      clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData copyWith(
+          void Function(
+                  UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData)
+              updates) =>
+      super.copyWith((message) => updates(message
+              as UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData))
+          as UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData
+      create() =>
+          UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData
+              ._();
+  @$core.override
+  UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData
+      createEmptyInstance() => create();
+  @$core.pragma('dart2js:noInline')
+  static UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData
+      getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
+              UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData>(
+          create);
+  static UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData?
+      _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $fixnum.Int64 get publicId => $_getI64(0);
+  @$pb.TagNumber(1)
+  set publicId($fixnum.Int64 value) => $_setInt64(0, value);
+  @$pb.TagNumber(1)
+  $core.bool hasPublicId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearPublicId() => $_clearField(1);
+
+  @$pb.TagNumber(2)
+  $fixnum.Int64 get userId => $_getI64(1);
+  @$pb.TagNumber(2)
+  set userId($fixnum.Int64 value) => $_setInt64(1, value);
+  @$pb.TagNumber(2)
+  $core.bool hasUserId() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearUserId() => $_clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.List<$core.int> get publicKey => $_getN(2);
+  @$pb.TagNumber(3)
+  set publicKey($core.List<$core.int> value) => $_setBytes(2, value);
+  @$pb.TagNumber(3)
+  $core.bool hasPublicKey() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearPublicKey() => $_clearField(3);
+}
+
+class UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted
+    extends $pb.GeneratedMessage {
+  factory UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted({
+    UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData?
+        signedData,
+    $core.List<$core.int>? signature,
+  }) {
+    final result = create();
+    if (signedData != null) result.signedData = signedData;
+    if (signature != null) result.signature = signature;
+    return result;
+  }
+
+  UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted._();
+
+  factory UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted.fromBuffer(
+          $core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted.fromJson(
+          $core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames
+          ? ''
+          : 'UserDiscoveryMessage.UserDiscoveryPromotion.AnnouncementShareDecrypted',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'user_discovery'),
+      createEmptyInstance: create)
+    ..aOM<UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData>(
+        1, _omitFieldNames ? '' : 'signedData',
+        subBuilder:
+            UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData
+                .create)
+    ..a<$core.List<$core.int>>(
+        2, _omitFieldNames ? '' : 'signature', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted
+      clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted copyWith(
+          void Function(
+                  UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted)
+              updates) =>
+      super.copyWith((message) => updates(message
+              as UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted))
+          as UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted
+      create() =>
+          UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted
+              ._();
+  @$core.override
+  UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted
+      createEmptyInstance() => create();
+  @$core.pragma('dart2js:noInline')
+  static UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted
+      getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
+              UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted>(
+          create);
+  static UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted?
+      _defaultInstance;
+
+  @$pb.TagNumber(1)
+  UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData
+      get signedData => $_getN(0);
+  @$pb.TagNumber(1)
+  set signedData(
+          UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData
+              value) =>
+      $_setField(1, value);
+  @$pb.TagNumber(1)
+  $core.bool hasSignedData() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearSignedData() => $_clearField(1);
+  @$pb.TagNumber(1)
+  UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData
+      ensureSignedData() => $_ensure(0);
+
+  @$pb.TagNumber(2)
+  $core.List<$core.int> get signature => $_getN(1);
+  @$pb.TagNumber(2)
+  set signature($core.List<$core.int> value) => $_setBytes(1, value);
+  @$pb.TagNumber(2)
+  $core.bool hasSignature() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearSignature() => $_clearField(2);
+}
+
+class UserDiscoveryMessage_UserDiscoveryPromotion extends $pb.GeneratedMessage {
+  factory UserDiscoveryMessage_UserDiscoveryPromotion({
+    $core.int? promotionId,
+    $fixnum.Int64? publicId,
+    $core.int? threshold,
+    $core.List<$core.int>? announcementShare,
+    $fixnum.Int64? publicKeyVerifiedTimestamp,
+  }) {
+    final result = create();
+    if (promotionId != null) result.promotionId = promotionId;
+    if (publicId != null) result.publicId = publicId;
+    if (threshold != null) result.threshold = threshold;
+    if (announcementShare != null) result.announcementShare = announcementShare;
+    if (publicKeyVerifiedTimestamp != null)
+      result.publicKeyVerifiedTimestamp = publicKeyVerifiedTimestamp;
+    return result;
+  }
+
+  UserDiscoveryMessage_UserDiscoveryPromotion._();
+
+  factory UserDiscoveryMessage_UserDiscoveryPromotion.fromBuffer(
+          $core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory UserDiscoveryMessage_UserDiscoveryPromotion.fromJson(
+          $core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'UserDiscoveryMessage.UserDiscoveryPromotion',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'user_discovery'),
+      createEmptyInstance: create)
+    ..aI(1, _omitFieldNames ? '' : 'promotionId',
+        fieldType: $pb.PbFieldType.OU3)
+    ..aInt64(2, _omitFieldNames ? '' : 'publicId')
+    ..aI(3, _omitFieldNames ? '' : 'threshold', fieldType: $pb.PbFieldType.OU3)
+    ..a<$core.List<$core.int>>(
+        5, _omitFieldNames ? '' : 'announcementShare', $pb.PbFieldType.OY)
+    ..aInt64(6, _omitFieldNames ? '' : 'publicKeyVerifiedTimestamp')
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  UserDiscoveryMessage_UserDiscoveryPromotion clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  UserDiscoveryMessage_UserDiscoveryPromotion copyWith(
+          void Function(UserDiscoveryMessage_UserDiscoveryPromotion) updates) =>
+      super.copyWith((message) =>
+              updates(message as UserDiscoveryMessage_UserDiscoveryPromotion))
+          as UserDiscoveryMessage_UserDiscoveryPromotion;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static UserDiscoveryMessage_UserDiscoveryPromotion create() =>
+      UserDiscoveryMessage_UserDiscoveryPromotion._();
+  @$core.override
+  UserDiscoveryMessage_UserDiscoveryPromotion createEmptyInstance() => create();
+  @$core.pragma('dart2js:noInline')
+  static UserDiscoveryMessage_UserDiscoveryPromotion getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
+          UserDiscoveryMessage_UserDiscoveryPromotion>(create);
+  static UserDiscoveryMessage_UserDiscoveryPromotion? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.int get promotionId => $_getIZ(0);
+  @$pb.TagNumber(1)
+  set promotionId($core.int value) => $_setUnsignedInt32(0, value);
+  @$pb.TagNumber(1)
+  $core.bool hasPromotionId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearPromotionId() => $_clearField(1);
+
+  @$pb.TagNumber(2)
+  $fixnum.Int64 get publicId => $_getI64(1);
+  @$pb.TagNumber(2)
+  set publicId($fixnum.Int64 value) => $_setInt64(1, value);
+  @$pb.TagNumber(2)
+  $core.bool hasPublicId() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearPublicId() => $_clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.int get threshold => $_getIZ(2);
+  @$pb.TagNumber(3)
+  set threshold($core.int value) => $_setUnsignedInt32(2, value);
+  @$pb.TagNumber(3)
+  $core.bool hasThreshold() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearThreshold() => $_clearField(3);
+
+  @$pb.TagNumber(5)
+  $core.List<$core.int> get announcementShare => $_getN(3);
+  @$pb.TagNumber(5)
+  set announcementShare($core.List<$core.int> value) => $_setBytes(3, value);
+  @$pb.TagNumber(5)
+  $core.bool hasAnnouncementShare() => $_has(3);
+  @$pb.TagNumber(5)
+  void clearAnnouncementShare() => $_clearField(5);
+
+  @$pb.TagNumber(6)
+  $fixnum.Int64 get publicKeyVerifiedTimestamp => $_getI64(4);
+  @$pb.TagNumber(6)
+  set publicKeyVerifiedTimestamp($fixnum.Int64 value) => $_setInt64(4, value);
+  @$pb.TagNumber(6)
+  $core.bool hasPublicKeyVerifiedTimestamp() => $_has(4);
+  @$pb.TagNumber(6)
+  void clearPublicKeyVerifiedTimestamp() => $_clearField(6);
+}
+
+class UserDiscoveryMessage_UserDiscoveryRecall extends $pb.GeneratedMessage {
+  factory UserDiscoveryMessage_UserDiscoveryRecall({
+    $fixnum.Int64? promotionId,
+  }) {
+    final result = create();
+    if (promotionId != null) result.promotionId = promotionId;
+    return result;
+  }
+
+  UserDiscoveryMessage_UserDiscoveryRecall._();
+
+  factory UserDiscoveryMessage_UserDiscoveryRecall.fromBuffer(
+          $core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory UserDiscoveryMessage_UserDiscoveryRecall.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'UserDiscoveryMessage.UserDiscoveryRecall',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'user_discovery'),
+      createEmptyInstance: create)
+    ..aInt64(1, _omitFieldNames ? '' : 'promotionId')
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  UserDiscoveryMessage_UserDiscoveryRecall clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  UserDiscoveryMessage_UserDiscoveryRecall copyWith(
+          void Function(UserDiscoveryMessage_UserDiscoveryRecall) updates) =>
+      super.copyWith((message) =>
+              updates(message as UserDiscoveryMessage_UserDiscoveryRecall))
+          as UserDiscoveryMessage_UserDiscoveryRecall;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static UserDiscoveryMessage_UserDiscoveryRecall create() =>
+      UserDiscoveryMessage_UserDiscoveryRecall._();
+  @$core.override
+  UserDiscoveryMessage_UserDiscoveryRecall createEmptyInstance() => create();
+  @$core.pragma('dart2js:noInline')
+  static UserDiscoveryMessage_UserDiscoveryRecall getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
+          UserDiscoveryMessage_UserDiscoveryRecall>(create);
+  static UserDiscoveryMessage_UserDiscoveryRecall? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $fixnum.Int64 get promotionId => $_getI64(0);
+  @$pb.TagNumber(1)
+  set promotionId($fixnum.Int64 value) => $_setInt64(0, value);
+  @$pb.TagNumber(1)
+  $core.bool hasPromotionId() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearPromotionId() => $_clearField(1);
+}
+
+class UserDiscoveryMessage extends $pb.GeneratedMessage {
+  factory UserDiscoveryMessage({
+    UserDiscoveryVersion? version,
+    UserDiscoveryMessage_UserDiscoveryAnnouncement? userDiscoveryAnnouncement,
+    UserDiscoveryMessage_UserDiscoveryPromotion? userDiscoveryPromotion,
+    UserDiscoveryMessage_UserDiscoveryRecall? userDiscoveryRecall,
+  }) {
+    final result = create();
+    if (version != null) result.version = version;
+    if (userDiscoveryAnnouncement != null)
+      result.userDiscoveryAnnouncement = userDiscoveryAnnouncement;
+    if (userDiscoveryPromotion != null)
+      result.userDiscoveryPromotion = userDiscoveryPromotion;
+    if (userDiscoveryRecall != null)
+      result.userDiscoveryRecall = userDiscoveryRecall;
+    return result;
+  }
+
+  UserDiscoveryMessage._();
+
+  factory UserDiscoveryMessage.fromBuffer($core.List<$core.int> data,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(data, registry);
+  factory UserDiscoveryMessage.fromJson($core.String json,
+          [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'UserDiscoveryMessage',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'user_discovery'),
+      createEmptyInstance: create)
+    ..aOM<UserDiscoveryVersion>(1, _omitFieldNames ? '' : 'version',
+        subBuilder: UserDiscoveryVersion.create)
+    ..aOM<UserDiscoveryMessage_UserDiscoveryAnnouncement>(
+        2, _omitFieldNames ? '' : 'userDiscoveryAnnouncement',
+        subBuilder: UserDiscoveryMessage_UserDiscoveryAnnouncement.create)
+    ..aOM<UserDiscoveryMessage_UserDiscoveryPromotion>(
+        3, _omitFieldNames ? '' : 'userDiscoveryPromotion',
+        subBuilder: UserDiscoveryMessage_UserDiscoveryPromotion.create)
+    ..aOM<UserDiscoveryMessage_UserDiscoveryRecall>(
+        4, _omitFieldNames ? '' : 'userDiscoveryRecall',
+        subBuilder: UserDiscoveryMessage_UserDiscoveryRecall.create)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  UserDiscoveryMessage clone() => deepCopy();
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  UserDiscoveryMessage copyWith(void Function(UserDiscoveryMessage) updates) =>
+      super.copyWith((message) => updates(message as UserDiscoveryMessage))
+          as UserDiscoveryMessage;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static UserDiscoveryMessage create() => UserDiscoveryMessage._();
+  @$core.override
+  UserDiscoveryMessage createEmptyInstance() => create();
+  @$core.pragma('dart2js:noInline')
+  static UserDiscoveryMessage getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<UserDiscoveryMessage>(create);
+  static UserDiscoveryMessage? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  UserDiscoveryVersion get version => $_getN(0);
+  @$pb.TagNumber(1)
+  set version(UserDiscoveryVersion value) => $_setField(1, value);
+  @$pb.TagNumber(1)
+  $core.bool hasVersion() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearVersion() => $_clearField(1);
+  @$pb.TagNumber(1)
+  UserDiscoveryVersion ensureVersion() => $_ensure(0);
+
+  @$pb.TagNumber(2)
+  UserDiscoveryMessage_UserDiscoveryAnnouncement
+      get userDiscoveryAnnouncement => $_getN(1);
+  @$pb.TagNumber(2)
+  set userDiscoveryAnnouncement(
+          UserDiscoveryMessage_UserDiscoveryAnnouncement value) =>
+      $_setField(2, value);
+  @$pb.TagNumber(2)
+  $core.bool hasUserDiscoveryAnnouncement() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearUserDiscoveryAnnouncement() => $_clearField(2);
+  @$pb.TagNumber(2)
+  UserDiscoveryMessage_UserDiscoveryAnnouncement
+      ensureUserDiscoveryAnnouncement() => $_ensure(1);
+
+  @$pb.TagNumber(3)
+  UserDiscoveryMessage_UserDiscoveryPromotion get userDiscoveryPromotion =>
+      $_getN(2);
+  @$pb.TagNumber(3)
+  set userDiscoveryPromotion(
+          UserDiscoveryMessage_UserDiscoveryPromotion value) =>
+      $_setField(3, value);
+  @$pb.TagNumber(3)
+  $core.bool hasUserDiscoveryPromotion() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearUserDiscoveryPromotion() => $_clearField(3);
+  @$pb.TagNumber(3)
+  UserDiscoveryMessage_UserDiscoveryPromotion ensureUserDiscoveryPromotion() =>
+      $_ensure(2);
+
+  @$pb.TagNumber(4)
+  UserDiscoveryMessage_UserDiscoveryRecall get userDiscoveryRecall => $_getN(3);
+  @$pb.TagNumber(4)
+  set userDiscoveryRecall(UserDiscoveryMessage_UserDiscoveryRecall value) =>
+      $_setField(4, value);
+  @$pb.TagNumber(4)
+  $core.bool hasUserDiscoveryRecall() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearUserDiscoveryRecall() => $_clearField(4);
+  @$pb.TagNumber(4)
+  UserDiscoveryMessage_UserDiscoveryRecall ensureUserDiscoveryRecall() =>
+      $_ensure(3);
+}
+
+const $core.bool _omitFieldNames =
+    $core.bool.fromEnvironment('protobuf.omit_field_names');
+const $core.bool _omitMessageNames =
+    $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/lib/src/model/protobuf/client/generated/user_discovery/types.pbenum.dart b/lib/src/model/protobuf/client/generated/user_discovery/types.pbenum.dart
new file mode 100644
index 00000000..af40bcc8
--- /dev/null
+++ b/lib/src/model/protobuf/client/generated/user_discovery/types.pbenum.dart
@@ -0,0 +1,11 @@
+// This is a generated file - do not edit.
+//
+// Generated from types.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
diff --git a/lib/src/model/protobuf/client/generated/user_discovery/types.pbjson.dart b/lib/src/model/protobuf/client/generated/user_discovery/types.pbjson.dart
new file mode 100644
index 00000000..fdb5343e
--- /dev/null
+++ b/lib/src/model/protobuf/client/generated/user_discovery/types.pbjson.dart
@@ -0,0 +1,210 @@
+// This is a generated file - do not edit.
+//
+// Generated from types.proto.
+
+// @dart = 3.3
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: curly_braces_in_flow_control_structures
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_relative_imports
+// ignore_for_file: unused_import
+
+import 'dart:convert' as $convert;
+import 'dart:core' as $core;
+import 'dart:typed_data' as $typed_data;
+
+@$core.Deprecated('Use userDiscoveryVersionDescriptor instead')
+const UserDiscoveryVersion$json = {
+  '1': 'UserDiscoveryVersion',
+  '2': [
+    {'1': 'announcement', '3': 1, '4': 1, '5': 13, '10': 'announcement'},
+    {'1': 'promotion', '3': 2, '4': 1, '5': 13, '10': 'promotion'},
+  ],
+};
+
+/// Descriptor for `UserDiscoveryVersion`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List userDiscoveryVersionDescriptor = $convert.base64Decode(
+    'ChRVc2VyRGlzY292ZXJ5VmVyc2lvbhIiCgxhbm5vdW5jZW1lbnQYASABKA1SDGFubm91bmNlbW'
+    'VudBIcCglwcm9tb3Rpb24YAiABKA1SCXByb21vdGlvbg==');
+
+@$core.Deprecated('Use userDiscoveryMessageDescriptor instead')
+const UserDiscoveryMessage$json = {
+  '1': 'UserDiscoveryMessage',
+  '2': [
+    {
+      '1': 'version',
+      '3': 1,
+      '4': 1,
+      '5': 11,
+      '6': '.user_discovery.UserDiscoveryVersion',
+      '10': 'version'
+    },
+    {
+      '1': 'user_discovery_announcement',
+      '3': 2,
+      '4': 1,
+      '5': 11,
+      '6': '.user_discovery.UserDiscoveryMessage.UserDiscoveryAnnouncement',
+      '9': 0,
+      '10': 'userDiscoveryAnnouncement',
+      '17': true
+    },
+    {
+      '1': 'user_discovery_promotion',
+      '3': 3,
+      '4': 1,
+      '5': 11,
+      '6': '.user_discovery.UserDiscoveryMessage.UserDiscoveryPromotion',
+      '9': 1,
+      '10': 'userDiscoveryPromotion',
+      '17': true
+    },
+    {
+      '1': 'user_discovery_recall',
+      '3': 4,
+      '4': 1,
+      '5': 11,
+      '6': '.user_discovery.UserDiscoveryMessage.UserDiscoveryRecall',
+      '9': 2,
+      '10': 'userDiscoveryRecall',
+      '17': true
+    },
+  ],
+  '3': [
+    UserDiscoveryMessage_UserDiscoveryAnnouncement$json,
+    UserDiscoveryMessage_UserDiscoveryPromotion$json,
+    UserDiscoveryMessage_UserDiscoveryRecall$json
+  ],
+  '8': [
+    {'1': '_user_discovery_announcement'},
+    {'1': '_user_discovery_promotion'},
+    {'1': '_user_discovery_recall'},
+  ],
+};
+
+@$core.Deprecated('Use userDiscoveryMessageDescriptor instead')
+const UserDiscoveryMessage_UserDiscoveryAnnouncement$json = {
+  '1': 'UserDiscoveryAnnouncement',
+  '2': [
+    {'1': 'public_id', '3': 1, '4': 1, '5': 3, '10': 'publicId'},
+    {'1': 'threshold', '3': 2, '4': 1, '5': 13, '10': 'threshold'},
+    {
+      '1': 'announcement_share',
+      '3': 3,
+      '4': 1,
+      '5': 12,
+      '10': 'announcementShare'
+    },
+    {'1': 'share_promotion', '3': 4, '4': 1, '5': 8, '10': 'sharePromotion'},
+    {
+      '1': 'verification_shares',
+      '3': 5,
+      '4': 3,
+      '5': 12,
+      '10': 'verificationShares'
+    },
+  ],
+};
+
+@$core.Deprecated('Use userDiscoveryMessageDescriptor instead')
+const UserDiscoveryMessage_UserDiscoveryPromotion$json = {
+  '1': 'UserDiscoveryPromotion',
+  '2': [
+    {'1': 'promotion_id', '3': 1, '4': 1, '5': 13, '10': 'promotionId'},
+    {'1': 'public_id', '3': 2, '4': 1, '5': 3, '10': 'publicId'},
+    {'1': 'threshold', '3': 3, '4': 1, '5': 13, '10': 'threshold'},
+    {
+      '1': 'announcement_share',
+      '3': 5,
+      '4': 1,
+      '5': 12,
+      '10': 'announcementShare'
+    },
+    {
+      '1': 'public_key_verified_timestamp',
+      '3': 6,
+      '4': 1,
+      '5': 3,
+      '9': 0,
+      '10': 'publicKeyVerifiedTimestamp',
+      '17': true
+    },
+  ],
+  '3': [
+    UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted$json
+  ],
+  '8': [
+    {'1': '_public_key_verified_timestamp'},
+  ],
+};
+
+@$core.Deprecated('Use userDiscoveryMessageDescriptor instead')
+const UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted$json =
+    {
+  '1': 'AnnouncementShareDecrypted',
+  '2': [
+    {
+      '1': 'signed_data',
+      '3': 1,
+      '4': 1,
+      '5': 11,
+      '6':
+          '.user_discovery.UserDiscoveryMessage.UserDiscoveryPromotion.AnnouncementShareDecrypted.SignedData',
+      '10': 'signedData'
+    },
+    {'1': 'signature', '3': 2, '4': 1, '5': 12, '10': 'signature'},
+  ],
+  '3': [
+    UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData$json
+  ],
+};
+
+@$core.Deprecated('Use userDiscoveryMessageDescriptor instead')
+const UserDiscoveryMessage_UserDiscoveryPromotion_AnnouncementShareDecrypted_SignedData$json =
+    {
+  '1': 'SignedData',
+  '2': [
+    {'1': 'public_id', '3': 1, '4': 1, '5': 3, '10': 'publicId'},
+    {'1': 'user_id', '3': 2, '4': 1, '5': 3, '10': 'userId'},
+    {'1': 'public_key', '3': 3, '4': 1, '5': 12, '10': 'publicKey'},
+  ],
+};
+
+@$core.Deprecated('Use userDiscoveryMessageDescriptor instead')
+const UserDiscoveryMessage_UserDiscoveryRecall$json = {
+  '1': 'UserDiscoveryRecall',
+  '2': [
+    {'1': 'promotion_id', '3': 1, '4': 1, '5': 3, '10': 'promotionId'},
+  ],
+};
+
+/// Descriptor for `UserDiscoveryMessage`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List userDiscoveryMessageDescriptor = $convert.base64Decode(
+    'ChRVc2VyRGlzY292ZXJ5TWVzc2FnZRI+Cgd2ZXJzaW9uGAEgASgLMiQudXNlcl9kaXNjb3Zlcn'
+    'kuVXNlckRpc2NvdmVyeVZlcnNpb25SB3ZlcnNpb24SgwEKG3VzZXJfZGlzY292ZXJ5X2Fubm91'
+    'bmNlbWVudBgCIAEoCzI+LnVzZXJfZGlzY292ZXJ5LlVzZXJEaXNjb3ZlcnlNZXNzYWdlLlVzZX'
+    'JEaXNjb3ZlcnlBbm5vdW5jZW1lbnRIAFIZdXNlckRpc2NvdmVyeUFubm91bmNlbWVudIgBARJ6'
+    'Chh1c2VyX2Rpc2NvdmVyeV9wcm9tb3Rpb24YAyABKAsyOy51c2VyX2Rpc2NvdmVyeS5Vc2VyRG'
+    'lzY292ZXJ5TWVzc2FnZS5Vc2VyRGlzY292ZXJ5UHJvbW90aW9uSAFSFnVzZXJEaXNjb3ZlcnlQ'
+    'cm9tb3Rpb26IAQEScQoVdXNlcl9kaXNjb3ZlcnlfcmVjYWxsGAQgASgLMjgudXNlcl9kaXNjb3'
+    'ZlcnkuVXNlckRpc2NvdmVyeU1lc3NhZ2UuVXNlckRpc2NvdmVyeVJlY2FsbEgCUhN1c2VyRGlz'
+    'Y292ZXJ5UmVjYWxsiAEBGt8BChlVc2VyRGlzY292ZXJ5QW5ub3VuY2VtZW50EhsKCXB1YmxpY1'
+    '9pZBgBIAEoA1IIcHVibGljSWQSHAoJdGhyZXNob2xkGAIgASgNUgl0aHJlc2hvbGQSLQoSYW5u'
+    'b3VuY2VtZW50X3NoYXJlGAMgASgMUhFhbm5vdW5jZW1lbnRTaGFyZRInCg9zaGFyZV9wcm9tb3'
+    'Rpb24YBCABKAhSDnNoYXJlUHJvbW90aW9uEi8KE3ZlcmlmaWNhdGlvbl9zaGFyZXMYBSADKAxS'
+    'EnZlcmlmaWNhdGlvblNoYXJlcxq0BAoWVXNlckRpc2NvdmVyeVByb21vdGlvbhIhCgxwcm9tb3'
+    'Rpb25faWQYASABKA1SC3Byb21vdGlvbklkEhsKCXB1YmxpY19pZBgCIAEoA1IIcHVibGljSWQS'
+    'HAoJdGhyZXNob2xkGAMgASgNUgl0aHJlc2hvbGQSLQoSYW5ub3VuY2VtZW50X3NoYXJlGAUgAS'
+    'gMUhFhbm5vdW5jZW1lbnRTaGFyZRJGCh1wdWJsaWNfa2V5X3ZlcmlmaWVkX3RpbWVzdGFtcBgG'
+    'IAEoA0gAUhpwdWJsaWNLZXlWZXJpZmllZFRpbWVzdGFtcIgBARqiAgoaQW5ub3VuY2VtZW50U2'
+    'hhcmVEZWNyeXB0ZWQSggEKC3NpZ25lZF9kYXRhGAEgASgLMmEudXNlcl9kaXNjb3ZlcnkuVXNl'
+    'ckRpc2NvdmVyeU1lc3NhZ2UuVXNlckRpc2NvdmVyeVByb21vdGlvbi5Bbm5vdW5jZW1lbnRTaG'
+    'FyZURlY3J5cHRlZC5TaWduZWREYXRhUgpzaWduZWREYXRhEhwKCXNpZ25hdHVyZRgCIAEoDFIJ'
+    'c2lnbmF0dXJlGmEKClNpZ25lZERhdGESGwoJcHVibGljX2lkGAEgASgDUghwdWJsaWNJZBIXCg'
+    'd1c2VyX2lkGAIgASgDUgZ1c2VySWQSHQoKcHVibGljX2tleRgDIAEoDFIJcHVibGljS2V5QiAK'
+    'Hl9wdWJsaWNfa2V5X3ZlcmlmaWVkX3RpbWVzdGFtcBo4ChNVc2VyRGlzY292ZXJ5UmVjYWxsEi'
+    'EKDHByb21vdGlvbl9pZBgBIAEoA1ILcHJvbW90aW9uSWRCHgocX3VzZXJfZGlzY292ZXJ5X2Fu'
+    'bm91bmNlbWVudEIbChlfdXNlcl9kaXNjb3ZlcnlfcHJvbW90aW9uQhgKFl91c2VyX2Rpc2Nvdm'
+    'VyeV9yZWNhbGw=');
diff --git a/lib/src/model/protobuf/client/groups.proto b/lib/src/model/protobuf/client/groups.proto
index 268ad1f6..d4e370d5 100644
--- a/lib/src/model/protobuf/client/groups.proto
+++ b/lib/src/model/protobuf/client/groups.proto
@@ -2,22 +2,22 @@ syntax = "proto3";
 
 // Stored encrypted on the server in the members columns.
 message EncryptedGroupState {
-    repeated int64 memberIds = 1; 
-    repeated int64 adminIds = 2; 
-    string groupName = 3;
-    optional int64 deleteMessagesAfterMilliseconds = 4;
-    bytes padding = 5;
+  repeated int64 member_ids                         = 1;
+  repeated int64 admin_ids                          = 2;
+  string         group_name                         = 3;
+  optional int64 delete_messages_after_milliseconds = 4;
+  bytes          padding                            = 5;
 }
 
 message EncryptedAppendedGroupState {
-    enum Type {
-        LEFT_GROUP = 0;
-    }
-    Type type = 1;
+  enum Type {
+    LEFT_GROUP = 0;
+  }
+  Type type = 1;
 }
 
 message EncryptedGroupStateEnvelop {
-    bytes nonce = 1;
-    bytes encryptedGroupState = 2;
-    bytes mac = 3;
+  bytes nonce                 = 1;
+  bytes encrypted_group_state = 2;
+  bytes mac                   = 3;
 }
\ No newline at end of file
diff --git a/lib/src/model/protobuf/client/messages.proto b/lib/src/model/protobuf/client/messages.proto
index 9ac0f291..a2093ca0 100644
--- a/lib/src/model/protobuf/client/messages.proto
+++ b/lib/src/model/protobuf/client/messages.proto
@@ -1,203 +1,217 @@
 syntax = "proto3";
 
 message Message {
-    enum Type {
-        SENDER_DELIVERY_RECEIPT = 0;
-        PLAINTEXT_CONTENT = 1;
-        CIPHERTEXT = 2;
-        PREKEY_BUNDLE = 3;
-        TEST_NOTIFICATION = 4;
-    }
-    Type type = 1;
-    string receiptId = 2;
-    optional bytes encryptedContent = 3;
-    optional PlaintextContent plaintextContent = 4;
+  enum Type {
+    SENDER_DELIVERY_RECEIPT = 0;
+    PLAINTEXT_CONTENT       = 1;
+    CIPHERTEXT              = 2;
+    PREKEY_BUNDLE           = 3;
+    TEST_NOTIFICATION       = 4;
+  }
+  Type                      type              = 1;
+  string                    receipt_id        = 2;
+  optional bytes            encrypted_content = 3;
+  optional PlaintextContent plaintext_content = 4;
 }
 
 message PlaintextContent {
-    optional DecryptionErrorMessage decryptionErrorMessage = 1;
-    optional RetryErrorMessage retryControlError = 2; 
+  optional DecryptionErrorMessage decryption_error_message = 1;
+  optional RetryErrorMessage      retry_control_error      = 2;
 
-    message RetryErrorMessage { }
+  message RetryErrorMessage { }
 
-    message DecryptionErrorMessage {
-        enum Type {
-            UNKNOWN = 0;
-            PREKEY_UNKNOWN = 1;
-        }
-        Type type = 1;
+  message DecryptionErrorMessage {
+    enum Type {
+      UNKNOWN        = 0;
+      PREKEY_UNKNOWN = 1;
     }
+    Type type = 1;
+  }
 }
 
-
 message EncryptedContent {
 
-    optional string groupId = 2;
-    optional bool isDirectChat = 3;
+  optional string group_id       = 2;
+  optional bool   is_direct_chat = 3;
 
     /// This can be added, so the receiver can check weather he is up to date with the current profile
-    optional int64 senderProfileCounter = 4;
+  optional int64 sender_profile_counter        = 4;
+  optional bytes sender_user_discovery_version = 21;
 
-    optional MessageUpdate messageUpdate  = 5;
-    optional Media media = 6;
-    optional MediaUpdate mediaUpdate = 7;
-    optional ContactUpdate contactUpdate = 8;
-    optional ContactRequest contactRequest = 9;
-    optional FlameSync flameSync = 10;
-    optional PushKeys pushKeys = 11;
-    optional Reaction reaction  = 12;
-    optional TextMessage textMessage  = 13;
-    optional GroupCreate groupCreate  = 14;
-    optional GroupJoin groupJoin  = 15;
-    optional GroupUpdate groupUpdate  = 16;
-    optional ResendGroupPublicKey resendGroupPublicKey = 17;
-    optional ErrorMessages error_messages = 18;
-    optional AdditionalDataMessage additional_data_message = 19;
-    optional TypingIndicator typing_indicator = 20;
+  optional MessageUpdate         message_update          = 5;
+  optional Media                 media                   = 6;
+  optional MediaUpdate           media_update            = 7;
+  optional ContactUpdate         contact_update          = 8;
+  optional ContactRequest        contact_request         = 9;
+  optional FlameSync             flame_sync              = 10;
+  optional PushKeys              push_keys               = 11;
+  optional Reaction              reaction                = 12;
+  optional TextMessage           text_message            = 13;
+  optional GroupCreate           group_create            = 14;
+  optional GroupJoin             group_join              = 15;
+  optional GroupUpdate           group_update            = 16;
+  optional ResendGroupPublicKey  resend_group_public_key = 17;
+  optional ErrorMessages         error_messages          = 18;
+  optional AdditionalDataMessage additional_data_message = 19;
+  optional TypingIndicator       typing_indicator        = 20;
+  optional UserDiscoveryRequest  user_discovery_request  = 22;
+  optional UserDiscoveryUpdate   user_discovery_update   = 23;
+  optional KeyVerificationProof  key_verification_proof  = 24;
 
-    message ErrorMessages {
-        enum Type {
-          ERROR_PROCESSING_MESSAGE_CREATED_ACCOUNT_REQUEST_INSTEAD = 0;
-          UNKNOWN_MESSAGE_TYPE = 2;
-          SESSION_OUT_OF_SYNC = 3;
-        }
-        Type type = 1;
-        string related_receipt_id = 2;
+  message ErrorMessages {
+    enum Type {
+      ERROR_PROCESSING_MESSAGE_CREATED_ACCOUNT_REQUEST_INSTEAD = 0;
+      UNKNOWN_MESSAGE_TYPE                                     = 2;
+      SESSION_OUT_OF_SYNC                                      = 3;
     }
+    Type   type               = 1;
+    string related_receipt_id = 2;
+  }
 
+  message GroupCreate {
+    // key for the state stored on the server
+    bytes state_key        = 3;
+    bytes group_public_key = 4;
+  }
 
-    message GroupCreate {
+  message GroupJoin {
         // key for the state stored on the server
-        bytes stateKey = 3;
-        bytes groupPublicKey = 4;
+    bytes group_public_key = 1;
+  }
+
+  message ResendGroupPublicKey {
+
+  }
+
+  message GroupUpdate {
+    string          group_action_type                      = 1; // GroupActionType.name
+    optional int64  affected_contact_id                    = 2;
+    optional string new_group_name                         = 3;
+    optional int64  new_delete_messages_after_milliseconds = 4;
+  }
+
+  message TextMessage {
+    string          sender_message_id = 1;
+    string          text              = 2;
+    int64           timestamp         = 3;
+    optional string quote_message_id  = 4;
+  }
+
+  message AdditionalDataMessage {
+    string         sender_message_id       = 1;
+    int64          timestamp               = 2;
+    string         type                    = 3;
+    optional bytes additional_message_data = 4;
+  }
+
+  message Reaction {
+    string target_message_id = 1;
+    string emoji             = 2;
+    bool   remove            = 3;
+  }
+
+  message MessageUpdate {
+    enum Type {
+      DELETE    = 0;
+      EDIT_TEXT = 1;
+      OPENED    = 2;
+    }
+    Type            type                        = 1;
+    optional string sender_message_id           = 2;
+    repeated string multiple_target_message_ids = 3;
+    optional string text                        = 4;
+    int64           timestamp                   = 5;
+  }
+
+  message Media {
+    enum Type {
+      REUPLOAD = 0;
+      IMAGE    = 1;
+      VIDEO    = 2;
+      GIF      = 3;
+      AUDIO    = 4;
     }
 
-    message GroupJoin {
-        // key for the state stored on the server
-        bytes groupPublicKey = 1;
+    string          sender_message_id             = 1;
+    Type            type                          = 2;
+    optional int64  display_limit_in_milliseconds = 3;
+    bool            requires_authentication       = 4;
+    int64           timestamp                     = 5;
+    optional string quote_message_id              = 6;
+
+    optional bytes download_token   = 7;
+    optional bytes encryption_key   = 8;
+    optional bytes encryption_mac   = 9;
+    optional bytes encryption_nonce = 10;
+
+    optional bytes additional_message_data = 11;
+  }
+
+  message MediaUpdate {
+    enum Type {
+      REOPENED         = 0;
+      STORED           = 1;
+      DECRYPTION_ERROR = 2;
+    }
+    Type   type              = 1;
+    string target_message_id = 2;
+  }
+
+  message ContactRequest {
+    enum Type {
+      REQUEST = 0;
+      REJECT  = 1;
+      ACCEPT  = 2;
+    }
+    Type type = 1;
+  }
+
+  message ContactUpdate {
+    enum Type {
+      REQUEST = 0;
+      UPDATE  = 1;
     }
 
-    message ResendGroupPublicKey {
+    Type            type                  = 1;
+    optional bytes  avatar_svg_compressed = 2;
+    optional string username              = 3;
+    optional string display_name          = 4;
+  }
 
+  message PushKeys {
+    enum Type {
+      REQUEST = 0;
+      UPDATE  = 1;
     }
 
-    message GroupUpdate {
-        string groupActionType = 1; // GroupActionType.name
-        optional int64 affectedContactId = 2;
-        optional string newGroupName = 3;
-        optional int64 newDeleteMessagesAfterMilliseconds = 4;
-    }
+    Type           type       = 1;
+    optional int64 key_id     = 2;
+    optional bytes key        = 3;
+    optional int64 created_at = 4;
+  }
 
-    message TextMessage {
-        string senderMessageId = 1;
-        string text = 2;
-        int64 timestamp = 3;
-        optional string quoteMessageId = 4;
-    }
+  message FlameSync {
+    int64 flame_counter             = 1;
+    int64 last_flame_counter_change = 2;
+    bool  best_friend               = 3;
+    bool  force_update              = 4;
+  }
 
-    message AdditionalDataMessage {
-        string sender_message_id = 1;
-        int64 timestamp = 2;
-        string type = 3;
-        optional bytes additional_message_data = 4;
-    }
+  message TypingIndicator {
+    bool  is_typing  = 1;
+    int64 created_at = 2;
+  }
 
-    message Reaction {
-        string targetMessageId = 1;
-        string emoji = 2;
-        bool remove = 3;
-    }
+  message UserDiscoveryRequest  {
+    bytes current_version = 1;
+  }
 
-    message MessageUpdate {
-        enum Type {
-            DELETE = 0;
-            EDIT_TEXT = 1;
-            OPENED = 2;
-        }
-        Type type = 1;
-        optional string senderMessageId = 2;
-        repeated string multipleTargetMessageIds = 3;
-        optional string text = 4;
-        int64 timestamp = 5;
-    }
+  message UserDiscoveryUpdate {
+    repeated bytes messages = 1;
+  }
 
-    message Media {
-        enum Type {
-            REUPLOAD = 0;
-            IMAGE = 1;
-            VIDEO = 2;
-            GIF = 3;
-            AUDIO = 4;
-        }
-
-        string senderMessageId = 1;
-        Type type = 2;
-        optional int64 displayLimitInMilliseconds = 3;
-        bool requiresAuthentication = 4;
-        int64 timestamp = 5;
-        optional string quoteMessageId = 6;
-
-        optional bytes downloadToken = 7;
-        optional bytes encryptionKey = 8;
-        optional bytes encryptionMac = 9;
-        optional bytes encryptionNonce = 10;
-
-        optional bytes additional_message_data = 11;
-    }
-
-    message MediaUpdate {
-        enum Type {
-            REOPENED = 0;
-            STORED = 1;
-            DECRYPTION_ERROR = 2;
-        }
-        Type type = 1;
-        string targetMessageId = 2;
-    }
-
-    message ContactRequest {
-        enum Type {
-            REQUEST = 0;
-            REJECT = 1;
-            ACCEPT = 2;
-        }
-        Type type = 1;
-    }
-
-    message ContactUpdate {
-        enum Type {
-            REQUEST = 0;
-            UPDATE = 1;
-        }
-
-        Type type = 1;
-        optional bytes avatarSvgCompressed = 2;
-        optional string username = 3;
-        optional string displayName = 4;
-    }
-
-    message PushKeys {
-        enum Type {
-            REQUEST = 0;
-            UPDATE = 1;
-        }
-
-        Type type = 1;
-        optional int64 keyId = 2;
-        optional bytes key = 3;
-        optional int64 createdAt = 4;
-    }
-
-    message FlameSync {
-        int64 flameCounter = 1;
-        int64 lastFlameCounterChange = 2;
-        bool bestFriend = 3;
-        bool forceUpdate = 4;
-    }
-
-    message TypingIndicator {
-        bool is_typing = 1;
-        int64 created_at = 2;
-    }
+  message KeyVerificationProof {
+    bytes calculated_mac = 1;
+  }
 
 }
\ No newline at end of file
diff --git a/lib/src/model/protobuf/client/push_notification.proto b/lib/src/model/protobuf/client/push_notification.proto
index 5e74e9c4..61b0bc09 100644
--- a/lib/src/model/protobuf/client/push_notification.proto
+++ b/lib/src/model/protobuf/client/push_notification.proto
@@ -1,53 +1,52 @@
 syntax = "proto3";
 
 message EncryptedPushNotification {
-    int64 keyId = 1;
-    bytes nonce = 2;
-    bytes ciphertext = 3;
-    bytes mac = 4;
+  int64 key_id     = 1;
+  bytes nonce      = 2;
+  bytes ciphertext = 3;
+  bytes mac        = 4;
 }
 
 enum PushKind {
-    reaction = 0;
-    response = 1;
-    text = 2;
-    video = 3;
-    twonly = 4;
-    image = 5;
-    contactRequest = 6;
-    acceptRequest = 7;
-    storedMediaFile = 8;
-    testNotification = 9;
-    reopenedMedia = 10;
-    reactionToVideo = 11;
-    reactionToText = 12;
-    reactionToImage = 13;
-    reactionToAudio = 14;
-    addedToGroup = 15;
-    audio = 16;
+  REACTION          = 0;
+  RESPONSE          = 1;
+  TEXT              = 2;
+  VIDEO             = 3;
+  TWONLY            = 4;
+  IMAGE             = 5;
+  CONTACT_REQUEST   = 6;
+  ACCEPT_REQUEST    = 7;
+  STORED_MEDIA_FILE = 8;
+  TEST_NOTIFICATION = 9;
+  REOPENED_MEDIA    = 10;
+  REACTION_TO_VIDEO = 11;
+  REACTION_TO_TEXT  = 12;
+  REACTION_TO_IMAGE = 13;
+  REACTION_TO_AUDIO = 14;
+  ADDED_TO_GROUP    = 15;
+  AUDIO             = 16;
 };
 
 message PushNotification {
-    PushKind kind = 1;
-    optional string messageId = 2;
-    optional string additionalContent = 3;
+  PushKind        kind               = 1;
+  optional string message_id         = 2;
+  optional string additional_content = 3;
 }
 
-
 message PushUsers {
-    repeated PushUser users = 1;
+  repeated PushUser users = 1;
 }
 
 message PushUser {
-    int64 userId = 1;
-    string displayName = 2;
-    bool blocked = 3;
-    optional string lastMessageId = 4;
-    repeated PushKey pushKeys = 5;
+  int64            user_id         = 1;
+  string           display_name    = 2;
+  bool             blocked         = 3;
+  optional string  last_message_id = 4;
+  repeated PushKey push_keys       = 5;
 }
 
 message PushKey {
-    int64 id = 1;
-    bytes key = 2;
-    int64 createdAtUnixTimestamp = 3;
+  int64 id                        = 1;
+  bytes key                       = 2;
+  int64 created_at_unix_timestamp = 3;
 }
\ No newline at end of file
diff --git a/lib/src/model/protobuf/client/qr.proto b/lib/src/model/protobuf/client/qr.proto
index 29440b9e..7193a6ac 100644
--- a/lib/src/model/protobuf/client/qr.proto
+++ b/lib/src/model/protobuf/client/qr.proto
@@ -1,19 +1,20 @@
 syntax = "proto3";
 
 message QREnvelope {
-    enum Type {
-        PublicProfile = 0;
-    }
-    Type type = 2;
-    bytes data = 3;
+  enum Type {
+    PUBLIC_PROFILE = 0;
+  }
+  Type  type = 2;
+  bytes data = 3;
 }
 
 message PublicProfile {
-    int64 user_id = 1;
-    string username = 2;
-    bytes public_identity_key = 3;
-    bytes signed_prekey = 4;
-    int64 registration_id = 5;
-    bytes signed_prekey_signature = 6;
-    int64 signed_prekey_id = 7;
+  int64  user_id                 = 1;
+  string username                = 2;
+  bytes  public_identity_key     = 3;
+  bytes  signed_prekey           = 4;
+  int64  registration_id         = 5;
+  bytes  signed_prekey_signature = 6;
+  int64  signed_prekey_id        = 7;
+  optional bytes secret_verification_token = 8; 
 }
diff --git a/lib/src/model/purchases/purchasable_product.dart b/lib/src/model/purchasable_product.model.dart
similarity index 100%
rename from lib/src/model/purchases/purchasable_product.dart
rename to lib/src/model/purchasable_product.model.dart
diff --git a/lib/src/providers/connection.provider.dart b/lib/src/providers/connection.provider.dart
index 1b004aeb..4814a3c7 100644
--- a/lib/src/providers/connection.provider.dart
+++ b/lib/src/providers/connection.provider.dart
@@ -1,8 +1,25 @@
+import 'dart:async';
 import 'package:flutter/foundation.dart';
+import 'package:twonly/locator.dart';
 
 class CustomChangeProvider with ChangeNotifier, DiagnosticableTreeMixin {
-  bool _isConnected = false;
+  CustomChangeProvider() {
+    // The API is connected before the subscription has started so ensure that the connection state is correct
+    _isConnected = apiService.isConnected;
+    _connSub = apiService.onConnectionStateUpdated.listen(
+      updateConnectionState,
+    );
+  }
+  late bool _isConnected;
+  late StreamSubscription<bool> _connSub;
   bool get isConnected => _isConnected;
+
+  @override
+  void dispose() {
+    _connSub.cancel();
+    super.dispose();
+  }
+
   Future<void> updateConnectionState(bool update) async {
     _isConnected = update;
     notifyListeners();
diff --git a/lib/src/providers/purchases.provider.dart b/lib/src/providers/purchases.provider.dart
index 25cf1508..d3c58f45 100644
--- a/lib/src/providers/purchases.provider.dart
+++ b/lib/src/providers/purchases.provider.dart
@@ -1,15 +1,16 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
+
 import 'package:flutter/foundation.dart';
 import 'package:in_app_purchase/in_app_purchase.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/constants/subscription.keys.dart';
 import 'package:twonly/src/model/protobuf/api/websocket/error.pb.dart';
-import 'package:twonly/src/model/purchases/purchasable_product.dart';
+import 'package:twonly/src/model/purchasable_product.model.dart';
 import 'package:twonly/src/services/subscription.service.dart';
+import 'package:twonly/src/services/user.service.dart';
 import 'package:twonly/src/utils/log.dart';
-import 'package:twonly/src/utils/storage.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 // Gives the option to override in tests.
@@ -31,13 +32,27 @@ Timer? globalForceIpaCheck;
 
 class PurchasesProvider with ChangeNotifier, DiagnosticableTreeMixin {
   PurchasesProvider() {
-    final purchaseUpdated = iapConnection.purchaseStream;
-    _subscription = purchaseUpdated.listen(
+    _subscription = iapConnection.purchaseStream.listen(
       _onPurchaseUpdate,
       onDone: _updateStreamOnDone,
       onError: _updateStreamOnError,
     );
 
+    _planSub = apiService.onPlanUpdated.listen(updatePlan);
+    _connSub = apiService.onConnectionStateUpdated.listen((_) async {
+      try {
+        if (userService.isUserCreated) {
+          updatePlan(planFromString(userService.currentUser.subscriptionPlan));
+        }
+      } catch (e) {
+        Log.error(e);
+      }
+    });
+
+    if (userService.isUserCreated) {
+      updatePlan(planFromString(userService.currentUser.subscriptionPlan));
+    }
+
     loadPurchases();
   }
 
@@ -48,6 +63,8 @@ class PurchasesProvider with ChangeNotifier, DiagnosticableTreeMixin {
   late StreamSubscription<List<PurchaseDetails>> _subscription;
   final InAppPurchase iapConnection = IAPConnection.instance;
 
+  late StreamSubscription<SubscriptionPlan> _planSub;
+  late StreamSubscription<bool> _connSub;
   bool _userTriggeredBuyButton = false;
 
   void updatePlan(SubscriptionPlan newPlan) {
@@ -59,7 +76,7 @@ class PurchasesProvider with ChangeNotifier, DiagnosticableTreeMixin {
     final available = await iapConnection.isAvailable();
     if (!available) {
       storeState = StoreState.notAvailable;
-      Log.error('Store is not available');
+      Log.warn('Store is not available');
       notifyListeners();
       return;
     }
@@ -79,16 +96,23 @@ class PurchasesProvider with ChangeNotifier, DiagnosticableTreeMixin {
     storeState = StoreState.available;
     notifyListeners();
 
-    final user = await getUser();
-    if (user != null && isPayingUser(planFromString(user.subscriptionPlan))) {
-      Log.info('Started IPA timer for verification.');
-      globalForceIpaCheck = Timer(const Duration(seconds: 5), () async {
-        Log.info('Force Ipa check was not stopped. Requesting forced check...');
-        await apiService.forceIpaCheck();
-      });
-    }
+    try {
+      if (userService.isUserCreated &&
+          isPayingUser(
+            planFromString(userService.currentUser.subscriptionPlan),
+          )) {
+        globalForceIpaCheck = Timer(const Duration(seconds: 5), () async {
+          Log.info(
+            'Force Ipa check was not stopped. Requesting forced check...',
+          );
+          await apiService.forceIpaCheck();
+        });
+      }
 
-    await iapConnection.restorePurchases();
+      await iapConnection.restorePurchases();
+    } catch (e) {
+      Log.error(e);
+    }
   }
 
   Future<void> buy(PurchasableProduct product) async {
@@ -164,9 +188,8 @@ class PurchasesProvider with ChangeNotifier, DiagnosticableTreeMixin {
     // an ok authenticated which is processed in the apiProvider...
     if (res.isSuccess) {
       if (Platform.isAndroid) {
-        await updateUserdata((u) {
+        await UserService.update((u) {
           u.subscriptionPlanIdStore = purchaseDetails.productID;
-          return u;
         });
       }
     }
@@ -196,11 +219,10 @@ class PurchasesProvider with ChangeNotifier, DiagnosticableTreeMixin {
         purchaseDetails.error == null) {
       globalForceIpaCheck?.cancel();
 
-      final user = await getUser();
+      final currentPlan = userService.currentUser.subscriptionPlan;
 
-      if (user != null &&
-          (user.subscriptionPlan != SubscriptionPlan.Family.name &&
-              user.subscriptionPlan != SubscriptionPlan.Pro.name)) {
+      if (currentPlan != SubscriptionPlan.Family.name &&
+          currentPlan != SubscriptionPlan.Pro.name) {
         for (var i = 0; i < 100; i++) {
           if (apiService.isAuthenticated) {
             Log.info(
@@ -225,6 +247,8 @@ class PurchasesProvider with ChangeNotifier, DiagnosticableTreeMixin {
 
   @override
   void dispose() {
+    _planSub.cancel();
+    _connSub.cancel();
     _subscription.cancel();
     super.dispose();
   }
diff --git a/lib/src/providers/routing.provider.dart b/lib/src/providers/routing.provider.dart
index d1eb1b00..cccb4c4c 100644
--- a/lib/src/providers/routing.provider.dart
+++ b/lib/src/providers/routing.provider.dart
@@ -2,49 +2,50 @@ import 'package:go_router/go_router.dart';
 import 'package:twonly/app.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
 import 'package:twonly/src/database/twonly.db.dart';
-import 'package:twonly/src/views/camera/camera_qr_scanner.view.dart';
-import 'package:twonly/src/views/camera/camera_send_to.view.dart';
-import 'package:twonly/src/views/chats/add_new_user.view.dart';
-import 'package:twonly/src/views/chats/archived_chats.view.dart';
-import 'package:twonly/src/views/chats/chat_messages.view.dart';
-import 'package:twonly/src/views/chats/media_viewer.view.dart';
-import 'package:twonly/src/views/chats/start_new_chat.view.dart';
-import 'package:twonly/src/views/contact/contact.view.dart';
-import 'package:twonly/src/views/groups/group.view.dart';
-import 'package:twonly/src/views/groups/group_create_select_members.view.dart';
-import 'package:twonly/src/views/onboarding/recover.view.dart';
-import 'package:twonly/src/views/public_profile.view.dart';
-import 'package:twonly/src/views/settings/account.view.dart';
-import 'package:twonly/src/views/settings/appearance.view.dart';
-import 'package:twonly/src/views/settings/backup/backup.view.dart';
-import 'package:twonly/src/views/settings/backup/backup_server.view.dart';
-import 'package:twonly/src/views/settings/backup/setup_backup.view.dart';
-import 'package:twonly/src/views/settings/chat/chat_reactions.view.dart';
-import 'package:twonly/src/views/settings/chat/chat_settings.view.dart';
-import 'package:twonly/src/views/settings/data_and_storage.view.dart';
-import 'package:twonly/src/views/settings/data_and_storage/export_media.view.dart';
-import 'package:twonly/src/views/settings/data_and_storage/import_media.view.dart';
-import 'package:twonly/src/views/settings/developer/automated_testing.view.dart';
-import 'package:twonly/src/views/settings/developer/developer.view.dart';
-import 'package:twonly/src/views/settings/developer/reduce_flames.view.dart';
-import 'package:twonly/src/views/settings/developer/retransmission_data.view.dart';
-import 'package:twonly/src/views/settings/help/changelog.view.dart';
-import 'package:twonly/src/views/settings/help/contact_us.view.dart';
-import 'package:twonly/src/views/settings/help/credits.view.dart';
-import 'package:twonly/src/views/settings/help/diagnostics.view.dart';
-import 'package:twonly/src/views/settings/help/faq.view.dart';
-import 'package:twonly/src/views/settings/help/faq/verifybadge.dart';
-import 'package:twonly/src/views/settings/help/help.view.dart';
-import 'package:twonly/src/views/settings/notification.view.dart';
-import 'package:twonly/src/views/settings/privacy.view.dart';
-import 'package:twonly/src/views/settings/privacy_view_block.view.dart';
-import 'package:twonly/src/views/settings/profile/modify_avatar.view.dart';
-import 'package:twonly/src/views/settings/profile/profile.view.dart';
-import 'package:twonly/src/views/settings/settings_main.view.dart';
-import 'package:twonly/src/views/settings/share_with_friends.view.dart';
-import 'package:twonly/src/views/settings/subscription/subscription.view.dart';
-import 'package:twonly/src/views/user_study/user_study_questionnaire.view.dart';
-import 'package:twonly/src/views/user_study/user_study_welcome.view.dart';
+import 'package:twonly/src/visual/views/camera/camera_qr_scanner.view.dart';
+import 'package:twonly/src/visual/views/camera/camera_send_to.view.dart';
+import 'package:twonly/src/visual/views/chats/archived_chats.view.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages.view.dart';
+import 'package:twonly/src/visual/views/chats/media_viewer.view.dart';
+import 'package:twonly/src/visual/views/chats/start_new_chat.view.dart';
+import 'package:twonly/src/visual/views/contact/add_new_contact.view.dart';
+import 'package:twonly/src/visual/views/contact/contact.view.dart';
+import 'package:twonly/src/visual/views/groups/group.view.dart';
+import 'package:twonly/src/visual/views/groups/group_create_select_members.view.dart';
+import 'package:twonly/src/visual/views/onboarding/recover.view.dart';
+import 'package:twonly/src/visual/views/public_profile.view.dart';
+import 'package:twonly/src/visual/views/settings/account.view.dart';
+import 'package:twonly/src/visual/views/settings/appearance.view.dart';
+import 'package:twonly/src/visual/views/settings/backup/backup_server.view.dart';
+import 'package:twonly/src/visual/views/settings/backup/backup_settings.view.dart';
+import 'package:twonly/src/visual/views/settings/backup/backup_setup.view.dart';
+import 'package:twonly/src/visual/views/settings/chat/chat_reactions.view.dart';
+import 'package:twonly/src/visual/views/settings/chat/chat_settings.view.dart';
+import 'package:twonly/src/visual/views/settings/data_and_storage.view.dart';
+import 'package:twonly/src/visual/views/settings/data_and_storage/export_media.view.dart';
+import 'package:twonly/src/visual/views/settings/data_and_storage/import_media.view.dart';
+import 'package:twonly/src/visual/views/settings/developer/automated_testing.view.dart';
+import 'package:twonly/src/visual/views/settings/developer/developer.view.dart';
+import 'package:twonly/src/visual/views/settings/developer/reduce_flames.view.dart';
+import 'package:twonly/src/visual/views/settings/developer/retransmission_data.view.dart';
+import 'package:twonly/src/visual/views/settings/help/changelog.view.dart';
+import 'package:twonly/src/visual/views/settings/help/contact_us.view.dart';
+import 'package:twonly/src/visual/views/settings/help/credits.view.dart';
+import 'package:twonly/src/visual/views/settings/help/diagnostics.view.dart';
+import 'package:twonly/src/visual/views/settings/help/faq.view.dart';
+import 'package:twonly/src/visual/views/settings/help/faq/verification_badge_faq.view.dart';
+import 'package:twonly/src/visual/views/settings/help/help.view.dart';
+import 'package:twonly/src/visual/views/settings/notification.view.dart';
+import 'package:twonly/src/visual/views/settings/privacy.view.dart';
+import 'package:twonly/src/visual/views/settings/privacy/block_users.view.dart';
+import 'package:twonly/src/visual/views/settings/privacy/user_discovery.view.dart';
+import 'package:twonly/src/visual/views/settings/profile/modify_avatar.view.dart';
+import 'package:twonly/src/visual/views/settings/profile/profile.view.dart';
+import 'package:twonly/src/visual/views/settings/settings_main.view.dart';
+import 'package:twonly/src/visual/views/settings/share_with_friends.view.dart';
+import 'package:twonly/src/visual/views/settings/subscription/subscription.view.dart';
+import 'package:twonly/src/visual/views/user_study/user_study_questionnaire.view.dart';
+import 'package:twonly/src/visual/views/user_study/user_study_welcome.view.dart';
 
 final routerProvider = GoRouter(
   routes: [
@@ -174,9 +175,7 @@ final routerProvider = GoRouter(
             ),
             GoRoute(
               path: 'setup',
-              builder: (context, state) => SetupBackupView(
-                isPasswordChangeOnly: state.extra as bool? ?? false,
-              ),
+              builder: (context, state) => const SetupBackupView(),
             ),
           ],
         ),
@@ -200,7 +199,11 @@ final routerProvider = GoRouter(
           routes: [
             GoRoute(
               path: 'block_users',
-              builder: (context, state) => const PrivacyViewBlockUsersView(),
+              builder: (context, state) => const BlockUsersView(),
+            ),
+            GoRoute(
+              path: 'user_discovery',
+              builder: (context, state) => const UserDiscoverySettingsView(),
             ),
           ],
         ),
diff --git a/lib/src/providers/settings.provider.dart b/lib/src/providers/settings.provider.dart
index 840f2d66..f2057b3a 100644
--- a/lib/src/providers/settings.provider.dart
+++ b/lib/src/providers/settings.provider.dart
@@ -1,15 +1,20 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:twonly/src/utils/storage.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/services/user.service.dart';
 
 class SettingsChangeProvider with ChangeNotifier, DiagnosticableTreeMixin {
   late ThemeMode _themeMode;
 
   ThemeMode get themeMode => _themeMode;
 
-  Future<void> loadSettings() async {
-    _themeMode = (await getUser())?.themeMode ?? ThemeMode.system;
-    notifyListeners();
+  void loadSettings() {
+    if (userService.isUserCreated) {
+      _themeMode = userService.currentUser.themeMode;
+      notifyListeners();
+    } else {
+      _themeMode = ThemeMode.system;
+    }
   }
 
   Future<void> updateThemeMode(ThemeMode? newThemeMode) async {
@@ -21,9 +26,6 @@ class SettingsChangeProvider with ChangeNotifier, DiagnosticableTreeMixin {
 
     notifyListeners();
 
-    await updateUserdata((user) {
-      user.themeMode = newThemeMode;
-      return user;
-    });
+    await UserService.update((u) => u.themeMode = newThemeMode);
   }
 }
diff --git a/lib/src/services/api.service.dart b/lib/src/services/api.service.dart
index 432b16b8..85d7d049 100644
--- a/lib/src/services/api.service.dart
+++ b/lib/src/services/api.service.dart
@@ -7,41 +7,44 @@ import 'dart:io';
 import 'dart:math';
 import 'dart:ui' as ui;
 
-import 'package:clock/clock.dart';
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:drift/drift.dart';
 import 'package:fixnum/fixnum.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 // ignore: implementation_imports
 import 'package:libsignal_protocol_dart/src/ecc/ed25519.dart';
 import 'package:mutex/mutex.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/constants/secure_storage_keys.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/constants/secure_storage.keys.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/protobuf/api/websocket/client_to_server.pbserver.dart';
 import 'package:twonly/src/model/protobuf/api/websocket/error.pb.dart';
 import 'package:twonly/src/model/protobuf/api/websocket/server_to_client.pb.dart'
     as server;
 import 'package:twonly/src/model/protobuf/api/websocket/server_to_client.pbserver.dart';
-import 'package:twonly/src/services/api/mediafiles/download.service.dart';
-import 'package:twonly/src/services/api/mediafiles/upload.service.dart';
-import 'package:twonly/src/services/api/messages.dart';
-import 'package:twonly/src/services/api/server_messages.dart';
-import 'package:twonly/src/services/api/utils.dart';
+import 'package:twonly/src/services/api/client2client/user_discovery.c2c.dart';
+import 'package:twonly/src/services/api/mediafiles/download.api.dart';
+import 'package:twonly/src/services/api/mediafiles/upload.api.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
+import 'package:twonly/src/services/api/server_messages.api.dart';
+import 'package:twonly/src/services/api/utils.api.dart';
 import 'package:twonly/src/services/flame.service.dart';
 import 'package:twonly/src/services/group.services.dart';
 import 'package:twonly/src/services/notifications/fcm.notifications.dart';
 import 'package:twonly/src/services/notifications/pushkeys.notifications.dart';
 import 'package:twonly/src/services/signal/identity.signal.dart';
+import 'package:twonly/src/services/signal/protocol_state.signal.dart';
 import 'package:twonly/src/services/signal/utils.signal.dart';
 import 'package:twonly/src/services/subscription.service.dart';
+import 'package:twonly/src/services/user.service.dart';
+import 'package:twonly/src/services/user_discovery.service.dart';
+import 'package:twonly/src/services/user_study.service.dart';
 import 'package:twonly/src/utils/keyvalue.dart';
 import 'package:twonly/src/utils/log.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/storage.dart';
-import 'package:twonly/src/views/user_study/user_study_data_collection.dart';
+import 'package:twonly/src/utils/secure_storage.dart';
 import 'package:web_socket_channel/io.dart';
 
 final lockConnecting = Mutex();
@@ -53,9 +56,23 @@ final lockAuthentication = Mutex();
 /// errors or network changes.
 class ApiService {
   ApiService();
-  final String apiHost = kReleaseMode ? 'api.twonly.eu' : '10.99.0.140:3030';
+  final String apiHost = kReleaseMode ? 'api.twonly.eu' : 'dev-api.twonly.eu';
   // final String apiHost = kReleaseMode ? 'api.twonly.eu' : 'dev.twonly.eu';
-  final String apiSecure = kReleaseMode ? 's' : '';
+  final String apiSecure = kReleaseMode ? 's' : 's';
+
+  final _planUpdateController = StreamController<SubscriptionPlan>.broadcast();
+  Stream<SubscriptionPlan> get onPlanUpdated => _planUpdateController.stream;
+
+  final _connectionStateController = StreamController<bool>.broadcast();
+  Stream<bool> get onConnectionStateUpdated =>
+      _connectionStateController.stream;
+
+  final _appOutdatedController = StreamController<void>.broadcast();
+  Stream<void> get onAppOutdated => _appOutdatedController.stream;
+
+  final _newDeviceRegisteredController = StreamController<void>.broadcast();
+  Stream<void> get onNewDeviceRegistered =>
+      _newDeviceRegisteredController.stream;
 
   bool appIsOutdated = false;
   bool isAuthenticated = false;
@@ -64,10 +81,11 @@ class ApiService {
   Timer? reconnectionTimer;
   int _reconnectionDelay = 5;
 
-  final HashMap<Int64, server.ServerToClient?> messagesV0 = HashMap();
+  final HashMap<Int64, Completer<server.ServerToClient?>> _pendingRequests =
+      HashMap();
   IOWebSocketChannel? _channel;
   // ignore: cancel_subscriptions
-  StreamSubscription<List<ConnectivityResult>>? connectivitySubscription;
+  StreamSubscription<List<ConnectivityResult>>? _connectivitySubscription;
 
   Future<bool> _connectTo(String apiUrl) async {
     if (appIsOutdated) return false;
@@ -88,27 +106,32 @@ class ApiService {
   // Function is called after the user is authenticated at the server
   Future<void> onAuthenticated() async {
     await initFCMAfterAuthenticated();
-    globalCallbackConnectionState(isConnected: true);
+    _connectionStateController.add(true);
 
-    if (globalIsInBackgroundTask) {
+    if (AppState.isInBackgroundTask) {
       await retransmitRawBytes();
       await retransmitAllMessages();
       await reuploadMediaFiles();
       await tryDownloadAllMediaFiles();
-    } else if (!globalIsAppInBackground) {
+    } else if (!AppState.isAppInBackground) {
       unawaited(retransmitRawBytes());
       unawaited(retransmitAllMessages());
       unawaited(tryDownloadAllMediaFiles());
       unawaited(reuploadMediaFiles());
+
       twonlyDB.markUpdated();
       unawaited(syncFlameCounters());
       unawaited(setupNotificationWithUsers());
       unawaited(signalHandleNewServerConnection());
+      resetResyncedUsers();
+      resetUserDiscoveryRequestUpdates();
       unawaited(fetchGroupStatesForUnjoinedGroups());
       unawaited(fetchMissingGroupPublicKey());
       unawaited(checkForDeletedUsernames());
 
-      if (gUser.userStudyParticipantsToken != null) {
+      unawaited(UserDiscoveryService.checkForNewAnnouncedUsers());
+
+      if (userService.currentUser.userStudyParticipantsToken != null) {
         // In case the user participates in the user study, call the handler after authenticated, to be sure there is a internet connection
         unawaited(handleUserStudyUpload());
       }
@@ -118,19 +141,26 @@ class ApiService {
   Future<void> onConnected() async {
     await authenticate();
     _reconnectionDelay = 1;
-    globalCallbackConnectionState(isConnected: true);
+    _connectionStateController.add(true);
   }
 
   Future<void> onClosed() async {
     _channel = null;
     isAuthenticated = false;
-    globalCallbackConnectionState(isConnected: false);
+    _connectionStateController.add(false);
+    // Complete all pending requests with null on disconnect
+    for (final completer in _pendingRequests.values) {
+      if (!completer.isCompleted) {
+        completer.complete(null);
+      }
+    }
+    _pendingRequests.clear();
     await twonlyDB.mediaFilesDao.resetPendingDownloadState();
     await startReconnectionTimer();
   }
 
   Future<void> startReconnectionTimer() async {
-    if (globalIsInBackgroundTask) return;
+    if (AppState.isInBackgroundTask) return;
     if (reconnectionTimer?.isActive ?? false) {
       return;
     }
@@ -138,7 +168,7 @@ class ApiService {
     reconnectionTimer = Timer(Duration(seconds: _reconnectionDelay), () async {
       reconnectionTimer = null;
       // only try to reconnect in case the app is in the foreground
-      if (!globalIsAppInBackground) {
+      if (!AppState.isAppInBackground) {
         await connect();
       }
     });
@@ -157,10 +187,10 @@ class ApiService {
   }
 
   Future<void> listenToNetworkChanges() async {
-    if (connectivitySubscription != null) {
+    if (_connectivitySubscription != null) {
       return;
     }
-    connectivitySubscription = Connectivity().onConnectivityChanged.listen((
+    _connectivitySubscription = Connectivity().onConnectivityChanged.listen((
       result,
     ) async {
       if (!result.contains(ConnectivityResult.none)) {
@@ -193,7 +223,7 @@ class ApiService {
     });
   }
 
-  bool get isConnected => _channel != null && _channel!.closeCode != null;
+  bool get isConnected => _channel != null && _channel!.closeCode == null;
 
   Future<void> _onDone() async {
     _reconnectionDelay = 3;
@@ -214,7 +244,10 @@ class ApiService {
       final msg = server.ServerToClient.fromBuffer(msgBuffer as Uint8List);
       if (msg.v0.hasResponse()) {
         await removeFromRetransmissionBuffer(msg.v0.seq);
-        messagesV0[msg.v0.seq] = msg;
+        final completer = _pendingRequests.remove(msg.v0.seq);
+        if (completer != null && !completer.isCompleted) {
+          completer.complete(msg);
+        }
       } else {
         await handleServerMessage(msg);
       }
@@ -224,22 +257,20 @@ class ApiService {
   }
 
   Future<server.ServerToClient?> _waitForResponse(Int64 seq) async {
-    final startTime = clock.now();
+    final completer = Completer<server.ServerToClient?>();
+    _pendingRequests[seq] = completer;
 
-    const timeout = Duration(seconds: 60);
-
-    while (true) {
-      if (messagesV0[seq] != null) {
-        final tmp = messagesV0[seq];
-        messagesV0.remove(seq);
-        return tmp;
-      }
-      if (clock.now().difference(startTime) > timeout) {
+    final timer = Timer(const Duration(seconds: 60), () {
+      if (!completer.isCompleted) {
         Log.warn('Timeout for message $seq');
-        return null;
+        _pendingRequests.remove(seq);
+        completer.complete(null);
       }
-      await Future.delayed(const Duration(milliseconds: 10));
-    }
+    });
+
+    final result = await completer.future;
+    timer.cancel();
+    return result;
   }
 
   Future<void> sendResponse(ClientToServer response) async {
@@ -296,7 +327,7 @@ class ApiService {
     int? contactId,
   }) async {
     var seq = Int64(Random().nextInt(4294967296));
-    while (messagesV0.containsKey(seq)) {
+    while (_pendingRequests.containsKey(seq)) {
       seq = Int64(Random().nextInt(4294967296));
     }
 
@@ -325,11 +356,10 @@ class ApiService {
       final ok = res.value as server.Response_Ok;
       if (ok.hasAuthenticated()) {
         final authenticated = ok.authenticated;
-        await updateUserdata((user) {
+        await UserService.update((user) {
           user.subscriptionPlan = authenticated.plan;
-          return user;
         });
-        globalCallbackUpdatePlan(planFromString(authenticated.plan));
+        _planUpdateController.add(planFromString(authenticated.plan));
 
         // this was triggered by apiService.ipaPurchase, so call the onAuthenticated again
         if (isAuthenticated) {
@@ -343,14 +373,14 @@ class ApiService {
         Log.warn('Got error from server: ${res.error}');
       }
       if (res.error == ErrorCode.AppVersionOutdated) {
-        globalCallbackAppIsOutdated();
+        _appOutdatedController.add(null);
         Log.warn('App Version is OUTDATED.');
         appIsOutdated = true;
         await close(() {});
         return Result.error(ErrorCode.InternalError);
       }
       if (res.error == ErrorCode.NewDeviceRegistered) {
-        globalCallbackNewDeviceRegistered();
+        _newDeviceRegisteredController.add(null);
         Log.warn(
           'Device is disabled, as a newer device restore twonly Backup.',
         );
@@ -388,25 +418,23 @@ class ApiService {
     return res;
   }
 
-  Future<bool> tryAuthenticateWithToken(int userId) async {
-    const storage = FlutterSecureStorage();
-    final apiAuthToken = await storage.read(
+  Future<bool> tryAuthenticateWithToken() async {
+    final apiAuthToken = await SecureStorage.instance.read(
       key: SecureStorageKeys.apiAuthToken,
     );
-    final user = await getUser();
 
-    if (apiAuthToken != null && user != null) {
-      if (user.appVersion < 62) {
+    if (apiAuthToken != null) {
+      if (userService.currentUser.appVersion < 62) {
         Log.error(
           'DID NOT authenticate the user, as he still has the old version!',
         );
         return false;
       }
       final authenticate = Handshake_Authenticate()
-        ..userId = Int64(userId)
+        ..userId = Int64(userService.currentUser.userId)
         ..appVersion = (await PackageInfo.fromPlatform()).version
-        ..deviceId = Int64(user.deviceId)
-        ..inBackground = globalIsInBackgroundTask
+        ..deviceId = Int64(userService.currentUser.deviceId)
+        ..inBackground = AppState.isInBackgroundTask
         ..authToken = base64Decode(apiAuthToken);
 
       final handshake = Handshake()..authenticate = authenticate;
@@ -417,7 +445,7 @@ class ApiService {
       if (result.isSuccess) {
         Log.info('websocket is authenticated');
         isAuthenticated = true;
-        if (globalIsInBackgroundTask) {
+        if (AppState.isInBackgroundTask) {
           await onAuthenticated();
         } else {
           unawaited(onAuthenticated());
@@ -441,13 +469,13 @@ class ApiService {
     return lockAuthentication.protect(() async {
       if (isAuthenticated) return;
       if (await getSignalIdentity() == null) {
+        Log.error('Signal identity not found.');
         return;
       }
 
-      final userData = await getUser();
-      if (userData == null) return;
+      if (!userService.isUserCreated) return;
 
-      if (await tryAuthenticateWithToken(userData.userId)) {
+      if (await tryAuthenticateWithToken()) {
         return;
       }
 
@@ -475,7 +503,7 @@ class ApiService {
 
       final getAuthToken = Handshake_GetAuthToken()
         ..response = signature
-        ..userId = Int64(userData.userId);
+        ..userId = Int64(userService.currentUser.userId);
 
       final getauthtoken = Handshake()..getAuthToken = getAuthToken;
 
@@ -490,13 +518,12 @@ class ApiService {
       final apiAuthToken = result2.value.authtoken as Uint8List;
       final apiAuthTokenB64 = base64Encode(apiAuthToken);
 
-      const storage = FlutterSecureStorage();
-      await storage.write(
+      await SecureStorage.instance.write(
         key: SecureStorageKeys.apiAuthToken,
         value: apiAuthTokenB64,
       );
 
-      await tryAuthenticateWithToken(userData.userId);
+      await tryAuthenticateWithToken();
     });
   }
 
@@ -766,17 +793,15 @@ class ApiService {
   Future<Response_PlanBallance?> loadPlanBalance({bool useCache = true}) async {
     final ballance = await getPlanBallance();
     if (ballance != null) {
-      await updateUserdata((u) {
+      await UserService.update((u) {
         u.lastPlanBallance = ballance.writeToJson();
-        return u;
       });
       return ballance;
     }
-    final user = await getUser();
-    if (user != null && user.lastPlanBallance != null && useCache) {
+    if (userService.currentUser.lastPlanBallance != null && useCache) {
       try {
         return Response_PlanBallance.fromJson(
-          user.lastPlanBallance!,
+          userService.currentUser.lastPlanBallance!,
         );
       } catch (e) {
         Log.error('from json: $e');
diff --git a/lib/src/services/api/client2client/additional_data.c2c.dart b/lib/src/services/api/client2client/additional_data.c2c.dart
index 6f420932..5a451bb4 100644
--- a/lib/src/services/api/client2client/additional_data.c2c.dart
+++ b/lib/src/services/api/client2client/additional_data.c2c.dart
@@ -1,9 +1,9 @@
 import 'package:clock/clock.dart' show clock;
 import 'package:drift/drift.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/protobuf/client/generated/messages.pb.dart';
-import 'package:twonly/src/services/api/utils.dart';
+import 'package:twonly/src/services/api/utils.api.dart';
 import 'package:twonly/src/utils/log.dart';
 
 Future<void> handleAdditionalDataMessage(
@@ -14,6 +14,19 @@ Future<void> handleAdditionalDataMessage(
   Log.info(
     'Got a additional data message: ${message.senderMessageId} from $groupId',
   );
+
+  // Prevent message overwrite: reject if a message with this ID already
+  // exists from a different sender.
+  final existing = await twonlyDB.messagesDao
+      .getMessageById(message.senderMessageId)
+      .getSingleOrNull();
+  if (existing != null && existing.senderId != fromUserId) {
+    Log.warn(
+      '$fromUserId tried to overwrite message from ${existing.senderId}. Dropping.',
+    );
+    return;
+  }
+
   final msg = await twonlyDB.messagesDao.insertMessage(
     MessagesCompanion(
       messageId: Value(message.senderMessageId),
diff --git a/lib/src/services/api/client2client/contact.c2c.dart b/lib/src/services/api/client2client/contact.c2c.dart
index 3f7c0b71..d074f2eb 100644
--- a/lib/src/services/api/client2client/contact.c2c.dart
+++ b/lib/src/services/api/client2client/contact.c2c.dart
@@ -2,12 +2,12 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:drift/drift.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/twonly.db.dart' hide Message;
 import 'package:twonly/src/model/protobuf/client/generated/messages.pb.dart';
-import 'package:twonly/src/services/api/messages.dart';
-import 'package:twonly/src/services/api/utils.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
+import 'package:twonly/src/services/api/utils.api.dart';
 import 'package:twonly/src/services/notifications/pushkeys.notifications.dart';
 import 'package:twonly/src/utils/avatars.dart';
 import 'package:twonly/src/utils/log.dart';
@@ -117,15 +117,20 @@ Future<void> handleContactUpdate(
 
     case EncryptedContent_ContactUpdate_Type.UPDATE:
       Log.info('Got a contact update $fromUserId');
-      if (contactUpdate.hasAvatarSvgCompressed() &&
-          contactUpdate.hasDisplayName() &&
+      Uint8List? avatarSvgCompressed;
+      if (contactUpdate.hasAvatarSvgCompressed()) {
+        avatarSvgCompressed = Uint8List.fromList(
+          contactUpdate.avatarSvgCompressed,
+        );
+      }
+      if (contactUpdate.hasDisplayName() &&
           contactUpdate.hasUsername() &&
           senderProfileCounter != null) {
         await twonlyDB.contactsDao.updateContact(
           fromUserId,
           ContactsCompanion(
             avatarSvgCompressed: Value(
-              Uint8List.fromList(contactUpdate.avatarSvgCompressed),
+              avatarSvgCompressed,
             ),
             displayName: Value(contactUpdate.displayName),
             username: Value(contactUpdate.username),
diff --git a/lib/src/services/api/client2client/errors.c2c.dart b/lib/src/services/api/client2client/errors.c2c.dart
index 84dc8c8e..bc03adfd 100644
--- a/lib/src/services/api/client2client/errors.c2c.dart
+++ b/lib/src/services/api/client2client/errors.c2c.dart
@@ -1,6 +1,6 @@
 import 'package:clock/clock.dart';
 import 'package:drift/drift.dart' show Value;
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/protobuf/client/generated/messages.pbserver.dart';
 import 'package:twonly/src/utils/log.dart';
@@ -26,6 +26,8 @@ Future<void> handleErrorMessage(
           requested: Value(true),
         ),
       );
+    case EncryptedContent_ErrorMessages_Type.SESSION_OUT_OF_SYNC:
+      break; // The other user initiated a new signal session, so ignore the error in this case, as the new session works...
     // ignore: no_default_cases
     default:
       break;
diff --git a/lib/src/services/api/client2client/groups.c2c.dart b/lib/src/services/api/client2client/groups.c2c.dart
index 8c88bac6..a6a1c463 100644
--- a/lib/src/services/api/client2client/groups.c2c.dart
+++ b/lib/src/services/api/client2client/groups.c2c.dart
@@ -1,12 +1,13 @@
 import 'dart:async';
+
 import 'package:drift/drift.dart';
 import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/tables/groups.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/protobuf/client/generated/messages.pb.dart';
-import 'package:twonly/src/services/api/messages.dart';
-import 'package:twonly/src/services/api/utils.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
+import 'package:twonly/src/services/api/utils.api.dart';
 import 'package:twonly/src/services/group.services.dart';
 import 'package:twonly/src/utils/log.dart';
 
@@ -161,7 +162,7 @@ Future<void> handleGroupUpdate(
     case GroupActionType.demoteToMember:
       int? affectedContactId = update.affectedContactId.toInt();
 
-      if (affectedContactId == gUser.userId) {
+      if (affectedContactId == userService.currentUser.userId) {
         affectedContactId = null;
         if (actionType == GroupActionType.removedMember) {
           // Oh no, I just got removed from the group...
diff --git a/lib/src/services/api/client2client/media.c2c.dart b/lib/src/services/api/client2client/media.c2c.dart
index 496ac0bc..88a041e0 100644
--- a/lib/src/services/api/client2client/media.c2c.dart
+++ b/lib/src/services/api/client2client/media.c2c.dart
@@ -1,14 +1,15 @@
 import 'dart:async';
+
 import 'package:drift/drift.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
 import 'package:twonly/src/database/tables/messages.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/protobuf/client/generated/messages.pb.dart'
     hide Message;
-import 'package:twonly/src/services/api/mediafiles/download.service.dart';
-import 'package:twonly/src/services/api/mediafiles/upload.service.dart';
-import 'package:twonly/src/services/api/utils.dart';
+import 'package:twonly/src/services/api/mediafiles/download.api.dart';
+import 'package:twonly/src/services/api/mediafiles/upload.api.dart';
+import 'package:twonly/src/services/api/utils.api.dart';
 import 'package:twonly/src/services/flame.service.dart';
 import 'package:twonly/src/services/mediafiles/mediafile.service.dart';
 import 'package:twonly/src/utils/log.dart';
@@ -177,9 +178,15 @@ Future<void> handleMedia(
 
     unawaited(startDownloadMedia(mediaFile!, false));
   } else {
-    Log.error(
-      'Could not insert new message as both the message and mediaFile are empty.',
-    );
+    if (mediaFile == null && message == null) {
+      Log.error(
+        'Could not insert new message as both the message and mediaFile are empty.',
+      );
+    } else if (mediaFile == null) {
+      Log.error('Could not insert new message as the mediaFile is empty.');
+    } else {
+      Log.error('Could not insert new message as the message is empty.');
+    }
   }
 }
 
diff --git a/lib/src/services/api/client2client/messages.c2c.dart b/lib/src/services/api/client2client/messages.c2c.dart
index d2f810f9..461846e0 100644
--- a/lib/src/services/api/client2client/messages.c2c.dart
+++ b/lib/src/services/api/client2client/messages.c2c.dart
@@ -1,6 +1,6 @@
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/model/protobuf/client/generated/messages.pb.dart';
-import 'package:twonly/src/services/api/utils.dart';
+import 'package:twonly/src/services/api/utils.api.dart';
 import 'package:twonly/src/utils/log.dart';
 
 Future<void> handleMessageUpdate(
diff --git a/lib/src/services/api/client2client/reaction.c2c.dart b/lib/src/services/api/client2client/reaction.c2c.dart
index 9d9b5e96..77fcdcc3 100644
--- a/lib/src/services/api/client2client/reaction.c2c.dart
+++ b/lib/src/services/api/client2client/reaction.c2c.dart
@@ -1,7 +1,7 @@
 import 'package:clock/clock.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/model/protobuf/client/generated/messages.pb.dart';
-import 'package:twonly/src/services/api/mediafiles/upload.service.dart';
+import 'package:twonly/src/services/api/mediafiles/upload.api.dart';
 import 'package:twonly/src/utils/log.dart';
 
 Future<void> handleReaction(
diff --git a/lib/src/services/api/client2client/text_message.c2c.dart b/lib/src/services/api/client2client/text_message.c2c.dart
index a189f39c..b46e72f2 100644
--- a/lib/src/services/api/client2client/text_message.c2c.dart
+++ b/lib/src/services/api/client2client/text_message.c2c.dart
@@ -1,10 +1,10 @@
 import 'package:clock/clock.dart';
 import 'package:drift/drift.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/tables/messages.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/protobuf/client/generated/messages.pb.dart';
-import 'package:twonly/src/services/api/utils.dart';
+import 'package:twonly/src/services/api/utils.api.dart';
 import 'package:twonly/src/utils/log.dart';
 
 Future<void> handleTextMessage(
@@ -16,6 +16,18 @@ Future<void> handleTextMessage(
     'Got a text message: ${textMessage.senderMessageId} from $groupId',
   );
 
+  // Prevent message overwrite: reject if a message with this ID already
+  // exists from a different sender.
+  final existing = await twonlyDB.messagesDao
+      .getMessageById(textMessage.senderMessageId)
+      .getSingleOrNull();
+  if (existing != null && existing.senderId != fromUserId) {
+    Log.warn(
+      '$fromUserId tried to overwrite message from ${existing.senderId}. Dropping.',
+    );
+    return;
+  }
+
   final message = await twonlyDB.messagesDao.insertMessage(
     MessagesCompanion(
       messageId: Value(textMessage.senderMessageId),
diff --git a/lib/src/services/api/client2client/user_discovery.c2c.dart b/lib/src/services/api/client2client/user_discovery.c2c.dart
new file mode 100644
index 00000000..b206109d
--- /dev/null
+++ b/lib/src/services/api/client2client/user_discovery.c2c.dart
@@ -0,0 +1,93 @@
+import 'dart:typed_data';
+
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/model/protobuf/client/generated/messages.pb.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
+import 'package:twonly/src/services/user_discovery.service.dart';
+import 'package:twonly/src/utils/log.dart';
+
+final _requestedUpdates = <int>{};
+
+void resetUserDiscoveryRequestUpdates() {
+  _requestedUpdates.clear();
+}
+
+Future<void> checkForUserDiscoveryChanges(
+  int fromUserId,
+  List<int> receivedVersion,
+) async {
+  final currentVersion = await UserDiscoveryService.shouldRequestNewMessages(
+    fromUserId,
+    receivedVersion,
+  );
+
+  if (currentVersion != null) {
+    if (_requestedUpdates.contains(fromUserId)) {
+      // Only request a new version once per app session
+      return;
+    }
+    Log.info('Having old version from contact. Requesting new version.');
+    _requestedUpdates.add(fromUserId);
+    await sendCipherText(
+      fromUserId,
+      EncryptedContent(
+        userDiscoveryRequest: EncryptedContent_UserDiscoveryRequest(
+          currentVersion: currentVersion.toList(),
+        ),
+      ),
+    );
+  }
+}
+
+Future<void> handleUserDiscoveryRequest(
+  int fromUserId,
+  EncryptedContent_UserDiscoveryRequest request,
+) async {
+  Log.info('Got a user discovery request');
+
+  if (!userService.currentUser.isUserDiscoveryEnabled) {
+    Log.warn('Got a user discovery request while it is disabled');
+    return;
+  }
+  final contact = await twonlyDB.contactsDao.getContactById(fromUserId);
+
+  if (!UserDiscoveryService.isContactAllowed(contact)) {
+    Log.warn(
+      'Got a request to update user discovery, but mediaSendCounter (${contact?.mediaSendCounter}) < ${userService.currentUser.requiredSendImages} or user is excluded ${contact?.userDiscoveryExcluded}',
+    );
+    return;
+  }
+
+  final newMessages = await UserDiscoveryService.getNewMessages(
+    fromUserId,
+    request.currentVersion,
+  );
+  if (newMessages != null && newMessages.isNotEmpty) {
+    Log.info('Sending ${newMessages.length} user discovery messages');
+    await sendCipherText(
+      fromUserId,
+      EncryptedContent(
+        userDiscoveryUpdate: EncryptedContent_UserDiscoveryUpdate(
+          messages: newMessages,
+        ),
+      ),
+    );
+  } else {
+    Log.info('Got update request, but there are no new updates for the user');
+  }
+}
+
+Future<void> handleUserDiscoveryUpdate(
+  int fromUserId,
+  EncryptedContent_UserDiscoveryUpdate update,
+) async {
+  if (!userService.currentUser.isUserDiscoveryEnabled) {
+    Log.warn('Got a user discovery update while it is disabled');
+    return;
+  }
+  Log.info('Got ${update.messages.length} user discovery messages');
+  await UserDiscoveryService.handleNewMessages(
+    fromUserId,
+    update.messages.map(Uint8List.fromList).toList(),
+  );
+}
diff --git a/lib/src/services/api/mediafiles/download.service.dart b/lib/src/services/api/mediafiles/download.api.dart
similarity index 76%
rename from lib/src/services/api/mediafiles/download.service.dart
rename to lib/src/services/api/mediafiles/download.api.dart
index 28a2a670..f7e8bd27 100644
--- a/lib/src/services/api/mediafiles/download.service.dart
+++ b/lib/src/services/api/mediafiles/download.api.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:io';
+
 import 'package:background_downloader/background_downloader.dart';
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:cryptography_flutter_plus/cryptography_flutter_plus.dart';
@@ -8,12 +9,13 @@ import 'package:drift/drift.dart';
 import 'package:http/http.dart' as http;
 import 'package:mutex/mutex.dart';
 import 'package:path/path.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/protobuf/client/generated/messages.pbserver.dart';
-import 'package:twonly/src/services/api/messages.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
 import 'package:twonly/src/services/mediafiles/mediafile.service.dart';
+import 'package:twonly/src/utils/exclusive_access.utils.dart';
 import 'package:twonly/src/utils/log.dart';
 import 'package:twonly/src/utils/misc.dart';
 
@@ -96,7 +98,8 @@ Future<bool> isAllowedToDownload(MediaType type) async {
   }
   final connectivityResult = await Connectivity().checkConnectivity();
 
-  final options = gUser.autoDownloadOptions ?? defaultAutoDownloadOptions;
+  final options =
+      userService.currentUser.autoDownloadOptions ?? defaultAutoDownloadOptions;
 
   if (connectivityResult.contains(ConnectivityResult.mobile)) {
     if (type == MediaType.video) {
@@ -156,7 +159,8 @@ Future<void> handleDownloadStatusUpdate(TaskStatusUpdate update) async {
   }
 }
 
-Mutex protectDownload = Mutex();
+Mutex _protectDownload = Mutex();
+Mutex _protectDecryption = Mutex();
 
 Future<void> startDownloadMedia(MediaFile media, bool force) async {
   final mediaService = MediaFileService(media);
@@ -173,7 +177,7 @@ Future<void> startDownloadMedia(MediaFile media, bool force) async {
     return;
   }
 
-  final isBlocked = await protectDownload.protect<bool>(() async {
+  final isBlocked = await _protectDownload.protect<bool>(() async {
     final msg = await twonlyDB.mediaFilesDao.getMediaFileById(media.mediaId);
 
     if (msg == null || msg.downloadState != DownloadState.pending) {
@@ -283,66 +287,79 @@ Future<void> requestMediaReupload(String mediaId) async {
 }
 
 Future<void> handleEncryptedFile(String mediaId) async {
-  final mediaService = await MediaFileService.fromMediaId(mediaId);
-  if (mediaService == null) {
-    Log.error('Media file not found in database.');
-    return;
-  }
+  await exclusiveAccess(
+    lockName: 'decryption-$mediaId',
+    mutex: _protectDecryption,
+    action: () async {
+      final mediaService = await MediaFileService.fromMediaId(mediaId);
+      if (mediaService == null) {
+        Log.error('Media file not found in database.');
+        return;
+      }
 
-  await twonlyDB.mediaFilesDao.updateMedia(
-    mediaId,
-    const MediaFilesCompanion(
-      downloadState: Value(DownloadState.downloaded),
-    ),
+      if (mediaService.mediaFile.downloadState == DownloadState.ready) {
+        Log.info('Decryption of $mediaId already finished.');
+        return;
+      }
+
+      if (!mediaService.encryptedPath.existsSync()) {
+        Log.warn(
+          'Encrypted media file $mediaId does not exist anymore. Decryption probably already finished.',
+        );
+        return;
+      }
+
+      late Uint8List encryptedBytes;
+      try {
+        encryptedBytes = await mediaService.encryptedPath.readAsBytes();
+      } catch (e) {
+        Log.error('Could not read encrypted media file: $e');
+        await requestMediaReupload(mediaId);
+        return;
+      }
+
+      try {
+        final chacha20 = FlutterChacha20.poly1305Aead();
+        final secretKeyData = SecretKeyData(
+          mediaService.mediaFile.encryptionKey!,
+        );
+
+        final secretBox = SecretBox(
+          encryptedBytes,
+          nonce: mediaService.mediaFile.encryptionNonce!,
+          mac: Mac(mediaService.mediaFile.encryptionMac!),
+        );
+
+        final plaintextBytes = await chacha20.decrypt(
+          secretBox,
+          secretKey: secretKeyData,
+        );
+
+        final rawMediaBytes = Uint8List.fromList(plaintextBytes);
+
+        await mediaService.tempPath.writeAsBytes(rawMediaBytes);
+      } catch (e) {
+        Log.error(
+          'Could not decrypt the media file. Requesting a new upload.',
+        );
+        await requestMediaReupload(mediaId);
+        return;
+      }
+
+      await twonlyDB.mediaFilesDao.updateMedia(
+        mediaId,
+        const MediaFilesCompanion(
+          downloadState: Value(DownloadState.ready),
+        ),
+      );
+
+      Log.info('Decryption of $mediaId was successful');
+
+      mediaService.encryptedPath.deleteSync();
+
+      unawaited(apiService.downloadDone(mediaService.mediaFile.downloadToken!));
+    },
   );
-
-  late Uint8List encryptedBytes;
-  try {
-    encryptedBytes = await mediaService.encryptedPath.readAsBytes();
-  } catch (e) {
-    Log.error('Could not read encrypted media file: $e');
-    await requestMediaReupload(mediaId);
-    return;
-  }
-
-  try {
-    final chacha20 = FlutterChacha20.poly1305Aead();
-    final secretKeyData = SecretKeyData(mediaService.mediaFile.encryptionKey!);
-
-    final secretBox = SecretBox(
-      encryptedBytes,
-      nonce: mediaService.mediaFile.encryptionNonce!,
-      mac: Mac(mediaService.mediaFile.encryptionMac!),
-    );
-
-    final plaintextBytes = await chacha20.decrypt(
-      secretBox,
-      secretKey: secretKeyData,
-    );
-
-    final rawMediaBytes = Uint8List.fromList(plaintextBytes);
-
-    await mediaService.tempPath.writeAsBytes(rawMediaBytes);
-  } catch (e) {
-    Log.error(
-      'Could not decrypt the media file. Requesting a new upload.',
-    );
-    await requestMediaReupload(mediaId);
-    return;
-  }
-
-  await twonlyDB.mediaFilesDao.updateMedia(
-    mediaId,
-    const MediaFilesCompanion(
-      downloadState: Value(DownloadState.ready),
-    ),
-  );
-
-  Log.info('Decryption of $mediaId was successful');
-
-  mediaService.encryptedPath.deleteSync();
-
-  unawaited(apiService.downloadDone(mediaService.mediaFile.downloadToken!));
 }
 
 Future<void> makeMigrationToVersion91() async {
diff --git a/lib/src/services/api/mediafiles/media_background.service.dart b/lib/src/services/api/mediafiles/media_background.api.dart
similarity index 95%
rename from lib/src/services/api/mediafiles/media_background.service.dart
rename to lib/src/services/api/mediafiles/media_background.api.dart
index 5b1edab2..7de58a96 100644
--- a/lib/src/services/api/mediafiles/media_background.service.dart
+++ b/lib/src/services/api/mediafiles/media_background.api.dart
@@ -3,11 +3,11 @@ import 'dart:async';
 import 'package:background_downloader/background_downloader.dart';
 import 'package:drift/drift.dart' show Value;
 import 'package:flutter/foundation.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
-import 'package:twonly/src/services/api/mediafiles/download.service.dart';
-import 'package:twonly/src/services/api/mediafiles/upload.service.dart';
+import 'package:twonly/src/services/api/mediafiles/download.api.dart';
+import 'package:twonly/src/services/api/mediafiles/upload.api.dart';
 import 'package:twonly/src/services/backup/create.backup.dart';
 import 'package:twonly/src/services/mediafiles/mediafile.service.dart';
 import 'package:twonly/src/utils/log.dart';
diff --git a/lib/src/services/api/mediafiles/upload.service.dart b/lib/src/services/api/mediafiles/upload.api.dart
similarity index 88%
rename from lib/src/services/api/mediafiles/upload.service.dart
rename to lib/src/services/api/mediafiles/upload.api.dart
index db485966..7689365b 100644
--- a/lib/src/services/api/mediafiles/upload.service.dart
+++ b/lib/src/services/api/mediafiles/upload.api.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
+
 import 'package:background_downloader/background_downloader.dart';
 import 'package:clock/clock.dart';
 import 'package:connectivity_plus/connectivity_plus.dart';
@@ -7,23 +8,24 @@ import 'package:cryptography_flutter_plus/cryptography_flutter_plus.dart';
 import 'package:cryptography_plus/cryptography_plus.dart';
 import 'package:drift/drift.dart';
 import 'package:fixnum/fixnum.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:http/http.dart' as http;
 import 'package:mutex/mutex.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/constants/secure_storage_keys.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/constants/secure_storage.keys.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
 import 'package:twonly/src/database/tables/messages.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/protobuf/api/http/http_requests.pb.dart';
 import 'package:twonly/src/model/protobuf/client/generated/data.pb.dart';
 import 'package:twonly/src/model/protobuf/client/generated/messages.pb.dart';
-import 'package:twonly/src/services/api/mediafiles/media_background.service.dart';
-import 'package:twonly/src/services/api/messages.dart';
+import 'package:twonly/src/services/api/mediafiles/media_background.api.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
 import 'package:twonly/src/services/flame.service.dart';
 import 'package:twonly/src/services/mediafiles/mediafile.service.dart';
 import 'package:twonly/src/utils/log.dart';
 import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/utils/secure_storage.dart';
 import 'package:workmanager/workmanager.dart' hide TaskStatus;
 
 final lockRetransmission = Mutex();
@@ -58,12 +60,23 @@ Future<void> reuploadMediaFiles() async {
           final content = EncryptedContent.fromBuffer(receipt.message);
           if (content.hasMedia()) {
             messageId = content.media.senderMessageId;
-            await twonlyDB.receiptsDao.updateReceipt(
-              receipt.receiptId,
-              ReceiptsCompanion(
-                messageId: Value(messageId),
-              ),
-            );
+            final messageExists = await twonlyDB.messagesDao
+                .getMessageById(messageId)
+                .getSingleOrNull();
+            if (messageExists != null) {
+              await twonlyDB.receiptsDao.updateReceipt(
+                receipt.receiptId,
+                ReceiptsCompanion(
+                  messageId: Value(messageId),
+                ),
+              );
+            } else {
+              Log.info(
+                'Message $messageId not found in DB for receipt recovery. Deleting stale receipt.',
+              );
+              await twonlyDB.receiptsDao.deleteReceipt(receipt.receiptId);
+              continue;
+            }
           }
         } catch (e) {
           Log.error(e);
@@ -108,8 +121,8 @@ Future<void> reuploadMediaFiles() async {
             await twonlyDB.messagesDao.deleteMessagesById(messageId);
           }
           await twonlyDB.receiptsDao.deleteReceipt(receipt.receiptId);
-          Log.error(
-            'Message not found for reupload of the receipt (${message == null} - ${message?.mediaId}).',
+          Log.warn(
+            'Message not found for reupload of the receipt, likely deleted from sender (${message == null} - ${message?.mediaId}).',
           );
           continue;
         }
@@ -191,11 +204,42 @@ Future<void> finishStartedPreprocessing() async {
           // media files was just stored..
           continue;
         }
-        Log.info(
-          'Deleted media files, as originalPath and uploadRequestPath both do not exists',
+        if (mediaFile.reuploadRequestedBy != null) {
+          Log.warn(
+            'Reupload requested for ${mediaFile.mediaId} but files are missing. Cancelling reupload but keeping record.',
+          );
+          await twonlyDB.mediaFilesDao.updateMedia(
+            mediaFile.mediaId,
+            const MediaFilesCompanion(
+              uploadState: Value(UploadState.uploaded),
+              reuploadRequestedBy: Value(null),
+            ),
+          );
+          continue;
+        }
+
+        final messages = await twonlyDB.messagesDao.getMessagesByMediaId(
+          mediaFile.mediaId,
         );
-        // the file does not exists anymore.
-        await twonlyDB.mediaFilesDao.deleteMediaFile(mediaFile.mediaId);
+
+        if (messages.isEmpty) {
+          Log.info(
+            'Deleted media files ${mediaFile.mediaId} as originalPath and uploadRequestPath both do not exists and no messages reference it.',
+          );
+          // the file does not exists anymore and no messages reference it.
+          await twonlyDB.mediaFilesDao.deleteMediaFile(mediaFile.mediaId);
+        } else {
+          Log.warn(
+            'Media files ${mediaFile.mediaId} missing but messages still reference it. Keeping record to avoid broken chat history.',
+          );
+          // Just mark as uploaded to stop preprocessing attempts
+          await twonlyDB.mediaFilesDao.updateMedia(
+            mediaFile.mediaId,
+            const MediaFilesCompanion(
+              uploadState: Value(UploadState.uploaded),
+            ),
+          );
+        }
         continue;
       }
       Log.info(
@@ -357,7 +401,7 @@ Future<void> startBackgroundMediaUpload(MediaFileService mediaService) async {
 
     // if the user has enabled auto storing and the file
     // was send with unlimited counter not in twonly-Mode then store the file
-    if (gUser.autoStoreAllSendUnlimitedMediaFiles &&
+    if (userService.currentUser.autoStoreAllSendUnlimitedMediaFiles &&
         !mediaService.mediaFile.requiresAuthentication &&
         !mediaService.storedPath.existsSync() &&
         mediaService.mediaFile.displayLimitInMilliseconds == null) {
@@ -563,7 +607,7 @@ Future<void> _uploadUploadRequest(MediaFileService media) async {
       return null;
     }
 
-    final apiAuthTokenRaw = await const FlutterSecureStorage().read(
+    final apiAuthTokenRaw = await SecureStorage.instance.read(
       key: SecureStorageKeys.apiAuthToken,
     );
 
@@ -593,7 +637,7 @@ Future<void> _uploadUploadRequest(MediaFileService media) async {
 
     final connectivityResult = await Connectivity().checkConnectivity();
 
-    if (globalIsInBackgroundTask ||
+    if (AppState.isInBackgroundTask ||
         !connectivityResult.contains(ConnectivityResult.mobile) &&
             !connectivityResult.contains(ConnectivityResult.wifi)) {
       // no internet, directly put it into the background...
diff --git a/lib/src/services/api/messages.dart b/lib/src/services/api/messages.api.dart
similarity index 93%
rename from lib/src/services/api/messages.dart
rename to lib/src/services/api/messages.api.dart
index e678e46e..22e7534a 100644
--- a/lib/src/services/api/messages.dart
+++ b/lib/src/services/api/messages.api.dart
@@ -1,12 +1,13 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
+
 import 'package:clock/clock.dart';
 import 'package:drift/drift.dart';
 import 'package:fixnum/fixnum.dart';
 import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
 import 'package:mutex/mutex.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/tables/messages.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
@@ -18,6 +19,7 @@ import 'package:twonly/src/model/protobuf/client/generated/push_notification.pb.
 import 'package:twonly/src/services/notifications/pushkeys.notifications.dart';
 import 'package:twonly/src/services/signal/encryption.signal.dart';
 import 'package:twonly/src/services/signal/session.signal.dart';
+import 'package:twonly/src/services/user_discovery.service.dart';
 import 'package:twonly/src/utils/log.dart';
 import 'package:twonly/src/utils/misc.dart';
 
@@ -122,7 +124,7 @@ Future<(Uint8List, Uint8List?)?> tryToSendCompleteMessage({
     }
 
     if (message.type == pb.Message_Type.TEST_NOTIFICATION) {
-      pushData = (PushNotification()..kind = PushKind.testNotification)
+      pushData = (PushNotification()..kind = PushKind.TEST_NOTIFICATION)
           .writeToBuffer();
     }
 
@@ -339,12 +341,24 @@ Future<(Uint8List, Uint8List?)?> sendCipherText(
     final openReceipts = await twonlyDB.receiptsDao.getReceiptCountForContact(
       contactId,
     );
-    if (openReceipts > 2) {
+    if (openReceipts > 6) {
       // this prevents that these types of messages are send in case the receiver is offline
       return null;
     }
   }
-  encryptedContent.senderProfileCounter = Int64(gUser.avatarCounter);
+  encryptedContent.senderProfileCounter = Int64(
+    userService.currentUser.avatarCounter,
+  );
+
+  if (userService.currentUser.isUserDiscoveryEnabled && messageId != null) {
+    final contact = await twonlyDB.contactsDao.getContactById(contactId);
+    if (UserDiscoveryService.isContactAllowed(contact)) {
+      final version = await UserDiscoveryService.getCurrentVersion();
+      if (version != null) {
+        encryptedContent.senderUserDiscoveryVersion = version;
+      }
+    }
+  }
 
   final response = pb.Message()
     ..type = pb.Message_Type.CIPHERTEXT
@@ -393,7 +407,7 @@ Future<(Uint8List, Uint8List?)?> sendCipherText(
 }
 
 Future<void> sendTypingIndication(String groupId, bool isTyping) async {
-  if (!gUser.typingIndicators) return;
+  if (!userService.currentUser.typingIndicators) return;
   await sendCipherTextToGroup(
     groupId,
     pb.EncryptedContent(
@@ -449,15 +463,17 @@ Future<void> notifyContactAboutOpeningMessage(
 
 Future<void> sendContactMyProfileData(int contactId) async {
   List<int>? avatarSvgCompressed;
-  if (gUser.avatarSvg != null) {
-    avatarSvgCompressed = gzip.encode(utf8.encode(gUser.avatarSvg!));
+  if (userService.currentUser.avatarSvg != null) {
+    avatarSvgCompressed = gzip.encode(
+      utf8.encode(userService.currentUser.avatarSvg!),
+    );
   }
   final encryptedContent = pb.EncryptedContent(
     contactUpdate: pb.EncryptedContent_ContactUpdate(
       type: pb.EncryptedContent_ContactUpdate_Type.UPDATE,
       avatarSvgCompressed: avatarSvgCompressed,
-      displayName: gUser.displayName,
-      username: gUser.username,
+      displayName: userService.currentUser.displayName,
+      username: userService.currentUser.username,
     ),
   );
   await sendCipherText(contactId, encryptedContent);
diff --git a/lib/src/services/api/server_messages.dart b/lib/src/services/api/server_messages.api.dart
similarity index 90%
rename from lib/src/services/api/server_messages.dart
rename to lib/src/services/api/server_messages.api.dart
index 3722523d..f9e3136a 100644
--- a/lib/src/services/api/server_messages.dart
+++ b/lib/src/services/api/server_messages.api.dart
@@ -1,10 +1,12 @@
 import 'dart:async';
 import 'dart:io';
+
 import 'package:clock/clock.dart';
 import 'package:drift/drift.dart';
 import 'package:hashlib/random.dart';
 import 'package:mutex/mutex.dart';
 import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/twonly.db.dart' hide Message;
 import 'package:twonly/src/model/protobuf/api/websocket/client_to_server.pb.dart'
@@ -24,8 +26,10 @@ import 'package:twonly/src/services/api/client2client/prekeys.c2c.dart';
 import 'package:twonly/src/services/api/client2client/pushkeys.c2c.dart';
 import 'package:twonly/src/services/api/client2client/reaction.c2c.dart';
 import 'package:twonly/src/services/api/client2client/text_message.c2c.dart';
-import 'package:twonly/src/services/api/messages.dart';
+import 'package:twonly/src/services/api/client2client/user_discovery.c2c.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
 import 'package:twonly/src/services/group.services.dart';
+import 'package:twonly/src/services/key_verification.service.dart';
 import 'package:twonly/src/services/notifications/background.notifications.dart';
 import 'package:twonly/src/services/signal/encryption.signal.dart';
 import 'package:twonly/src/services/signal/session.signal.dart';
@@ -65,12 +69,11 @@ Future<void> handleServerMessage(server.ServerToClient msg) async {
       ..response = response;
 
     await apiService.sendResponse(ClientToServer()..v0 = v0);
-    globalGotMessageFromServer = true;
+    AppState.gotMessageFromServer = true;
   });
 }
 
 DateTime lastPushKeyRequest = clock.now().subtract(const Duration(hours: 1));
-bool alreadyPerformedAnResync = false;
 
 Mutex protectReceiptCheck = Mutex();
 
@@ -223,11 +226,15 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessageRaw(
   );
 
   if (encryptedContent == null) {
+    if (decryptionErrorType == null) {
+      // Duplicate message
+      return (null, null);
+    }
     return (
       null,
       PlaintextContent()
         ..decryptionErrorMessage = (PlaintextContent_DecryptionErrorMessage()
-          ..type = decryptionErrorType!),
+          ..type = decryptionErrorType),
     );
   }
 
@@ -262,6 +269,13 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessage(
   await twonlyDB.receiptsDao.markMessagesForRetry(fromUserId);
 
   final senderProfileCounter = await checkForProfileUpdate(fromUserId, content);
+  if (userService.currentUser.isUserDiscoveryEnabled &&
+      content.hasSenderUserDiscoveryVersion()) {
+    await checkForUserDiscoveryChanges(
+      fromUserId,
+      content.senderUserDiscoveryVersion,
+    );
+  }
 
   if (content.hasContactRequest()) {
     if (!await handleContactRequest(fromUserId, content.contactRequest)) {
@@ -291,6 +305,22 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessage(
     return (null, null);
   }
 
+  if (content.hasUserDiscoveryRequest()) {
+    await handleUserDiscoveryRequest(
+      fromUserId,
+      content.userDiscoveryRequest,
+    );
+    return (null, null);
+  }
+
+  if (content.hasUserDiscoveryUpdate()) {
+    await handleUserDiscoveryUpdate(
+      fromUserId,
+      content.userDiscoveryUpdate,
+    );
+    return (null, null);
+  }
+
   if (content.hasPushKeys()) {
     await handlePushKey(fromUserId, content.pushKeys);
     return (null, null);
@@ -304,6 +334,14 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessage(
     return (null, null);
   }
 
+  if (content.hasKeyVerificationProof()) {
+    await KeyVerificationService.handleVerificationProof(
+      fromUserId,
+      content.keyVerificationProof.calculatedMac,
+    );
+    return (null, null);
+  }
+
   if (content.hasMediaUpdate()) {
     await handleMediaUpdate(
       fromUserId,
@@ -328,11 +366,15 @@ Future<(EncryptedContent?, PlaintextContent?)> handleEncryptedMessage(
 
   /// Verify that the user is (still) in that group...
   if (!await twonlyDB.groupsDao.isContactInGroup(fromUserId, content.groupId)) {
-    if (getUUIDforDirectChat(gUser.userId, fromUserId) == content.groupId) {
+    if (getUUIDforDirectChat(userService.currentUser.userId, fromUserId) ==
+        content.groupId) {
       final contact = await twonlyDB.contactsDao
           .getContactByUserId(fromUserId)
           .getSingleOrNull();
-      if (contact == null || contact.deletedByUser) {
+      Log.info(
+        'Contact exists?: ${contact != null} Is deleted? ${contact?.deletedByUser} Accepted? (${contact?.accepted})',
+      );
+      if (contact == null || !contact.accepted || contact.deletedByUser) {
         await handleNewContactRequest(fromUserId);
         Log.error(
           'User tries to send message to direct chat while the user does not exists !',
diff --git a/lib/src/services/api/utils.dart b/lib/src/services/api/utils.api.dart
similarity index 96%
rename from lib/src/services/api/utils.dart
rename to lib/src/services/api/utils.api.dart
index 81b084b1..13ca8f05 100644
--- a/lib/src/services/api/utils.dart
+++ b/lib/src/services/api/utils.api.dart
@@ -1,6 +1,6 @@
 import 'package:drift/drift.dart';
 import 'package:fixnum/fixnum.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/protobuf/api/websocket/client_to_server.pb.dart'
@@ -11,7 +11,7 @@ import 'package:twonly/src/model/protobuf/api/websocket/server_to_client.pb.dart
     as server;
 import 'package:twonly/src/model/protobuf/client/generated/messages.pbserver.dart'
     hide Message;
-import 'package:twonly/src/services/api/messages.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
 import 'package:twonly/src/services/notifications/pushkeys.notifications.dart';
 import 'package:twonly/src/services/signal/session.signal.dart';
 
diff --git a/lib/src/services/background/callback_dispatcher.background.dart b/lib/src/services/background/callback_dispatcher.background.dart
index a1460266..249a10fe 100644
--- a/lib/src/services/background/callback_dispatcher.background.dart
+++ b/lib/src/services/background/callback_dispatcher.background.dart
@@ -1,16 +1,14 @@
 import 'dart:async';
+
 import 'package:mutex/mutex.dart';
-import 'package:path_provider/path_provider.dart';
-import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/main.dart';
 import 'package:twonly/src/constants/keyvalue.keys.dart';
-import 'package:twonly/src/database/twonly.db.dart';
-import 'package:twonly/src/services/api.service.dart';
-import 'package:twonly/src/services/api/mediafiles/upload.service.dart';
-import 'package:twonly/src/utils/exclusive_access.dart';
+import 'package:twonly/src/services/api/mediafiles/upload.api.dart';
+import 'package:twonly/src/utils/exclusive_access.utils.dart';
 import 'package:twonly/src/utils/keyvalue.dart';
 import 'package:twonly/src/utils/log.dart';
-import 'package:twonly/src/utils/storage.dart';
 import 'package:workmanager/workmanager.dart';
 
 // ignore: unreachable_from_main
@@ -55,26 +53,17 @@ Future<bool> initBackgroundExecution() async {
   if (_isInitialized) {
     // Reload the users, as on Android the background isolate can
     // stay alive for multiple hours between task executions
-    final user = await getUser();
-    if (user == null) return false;
-    gUser = user;
-    return true;
+    return userService.tryInit();
   }
 
-  SentryWidgetsFlutterBinding.ensureInitialized();
-  globalApplicationCacheDirectory = (await getApplicationCacheDirectory()).path;
-  globalApplicationSupportDirectory =
-      (await getApplicationSupportDirectory()).path;
+  await twonlyMinimumInitialization();
 
-  initLogger();
+  if (!await userService.tryInit()) {
+    Log.info('Early return as user is not registered yet.');
+    return false;
+  }
 
-  final user = await getUser();
-  if (user == null) return false;
-  gUser = user;
-
-  twonlyDB = TwonlyDB();
-  apiService = ApiService();
-  globalIsInBackgroundTask = true;
+  AppState.isInBackgroundTask = true;
 
   _isInitialized = true;
   return true;
@@ -125,7 +114,7 @@ Future<void> handlePeriodicTask({int lastExecutionInSecondsLimit = 120}) async {
     return;
   }
 
-  while (!globalGotMessageFromServer) {
+  while (!AppState.gotMessageFromServer) {
     if (stopwatch.elapsed.inSeconds >= 15) {
       Log.info('No new message from the server after 15 seconds.');
       break;
@@ -133,7 +122,7 @@ Future<void> handlePeriodicTask({int lastExecutionInSecondsLimit = 120}) async {
     await Future.delayed(const Duration(milliseconds: 500));
   }
 
-  if (globalGotMessageFromServer) {
+  if (AppState.gotMessageFromServer) {
     Log.info('Received a server message from the server.');
   }
 
diff --git a/lib/src/services/backup/common.backup.dart b/lib/src/services/backup/common.backup.dart
index 9617954b..0751a0c1 100644
--- a/lib/src/services/backup/common.backup.dart
+++ b/lib/src/services/backup/common.backup.dart
@@ -1,46 +1,48 @@
 import 'dart:async';
 import 'dart:convert';
+
 import 'package:drift/drift.dart';
 import 'package:hashlib/hashlib.dart';
 import 'package:http/http.dart' as http;
-import 'package:twonly/globals.dart';
-import 'package:twonly/src/model/json/userdata.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/model/json/userdata.model.dart';
 import 'package:twonly/src/services/backup/create.backup.dart';
+import 'package:twonly/src/services/user.service.dart';
 import 'package:twonly/src/utils/log.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/storage.dart';
 
 Future<void> enableTwonlySafe(String password) async {
   final (backupId, encryptionKey) = await getMasterKey(
     password,
-    gUser.username,
+    userService.currentUser.username,
   );
 
-  await updateUserdata((user) {
+  await UserService.update((user) {
     user.twonlySafeBackup = TwonlySafeBackup(
       encryptionKey: encryptionKey,
       backupId: backupId,
     );
-    return user;
   });
   unawaited(performTwonlySafeBackup(force: true));
 }
 
 Future<void> removeTwonlySafeFromServer() async {
-  final serverUrl = await getTwonlySafeBackupUrl();
-  if (serverUrl != null) {
-    try {
-      final response = await http.delete(
-        Uri.parse(serverUrl),
-        headers: {
-          'Content-Type': 'application/json', // Set the content type if needed
-          // Add any other headers if required
-        },
-      );
-      Log.info('Download deleted with: ${response.statusCode}');
-    } catch (e) {
-      Log.error('Could not connect upload the backup.');
-    }
+  final serverUrl = getTwonlySafeBackupUrl();
+  if (serverUrl == null) {
+    Log.error('Could not remove twonly safe as serverUrl is null');
+    return;
+  }
+  try {
+    final response = await http.delete(
+      Uri.parse(serverUrl),
+      headers: {
+        'Content-Type': 'application/json', // Set the content type if needed
+        // Add any other headers if required
+      },
+    );
+    Log.info('Download deleted with: ${response.statusCode}');
+  } catch (e) {
+    Log.error('Could not connect upload the backup.');
   }
 }
 
@@ -63,19 +65,18 @@ Future<(Uint8List, Uint8List)> getMasterKey(
   return (key.sublist(0, 32), key.sublist(32, 64));
 }
 
-Future<String?> getTwonlySafeBackupUrl() async {
-  final user = await getUser();
-  if (user == null || user.twonlySafeBackup == null) return null;
+String? getTwonlySafeBackupUrl() {
+  if (userService.currentUser.twonlySafeBackup == null) return null;
   return getTwonlySafeBackupUrlFromServer(
-    user.twonlySafeBackup!.backupId,
-    user.backupServer,
+    userService.currentUser.twonlySafeBackup!.backupId,
+    userService.currentUser.backupServer,
   );
 }
 
-Future<String?> getTwonlySafeBackupUrlFromServer(
+String? getTwonlySafeBackupUrlFromServer(
   List<int> backupId,
   BackupServer? backupServer,
-) async {
+) {
   var backupServerUrl = 'https://safe.twonly.eu/';
 
   if (backupServer != null) {
diff --git a/lib/src/services/backup/create.backup.dart b/lib/src/services/backup/create.backup.dart
index 97b74ed8..f633677c 100644
--- a/lib/src/services/backup/create.backup.dart
+++ b/lib/src/services/backup/create.backup.dart
@@ -2,37 +2,39 @@
 
 import 'dart:convert';
 import 'dart:io';
+
 import 'package:background_downloader/background_downloader.dart';
 import 'package:clock/clock.dart';
 import 'package:cryptography_flutter_plus/cryptography_flutter_plus.dart';
 import 'package:cryptography_plus/cryptography_plus.dart';
 import 'package:drift/drift.dart';
 import 'package:drift_flutter/drift_flutter.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:path/path.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/constants/secure_storage_keys.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/constants/secure_storage.keys.dart';
 import 'package:twonly/src/database/twonly.db.dart';
-import 'package:twonly/src/model/json/userdata.dart';
+import 'package:twonly/src/model/json/userdata.model.dart';
 import 'package:twonly/src/model/protobuf/client/generated/backup.pb.dart';
 import 'package:twonly/src/services/backup/common.backup.dart';
+import 'package:twonly/src/services/user.service.dart';
 import 'package:twonly/src/utils/log.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/storage.dart';
-import 'package:twonly/src/views/settings/backup/backup.view.dart';
+import 'package:twonly/src/utils/secure_storage.dart';
 
 Future<void> performTwonlySafeBackup({bool force = false}) async {
-  if (gUser.twonlySafeBackup == null) {
+  if (userService.currentUser.twonlySafeBackup == null) {
     return;
   }
 
-  if (gUser.twonlySafeBackup!.backupUploadState ==
+  if (userService.currentUser.twonlySafeBackup!.backupUploadState ==
       LastBackupUploadState.pending) {
     Log.warn('Backup upload is already pending.');
     return;
   }
 
-  final lastUpdateTime = gUser.twonlySafeBackup!.lastBackupDone;
+  final lastUpdateTime =
+      userService.currentUser.twonlySafeBackup!.lastBackupDone;
   if (!force && lastUpdateTime != null) {
     if (lastUpdateTime.isAfter(clock.now().subtract(const Duration(days: 1)))) {
       return;
@@ -41,9 +43,9 @@ Future<void> performTwonlySafeBackup({bool force = false}) async {
 
   Log.info('Starting new twonly Backup!');
 
-  final baseDir = globalApplicationSupportDirectory;
-
-  final backupDir = Directory(join(baseDir, 'backup_twonly_safe/'));
+  final backupDir = Directory(
+    join(AppEnvironment.supportDir, 'backup_twonly_safe/'),
+  );
   await backupDir.create(recursive: true);
 
   final backupDatabaseFile = File(join(backupDir.path, 'twonly.backup.sqlite'));
@@ -53,7 +55,9 @@ Future<void> performTwonlySafeBackup({bool force = false}) async {
   );
 
   // copy database
-  final originalDatabase = File(join(baseDir, 'twonly.sqlite'));
+  final originalDatabase = File(
+    join(AppEnvironment.supportDir, 'twonly.sqlite'),
+  );
   await originalDatabase.copy(backupDatabaseFile.path);
 
   driftRuntimeOptions.dontWarnAboutMultipleDatabases = true;
@@ -80,14 +84,17 @@ Future<void> performTwonlySafeBackup({bool force = false}) async {
 
   // ignore: inference_failure_on_collection_literal
   final secureStorageBackup = {};
-  const storage = FlutterSecureStorage();
-  secureStorageBackup[SecureStorageKeys.signalIdentity] = await storage.read(
-    key: SecureStorageKeys.signalIdentity,
-  );
-  secureStorageBackup[SecureStorageKeys.signalSignedPreKey] = await storage
-      .read(key: SecureStorageKeys.signalSignedPreKey);
+  secureStorageBackup[SecureStorageKeys.signalIdentity] = await SecureStorage
+      .instance
+      .read(
+        key: SecureStorageKeys.signalIdentity,
+      );
+  secureStorageBackup[SecureStorageKeys.signalSignedPreKey] =
+      await SecureStorage.instance.read(
+        key: SecureStorageKeys.signalSignedPreKey,
+      );
 
-  final userBackup = await getUser();
+  final userBackup = await UserService.getUser();
   if (userBackup == null) return;
   // FILTER settings which should not be in the backup
   userBackup
@@ -118,14 +125,14 @@ Future<void> performTwonlySafeBackup({bool force = false}) async {
 
   final backupHash = uint8ListToHex((await Sha256().hash(backupBytes)).bytes);
 
-  if (gUser.twonlySafeBackup!.lastBackupDone == null ||
-      gUser.twonlySafeBackup!.lastBackupDone!.isAfter(
+  if (userService.currentUser.twonlySafeBackup!.lastBackupDone == null ||
+      userService.currentUser.twonlySafeBackup!.lastBackupDone!.isAfter(
         clock.now().subtract(const Duration(days: 90)),
       )) {
     force = true;
   }
 
-  final lastHash = await storage.read(
+  final lastHash = await SecureStorage.instance.read(
     key: SecureStorageKeys.twonlySafeLastBackupHash,
   );
 
@@ -135,7 +142,8 @@ Future<void> performTwonlySafeBackup({bool force = false}) async {
       return;
     }
   }
-  await storage.write(
+
+  await SecureStorage.instance.write(
     key: SecureStorageKeys.twonlySafeLastBackupHash,
     value: backupHash,
   );
@@ -147,7 +155,9 @@ Future<void> performTwonlySafeBackup({bool force = false}) async {
 
   final secretBox = await chacha20.encrypt(
     backupBytes,
-    secretKey: SecretKey(gUser.twonlySafeBackup!.encryptionKey),
+    secretKey: SecretKey(
+      userService.currentUser.twonlySafeBackup!.encryptionKey,
+    ),
     nonce: nonce,
   );
 
@@ -169,12 +179,12 @@ Future<void> performTwonlySafeBackup({bool force = false}) async {
     'Create twonly Backup with a size of ${encryptedBackupBytes.length} bytes.',
   );
 
-  if (gUser.backupServer != null) {
-    if (encryptedBackupBytes.length > gUser.backupServer!.maxBackupBytes) {
+  if (userService.currentUser.backupServer != null) {
+    if (encryptedBackupBytes.length >
+        userService.currentUser.backupServer!.maxBackupBytes) {
       Log.error('Backup is to big for the alternative backup server.');
-      await updateUserdata((user) {
+      await UserService.update((user) {
         user.twonlySafeBackup!.backupUploadState = LastBackupUploadState.failed;
-        return user;
       });
       return;
     }
@@ -184,7 +194,7 @@ Future<void> performTwonlySafeBackup({bool force = false}) async {
     taskId: 'backup',
     file: encryptedBackupBytesFile,
     httpRequestMethod: 'PUT',
-    url: (await getTwonlySafeBackupUrl())!,
+    url: getTwonlySafeBackupUrl()!,
     post: 'binary',
     retries: 2,
     headers: {
@@ -193,13 +203,11 @@ Future<void> performTwonlySafeBackup({bool force = false}) async {
   );
   if (await FileDownloader().enqueue(task)) {
     Log.info('Starting upload from twonly Backup.');
-    await updateUserdata((user) {
+    await UserService.update((user) {
       user.twonlySafeBackup!.backupUploadState = LastBackupUploadState.pending;
       user.twonlySafeBackup!.lastBackupDone = clock.now();
       user.twonlySafeBackup!.lastBackupSize = encryptedBackupBytes.length;
-      return user;
     });
-    gUpdateBackupView();
   } else {
     Log.error('Error starting UploadTask for twonly Backup.');
   }
@@ -208,26 +216,23 @@ Future<void> performTwonlySafeBackup({bool force = false}) async {
 Future<void> handleBackupStatusUpdate(TaskStatusUpdate update) async {
   if (update.status == TaskStatus.failed ||
       update.status == TaskStatus.canceled) {
-    await updateUserdata((user) {
+    await UserService.update((user) {
       if (user.twonlySafeBackup != null) {
         user.twonlySafeBackup!.backupUploadState = LastBackupUploadState.failed;
       }
-      return user;
     });
   } else if (update.status == TaskStatus.complete) {
     Log.info(
       'twonly Backup uploaded with status code ${update.responseStatusCode}',
     );
-    await updateUserdata((user) {
+    await UserService.update((user) {
       if (user.twonlySafeBackup != null) {
         user.twonlySafeBackup!.backupUploadState =
             LastBackupUploadState.success;
       }
-      return user;
     });
   } else {
     Log.info('Backup is in state: ${update.status}');
     return;
   }
-  gUpdateBackupView();
 }
diff --git a/lib/src/services/backup/restore.backup.dart b/lib/src/services/backup/restore.backup.dart
index 006d43fe..3ca90187 100644
--- a/lib/src/services/backup/restore.backup.dart
+++ b/lib/src/services/backup/restore.backup.dart
@@ -2,19 +2,20 @@
 
 import 'dart:convert';
 import 'dart:io';
+
 import 'package:cryptography_flutter_plus/cryptography_flutter_plus.dart';
 import 'package:cryptography_plus/cryptography_plus.dart';
 import 'package:drift/drift.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:http/http.dart' as http;
 import 'package:path/path.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/constants/secure_storage_keys.dart';
-import 'package:twonly/src/model/json/userdata.dart';
+import 'package:twonly/src/constants/secure_storage.keys.dart';
+import 'package:twonly/src/model/json/userdata.model.dart';
 import 'package:twonly/src/model/protobuf/client/generated/backup.pb.dart';
 import 'package:twonly/src/services/backup/common.backup.dart';
+import 'package:twonly/src/services/user.service.dart';
 import 'package:twonly/src/utils/log.dart';
-import 'package:twonly/src/utils/storage.dart';
+import 'package:twonly/src/utils/secure_storage.dart';
 
 Future<void> recoverBackup(
   String username,
@@ -23,10 +24,7 @@ Future<void> recoverBackup(
 ) async {
   final (backupId, encryptionKey) = await getMasterKey(password, username);
 
-  final backupServerUrl = await getTwonlySafeBackupUrlFromServer(
-    backupId,
-    server,
-  );
+  final backupServerUrl = getTwonlySafeBackupUrlFromServer(backupId, server);
 
   if (backupServerUrl == null) {
     Log.error('Could not create backup url');
@@ -90,11 +88,15 @@ Future<void> handleBackupData(
   );
 
   final originalDatabase = File(
-    join(globalApplicationSupportDirectory, 'twonly.sqlite'),
+    join(AppEnvironment.supportDir, 'twonly.sqlite'),
   );
-  await originalDatabase.writeAsBytes(backupContent.twonlyDatabase);
 
-  const storage = FlutterSecureStorage();
+  // in case there was only a secure storage error, do not replace the original database
+  if (!originalDatabase.existsSync()) {
+    await originalDatabase.writeAsBytes(backupContent.twonlyDatabase);
+  }
+
+  const storage = SecureStorage.instance;
 
   final secureStorage = jsonDecode(backupContent.secureStorageJson);
 
@@ -110,8 +112,7 @@ Future<void> handleBackupData(
     key: SecureStorageKeys.userData,
     value: secureStorage[SecureStorageKeys.userData] as String,
   );
-  await updateUserdata((u) {
+  await UserService.update((u) {
     u.deviceId += 1;
-    return u;
   });
 }
diff --git a/lib/src/services/flame.service.dart b/lib/src/services/flame.service.dart
index f25a5df8..8824ac7f 100644
--- a/lib/src/services/flame.service.dart
+++ b/lib/src/services/flame.service.dart
@@ -2,12 +2,12 @@ import 'package:clock/clock.dart';
 import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
 import 'package:fixnum/fixnum.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/protobuf/client/generated/messages.pb.dart';
-import 'package:twonly/src/services/api/messages.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
+import 'package:twonly/src/services/user.service.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/storage.dart';
 
 Future<void> syncFlameCounters({String? forceForGroup}) async {
   final groups = await twonlyDB.groupsDao.getAllGroups();
@@ -17,10 +17,9 @@ Future<void> syncFlameCounters({String? forceForGroup}) async {
     (x) => x.totalMediaCounter == maxMessageCounter,
   );
 
-  if (gUser.myBestFriendGroupId != bestFriend.groupId) {
-    await updateUserdata((user) {
+  if (userService.currentUser.myBestFriendGroupId != bestFriend.groupId) {
+    await UserService.update((user) {
       user.myBestFriendGroupId = bestFriend.groupId;
-      return user;
     });
   }
 
@@ -33,16 +32,18 @@ Future<void> syncFlameCounters({String? forceForGroup}) async {
       }
     }
 
-    final flameCounter = getFlameCounterFromGroup(group);
+    final flameResult = getFlameCounterFromGroup(group);
 
     // only sync when flame counter is higher three or when they are bestFriends
-    if (flameCounter <= 2 && bestFriend.groupId != group.groupId) continue;
+    if (flameResult.counter <= 2 && bestFriend.groupId != group.groupId) {
+      continue;
+    }
 
     await sendCipherTextToGroup(
       group.groupId,
       EncryptedContent(
         flameSync: EncryptedContent_FlameSync(
-          flameCounter: Int64(flameCounter),
+          flameCounter: Int64(flameResult.counter),
           lastFlameCounterChange: Int64(
             group.lastFlameCounterChange!.millisecondsSinceEpoch,
           ),
@@ -61,12 +62,13 @@ Future<void> syncFlameCounters({String? forceForGroup}) async {
   }
 }
 
-int getFlameCounterFromGroup(Group? group) {
-  if (group == null) return 0;
+({int counter, bool isExpiring}) getFlameCounterFromGroup(Group? group) {
+  const zero = (counter: 0, isExpiring: false);
+  if (group == null) return zero;
   if (group.lastMessageSend == null ||
       group.lastMessageReceived == null ||
       group.lastFlameCounterChange == null) {
-    return 0;
+    return zero;
   }
   final now = clock.now();
   final startOfToday = DateTime(now.year, now.month, now.day);
@@ -75,9 +77,14 @@ int getFlameCounterFromGroup(Group? group) {
   if (group.lastMessageSend!.isAfter(twoDaysAgo) &&
           group.lastMessageReceived!.isAfter(twoDaysAgo) ||
       group.lastFlameCounterChange!.isAfter(oneDayAgo)) {
-    return group.flameCounter;
+    // Flame is expiring when today no exchange has happened yet:
+    // both lastMessageSend and lastMessageReceived are before startOfToday.
+    final isExpiring =
+        group.lastMessageSend!.isBefore(oneDayAgo) ||
+        group.lastMessageReceived!.isBefore(oneDayAgo);
+    return (counter: group.flameCounter, isExpiring: isExpiring);
   } else {
-    return 0;
+    return zero;
   }
 }
 
@@ -89,6 +96,25 @@ Future<void> incFlameCounter(
   final group = await twonlyDB.groupsDao.getGroup(groupId);
   if (group == null) return;
 
+  if (group.isDirectChat) {
+    final contacts = await twonlyDB.groupsDao.getGroupContact(
+      group.groupId,
+    );
+    if (contacts.length == 1) {
+      await twonlyDB.contactsDao.updateContact(
+        contacts.first.userId,
+        ContactsCompanion(
+          mediaReceivedCounter: Value(
+            contacts.first.mediaReceivedCounter + (received ? 1 : 0),
+          ),
+          mediaSendCounter: Value(
+            contacts.first.mediaSendCounter + (received ? 0 : 1),
+          ),
+        ),
+      );
+    }
+  }
+
   final totalMediaCounter = group.totalMediaCounter + 1;
   var flameCounter = group.flameCounter;
   var maxFlameCounter = group.maxFlameCounter;
@@ -172,9 +198,9 @@ Future<void> incFlameCounter(
 }
 
 bool isItPossibleToRestoreFlames(Group group) {
-  final flameCounter = getFlameCounterFromGroup(group);
+  final flameResult = getFlameCounterFromGroup(group);
   return group.maxFlameCounter > 2 &&
-      flameCounter < group.maxFlameCounter &&
+      flameResult.counter < group.maxFlameCounter &&
       group.maxFlameCounterFrom!.isAfter(
         clock.now().subtract(const Duration(days: 7)),
       );
diff --git a/lib/src/services/group.services.dart b/lib/src/services/group.services.dart
index 7a64777a..5df5828d 100644
--- a/lib/src/services/group.services.dart
+++ b/lib/src/services/group.services.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:math';
+
 import 'package:clock/clock.dart';
 import 'package:collection/collection.dart';
 import 'package:cryptography_flutter_plus/cryptography_flutter_plus.dart';
@@ -13,13 +14,13 @@ import 'package:http/http.dart' as http;
 import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
 // ignore: implementation_imports
 import 'package:libsignal_protocol_dart/src/ecc/ed25519.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/tables/groups.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/protobuf/api/http/http_requests.pb.dart';
 import 'package:twonly/src/model/protobuf/client/generated/groups.pb.dart';
 import 'package:twonly/src/model/protobuf/client/generated/messages.pbserver.dart';
-import 'package:twonly/src/services/api/messages.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
 import 'package:twonly/src/services/notifications/pushkeys.notifications.dart';
 import 'package:twonly/src/services/signal/session.signal.dart';
 import 'package:twonly/src/utils/log.dart';
@@ -42,8 +43,8 @@ Future<bool> createNewGroup(String groupName, List<Contact> members) async {
   final memberIds = members.map((x) => Int64(x.userId)).toList();
 
   final groupState = EncryptedGroupState(
-    memberIds: [Int64(gUser.userId)] + memberIds,
-    adminIds: [Int64(gUser.userId)],
+    memberIds: [Int64(userService.currentUser.userId)] + memberIds,
+    adminIds: [Int64(userService.currentUser.userId)],
     groupName: groupName,
     deleteMessagesAfterMilliseconds: Int64(
       defaultDeleteMessagesAfterMilliseconds,
@@ -283,9 +284,9 @@ Future<(int, EncryptedGroupState)?> fetchGroupState(Group group) async {
         final myPubKey = keyPair.getPublicKey().serialize().toList();
 
         if (listEquals(appendedPubKey, myPubKey)) {
-          adminIds.remove(Int64(gUser.userId));
+          adminIds.remove(Int64(userService.currentUser.userId));
           memberIds.remove(
-            Int64(gUser.userId),
+            Int64(userService.currentUser.userId),
           ); // -> Will remove the user later...
         } else {
           Log.info('A non admin left the group!!!');
@@ -303,7 +304,7 @@ Future<(int, EncryptedGroupState)?> fetchGroupState(Group group) async {
       }
     }
 
-    if (!memberIds.contains(Int64(gUser.userId))) {
+    if (!memberIds.contains(Int64(userService.currentUser.userId))) {
       // OH no, I am no longer a member of this group...
       // Return from the group...
       await twonlyDB.groupsDao.updateGroup(
@@ -316,7 +317,10 @@ Future<(int, EncryptedGroupState)?> fetchGroupState(Group group) async {
     }
 
     final isGroupAdmin =
-        adminIds.firstWhereOrNull((t) => t.toInt() == gUser.userId) != null;
+        adminIds.firstWhereOrNull(
+          (t) => t.toInt() == userService.currentUser.userId,
+        ) !=
+        null;
 
     if (!listEquals(memberIds, encryptedGroupState.memberIds)) {
       if (isGroupAdmin) {
@@ -368,7 +372,7 @@ Future<(int, EncryptedGroupState)?> fetchGroupState(Group group) async {
 
     // First find and insert NEW members
     for (final memberId in memberIds) {
-      if (memberId == Int64(gUser.userId)) {
+      if (memberId == Int64(userService.currentUser.userId)) {
         continue;
       }
       if (currentGroupMembers.any((t) => t.contactId == memberId.toInt())) {
@@ -838,7 +842,9 @@ Future<bool> removeMemberFromGroup(
       groupId: Value(group.groupId),
       type: const Value(GroupActionType.removedMember),
       affectedContactId: Value(
-        removeContactId == gUser.userId ? null : removeContactId,
+        removeContactId == userService.currentUser.userId
+            ? null
+            : removeContactId,
       ),
     ),
   );
@@ -945,7 +951,7 @@ Future<bool> leaveAsNonAdminFromGroup(Group group) async {
     EncryptedContent(
       groupUpdate: EncryptedContent_GroupUpdate(
         groupActionType: groupActionType.name,
-        affectedContactId: Int64(gUser.userId),
+        affectedContactId: Int64(userService.currentUser.userId),
       ),
     ),
   );
diff --git a/lib/src/services/intent/links.intent.dart b/lib/src/services/intent/links.intent.dart
index 03d70db1..39fa5a65 100644
--- a/lib/src/services/intent/links.intent.dart
+++ b/lib/src/services/intent/links.intent.dart
@@ -2,29 +2,66 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
+
 import 'package:collection/collection.dart';
-import 'package:drift/drift.dart' show Value;
 import 'package:flutter/material.dart';
 import 'package:flutter_sharing_intent/flutter_sharing_intent.dart';
 import 'package:flutter_sharing_intent/model/sharing_file.dart';
 import 'package:go_router/go_router.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
+import 'package:twonly/src/database/tables/contacts.table.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
-import 'package:twonly/src/database/twonly.db.dart';
-import 'package:twonly/src/services/api/mediafiles/upload.service.dart';
+import 'package:twonly/src/services/api/mediafiles/upload.api.dart';
 import 'package:twonly/src/services/signal/session.signal.dart';
 import 'package:twonly/src/utils/log.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/camera/share_image_editor.view.dart';
-import 'package:twonly/src/views/chats/add_new_user.view.dart';
-import 'package:twonly/src/views/components/alert_dialog.dart';
+import 'package:twonly/src/utils/qr.utils.dart';
+import 'package:twonly/src/visual/components/alert.dialog.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor.view.dart';
+import 'package:twonly/src/visual/views/contact/add_contact_via_qr_link.view.dart';
+import 'package:twonly/src/visual/views/contact/add_new_contact.view.dart';
 
 Future<bool> handleIntentUrl(BuildContext context, Uri uri) async {
   if (!uri.scheme.startsWith('http')) return false;
   if (uri.host != 'me.twonly.eu') return false;
   if (uri.hasEmptyPath) return false;
 
+  // Check if this is the QR code link which was
+  // therefore scanned with the system camera
+
+  if (uri.toString().startsWith(QrCodeUtils.linkPrefix)) {
+    final result = await QrCodeUtils.handleQrCodeLink(uri.toString());
+
+    if (!context.mounted) return false;
+
+    if (result != null) {
+      final (profile, contact, verificationOk) = result;
+
+      if (profile.username == userService.currentUser.username) {
+        await context.push(Routes.settingsPublicProfile);
+        return true;
+      }
+
+      if (contact != null) {
+        if (verificationOk) {
+          await context.push(Routes.profileContact(contact.userId));
+        } else {
+          await _pubKeysDoNotMatch(context, contact.username);
+        }
+      } else {
+        await context.navPush(
+          AddContactViaQrLinkView(
+            profile: profile,
+            qrCodeLink: uri.toString(),
+          ),
+        );
+      }
+    }
+
+    return true;
+  }
+
   final publicKey = uri.hasFragment ? uri.fragment : null;
   final userPaths = uri.path.split('/');
   if (userPaths.length != 2) return false;
@@ -32,7 +69,7 @@ Future<bool> handleIntentUrl(BuildContext context, Uri uri) async {
 
   if (!context.mounted) return false;
 
-  if (username == gUser.username) {
+  if (username == userService.currentUser.username) {
     await context.push(Routes.settingsPublicProfile);
     return true;
   }
@@ -40,25 +77,26 @@ Future<bool> handleIntentUrl(BuildContext context, Uri uri) async {
   Log.info(
     'Opened via deep link!: username = $username public_key = ${uri.fragment}',
   );
+
   final contacts = await twonlyDB.contactsDao.getContactsByUsername(username);
+  if (!context.mounted) return true;
+
   if (contacts.isEmpty) {
-    if (!context.mounted) return true;
+    // User does not yet exists, making a request...
     Uint8List? publicKeyBytes;
     if (publicKey != null) {
       publicKeyBytes = base64Url.decode(publicKey);
     }
-    await Navigator.push(
-      context,
-      MaterialPageRoute(
-        builder: (context) {
-          return AddNewUserView(
-            username: username,
-            publicKey: publicKeyBytes,
-          );
-        },
+    await context.navPush(
+      AddNewUserView(
+        username: username,
+        publicKey: publicKeyBytes,
       ),
     );
-  } else if (publicKey != null) {
+    return true;
+  }
+
+  if (publicKey != null) {
     try {
       final contact = contacts.first;
       final storedPublicKey = await getPublicKeyFromContact(contact.userId);
@@ -69,39 +107,41 @@ Future<bool> handleIntentUrl(BuildContext context, Uri uri) async {
         return true;
       }
       if (storedPublicKey.equals(receivedPublicKey)) {
-        if (!contact.verified) {
-          final markAsVerified = await showAlertDialog(
-            context,
-            context.lang.linkFromUsername(contact.username),
-            context.lang.linkFromUsernameLong,
-            customOk: context.lang.gotLinkFromFriend,
+        final markAsVerified = await showAlertDialog(
+          context,
+          context.lang.linkFromUsername(contact.username),
+          context.lang.linkFromUsernameLong,
+          customOk: context.lang.gotLinkFromFriend,
+        );
+        if (markAsVerified) {
+          await twonlyDB.keyVerificationDao.addKeyVerification(
+            contact.userId,
+            VerificationType.link,
           );
-          if (markAsVerified) {
-            await twonlyDB.contactsDao.updateContact(
-              contact.userId,
-              const ContactsCompanion(
-                verified: Value(true),
-              ),
-            );
-          }
-        } else {
+        }
+        if (context.mounted) {
           await context.push(Routes.profileContact(contact.userId));
         }
       } else {
-        await showAlertDialog(
-          context,
-          context.lang.couldNotVerifyUsername(contact.username),
-          context.lang.linkPubkeyDoesNotMatch,
-          customCancel: '',
-        );
+        await _pubKeysDoNotMatch(context, contact.username);
       }
     } catch (e) {
       Log.warn(e);
     }
   }
+
   return true;
 }
 
+Future<void> _pubKeysDoNotMatch(BuildContext context, String username) async {
+  await showAlertDialog(
+    context,
+    context.lang.couldNotVerifyUsername(username),
+    context.lang.linkPubkeyDoesNotMatch,
+    customCancel: '',
+  );
+}
+
 Future<void> handleIntentMediaFile(
   BuildContext context,
   String filePath,
@@ -115,7 +155,7 @@ Future<void> handleIntentMediaFile(
 
   final newMediaService = await initializeMediaUpload(
     type,
-    gUser.defaultShowTime,
+    userService.currentUser.defaultShowTime,
   );
   if (newMediaService == null) {
     Log.error('Could not create new media file for intent shared file');
diff --git a/lib/src/services/key_verification.service.dart b/lib/src/services/key_verification.service.dart
new file mode 100644
index 00000000..410e1b58
--- /dev/null
+++ b/lib/src/services/key_verification.service.dart
@@ -0,0 +1,120 @@
+import 'dart:typed_data';
+
+import 'package:collection/collection.dart';
+import 'package:cryptography_plus/cryptography_plus.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/database/tables/contacts.table.dart';
+import 'package:twonly/src/model/protobuf/client/generated/messages.pb.dart'
+    as pb;
+import 'package:twonly/src/services/api/messages.api.dart';
+import 'package:twonly/src/services/signal/identity.signal.dart';
+import 'package:twonly/src/services/signal/session.signal.dart';
+import 'package:twonly/src/utils/log.dart';
+import 'package:twonly/src/utils/misc.dart';
+
+class KeyVerificationService {
+  static Future<List<int>> getNewSecretVerificationToken() async {
+    final token = getRandomUint8List(16);
+    await twonlyDB.keyVerificationDao.insertVerificationToken(token);
+    return token.toList();
+  }
+
+  static Future<void> handleScannedVerificationToken(
+    int contactId,
+    Uint8List contactPubKey,
+    List<int> secretToken,
+  ) async {
+    Log.info('Notifying verified user using the secret token');
+
+    final calculatedMac = await _createVerificationBytes(
+      contactId,
+      contactPubKey,
+      secretToken,
+      false,
+    );
+
+    await sendCipherText(
+      contactId,
+      pb.EncryptedContent(
+        keyVerificationProof: pb.EncryptedContent_KeyVerificationProof(
+          calculatedMac: calculatedMac,
+        ),
+      ),
+    );
+  }
+
+  static Future<void> handleVerificationProof(
+    int fromUserId,
+    List<int> receivedMac,
+  ) async {
+    Log.info('Received a verification proof. Verifying the calculated mac...');
+
+    final contactPubKey = await getPublicKeyFromContact(fromUserId);
+    if (contactPubKey == null) {
+      Log.error('No public key stored..');
+      return;
+    }
+
+    final secretTokens = await twonlyDB.keyVerificationDao
+        .getRecentVerificationTokens();
+    for (final secretToken in secretTokens) {
+      final recalculatedMac = await _createVerificationBytes(
+        fromUserId,
+        contactPubKey,
+        secretToken.token,
+        true,
+      );
+      if (recalculatedMac.equals(receivedMac)) {
+        await twonlyDB.keyVerificationDao.addKeyVerification(
+          fromUserId,
+          VerificationType.secretQrToken,
+        );
+        Log.info('Contact was verified via secretQrToken');
+        return;
+      }
+    }
+
+    Log.error('No valid secret token could be found...');
+  }
+}
+
+Future<List<int>> _createVerificationBytes(
+  int contactId,
+  Uint8List contactPubKey,
+  List<int> secretToken,
+  bool verifying,
+) async {
+  final bytes = <int>[];
+
+  final userPublicKey = await getUserPublicKey();
+
+  final ownBytes = [
+    ..._userIdToLeBytes(userService.currentUser.userId),
+    ...userPublicKey,
+  ];
+
+  final contactBytes = [..._userIdToLeBytes(contactId), ...contactPubKey];
+
+  if (verifying) {
+    bytes
+      ..addAll(ownBytes)
+      ..addAll(contactBytes);
+  } else {
+    bytes
+      ..addAll(contactBytes)
+      ..addAll(ownBytes);
+  }
+
+  final hmac = Hmac.sha256();
+  final mac = await hmac.calculateMac(
+    Uint8List.fromList(bytes),
+    secretKey: SecretKey(secretToken),
+  );
+
+  return mac.bytes;
+}
+
+List<int> _userIdToLeBytes(int userId) {
+  final byteData = ByteData(8)..setInt64(0, userId, Endian.little);
+  return byteData.buffer.asUint8List();
+}
diff --git a/lib/src/services/mediafiles/compression.service.dart b/lib/src/services/mediafiles/compression.service.dart
index f79a4e1a..d0c8afb4 100644
--- a/lib/src/services/mediafiles/compression.service.dart
+++ b/lib/src/services/mediafiles/compression.service.dart
@@ -1,10 +1,11 @@
 import 'dart:async';
 import 'dart:io';
+
 import 'package:drift/drift.dart' show Value;
 import 'package:flutter/foundation.dart';
 import 'package:flutter_image_compress/flutter_image_compress.dart';
 import 'package:pro_video_editor/pro_video_editor.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/channels/video_compression.channel.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
diff --git a/lib/src/services/mediafiles/mediafile.service.dart b/lib/src/services/mediafiles/mediafile.service.dart
index 6fb18271..7f08c4f4 100644
--- a/lib/src/services/mediafiles/mediafile.service.dart
+++ b/lib/src/services/mediafiles/mediafile.service.dart
@@ -1,9 +1,11 @@
 import 'dart:async';
 import 'dart:io';
+
 import 'package:clock/clock.dart';
 import 'package:drift/drift.dart';
 import 'package:path/path.dart';
 import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/services/mediafiles/compression.service.dart';
@@ -27,7 +29,7 @@ class MediaFileService {
     try {
       final tempDirectory = MediaFileService.buildDirectoryPath(
         'tmp',
-        globalApplicationSupportDirectory,
+        AppEnvironment.supportDir,
       );
 
       final files = tempDirectory.listSync();
@@ -76,7 +78,7 @@ class MediaFileService {
                 final group = await twonlyDB.groupsDao.getGroup(
                   message.groupId,
                 );
-                if (group != null && !group.isDirectChat) {
+                if (group != null) {
                   delete = false;
                 }
               }
@@ -237,7 +239,7 @@ class MediaFileService {
     }
     if (tempPath.existsSync()) {
       await tempPath.copy(storedPath.path);
-      if (gUser.storeMediaFilesInGallery) {
+      if (userService.currentUser.storeMediaFilesInGallery) {
         if (mediaFile.type == MediaType.video) {
           await saveVideoToGallery(storedPath.path);
         } else {
@@ -307,7 +309,7 @@ class MediaFileService {
     }
     final mediaBaseDir = buildDirectoryPath(
       directory,
-      globalApplicationSupportDirectory,
+      AppEnvironment.supportDir,
     );
     return File(
       join(mediaBaseDir.path, '${mediaFile.mediaId}$namePrefix.$extension'),
diff --git a/lib/src/services/notifications/background.notifications.dart b/lib/src/services/notifications/background.notifications.dart
index 3a1e6823..45ab7a0f 100644
--- a/lib/src/services/notifications/background.notifications.dart
+++ b/lib/src/services/notifications/background.notifications.dart
@@ -7,7 +7,7 @@ import 'package:cryptography_plus/cryptography_plus.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
-import 'package:twonly/src/constants/secure_storage_keys.dart';
+import 'package:twonly/src/constants/secure_storage.keys.dart';
 import 'package:twonly/src/localization/generated/app_localizations.dart';
 import 'package:twonly/src/localization/generated/app_localizations_de.dart';
 import 'package:twonly/src/localization/generated/app_localizations_en.dart';
@@ -100,7 +100,7 @@ Future<void> handlePushData(String pushDataB64) async {
     }
 
     if (pushNotification != null) {
-      if (pushNotification.kind == PushKind.testNotification) {
+      if (pushNotification.kind == PushKind.TEST_NOTIFICATION) {
         await customLocalPushNotification(
           'Test notification',
           'This is a test notification.',
@@ -206,13 +206,13 @@ Future<void> showLocalPushNotification(
   String? payload;
 
   if (groupId != null &&
-      (pushNotification.kind == PushKind.text ||
-          pushNotification.kind == PushKind.response ||
-          pushNotification.kind == PushKind.reactionToAudio ||
-          pushNotification.kind == PushKind.storedMediaFile ||
-          pushNotification.kind == PushKind.reactionToImage ||
-          pushNotification.kind == PushKind.reactionToText ||
-          pushNotification.kind == PushKind.reactionToAudio)) {
+      (pushNotification.kind == PushKind.TEXT ||
+          pushNotification.kind == PushKind.RESPONSE ||
+          pushNotification.kind == PushKind.REACTION_TO_AUDIO ||
+          pushNotification.kind == PushKind.STORED_MEDIA_FILE ||
+          pushNotification.kind == PushKind.REACTION_TO_IMAGE ||
+          pushNotification.kind == PushKind.REACTION_TO_TEXT ||
+          pushNotification.kind == PushKind.REACTION_TO_VIDEO)) {
     payload = Routes.chatsMessages(groupId);
   } else {
     payload = Routes.chats;
@@ -236,7 +236,7 @@ Future<void> showLocalPushNotificationWithoutUserId(
   var title = lang.notificationTitleUnknown;
   var body = lang.notificationBodyUnknown;
 
-  if (pushNotification.kind == PushKind.contactRequest) {
+  if (pushNotification.kind == PushKind.CONTACT_REQUEST) {
     title = lang.you;
     body = lang.notificationContactRequestUnknownUser;
   }
@@ -293,30 +293,30 @@ String getPushNotificationText(PushNotification pushNotification) {
   }
 
   final pushNotificationText = {
-    PushKind.text.name: lang.notificationText(inGroup),
-    PushKind.twonly.name: lang.notificationTwonly(inGroup),
-    PushKind.video.name: lang.notificationVideo(inGroup),
-    PushKind.image.name: lang.notificationImage(inGroup),
-    PushKind.audio.name: lang.notificationAudio(inGroup),
-    PushKind.contactRequest.name: lang.notificationContactRequest,
-    PushKind.acceptRequest.name: lang.notificationAcceptRequest,
-    PushKind.storedMediaFile.name: lang.notificationStoredMediaFile,
-    PushKind.reaction.name: lang.notificationReaction,
-    PushKind.reopenedMedia.name: lang.notificationReopenedMedia,
-    PushKind.reactionToVideo.name: lang.notificationReactionToVideo(
+    PushKind.TEXT.name: lang.notificationText(inGroup),
+    PushKind.TWONLY.name: lang.notificationTwonly(inGroup),
+    PushKind.VIDEO.name: lang.notificationVideo(inGroup),
+    PushKind.IMAGE.name: lang.notificationImage(inGroup),
+    PushKind.AUDIO.name: lang.notificationAudio(inGroup),
+    PushKind.CONTACT_REQUEST.name: lang.notificationContactRequest,
+    PushKind.ACCEPT_REQUEST.name: lang.notificationAcceptRequest,
+    PushKind.STORED_MEDIA_FILE.name: lang.notificationStoredMediaFile,
+    PushKind.REACTION.name: lang.notificationReaction,
+    PushKind.REOPENED_MEDIA.name: lang.notificationReopenedMedia,
+    PushKind.REACTION_TO_VIDEO.name: lang.notificationReactionToVideo(
       pushNotification.additionalContent,
     ),
-    PushKind.reactionToAudio.name: lang.notificationReactionToAudio(
+    PushKind.REACTION_TO_AUDIO.name: lang.notificationReactionToAudio(
       pushNotification.additionalContent,
     ),
-    PushKind.reactionToText.name: lang.notificationReactionToText(
+    PushKind.REACTION_TO_TEXT.name: lang.notificationReactionToText(
       pushNotification.additionalContent,
     ),
-    PushKind.reactionToImage.name: lang.notificationReactionToImage(
+    PushKind.REACTION_TO_IMAGE.name: lang.notificationReactionToImage(
       pushNotification.additionalContent,
     ),
-    PushKind.response.name: lang.notificationResponse(inGroup),
-    PushKind.addedToGroup.name: lang.notificationAddedToGroup(
+    PushKind.RESPONSE.name: lang.notificationResponse(inGroup),
+    PushKind.ADDED_TO_GROUP.name: lang.notificationAddedToGroup(
       pushNotification.additionalContent,
     ),
   };
diff --git a/lib/src/services/notifications/fcm.notifications.dart b/lib/src/services/notifications/fcm.notifications.dart
index 89b70e4d..c8bdd4bf 100644
--- a/lib/src/services/notifications/fcm.notifications.dart
+++ b/lib/src/services/notifications/fcm.notifications.dart
@@ -8,11 +8,12 @@ import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/constants/secure_storage_keys.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/constants/secure_storage.keys.dart';
 import 'package:twonly/src/services/background/callback_dispatcher.background.dart';
 import 'package:twonly/src/services/notifications/background.notifications.dart';
+import 'package:twonly/src/services/user.service.dart';
 import 'package:twonly/src/utils/log.dart';
-import 'package:twonly/src/utils/storage.dart';
 
 import '../../../firebase_options.dart';
 
@@ -48,9 +49,8 @@ Future<void> checkForTokenUpdates() async {
     if (storedToken == null || fcmToken != storedToken) {
       Log.info('Got new FCM TOKEN.');
       await storage.write(key: SecureStorageKeys.googleFcm, value: fcmToken);
-      await updateUserdata((u) {
+      await UserService.update((u) {
         u.updateFCMToken = true;
-        return u;
       });
     }
 
@@ -61,9 +61,8 @@ Future<void> checkForTokenUpdates() async {
             key: SecureStorageKeys.googleFcm,
             value: fcmToken,
           );
-          await updateUserdata((u) {
+          await UserService.update((u) {
             u.updateFCMToken = true;
-            return u;
           });
         })
         .onError((err) {
@@ -75,16 +74,15 @@ Future<void> checkForTokenUpdates() async {
 }
 
 Future<void> initFCMAfterAuthenticated({bool force = false}) async {
-  if (gUser.updateFCMToken || force) {
+  if (userService.currentUser.updateFCMToken || force) {
     const storage = FlutterSecureStorage();
     final storedToken = await storage.read(key: SecureStorageKeys.googleFcm);
     if (storedToken != null) {
       final res = await apiService.updateFCMToken(storedToken);
       if (res.isSuccess) {
         Log.info('Uploaded new FCM token!');
-        await updateUserdata((u) {
+        await UserService.update((u) {
           u.updateFCMToken = false;
-          return u;
         });
       } else {
         Log.error('Could not update FCM token!');
@@ -110,12 +108,10 @@ Future<void> initFCMService() async {
     options: DefaultFirebaseOptions.currentPlatform,
   );
 
-  await checkForTokenUpdates();
+  unawaited(checkForTokenUpdates());
 
   FirebaseMessaging.onBackgroundMessage(_firebaseMessagingBackgroundHandler);
 
-  await FirebaseMessaging.instance.requestPermission();
-
   FirebaseMessaging.onMessage.listen(handleRemoteMessage);
 }
 
@@ -139,7 +135,7 @@ Future<void> handleRemoteMessage(RemoteMessage message) async {
   if (!Platform.isAndroid) {
     Log.error('Got message in Dart while on iOS');
   }
-  if (message.notification != null && globalIsAppInBackground) {
+  if (message.notification != null && AppState.isAppInBackground) {
     Log.error(
       'Got notification but app is in background, so the SDK already have shown the message.',
     );
diff --git a/lib/src/services/notifications/pushkeys.notifications.dart b/lib/src/services/notifications/pushkeys.notifications.dart
index 4d00549e..b5bf8b35 100644
--- a/lib/src/services/notifications/pushkeys.notifications.dart
+++ b/lib/src/services/notifications/pushkeys.notifications.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:math';
+
 import 'package:clock/clock.dart';
 import 'package:collection/collection.dart';
 import 'package:cryptography_flutter_plus/cryptography_flutter_plus.dart';
@@ -9,14 +10,14 @@ import 'package:fixnum/fixnum.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:hashlib/random.dart';
-import 'package:twonly/globals.dart';
-import 'package:twonly/src/constants/secure_storage_keys.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/constants/secure_storage.keys.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/protobuf/client/generated/messages.pb.dart';
 import 'package:twonly/src/model/protobuf/client/generated/push_notification.pb.dart';
-import 'package:twonly/src/services/api/messages.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
 import 'package:twonly/src/utils/log.dart';
 import 'package:twonly/src/utils/misc.dart';
 
@@ -216,28 +217,28 @@ Future<PushNotification?> getPushNotificationFromEncryptedContent(
       return null;
     }
     if (msg.content != null) {
-      kind = PushKind.reactionToText;
+      kind = PushKind.REACTION_TO_TEXT;
     } else if (msg.mediaId != null) {
       final media = await twonlyDB.mediaFilesDao.getMediaFileById(msg.mediaId!);
       if (media == null) return null;
       switch (media.type) {
         case MediaType.image:
-          kind = PushKind.reactionToImage;
+          kind = PushKind.REACTION_TO_IMAGE;
         case MediaType.audio:
-          kind = PushKind.reactionToAudio;
+          kind = PushKind.REACTION_TO_AUDIO;
         case MediaType.video:
-          kind = PushKind.reactionToVideo;
+          kind = PushKind.REACTION_TO_VIDEO;
         case MediaType.gif:
-          kind = PushKind.reaction;
+          kind = PushKind.REACTION;
       }
     }
     additionalContent = content.reaction.emoji;
   }
 
   if (content.hasTextMessage()) {
-    kind = PushKind.text;
+    kind = PushKind.TEXT;
     if (content.textMessage.hasQuoteMessageId()) {
-      kind = PushKind.response;
+      kind = PushKind.RESPONSE;
     }
     final group = await twonlyDB.groupsDao.getGroup(content.groupId);
     if (group != null && !group.isDirectChat) {
@@ -246,7 +247,7 @@ Future<PushNotification?> getPushNotificationFromEncryptedContent(
   }
 
   if (content.hasAdditionalDataMessage()) {
-    kind = PushKind.text;
+    kind = PushKind.TEXT;
   }
 
   if (content.hasMedia()) {
@@ -254,16 +255,16 @@ Future<PushNotification?> getPushNotificationFromEncryptedContent(
       case EncryptedContent_Media_Type.REUPLOAD:
         return null;
       case EncryptedContent_Media_Type.IMAGE:
-        kind = PushKind.image;
+        kind = PushKind.IMAGE;
       case EncryptedContent_Media_Type.VIDEO:
-        kind = PushKind.video;
+        kind = PushKind.VIDEO;
       case EncryptedContent_Media_Type.GIF:
-        kind = PushKind.image;
+        kind = PushKind.IMAGE;
       case EncryptedContent_Media_Type.AUDIO:
-        kind = PushKind.audio;
+        kind = PushKind.AUDIO;
     }
     if (content.media.requiresAuthentication) {
-      kind = PushKind.twonly;
+      kind = PushKind.TWONLY;
     }
     final group = await twonlyDB.groupsDao.getGroup(content.groupId);
     if (group != null && !group.isDirectChat) {
@@ -274,9 +275,9 @@ Future<PushNotification?> getPushNotificationFromEncryptedContent(
   if (content.hasContactRequest()) {
     switch (content.contactRequest.type) {
       case EncryptedContent_ContactRequest_Type.REQUEST:
-        kind = PushKind.contactRequest;
+        kind = PushKind.CONTACT_REQUEST;
       case EncryptedContent_ContactRequest_Type.ACCEPT:
-        kind = PushKind.acceptRequest;
+        kind = PushKind.ACCEPT_REQUEST;
       case EncryptedContent_ContactRequest_Type.REJECT:
         return null;
     }
@@ -292,16 +293,16 @@ Future<PushNotification?> getPushNotificationFromEncryptedContent(
     }
     switch (content.mediaUpdate.type) {
       case EncryptedContent_MediaUpdate_Type.REOPENED:
-        kind = PushKind.reopenedMedia;
+        kind = PushKind.REOPENED_MEDIA;
       case EncryptedContent_MediaUpdate_Type.STORED:
-        kind = PushKind.storedMediaFile;
+        kind = PushKind.STORED_MEDIA_FILE;
       case EncryptedContent_MediaUpdate_Type.DECRYPTION_ERROR:
         return null;
     }
   }
 
   if (content.hasGroupCreate()) {
-    kind = PushKind.addedToGroup;
+    kind = PushKind.ADDED_TO_GROUP;
     final group = await twonlyDB.groupsDao.getGroup(content.groupId);
     additionalContent = group!.groupName;
   }
@@ -344,9 +345,9 @@ Future<Uint8List?> encryptPushNotification(
     // user does not have send any push keys
     // only allow accept request and contact request to be send in an insecure way :/
     // In future find a better way, e.g. use the signal protocol in a native way..
-    if (content.kind != PushKind.acceptRequest &&
-        content.kind != PushKind.contactRequest &&
-        content.kind != PushKind.testNotification) {
+    if (content.kind != PushKind.ACCEPT_REQUEST &&
+        content.kind != PushKind.CONTACT_REQUEST &&
+        content.kind != PushKind.TEST_NOTIFICATION) {
       // this will be enforced after every app uses this system... :/
       // return null;
       Log.warn('Using insecure key as the receiver does not send a push key!');
diff --git a/lib/src/services/signal/encryption.signal.dart b/lib/src/services/signal/encryption.signal.dart
index 7a6efcd3..a50b7ca5 100644
--- a/lib/src/services/signal/encryption.signal.dart
+++ b/lib/src/services/signal/encryption.signal.dart
@@ -3,21 +3,18 @@ import 'dart:typed_data';
 import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
 // ignore: implementation_imports
 import 'package:libsignal_protocol_dart/src/invalid_message_exception.dart';
-import 'package:mutex/mutex.dart';
 import 'package:twonly/src/model/protobuf/client/generated/messages.pb.dart';
-import 'package:twonly/src/services/api/messages.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
+import 'package:twonly/src/services/signal/protocol_state.signal.dart';
 import 'package:twonly/src/services/signal/session.signal.dart';
 import 'package:twonly/src/services/signal/utils.signal.dart';
 import 'package:twonly/src/utils/log.dart';
 
-/// This caused some troubles, so protection the encryption...
-final lockingSignalEncryption = Mutex();
-
 Future<CiphertextMessage?> signalEncryptMessage(
   int target,
   Uint8List plaintextContent,
 ) async {
-  return lockingSignalEncryption.protect<CiphertextMessage?>(() async {
+  return lockingSignalProtocol.protect<CiphertextMessage?>(() async {
     try {
       final signalStore = (await getSignalStore())!;
       final address = getSignalAddress(target);
@@ -30,62 +27,68 @@ Future<CiphertextMessage?> signalEncryptMessage(
   });
 }
 
-bool alreadyPerformedAnResync = false;
-
 Future<(EncryptedContent?, PlaintextContent_DecryptionErrorMessage_Type?)>
 signalDecryptMessage(
   int fromUserId,
   Uint8List encryptedContentRaw,
   int type,
 ) async {
-  try {
-    final session = SessionCipher.fromStore(
-      (await getSignalStore())!,
-      getSignalAddress(fromUserId),
-    );
+  return lockingSignalProtocol.protect(() async {
+    try {
+      final session = SessionCipher.fromStore(
+        (await getSignalStore())!,
+        getSignalAddress(fromUserId),
+      );
 
-    Uint8List plaintext;
+      Uint8List plaintext;
 
-    switch (type) {
-      case CiphertextMessage.prekeyType:
-        plaintext = await session.decrypt(
-          PreKeySignalMessage(encryptedContentRaw),
-        );
-      case CiphertextMessage.whisperType:
-        plaintext = await session.decryptFromSignal(
-          SignalMessage.fromSerialized(encryptedContentRaw),
-        );
-      default:
-        Log.error('Unknown Message Decryption Type: $type');
-        return (null, PlaintextContent_DecryptionErrorMessage_Type.UNKNOWN);
-    }
-
-    return (EncryptedContent.fromBuffer(plaintext), null);
-  } on InvalidKeyIdException catch (e) {
-    Log.warn(e);
-    return (null, PlaintextContent_DecryptionErrorMessage_Type.PREKEY_UNKNOWN);
-  } on InvalidMessageException catch (e) {
-    if (!alreadyPerformedAnResync) {
-      if (await handleSessionResync(fromUserId)) {
-        // This flag prevents from resyncing the session the client received multiple new
-        // messages from the server he could not decrypt
-        alreadyPerformedAnResync = true;
-
-        // This message contains a new PreKeyBundle establishing a new signal session
-        await sendCipherText(
-          fromUserId,
-          EncryptedContent(
-            errorMessages: EncryptedContent_ErrorMessages(
-              type: EncryptedContent_ErrorMessages_Type.SESSION_OUT_OF_SYNC,
-            ),
-          ),
-        );
+      switch (type) {
+        case CiphertextMessage.prekeyType:
+          plaintext = await session.decrypt(
+            PreKeySignalMessage(encryptedContentRaw),
+          );
+        case CiphertextMessage.whisperType:
+          plaintext = await session.decryptFromSignal(
+            SignalMessage.fromSerialized(encryptedContentRaw),
+          );
+        default:
+          Log.error('Unknown Message Decryption Type: $type');
+          return (null, PlaintextContent_DecryptionErrorMessage_Type.UNKNOWN);
       }
+
+      return (EncryptedContent.fromBuffer(plaintext), null);
+    } on InvalidKeyIdException catch (e) {
+      Log.warn(e);
+      return (
+        null,
+        PlaintextContent_DecryptionErrorMessage_Type.PREKEY_UNKNOWN,
+      );
+    } on DuplicateMessageException catch (e) {
+      Log.info(e.toString());
+      return (null, null);
+    } on InvalidMessageException catch (e) {
+      if (!resyncedUsers.contains(fromUserId)) {
+        if (await handleSessionResync(fromUserId)) {
+          // This flag prevents from resyncing the session the client received multiple new
+          // messages from the server he could not decrypt
+          resyncedUsers.add(fromUserId);
+
+          // This message contains a new PreKeyBundle establishing a new signal session
+          await sendCipherText(
+            fromUserId,
+            EncryptedContent(
+              errorMessages: EncryptedContent_ErrorMessages(
+                type: EncryptedContent_ErrorMessages_Type.SESSION_OUT_OF_SYNC,
+              ),
+            ),
+          );
+        }
+      }
+      Log.warn(e);
+      return (null, PlaintextContent_DecryptionErrorMessage_Type.UNKNOWN);
+    } catch (e) {
+      Log.error(e);
+      return (null, PlaintextContent_DecryptionErrorMessage_Type.UNKNOWN);
     }
-    Log.warn(e);
-    return (null, PlaintextContent_DecryptionErrorMessage_Type.UNKNOWN);
-  } catch (e) {
-    Log.error(e);
-    return (null, PlaintextContent_DecryptionErrorMessage_Type.UNKNOWN);
-  }
+  });
 }
diff --git a/lib/src/services/signal/identity.signal.dart b/lib/src/services/signal/identity.signal.dart
index a9692dac..722f844c 100644
--- a/lib/src/services/signal/identity.signal.dart
+++ b/lib/src/services/signal/identity.signal.dart
@@ -1,15 +1,18 @@
 import 'dart:convert';
+import 'dart:typed_data';
+
 import 'package:clock/clock.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
-import 'package:twonly/globals.dart';
-import 'package:twonly/src/constants/secure_storage_keys.dart';
-import 'package:twonly/src/database/signal/connect_signal_protocol_store.dart';
-import 'package:twonly/src/model/json/signal_identity.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/constants/secure_storage.keys.dart';
+import 'package:twonly/src/database/signal/signal_protocol_store.dart';
+import 'package:twonly/src/model/json/signal_identity.model.dart';
 import 'package:twonly/src/services/signal/consts.signal.dart';
+import 'package:twonly/src/services/signal/protocol_state.signal.dart';
 import 'package:twonly/src/services/signal/utils.signal.dart';
+import 'package:twonly/src/services/user.service.dart';
 import 'package:twonly/src/utils/log.dart';
-import 'package:twonly/src/utils/storage.dart';
+import 'package:twonly/src/utils/secure_storage.dart';
 
 Future<IdentityKeyPair?> getSignalIdentityKeyPair() async {
   final signalIdentity = await getSignalIdentity();
@@ -20,11 +23,12 @@ Future<IdentityKeyPair?> getSignalIdentityKeyPair() async {
 // This function runs after the clients authenticated with the server.
 // It then checks if it should update a new session key
 Future<void> signalHandleNewServerConnection() async {
-  if (gUser.signalLastSignedPreKeyUpdated != null) {
+  if (userService.currentUser.signalLastSignedPreKeyUpdated != null) {
     final fortyEightHoursAgo = clock.now().subtract(const Duration(hours: 48));
-    final isYoungerThan48Hours = (gUser.signalLastSignedPreKeyUpdated!).isAfter(
-      fortyEightHoursAgo,
-    );
+    final isYoungerThan48Hours =
+        (userService.currentUser.signalLastSignedPreKeyUpdated!).isAfter(
+          fortyEightHoursAgo,
+        );
     if (isYoungerThan48Hours) {
       // The key does live for 48 hours then it expires and a new key is generated.
       return;
@@ -35,9 +39,8 @@ Future<void> signalHandleNewServerConnection() async {
     Log.error('could not generate a new signed pre key!');
     return;
   }
-  await updateUserdata((user) {
+  await UserService.update((user) {
     user.signalLastSignedPreKeyUpdated = clock.now();
-    return user;
   });
   final res = await apiService.updateSignedPreKey(
     signedPreKey.id,
@@ -46,9 +49,8 @@ Future<void> signalHandleNewServerConnection() async {
   );
   if (res.isError) {
     Log.error('could not update the signed pre key: ${res.error}');
-    await updateUserdata((user) {
+    await UserService.update((user) {
       user.signalLastSignedPreKeyUpdated = null;
-      return user;
     });
   } else {
     Log.info('updated signed pre key');
@@ -56,28 +58,24 @@ Future<void> signalHandleNewServerConnection() async {
 }
 
 Future<List<PreKeyRecord>> signalGetPreKeys() async {
-  final user = await getUser();
-  if (user == null) return [];
-
-  final start = user.currentPreKeyIndexStart;
-  await updateUserdata((user) {
-    user.currentPreKeyIndexStart =
-        (user.currentPreKeyIndexStart + 200) % maxValue;
-    return user;
+  return lockingSignalProtocol.protect(() async {
+    final start = userService.currentUser.currentPreKeyIndexStart;
+    await UserService.update((u) {
+      u.currentPreKeyIndexStart = (u.currentPreKeyIndexStart + 200) % maxValue;
+    });
+    final preKeys = generatePreKeys(start, 200);
+    final signalStore = await getSignalStore();
+    if (signalStore == null) return [];
+    for (final p in preKeys) {
+      await signalStore.preKeyStore.storePreKey(p.id, p);
+    }
+    return preKeys;
   });
-  final preKeys = generatePreKeys(start, 200);
-  final signalStore = await getSignalStore();
-  if (signalStore == null) return [];
-  for (final p in preKeys) {
-    await signalStore.preKeyStore.storePreKey(p.id, p);
-  }
-  return preKeys;
 }
 
 Future<SignalIdentity?> getSignalIdentity() async {
   try {
-    const storage = FlutterSecureStorage();
-    var signalIdentityJson = await storage.read(
+    var signalIdentityJson = await SecureStorage.instance.read(
       key: SecureStorageKeys.signalIdentity,
     );
     if (signalIdentityJson == null) {
@@ -92,10 +90,14 @@ Future<SignalIdentity?> getSignalIdentity() async {
   }
 }
 
-Future<void> createIfNotExistsSignalIdentity() async {
-  const storage = FlutterSecureStorage();
+Future<Uint8List> getUserPublicKey() async {
+  final signalIdentity = (await getSignalIdentity())!;
+  final signalStore = await getSignalStoreFromIdentity(signalIdentity);
+  return (await signalStore.getIdentityKeyPair()).getPublicKey().serialize();
+}
 
-  final signalIdentity = await storage.read(
+Future<void> createIfNotExistsSignalIdentity() async {
+  final signalIdentity = await SecureStorage.instance.read(
     key: SecureStorageKeys.signalIdentity,
   );
 
@@ -106,7 +108,7 @@ Future<void> createIfNotExistsSignalIdentity() async {
   final identityKeyPair = generateIdentityKeyPair();
   final registrationId = generateRegistrationId(true);
 
-  final signalStore = ConnectSignalProtocolStore(
+  final signalStore = SignalSignalProtocolStore(
     identityKeyPair,
     registrationId,
   );
@@ -123,34 +125,35 @@ Future<void> createIfNotExistsSignalIdentity() async {
     registrationId: registrationId,
   );
 
-  await storage.write(
+  await SecureStorage.instance.write(
     key: SecureStorageKeys.signalIdentity,
     value: jsonEncode(storedSignalIdentity),
   );
 }
 
 Future<SignedPreKeyRecord?> _getNewSignalSignedPreKey() async {
-  var identityKeyPair = await getSignalIdentityKeyPair();
-  final user = await getUser();
-  final signalStore = await getSignalStore();
-  if (identityKeyPair == null || signalStore == null || user == null) {
-    return null;
-  }
+  return lockingSignalProtocol.protect(() async {
+    var identityKeyPair = await getSignalIdentityKeyPair();
+    final signalStore = await getSignalStore();
+    if (identityKeyPair == null || signalStore == null) {
+      return null;
+    }
 
-  final signedPreKeyId = user.currentSignedPreKeyIndexStart;
-  await updateUserdata((user) {
-    user.currentSignedPreKeyIndexStart += 1;
-    return user;
+    final signedPreKeyId =
+        userService.currentUser.currentSignedPreKeyIndexStart;
+    await UserService.update((user) {
+      user.currentSignedPreKeyIndexStart += 1;
+    });
+
+    final signedPreKey = generateSignedPreKey(
+      identityKeyPair,
+      signedPreKeyId,
+    );
+
+    identityKeyPair = null;
+
+    await signalStore.storeSignedPreKey(signedPreKeyId, signedPreKey);
+
+    return signedPreKey;
   });
-
-  final signedPreKey = generateSignedPreKey(
-    identityKeyPair,
-    signedPreKeyId,
-  );
-
-  identityKeyPair = null;
-
-  await signalStore.storeSignedPreKey(signedPreKeyId, signedPreKey);
-
-  return signedPreKey;
 }
diff --git a/lib/src/services/signal/protocol_state.signal.dart b/lib/src/services/signal/protocol_state.signal.dart
new file mode 100644
index 00000000..9d797473
--- /dev/null
+++ b/lib/src/services/signal/protocol_state.signal.dart
@@ -0,0 +1,12 @@
+import 'package:mutex/mutex.dart';
+
+/// Unified lock for all Signal protocol operations (encryption, decryption, session management).
+final lockingSignalProtocol = Mutex();
+
+/// Tracking users who have already been resynced in the current session.
+final resyncedUsers = <int>{};
+
+/// Reset the resync tracking set.
+void resetResyncedUsers() {
+  resyncedUsers.clear();
+}
diff --git a/lib/src/services/signal/session.signal.dart b/lib/src/services/signal/session.signal.dart
index d5d07a0e..03554d32 100644
--- a/lib/src/services/signal/session.signal.dart
+++ b/lib/src/services/signal/session.signal.dart
@@ -1,83 +1,80 @@
 import 'dart:typed_data';
+
 import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/model/protobuf/api/websocket/server_to_client.pb.dart';
 import 'package:twonly/src/services/signal/consts.signal.dart';
+import 'package:twonly/src/services/signal/protocol_state.signal.dart';
 import 'package:twonly/src/services/signal/utils.signal.dart';
 import 'package:twonly/src/utils/log.dart';
 
 Future<bool> processSignalUserData(Response_UserData userData) async {
-  final SignalProtocolStore? signalStore = await getSignalStore();
+  return lockingSignalProtocol.protect(() async {
+    final SignalProtocolStore? signalStore = await getSignalStore();
 
-  if (signalStore == null) {
-    return false;
-  }
+    if (signalStore == null) {
+      return false;
+    }
 
-  final targetAddress = getSignalAddress(userData.userId.toInt());
+    final targetAddress = getSignalAddress(userData.userId.toInt());
 
-  final sessionBuilder = SessionBuilder.fromSignalStore(
-    signalStore,
-    targetAddress,
-  );
+    final sessionBuilder = SessionBuilder.fromSignalStore(
+      signalStore,
+      targetAddress,
+    );
 
-  ECPublicKey? tempPrePublicKey;
-  int? tempPreKeyId;
+    ECPublicKey? tempPrePublicKey;
+    int? tempPreKeyId;
 
-  if (userData.prekeys.isNotEmpty) {
-    tempPrePublicKey = Curve.decodePoint(
-      DjbECPublicKey(
-        Uint8List.fromList(userData.prekeys.first.prekey),
-      ).serialize(),
+    if (userData.prekeys.isNotEmpty) {
+      tempPrePublicKey = Curve.decodePoint(
+        DjbECPublicKey(
+          Uint8List.fromList(userData.prekeys.first.prekey),
+        ).serialize(),
+        1,
+      );
+      tempPreKeyId = userData.prekeys.first.id.toInt();
+    }
+
+    final tempSignedPreKeyId = userData.signedPrekeyId.toInt();
+
+    final tempSignedPreKeyPublic = Curve.decodePoint(
+      DjbECPublicKey(Uint8List.fromList(userData.signedPrekey)).serialize(),
       1,
     );
-    tempPreKeyId = userData.prekeys.first.id.toInt();
-  }
 
-  final tempSignedPreKeyId = userData.signedPrekeyId.toInt();
+    final tempSignedPreKeySignature = Uint8List.fromList(
+      userData.signedPrekeySignature,
+    );
 
-  final tempSignedPreKeyPublic = Curve.decodePoint(
-    DjbECPublicKey(Uint8List.fromList(userData.signedPrekey)).serialize(),
-    1,
-  );
+    final tempIdentityKey = IdentityKey(
+      Curve.decodePoint(
+        DjbECPublicKey(
+          Uint8List.fromList(userData.publicIdentityKey),
+        ).serialize(),
+        1,
+      ),
+    );
 
-  final tempSignedPreKeySignature = Uint8List.fromList(
-    userData.signedPrekeySignature,
-  );
+    final preKeyBundle = PreKeyBundle(
+      userData.registrationId.toInt(),
+      defaultDeviceId,
+      tempPreKeyId,
+      tempPrePublicKey,
+      tempSignedPreKeyId,
+      tempSignedPreKeyPublic,
+      tempSignedPreKeySignature,
+      tempIdentityKey,
+    );
 
-  final tempIdentityKey = IdentityKey(
-    Curve.decodePoint(
-      DjbECPublicKey(
-        Uint8List.fromList(userData.publicIdentityKey),
-      ).serialize(),
-      1,
-    ),
-  );
-
-  final preKeyBundle = PreKeyBundle(
-    userData.registrationId.toInt(),
-    defaultDeviceId,
-    tempPreKeyId,
-    tempPrePublicKey,
-    tempSignedPreKeyId,
-    tempSignedPreKeyPublic,
-    tempSignedPreKeySignature,
-    tempIdentityKey,
-  );
-
-  try {
-    await sessionBuilder.processPreKeyBundle(preKeyBundle);
-    return true;
-  } catch (e) {
-    Log.error('could not process pre key bundle: $e');
-    return false;
-  }
-}
-
-Future<void> deleteSessionWithTarget(int target) async {
-  final signalStore = await getSignalStore();
-  if (signalStore == null) return;
-  final address = SignalProtocolAddress(target.toString(), defaultDeviceId);
-  await signalStore.sessionStore.deleteSession(address);
+    try {
+      await sessionBuilder.processPreKeyBundle(preKeyBundle);
+      return true;
+    } catch (e) {
+      Log.error('could not process pre key bundle: $e');
+      return false;
+    }
+  });
 }
 
 Future<Uint8List?> getPublicKeyFromContact(int contactId) async {
diff --git a/lib/src/services/signal/utils.signal.dart b/lib/src/services/signal/utils.signal.dart
index 566fd8e4..fb399884 100644
--- a/lib/src/services/signal/utils.signal.dart
+++ b/lib/src/services/signal/utils.signal.dart
@@ -1,21 +1,21 @@
 import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
-import 'package:twonly/src/database/signal/connect_signal_protocol_store.dart';
-import 'package:twonly/src/model/json/signal_identity.dart';
+import 'package:twonly/src/database/signal/signal_protocol_store.dart';
+import 'package:twonly/src/model/json/signal_identity.model.dart';
 import 'package:twonly/src/services/signal/consts.signal.dart';
 import 'package:twonly/src/services/signal/identity.signal.dart';
 
-Future<ConnectSignalProtocolStore?> getSignalStore() async {
+Future<SignalSignalProtocolStore?> getSignalStore() async {
   return getSignalStoreFromIdentity((await getSignalIdentity())!);
 }
 
-Future<ConnectSignalProtocolStore> getSignalStoreFromIdentity(
+Future<SignalSignalProtocolStore> getSignalStoreFromIdentity(
   SignalIdentity signalIdentity,
 ) async {
   final identityKeyPair = IdentityKeyPair.fromSerialized(
     signalIdentity.identityKeyPairU8List,
   );
 
-  return ConnectSignalProtocolStore(
+  return SignalSignalProtocolStore(
     identityKeyPair,
     signalIdentity.registrationId,
   );
diff --git a/lib/src/services/subscription.service.dart b/lib/src/services/subscription.service.dart
index 27b50cc3..cd115e43 100644
--- a/lib/src/services/subscription.service.dart
+++ b/lib/src/services/subscription.service.dart
@@ -1,7 +1,5 @@
 // ignore_for_file: constant_identifier_names
 
-import 'package:twonly/globals.dart';
-
 enum SubscriptionPlan {
   Free,
   Tester,
@@ -41,7 +39,3 @@ SubscriptionPlan planFromString(String value) {
   }
   return SubscriptionPlan.Free;
 }
-
-SubscriptionPlan getCurrentPlan() {
-  return planFromString(gUser.subscriptionPlan);
-}
diff --git a/lib/src/services/user.service.dart b/lib/src/services/user.service.dart
new file mode 100644
index 00000000..6bdb53fa
--- /dev/null
+++ b/lib/src/services/user.service.dart
@@ -0,0 +1,72 @@
+import 'dart:async';
+import 'dart:convert';
+
+import 'package:mutex/mutex.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/constants/secure_storage.keys.dart';
+import 'package:twonly/src/model/json/userdata.model.dart';
+import 'package:twonly/src/utils/log.dart';
+import 'package:twonly/src/utils/secure_storage.dart';
+
+class UserService {
+  late UserData currentUser;
+  bool isUserCreated = false;
+  static final Mutex _updateProtection = Mutex();
+
+  final _userDataUpdateController = StreamController<void>.broadcast();
+  Stream<void> get onUserUpdated => _userDataUpdateController.stream;
+
+  Future<bool> tryInit() async {
+    final user = await getUser();
+    if (user == null) return false;
+    userService.currentUser = user;
+    userService.isUserCreated = true;
+    return true;
+  }
+
+  static Future<UserData?> getUser() async {
+    try {
+      final userDataJson = await SecureStorage.instance.read(
+        key: SecureStorageKeys.userData,
+      );
+      if (userDataJson == null) {
+        return null;
+      }
+      return UserData.fromJson(
+        jsonDecode(userDataJson) as Map<String, dynamic>,
+      );
+    } catch (e) {
+      Log.error('could not load user: $e');
+      rethrow; // Rethrow instead of returning null to distinguish error from missing user
+    }
+  }
+
+  static Future<void> update(
+    void Function(UserData userData) updateUser,
+  ) async {
+    await _updateProtection.protect(() async {
+      try {
+        final user = await getUser();
+        if (user == null) return;
+        if (user.defaultShowTime == 999999) {
+          // This was the old version for infinity -> change it to null
+          user.defaultShowTime = null;
+        }
+        updateUser(user);
+        await SecureStorage.instance.write(
+          key: SecureStorageKeys.userData,
+          value: jsonEncode(user),
+        );
+        userService.currentUser = user;
+      } catch (e) {
+        Log.error('Could not update the user: $e');
+      }
+    });
+
+    userService.triggerUserUpdate();
+  }
+
+  void triggerUserUpdate() {
+    _userDataUpdateController.add(null);
+  }
+}
diff --git a/lib/src/services/user_discovery.service.dart b/lib/src/services/user_discovery.service.dart
new file mode 100644
index 00000000..a9d0015b
--- /dev/null
+++ b/lib/src/services/user_discovery.service.dart
@@ -0,0 +1,214 @@
+import 'dart:convert';
+import 'package:collection/collection.dart';
+import 'package:drift/drift.dart';
+import 'package:flutter/foundation.dart';
+import 'package:twonly/core/bridge/wrapper/user_discovery.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/database/twonly.db.dart';
+import 'package:twonly/src/model/protobuf/client/generated/user_discovery/types.pb.dart';
+import 'package:twonly/src/services/signal/identity.signal.dart';
+import 'package:twonly/src/services/user.service.dart';
+import 'package:twonly/src/utils/log.dart';
+
+class UserDiscoveryService {
+  static Future<void> checkForNewAnnouncedUsers() async {
+    final announcedUsers = await twonlyDB.userDiscoveryDao
+        .getNewAnnouncementsWithoutData();
+
+    for (final announcedUser in announcedUsers) {
+      final userdata = await apiService.getUserById(
+        announcedUser.announcedUserId,
+      );
+      if (userdata == null) continue;
+      if (!userdata.publicIdentityKey.equals(
+        announcedUser.announcedPublicKey.toList(),
+      )) {
+        if (kDebugMode) {
+          Log.warn(
+            '${userdata.publicIdentityKey} != ${announcedUser.announcedPublicKey.toList()}',
+          );
+        }
+        Log.error(
+          'Server delivered a different public key then received from the announcement.',
+        );
+        continue;
+      }
+
+      Log.info('Updating the username from the announced user');
+
+      // Updating the username, so the data will not be requested again..
+      await twonlyDB.userDiscoveryDao.updateAnnouncedUser(
+        announcedUser.announcedUserId,
+        UserDiscoveryAnnouncedUsersCompanion(
+          username: Value(utf8.decode(userdata.username)),
+        ),
+      );
+    }
+  }
+
+  static bool isContactAllowed(Contact? c) {
+    if (c == null) return false;
+    final u = userService.currentUser;
+    // Only accepted users are allowed.
+    if (!c.accepted || c.blocked) return false;
+    if (c.mediaSendCounter < u.requiredSendImages) return false;
+    if (c.userDiscoveryExcluded) return false;
+    if (u.userDiscoveryRequiresManualApproval &&
+        (c.userDiscoveryManualApproved == null ||
+            !c.userDiscoveryManualApproved!)) {
+      return false;
+    }
+    return true;
+  }
+
+  static bool shouldRequestManualApproval(Contact c) {
+    final u = userService.currentUser;
+    if (!u.isUserDiscoveryEnabled) return false;
+    if (c.mediaSendCounter < u.requiredSendImages) return false;
+    if (c.userDiscoveryExcluded) return false;
+    if (!u.userDiscoveryRequiresManualApproval) return false;
+    if (c.userDiscoveryManualApproved == true) return false;
+    return true;
+  }
+
+  static Future<void> initializeOrUpdate({
+    required int threshold,
+    required bool sharePromotion,
+  }) async {
+    try {
+      await FlutterUserDiscovery.initializeOrUpdate(
+        threshold: threshold,
+        userId: userService.currentUser.userId,
+        publicKey: await getUserPublicKey(),
+        sharePromotion: sharePromotion,
+      );
+      await UserService.update(
+        (u) => u
+          ..isUserDiscoveryEnabled = true
+          ..userDiscoverySharePromotion = sharePromotion
+          ..userDiscoveryThreshold = threshold,
+      );
+    } catch (e) {
+      Log.error(e);
+    }
+  }
+
+  static Future<Uint8List?> getCurrentVersion() async {
+    try {
+      return await FlutterUserDiscovery.getCurrentVersion();
+    } catch (e) {
+      Log.error(e);
+      return null;
+    }
+  }
+
+  static Future<UserDiscoveryVersion?> getCurrentVersionTyped() async {
+    final version = await getCurrentVersion();
+    if (version == null) return null;
+    return UserDiscoveryVersion.fromBuffer(version);
+  }
+
+  static Future<UserDiscoveryVersion?> getContactVersionTyped(
+    int contactId,
+  ) async {
+    final contact = await twonlyDB.contactsDao.getContactById(contactId);
+    if (contact == null || contact.userDiscoveryVersion == null) return null;
+    return UserDiscoveryVersion.fromBuffer(contact.userDiscoveryVersion!);
+  }
+
+  static UserDiscoveryVersion? getContactVersionTypedFromContact(
+    Contact contact,
+  ) {
+    if (contact.userDiscoveryVersion == null) return null;
+    return UserDiscoveryVersion.fromBuffer(contact.userDiscoveryVersion!);
+  }
+
+  static Future<Uint8List?> shouldRequestNewMessages(
+    int fromUserId,
+    List<int> receivedVersion,
+  ) async {
+    try {
+      return await FlutterUserDiscovery.shouldRequestNewMessages(
+        contactId: fromUserId,
+        version: receivedVersion,
+      );
+    } catch (e) {
+      Log.error(e);
+      return null;
+    }
+  }
+
+  static Future<List<Uint8List>?> getNewMessages(
+    int fromUserId,
+    List<int> receivedVersion,
+  ) async {
+    try {
+      return await FlutterUserDiscovery.getNewMessages(
+        contactId: fromUserId,
+        receivedVersion: receivedVersion,
+      );
+    } catch (e) {
+      Log.error(e);
+      return null;
+    }
+  }
+
+  static Future<void> handleNewMessages(
+    int fromUserId,
+    List<Uint8List> messages,
+  ) async {
+    try {
+      final verifications = await twonlyDB.keyVerificationDao
+          .getContactVerification(fromUserId);
+
+      return await FlutterUserDiscovery.handleNewMessages(
+        contactId: fromUserId,
+        messages: messages,
+        publicKeyVerifiedTimestamp:
+            verifications.lastOrNull?.createdAt.millisecondsSinceEpoch,
+      );
+    } catch (e) {
+      Log.error(e);
+    }
+  }
+
+  static Future<void> removeDeletedContacts() async {
+    final subquery = twonlyDB.selectOnly(twonlyDB.contacts)
+      ..addColumns([twonlyDB.contacts.userId])
+      ..where(twonlyDB.contacts.accountDeleted.equals(true));
+
+    await (twonlyDB.update(
+      twonlyDB.userDiscoveryOwnPromotions,
+    )..where((t) => t.contactId.isInQuery(subquery))).write(
+      UserDiscoveryOwnPromotionsCompanion(promotion: Value(Uint8List(0))),
+    );
+  }
+
+  static Future<void> changeExclusionForContact(
+    int contactId,
+    bool exclude,
+  ) async {
+    // Remove old versions from the user...
+    await (twonlyDB.update(
+      twonlyDB.userDiscoveryOwnPromotions,
+    )..where((t) => t.contactId.equals(contactId))).write(
+      UserDiscoveryOwnPromotionsCompanion(promotion: Value(Uint8List(0))),
+    );
+
+    await twonlyDB.contactsDao.updateContact(
+      contactId,
+      ContactsCompanion(
+        userDiscoveryExcluded: Value(exclude),
+        userDiscoveryVersion: const Value(
+          null, // If the user is included again, this will trigger a new request of his original announcement
+        ),
+      ),
+    );
+  }
+
+  static Future<void> disable() async {
+    await UserService.update((u) {
+      u.isUserDiscoveryEnabled = false;
+    });
+  }
+}
diff --git a/lib/src/services/user_study.service.dart b/lib/src/services/user_study.service.dart
new file mode 100644
index 00000000..4507add8
--- /dev/null
+++ b/lib/src/services/user_study.service.dart
@@ -0,0 +1,125 @@
+import 'dart:convert';
+
+import 'package:http/http.dart' as http;
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/database/tables/contacts.table.dart';
+import 'package:twonly/src/services/user.service.dart';
+import 'package:twonly/src/utils/keyvalue.dart';
+import 'package:twonly/src/utils/log.dart';
+import 'package:twonly/src/utils/misc.dart';
+
+const userStudySurveyKey = 'user_study_survey';
+
+// PLEASE DO NOT SPAM OR TRY SENDING DIRECTLY TO THIS URL!
+// You're just making my master's thesis more difficult and destroy scientific data. :/
+const surveyUrlBase = 'https://survey.twonly.org/upload.php';
+
+Future<void> handleUserStudyUpload() async {
+  try {
+    final token = userService.currentUser.userStudyParticipantsToken;
+    if (token == null) return;
+
+    // in case the survey was taken offline try again
+    final userStudySurvey = await KeyValueStore.get(userStudySurveyKey);
+    if (userStudySurvey != null) {
+      final response = await http.post(
+        Uri.parse('$surveyUrlBase/create/$token'),
+        body: jsonEncode(userStudySurvey),
+        headers: {'Content-Type': 'application/json'},
+      );
+      if (response.statusCode != 200) {
+        Log.warn(
+          'Got different status code for survey upload: ${response.statusCode}',
+        );
+        return;
+      }
+      await KeyValueStore.delete(userStudySurveyKey);
+    }
+
+    if (userService.currentUser.lastUserStudyDataUpload != null &&
+        isToday(userService.currentUser.lastUserStudyDataUpload!)) {
+      // Only send updates once a day.
+      // This enables to see if improvements to actually work.
+      return;
+    }
+
+    final contacts = await twonlyDB.contactsDao.getAllContacts();
+    final verifications = await twonlyDB.keyVerificationDao
+        .getFirstVerificationTypeByContacts();
+
+    final udFriendsShared = await twonlyDB.contactsDao
+        .getContactsAnnouncedViaUserDiscovery();
+
+    final udAllAnnouncedUsers = await twonlyDB.userDiscoveryDao
+        .getAllAnnouncedUsersWithRelations();
+
+    var udUnknownAnnouncedUsers = 0;
+
+    for (final udUser in udAllAnnouncedUsers.keys) {
+      if (!contacts.any((c) => c.userId == udUser.announcedUserId)) {
+        udUnknownAnnouncedUsers += 1;
+      }
+    }
+
+    final dataCollection = {
+      'total_contacts': contacts.length,
+
+      'user_discovery_enabled': userService.currentUser.isUserDiscoveryEnabled,
+      'user_discovery_required_send_images':
+          userService.currentUser.requiredSendImages,
+      'user_discovery_threshold':
+          userService.currentUser.userDiscoveryThreshold,
+      'user_discovery_requires_manual_approval':
+          userService.currentUser.userDiscoveryRequiresManualApproval,
+      'user_discovery_share_promotion':
+          userService.currentUser.userDiscoverySharePromotion,
+
+      'user_discovery_count_friends_shared': udFriendsShared.length,
+
+      'user_discovery_count_announced_users': udAllAnnouncedUsers.length,
+      'user_discovery_count_unknown_announced_users': udUnknownAnnouncedUsers,
+
+      'user_study_count_new_friends_via_suggestion':
+          userService.currentUser.userStudyCountNewFriendsViaSuggestion,
+
+      'accepted_contacts': contacts.where((c) => c.accepted).length,
+      'verified_contacts': verifications.length,
+      'verified_contacts_via_migrated_from_old_version': verifications.values
+          .where((c) => c == VerificationType.migratedFromOldVersion)
+          .length,
+      'verified_contacts_via_qr_scanned': verifications.values
+          .where((c) => c == VerificationType.qrScanned)
+          .length,
+      'verified_contacts_via_link': verifications.values
+          .where((c) => c == VerificationType.link)
+          .length,
+      'verified_contacts_via_secret_qr_token': verifications.values
+          .where((c) => c == VerificationType.secretQrToken)
+          .length,
+      'verified_contacts_via_contact_shared_by_verified': verifications.values
+          .where((c) => c == VerificationType.contactSharedByVerified)
+          .length,
+    };
+
+    final response = await http.post(
+      Uri.parse('$surveyUrlBase/push/$token'),
+      body: jsonEncode(dataCollection),
+      headers: {'Content-Type': 'application/json'},
+    );
+    if (response.statusCode == 200) {
+      await UserService.update((u) {
+        u.lastUserStudyDataUpload = DateTime.now();
+      });
+    }
+    if (response.statusCode == 404) {
+      // Token is unknown to the server...
+      await UserService.update((u) {
+        u
+          ..lastUserStudyDataUpload = null
+          ..userStudyParticipantsToken = null;
+      });
+    }
+  } catch (e) {
+    Log.error(e);
+  }
+}
diff --git a/lib/src/themes/colors.dart b/lib/src/themes/colors.dart
deleted file mode 100644
index e236bc54..00000000
--- a/lib/src/themes/colors.dart
+++ /dev/null
@@ -1,6 +0,0 @@
-import 'dart:ui';
-
-class DefaultColors {
-  static const messageSelf = Color.fromARGB(255, 58, 136, 102);
-  static const messageOther = Color.fromARGB(233, 68, 137, 255);
-}
diff --git a/lib/src/themes/light.dart b/lib/src/themes/light.dart
deleted file mode 100644
index 88bfc716..00000000
--- a/lib/src/themes/light.dart
+++ /dev/null
@@ -1,10 +0,0 @@
-import 'package:flutter/material.dart';
-
-final ThemeData lightTheme = ThemeData(
-  colorScheme: ColorScheme.fromSeed(
-    seedColor: const Color(0xFF57CC99),
-  ),
-  inputDecorationTheme: const InputDecorationTheme(
-    border: OutlineInputBorder(),
-  ),
-);
diff --git a/lib/src/utils/avatars.dart b/lib/src/utils/avatars.dart
index d1fcd694..4aaefa48 100644
--- a/lib/src/utils/avatars.dart
+++ b/lib/src/utils/avatars.dart
@@ -1,10 +1,16 @@
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io';
 import 'dart:ui' as ui;
+
 import 'package:flutter/services.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/locator.dart';
+
+String getAvatarSvg(Uint8List avatarSvgCompressed) {
+  return utf8.decode(gzip.decode(avatarSvgCompressed));
+}
 
 Future<void> createPushAvatars({int? forceForUserId}) async {
   final contacts = await twonlyDB.contactsDao.getAllContacts();
@@ -37,7 +43,7 @@ Future<void> createPushAvatars({int? forceForUserId}) async {
 
 File avatarPNGFile(int contactId) {
   final avatarsDirectory = Directory(
-    '$globalApplicationCacheDirectory/avatars',
+    '${AppEnvironment.cacheDir}/avatars',
   );
 
   if (!avatarsDirectory.existsSync()) {
@@ -47,13 +53,13 @@ File avatarPNGFile(int contactId) {
 }
 
 Future<Uint8List> getUserAvatar() async {
-  if (gUser.avatarSvg == null) {
+  if (userService.currentUser.avatarSvg == null) {
     final data = await rootBundle.load('assets/images/default_avatar.png');
     return data.buffer.asUint8List();
   }
 
   final pictureInfo = await vg.loadPicture(
-    SvgStringLoader(gUser.avatarSvg!),
+    SvgStringLoader(userService.currentUser.avatarSvg!),
     null,
   );
 
@@ -62,7 +68,8 @@ Future<Uint8List> getUserAvatar() async {
   final byteData = await image.toByteData(format: ui.ImageByteFormat.png);
   final pngBytes = byteData!.buffer.asUint8List();
 
-  final file = avatarPNGFile(gUser.userId)..writeAsBytesSync(pngBytes);
+  final file = avatarPNGFile(userService.currentUser.userId)
+    ..writeAsBytesSync(pngBytes);
   pictureInfo.picture.dispose();
 
   return file.readAsBytesSync();
diff --git a/lib/src/utils/exclusive_access.dart b/lib/src/utils/exclusive_access.utils.dart
similarity index 90%
rename from lib/src/utils/exclusive_access.dart
rename to lib/src/utils/exclusive_access.utils.dart
index d2a4253a..f39ce62e 100644
--- a/lib/src/utils/exclusive_access.dart
+++ b/lib/src/utils/exclusive_access.utils.dart
@@ -8,7 +8,7 @@ Future<T> exclusiveAccess<T>({
   required Future<T> Function() action,
   required Mutex mutex,
 }) async {
-  final lockFile = File('$globalApplicationSupportDirectory/$lockName.lock');
+  final lockFile = File('${AppEnvironment.cacheDir}/$lockName.lock');
   return mutex.protect(() async {
     var lockAcquired = false;
 
@@ -24,8 +24,8 @@ Future<T> exclusiveAccess<T>({
         try {
           final stat = lockFile.statSync();
           if (stat.type != FileSystemEntityType.notFound) {
-            final age = DateTime.now().difference(stat.modified).inMilliseconds;
-            if (age > 1000) {
+            final age = DateTime.now().difference(stat.modified).inSeconds;
+            if (age > 10) {
               lockFile.deleteSync();
               continue;
             }
diff --git a/lib/src/utils/keyvalue.dart b/lib/src/utils/keyvalue.dart
index 10e62f30..b8f5ce5d 100644
--- a/lib/src/utils/keyvalue.dart
+++ b/lib/src/utils/keyvalue.dart
@@ -1,14 +1,27 @@
 import 'dart:convert';
 import 'dart:io';
+
+import 'package:mutex/mutex.dart';
 import 'package:twonly/globals.dart';
+import 'package:twonly/src/utils/exclusive_access.utils.dart';
 import 'package:twonly/src/utils/log.dart';
 
 class KeyValueStore {
+  static final Mutex _mutex = Mutex();
+
   static Future<File> _getFilePath(String key) async {
-    return File('$globalApplicationSupportDirectory/keyvalue/$key.json');
+    return File('${AppEnvironment.supportDir}/keyvalue/$key.json');
   }
 
-  static Future<void> delete(String key) async {
+  static Future<T> _exclusive<T>(String key, Future<T> Function() action) {
+    return exclusiveAccess(
+      lockName: 'keyvalue-$key',
+      mutex: _mutex,
+      action: action,
+    );
+  }
+
+  static Future<void> delete(String key) => _exclusive(key, () async {
     try {
       final file = await _getFilePath(key);
       if (file.existsSync()) {
@@ -17,30 +30,33 @@ class KeyValueStore {
     } catch (e) {
       Log.error('Error deleting file: $e');
     }
-  }
+  });
 
-  static Future<Map<String, dynamic>?> get(String key) async {
-    try {
-      final file = await _getFilePath(key);
-      if (file.existsSync()) {
-        final contents = await file.readAsString();
-        return jsonDecode(contents) as Map<String, dynamic>;
-      } else {
-        return null;
-      }
-    } catch (e) {
-      Log.warn('Error reading file: $e');
-      return null;
-    }
-  }
+  static Future<Map<String, dynamic>?> get(String key) =>
+      _exclusive(key, () async {
+        final file = await _getFilePath(key);
+        try {
+          if (file.existsSync()) {
+            final contents = await file.readAsString();
+            return jsonDecode(contents) as Map<String, dynamic>;
+          } else {
+            return null;
+          }
+        } catch (e) {
+          Log.warn('Error reading file. Deleting it.: $e');
+          file.deleteSync();
+          return null;
+        }
+      });
 
-  static Future<void> put(String key, Map<String, dynamic> value) async {
-    try {
-      final file = await _getFilePath(key);
-      await file.parent.create(recursive: true);
-      await file.writeAsString(jsonEncode(value));
-    } catch (e) {
-      Log.error('Error writing file: $e');
-    }
-  }
+  static Future<void> put(String key, Map<String, dynamic> value) =>
+      _exclusive(key, () async {
+        try {
+          final file = await _getFilePath(key);
+          await file.parent.create(recursive: true);
+          await file.writeAsString(jsonEncode(value));
+        } catch (e) {
+          Log.error('Error writing file: $e');
+        }
+      });
 }
diff --git a/lib/src/utils/log.dart b/lib/src/utils/log.dart
index 29281db3..abf019bf 100644
--- a/lib/src/utils/log.dart
+++ b/lib/src/utils/log.dart
@@ -6,27 +6,27 @@ import 'package:logging/logging.dart';
 import 'package:mutex/mutex.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/utils/exclusive_access.dart';
-
-bool _isInitialized = false;
-
-void initLogger() {
-  if (_isInitialized) return;
-  _isInitialized = true;
-  Logger.root.level = Level.ALL;
-  Logger.root.onRecord.listen((record) async {
-    unawaited(_writeLogToFile(record));
-    if (!kReleaseMode) {
-      // ignore: avoid_print
-      print(
-        '${record.level.name} [twonly] ${record.loggerName} > ${record.message}',
-      );
-    }
-  });
-  cleanLogFile();
-}
+import 'package:twonly/src/utils/exclusive_access.utils.dart';
 
 class Log {
+  static bool _isInitialized = false;
+
+  static void init() {
+    if (_isInitialized) return;
+    _isInitialized = true;
+    Logger.root.level = Level.ALL;
+    Logger.root.onRecord.listen((record) async {
+      unawaited(_writeLogToFile(record));
+      if (!kReleaseMode) {
+        // ignore: avoid_print
+        print(
+          '${record.level.name} [${AppState.isInBackgroundTask ? 'b' : 'f'}] [twonly] ${record.loggerName} > ${record.message}',
+        );
+      }
+    });
+    cleanLogFile();
+  }
+
   static String filterLogMessage(String msg) {
     if (msg.contains('SqliteException')) {
       // Do not log data which would be inserted into the DB.
@@ -41,7 +41,7 @@ class Log {
     StackTrace? stackTrace,
   ]) {
     final message = filterLogMessage('$messageInput');
-    if (globalAllowErrorTrackingViaSentry) {
+    if (AppState.allowErrorTrackingViaSentry) {
       try {
         throw Exception(message);
       } catch (exception, stackTrace) {
@@ -72,7 +72,7 @@ class Log {
 
 Future<String> loadLogFile() async {
   return _protectFileAccess(() async {
-    final logFile = File('$globalApplicationSupportDirectory/app.log');
+    final logFile = File('${AppEnvironment.supportDir}/app.log');
 
     if (logFile.existsSync()) {
       return logFile.readAsString();
@@ -84,7 +84,7 @@ Future<String> loadLogFile() async {
 
 Future<String> readLast1000Lines() async {
   return _protectFileAccess(() async {
-    final file = File('$globalApplicationSupportDirectory/app.log');
+    final file = File('${AppEnvironment.supportDir}/app.log');
     if (!file.existsSync()) return '';
     final all = await file.readAsLines();
     final start = all.length > 1000 ? all.length - 1000 : 0;
@@ -103,7 +103,7 @@ Future<T> _protectFileAccess<T>(Future<T> Function() action) async {
 }
 
 Future<void> _writeLogToFile(LogRecord record) async {
-  final logFile = File('$globalApplicationSupportDirectory/app.log');
+  final logFile = File('${AppEnvironment.supportDir}/app.log');
 
   final logMessage =
       '${clock.now().toString().split(".")[0]} ${record.level.name} [twonly] ${record.loggerName} > ${record.message}\n';
@@ -127,7 +127,7 @@ Future<void> _writeLogToFile(LogRecord record) async {
 
 Future<void> cleanLogFile() async {
   return _protectFileAccess(() async {
-    final logFile = File('$globalApplicationSupportDirectory/app.log');
+    final logFile = File('${AppEnvironment.supportDir}/app.log');
 
     if (!logFile.existsSync()) {
       return;
@@ -162,7 +162,7 @@ Future<void> cleanLogFile() async {
 
 Future<bool> deleteLogFile() async {
   return _protectFileAccess(() async {
-    final logFile = File('$globalApplicationSupportDirectory/app.log');
+    final logFile = File('${AppEnvironment.supportDir}/app.log');
 
     if (logFile.existsSync()) {
       await logFile.delete();
diff --git a/lib/src/utils/misc.dart b/lib/src/utils/misc.dart
index fb35ec52..33874fc9 100644
--- a/lib/src/utils/misc.dart
+++ b/lib/src/utils/misc.dart
@@ -1,4 +1,3 @@
-import 'dart:convert';
 import 'dart:io';
 import 'dart:math';
 import 'package:clock/clock.dart';
@@ -11,9 +10,6 @@ import 'package:gal/gal.dart';
 import 'package:intl/intl.dart';
 import 'package:local_auth/local_auth.dart';
 import 'package:provider/provider.dart';
-import 'package:twonly/src/database/tables/mediafiles.table.dart';
-import 'package:twonly/src/database/tables/messages.table.dart';
-import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/localization/generated/app_localizations.dart';
 import 'package:twonly/src/model/protobuf/api/websocket/error.pb.dart';
 import 'package:twonly/src/providers/settings.provider.dart';
@@ -22,7 +18,6 @@ import 'package:twonly/src/utils/misc.dart';
 
 extension ShortCutsExtension on BuildContext {
   AppLocalizations get lang => AppLocalizations.of(this)!;
-  TwonlyDB get db => Provider.of<TwonlyDB>(this);
   ColorScheme get color => Theme.of(this).colorScheme;
   Future<dynamic> navPush(Widget route) async {
     return Navigator.push(
@@ -131,30 +126,6 @@ String formatDuration(BuildContext context, int seconds) {
   }
 }
 
-InputDecoration getInputDecoration(BuildContext context, String hintText) {
-  final primaryColor = Theme.of(context).colorScheme.primary;
-  return InputDecoration(
-    hintText: hintText,
-    focusedBorder: OutlineInputBorder(
-      borderRadius: BorderRadius.circular(9),
-      borderSide: BorderSide(color: primaryColor),
-    ),
-    enabledBorder: OutlineInputBorder(
-      borderRadius: BorderRadius.circular(8),
-      borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
-    ),
-    contentPadding: const EdgeInsets.symmetric(vertical: 15, horizontal: 20),
-  );
-}
-
-Future<Uint8List?> getCompressedImage(Uint8List imageBytes) async {
-  final result = await FlutterImageCompress.compressWithList(
-    imageBytes,
-    quality: 90,
-  );
-  return result;
-}
-
 Future<bool> authenticateUser(
   String localizedReason, {
   bool force = true,
@@ -180,27 +151,6 @@ Future<bool> authenticateUser(
   return false;
 }
 
-Uint8List intToBytes(int value) {
-  final byteData = ByteData(4)..setInt32(0, value);
-  return byteData.buffer.asUint8List();
-}
-
-int bytesToInt(Uint8List bytes) {
-  final byteData = ByteData.sublistView(bytes);
-  return byteData.getInt32(0);
-}
-
-List<Uint8List>? removeLastXBytes(Uint8List original, int count) {
-  if (original.length < count) {
-    return null;
-  }
-  final newList = Uint8List(original.length - count)
-    ..setAll(0, original.sublist(0, original.length - count));
-
-  final lastXBytes = original.sublist(original.length - count);
-  return [newList, lastXBytes];
-}
-
 bool isDarkMode(BuildContext context) {
   final selectedTheme = context.read<SettingsChangeProvider>().themeMode;
 
@@ -218,31 +168,6 @@ bool isToday(DateTime lastImageSend) {
       lastImageSend.day == now.day;
 }
 
-InputDecoration inputTextMessageDeco(BuildContext context) {
-  return InputDecoration(
-    hintText: context.lang.chatListDetailInput,
-    contentPadding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
-    border: OutlineInputBorder(
-      borderRadius: BorderRadius.circular(20),
-      borderSide: BorderSide(
-        color: Theme.of(context).colorScheme.primary,
-        width: 2,
-      ),
-    ),
-    focusedBorder: OutlineInputBorder(
-      borderRadius: BorderRadius.circular(20),
-      borderSide: BorderSide(
-        color: Theme.of(context).colorScheme.primary,
-        width: 2,
-      ),
-    ),
-    enabledBorder: OutlineInputBorder(
-      borderRadius: BorderRadius.circular(20),
-      borderSide: const BorderSide(color: Colors.grey, width: 2),
-    ),
-  );
-}
-
 String truncateString(String input, {int maxLength = 20}) {
   if (input.length > maxLength) {
     return '${input.characters.take(maxLength)}...';
@@ -301,35 +226,6 @@ Uint8List hexToUint8List(String hex) => Uint8List.fromList(
   ),
 );
 
-Color getMessageColorFromType(
-  Message message,
-  MediaFile? mediaFile,
-  BuildContext context,
-) {
-  Color color;
-
-  if (message.type == MessageType.restoreFlameCounter.name) {
-    color = Colors.orange;
-  } else if (message.type == MessageType.text.name) {
-    color = Colors.blueAccent;
-  } else if (mediaFile != null) {
-    if (mediaFile.requiresAuthentication) {
-      color = context.color.primary;
-    } else {
-      if (mediaFile.type == MediaType.video) {
-        color = const Color.fromARGB(255, 243, 33, 208);
-      } else if (mediaFile.type == MediaType.audio) {
-        color = const Color.fromARGB(255, 252, 149, 85);
-      } else {
-        color = Colors.redAccent;
-      }
-    }
-  } else {
-    return (isDarkMode(context)) ? Colors.white : Colors.black;
-  }
-  return color;
-}
-
 String getUUIDforDirectChat(int a, int b) {
   if (a < 0 || b < 0) {
     throw ArgumentError('Inputs must be non-negative integers.');
@@ -385,17 +281,6 @@ String friendlyDateTime(
   return '$timePart $datePart';
 }
 
-String getAvatarSvg(Uint8List avatarSvgCompressed) {
-  final raw = gzip.decode(avatarSvgCompressed);
-  return utf8.decode(raw);
-}
-
-void printWrapped(String text) {
-  final pattern = RegExp('.{1,800}'); // 800 is the size of each chunk
-  // ignore: avoid_print
-  pattern.allMatches(text).forEach((match) => print(match.group(0)));
-}
-
 Future<List<int>> sha256File(File file) async {
   final input = file.openRead();
   final sha256Sink = AccumulatorSink<Digest>();
@@ -404,3 +289,56 @@ Future<List<int>> sha256File(File file) async {
   converter.close();
   return sha256Sink.events.single.bytes;
 }
+
+List<TextSpan> formattedText(
+  BuildContext context,
+  String input, {
+  Color? boldTextColor,
+}) {
+  final defaultColor = Theme.of(context).colorScheme.onSurface;
+
+  final regex = RegExp(r'\*(.*?)\*');
+  final spans = <TextSpan>[];
+
+  var lastMatchEnd = 0;
+
+  for (final match in regex.allMatches(input)) {
+    if (match.start > lastMatchEnd) {
+      spans.add(
+        TextSpan(
+          text: input.substring(lastMatchEnd, match.start),
+          style: TextStyle(color: defaultColor),
+        ),
+      );
+    }
+
+    spans.add(
+      TextSpan(
+        text: match.group(1),
+        style: TextStyle(
+          fontWeight: FontWeight.bold,
+          color: boldTextColor ?? defaultColor,
+        ),
+      ),
+    );
+
+    lastMatchEnd = match.end;
+  }
+
+  if (lastMatchEnd < input.length) {
+    spans.add(
+      TextSpan(
+        text: input.substring(lastMatchEnd),
+        style: TextStyle(color: defaultColor),
+      ),
+    );
+  }
+
+  return spans;
+}
+
+String joinWithAnd(List<String> items, String andWord) {
+  if (items.isEmpty) return '';
+  if (items.length == 1) return items.first;
+  return '${items.sublist(0, items.length - 1).join(', ')} $andWord ${items.last}';
+}
diff --git a/lib/src/utils/qr.dart b/lib/src/utils/qr.dart
deleted file mode 100644
index 87b98ef2..00000000
--- a/lib/src/utils/qr.dart
+++ /dev/null
@@ -1,85 +0,0 @@
-import 'package:drift/drift.dart' show Value;
-import 'package:fixnum/fixnum.dart';
-import 'package:flutter/foundation.dart';
-import 'package:twonly/globals.dart';
-import 'package:twonly/src/database/twonly.db.dart';
-import 'package:twonly/src/model/protobuf/api/websocket/server_to_client.pb.dart';
-import 'package:twonly/src/model/protobuf/client/generated/qr.pb.dart';
-import 'package:twonly/src/services/api/utils.dart';
-import 'package:twonly/src/services/signal/identity.signal.dart';
-import 'package:twonly/src/services/signal/utils.signal.dart';
-
-Future<Uint8List> getProfileQrCodeData() async {
-  final signalIdentity = (await getSignalIdentity())!;
-
-  final signalStore = await getSignalStoreFromIdentity(signalIdentity);
-
-  final signedPreKey = (await signalStore.loadSignedPreKeys())[0];
-
-  final publicProfile = PublicProfile(
-    userId: Int64(gUser.userId),
-    username: gUser.username,
-    publicIdentityKey: (await signalStore.getIdentityKeyPair())
-        .getPublicKey()
-        .serialize(),
-    registrationId: Int64(signalIdentity.registrationId),
-    signedPrekey: signedPreKey.getKeyPair().publicKey.serialize(),
-    signedPrekeySignature: signedPreKey.signature,
-    signedPrekeyId: Int64(signedPreKey.id),
-  );
-
-  final data = publicProfile.writeToBuffer();
-
-  final qrEnvelope = QREnvelope(
-    type: QREnvelope_Type.PublicProfile,
-    data: data,
-  );
-
-  return qrEnvelope.writeToBuffer();
-}
-
-Future<Uint8List> getUserPublicKey() async {
-  final signalIdentity = (await getSignalIdentity())!;
-  final signalStore = await getSignalStoreFromIdentity(signalIdentity);
-  return (await signalStore.getIdentityKeyPair()).getPublicKey().serialize();
-}
-
-PublicProfile? parseQrCodeData(Uint8List rawBytes) {
-  try {
-    final envelop = QREnvelope.fromBuffer(rawBytes);
-    if (envelop.type == QREnvelope_Type.PublicProfile) {
-      return PublicProfile.fromBuffer(envelop.data);
-    }
-  } catch (e) {
-    // Log.warn(e);
-  }
-  return null;
-}
-
-Future<bool> addNewContactFromPublicProfile(PublicProfile profile) async {
-  final userdata = Response_UserData(
-    userId: profile.userId,
-    publicIdentityKey: profile.publicIdentityKey,
-    signedPrekey: profile.signedPrekey,
-    signedPrekeyId: profile.signedPrekeyId,
-    signedPrekeySignature: profile.signedPrekeySignature,
-  );
-
-  final added = await twonlyDB.contactsDao.insertOnConflictUpdate(
-    ContactsCompanion(
-      username: Value(profile.username),
-      userId: Value(profile.userId.toInt()),
-      requested: const Value(false),
-      blocked: const Value(false),
-      deletedByUser: const Value(false),
-      verified: const Value(
-        true,
-      ), // This contact was added from a QR-Code scan, so the public key was not loaded from the server
-    ),
-  );
-
-  if (added > 0) {
-    return importSignalContactAndCreateRequest(userdata);
-  }
-  return false;
-}
diff --git a/lib/src/utils/qr.utils.dart b/lib/src/utils/qr.utils.dart
new file mode 100644
index 00000000..c4f6f389
--- /dev/null
+++ b/lib/src/utils/qr.utils.dart
@@ -0,0 +1,156 @@
+import 'dart:async';
+import 'dart:convert';
+
+import 'package:collection/collection.dart' show ListExtensions;
+import 'package:drift/drift.dart' show Value;
+import 'package:fixnum/fixnum.dart';
+import 'package:flutter/foundation.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/database/tables/contacts.table.dart';
+import 'package:twonly/src/database/twonly.db.dart';
+import 'package:twonly/src/model/protobuf/api/websocket/server_to_client.pb.dart';
+import 'package:twonly/src/model/protobuf/client/generated/qr.pb.dart';
+import 'package:twonly/src/services/api/utils.api.dart';
+import 'package:twonly/src/services/key_verification.service.dart';
+import 'package:twonly/src/services/signal/identity.signal.dart';
+import 'package:twonly/src/services/signal/session.signal.dart';
+import 'package:twonly/src/services/signal/utils.signal.dart';
+import 'package:twonly/src/utils/log.dart';
+
+class QrCodeUtils {
+  static String linkPrefix = 'https://me.twonly.eu/qr/#';
+
+  static Future<String> publicProfileLink() async {
+    final signalIdentity = (await getSignalIdentity())!;
+
+    final signalStore = await getSignalStoreFromIdentity(signalIdentity);
+
+    final signedPreKey = (await signalStore.loadSignedPreKeys())[0];
+
+    final secretVerificationToken =
+        await KeyVerificationService.getNewSecretVerificationToken();
+
+    final publicProfile = PublicProfile(
+      userId: Int64(userService.currentUser.userId),
+      username: userService.currentUser.username,
+      publicIdentityKey: (await signalStore.getIdentityKeyPair())
+          .getPublicKey()
+          .serialize(),
+      registrationId: Int64(signalIdentity.registrationId),
+      signedPrekey: signedPreKey.getKeyPair().publicKey.serialize(),
+      signedPrekeySignature: signedPreKey.signature,
+      signedPrekeyId: Int64(signedPreKey.id),
+      secretVerificationToken: secretVerificationToken,
+    );
+
+    final data = publicProfile.writeToBuffer();
+
+    final qrEnvelope = QREnvelope(
+      type: QREnvelope_Type.PUBLIC_PROFILE,
+      data: data,
+    );
+
+    final bytes = qrEnvelope.writeToBuffer();
+    final urlSafeBase64 = base64Url.encode(bytes);
+
+    final link = '$linkPrefix$urlSafeBase64';
+    if (kDebugMode) Log.info(link);
+    return link;
+  }
+
+  // returns: profile, NEW_USER=true/VERIFIED_USER=false, VERIFICATION_OK
+  static Future<(PublicProfile, Contact?, bool)?> handleQrCodeLink(
+    String link,
+  ) async {
+    late PublicProfile profile;
+
+    try {
+      final bytes = base64Url.decode(link.replaceFirst(linkPrefix, ''));
+      final envelope = QREnvelope.fromBuffer(bytes);
+      if (envelope.type != QREnvelope_Type.PUBLIC_PROFILE) return null;
+      profile = PublicProfile.fromBuffer(envelope.data);
+    } catch (e) {
+      Log.error(e);
+      return null;
+    }
+
+    final contact = await twonlyDB.contactsDao.getContactById(
+      profile.userId.toInt(),
+    );
+
+    if (contact == null) {
+      if (profile.username == userService.currentUser.username) {
+        return null;
+      }
+      // NEW_USER
+      return (profile, null, false);
+    }
+
+    final storedPublicKey = await getPublicKeyFromContact(contact.userId);
+    if (storedPublicKey == null) return null;
+
+    final verificationOk = profile.publicIdentityKey.equals(
+      storedPublicKey.toList(),
+    );
+
+    if (verificationOk) {
+      if (profile.hasSecretVerificationToken()) {
+        unawaited(
+          KeyVerificationService.handleScannedVerificationToken(
+            contact.userId,
+            storedPublicKey,
+            profile.secretVerificationToken,
+          ),
+        );
+      }
+      await twonlyDB.keyVerificationDao.addKeyVerification(
+        contact.userId,
+        VerificationType.qrScanned,
+      );
+    }
+
+    return (profile, contact, verificationOk);
+  }
+}
+
+Future<bool> addNewContactFromPublicProfile(PublicProfile profile) async {
+  final userdata = Response_UserData(
+    userId: profile.userId,
+    publicIdentityKey: profile.publicIdentityKey,
+    signedPrekey: profile.signedPrekey,
+    signedPrekeyId: profile.signedPrekeyId,
+    signedPrekeySignature: profile.signedPrekeySignature,
+  );
+
+  final added = await twonlyDB.contactsDao.insertOnConflictUpdate(
+    ContactsCompanion(
+      username: Value(profile.username),
+      userId: Value(profile.userId.toInt()),
+      requested: const Value(false),
+      blocked: const Value(false),
+      deletedByUser: const Value(false),
+    ),
+  );
+
+  // The user was added via the profile scanned from the QR code so the scanned public key was used.
+  await twonlyDB.keyVerificationDao.addKeyVerification(
+    profile.userId.toInt(),
+    VerificationType.qrScanned,
+  );
+
+  if (added > 0) {
+    if (await importSignalContactAndCreateRequest(userdata)) {
+      if (profile.hasSecretVerificationToken()) {
+        await KeyVerificationService.handleScannedVerificationToken(
+          profile.userId.toInt(),
+          Uint8List.fromList(profile.publicIdentityKey),
+          profile.secretVerificationToken,
+        );
+      }
+      return true;
+    }
+    return false;
+  }
+
+  return false;
+}
diff --git a/lib/src/utils/secure_storage.dart b/lib/src/utils/secure_storage.dart
new file mode 100644
index 00000000..b2d62241
--- /dev/null
+++ b/lib/src/utils/secure_storage.dart
@@ -0,0 +1,5 @@
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+
+class SecureStorage {
+  static const FlutterSecureStorage instance = FlutterSecureStorage();
+}
diff --git a/lib/src/utils/storage.dart b/lib/src/utils/storage.dart
index 6d89be2c..b6e4e283 100644
--- a/lib/src/utils/storage.dart
+++ b/lib/src/utils/storage.dart
@@ -1,92 +1,11 @@
-import 'dart:convert';
-import 'package:flutter/material.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:mutex/mutex.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:provider/provider.dart';
-import 'package:twonly/globals.dart';
-import 'package:twonly/src/constants/secure_storage_keys.dart';
-import 'package:twonly/src/model/json/userdata.dart';
-import 'package:twonly/src/providers/purchases.provider.dart';
-import 'package:twonly/src/services/subscription.service.dart';
-import 'package:twonly/src/utils/log.dart';
-
-Future<bool> isUserCreated() async {
-  final user = await getUser();
-  if (user == null) {
-    return false;
-  }
-  gUser = user;
-  return true;
-}
-
-Future<UserData?> getUser() async {
-  try {
-    final userJson = await const FlutterSecureStorage().read(
-      key: SecureStorageKeys.userData,
-    );
-    if (userJson == null) {
-      return null;
-    }
-    final userMap = jsonDecode(userJson) as Map<String, dynamic>;
-    final user = UserData.fromJson(userMap);
-    return user;
-  } catch (e) {
-    Log.error('Error getting user: $e');
-    return null;
-  }
-}
-
-Future<void> updateUsersPlan(
-  BuildContext context,
-  SubscriptionPlan plan,
-) async {
-  context.read<PurchasesProvider>().plan = plan;
-
-  await updateUserdata((user) {
-    user.subscriptionPlan = plan.name;
-    return user;
-  });
-
-  if (!context.mounted) return;
-  context.read<PurchasesProvider>().updatePlan(plan);
-}
-
-Mutex updateProtection = Mutex();
-
-Future<UserData?> updateUserdata(
-  UserData Function(UserData userData) updateUser,
-) async {
-  final userData = await updateProtection.protect<UserData?>(() async {
-    final user = await getUser();
-    if (user == null) return null;
-    if (user.defaultShowTime == 999999) {
-      // This was the old version for infinity -> change it to null
-      user.defaultShowTime = null;
-    }
-    final updated = updateUser(user);
-    await const FlutterSecureStorage().write(
-      key: SecureStorageKeys.userData,
-      value: jsonEncode(updated),
-    );
-    gUser = updated;
-    return updated;
-  });
-  try {
-    for (final callBack in globalUserDataChangedCallBack.values) {
-      callBack();
-    }
-  } catch (e) {
-    Log.error(e);
-  }
-  return userData;
-}
+import 'package:twonly/src/utils/secure_storage.dart';
 
 Future<bool> deleteLocalUserData() async {
   final appDir = await getApplicationSupportDirectory();
   if (appDir.existsSync()) {
     appDir.deleteSync(recursive: true);
   }
-  await const FlutterSecureStorage().deleteAll();
+  await SecureStorage.instance.deleteAll();
   return true;
 }
diff --git a/lib/src/views/camera/camera_preview_components/camera_preview_controller_view.dart b/lib/src/views/camera/camera_preview_components/camera_preview_controller_view.dart
deleted file mode 100644
index bc9d0fb7..00000000
--- a/lib/src/views/camera/camera_preview_components/camera_preview_controller_view.dart
+++ /dev/null
@@ -1,1029 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-
-import 'package:camera/camera.dart';
-import 'package:clock/clock.dart';
-import 'package:device_info_plus/device_info_plus.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_android_volume_keydown/flutter_android_volume_keydown.dart';
-import 'package:flutter_volume_controller/flutter_volume_controller.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:image_picker/image_picker.dart';
-import 'package:lottie/lottie.dart';
-import 'package:permission_handler/permission_handler.dart';
-import 'package:twonly/globals.dart';
-import 'package:twonly/src/database/daos/contacts.dao.dart';
-import 'package:twonly/src/database/tables/mediafiles.table.dart';
-import 'package:twonly/src/database/twonly.db.dart';
-import 'package:twonly/src/services/api/mediafiles/upload.service.dart';
-import 'package:twonly/src/utils/log.dart';
-import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/qr.dart';
-import 'package:twonly/src/utils/screenshot.dart';
-import 'package:twonly/src/utils/storage.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/face_filters.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/main_camera_controller.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/permissions_view.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/send_to.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/video_recording_time.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/zoom_selector.dart';
-import 'package:twonly/src/views/camera/share_image_editor.view.dart';
-import 'package:twonly/src/views/camera/share_image_editor/action_button.dart';
-import 'package:twonly/src/views/components/avatar_icon.component.dart';
-import 'package:twonly/src/views/components/loader/three_rotating_dots.loader.dart';
-import 'package:twonly/src/views/components/media_view_sizing.dart';
-import 'package:twonly/src/views/home.view.dart';
-import 'package:url_launcher/url_launcher_string.dart';
-
-int maxVideoRecordingTime = 60;
-
-class SelectedCameraDetails {
-  double maxAvailableZoom = 1;
-  double minAvailableZoom = 1;
-  int cameraId = 0;
-  bool isZoomAble = false;
-  bool isFlashOn = false;
-  double scaleFactor = 1;
-  bool cameraLoaded = false;
-}
-
-class CameraPreviewControllerView extends StatelessWidget {
-  const CameraPreviewControllerView({
-    required this.mainController,
-    required this.isVisible,
-    this.hideControllers = false,
-    super.key,
-    this.sendToGroup,
-  });
-
-  final MainCameraController mainController;
-  final Group? sendToGroup;
-  final bool isVisible;
-  final bool hideControllers;
-
-  @override
-  Widget build(BuildContext context) {
-    return FutureBuilder(
-      future: checkPermissions(),
-      builder: (context, snap) {
-        if (snap.hasData) {
-          if (snap.data!) {
-            return CameraPreviewView(
-              sendToGroup: sendToGroup,
-              mainCameraController: mainController,
-              isVisible: isVisible,
-              hideControllers: hideControllers,
-            );
-          } else {
-            return PermissionHandlerView(
-              onSuccess: () {
-                mainController.selectCamera(0, true);
-              },
-            );
-          }
-        } else {
-          return Container();
-        }
-      },
-    );
-  }
-}
-
-class CameraPreviewView extends StatefulWidget {
-  const CameraPreviewView({
-    required this.mainCameraController,
-    required this.isVisible,
-    required this.hideControllers,
-    super.key,
-    this.sendToGroup,
-  });
-
-  final MainCameraController mainCameraController;
-  final Group? sendToGroup;
-  final bool isVisible;
-  final bool hideControllers;
-
-  @override
-  State<CameraPreviewView> createState() => _CameraPreviewViewState();
-}
-
-class _CameraPreviewViewState extends State<CameraPreviewView> {
-  bool _galleryLoadedImageIsShown = false;
-  bool _showSelfieFlash = false;
-  double _basePanY = 0;
-  double _baseScaleFactor = 0;
-  bool _hasAudioPermission = true;
-  DateTime? _videoRecordingStarted;
-  Timer? _videoRecordingTimer;
-
-  DateTime _currentTime = clock.now();
-  final GlobalKey keyTriggerButton = GlobalKey();
-  final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
-
-  MainCameraController get mc => widget.mainCameraController;
-
-  StreamSubscription<HardwareButton>? androidVolumeDownSub;
-
-  @override
-  void initState() {
-    super.initState();
-    initVolumeControl();
-    initAsync();
-  }
-
-  @override
-  void didUpdateWidget(covariant CameraPreviewView oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    if (oldWidget.isVisible != widget.isVisible) {
-      if (widget.isVisible) {
-        initVolumeControl();
-      } else {
-        deInitVolumeControl();
-      }
-    }
-  }
-
-  @override
-  void dispose() {
-    _videoRecordingTimer?.cancel();
-    deInitVolumeControl();
-    super.dispose();
-  }
-
-  Future<void> initVolumeControl() async {
-    if (Platform.isIOS) {
-      await FlutterVolumeController.updateShowSystemUI(false);
-      double? startedVolume;
-
-      FlutterVolumeController.addListener(
-        (volume) async {
-          if (!widget.isVisible) {
-            await deInitVolumeControl();
-            return;
-          }
-          if (startedVolume == null) {
-            startedVolume = volume;
-            return;
-          }
-          if (startedVolume == volume) {
-            return;
-          }
-          // reset the volume back to the original value
-          await FlutterVolumeController.setVolume(startedVolume!);
-          await takePicture();
-        },
-      );
-    }
-    if (Platform.isAndroid) {
-      if ((await DeviceInfoPlugin().androidInfo).version.release == '9') {
-        // MissingPluginException: MissingPluginException(No implementation found for method cancel on channel dart-tools.dev/flutter_…
-        // Maybe this is the reason?
-        return;
-      } else {
-        androidVolumeDownSub = FlutterAndroidVolumeKeydown.stream.listen((
-          event,
-        ) {
-          if (widget.isVisible) {
-            takePicture();
-          } else {
-            deInitVolumeControl();
-            return;
-          }
-        });
-      }
-    }
-  }
-
-  Future<void> deInitVolumeControl() async {
-    if (Platform.isIOS) {
-      await FlutterVolumeController.updateShowSystemUI(true);
-      FlutterVolumeController.removeListener();
-    }
-    if (Platform.isAndroid) {
-      await androidVolumeDownSub?.cancel();
-    }
-  }
-
-  Future<void> initAsync() async {
-    _hasAudioPermission = await Permission.microphone.isGranted;
-
-    if (!_hasAudioPermission && !gUser.requestedAudioPermission) {
-      await updateUserdata((u) {
-        u.requestedAudioPermission = true;
-        return u;
-      });
-      await requestMicrophonePermission();
-    }
-    if (!mounted) return;
-    setState(() {});
-  }
-
-  Future<void> requestMicrophonePermission() async {
-    final statuses = await [
-      Permission.microphone,
-    ].request();
-    if (statuses[Permission.microphone]!.isPermanentlyDenied) {
-      await openAppSettings();
-    } else {
-      _hasAudioPermission = await Permission.microphone.isGranted;
-      setState(() {});
-    }
-  }
-
-  Future<void> updateScaleFactor(double newScale) async {
-    if (mc.selectedCameraDetails.scaleFactor == newScale ||
-        mc.cameraController == null) {
-      return;
-    }
-    await mc.cameraController?.setZoomLevel(
-      newScale.clamp(
-        mc.selectedCameraDetails.minAvailableZoom,
-        mc.selectedCameraDetails.maxAvailableZoom,
-      ),
-    );
-    setState(() {
-      mc.selectedCameraDetails.scaleFactor = newScale;
-    });
-  }
-
-  Future<Uint8List?> loadAndDeletePictureFromFile(XFile picture) async {
-    try {
-      // Load the image into bytes
-      final imageBytes = await picture.readAsBytes();
-      // Remove the image file
-      await File(picture.path).delete();
-      return imageBytes;
-    } catch (e) {
-      if (context.mounted) {
-        // ignore: use_build_context_synchronously
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text('Error loading picture: $e'),
-            duration: const Duration(seconds: 3),
-          ),
-        );
-      }
-      return null;
-    }
-  }
-
-  Future<void> takePicture() async {
-    if (mc.isSharePreviewIsShown || mc.isVideoRecording) return;
-
-    setState(() {
-      mc.isSharePreviewIsShown = true;
-    });
-    if (mc.selectedCameraDetails.isFlashOn) {
-      if (isFront) {
-        setState(() {
-          _showSelfieFlash = true;
-        });
-      } else {
-        await mc.cameraController?.setFlashMode(FlashMode.torch);
-      }
-      await Future.delayed(const Duration(milliseconds: 1000));
-    }
-
-    await mc.cameraController?.pausePreview();
-    if (!mounted) {
-      return;
-    }
-
-    if (mc.cameraController?.value.flashMode != FlashMode.off) {
-      await mc.cameraController?.setFlashMode(FlashMode.off);
-    }
-
-    if (!mounted) {
-      return;
-    }
-
-    final image = await mc.screenshotController.capture(
-      pixelRatio: MediaQuery.of(context).devicePixelRatio,
-    );
-
-    if (await pushMediaEditor(image, null)) {
-      return;
-    }
-    setState(() {
-      mc.isSharePreviewIsShown = false;
-    });
-  }
-
-  Future<bool> pushMediaEditor(
-    ScreenshotImage? screenshotImage,
-    File? videoFilePath, {
-    bool sharedFromGallery = false,
-    MediaType? mediaType,
-  }) async {
-    final type =
-        mediaType ??
-        ((videoFilePath != null) ? MediaType.video : MediaType.image);
-    final mediaFileService = await initializeMediaUpload(
-      type,
-      gUser.defaultShowTime,
-      isDraftMedia: true,
-    );
-    if (!mounted) return true;
-
-    if (mediaFileService == null) {
-      Log.error('Could not generate media file service');
-      return false;
-    }
-
-    if (videoFilePath != null) {
-      videoFilePath
-        ..copySync(mediaFileService.originalPath.path)
-        ..deleteSync();
-
-      // Start with compressing the video, to speed up the process in case the video is not changed.
-      // unawaited(mediaFileService.compressMedia());
-    }
-
-    await deInitVolumeControl();
-    if (!mounted) return true;
-
-    final shouldReturn =
-        await Navigator.push(
-              context,
-              PageRouteBuilder(
-                opaque: false,
-                pageBuilder: (context, a1, a2) => ShareImageEditorView(
-                  screenshotImage: screenshotImage,
-                  sharedFromGallery: sharedFromGallery,
-                  sendToGroup: widget.sendToGroup,
-                  mediaFileService: mediaFileService,
-                  mainCameraController: mc,
-                  previewLink: mc.sharedLinkForPreview,
-                ),
-                transitionsBuilder:
-                    (context, animation, secondaryAnimation, child) {
-                      return child;
-                    },
-                transitionDuration: Duration.zero,
-                reverseTransitionDuration: Duration.zero,
-              ),
-            )
-            as bool?;
-    if (mounted) {
-      setState(() {
-        mc.isSharePreviewIsShown = false;
-        _showSelfieFlash = false;
-      });
-    }
-    if (!mounted) return true;
-    await initVolumeControl();
-    // shouldReturn is null when the user used the back button
-    if (shouldReturn != null && shouldReturn) {
-      if (widget.sendToGroup == null) {
-        globalUpdateOfHomeViewPageIndex(0);
-      } else if (mounted) {
-        Navigator.pop(context);
-      }
-      return true;
-    }
-    await mc.selectCamera(
-      mc.selectedCameraDetails.cameraId,
-      false,
-    );
-    return false;
-  }
-
-  bool get isFront =>
-      mc.cameraController?.description.lensDirection ==
-      CameraLensDirection.front;
-
-  Future<void> onPanUpdate(dynamic details) async {
-    if (details == null) {
-      return;
-    }
-    if (mc.cameraController == null ||
-        !mc.cameraController!.value.isInitialized) {
-      return;
-    }
-
-    mc.selectedCameraDetails.scaleFactor =
-        (_baseScaleFactor +
-                // ignore: avoid_dynamic_calls
-                (_basePanY - (details.localPosition.dy as double)) / 30)
-            .clamp(1, mc.selectedCameraDetails.maxAvailableZoom);
-
-    await mc.cameraController!.setZoomLevel(
-      mc.selectedCameraDetails.scaleFactor,
-    );
-    if (mounted) {
-      setState(() {});
-    }
-  }
-
-  Future<void> pickImageFromGallery() async {
-    setState(() {
-      _galleryLoadedImageIsShown = true;
-      mc.isSharePreviewIsShown = true;
-    });
-    final picker = ImagePicker();
-    final pickedFile = await picker.pickMedia();
-
-    if (pickedFile != null) {
-      final imageExtensions = [
-        '.png',
-        '.jpg',
-        '.jpeg',
-        '.gif',
-        '.webp',
-        '.heic',
-        '.heif',
-        '.avif',
-      ];
-
-      Log.info('Picket from gallery: ${pickedFile.path}');
-
-      File? videoFilePath;
-      ScreenshotImage? image;
-      MediaType? mediaType;
-
-      final isImage = imageExtensions.any(
-        (ext) => pickedFile.name.contains(ext),
-      );
-      if (isImage) {
-        if (pickedFile.name.contains('.gif')) {
-          mediaType = MediaType.gif;
-        }
-        image = ScreenshotImage(imageBytesFuture: pickedFile.readAsBytes());
-      } else {
-        videoFilePath = File(pickedFile.path);
-      }
-
-      await pushMediaEditor(
-        image,
-        videoFilePath,
-        sharedFromGallery: true,
-        mediaType: mediaType,
-      );
-    }
-    setState(() {
-      _galleryLoadedImageIsShown = false;
-      mc.isSharePreviewIsShown = false;
-    });
-  }
-
-  Future<void> pressSideButtonLeft() async {
-    if (!mc.isSelectingFaceFilters) {
-      return pickImageFromGallery();
-    }
-    if (mc.currentFilterType.index == 1) {
-      mc.setFilter(FaceFilterType.none);
-      setState(() {
-        mc.isSelectingFaceFilters = false;
-      });
-      return;
-    }
-    mc.setFilter(mc.currentFilterType.goLeft());
-  }
-
-  Future<void> pressSideButtonRight() async {
-    if (!mc.isSelectingFaceFilters) {
-      setState(() {
-        mc.isSelectingFaceFilters = true;
-      });
-    }
-    if (mc.currentFilterType.index == FaceFilterType.values.length - 1) {
-      mc.setFilter(FaceFilterType.none);
-      setState(() {
-        mc.isSelectingFaceFilters = false;
-      });
-      return;
-    }
-    mc.setFilter(mc.currentFilterType.goRight());
-  }
-
-  Future<void> startVideoRecording() async {
-    if (mc.cameraController != null &&
-        mc.cameraController!.value.isRecordingVideo) {
-      return;
-    }
-    setState(() {
-      mc.isVideoRecording = true;
-    });
-
-    if (mc.selectedCameraDetails.isFlashOn) {
-      await mc.cameraController?.setFlashMode(FlashMode.torch);
-    }
-
-    try {
-      await mc.cameraController?.startVideoRecording();
-      _videoRecordingTimer = Timer.periodic(const Duration(milliseconds: 15), (
-        timer,
-      ) {
-        setState(() {
-          _currentTime = clock.now();
-        });
-        if (_videoRecordingStarted != null &&
-            _currentTime.difference(_videoRecordingStarted!).inSeconds >=
-                maxVideoRecordingTime) {
-          timer.cancel();
-          _videoRecordingTimer = null;
-          stopVideoRecording();
-        }
-      });
-      setState(() {
-        _videoRecordingStarted = clock.now();
-        mc.isVideoRecording = true;
-      });
-    } on CameraException catch (e) {
-      setState(() {
-        mc.isVideoRecording = false;
-      });
-      _showCameraException(e);
-      await mc.cameraController?.setFlashMode(FlashMode.off);
-      return;
-    }
-  }
-
-  Future<void> stopVideoRecording() async {
-    if (_videoRecordingTimer != null) {
-      _videoRecordingTimer?.cancel();
-      _videoRecordingTimer = null;
-    }
-
-    await mc.cameraController?.setFlashMode(FlashMode.off);
-
-    setState(() {
-      _videoRecordingStarted = null;
-      mc.isVideoRecording = false;
-    });
-
-    if (mc.cameraController == null ||
-        !mc.cameraController!.value.isRecordingVideo) {
-      return;
-    }
-
-    setState(() {
-      mc.isSharePreviewIsShown = true;
-    });
-
-    try {
-      final videoPath = await mc.cameraController?.stopVideoRecording();
-      if (videoPath == null) return;
-      await mc.cameraController?.pausePreview();
-      if (await pushMediaEditor(null, File(videoPath.path))) {
-        return;
-      }
-    } on CameraException catch (e) {
-      _showCameraException(e);
-      return;
-    }
-  }
-
-  void _showCameraException(dynamic e) {
-    Log.error('$e');
-    try {
-      if (context.mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text('Error: $e'),
-            duration: const Duration(seconds: 3),
-          ),
-        );
-      }
-      // ignore: empty_catches
-    } catch (e) {}
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    if (mc.selectedCameraDetails.cameraId >= gCameras.length ||
-        mc.cameraController == null) {
-      return Container();
-    }
-    return MediaViewSizing(
-      requiredHeight: 0,
-      additionalPadding: 59,
-      bottomNavigation: Container(),
-      child: GestureDetector(
-        onPanStart: (details) async {
-          setState(() {
-            _basePanY = details.localPosition.dy;
-            _baseScaleFactor = mc.selectedCameraDetails.scaleFactor;
-          });
-        },
-        onLongPressMoveUpdate: onPanUpdate,
-        onLongPressStart: (details) {
-          setState(() {
-            _basePanY = details.localPosition.dy;
-            _baseScaleFactor = mc.selectedCameraDetails.scaleFactor;
-          });
-          // Get the position of the pointer
-          final renderBox =
-              keyTriggerButton.currentContext!.findRenderObject()! as RenderBox;
-          final localPosition = renderBox.globalToLocal(details.globalPosition);
-
-          final containerRect = Rect.fromLTWH(
-            0,
-            0,
-            renderBox.size.width,
-            renderBox.size.height,
-          );
-
-          if (containerRect.contains(localPosition)) {
-            startVideoRecording();
-          }
-        },
-        onLongPressEnd: (a) {
-          stopVideoRecording();
-        },
-        onPanEnd: (a) {
-          stopVideoRecording();
-        },
-        onPanUpdate: onPanUpdate,
-        child: Stack(
-          children: [
-            if (_galleryLoadedImageIsShown)
-              Center(
-                child: SizedBox(
-                  height: 60,
-                  width: 60,
-                  child: ThreeRotatingDots(
-                    size: 40,
-                    color: context.color.primary,
-                  ),
-                ),
-              ),
-            if (!mc.isSharePreviewIsShown &&
-                widget.sendToGroup != null &&
-                !mc.isVideoRecording)
-              ShowTitleText(
-                title: widget.sendToGroup!.groupName,
-                desc: context.lang.cameraPreviewSendTo,
-              ),
-            if (!mc.isSharePreviewIsShown &&
-                mc.sharedLinkForPreview != null &&
-                !mc.isVideoRecording)
-              ShowTitleText(
-                title: mc.sharedLinkForPreview?.host ?? '',
-                desc: 'Link',
-                isLink: true,
-              ),
-            if (!mc.isSharePreviewIsShown &&
-                !mc.isVideoRecording &&
-                !widget.hideControllers)
-              Positioned(
-                right: 5,
-                top: 0,
-                child: Container(
-                  alignment: Alignment.bottomCenter,
-                  padding: const EdgeInsets.symmetric(vertical: 16),
-                  child: SafeArea(
-                    child: Column(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      children: <Widget>[
-                        ActionButton(
-                          Icons.repeat_rounded,
-                          tooltipText: context.lang.switchFrontAndBackCamera,
-                          onPressed: () async {
-                            await mc.selectCamera(
-                              (mc.selectedCameraDetails.cameraId + 1) % 2,
-                              false,
-                            );
-                          },
-                        ),
-                        ActionButton(
-                          mc.selectedCameraDetails.isFlashOn
-                              ? Icons.flash_on_rounded
-                              : Icons.flash_off_rounded,
-                          tooltipText: context.lang.toggleFlashLight,
-                          color: mc.selectedCameraDetails.isFlashOn
-                              ? Colors.white
-                              : Colors.white.withAlpha(160),
-                          onPressed: () async {
-                            if (mc.selectedCameraDetails.isFlashOn) {
-                              await mc.cameraController?.setFlashMode(
-                                FlashMode.off,
-                              );
-                              mc.selectedCameraDetails.isFlashOn = false;
-                            } else {
-                              await mc.cameraController?.setFlashMode(
-                                FlashMode.always,
-                              );
-                              mc.selectedCameraDetails.isFlashOn = true;
-                            }
-                            setState(() {});
-                          },
-                        ),
-                        if (!_hasAudioPermission)
-                          ActionButton(
-                            Icons.mic_off_rounded,
-                            color: Colors.white.withAlpha(160),
-                            tooltipText:
-                                'Allow microphone access for video recording.',
-                            onPressed: requestMicrophonePermission,
-                          ),
-                      ],
-                    ),
-                  ),
-                ),
-              ),
-            if (!mc.isSharePreviewIsShown && !widget.hideControllers)
-              Positioned(
-                bottom: 30,
-                left: 0,
-                right: 0,
-                child: Align(
-                  alignment: Alignment.bottomCenter,
-                  child: Column(
-                    children: [
-                      if (mc.cameraController!.value.isInitialized &&
-                          mc.selectedCameraDetails.isZoomAble &&
-                          !mc.isVideoRecording)
-                        SizedBox(
-                          width: 120,
-                          child: CameraZoomButtons(
-                            key: mc.zoomButtonKey,
-                            scaleFactor: mc.selectedCameraDetails.scaleFactor,
-                            updateScaleFactor: updateScaleFactor,
-                            selectCamera: mc.selectCamera,
-                            selectedCameraDetails: mc.selectedCameraDetails,
-                            controller: mc.cameraController!,
-                          ),
-                        ),
-                      const SizedBox(height: 30),
-                      Row(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: [
-                          if (!mc.isVideoRecording)
-                            GestureDetector(
-                              onTap: pressSideButtonLeft,
-                              child: Align(
-                                child: Container(
-                                  height: 50,
-                                  width: 80,
-                                  padding: const EdgeInsets.all(2),
-                                  child: Center(
-                                    child: FaIcon(
-                                      mc.isSelectingFaceFilters
-                                          ? mc.currentFilterType.index == 1
-                                                ? FontAwesomeIcons.xmark
-                                                : FontAwesomeIcons.arrowLeft
-                                          : FontAwesomeIcons.photoFilm,
-                                      color: Colors.white,
-                                      size: 25,
-                                    ),
-                                  ),
-                                ),
-                              ),
-                            ),
-                          GestureDetector(
-                            onTap: takePicture,
-                            // onLongPress: startVideoRecording,
-                            key: keyTriggerButton,
-                            child: Align(
-                              child: Container(
-                                height: 100,
-                                width: 100,
-                                clipBehavior: Clip.antiAliasWithSaveLayer,
-                                padding: const EdgeInsets.all(2),
-                                decoration: BoxDecoration(
-                                  shape: BoxShape.circle,
-                                  border: Border.all(
-                                    width: 7,
-                                    color: mc.isVideoRecording
-                                        ? Colors.red
-                                        : Colors.white,
-                                  ),
-                                ),
-                                child: mc.currentFilterType.preview,
-                              ),
-                            ),
-                          ),
-                          if (!mc.isVideoRecording)
-                            if (isFront)
-                              GestureDetector(
-                                onTap: pressSideButtonRight,
-                                child: Align(
-                                  child: Container(
-                                    height: 50,
-                                    width: 80,
-                                    padding: const EdgeInsets.all(2),
-                                    child: Center(
-                                      child: FaIcon(
-                                        mc.isSelectingFaceFilters
-                                            ? mc.currentFilterType.index ==
-                                                      FaceFilterType
-                                                              .values
-                                                              .length -
-                                                          1
-                                                  ? FontAwesomeIcons.xmark
-                                                  : FontAwesomeIcons.arrowRight
-                                            : FontAwesomeIcons
-                                                  .faceGrinTongueSquint,
-                                        color: Colors.white,
-                                        size: 25,
-                                      ),
-                                    ),
-                                  ),
-                                ),
-                              )
-                            else
-                              const SizedBox(width: 80),
-                        ],
-                      ),
-                    ],
-                  ),
-                ),
-              ),
-            VideoRecordingTimer(
-              videoRecordingStarted: _videoRecordingStarted,
-              maxVideoRecordingTime: maxVideoRecordingTime,
-            ),
-            if (!mc.isSharePreviewIsShown && widget.sendToGroup != null ||
-                widget.hideControllers)
-              Positioned(
-                left: 5,
-                top: 10,
-                child: ActionButton(
-                  FontAwesomeIcons.xmark,
-                  tooltipText: context.lang.close,
-                  onPressed: () async {
-                    Navigator.pop(context);
-                  },
-                ),
-              ),
-            if (_showSelfieFlash)
-              Positioned.fill(
-                child: ClipRRect(
-                  borderRadius: BorderRadius.circular(22),
-                  child: Container(
-                    color: Colors.white,
-                  ),
-                ),
-              ),
-            Positioned(
-              right: 8,
-              top: 170,
-              child: SizedBox(
-                height: 200,
-                width: 150,
-                child: ListView(
-                  children: [
-                    ...widget.mainCameraController.scannedNewProfiles.values
-                        .map(
-                          (c) {
-                            if (c.isLoading) return Container();
-                            return GestureDetector(
-                              onTap: () async {
-                                c.isLoading = true;
-                                widget.mainCameraController.setState();
-                                if (await addNewContactFromPublicProfile(
-                                      c.profile,
-                                    ) &&
-                                    context.mounted) {
-                                  ScaffoldMessenger.of(context).showSnackBar(
-                                    SnackBar(
-                                      content: Text(
-                                        context.lang.requestedUserToastText(
-                                          c.profile.username,
-                                        ),
-                                      ),
-                                      duration: const Duration(seconds: 8),
-                                    ),
-                                  );
-                                }
-                              },
-                              child: Container(
-                                padding: const EdgeInsets.all(12),
-                                margin: const EdgeInsets.only(bottom: 10),
-                                decoration: BoxDecoration(
-                                  borderRadius: BorderRadius.circular(12),
-                                  color: context.color.surfaceContainer,
-                                ),
-                                child: Row(
-                                  children: [
-                                    Text(c.profile.username),
-                                    Expanded(child: Container()),
-                                    if (c.isLoading)
-                                      const SizedBox(
-                                        width: 12,
-                                        height: 12,
-                                        child: CircularProgressIndicator(
-                                          strokeWidth: 2,
-                                        ),
-                                      )
-                                    else
-                                      ColoredBox(
-                                        color: Colors.transparent,
-                                        child: FaIcon(
-                                          FontAwesomeIcons.userPlus,
-                                          color: isDarkMode(context)
-                                              ? Colors.white
-                                              : Colors.black,
-                                          size: 17,
-                                        ),
-                                      ),
-                                  ],
-                                ),
-                              ),
-                            );
-                          },
-                        ),
-                    ...widget.mainCameraController.contactsVerified.values.map(
-                      (c) {
-                        return Container(
-                          padding: const EdgeInsets.all(8),
-                          margin: const EdgeInsets.only(bottom: 10),
-                          decoration: BoxDecoration(
-                            borderRadius: BorderRadius.circular(12),
-                            color: context.color.surfaceContainer,
-                          ),
-                          child: Row(
-                            children: [
-                              AvatarIcon(
-                                contactId: c.contact.userId,
-                                fontSize: 14,
-                              ),
-                              const SizedBox(width: 10),
-                              Text(
-                                getContactDisplayName(
-                                  c.contact,
-                                  maxLength: 13,
-                                ),
-                              ),
-                              Expanded(
-                                child: Container(),
-                              ),
-                              ColoredBox(
-                                color: Colors.transparent,
-                                child: SizedBox(
-                                  width: 30,
-                                  child: Lottie.asset(
-                                    c.verificationOk
-                                        ? 'assets/animations/success.lottie'
-                                        : 'assets/animations/failed.lottie',
-                                    repeat: false,
-                                    onLoaded: (p0) {
-                                      Future.delayed(
-                                        const Duration(seconds: 4),
-                                        () {
-                                          widget.mainCameraController
-                                              .setState();
-                                        },
-                                      );
-                                    },
-                                  ),
-                                ),
-                              ),
-                            ],
-                          ),
-                        );
-                      },
-                    ),
-                    if (widget.mainCameraController.scannedUrl != null)
-                      GestureDetector(
-                        onTap: () {
-                          launchUrlString(
-                            widget.mainCameraController.scannedUrl!,
-                          );
-                        },
-                        child: Container(
-                          padding: const EdgeInsets.all(8),
-                          margin: const EdgeInsets.only(bottom: 10),
-                          decoration: BoxDecoration(
-                            borderRadius: BorderRadius.circular(12),
-                            color: context.color.surfaceContainer,
-                          ),
-                          child: Row(
-                            children: [
-                              Text(
-                                substringBy(
-                                  widget.mainCameraController.scannedUrl!,
-                                  25,
-                                ),
-                                style: const TextStyle(fontSize: 8),
-                              ),
-                              Expanded(
-                                child: Container(),
-                              ),
-                              Expanded(child: Container()),
-                              ColoredBox(
-                                color: Colors.transparent,
-                                child: FaIcon(
-                                  FontAwesomeIcons.shareFromSquare,
-                                  color: isDarkMode(context)
-                                      ? Colors.white
-                                      : Colors.black,
-                                  size: 17,
-                                ),
-                              ),
-                            ],
-                          ),
-                        ),
-                      ),
-                  ],
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/src/views/chats/add_new_user.view.dart b/lib/src/views/chats/add_new_user.view.dart
deleted file mode 100644
index ac3558a6..00000000
--- a/lib/src/views/chats/add_new_user.view.dart
+++ /dev/null
@@ -1,308 +0,0 @@
-import 'dart:async';
-import 'package:collection/collection.dart';
-import 'package:drift/drift.dart' hide Column;
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:go_router/go_router.dart';
-import 'package:twonly/globals.dart';
-import 'package:twonly/src/constants/routes.keys.dart';
-import 'package:twonly/src/database/daos/contacts.dao.dart';
-import 'package:twonly/src/database/twonly.db.dart';
-import 'package:twonly/src/model/protobuf/client/generated/messages.pb.dart';
-import 'package:twonly/src/services/api/messages.dart';
-import 'package:twonly/src/services/api/utils.dart';
-import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/alert_dialog.dart';
-import 'package:twonly/src/views/components/avatar_icon.component.dart';
-import 'package:twonly/src/views/components/headline.dart';
-
-class AddNewUserView extends StatefulWidget {
-  const AddNewUserView({
-    this.username,
-    this.publicKey,
-    super.key,
-  });
-
-  final String? username;
-  final Uint8List? publicKey;
-
-  @override
-  State<AddNewUserView> createState() => _SearchUsernameView();
-}
-
-class _SearchUsernameView extends State<AddNewUserView> {
-  final TextEditingController searchUserName = TextEditingController();
-  bool _isLoading = false;
-  bool hasRequestedUsers = false;
-
-  List<Contact> contacts = [];
-  late StreamSubscription<List<Contact>> contactsStream;
-
-  @override
-  void initState() {
-    super.initState();
-    contactsStream = twonlyDB.contactsDao.watchNotAcceptedContacts().listen(
-      (update) => setState(() {
-        contacts = update;
-      }),
-    );
-
-    if (widget.username != null) {
-      searchUserName.text = widget.username!;
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        _addNewUser(context);
-      });
-    }
-  }
-
-  @override
-  void dispose() {
-    unawaited(contactsStream.cancel());
-    super.dispose();
-  }
-
-  Future<void> _addNewUser(BuildContext context) async {
-    if (gUser.username == searchUserName.text) {
-      return;
-    }
-
-    setState(() {
-      _isLoading = true;
-    });
-
-    final userdata = await apiService.getUserData(searchUserName.text);
-    if (!context.mounted) return;
-
-    setState(() {
-      _isLoading = false;
-    });
-
-    if (userdata == null) {
-      await showAlertDialog(
-        context,
-        context.lang.searchUsernameNotFound,
-        context.lang.searchUsernameNotFoundBody(searchUserName.text),
-      );
-      return;
-    }
-
-    final addUser = await showAlertDialog(
-      context,
-      context.lang.userFound(searchUserName.text),
-      context.lang.userFoundBody,
-    );
-
-    if (!addUser || !context.mounted) {
-      return;
-    }
-
-    final added = await twonlyDB.contactsDao.insertOnConflictUpdate(
-      ContactsCompanion(
-        username: Value(searchUserName.text),
-        userId: Value(userdata.userId.toInt()),
-        requested: const Value(false),
-        blocked: const Value(false),
-        deletedByUser: const Value(false),
-        verified: Value(
-          !(widget.publicKey == null) &&
-              userdata.publicIdentityKey.equals(widget.publicKey!),
-        ),
-      ),
-    );
-
-    if (added > 0) await importSignalContactAndCreateRequest(userdata);
-  }
-
-  InputDecoration getInputDecoration(String hintText) {
-    return InputDecoration(
-      hintText: hintText,
-      focusedBorder: OutlineInputBorder(
-        borderRadius: BorderRadius.circular(9),
-        borderSide: BorderSide(color: context.color.primary),
-      ),
-      enabledBorder: OutlineInputBorder(
-        borderRadius: BorderRadius.circular(8),
-        borderSide: BorderSide(color: context.color.outline),
-      ),
-      contentPadding: const EdgeInsets.symmetric(vertical: 15, horizontal: 20),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(context.lang.addFriendTitle),
-      ),
-      body: SafeArea(
-        child: Padding(
-          padding: const EdgeInsets.symmetric(vertical: 20, horizontal: 10),
-          child: Column(
-            children: [
-              Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 10),
-                child: Row(
-                  children: [
-                    Expanded(
-                      child: TextField(
-                        onSubmitted: (_) async {
-                          await _addNewUser(context);
-                        },
-                        onChanged: (value) {
-                          searchUserName.text = value.toLowerCase();
-                          searchUserName.selection = TextSelection.fromPosition(
-                            TextPosition(offset: searchUserName.text.length),
-                          );
-                        },
-                        inputFormatters: [
-                          LengthLimitingTextInputFormatter(12),
-                          FilteringTextInputFormatter.allow(
-                            RegExp('[a-z0-9A-Z._]'),
-                          ),
-                        ],
-                        controller: searchUserName,
-                        decoration: getInputDecoration(
-                          context.lang.searchUsernameInput,
-                        ),
-                      ),
-                    ),
-                    Align(
-                      alignment: Alignment.centerRight,
-                      child: IconButton(
-                        onPressed: () =>
-                            context.push(Routes.settingsPublicProfile),
-                        icon: const FaIcon(FontAwesomeIcons.qrcode),
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-              const SizedBox(height: 20),
-              if (contacts.isNotEmpty)
-                HeadLineComponent(
-                  context.lang.searchUsernameNewFollowerTitle,
-                ),
-              Expanded(
-                child: ContactsListView(contacts),
-              ),
-            ],
-          ),
-        ),
-      ),
-      floatingActionButton: Padding(
-        padding: const EdgeInsets.only(bottom: 30),
-        child: FloatingActionButton(
-          onPressed: _isLoading || searchUserName.text.isEmpty
-              ? null
-              : () async => _addNewUser(context),
-          child: _isLoading
-              ? const Center(child: CircularProgressIndicator())
-              : const FaIcon(FontAwesomeIcons.magnifyingGlassPlus),
-        ),
-      ),
-    );
-  }
-}
-
-class ContactsListView extends StatelessWidget {
-  const ContactsListView(this.contacts, {super.key});
-  final List<Contact> contacts;
-
-  List<Widget> sendRequestActions(BuildContext context, Contact contact) {
-    return [
-      IconButton(
-        icon: const FaIcon(Icons.archive_outlined, size: 15),
-        onPressed: () async {
-          const update = ContactsCompanion(deletedByUser: Value(true));
-          await twonlyDB.contactsDao.updateContact(contact.userId, update);
-        },
-      ),
-      Text(context.lang.searchUserNamePending),
-    ];
-  }
-
-  List<Widget> requestedActions(BuildContext context, Contact contact) {
-    return [
-      IconButton(
-        icon: const Icon(
-          Icons.person_off_rounded,
-          color: Color.fromARGB(164, 244, 67, 54),
-        ),
-        onPressed: () async {
-          const update = ContactsCompanion(blocked: Value(true));
-          await twonlyDB.contactsDao.updateContact(contact.userId, update);
-        },
-      ),
-      IconButton(
-        icon: const Icon(Icons.close, color: Colors.red),
-        onPressed: () async {
-          await sendCipherText(
-            contact.userId,
-            EncryptedContent(
-              contactRequest: EncryptedContent_ContactRequest(
-                type: EncryptedContent_ContactRequest_Type.REJECT,
-              ),
-            ),
-          );
-          await twonlyDB.contactsDao.updateContact(
-            contact.userId,
-            const ContactsCompanion(
-              accepted: Value(false),
-              requested: Value(false),
-              deletedByUser: Value(true),
-            ),
-          );
-        },
-      ),
-      IconButton(
-        icon: const Icon(Icons.check, color: Colors.green),
-        onPressed: () async {
-          await twonlyDB.contactsDao.updateContact(
-            contact.userId,
-            const ContactsCompanion(
-              accepted: Value(true),
-              requested: Value(false),
-            ),
-          );
-          await twonlyDB.groupsDao.createNewDirectChat(
-            contact.userId,
-            GroupsCompanion(
-              groupName: Value(getContactDisplayName(contact)),
-            ),
-          );
-          await sendCipherText(
-            contact.userId,
-            EncryptedContent(
-              contactRequest: EncryptedContent_ContactRequest(
-                type: EncryptedContent_ContactRequest_Type.ACCEPT,
-              ),
-            ),
-          );
-          await sendContactMyProfileData(contact.userId);
-        },
-      ),
-    ];
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return ListView.builder(
-      itemCount: contacts.length,
-      itemBuilder: (context, index) {
-        final contact = contacts[index];
-        return ListTile(
-          key: ValueKey(contact.userId),
-          title: Text(substringBy(contact.username, 25)),
-          leading: AvatarIcon(contactId: contact.userId),
-          trailing: Row(
-            mainAxisSize: MainAxisSize.min,
-            children: contact.requested
-                ? requestedActions(context, contact)
-                : sendRequestActions(context, contact),
-          ),
-        );
-      },
-    );
-  }
-}
diff --git a/lib/src/views/chats/chat_list.view.dart b/lib/src/views/chats/chat_list.view.dart
deleted file mode 100644
index 1f2a89a8..00000000
--- a/lib/src/views/chats/chat_list.view.dart
+++ /dev/null
@@ -1,281 +0,0 @@
-import 'dart:async';
-import 'package:cryptography_plus/cryptography_plus.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:go_router/go_router.dart';
-import 'package:provider/provider.dart';
-import 'package:twonly/globals.dart';
-import 'package:twonly/src/constants/routes.keys.dart';
-import 'package:twonly/src/database/twonly.db.dart';
-import 'package:twonly/src/providers/purchases.provider.dart';
-import 'package:twonly/src/services/subscription.service.dart';
-import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/storage.dart';
-import 'package:twonly/src/views/chats/chat_list_components/feedback_btn.dart';
-import 'package:twonly/src/views/chats/chat_list_components/group_list_item.dart';
-import 'package:twonly/src/views/components/avatar_icon.component.dart';
-import 'package:twonly/src/views/components/connection_status_badge.dart';
-import 'package:twonly/src/views/components/notification_badge.dart';
-
-class ChatListView extends StatefulWidget {
-  const ChatListView({super.key});
-  @override
-  State<ChatListView> createState() => _ChatListViewState();
-}
-
-class _ChatListViewState extends State<ChatListView> {
-  late StreamSubscription<List<Group>> _contactsSub;
-  List<Group> _groupsNotPinned = [];
-  List<Group> _groupsPinned = [];
-  List<Group> _groupsArchived = [];
-
-  GlobalKey searchForOtherUsers = GlobalKey();
-  bool showFeedbackShortcut = false;
-
-  @override
-  void initState() {
-    initAsync();
-    super.initState();
-  }
-
-  Future<void> initAsync() async {
-    final stream = twonlyDB.groupsDao.watchGroupsForChatList();
-    _contactsSub = stream.listen((groups) {
-      setState(() {
-        _groupsNotPinned = groups
-            .where((x) => !x.pinned && !x.archived)
-            .toList();
-        _groupsPinned = groups.where((x) => x.pinned && !x.archived).toList();
-        _groupsArchived = groups.where((x) => x.archived).toList();
-      });
-    });
-
-    // In case the user is already a Tester, ask him for permission.
-
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      if (gUser.subscriptionPlan == SubscriptionPlan.Tester.name &&
-          !gUser.askedForUserStudyPermission) {
-        await context.push(
-          Routes.settingsHelpUserStudy,
-          extra: true,
-        );
-      }
-
-      final changeLog = await rootBundle.loadString('CHANGELOG.md');
-      final changeLogHash = (await compute(
-        Sha256().hash,
-        changeLog.codeUnits,
-      )).bytes;
-      if (!gUser.hideChangeLog &&
-          gUser.lastChangeLogHash.toString() != changeLogHash.toString()) {
-        await updateUserdata((u) {
-          u.lastChangeLogHash = changeLogHash;
-          return u;
-        });
-        if (!mounted) return;
-        // only show changelog to people who already have contacts
-        // this prevents that this is shown directly after the user registered
-        if (_groupsNotPinned.isNotEmpty) {
-          await context.push(
-            Routes.settingsHelpChangelog,
-            extra: changeLog,
-          );
-        }
-      }
-    });
-  }
-
-  @override
-  void dispose() {
-    _contactsSub.cancel();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final plan = context.watch<PurchasesProvider>().plan;
-    return Scaffold(
-      appBar: AppBar(
-        title: Row(
-          children: [
-            ConnectionStatusBadge(
-              child: GestureDetector(
-                onTap: () async {
-                  await context.push(Routes.settingsProfile);
-                  if (!mounted) return;
-                  setState(() {}); // gUser has updated
-                },
-                child: AvatarIcon(
-                  myAvatar: true,
-                  fontSize: 14,
-                  color: context.color.onSurface.withAlpha(20),
-                ),
-              ),
-            ),
-            const SizedBox(width: 10),
-            const Text('twonly '),
-            if (plan != SubscriptionPlan.Free)
-              GestureDetector(
-                onTap: () => context.push(Routes.settingsSubscription),
-                child: Container(
-                  decoration: BoxDecoration(
-                    color: context.color.primary,
-                    borderRadius: BorderRadius.circular(15),
-                  ),
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: 5,
-                    vertical: 3,
-                  ),
-                  child: Text(
-                    plan.name,
-                    style: TextStyle(
-                      fontSize: 10,
-                      fontWeight: FontWeight.bold,
-                      color: isDarkMode(context) ? Colors.black : Colors.white,
-                    ),
-                  ),
-                ),
-              ),
-          ],
-        ),
-        actions: [
-          const FeedbackIconButton(),
-          StreamBuilder(
-            stream: twonlyDB.contactsDao.watchContactsRequestedCount(),
-            builder: (context, snapshot) {
-              var count = 0;
-              if (snapshot.hasData && snapshot.data != null) {
-                count = snapshot.data!;
-              }
-              return NotificationBadge(
-                count: count.toString(),
-                child: IconButton(
-                  key: searchForOtherUsers,
-                  icon: const FaIcon(FontAwesomeIcons.userPlus, size: 18),
-                  onPressed: () => context.push(Routes.chatsAddNewUser),
-                ),
-              );
-            },
-          ),
-          IconButton(
-            onPressed: () async {
-              await context.push(Routes.settings);
-              if (mounted) setState(() {}); // gUser may has changed...
-            },
-            icon: const FaIcon(FontAwesomeIcons.gear, size: 19),
-          ),
-        ],
-      ),
-      body: RefreshIndicator(
-        onRefresh: () async {
-          await apiService.close(() {});
-          await apiService.connect();
-          await Future.delayed(const Duration(seconds: 1));
-        },
-        child:
-            (_groupsNotPinned.isEmpty &&
-                _groupsPinned.isEmpty &&
-                _groupsArchived.isEmpty)
-            ? Center(
-                child: Padding(
-                  padding: const EdgeInsets.all(10),
-                  child: OutlinedButton.icon(
-                    icon: const Icon(Icons.person_add),
-                    onPressed: () => context.push(Routes.chatsAddNewUser),
-                    label: Text(
-                      context.lang.chatListViewSearchUserNameBtn,
-                    ),
-                  ),
-                ),
-              )
-            : ListView.builder(
-                itemCount:
-                    _groupsPinned.length +
-                    (_groupsPinned.isNotEmpty ? 1 : 0) +
-                    _groupsNotPinned.length +
-                    (_groupsArchived.isNotEmpty ? 1 : 0),
-                itemBuilder: (context, index) {
-                  if (index >=
-                      _groupsNotPinned.length +
-                          _groupsPinned.length +
-                          (_groupsPinned.isNotEmpty ? 1 : 0)) {
-                    if (_groupsArchived.isEmpty) return Container();
-                    return ListTile(
-                      title: Text(
-                        '${context.lang.archivedChats} (${_groupsArchived.length})',
-                        textAlign: TextAlign.center,
-                        style: const TextStyle(fontSize: 13),
-                      ),
-                      onTap: () => context.push(Routes.chatsArchived),
-                    );
-                  }
-                  // Check if the index is for the pinned users
-                  if (index < _groupsPinned.length) {
-                    final group = _groupsPinned[index];
-                    return GroupListItem(
-                      key: ValueKey(group.groupId),
-                      group: group,
-                    );
-                  }
-
-                  // If there are pinned users, account for the Divider
-                  var adjustedIndex = index - _groupsPinned.length;
-                  if (_groupsPinned.isNotEmpty && adjustedIndex == 0) {
-                    return const Divider();
-                  }
-
-                  // Adjust the index for the contacts list
-                  adjustedIndex -= (_groupsPinned.isNotEmpty ? 1 : 0);
-
-                  // Get the contacts that are not pinned
-                  final group = _groupsNotPinned.elementAt(
-                    adjustedIndex,
-                  );
-                  return GroupListItem(
-                    key: ValueKey(group.groupId),
-                    group: group,
-                  );
-                },
-              ),
-      ),
-      floatingActionButton: Padding(
-        padding: const EdgeInsets.only(bottom: 30),
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.end,
-          children: [
-            Material(
-              elevation: 3,
-              shape: const CircleBorder(),
-              color: context.color.primary,
-              child: InkWell(
-                borderRadius: BorderRadius.circular(12),
-                onTap: () => context.push(Routes.settingsPublicProfile),
-                child: SizedBox(
-                  width: 45,
-                  height: 45,
-                  child: Center(
-                    child: FaIcon(
-                      FontAwesomeIcons.qrcode,
-                      color: isDarkMode(context) ? Colors.black : Colors.white,
-                    ),
-                  ),
-                ),
-              ),
-            ),
-            const SizedBox(height: 12),
-            FloatingActionButton(
-              backgroundColor: context.color.primary,
-              onPressed: () => context.push(Routes.chatsStartNewChat),
-              child: FaIcon(
-                FontAwesomeIcons.penToSquare,
-                color: isDarkMode(context) ? Colors.black : Colors.white,
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/src/views/chats/chat_list_components/feedback_btn.dart b/lib/src/views/chats/chat_list_components/feedback_btn.dart
deleted file mode 100644
index 412ab19b..00000000
--- a/lib/src/views/chats/chat_list_components/feedback_btn.dart
+++ /dev/null
@@ -1,46 +0,0 @@
-import 'dart:async';
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:go_router/go_router.dart';
-import 'package:twonly/src/constants/routes.keys.dart';
-import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/storage.dart';
-
-class FeedbackIconButton extends StatefulWidget {
-  const FeedbackIconButton({super.key});
-
-  @override
-  State<FeedbackIconButton> createState() => _FeedbackIconButtonState();
-}
-
-class _FeedbackIconButtonState extends State<FeedbackIconButton> {
-  bool showFeedbackShortcut = false;
-
-  @override
-  void initState() {
-    super.initState();
-    unawaited(initAsync());
-  }
-
-  Future<void> initAsync() async {
-    final user = await getUser();
-    if (user == null || !mounted) return;
-    setState(() {
-      showFeedbackShortcut = user.showFeedbackShortcut;
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    if (!showFeedbackShortcut) {
-      return const SizedBox.shrink();
-    }
-
-    return IconButton(
-      onPressed: () => context.push(Routes.settingsHelpContactUs),
-      color: Colors.grey,
-      tooltip: context.lang.feedbackTooltip,
-      icon: const FaIcon(FontAwesomeIcons.commentDots, size: 19),
-    );
-  }
-}
diff --git a/lib/src/views/components/fingerprint_text.dart b/lib/src/views/components/fingerprint_text.dart
deleted file mode 100644
index e470e467..00000000
--- a/lib/src/views/components/fingerprint_text.dart
+++ /dev/null
@@ -1,38 +0,0 @@
-import 'package:flutter/material.dart';
-
-class FingerprintText extends StatelessWidget {
-  const FingerprintText(this.longString, {super.key});
-  final String longString;
-
-  String formatString(String input) {
-    final formattedString = StringBuffer();
-    var blockCount = 0;
-
-    for (var i = 0; i < input.length; i += 4) {
-      final block = input.substring(
-        i,
-        i + 4 > input.length ? input.length : i + 4,
-      );
-      formattedString.write(block);
-      blockCount++;
-
-      if (blockCount == 5) {
-        formattedString.writeln();
-        blockCount = 0;
-      } else {
-        formattedString.write(' ');
-      }
-    }
-
-    return formattedString.toString().trim();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return SelectableText(
-      formatString(longString),
-      style: const TextStyle(fontSize: 16, color: Colors.black),
-      textAlign: TextAlign.center,
-    );
-  }
-}
diff --git a/lib/src/views/components/verified_shield.dart b/lib/src/views/components/verified_shield.dart
deleted file mode 100644
index 293e0380..00000000
--- a/lib/src/views/components/verified_shield.dart
+++ /dev/null
@@ -1,88 +0,0 @@
-import 'dart:async';
-import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
-import 'package:twonly/globals.dart';
-import 'package:twonly/src/constants/routes.keys.dart';
-import 'package:twonly/src/database/twonly.db.dart';
-import 'package:twonly/src/views/components/svg_icon.dart';
-
-class VerifiedShield extends StatefulWidget {
-  const VerifiedShield({
-    this.contact,
-    this.group,
-    super.key,
-    this.size = 15,
-    this.showOnlyIfVerified = false,
-    this.clickable = true,
-  });
-  final Group? group;
-  final Contact? contact;
-  final double size;
-
-  final bool showOnlyIfVerified;
-  final bool clickable;
-
-  @override
-  State<VerifiedShield> createState() => _VerifiedShieldState();
-}
-
-class _VerifiedShieldState extends State<VerifiedShield> {
-  bool isVerified = false;
-  Contact? contact;
-
-  StreamSubscription<List<Contact>>? stream;
-
-  @override
-  void initState() {
-    if (widget.group != null) {
-      stream = twonlyDB.groupsDao
-          .watchGroupContact(widget.group!.groupId)
-          .listen((contacts) {
-            if (contacts.length == 1) {
-              contact = contacts.first;
-            }
-            setState(() {
-              isVerified = contacts.every((t) => t.verified);
-            });
-          });
-    } else if (widget.contact != null) {
-      isVerified = widget.contact!.verified;
-      contact = widget.contact;
-    }
-
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    stream?.cancel();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    if (!isVerified && widget.showOnlyIfVerified) return Container();
-    return GestureDetector(
-      onTap: (contact == null || !widget.clickable)
-          ? null
-          : () => context.push(Routes.settingsHelpFaqVerifyBadge),
-      child: ColoredBox(
-        color: Colors.transparent,
-        child: Padding(
-          padding: const EdgeInsetsGeometry.only(
-            top: 4,
-            left: 3,
-            right: 3,
-            bottom: 3,
-          ),
-          child: SvgIcon(
-            assetPath: isVerified
-                ? SvgIcons.verifiedGreen
-                : SvgIcons.verifiedRed,
-            size: widget.size,
-          ),
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/src/views/settings/account.view.dart b/lib/src/views/settings/account.view.dart
deleted file mode 100644
index 969db76a..00000000
--- a/lib/src/views/settings/account.view.dart
+++ /dev/null
@@ -1,154 +0,0 @@
-import 'dart:async';
-import 'package:collection/collection.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:restart_app/restart_app.dart';
-import 'package:twonly/globals.dart';
-import 'package:twonly/src/model/protobuf/api/websocket/server_to_client.pb.dart';
-import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/storage.dart';
-import 'package:twonly/src/views/components/alert_dialog.dart';
-import 'package:twonly/src/views/settings/account/refund_credits.view.dart';
-
-class AccountView extends StatefulWidget {
-  const AccountView({super.key});
-
-  @override
-  State<AccountView> createState() => _AccountViewState();
-}
-
-class _AccountViewState extends State<AccountView> {
-  String? formattedBallance;
-  bool hasRemainingBallance = false;
-
-  @override
-  void initState() {
-    super.initState();
-    unawaited(initAsync());
-  }
-
-  Future<void> initAsync() async {
-    final ballance = await apiService.loadPlanBalance(useCache: false);
-    if (ballance == null || !mounted) return;
-    var ballanceInCents = ballance.transactions
-        .where(
-          (x) =>
-              x.transactionType != Response_TransactionTypes.ThanksForTesting ||
-              !kReleaseMode,
-        )
-        .map((a) => a.depositCents.toInt())
-        .sum;
-    if (ballanceInCents < 0) {
-      ballanceInCents = 0;
-    }
-    hasRemainingBallance = ballanceInCents > 0;
-    final myLocale = Localizations.localeOf(context);
-    formattedBallance = NumberFormat.currency(
-      locale: myLocale.toString(),
-      symbol: '€',
-      decimalDigits: 2,
-    ).format(ballanceInCents / 100);
-    setState(() {});
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(context.lang.settingsAccount),
-      ),
-      body: ListView(
-        children: [
-          // ListTile(
-          //   title: const Text('Transfer account'),
-          //   subtitle: const Text('Coming soon'),
-          //   onTap: () async {
-          //     await showAlertDialog(
-          //       context,
-          //       'Coming soon',
-          //       'This feature is not yet implemented!',
-          //     );
-          //   },
-          // ),
-          // const Divider(),
-          Container(
-            alignment: Alignment.center,
-            padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 20),
-            child: const Text(
-              'Danger Zone',
-              textAlign: TextAlign.center,
-              style: TextStyle(
-                fontSize: 20,
-                color: Colors.red,
-                fontWeight: FontWeight.bold,
-              ),
-            ),
-          ),
-          ListTile(
-            title: Text(
-              context.lang.settingsAccountDeleteAccount,
-              style: const TextStyle(color: Colors.red),
-            ),
-            subtitle: (formattedBallance == null)
-                ? Text(context.lang.settingsAccountDeleteAccountNoInternet)
-                : hasRemainingBallance
-                ? Text(
-                    context.lang.settingsAccountDeleteAccountWithBallance(
-                      formattedBallance!,
-                    ),
-                  )
-                : Text(context.lang.settingsAccountDeleteAccountNoBallance),
-            onTap: (formattedBallance == null)
-                ? null
-                : () async {
-                    if (hasRemainingBallance) {
-                      final canGoNext =
-                          await Navigator.push(
-                                context,
-                                MaterialPageRoute(
-                                  builder: (context) {
-                                    return RefundCreditsView(
-                                      formattedBalance: formattedBallance!,
-                                    );
-                                  },
-                                ),
-                              )
-                              as bool?;
-                      unawaited(initAsync());
-                      if (canGoNext == null || !canGoNext) return;
-                    }
-                    if (!context.mounted) return;
-                    final ok = await showAlertDialog(
-                      context,
-                      context.lang.settingsAccountDeleteModalTitle,
-                      context.lang.settingsAccountDeleteModalBody,
-                    );
-                    if (ok) {
-                      final res = await apiService.deleteAccount();
-                      if (res.isError) {
-                        if (!context.mounted) return;
-                        ScaffoldMessenger.of(context).showSnackBar(
-                          const SnackBar(
-                            content: Text(
-                              'Could not delete the account. Please ensure you have a internet connection!',
-                            ),
-                            duration: Duration(seconds: 3),
-                          ),
-                        );
-                        return;
-                      }
-                      await deleteLocalUserData();
-                      await Restart.restartApp(
-                        notificationTitle: 'Account successfully deleted',
-                        notificationBody: 'Click here to open the app again',
-                        forceKill: true,
-                      );
-                    }
-                  },
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/src/views/settings/account/refund_credits.view.dart b/lib/src/views/settings/account/refund_credits.view.dart
deleted file mode 100644
index 2dcd6a55..00000000
--- a/lib/src/views/settings/account/refund_credits.view.dart
+++ /dev/null
@@ -1,83 +0,0 @@
-import 'package:flutter/material.dart';
-// import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:twonly/src/views/settings/subscription_custom/voucher.view.dart';
-// import 'package:url_launcher/url_launcher.dart';
-
-class RefundCreditsView extends StatefulWidget {
-  const RefundCreditsView({required this.formattedBalance, super.key});
-  final String formattedBalance;
-
-  @override
-  State<RefundCreditsView> createState() => _RefundCreditsViewState();
-}
-
-class _RefundCreditsViewState extends State<RefundCreditsView> {
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: const Text('Refund Credits'),
-      ),
-      body: Padding(
-        padding: const EdgeInsets.all(16),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Center(
-              child: Text(
-                'Remaining balance: ${widget.formattedBalance}',
-                textAlign: TextAlign.center,
-              ),
-            ),
-            const SizedBox(height: 20), // Space between balance and options
-
-            ListTile(
-              title: const Text('Create a Voucher'),
-              onTap: () async {
-                await Navigator.push(
-                  context,
-                  MaterialPageRoute(
-                    builder: (context) {
-                      return const VoucherView();
-                    },
-                  ),
-                );
-                if (context.mounted) {
-                  Navigator.pop(context, false);
-                }
-              },
-            ),
-            // ListTile(
-            //   title: Text("Spend to an Open Source Project"),
-            //   onTap: () async {},
-            // ),
-            // ListTile(
-            //   title: Text("Spend to an NGO"),
-            //   onTap: () async {},
-            // ),
-            // ListTile(
-            //   title: Text("Spend to twonly"),
-            //   onTap: () async {},
-            // ),
-            // Divider(),
-            // ListTile(
-            //   title: Text(
-            //     "Learn more about your donation",
-            //   ),
-            //   subtitle: Text(
-            //     "This will open our webpage which will provide you more informations where we will donate your remaining ballance if you choose this option.",
-            //   ),
-            //   onTap: () {
-            //     launchUrl(Uri.parse("https://twonly.eu/de/donation/"));
-            //   },
-            //   trailing: FaIcon(
-            //     FontAwesomeIcons.arrowUpRightFromSquare,
-            //     size: 15,
-            //   ),
-            // ),
-          ],
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/src/views/settings/backup/backup.view.dart b/lib/src/views/settings/backup/backup.view.dart
deleted file mode 100644
index 95e4f314..00000000
--- a/lib/src/views/settings/backup/backup.view.dart
+++ /dev/null
@@ -1,256 +0,0 @@
-import 'dart:async';
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:go_router/go_router.dart';
-import 'package:twonly/globals.dart';
-import 'package:twonly/src/constants/routes.keys.dart';
-import 'package:twonly/src/model/json/userdata.dart';
-import 'package:twonly/src/services/backup/create.backup.dart';
-import 'package:twonly/src/utils/misc.dart';
-
-void Function() gUpdateBackupView = () {};
-
-class BackupView extends StatefulWidget {
-  const BackupView({super.key});
-
-  @override
-  State<BackupView> createState() => _BackupViewState();
-}
-
-BackupServer defaultBackupServer = BackupServer(
-  serverUrl: 'Default',
-  retentionDays: 180,
-  maxBackupBytes: 2097152,
-);
-
-class _BackupViewState extends State<BackupView> {
-  bool isLoading = false;
-
-  int activePageIdx = 0;
-
-  final PageController pageController = PageController();
-
-  @override
-  void initState() {
-    super.initState();
-    unawaited(initAsync());
-    gUpdateBackupView = initAsync;
-  }
-
-  @override
-  void dispose() {
-    gUpdateBackupView = () {};
-    super.dispose();
-  }
-
-  Future<void> initAsync() async {
-    setState(() {});
-  }
-
-  String backupStatus(LastBackupUploadState status) {
-    switch (status) {
-      case LastBackupUploadState.none:
-        return context.lang.backupPending;
-      case LastBackupUploadState.pending:
-        return context.lang.backupPending;
-      case LastBackupUploadState.failed:
-        return context.lang.backupFailed;
-      case LastBackupUploadState.success:
-        return context.lang.backupSuccess;
-    }
-  }
-
-  Future<void> changeTwonlySafePassword() async {
-    await context.push(Routes.settingsBackupSetup, extra: true);
-    setState(() {
-      // gUser was updated
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final backupServer = gUser.backupServer ?? defaultBackupServer;
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(context.lang.settingsBackup),
-      ),
-      body: PageView(
-        controller: pageController,
-        onPageChanged: (index) {
-          setState(() {
-            activePageIdx = index;
-          });
-        },
-        children: [
-          BackupOption(
-            title: 'twonly Backup',
-            description: context.lang.backupTwonlySafeDesc,
-            bottomButton: FilledButton(
-              onPressed: changeTwonlySafePassword,
-              child: Text(context.lang.backupChangePassword),
-            ),
-            child: (gUser.twonlySafeBackup == null)
-                ? null
-                : Column(
-                    children: [
-                      Table(
-                        defaultVerticalAlignment:
-                            TableCellVerticalAlignment.middle,
-                        children: [
-                          ...[
-                            (
-                              context.lang.backupServer,
-                              (backupServer.serverUrl.contains('@'))
-                                  ? backupServer.serverUrl.split('@')[1]
-                                  : backupServer.serverUrl.replaceAll(
-                                      'https://',
-                                      '',
-                                    ),
-                            ),
-                            (
-                              context.lang.backupMaxBackupSize,
-                              formatBytes(backupServer.maxBackupBytes),
-                            ),
-                            (
-                              context.lang.backupStorageRetention,
-                              '${backupServer.retentionDays} Days',
-                            ),
-                            (
-                              context.lang.backupLastBackupDate,
-                              formatDateTime(
-                                context,
-                                gUser.twonlySafeBackup!.lastBackupDone,
-                              ),
-                            ),
-                            (
-                              context.lang.backupLastBackupSize,
-                              formatBytes(
-                                gUser.twonlySafeBackup!.lastBackupSize,
-                              ),
-                            ),
-                            (
-                              context.lang.backupLastBackupResult,
-                              backupStatus(
-                                gUser.twonlySafeBackup!.backupUploadState,
-                              ),
-                            ),
-                          ].map((pair) {
-                            return TableRow(
-                              children: [
-                                TableCell(
-                                  // padding: EdgeInsets.all(4),
-                                  child: Text(pair.$1),
-                                ),
-                                TableCell(
-                                  child: Padding(
-                                    padding: const EdgeInsets.symmetric(
-                                      vertical: 4,
-                                    ),
-                                    child: Text(
-                                      pair.$2,
-                                      textAlign: TextAlign.right,
-                                    ),
-                                  ),
-                                ),
-                              ],
-                            );
-                          }),
-                        ],
-                      ),
-                      const SizedBox(height: 10),
-                      OutlinedButton(
-                        onPressed: isLoading
-                            ? null
-                            : () async {
-                                setState(() {
-                                  isLoading = true;
-                                });
-                                await performTwonlySafeBackup(force: true);
-                                setState(() {
-                                  isLoading = false;
-                                });
-                              },
-                        child: Text(context.lang.backupTwonlySaveNow),
-                      ),
-                    ],
-                  ),
-          ),
-          BackupOption(
-            title: '${context.lang.backupData} (Coming Soon)',
-            description: context.lang.backupDataDesc,
-          ),
-        ],
-      ),
-      bottomNavigationBar: BottomNavigationBar(
-        showSelectedLabels: true,
-        showUnselectedLabels: true,
-        unselectedIconTheme: IconThemeData(
-          color: Theme.of(context).colorScheme.inverseSurface.withAlpha(150),
-        ),
-        selectedIconTheme: IconThemeData(
-          color: Theme.of(context).colorScheme.inverseSurface,
-        ),
-        items: [
-          const BottomNavigationBarItem(
-            icon: FaIcon(FontAwesomeIcons.vault, size: 17),
-            label: 'twonly Backup',
-          ),
-          BottomNavigationBarItem(
-            icon: const FaIcon(Icons.archive_outlined, size: 17),
-            label: context.lang.backupData,
-          ),
-        ],
-        onTap: (index) async {
-          activePageIdx = index;
-          await pageController.animateToPage(
-            index,
-            duration: const Duration(milliseconds: 100),
-            curve: Curves.bounceIn,
-          );
-          if (mounted) setState(() {});
-        },
-        currentIndex: activePageIdx,
-        // ),
-      ),
-    );
-  }
-}
-
-class BackupOption extends StatelessWidget {
-  const BackupOption({
-    required this.title,
-    required this.description,
-    this.bottomButton,
-    super.key,
-    this.child,
-  });
-  final String title;
-  final String description;
-  final Widget? child;
-  final Widget? bottomButton;
-
-  @override
-  Widget build(BuildContext context) {
-    return Card(
-      margin: const EdgeInsets.all(16),
-      child: Padding(
-        padding: const EdgeInsets.all(16),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text(
-              title,
-              style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
-            ),
-            const SizedBox(height: 8),
-            Text(description),
-            const SizedBox(height: 8),
-            if (child != null) child! else Container(),
-            Expanded(child: Container()),
-            if (bottomButton != null) Center(child: bottomButton),
-          ],
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/src/views/settings/chat/chat_reactions.view.dart b/lib/src/views/settings/chat/chat_reactions.view.dart
deleted file mode 100644
index 6adae922..00000000
--- a/lib/src/views/settings/chat/chat_reactions.view.dart
+++ /dev/null
@@ -1,112 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/storage.dart';
-import 'package:twonly/src/views/components/animate_icon.dart';
-
-class ChatReactionSelectionView extends StatefulWidget {
-  const ChatReactionSelectionView({super.key});
-
-  @override
-  State<ChatReactionSelectionView> createState() =>
-      _ChatReactionSelectionView();
-}
-
-class _ChatReactionSelectionView extends State<ChatReactionSelectionView> {
-  List<String> selectedEmojis = [];
-
-  @override
-  void initState() {
-    super.initState();
-    unawaited(initAsync());
-  }
-
-  Future<void> initAsync() async {
-    final user = await getUser();
-    if (user != null && user.preSelectedEmojies != null) {
-      selectedEmojis = user.preSelectedEmojies!;
-    } else {
-      selectedEmojis = EmojiAnimation.animatedIcons.keys.toList().sublist(0, 6);
-    }
-    setState(() {});
-  }
-
-  Future<void> _onEmojiSelected(String emoji) async {
-    if (selectedEmojis.contains(emoji)) {
-      selectedEmojis.remove(emoji);
-    } else {
-      if (selectedEmojis.length < 12) {
-        selectedEmojis.add(emoji);
-        await updateUserdata((user) {
-          user.preSelectedEmojies = selectedEmojis;
-          return user;
-        });
-      } else {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(context.lang.settingsPreSelectedReactionsError),
-            duration: const Duration(seconds: 3),
-          ),
-        );
-      }
-    }
-    setState(() {});
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: const Text('Select Reactions'),
-      ),
-      body: GridView.builder(
-        gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-          crossAxisCount: 4, // Number of columns
-        ),
-        itemCount: EmojiAnimation.animatedIcons.keys.length,
-        itemBuilder: (context, index) {
-          final emoji = EmojiAnimation.animatedIcons.keys.elementAt(index);
-          return GestureDetector(
-            onTap: () async {
-              await _onEmojiSelected(emoji);
-            },
-            child: Card(
-              color: selectedEmojis.contains(emoji)
-                  ? context.color.primary.withAlpha(150)
-                  : context.color.surface,
-              child: Center(
-                child: SizedBox(
-                  width: 40,
-                  height: 40,
-                  child: EmojiAnimation(
-                    emoji: emoji,
-                    // repeat: selectedEmojis.contains(emoji),
-                  ),
-                ),
-              ),
-            ),
-          );
-        },
-      ),
-      floatingActionButton: Padding(
-        padding: const EdgeInsets.only(bottom: 30),
-        child: FloatingActionButton(
-          foregroundColor: Colors.white,
-          onPressed: () async {
-            selectedEmojis = EmojiAnimation.animatedIcons.keys.toList().sublist(
-              0,
-              6,
-            );
-            setState(() {});
-            await updateUserdata((user) {
-              user.preSelectedEmojies = selectedEmojis;
-              return user;
-            });
-          },
-          child: const Icon(Icons.settings_backup_restore_rounded),
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/src/views/settings/developer/developer.view.dart b/lib/src/views/settings/developer/developer.view.dart
deleted file mode 100644
index a9d3ca57..00000000
--- a/lib/src/views/settings/developer/developer.view.dart
+++ /dev/null
@@ -1,127 +0,0 @@
-import 'dart:async';
-import 'package:clock/clock.dart';
-import 'package:drift/drift.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:go_router/go_router.dart';
-import 'package:restart_app/restart_app.dart';
-import 'package:twonly/globals.dart';
-import 'package:twonly/src/constants/routes.keys.dart';
-import 'package:twonly/src/database/twonly.db.dart';
-import 'package:twonly/src/utils/storage.dart';
-import 'package:twonly/src/views/components/alert_dialog.dart';
-
-class DeveloperSettingsView extends StatefulWidget {
-  const DeveloperSettingsView({super.key});
-
-  @override
-  State<DeveloperSettingsView> createState() => _DeveloperSettingsViewState();
-}
-
-class _DeveloperSettingsViewState extends State<DeveloperSettingsView> {
-  @override
-  void initState() {
-    super.initState();
-  }
-
-  Future<void> toggleDeveloperSettings() async {
-    await updateUserdata((u) {
-      u.isDeveloper = !u.isDeveloper;
-      return u;
-    });
-    setState(() {});
-  }
-
-  Future<void> toggleVideoStabilization() async {
-    await updateUserdata((u) {
-      u.videoStabilizationEnabled = !u.videoStabilizationEnabled;
-      return u;
-    });
-    setState(() {});
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: const Text('Developer Settings'),
-      ),
-      body: ListView(
-        children: [
-          ListTile(
-            title: const Text('Show Developer Settings'),
-            onTap: toggleDeveloperSettings,
-            trailing: Switch(
-              value: gUser.isDeveloper,
-              onChanged: (a) => toggleDeveloperSettings(),
-            ),
-          ),
-          ListTile(
-            title: const Text('Show Retransmission Database'),
-            onTap: () =>
-                context.push(Routes.settingsDeveloperRetransmissionDatabase),
-          ),
-          ListTile(
-            title: const Text('Toggle Video Stabilization'),
-            onTap: toggleVideoStabilization,
-            trailing: Switch(
-              value: gUser.videoStabilizationEnabled,
-              onChanged: (a) => toggleVideoStabilization(),
-            ),
-          ),
-          ListTile(
-            title: const Text('Delete all (!) app data'),
-            onTap: () async {
-              final ok = await showAlertDialog(
-                context,
-                'Sure?',
-                'If you do not have a backup, you have to register with a new account.',
-              );
-              if (ok) {
-                await deleteLocalUserData();
-                await Restart.restartApp(
-                  notificationTitle: 'Account successfully deleted',
-                  notificationBody: 'Click here to open the app again',
-                  forceKill: true,
-                );
-              }
-            },
-          ),
-          ListTile(
-            title: const Text('Reduce flames'),
-            onTap: () => context.push(Routes.settingsDeveloperReduceFlames),
-          ),
-          if (!kReleaseMode)
-            ListTile(
-              title: const Text('Make it possible to reset flames'),
-              onTap: () async {
-                final chats = await twonlyDB.groupsDao.getAllDirectChats();
-
-                for (final chat in chats) {
-                  await twonlyDB.groupsDao.updateGroup(
-                    chat.groupId,
-                    GroupsCompanion(
-                      flameCounter: const Value(0),
-                      maxFlameCounter: const Value(365),
-                      lastFlameCounterChange: Value(clock.now()),
-                      maxFlameCounterFrom: Value(
-                        clock.now().subtract(const Duration(days: 1)),
-                      ),
-                    ),
-                  );
-                }
-                await HapticFeedback.heavyImpact();
-              },
-            ),
-          if (!kReleaseMode)
-            ListTile(
-              title: const Text('Automated Testing'),
-              onTap: () =>
-                  context.push(Routes.settingsDeveloperAutomatedTesting),
-            ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/src/views/settings/help/faq.view.dart b/lib/src/views/settings/help/faq.view.dart
deleted file mode 100644
index c6e10da0..00000000
--- a/lib/src/views/settings/help/faq.view.dart
+++ /dev/null
@@ -1,113 +0,0 @@
-// ignore_for_file: avoid_dynamic_calls, inference_failure_on_untyped_parameter
-
-import 'dart:async';
-import 'dart:convert';
-import 'package:flutter/material.dart';
-import 'package:http/http.dart' as http;
-import 'package:twonly/src/utils/log.dart';
-import 'package:twonly/src/utils/misc.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-class FaqView extends StatefulWidget {
-  const FaqView({super.key});
-
-  @override
-  State<FaqView> createState() => _FaqViewState();
-}
-
-class _FaqViewState extends State<FaqView> {
-  Map<String, dynamic>? _faqData;
-  String? _locale;
-  late String domain;
-  bool noInternet = false;
-
-  @override
-  void initState() {
-    super.initState();
-    domain = 'https://twonly.eu';
-    unawaited(_fetchFAQData());
-  }
-
-  Future<void> _fetchFAQData() async {
-    try {
-      final response = await http.get(Uri.parse('$domain/faq.json'));
-
-      if (response.statusCode == 200) {
-        setState(() {
-          _faqData =
-              json.decode(utf8.decode(response.bodyBytes))
-                  as Map<String, dynamic>?;
-          noInternet = false;
-        });
-      } else {
-        Log.error('FAQ got ${response.statusCode}');
-      }
-    } catch (e) {
-      Log.error(e);
-      setState(() {
-        noInternet = true;
-      });
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    if (noInternet) {
-      return Scaffold(
-        appBar: AppBar(
-          title: Text(context.lang.settingsHelpFAQ),
-        ),
-        body: const Center(
-          child: Text('Could not load the FAQ.'),
-        ),
-      );
-    }
-
-    if (_faqData == null) {
-      return Scaffold(
-        appBar: AppBar(
-          title: Text(context.lang.settingsHelpFAQ),
-        ),
-        body: const Center(child: CircularProgressIndicator()),
-      );
-    }
-
-    final faq = _faqData![_locale ?? 'en'] as Map;
-
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(context.lang.settingsHelpFAQ),
-      ),
-      body: ListView.builder(
-        itemCount: faq.keys.length,
-        itemBuilder: (context, index) {
-          final category = faq.keys.elementAt(index);
-          final categoryData = faq[category];
-
-          return Card(
-            child: ExpansionTile(
-              title: Text(categoryData['meta']['title'] as String),
-              subtitle: Text(categoryData['meta']['desc'] as String),
-              children:
-                  categoryData['questions'].map<Widget>((question) {
-                        return ListTile(
-                          title: Text(question['title'] as String),
-                          onTap: () => _launchURL(question['path'] as String),
-                        );
-                      }).toList()
-                      as List<Widget>,
-            ),
-          );
-        },
-      ),
-    );
-  }
-
-  Future<void> _launchURL(String path) async {
-    try {
-      await launchUrl(Uri.parse('$domain$path'));
-    } catch (e) {
-      Log.error('Could not launch $e');
-    }
-  }
-}
diff --git a/lib/src/views/settings/help/faq/verifybadge.dart b/lib/src/views/settings/help/faq/verifybadge.dart
deleted file mode 100644
index 4bb9e176..00000000
--- a/lib/src/views/settings/help/faq/verifybadge.dart
+++ /dev/null
@@ -1,84 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:go_router/go_router.dart';
-import 'package:twonly/src/constants/routes.keys.dart';
-import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/better_list_title.dart';
-import 'package:twonly/src/views/components/svg_icon.dart';
-
-const colorVerificationBadgeYellow = Color(0xffffa500);
-
-class VerificationBadeFaqView extends StatefulWidget {
-  const VerificationBadeFaqView({super.key});
-
-  @override
-  State<VerificationBadeFaqView> createState() =>
-      _VerificationBadeFaqViewState();
-}
-
-class _VerificationBadeFaqViewState extends State<VerificationBadeFaqView> {
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(context.lang.verificationBadgeTitle),
-      ),
-      body: ListView(
-        padding: const EdgeInsets.all(40),
-        children: [
-          Text(
-            context.lang.verificationBadgeGeneralDesc,
-            textAlign: TextAlign.center,
-          ),
-          const SizedBox(height: 40),
-          _buildItem(
-            icon: const SvgIcon(assetPath: SvgIcons.verifiedGreen, size: 40),
-            description: context.lang.verificationBadgeGreenDesc,
-          ),
-          _buildItem(
-            icon: const SvgIcon(
-              assetPath: SvgIcons.verifiedGreen,
-              size: 40,
-              color: colorVerificationBadgeYellow,
-            ),
-            description: context.lang.verificationBadgeYellowDesc,
-          ),
-          _buildItem(
-            icon: const SvgIcon(assetPath: SvgIcons.verifiedRed, size: 40),
-            description: context.lang.verificationBadgeRedDesc,
-          ),
-          const SizedBox(height: 20),
-          const SizedBox(height: 20),
-          BetterListTile(
-            leading: const FaIcon(FontAwesomeIcons.camera),
-            text: context.lang.scanOtherProfile,
-            onTap: () => context.push(Routes.cameraQRScanner),
-          ),
-          BetterListTile(
-            leading: const FaIcon(FontAwesomeIcons.qrcode),
-            text: context.lang.openYourOwnQRcode,
-            onTap: () => context.push(Routes.settingsPublicProfile),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildItem({required Widget icon, required String description}) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 40),
-      child: Row(
-        children: [
-          icon,
-          const SizedBox(width: 20),
-          Expanded(
-            child: Text(
-              description,
-              style: const TextStyle(fontSize: 16, height: 1.4),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/src/views/settings/help/help.view.dart b/lib/src/views/settings/help/help.view.dart
deleted file mode 100644
index 19b671e2..00000000
--- a/lib/src/views/settings/help/help.view.dart
+++ /dev/null
@@ -1,143 +0,0 @@
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:go_router/go_router.dart';
-import 'package:package_info_plus/package_info_plus.dart';
-import 'package:twonly/globals.dart';
-import 'package:twonly/src/constants/routes.keys.dart';
-import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/storage.dart';
-import 'package:twonly/src/views/components/alert_dialog.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-class HelpView extends StatefulWidget {
-  const HelpView({super.key});
-
-  @override
-  State<HelpView> createState() => _HelpViewState();
-}
-
-class _HelpViewState extends State<HelpView> {
-  Future<void> toggleAllowErrorTrackingViaSentry() async {
-    await updateUserdata((u) {
-      u.allowErrorTrackingViaSentry = !u.allowErrorTrackingViaSentry;
-      return u;
-    });
-    setState(() {});
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(context.lang.settingsHelp),
-      ),
-      body: ListView(
-        children: [
-          ListTile(
-            title: Text(context.lang.settingsHelpFAQ),
-            onTap: () => context.push(Routes.settingsHelpFaq),
-          ),
-          ListTile(
-            title: Text(context.lang.settingsHelpContactUs),
-            onTap: () => context.push(Routes.settingsHelpContactUs),
-          ),
-          const Divider(),
-          ListTile(
-            title: Text(context.lang.allowErrorTracking),
-            subtitle: Text(
-              context.lang.allowErrorTrackingSubtitle,
-              style: const TextStyle(fontSize: 10),
-            ),
-            onTap: toggleAllowErrorTrackingViaSentry,
-            trailing: Switch(
-              value: gUser.allowErrorTrackingViaSentry,
-              onChanged: (a) => toggleAllowErrorTrackingViaSentry(),
-            ),
-          ),
-          ListTile(
-            title: Text(context.lang.settingsHelpDiagnostics),
-            onTap: () => context.push(Routes.settingsHelpDiagnostics),
-          ),
-          const Divider(),
-          if (gUser.userStudyParticipantsToken == null || kDebugMode)
-            ListTile(
-              title: const Text('Teilnahme an Nutzerstudie'),
-              onTap: () => context.push(Routes.settingsHelpUserStudy),
-            ),
-          FutureBuilder(
-            future: PackageInfo.fromPlatform(),
-            builder: (context, snap) {
-              if (snap.hasData) {
-                return ListTile(
-                  title: Text(context.lang.settingsHelpVersion),
-                  subtitle: Text(snap.data!.version),
-                );
-              } else {
-                return Container();
-              }
-            },
-          ),
-          ListTile(
-            title: Text(context.lang.settingsHelpLicenses),
-            onTap: () => showLicensePage(context: context),
-          ),
-          ListTile(
-            title: Text(context.lang.settingsHelpCredits),
-            onTap: () => context.push(Routes.settingsHelpCredits),
-          ),
-          ListTile(
-            title: const Text('Changelog'),
-            onTap: () => context.push(Routes.settingsHelpChangelog),
-          ),
-          ListTile(
-            title: const Text('Open Source'),
-            onTap: () => launchUrl(
-              Uri.parse('https://github.com/twonlyapp/twonly-app'),
-            ),
-            trailing: const FaIcon(
-              FontAwesomeIcons.arrowUpRightFromSquare,
-              size: 15,
-            ),
-          ),
-          ListTile(
-            title: Text(context.lang.settingsHelpImprint),
-            onTap: () => launchUrl(Uri.parse('https://twonly.eu/de/legal/')),
-            trailing: const FaIcon(
-              FontAwesomeIcons.arrowUpRightFromSquare,
-              size: 15,
-            ),
-          ),
-          ListTile(
-            title: Text(context.lang.settingsHelpTerms),
-            onTap: () =>
-                launchUrl(Uri.parse('https://twonly.eu/de/legal/agb.html')),
-            trailing: const FaIcon(
-              FontAwesomeIcons.arrowUpRightFromSquare,
-              size: 15,
-            ),
-          ),
-          ListTile(
-            onLongPress: () async {
-              final okay = await showAlertDialog(
-                context,
-                'Developer Settings',
-                'Do you want to enable the developer settings?',
-              );
-              if (okay) {
-                await updateUserdata((u) {
-                  u.isDeveloper = true;
-                  return u;
-                });
-              }
-            },
-            title: const Text(
-              'Copyright twonly',
-              style: TextStyle(color: Colors.grey, fontSize: 13),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/src/views/settings/profile/profile.view.dart b/lib/src/views/settings/profile/profile.view.dart
deleted file mode 100644
index fa743e29..00000000
--- a/lib/src/views/settings/profile/profile.view.dart
+++ /dev/null
@@ -1,251 +0,0 @@
-import 'dart:async';
-import 'package:avatar_maker/avatar_maker.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:go_router/go_router.dart';
-import 'package:twonly/globals.dart';
-import 'package:twonly/src/constants/routes.keys.dart';
-import 'package:twonly/src/model/protobuf/api/websocket/error.pb.dart';
-import 'package:twonly/src/services/backup/common.backup.dart';
-import 'package:twonly/src/services/backup/create.backup.dart';
-import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/storage.dart';
-import 'package:twonly/src/views/components/better_list_title.dart';
-import 'package:twonly/src/views/groups/group.view.dart';
-
-class ProfileView extends StatefulWidget {
-  const ProfileView({super.key});
-
-  @override
-  State<ProfileView> createState() => _ProfileViewState();
-}
-
-class _ProfileViewState extends State<ProfileView> {
-  final AvatarMakerController _avatarMakerController =
-      PersistentAvatarMakerController(customizedPropertyCategories: []);
-
-  int twonlyScore = 0;
-  late StreamSubscription<int> twonlyScoreSub;
-
-  @override
-  void initState() {
-    twonlyScoreSub = twonlyDB.groupsDao.watchSumTotalMediaCounter().listen((
-      update,
-    ) {
-      setState(() {
-        twonlyScore = update;
-      });
-    });
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    twonlyScoreSub.cancel();
-    super.dispose();
-  }
-
-  Future<void> updateUserDisplayName(String displayName) async {
-    await updateUserdata((user) {
-      user
-        ..displayName = displayName
-        ..avatarCounter = user.avatarCounter + 1;
-      return user;
-    });
-    if (mounted) setState(() {}); // gUser has updated
-  }
-
-  Future<void> _updateUsername(String username) async {
-    var filteredUsername = username.replaceAll(
-      RegExp('[^a-zA-Z0-9._]'),
-      '',
-    );
-
-    if (filteredUsername.length > 12) {
-      filteredUsername = filteredUsername.substring(0, 12);
-    }
-
-    final result = await apiService.changeUsername(filteredUsername);
-    if (result.isError) {
-      if (!mounted) return;
-
-      if (result.error == ErrorCode.UsernameAlreadyTaken ||
-          result.error == ErrorCode.UsernameNotValid) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(
-              result.error == ErrorCode.UsernameAlreadyTaken
-                  ? context.lang.errorUsernameAlreadyTaken
-                  : context.lang.errorUsernameNotValid,
-            ),
-            duration: const Duration(seconds: 3),
-          ),
-        );
-        return;
-      }
-
-      showNetworkIssue(context);
-
-      return;
-    }
-
-    // as the username has changes, remove the old from the server and then upload it again.
-    await removeTwonlySafeFromServer();
-    unawaited(performTwonlySafeBackup(force: true));
-
-    await updateUserdata((user) {
-      user
-        ..username = username
-        ..avatarCounter = user.avatarCounter + 1;
-      return user;
-    });
-    setState(() {}); // gUser has updated
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(context.lang.settingsProfile),
-      ),
-      body: ListView(
-        physics: const BouncingScrollPhysics(),
-        children: <Widget>[
-          const SizedBox(height: 25),
-          AvatarMakerAvatar(
-            backgroundColor: Colors.transparent,
-            radius: 80,
-            controller: _avatarMakerController,
-          ),
-          const SizedBox(height: 10),
-          Center(
-            child: SizedBox(
-              height: 35,
-              child: ElevatedButton.icon(
-                icon: const Icon(Icons.edit),
-                label: Text(context.lang.settingsProfileCustomizeAvatar),
-                onPressed: () async {
-                  await context.push(Routes.settingsProfileModifyAvatar);
-                  await _avatarMakerController.performRestore();
-                  setState(() {});
-                },
-              ),
-            ),
-          ),
-          const SizedBox(height: 20),
-          const Divider(),
-          BetterListTile(
-            leading: const Padding(
-              padding: EdgeInsets.only(right: 5, left: 1),
-              child: FaIcon(
-                FontAwesomeIcons.qrcode,
-                size: 20,
-              ),
-            ),
-            onTap: () => context.push(Routes.settingsPublicProfile),
-            text: context.lang.profileYourQrCode,
-          ),
-          BetterListTile(
-            leading: const Padding(
-              padding: EdgeInsets.only(right: 5, left: 1),
-              child: FaIcon(
-                FontAwesomeIcons.at,
-                size: 20,
-              ),
-            ),
-            text: context.lang.registerUsernameDecoration,
-            subtitle: Text(gUser.username),
-            onTap: () async {
-              final username = await showDisplayNameChangeDialog(
-                context,
-                gUser.username,
-                context.lang.registerUsernameDecoration,
-                context.lang.registerUsernameDecoration,
-                maxLength: 12,
-                inputFormatters: [
-                  LengthLimitingTextInputFormatter(12),
-                  FilteringTextInputFormatter.allow(RegExp('[a-z0-9A-Z._]')),
-                ],
-              );
-              if (context.mounted && username != null && username != '') {
-                await _updateUsername(username);
-              }
-            },
-          ),
-          BetterListTile(
-            icon: FontAwesomeIcons.userPen,
-            text: context.lang.settingsProfileEditDisplayName,
-            subtitle: Text(gUser.displayName),
-            onTap: () async {
-              final displayName = await showDisplayNameChangeDialog(
-                context,
-                gUser.displayName,
-                context.lang.settingsProfileEditDisplayName,
-                context.lang.settingsProfileEditDisplayNameNew,
-                maxLength: 30,
-              );
-              if (context.mounted && displayName != null && displayName != '') {
-                await updateUserDisplayName(displayName);
-              }
-            },
-          ),
-          BetterListTile(
-            text: context.lang.yourTwonlyScore,
-            icon: FontAwesomeIcons.trophy,
-            trailing: Text(
-              twonlyScore.toString(),
-              style: TextStyle(
-                color: context.color.primary,
-                fontSize: 18,
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-Future<String?> showDisplayNameChangeDialog(
-  BuildContext context,
-  String currentName,
-  String title,
-  String hintText, {
-  List<TextInputFormatter>? inputFormatters,
-  int? maxLength,
-}) {
-  final controller = TextEditingController(text: currentName);
-
-  return showDialog<String>(
-    context: context,
-    builder: (context) {
-      return AlertDialog(
-        title: Text(title),
-        content: TextField(
-          controller: controller,
-          autofocus: true,
-          inputFormatters: inputFormatters,
-          maxLength: maxLength,
-          decoration: InputDecoration(
-            hintText: hintText,
-          ),
-        ),
-        actions: <Widget>[
-          TextButton(
-            child: Text(context.lang.cancel),
-            onPressed: () {
-              Navigator.of(context).pop();
-            },
-          ),
-          TextButton(
-            child: Text(context.lang.ok),
-            onPressed: () {
-              Navigator.of(context).pop(controller.text);
-            },
-          ),
-        ],
-      );
-    },
-  );
-}
diff --git a/lib/src/views/settings/settings_main.view.dart b/lib/src/views/settings/settings_main.view.dart
deleted file mode 100644
index 47a11a4f..00000000
--- a/lib/src/views/settings/settings_main.view.dart
+++ /dev/null
@@ -1,146 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:go_router/go_router.dart';
-import 'package:twonly/globals.dart';
-import 'package:twonly/src/constants/routes.keys.dart';
-import 'package:twonly/src/database/daos/contacts.dao.dart';
-import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/avatar_icon.component.dart';
-import 'package:twonly/src/views/components/better_list_title.dart';
-
-class SettingsMainView extends StatefulWidget {
-  const SettingsMainView({super.key});
-
-  @override
-  State<SettingsMainView> createState() => _SettingsMainViewState();
-}
-
-class _SettingsMainViewState extends State<SettingsMainView> {
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(context.lang.settingsTitle),
-      ),
-      body: ListView(
-        children: [
-          Padding(
-            padding: const EdgeInsets.all(30),
-            child: Row(
-              children: [
-                Expanded(
-                  child: GestureDetector(
-                    onTap: () async {
-                      await context.push(Routes.settingsProfile);
-                      setState(() {});
-                    },
-                    child: ColoredBox(
-                      color: context.color.surface.withAlpha(0),
-                      child: Row(
-                        children: [
-                          const AvatarIcon(
-                            myAvatar: true,
-                            fontSize: 30,
-                          ),
-                          Container(width: 20, color: Colors.transparent),
-                          Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              Text(
-                                substringBy(gUser.displayName, 27),
-                                style: const TextStyle(fontSize: 20),
-                                textAlign: TextAlign.left,
-                              ),
-                              Text(
-                                gUser.username,
-                                style: const TextStyle(
-                                  fontSize: 14,
-                                ),
-                                textAlign: TextAlign.left,
-                              ),
-                            ],
-                          ),
-                        ],
-                      ),
-                    ),
-                  ),
-                ),
-                Align(
-                  alignment: Alignment.centerRight,
-                  child: IconButton(
-                    onPressed: () => context.push(Routes.settingsPublicProfile),
-                    icon: const FaIcon(FontAwesomeIcons.qrcode),
-                  ),
-                ),
-              ],
-            ),
-          ),
-          BetterListTile(
-            icon: FontAwesomeIcons.user,
-            text: context.lang.settingsAccount,
-            onTap: () => context.push(Routes.settingsAccount),
-          ),
-          BetterListTile(
-            icon: FontAwesomeIcons.shieldHeart,
-            text: context.lang.settingsSubscription,
-            onTap: () => context.push(Routes.settingsSubscription),
-          ),
-          BetterListTile(
-            icon: Icons.lock_clock_rounded,
-            text: context.lang.settingsBackup,
-            onTap: () => context.push(Routes.settingsBackup),
-          ),
-          const Divider(),
-          BetterListTile(
-            icon: FontAwesomeIcons.sun,
-            text: context.lang.settingsAppearance,
-            onTap: () => context.push(Routes.settingsAppearance),
-          ),
-          BetterListTile(
-            icon: FontAwesomeIcons.comment,
-            text: context.lang.settingsChats,
-            onTap: () => context.push(Routes.settingsChats),
-          ),
-          BetterListTile(
-            icon: FontAwesomeIcons.lock,
-            text: context.lang.settingsPrivacy,
-            onTap: () => context.push(Routes.settingsPrivacy),
-          ),
-          BetterListTile(
-            icon: FontAwesomeIcons.bell,
-            text: context.lang.settingsNotification,
-            onTap: () => context.push(Routes.settingsNotification),
-          ),
-          BetterListTile(
-            icon: FontAwesomeIcons.chartPie,
-            iconSize: 15,
-            text: context.lang.settingsStorageData,
-            onTap: () => context.push(Routes.settingsStorage),
-          ),
-          const Divider(),
-          BetterListTile(
-            icon: FontAwesomeIcons.circleQuestion,
-            text: context.lang.settingsHelp,
-            onTap: () async {
-              await context.push(Routes.settingsHelp);
-              setState(() {
-                // gUser could have been changed
-              });
-            },
-          ),
-          if (gUser.isDeveloper)
-            BetterListTile(
-              icon: FontAwesomeIcons.code,
-              text: 'Developer Settings',
-              onTap: () => context.push(Routes.settingsDeveloper),
-            ),
-          BetterListTile(
-            icon: FontAwesomeIcons.shareFromSquare,
-            text: context.lang.inviteFriends,
-            onTap: () => context.push(Routes.settingsInvite),
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/src/views/settings/subscription_custom/checkout.view.dart b/lib/src/views/settings/subscription_custom/checkout.view.dart
deleted file mode 100644
index 916c6d87..00000000
--- a/lib/src/views/settings/subscription_custom/checkout.view.dart
+++ /dev/null
@@ -1,130 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:twonly/src/services/subscription.service.dart';
-import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/settings/subscription_custom/select_payment.view.dart';
-import 'package:twonly/src/views/settings/subscription_custom/subscription.view.dart';
-
-class CheckoutView extends StatefulWidget {
-  const CheckoutView({
-    required this.plan,
-    super.key,
-    this.disableMonthlyOption,
-  });
-
-  final SubscriptionPlan plan;
-  final bool? disableMonthlyOption;
-
-  @override
-  State<CheckoutView> createState() => _CheckoutViewState();
-}
-
-class _CheckoutViewState extends State<CheckoutView> {
-  int checkoutInCents = 0;
-  bool paidMonthly = false;
-  bool tryAutoRenewal = true;
-
-  @override
-  void initState() {
-    super.initState();
-    setCheckout(init: true);
-  }
-
-  void setCheckout({bool init = false}) {
-    checkoutInCents = getPlanPrice(widget.plan, paidMonthly: paidMonthly);
-    if (!init) {
-      setState(() {});
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final totalPrice =
-        '${localePrizing(context, checkoutInCents)}/${paidMonthly ? context.lang.month : context.lang.year}';
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(context.lang.checkoutOptions),
-      ),
-      body: SafeArea(
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.stretch,
-          children: [
-            Expanded(
-              child: ListView(
-                children: [
-                  PlanCard(plan: widget.plan),
-                  if (widget.disableMonthlyOption == null ||
-                      !widget.disableMonthlyOption!)
-                    Padding(
-                      padding: const EdgeInsets.all(16),
-                      child: ListTile(
-                        title: Text(context.lang.checkoutPayYearly),
-                        onTap: () {
-                          paidMonthly = !paidMonthly;
-                          setCheckout();
-                        },
-                        trailing: Checkbox(
-                          value: !paidMonthly,
-                          onChanged: (a) {
-                            paidMonthly = !paidMonthly;
-                            setCheckout();
-                          },
-                        ),
-                      ),
-                    ),
-                ],
-              ),
-            ),
-            Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 16),
-              child: Card(
-                color: context.color.surfaceContainer,
-                child: Padding(
-                  padding: const EdgeInsets.all(16),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                    children: [
-                      Text(
-                        context.lang.checkoutTotal,
-                        style: const TextStyle(fontWeight: FontWeight.bold),
-                      ),
-                      Text(
-                        totalPrice,
-                        textAlign: TextAlign.end,
-                      ),
-                    ],
-                  ),
-                ),
-              ),
-            ),
-            const SizedBox(height: 16),
-            Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 16),
-              child: FilledButton(
-                onPressed: () async {
-                  final success =
-                      await Navigator.push(
-                            context,
-                            MaterialPageRoute(
-                              builder: (context) {
-                                return SelectPaymentView(
-                                  plan: widget.plan,
-                                  payMonthly: paidMonthly,
-                                );
-                              },
-                            ),
-                          )
-                          as bool?;
-                  if (success != null && success && context.mounted) {
-                    Navigator.pop(context);
-                  }
-                },
-                child: Text(context.lang.selectPaymentMethod),
-              ),
-            ),
-            const SizedBox(height: 20),
-          ],
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/src/views/settings/subscription_custom/manage_subscription.view.dart b/lib/src/views/settings/subscription_custom/manage_subscription.view.dart
deleted file mode 100644
index 5e15e9a2..00000000
--- a/lib/src/views/settings/subscription_custom/manage_subscription.view.dart
+++ /dev/null
@@ -1,103 +0,0 @@
-import 'dart:async';
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
-import 'package:twonly/globals.dart';
-import 'package:twonly/src/model/protobuf/api/websocket/error.pb.dart';
-import 'package:twonly/src/model/protobuf/api/websocket/server_to_client.pb.dart';
-import 'package:twonly/src/providers/purchases.provider.dart';
-import 'package:twonly/src/services/subscription.service.dart';
-import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/settings/subscription_custom/subscription.view.dart';
-
-class ManageSubscriptionView extends StatefulWidget {
-  const ManageSubscriptionView({
-    required this.ballance,
-    required this.nextPayment,
-    super.key,
-  });
-
-  final Response_PlanBallance? ballance;
-  final DateTime? nextPayment;
-
-  @override
-  State<ManageSubscriptionView> createState() => _ManageSubscriptionViewState();
-}
-
-class _ManageSubscriptionViewState extends State<ManageSubscriptionView> {
-  Response_PlanBallance? ballance;
-  bool? autoRenewal;
-
-  @override
-  void initState() {
-    super.initState();
-    ballance = widget.ballance;
-    if (ballance != null) {
-      autoRenewal = ballance!.autoRenewal;
-    }
-    unawaited(initAsync(true));
-  }
-
-  Future<void> initAsync(bool force) async {
-    if (force) {
-      ballance = await loadPlanBalance(useCache: false);
-      if (ballance != null) {
-        autoRenewal = ballance!.autoRenewal;
-      }
-    }
-    setState(() {});
-  }
-
-  Future<void> toggleRenewalOption() async {
-    final res = await apiService.updatePlanOptions(!autoRenewal!);
-    if (res.isError) {
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(errorCodeToText(context, res.error as ErrorCode)),
-          ),
-        );
-      }
-    }
-    await initAsync(true);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final plan = context.watch<PurchasesProvider>().plan;
-    final myLocale = Localizations.localeOf(context);
-    final paidMonthly = ballance?.paymentPeriodDays == MONTHLY_PAYMENT_DAYS;
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(context.lang.manageSubscription),
-      ),
-      body: ListView(
-        children: [
-          PlanCard(plan: plan, paidMonthly: paidMonthly),
-          if (isPayingUser(plan)) const SizedBox(height: 20),
-          if (widget.nextPayment != null && isPayingUser(plan))
-            ListTile(
-              title: Text(
-                '${context.lang.nextPayment}: ${DateFormat.yMMMMd(myLocale.toString()).format(widget.nextPayment!)}',
-              ),
-            ),
-          if (autoRenewal != null && isPayingUser(plan))
-            ListTile(
-              title: Text(context.lang.autoRenewal),
-              subtitle: Text(
-                context.lang.autoRenewalLongDesc,
-                style: const TextStyle(fontSize: 12),
-              ),
-              onTap: toggleRenewalOption,
-              trailing: Switch(
-                value: autoRenewal!,
-                onChanged: (a) async {
-                  await toggleRenewalOption();
-                },
-              ),
-            ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/src/views/settings/subscription_custom/select_payment.view.dart b/lib/src/views/settings/subscription_custom/select_payment.view.dart
deleted file mode 100644
index 658eda68..00000000
--- a/lib/src/views/settings/subscription_custom/select_payment.view.dart
+++ /dev/null
@@ -1,286 +0,0 @@
-import 'dart:async';
-
-import 'package:collection/collection.dart';
-import 'package:flutter/material.dart';
-import 'package:twonly/globals.dart';
-import 'package:twonly/src/model/protobuf/api/websocket/error.pbserver.dart';
-import 'package:twonly/src/services/subscription.service.dart';
-import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/storage.dart';
-import 'package:twonly/src/views/settings/subscription_custom/subscription.view.dart';
-import 'package:twonly/src/views/settings/subscription_custom/voucher.view.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-class SelectPaymentView extends StatefulWidget {
-  const SelectPaymentView({
-    super.key,
-    this.plan,
-    this.payMonthly,
-    this.valueInCents,
-  });
-
-  final SubscriptionPlan? plan;
-  final bool? payMonthly;
-  final int? valueInCents;
-
-  @override
-  State<SelectPaymentView> createState() => _SelectPaymentViewState();
-}
-
-enum PaymentMethods {
-  twonlyCredit,
-  googleSubscription,
-  appleSubscription,
-}
-
-class _SelectPaymentViewState extends State<SelectPaymentView> {
-  int? balanceInCents;
-  int checkoutInCents = 0;
-  bool tryAutoRenewal = true;
-
-  PaymentMethods paymentMethods = PaymentMethods.twonlyCredit;
-
-  @override
-  void initState() {
-    super.initState();
-    setCheckout(true);
-    unawaited(initAsync());
-  }
-
-  Future<void> initAsync() async {
-    final balance = await loadPlanBalance();
-    if (balance == null) {
-      balanceInCents = 0;
-    } else {
-      balanceInCents = balance.transactions
-          .map((a) => a.depositCents.toInt())
-          .sum;
-    }
-    setState(() {});
-  }
-
-  void setCheckout(bool init) {
-    if (widget.valueInCents != null && widget.valueInCents! > 0) {
-      checkoutInCents = widget.valueInCents!;
-    } else if (widget.plan != null) {
-      checkoutInCents = getPlanPrice(
-        widget.plan!,
-        paidMonthly: widget.payMonthly!,
-      );
-    } else {
-      /// Nothing to checkout for...
-      Navigator.pop(context);
-    }
-
-    if (!init) {
-      setState(() {});
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final totalPrice = (widget.plan != null && widget.payMonthly != null)
-        ? '${localePrizing(context, checkoutInCents)}/${(widget.payMonthly!) ? context.lang.month : context.lang.year}'
-        : localePrizing(context, checkoutInCents);
-    final canPay =
-        paymentMethods == PaymentMethods.twonlyCredit &&
-        (balanceInCents == null || balanceInCents! >= checkoutInCents);
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(context.lang.selectPaymentMethod),
-      ),
-      body: SafeArea(
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.stretch,
-          children: [
-            Padding(
-              padding: const EdgeInsets.all(16),
-              child: Container(
-                decoration: BoxDecoration(
-                  color: Colors.red,
-                  borderRadius: BorderRadius.circular(16),
-                ),
-                padding: const EdgeInsets.all(16),
-                child: Text(
-                  context.lang.testPaymentMethod,
-                  textAlign: TextAlign.center,
-                ),
-              ),
-            ),
-            Expanded(
-              child: ListView(
-                children: [
-                  Padding(
-                    padding: const EdgeInsets.all(16),
-                    child: Card(
-                      color: context.color.surfaceContainer,
-                      child: Padding(
-                        padding: const EdgeInsets.all(16),
-                        child: Row(
-                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                          children: [
-                            Column(
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                Text(context.lang.twonlyCredit),
-                                if (balanceInCents != null)
-                                  Text(
-                                    '${context.lang.currentBalance}: ${localePrizing(context, balanceInCents!)}',
-                                    style: const TextStyle(fontSize: 10),
-                                  ),
-                              ],
-                            ),
-                            Checkbox(
-                              value:
-                                  paymentMethods == PaymentMethods.twonlyCredit,
-                              onChanged: (value) {
-                                setState(() {
-                                  paymentMethods = PaymentMethods.twonlyCredit;
-                                });
-                              },
-                            ),
-                          ],
-                        ),
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            if (!canPay) ...[
-              Padding(
-                padding: const EdgeInsets.all(16),
-                child: Text(
-                  context.lang.notEnoughCredit,
-                  textAlign: TextAlign.center,
-                  style: const TextStyle(fontSize: 12),
-                ),
-              ),
-              Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 16),
-                child: FilledButton(
-                  onPressed: () async {
-                    await Navigator.push(
-                      context,
-                      MaterialPageRoute(
-                        builder: (context) {
-                          return const VoucherView();
-                        },
-                      ),
-                    );
-                    await initAsync();
-                  },
-                  child: Text(context.lang.chargeCredit),
-                ),
-              ),
-            ],
-            Padding(
-              padding: const EdgeInsets.all(16),
-              child: ListTile(
-                title: Text(context.lang.autoRenewal),
-                subtitle: Text(context.lang.autoRenewalDesc),
-                onTap: () {
-                  tryAutoRenewal = !tryAutoRenewal;
-                  setCheckout(false);
-                },
-                trailing: Checkbox(
-                  value: tryAutoRenewal,
-                  onChanged: (a) {
-                    tryAutoRenewal = !tryAutoRenewal;
-                    setCheckout(false);
-                  },
-                ),
-              ),
-            ),
-            Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 16),
-              child: Card(
-                color: context.color.surfaceContainer,
-                child: Padding(
-                  padding: const EdgeInsets.all(16),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                    children: [
-                      Text(
-                        context.lang.checkoutTotal,
-                        style: const TextStyle(fontWeight: FontWeight.bold),
-                      ),
-                      Text(
-                        totalPrice,
-                        textAlign: TextAlign.end,
-                      ),
-                    ],
-                  ),
-                ),
-              ),
-            ),
-            const SizedBox(height: 16),
-            Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 16),
-              child: FilledButton(
-                onPressed: canPay
-                    ? () async {
-                        final res = await apiService.switchToPayedPlan(
-                          widget.plan!.name,
-                          widget.payMonthly!,
-                          tryAutoRenewal,
-                        );
-                        if (!context.mounted) return;
-                        if (res.isSuccess) {
-                          await updateUsersPlan(context, widget.plan!);
-                          if (!context.mounted) return;
-                          ScaffoldMessenger.of(context).showSnackBar(
-                            SnackBar(
-                              content: Text(context.lang.planSuccessUpgraded),
-                            ),
-                          );
-                          Navigator.of(context).pop(true);
-                        } else {
-                          ScaffoldMessenger.of(context).showSnackBar(
-                            SnackBar(
-                              content: Text(
-                                errorCodeToText(
-                                  context,
-                                  res.error as ErrorCode,
-                                ),
-                              ),
-                            ),
-                          );
-                        }
-                      }
-                    : null,
-                child: Text(context.lang.checkoutSubmit),
-              ),
-            ),
-            Row(
-              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-              children: [
-                TextButton(
-                  onPressed: () => launchUrl(
-                    Uri.parse(
-                      'https://twonly.eu/de/legal/#revocation-policy',
-                    ),
-                  ),
-                  child: const Text(
-                    'Widerrufsbelehrung',
-                    style: TextStyle(color: Colors.blue),
-                  ),
-                ),
-                TextButton(
-                  onPressed: () => launchUrl(
-                    Uri.parse('https://twonly.eu/de/legal/agb.html'),
-                  ),
-                  child: const Text(
-                    'ABG',
-                    style: TextStyle(color: Colors.blue),
-                  ),
-                ),
-              ],
-            ),
-            const SizedBox(height: 20),
-          ],
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/src/views/settings/subscription_custom/subscription.view.dart b/lib/src/views/settings/subscription_custom/subscription.view.dart
deleted file mode 100644
index 4867d27c..00000000
--- a/lib/src/views/settings/subscription_custom/subscription.view.dart
+++ /dev/null
@@ -1,476 +0,0 @@
-// ignore_for_file: inference_failure_on_instance_creation
-import 'dart:async';
-import 'package:collection/collection.dart';
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
-import 'package:twonly/globals.dart';
-import 'package:twonly/src/database/daos/contacts.dao.dart';
-import 'package:twonly/src/model/protobuf/api/websocket/error.pb.dart';
-import 'package:twonly/src/model/protobuf/api/websocket/server_to_client.pb.dart';
-import 'package:twonly/src/providers/purchases.provider.dart';
-import 'package:twonly/src/services/subscription.service.dart';
-import 'package:twonly/src/utils/log.dart';
-import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/storage.dart';
-import 'package:twonly/src/views/components/better_list_title.dart';
-import 'package:twonly/src/views/settings/subscription/additional_users.view.dart';
-import 'package:twonly/src/views/settings/subscription_custom/checkout.view.dart';
-import 'package:twonly/src/views/settings/subscription_custom/manage_subscription.view.dart';
-import 'package:twonly/src/views/settings/subscription_custom/transaction.view.dart';
-import 'package:twonly/src/views/settings/subscription_custom/voucher.view.dart';
-
-String localePrizing(BuildContext context, int cents) {
-  final myLocale = Localizations.localeOf(context);
-  final euros = cents / 100;
-
-  if (euros == euros.toInt()) {
-    return '${euros.toInt()}€';
-  }
-
-  return NumberFormat.currency(
-    locale: myLocale.toString(),
-    symbol: '€',
-    decimalDigits: 2,
-  ).format(cents / 100);
-}
-
-Future<Response_PlanBallance?> loadPlanBalance({bool useCache = true}) async {
-  final ballance = await apiService.getPlanBallance();
-  if (ballance != null) {
-    await updateUserdata((u) {
-      u.lastPlanBallance = ballance.writeToJson();
-      return u;
-    });
-    return ballance;
-  }
-  final user = await getUser();
-  if (user != null && user.lastPlanBallance != null && useCache) {
-    try {
-      return Response_PlanBallance.fromJson(
-        user.lastPlanBallance!,
-      );
-    } catch (e) {
-      Log.error('from json: $e');
-    }
-  }
-  return ballance;
-}
-
-// ignore: constant_identifier_names
-const int MONTHLY_PAYMENT_DAYS = 30;
-// ignore: constant_identifier_names
-const int YEARLY_PAYMENT_DAYS = 365;
-
-class SubscriptionCustomView extends StatefulWidget {
-  const SubscriptionCustomView({super.key, this.redirectError});
-
-  final ErrorCode? redirectError;
-
-  @override
-  State<SubscriptionCustomView> createState() => _SubscriptionCustomViewState();
-}
-
-class _SubscriptionCustomViewState extends State<SubscriptionCustomView> {
-  bool loaded = false;
-  bool testerRequested = true;
-  Response_PlanBallance? ballance;
-  String? additionalOwnerName;
-
-  @override
-  void initState() {
-    super.initState();
-    unawaited(initAsync());
-  }
-
-  Future<void> initAsync() async {
-    ballance = await loadPlanBalance();
-    if (ballance != null && ballance!.hasAdditionalAccountOwnerId()) {
-      final ownerId = ballance!.additionalAccountOwnerId.toInt();
-      final contact = await twonlyDB.contactsDao
-          .getContactByUserId(ownerId)
-          .getSingleOrNull();
-      if (contact != null) {
-        additionalOwnerName = getContactDisplayName(contact);
-      } else {
-        additionalOwnerName = ownerId.toString();
-      }
-    }
-    setState(() {});
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final myLocale = Localizations.localeOf(context);
-    String? formattedBalance;
-    DateTime? nextPayment;
-    final currentPlan = context.watch<PurchasesProvider>().plan;
-
-    if (ballance != null) {
-      final lastPaymentDateTime = DateTime.fromMillisecondsSinceEpoch(
-        ballance!.lastPaymentDoneUnixTimestamp.toInt() * 1000,
-      );
-      if (isPayingUser(currentPlan)) {
-        nextPayment = lastPaymentDateTime.add(
-          Duration(days: ballance!.paymentPeriodDays.toInt()),
-        );
-      }
-      final ballanceInCents = ballance!.transactions
-          .map((a) => a.depositCents.toInt())
-          .sum;
-      formattedBalance = NumberFormat.currency(
-        locale: myLocale.toString(),
-        symbol: '€',
-        decimalDigits: 2,
-      ).format(ballanceInCents / 100);
-    }
-
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(context.lang.settingsSubscription),
-      ),
-      body: ListView(
-        children: [
-          if (widget.redirectError != null)
-            Center(
-              child: Container(
-                padding: const EdgeInsets.all(16),
-                margin: const EdgeInsets.all(16),
-                decoration: BoxDecoration(
-                  color: Colors.orangeAccent,
-                  borderRadius: BorderRadius.circular(15),
-                ),
-                child: Text(
-                  (widget.redirectError == ErrorCode.PlanLimitReached)
-                      ? context.lang.planLimitReached
-                      : context.lang.planNotAllowed,
-                  style: const TextStyle(color: Colors.black),
-                  textAlign: TextAlign.center,
-                ),
-              ),
-            ),
-          Padding(
-            padding: const EdgeInsets.all(32),
-            child: Center(
-              child: Container(
-                decoration: BoxDecoration(
-                  color: context.color.primary,
-                  borderRadius: BorderRadius.circular(15),
-                ),
-                padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
-                child: Text(
-                  currentPlan.name,
-                  style: TextStyle(
-                    fontSize: 32,
-                    fontWeight: FontWeight.bold,
-                    color: isDarkMode(context) ? Colors.black : Colors.white,
-                  ),
-                ),
-              ),
-            ),
-          ),
-          if (additionalOwnerName != null)
-            Center(
-              child: Text(
-                context.lang.partOfPaidPlanOf(additionalOwnerName!),
-                textAlign: TextAlign.center,
-                style: const TextStyle(color: Colors.orange),
-              ),
-            ),
-          if (!isPayingUser(currentPlan))
-            Center(
-              child: Padding(
-                padding: const EdgeInsets.all(18),
-                child: Text(
-                  context.lang.upgradeToPaidPlan,
-                  textAlign: TextAlign.center,
-                  style: const TextStyle(fontSize: 18),
-                ),
-              ),
-            ),
-          if (!isPayingUser(currentPlan) ||
-              currentPlan == SubscriptionPlan.Tester)
-            PlanCard(
-              plan: SubscriptionPlan.Pro,
-              onTap: () async {
-                await Navigator.push(
-                  context,
-                  MaterialPageRoute(
-                    builder: (context) {
-                      return const CheckoutView(
-                        plan: SubscriptionPlan.Pro,
-                      );
-                    },
-                  ),
-                );
-                await initAsync();
-              },
-            ),
-          if (currentPlan != SubscriptionPlan.Family)
-            PlanCard(
-              plan: SubscriptionPlan.Family,
-              onTap: () async {
-                await Navigator.push(
-                  context,
-                  MaterialPageRoute(
-                    builder: (context) {
-                      return CheckoutView(
-                        plan: SubscriptionPlan.Family,
-                        disableMonthlyOption:
-                            currentPlan == SubscriptionPlan.Pro &&
-                            ballance!.paymentPeriodDays.toInt() ==
-                                YEARLY_PAYMENT_DAYS,
-                      );
-                    },
-                  ),
-                );
-                await initAsync();
-              },
-            ),
-          const SizedBox(height: 10),
-          if (currentPlan != SubscriptionPlan.Family) const Divider(),
-          BetterListTile(
-            icon: FontAwesomeIcons.gears,
-            text: context.lang.manageSubscription,
-            subtitle: (nextPayment != null)
-                ? Text(
-                    '${context.lang.nextPayment}: ${DateFormat.yMMMMd(myLocale.toString()).format(nextPayment)}',
-                  )
-                : null,
-            onTap: () async {
-              await Navigator.push(
-                context,
-                MaterialPageRoute(
-                  builder: (context) {
-                    return ManageSubscriptionView(
-                      ballance: ballance,
-                      nextPayment: nextPayment,
-                    );
-                  },
-                ),
-              );
-              await initAsync();
-            },
-          ),
-          BetterListTile(
-            icon: FontAwesomeIcons.moneyBillTransfer,
-            text: context.lang.transactionHistory,
-            subtitle: (formattedBalance != null)
-                ? Text('${context.lang.currentBalance}: $formattedBalance')
-                : null,
-            onTap: () async {
-              if (formattedBalance == null) return;
-              await Navigator.push(
-                context,
-                MaterialPageRoute(
-                  builder: (context) {
-                    return TransactionView(
-                      transactions: ballance?.transactions,
-                      formattedBalance: formattedBalance!,
-                    );
-                  },
-                ),
-              );
-            },
-          ),
-          if (isPayingUser(currentPlan) ||
-              currentPlan == SubscriptionPlan.Tester)
-            BetterListTile(
-              icon: FontAwesomeIcons.userPlus,
-              text: context.lang.manageAdditionalUsers,
-              subtitle: loaded ? Text('${context.lang.open}: 3') : null,
-              onTap: () async {
-                await Navigator.push(
-                  context,
-                  MaterialPageRoute(
-                    builder: (context) {
-                      return AdditionalUsersView(
-                        ballance: ballance,
-                      );
-                    },
-                  ),
-                );
-                await initAsync();
-              },
-            ),
-          BetterListTile(
-            icon: FontAwesomeIcons.ticket,
-            text: context.lang.createOrRedeemVoucher,
-            onTap: () async {
-              await Navigator.push(
-                context,
-                MaterialPageRoute(
-                  builder: (context) {
-                    return const VoucherView();
-                  },
-                ),
-              );
-              await initAsync();
-            },
-          ),
-          const SizedBox(height: 30),
-        ],
-      ),
-    );
-  }
-}
-
-int getPlanPrice(SubscriptionPlan plan, {required bool paidMonthly}) {
-  switch (plan) {
-    case SubscriptionPlan.Pro:
-      return paidMonthly ? 100 : 1000;
-    case SubscriptionPlan.Family:
-      return paidMonthly ? 200 : 2000;
-    // ignore: no_default_cases
-    default:
-      return 0;
-  }
-}
-
-class PlanCard extends StatelessWidget {
-  const PlanCard({
-    required this.plan,
-    super.key,
-    this.refund,
-    this.onTap,
-    this.paidMonthly,
-  });
-  final SubscriptionPlan plan;
-  final void Function()? onTap;
-  final int? refund;
-  final bool? paidMonthly;
-
-  @override
-  Widget build(BuildContext context) {
-    final yearlyPrice = getPlanPrice(plan, paidMonthly: false);
-    final monthlyPrice = getPlanPrice(plan, paidMonthly: true);
-    var features = <String>[];
-
-    switch (plan.name) {
-      case 'Free':
-        features = [context.lang.freeFeature1];
-      case 'Plus':
-        features = [context.lang.plusFeature1, context.lang.plusFeature2];
-      case 'Tester':
-      case 'Pro':
-        features = [
-          context.lang.proFeature1,
-          context.lang.proFeature2,
-          context.lang.proFeature3,
-          context.lang.proFeature4,
-        ];
-      case 'Family':
-        features = [
-          context.lang.proFeature1,
-          context.lang.familyFeature2,
-          context.lang.proFeature3,
-          context.lang.proFeature4,
-        ];
-      default:
-    }
-
-    return Padding(
-      padding: const EdgeInsets.only(left: 16, right: 16),
-      child: GestureDetector(
-        onTap: onTap,
-        child: Card(
-          elevation: 4,
-          shape: RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(10),
-          ),
-          color: context.color.surfaceContainer,
-          child: Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 16),
-            child: Column(
-              children: [
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                  children: [
-                    Text(
-                      plan.name,
-                      textAlign: TextAlign.center,
-                      style: const TextStyle(
-                        fontSize: 24,
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                    if (yearlyPrice != 0) const SizedBox(height: 10),
-                    if (yearlyPrice != 0 && paidMonthly == null)
-                      Column(
-                        children: [
-                          if (paidMonthly == null || paidMonthly!)
-                            Text(
-                              '${localePrizing(context, yearlyPrice)}/${context.lang.year}',
-                              textAlign: TextAlign.center,
-                              style: const TextStyle(
-                                fontSize: 20,
-                                fontWeight: FontWeight.bold,
-                              ),
-                            ),
-                          if (paidMonthly == null || !paidMonthly!)
-                            Text(
-                              '${localePrizing(context, monthlyPrice)}/${context.lang.month}',
-                              textAlign: TextAlign.center,
-                              style: const TextStyle(
-                                fontSize: 16,
-                                color: Colors.grey,
-                              ),
-                            ),
-                        ],
-                      ),
-                    if (paidMonthly != null)
-                      Text(
-                        (paidMonthly!)
-                            ? '${localePrizing(context, monthlyPrice)}/${context.lang.month}'
-                            : '${localePrizing(context, yearlyPrice)}/${context.lang.year}',
-                        textAlign: TextAlign.center,
-                        style: const TextStyle(
-                          fontSize: 20,
-                          fontWeight: FontWeight.bold,
-                        ),
-                      ),
-                  ],
-                ),
-                const SizedBox(height: 10),
-                ...features.map(
-                  (feature) => Padding(
-                    padding: const EdgeInsets.symmetric(vertical: 2),
-                    child: Text(
-                      feature,
-                      textAlign: TextAlign.center,
-                    ),
-                  ),
-                ),
-                if (refund != null && refund! > 0)
-                  Padding(
-                    padding: const EdgeInsets.only(top: 7),
-                    child: Text(
-                      context.lang.subscriptionRefund(
-                        localePrizing(context, refund!),
-                      ),
-                      textAlign: TextAlign.center,
-                      style: TextStyle(
-                        color: context.color.primary,
-                        fontSize: 12,
-                      ),
-                    ),
-                  ),
-                if (onTap != null)
-                  Padding(
-                    padding: const EdgeInsets.only(top: 10),
-                    child: FilledButton.icon(
-                      onPressed: onTap,
-                      label: Text(
-                        context.lang.upgradeToPaidPlanButton(plan.name, ''),
-                      ),
-                    ),
-                  ),
-              ],
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/src/views/settings/subscription_custom/transaction.view.dart b/lib/src/views/settings/subscription_custom/transaction.view.dart
deleted file mode 100644
index 70a597b8..00000000
--- a/lib/src/views/settings/subscription_custom/transaction.view.dart
+++ /dev/null
@@ -1,147 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:twonly/src/model/protobuf/api/websocket/server_to_client.pb.dart';
-import 'package:twonly/src/utils/misc.dart';
-
-class TransactionView extends StatefulWidget {
-  const TransactionView({
-    required this.transactions,
-    required this.formattedBalance,
-    super.key,
-  });
-  final List<Response_Transaction>? transactions;
-  final String formattedBalance;
-
-  @override
-  State<TransactionView> createState() => _TransactionViewState();
-}
-
-class _TransactionViewState extends State<TransactionView> {
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(context.lang.transactionHistory),
-      ),
-      body: ListView(
-        children: [
-          Padding(
-            padding: const EdgeInsets.all(32),
-            child: Center(
-              child: Container(
-                decoration: BoxDecoration(
-                  color: context.color.primary,
-                  borderRadius: BorderRadius.circular(15),
-                ),
-                padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
-                child: Text(
-                  widget.formattedBalance,
-                  style: TextStyle(
-                    fontSize: 32,
-                    fontWeight: FontWeight.bold,
-                    color: isDarkMode(context) ? Colors.black : Colors.white,
-                  ),
-                ),
-              ),
-            ),
-          ),
-          if (widget.transactions != null)
-            ...widget.transactions!.map((x) => TransactionCard(transaction: x)),
-        ],
-      ),
-    );
-  }
-}
-
-class TransactionCard extends StatefulWidget {
-  const TransactionCard({required this.transaction, super.key});
-  final Response_Transaction transaction;
-
-  @override
-  State<TransactionCard> createState() => _TransactionCardState();
-}
-
-class _TransactionCardState extends State<TransactionCard> {
-  String typeToText(Response_TransactionTypes type) {
-    switch (type) {
-      case Response_TransactionTypes.Cash:
-        return context.lang.transactionCash;
-      case Response_TransactionTypes.PlanUpgrade:
-        return context.lang.transactionPlanUpgrade;
-      case Response_TransactionTypes.Refund:
-        return context.lang.transactionRefund;
-      case Response_TransactionTypes.ThanksForTesting:
-        return context.lang.transactionThanksForTesting;
-      case Response_TransactionTypes.Unknown:
-        return context.lang.transactionUnknown;
-      case Response_TransactionTypes.VoucherCreated:
-        return context.lang.transactionVoucherCreated;
-      case Response_TransactionTypes.VoucherRedeemed:
-        return context.lang.transactionVoucherRedeemed;
-      case Response_TransactionTypes.AutoRenewal:
-        return context.lang.transactionAutoRenewal;
-    }
-    return type.toString();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final myLocale = Localizations.localeOf(context);
-    final formattedValue = NumberFormat.currency(
-      locale: myLocale.toString(),
-      symbol: '€',
-      decimalDigits: 2,
-    ).format(widget.transaction.depositCents.toInt() / 100);
-
-    final timestamp = DateTime.fromMillisecondsSinceEpoch(
-      widget.transaction.createdAtUnixTimestamp.toInt() * 1000,
-    );
-
-    return Card(
-      margin: const EdgeInsets.all(10),
-      elevation: 5,
-      child: Padding(
-        padding: const EdgeInsets.all(16),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Text(
-                      typeToText(widget.transaction.transactionType),
-                      style: const TextStyle(
-                        fontSize: 18,
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                    Text(
-                      DateFormat.yMMMMd(myLocale.toString()).format(timestamp),
-                      style: const TextStyle(
-                        fontSize: 12,
-                        color: Colors.grey,
-                      ),
-                    ),
-                  ],
-                ),
-                Text(
-                  formattedValue,
-                  style: TextStyle(
-                    fontSize: 18,
-                    fontWeight: FontWeight.bold,
-                    color: (widget.transaction.depositCents < 0)
-                        ? Colors.red
-                        : context.color.primary,
-                  ),
-                ),
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/src/views/settings/subscription_custom/voucher.view.dart b/lib/src/views/settings/subscription_custom/voucher.view.dart
deleted file mode 100644
index 770da2f0..00000000
--- a/lib/src/views/settings/subscription_custom/voucher.view.dart
+++ /dev/null
@@ -1,321 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:intl/intl.dart';
-import 'package:twonly/globals.dart';
-import 'package:twonly/src/model/protobuf/api/websocket/error.pb.dart';
-import 'package:twonly/src/model/protobuf/api/websocket/server_to_client.pb.dart';
-import 'package:twonly/src/utils/misc.dart';
-
-class VoucherView extends StatefulWidget {
-  const VoucherView({super.key});
-
-  @override
-  State<VoucherView> createState() => _VoucherViewState();
-}
-
-class _VoucherViewState extends State<VoucherView> {
-  List<Response_Voucher> vouchers = [];
-
-  @override
-  void initState() {
-    super.initState();
-    unawaited(initAsync());
-  }
-
-  Future<void> initAsync() async {
-    final resVouchers = await apiService.getVoucherList();
-    setState(() {
-      vouchers = resVouchers?.vouchers ?? [];
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final openVoucher = vouchers.where((x) => !x.redeemed && !x.requested);
-    final redeemedVoucher = vouchers.where((x) => x.redeemed);
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(context.lang.createOrRedeemVoucher),
-      ),
-      body: ListView(
-        children: [
-          ListTile(
-            title: Text(context.lang.redeemVoucher),
-            onTap: () async {
-              await redeemVoucher(context);
-              await initAsync();
-            },
-          ),
-          ListTile(
-            title: Text(context.lang.createVoucher),
-            onTap: () async {
-              await showBuyVoucher(context);
-              await initAsync();
-            },
-          ),
-          const Divider(),
-          if (openVoucher.isNotEmpty)
-            ListTile(
-              title: Text(
-                context.lang.openVouchers,
-                style: const TextStyle(fontSize: 13),
-              ),
-            ),
-          ...openVoucher.map((x) => VoucherCard(voucher: x)),
-          if (redeemedVoucher.isNotEmpty)
-            ListTile(
-              title: Text(
-                context.lang.redeemedVouchers,
-                style: const TextStyle(fontSize: 13),
-              ),
-            ),
-          ...redeemedVoucher.map((x) => VoucherCard(voucher: x)),
-        ],
-      ),
-    );
-  }
-}
-
-class VoucherCard extends StatefulWidget {
-  const VoucherCard({required this.voucher, super.key});
-  final Response_Voucher voucher;
-
-  @override
-  State<VoucherCard> createState() => _VoucherCardState();
-}
-
-class _VoucherCardState extends State<VoucherCard> {
-  Future<void> _copyVoucherId() async {
-    if (!widget.voucher.redeemed) {
-      await Clipboard.setData(ClipboardData(text: widget.voucher.voucherId));
-      await HapticFeedback.heavyImpact();
-      if (!mounted) return;
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text('${widget.voucher.voucherId} copied.')),
-      );
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final isRedeemed = widget.voucher.redeemed || widget.voucher.requested;
-    final myLocale = Localizations.localeOf(context);
-    final formattedValue = NumberFormat.currency(
-      locale: myLocale.toString(),
-      symbol: '€',
-      decimalDigits: 2,
-    ).format(widget.voucher.valueCents.toInt() / 100);
-
-    return GestureDetector(
-      onTap: _copyVoucherId,
-      child: Card(
-        margin: const EdgeInsets.all(10),
-        elevation: 5,
-        child: Padding(
-          padding: const EdgeInsets.all(16),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  Text(
-                    widget.voucher.voucherId.toUpperCase(),
-                    style: TextStyle(
-                      fontSize: 18,
-                      fontWeight: FontWeight.bold,
-                      color: isRedeemed ? Colors.grey : context.color.onSurface,
-                    ),
-                  ),
-                  Text(
-                    formattedValue,
-                    style: TextStyle(
-                      fontSize: 18,
-                      fontWeight: FontWeight.bold,
-                      color: isRedeemed ? Colors.grey : context.color.onSurface,
-                    ),
-                  ),
-                ],
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-Future<void> redeemVoucher(BuildContext context) async {
-  var voucherCode = '';
-  //
-  // ignore: inference_failure_on_function_invocation
-  await showDialog(
-    context: context,
-    builder: (context) {
-      return AlertDialog(
-        title: Text(context.lang.redeemVoucher),
-        content: StatefulBuilder(
-          builder: (context, setState) {
-            return SingleChildScrollView(
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Padding(
-                    padding: const EdgeInsets.symmetric(vertical: 16),
-                    child: TextField(
-                      onChanged: (value) {
-                        // Convert to uppercase
-                        setState(() {
-                          voucherCode = value.toUpperCase();
-                        });
-                      },
-                      decoration: InputDecoration(
-                        labelText: context.lang.enterVoucherCode,
-                        border: const OutlineInputBorder(),
-                      ),
-                      // Set the text to be uppercase
-                      textCapitalization: TextCapitalization.characters,
-                    ),
-                  ),
-                ],
-              ),
-            );
-          },
-        ),
-        actions: [
-          TextButton(
-            onPressed: () {
-              Navigator.of(context).pop();
-            },
-            child: Text(context.lang.cancel),
-          ),
-          TextButton(
-            onPressed: () async {
-              final res = await apiService.redeemVoucher(voucherCode);
-              if (!context.mounted) return;
-              if (res.isSuccess) {
-                ScaffoldMessenger.of(context).showSnackBar(
-                  SnackBar(content: Text(context.lang.voucherRedeemed)),
-                );
-              } else {
-                ScaffoldMessenger.of(context).showSnackBar(
-                  SnackBar(
-                    content: Text(
-                      errorCodeToText(
-                        context,
-                        res.error as ErrorCode,
-                      ),
-                    ),
-                  ),
-                );
-              }
-              Navigator.of(context).pop();
-            },
-            child: Text(context.lang.ok),
-          ),
-        ],
-      );
-    },
-  );
-}
-
-Future<void> showBuyVoucher(BuildContext context) async {
-  var quantity = 1000;
-  //
-  // ignore: inference_failure_on_function_invocation
-  await showDialog(
-    context: context,
-    builder: (context) {
-      return AlertDialog(
-        title: Text(context.lang.createVoucher),
-        content: StatefulBuilder(
-          builder: (context, setState) {
-            return SingleChildScrollView(
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Text(context.lang.createVoucherDesc),
-                  const SizedBox(height: 20),
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      IconButton(
-                        icon: const Icon(Icons.remove),
-                        onPressed: () {
-                          if (quantity > 1) {
-                            setState(() {
-                              if (quantity <= 100) return;
-                              if (quantity <= 1000) {
-                                quantity -= 100;
-                              } else {
-                                quantity -= 500;
-                              }
-                            });
-                          }
-                        },
-                      ),
-                      Text(
-                        NumberFormat.currency(
-                          locale: Localizations.localeOf(context).toString(),
-                          symbol: '€',
-                          decimalDigits: 2,
-                        ).format(quantity / 100),
-                        style: const TextStyle(fontSize: 24),
-                      ),
-                      IconButton(
-                        icon: const Icon(Icons.add),
-                        onPressed: () {
-                          setState(() {
-                            if (quantity >= 1000) {
-                              quantity += 500;
-                            } else {
-                              quantity += 100;
-                            }
-                          });
-                        },
-                      ),
-                    ],
-                  ),
-                ],
-              ),
-            );
-          },
-        ),
-        actions: [
-          TextButton(
-            onPressed: () {
-              Navigator.of(context).pop(); // Close the dialog
-            },
-            child: Text(context.lang.cancel),
-          ),
-          TextButton(
-            onPressed: () async {
-              final res = await apiService.buyVoucher(quantity);
-              if (!context.mounted) return;
-              if (res.isSuccess) {
-                ScaffoldMessenger.of(context).showSnackBar(
-                  SnackBar(content: Text(context.lang.voucherCreated)),
-                );
-              } else {
-                ScaffoldMessenger.of(context).showSnackBar(
-                  SnackBar(
-                    content: Text(
-                      errorCodeToText(
-                        context,
-                        res.error as ErrorCode,
-                      ),
-                    ),
-                  ),
-                );
-              }
-              Navigator.of(context).pop(); // Close the dialog
-            },
-            child: Text(context.lang.buy),
-          ),
-        ],
-      );
-    },
-  );
-}
diff --git a/lib/src/views/user_study/user_study_data_collection.dart b/lib/src/views/user_study/user_study_data_collection.dart
deleted file mode 100644
index 1b576ee8..00000000
--- a/lib/src/views/user_study/user_study_data_collection.dart
+++ /dev/null
@@ -1,76 +0,0 @@
-import 'dart:convert';
-
-import 'package:http/http.dart' as http;
-import 'package:twonly/globals.dart';
-import 'package:twonly/src/utils/keyvalue.dart';
-import 'package:twonly/src/utils/log.dart';
-import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/storage.dart';
-
-const userStudySurveyKey = 'user_study_survey';
-
-// LEASE DO NOT SPAM OR TRY SENDING DIRECTLY TO THIS URL!
-// You're just making my master's thesis more difficult and destroy scientific data. :/
-const surveyUrlBase = 'https://survey.twonly.org/upload.php';
-
-Future<void> handleUserStudyUpload() async {
-  try {
-    final token = gUser.userStudyParticipantsToken;
-    if (token == null) return;
-
-    // in case the survey was taken offline try again
-    final userStudySurvey = await KeyValueStore.get(userStudySurveyKey);
-    if (userStudySurvey != null) {
-      final response = await http.post(
-        Uri.parse('$surveyUrlBase/create/$token'),
-        body: jsonEncode(userStudySurvey),
-        headers: {'Content-Type': 'application/json'},
-      );
-      if (response.statusCode != 200) {
-        Log.warn(
-          'Got different status code for survey upload: ${response.statusCode}',
-        );
-        return;
-      }
-      await KeyValueStore.delete(userStudySurveyKey);
-    }
-
-    if (gUser.lastUserStudyDataUpload != null &&
-        isToday(gUser.lastUserStudyDataUpload!)) {
-      // Only send updates once a day.
-      // This enables to see if improvements to actually work.
-      return;
-    }
-
-    final contacts = await twonlyDB.contactsDao.getAllContacts();
-
-    final dataCollection = {
-      'total_contacts': contacts.length,
-      'accepted_contacts': contacts.where((c) => c.accepted).length,
-      'verified_contacts': contacts.where((c) => c.verified).length,
-    };
-
-    final response = await http.post(
-      Uri.parse('$surveyUrlBase/push/$token'),
-      body: jsonEncode(dataCollection),
-      headers: {'Content-Type': 'application/json'},
-    );
-    if (response.statusCode == 200) {
-      await updateUserdata((u) {
-        u.lastUserStudyDataUpload = DateTime.now();
-        return u;
-      });
-    }
-    if (response.statusCode == 404) {
-      // Token is unknown to the server...
-      await updateUserdata((u) {
-        u
-          ..lastUserStudyDataUpload = null
-          ..userStudyParticipantsToken = null;
-        return u;
-      });
-    }
-  } catch (e) {
-    Log.error(e);
-  }
-}
diff --git a/lib/src/views/components/alert_dialog.dart b/lib/src/visual/components/alert.dialog.dart
similarity index 100%
rename from lib/src/views/components/alert_dialog.dart
rename to lib/src/visual/components/alert.dialog.dart
diff --git a/lib/src/views/components/animate_icon.dart b/lib/src/visual/components/animate_icon.comp.dart
similarity index 98%
rename from lib/src/views/components/animate_icon.dart
rename to lib/src/visual/components/animate_icon.comp.dart
index 055f00ce..3f2edc9e 100644
--- a/lib/src/views/components/animate_icon.dart
+++ b/lib/src/visual/components/animate_icon.comp.dart
@@ -17,8 +17,12 @@ bool isOneEmoji(String character) {
   return false;
 }
 
-class EmojiAnimation extends StatelessWidget {
-  const EmojiAnimation({required this.emoji, super.key, this.repeat = true});
+class EmojiAnimationComp extends StatelessWidget {
+  const EmojiAnimationComp({
+    required this.emoji,
+    super.key,
+    this.repeat = true,
+  });
   final String emoji;
   final bool repeat;
   static final Map<String, String> animatedIcons = {
@@ -114,6 +118,7 @@ class EmojiAnimation extends StatelessWidget {
     '🎉': 'party-popper.lottie',
     '🎊': 'confetti-ball.lottie',
     '🎂': 'birthday-cake.json',
+    '⌛': 'hourglass.json',
     '🧡': 'orange-heart.lottie',
     '💛': 'yellow-heart.lottie',
     '💚': 'green-heart.lottie',
@@ -279,7 +284,7 @@ class EmojiAnimationFlying extends StatelessWidget {
           padding: EdgeInsets.only(bottom: 20 * value),
           child: SizedBox(
             width: size + 30 * value,
-            child: EmojiAnimation(emoji: emoji),
+            child: EmojiAnimationComp(emoji: emoji),
           ),
         );
       },
diff --git a/lib/src/views/components/app_outdated.dart b/lib/src/visual/components/app_outdated.comp.dart
similarity index 78%
rename from lib/src/views/components/app_outdated.dart
rename to lib/src/visual/components/app_outdated.comp.dart
index ac50807a..e3d172e5 100644
--- a/lib/src/views/components/app_outdated.dart
+++ b/lib/src/visual/components/app_outdated.comp.dart
@@ -1,44 +1,54 @@
+import 'dart:async';
 import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/providers/connection.provider.dart';
 import 'package:twonly/src/utils/misc.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-class AppOutdated extends StatefulWidget {
-  const AppOutdated({super.key});
+class AppOutdatedComp extends StatefulWidget {
+  const AppOutdatedComp({super.key});
 
   @override
-  State<AppOutdated> createState() => _AppOutdatedState();
+  State<AppOutdatedComp> createState() => _AppOutdatedCompState();
 }
 
-class _AppOutdatedState extends State<AppOutdated> {
+class _AppOutdatedCompState extends State<AppOutdatedComp> {
   bool appIsOutdated = false;
   bool newDeviceRegistered = false;
 
+  late StreamSubscription<void> _subOutdated;
+  late StreamSubscription<void> _subNewDevice;
+
   @override
   void dispose() {
-    globalCallbackAppIsOutdated = () {};
-    globalCallbackNewDeviceRegistered = () {};
+    _subOutdated.cancel();
+    _subNewDevice.cancel();
     super.dispose();
   }
 
   @override
   void initState() {
-    globalCallbackAppIsOutdated = () async {
-      await context.read<CustomChangeProvider>().updateConnectionState(false);
-      setState(() {
-        appIsOutdated = true;
-      });
-    };
-    globalCallbackNewDeviceRegistered = () async {
-      await context.read<CustomChangeProvider>().updateConnectionState(false);
-      setState(() {
-        newDeviceRegistered = true;
-      });
-    };
     super.initState();
+    _subOutdated = apiService.onAppOutdated.listen((_) async {
+      if (mounted) {
+        await context.read<CustomChangeProvider>().updateConnectionState(false);
+        setState(() {
+          appIsOutdated = true;
+        });
+      }
+    });
+
+    _subNewDevice = apiService.onNewDeviceRegistered.listen((_) async {
+      if (mounted) {
+        await context.read<CustomChangeProvider>().updateConnectionState(false);
+        setState(() {
+          newDeviceRegistered = true;
+        });
+      }
+    });
   }
 
   @override
diff --git a/lib/src/views/components/avatar_icon.component.dart b/lib/src/visual/components/avatar_icon.comp.dart
similarity index 88%
rename from lib/src/views/components/avatar_icon.component.dart
rename to lib/src/visual/components/avatar_icon.comp.dart
index f16e86cc..dbd3449e 100644
--- a/lib/src/views/components/avatar_icon.component.dart
+++ b/lib/src/visual/components/avatar_icon.comp.dart
@@ -1,10 +1,10 @@
 import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/utils/avatars.dart';
-import 'package:twonly/src/utils/misc.dart';
 import 'package:vector_graphics/vector_graphics.dart';
 
 class AvatarIcon extends StatefulWidget {
@@ -28,17 +28,17 @@ class AvatarIcon extends StatefulWidget {
 
 class _AvatarIconState extends State<AvatarIcon> {
   List<Contact> _avatarContacts = [];
-  String? _globalUserDataCallBackId;
   String? _avatarSvg;
 
   StreamSubscription<List<Contact>>? groupStream;
   StreamSubscription<List<Contact>>? contactsStream;
   StreamSubscription<Contact?>? contactStream;
+  StreamSubscription<void>? _userSub;
 
   @override
   void initState() {
-    initAsync();
     super.initState();
+    initAsync();
   }
 
   @override
@@ -46,9 +46,7 @@ class _AvatarIconState extends State<AvatarIcon> {
     groupStream?.cancel();
     contactStream?.cancel();
     contactsStream?.cancel();
-    if (_globalUserDataCallBackId != null) {
-      globalUserDataChangedCallBack.remove(_globalUserDataCallBackId);
-    }
+    _userSub?.cancel();
     super.dispose();
   }
 
@@ -95,18 +93,19 @@ class _AvatarIconState extends State<AvatarIcon> {
             setState(() {});
           });
     } else if (widget.myAvatar) {
-      _globalUserDataCallBackId = 'avatar_${getRandomString(10)}';
-      globalUserDataChangedCallBack[_globalUserDataCallBackId!] = () {
-        setState(() {
-          if (gUser.avatarSvg != null) {
-            _avatarSvg = gUser.avatarSvg;
-          } else {
-            _avatarContacts = [];
-          }
-        });
-      };
-      if (gUser.avatarSvg != null) {
-        _avatarSvg = gUser.avatarSvg;
+      _userSub = userService.onUserUpdated.listen((_) {
+        if (mounted) {
+          setState(() {
+            if (userService.currentUser.avatarSvg != null) {
+              _avatarSvg = userService.currentUser.avatarSvg;
+            } else {
+              _avatarContacts = [];
+            }
+          });
+        }
+      });
+      if (userService.currentUser.avatarSvg != null) {
+        _avatarSvg = userService.currentUser.avatarSvg;
       }
     } else if (widget.contactId != null) {
       contactStream = twonlyDB.contactsDao
diff --git a/lib/src/views/components/connection_status_badge.dart b/lib/src/visual/components/connection_status.comp.dart
similarity index 86%
rename from lib/src/views/components/connection_status_badge.dart
rename to lib/src/visual/components/connection_status.comp.dart
index dba83d11..19ff05f2 100644
--- a/lib/src/views/components/connection_status_badge.dart
+++ b/lib/src/visual/components/connection_status.comp.dart
@@ -2,10 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:twonly/src/providers/connection.provider.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/loader/ripple.loader.dart';
+import 'package:twonly/src/visual/loader/ripple.loader.dart';
 
-class ConnectionStatusBadge extends StatelessWidget {
-  const ConnectionStatusBadge({
+class ConnectionStatusComp extends StatelessWidget {
+  const ConnectionStatusComp({
     required this.child,
     super.key,
   });
diff --git a/lib/src/views/components/user_context_menu.component.dart b/lib/src/visual/components/context_menu/user.context_menu.dart
similarity index 91%
rename from lib/src/views/components/user_context_menu.component.dart
rename to lib/src/visual/components/context_menu/user.context_menu.dart
index 6471bd9d..4d8bfbc9 100644
--- a/lib/src/views/components/user_context_menu.component.dart
+++ b/lib/src/visual/components/context_menu/user.context_menu.dart
@@ -4,7 +4,7 @@ import 'package:go_router/go_router.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/context_menu.component.dart';
+import 'package:twonly/src/visual/context_menu/context_menu.helper.dart';
 
 class UserContextMenu extends StatelessWidget {
   const UserContextMenu({
diff --git a/lib/src/views/components/emoji_picker.bottom.dart b/lib/src/visual/components/emoji_picker.bottom.dart
similarity index 97%
rename from lib/src/views/components/emoji_picker.bottom.dart
rename to lib/src/visual/components/emoji_picker.bottom.dart
index ba2e660c..1fa65465 100755
--- a/lib/src/views/components/emoji_picker.bottom.dart
+++ b/lib/src/visual/components/emoji_picker.bottom.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 import 'package:emoji_picker_flutter/emoji_picker_flutter.dart';
 import 'package:flutter/material.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layer_data.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layer_data.dart';
 
 class EmojiPickerBottom extends StatelessWidget {
   const EmojiPickerBottom({super.key});
diff --git a/lib/src/views/components/flame.dart b/lib/src/visual/components/flame_counter.comp.dart
similarity index 76%
rename from lib/src/views/components/flame.dart
rename to lib/src/visual/components/flame_counter.comp.dart
index 07dae00c..73d6491f 100644
--- a/lib/src/views/components/flame.dart
+++ b/lib/src/visual/components/flame_counter.comp.dart
@@ -1,8 +1,9 @@
 import 'dart:async';
+
 import 'package:flutter/material.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/twonly.db.dart';
-import 'package:twonly/src/views/components/animate_icon.dart';
+import 'package:twonly/src/visual/components/animate_icon.comp.dart';
 
 class FlameCounterWidget extends StatefulWidget {
   const FlameCounterWidget({
@@ -22,13 +23,14 @@ class FlameCounterWidget extends StatefulWidget {
 class _FlameCounterWidgetState extends State<FlameCounterWidget> {
   int flameCounter = 0;
   bool isBestFriend = false;
+  bool isExpiring = false;
 
-  StreamSubscription<int>? flameCounterSub;
+  StreamSubscription<({int counter, bool isExpiring})>? flameCounterSub;
 
   @override
   void initState() {
-    initAsync();
     super.initState();
+    initAsync();
   }
 
   @override
@@ -48,12 +50,14 @@ class _FlameCounterWidgetState extends State<FlameCounterWidget> {
     }
     if (groupId != null && group != null) {
       isBestFriend =
-          gUser.myBestFriendGroupId == groupId && group.alsoBestFriend;
+          userService.currentUser.myBestFriendGroupId == groupId &&
+          group.alsoBestFriend;
       final stream = twonlyDB.groupsDao.watchFlameCounter(groupId);
-      flameCounterSub = stream.listen((counter) {
+      flameCounterSub = stream.listen((result) {
         if (mounted) {
           setState(() {
-            flameCounter = counter;
+            flameCounter = result.counter;
+            isExpiring = result.isExpiring;
           });
         }
       });
@@ -85,10 +89,17 @@ class _FlameCounterWidgetState extends State<FlameCounterWidget> {
           ),
         SizedBox(
           height: 15,
-          child: EmojiAnimation(
+          child: EmojiAnimationComp(
             emoji: flameEmoji,
           ),
         ),
+        if (isExpiring)
+          const SizedBox(
+            height: 11,
+            child: EmojiAnimationComp(
+              emoji: '⌛',
+            ),
+          ),
       ],
     );
   }
diff --git a/lib/src/views/components/notification_badge.dart b/lib/src/visual/components/notification_badge.comp.dart
similarity index 72%
rename from lib/src/views/components/notification_badge.dart
rename to lib/src/visual/components/notification_badge.comp.dart
index dd4e0ac0..2e4b7617 100644
--- a/lib/src/views/components/notification_badge.dart
+++ b/lib/src/visual/components/notification_badge.comp.dart
@@ -1,12 +1,16 @@
 import 'package:flutter/material.dart';
 
-class NotificationBadge extends StatelessWidget {
-  const NotificationBadge({
+class NotificationBadgeComp extends StatelessWidget {
+  const NotificationBadgeComp({
     required this.count,
     required this.child,
+    this.backgroundColor = Colors.red,
+    this.textColor = Colors.white,
     super.key,
   });
   final String count;
+  final Color backgroundColor;
+  final Color textColor;
   final Widget child;
 
   @override
@@ -23,14 +27,14 @@ class NotificationBadge extends StatelessWidget {
             height: 18,
             width: 18,
             child: CircleAvatar(
-              backgroundColor: Colors.red,
+              backgroundColor: backgroundColor,
               child: Center(
                 child: Transform.rotate(
                   angle: infinity ? 90 * (3.141592653589793 / 180) : 0,
                   child: Text(
                     infinity ? '8' : count,
-                    style: const TextStyle(
-                      color: Colors.white, // Text color
+                    style: TextStyle(
+                      color: textColor,
                       fontSize: 10,
                     ),
                   ),
diff --git a/lib/src/views/components/select_chat_deletion_time.comp.dart b/lib/src/visual/components/select_chat_deletion_time.comp.dart
similarity index 95%
rename from lib/src/views/components/select_chat_deletion_time.comp.dart
rename to lib/src/visual/components/select_chat_deletion_time.comp.dart
index 58602c64..bae7ec3e 100644
--- a/lib/src/views/components/select_chat_deletion_time.comp.dart
+++ b/lib/src/visual/components/select_chat_deletion_time.comp.dart
@@ -4,15 +4,15 @@ import 'package:drift/drift.dart' show Value;
 import 'package:fixnum/fixnum.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/tables/groups.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/protobuf/client/generated/messages.pb.dart';
-import 'package:twonly/src/services/api/messages.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
 import 'package:twonly/src/services/group.services.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/better_list_title.dart';
-import 'package:twonly/src/views/groups/group.view.dart';
+import 'package:twonly/src/visual/elements/better_list_title.element.dart';
+import 'package:twonly/src/visual/views/groups/group.view.dart';
 
 class SelectChatDeletionTimeListTitle extends StatefulWidget {
   const SelectChatDeletionTimeListTitle({
@@ -38,6 +38,7 @@ class _SelectChatDeletionTimeListTitleState
 
   @override
   void initState() {
+    super.initState();
     groupSub = twonlyDB.groupsDao.watchGroup(widget.groupId).listen((update) {
       if (update == null) return;
       group = update;
@@ -49,7 +50,6 @@ class _SelectChatDeletionTimeListTitleState
         _selectedDeletionTime = selected % _getOptions().length;
       });
     });
-    super.initState();
   }
 
   @override
diff --git a/lib/src/visual/components/verification_badge.comp.dart b/lib/src/visual/components/verification_badge.comp.dart
new file mode 100644
index 00000000..8a7bc422
--- /dev/null
+++ b/lib/src/visual/components/verification_badge.comp.dart
@@ -0,0 +1,129 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/constants/routes.keys.dart';
+import 'package:twonly/src/database/daos/key_verification.dao.dart';
+import 'package:twonly/src/database/twonly.db.dart';
+import 'package:twonly/src/utils/log.dart';
+import 'package:twonly/src/visual/components/verification_badge_info.comp.dart';
+import 'package:twonly/src/visual/elements/svg_icon.element.dart';
+
+class VerificationBadgeComp extends StatefulWidget {
+  const VerificationBadgeComp({
+    this.contact,
+    this.group,
+    super.key,
+    this.size = 15,
+    this.showOnlyIfVerified = false,
+    this.isVerifiedByTransferredTrust,
+    this.clickable = true,
+  });
+  final Group? group;
+  final Contact? contact;
+  final double size;
+
+  final bool showOnlyIfVerified;
+  final bool clickable;
+  final bool? isVerifiedByTransferredTrust;
+
+  @override
+  State<VerificationBadgeComp> createState() => _VerificationBadgeCompState();
+}
+
+class _VerificationBadgeCompState extends State<VerificationBadgeComp> {
+  bool _isVerified = false;
+  bool _isVerifiedByTransferredTrust = false;
+
+  StreamSubscription<VerificationStatus>? _streamAllVerified;
+  StreamSubscription<List<KeyVerification>>? _streamContactVerification;
+  StreamSubscription<List<(Contact, DateTime)>>? _streamTransferredTrust;
+
+  @override
+  void initState() {
+    super.initState();
+    if (widget.group != null) {
+      _streamAllVerified = twonlyDB.keyVerificationDao
+          .watchAllGroupMembersVerified(widget.group!.groupId)
+          .listen((update) {
+            if (!mounted) return;
+            setState(() {
+              _isVerified = false;
+              _isVerifiedByTransferredTrust = false;
+              if (update == VerificationStatus.trusted) {
+                _isVerified = true;
+              }
+              if (update == VerificationStatus.partialTrusted) {
+                _isVerifiedByTransferredTrust = true;
+              }
+            });
+          });
+    } else if (widget.contact != null) {
+      _streamContactVerification = twonlyDB.keyVerificationDao
+          .watchContactVerification(widget.contact!.userId)
+          .listen((update) {
+            if (!mounted) return;
+            setState(() {
+              Log.info('Update: ${update.length}');
+              _isVerified = update.isNotEmpty;
+            });
+          });
+
+      _streamTransferredTrust = twonlyDB.keyVerificationDao
+          .watchTransferredTrustVerifications(widget.contact!.userId)
+          .listen((update) {
+            if (!mounted) return;
+            setState(() {
+              _isVerifiedByTransferredTrust = update.isNotEmpty;
+            });
+          });
+    } else if (widget.isVerifiedByTransferredTrust != null) {
+      setState(() {
+        _isVerifiedByTransferredTrust = widget.isVerifiedByTransferredTrust!;
+      });
+    }
+  }
+
+  @override
+  void dispose() {
+    _streamAllVerified?.cancel();
+    _streamContactVerification?.cancel();
+    _streamTransferredTrust?.cancel();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (!_isVerified &&
+        !_isVerifiedByTransferredTrust &&
+        widget.showOnlyIfVerified) {
+      return Container();
+    }
+    return GestureDetector(
+      onTap: (!widget.clickable)
+          ? null
+          : () => context.push(Routes.settingsHelpFaqVerifyBadge),
+      child: ColoredBox(
+        color: Colors.transparent,
+        child: Padding(
+          padding: const EdgeInsetsGeometry.only(
+            top: 4,
+            left: 3,
+            right: 3,
+            bottom: 3,
+          ),
+          child: SvgIcon(
+            assetPath: (_isVerified || _isVerifiedByTransferredTrust)
+                ? SvgIcons.verifiedGreen
+                : SvgIcons.verifiedRed,
+            color: (_isVerifiedByTransferredTrust && !_isVerified)
+                ? colorVerificationBadgeYellow
+                : null,
+            size: widget.size,
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/src/visual/components/verification_badge_info.comp.dart b/lib/src/visual/components/verification_badge_info.comp.dart
new file mode 100644
index 00000000..cded90c2
--- /dev/null
+++ b/lib/src/visual/components/verification_badge_info.comp.dart
@@ -0,0 +1,74 @@
+import 'package:flutter/material.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/elements/svg_icon.element.dart';
+import 'package:twonly/src/visual/themes/light.dart';
+
+const colorVerificationBadgeYellow = Color.fromARGB(255, 0, 182, 238);
+
+class VerificationBadgeInfo extends StatelessWidget {
+  const VerificationBadgeInfo({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        Text(
+          context.lang.verificationBadgeGeneralDesc,
+          textAlign: TextAlign.center,
+        ),
+        const SizedBox(height: 30),
+        _buildItem(
+          context,
+          icon: const SvgIcon(assetPath: SvgIcons.verifiedGreen, size: 40),
+          description: context.lang.verificationBadgeGreenDesc,
+          boldTextColor: primaryColor,
+        ),
+        _buildItem(
+          context,
+          icon: const SvgIcon(
+            assetPath: SvgIcons.verifiedGreen,
+            size: 40,
+            color: colorVerificationBadgeYellow,
+          ),
+          description: context.lang.verificationBadgeYellowDesc,
+          boldTextColor: colorVerificationBadgeYellow,
+        ),
+        _buildItem(
+          context,
+          icon: const SvgIcon(assetPath: SvgIcons.verifiedRed, size: 40),
+          description: context.lang.verificationBadgeRedDesc,
+          boldTextColor: const Color(0xffff0000),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildItem(
+    BuildContext context, {
+    required Widget icon,
+    required String description,
+    required Color boldTextColor,
+  }) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 25),
+      child: Row(
+        children: [
+          icon,
+          const SizedBox(width: 20),
+          Expanded(
+            child: RichText(
+              text: TextSpan(
+                children: formattedText(
+                  context,
+                  description,
+                  boldTextColor: boldTextColor,
+                ),
+                style: const TextStyle(fontSize: 16),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/src/views/components/context_menu.component.dart b/lib/src/visual/context_menu/context_menu.helper.dart
similarity index 100%
rename from lib/src/views/components/context_menu.component.dart
rename to lib/src/visual/context_menu/context_menu.helper.dart
diff --git a/lib/src/views/components/group_context_menu.component.dart b/lib/src/visual/context_menu/group.context_menu.dart
similarity index 94%
rename from lib/src/views/components/group_context_menu.component.dart
rename to lib/src/visual/context_menu/group.context_menu.dart
index 08b66795..0e86fc59 100644
--- a/lib/src/views/components/group_context_menu.component.dart
+++ b/lib/src/visual/context_menu/group.context_menu.dart
@@ -2,12 +2,12 @@ import 'package:drift/drift.dart' hide Column;
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:go_router/go_router.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/alert_dialog.dart';
-import 'package:twonly/src/views/components/context_menu.component.dart';
+import 'package:twonly/src/visual/components/alert.dialog.dart';
+import 'package:twonly/src/visual/context_menu/context_menu.helper.dart';
 
 class GroupContextMenu extends StatelessWidget {
   const GroupContextMenu({
diff --git a/lib/src/visual/context_menu/user.context_menu.dart b/lib/src/visual/context_menu/user.context_menu.dart
new file mode 100644
index 00000000..4d8bfbc9
--- /dev/null
+++ b/lib/src/visual/context_menu/user.context_menu.dart
@@ -0,0 +1,31 @@
+import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:go_router/go_router.dart';
+import 'package:twonly/src/constants/routes.keys.dart';
+import 'package:twonly/src/database/twonly.db.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/context_menu/context_menu.helper.dart';
+
+class UserContextMenu extends StatelessWidget {
+  const UserContextMenu({
+    required this.contact,
+    required this.child,
+    super.key,
+  });
+  final Widget child;
+  final Contact contact;
+
+  @override
+  Widget build(BuildContext context) {
+    return ContextMenu(
+      items: [
+        ContextMenuItem(
+          title: context.lang.contextMenuUserProfile,
+          onTap: () => context.push(Routes.profileContact(contact.userId)),
+          icon: FontAwesomeIcons.user,
+        ),
+      ],
+      child: child,
+    );
+  }
+}
diff --git a/lib/src/visual/decorations/input_text.decoration.dart b/lib/src/visual/decorations/input_text.decoration.dart
new file mode 100644
index 00000000..9a42f916
--- /dev/null
+++ b/lib/src/visual/decorations/input_text.decoration.dart
@@ -0,0 +1,42 @@
+import 'package:flutter/material.dart';
+
+InputDecoration inputTextMessageDeco(BuildContext context, String hintText) {
+  return InputDecoration(
+    hintText: hintText,
+    contentPadding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+    border: OutlineInputBorder(
+      borderRadius: BorderRadius.circular(20),
+      borderSide: BorderSide(
+        color: Theme.of(context).colorScheme.primary,
+        width: 2,
+      ),
+    ),
+    focusedBorder: OutlineInputBorder(
+      borderRadius: BorderRadius.circular(20),
+      borderSide: BorderSide(
+        color: Theme.of(context).colorScheme.primary,
+        width: 2,
+      ),
+    ),
+    enabledBorder: OutlineInputBorder(
+      borderRadius: BorderRadius.circular(20),
+      borderSide: const BorderSide(color: Colors.grey, width: 2),
+    ),
+  );
+}
+
+InputDecoration getInputDecoration(BuildContext context, String hintText) {
+  final primaryColor = Theme.of(context).colorScheme.primary;
+  return InputDecoration(
+    hintText: hintText,
+    focusedBorder: OutlineInputBorder(
+      borderRadius: BorderRadius.circular(9),
+      borderSide: BorderSide(color: primaryColor),
+    ),
+    enabledBorder: OutlineInputBorder(
+      borderRadius: BorderRadius.circular(8),
+      borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
+    ),
+    contentPadding: const EdgeInsets.symmetric(vertical: 15, horizontal: 20),
+  );
+}
diff --git a/lib/src/views/components/better_list_title.dart b/lib/src/visual/elements/better_list_title.element.dart
similarity index 100%
rename from lib/src/views/components/better_list_title.dart
rename to lib/src/visual/elements/better_list_title.element.dart
diff --git a/lib/src/views/components/better_text.dart b/lib/src/visual/elements/better_text.element.dart
similarity index 100%
rename from lib/src/views/components/better_text.dart
rename to lib/src/visual/elements/better_text.element.dart
diff --git a/lib/src/views/components/headline.dart b/lib/src/visual/elements/headline.element.dart
similarity index 77%
rename from lib/src/views/components/headline.dart
rename to lib/src/visual/elements/headline.element.dart
index f21c5ae3..0b8a626a 100644
--- a/lib/src/views/components/headline.dart
+++ b/lib/src/visual/elements/headline.element.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
-class HeadLineComponent extends StatelessWidget {
-  const HeadLineComponent(this.text, {super.key});
+class HeadLineComp extends StatelessWidget {
+  const HeadLineComp(this.text, {super.key});
   final String text;
 
   @override
diff --git a/lib/src/views/components/radio_button.dart b/lib/src/visual/elements/radio_button.element.dart
similarity index 100%
rename from lib/src/views/components/radio_button.dart
rename to lib/src/visual/elements/radio_button.element.dart
diff --git a/lib/src/views/components/svg_icon.dart b/lib/src/visual/elements/svg_icon.element.dart
similarity index 100%
rename from lib/src/views/components/svg_icon.dart
rename to lib/src/visual/elements/svg_icon.element.dart
diff --git a/lib/src/views/components/media_view_sizing.dart b/lib/src/visual/helpers/media_view_sizing.helper.dart
similarity index 90%
rename from lib/src/views/components/media_view_sizing.dart
rename to lib/src/visual/helpers/media_view_sizing.helper.dart
index f40491d9..001f90cb 100644
--- a/lib/src/views/components/media_view_sizing.dart
+++ b/lib/src/visual/helpers/media_view_sizing.helper.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
-class MediaViewSizing extends StatefulWidget {
-  const MediaViewSizing({
+class MediaViewSizingHelper extends StatefulWidget {
+  const MediaViewSizingHelper({
     required this.child,
     super.key,
     this.requiredHeight,
@@ -15,10 +15,10 @@ class MediaViewSizing extends StatefulWidget {
   final Widget child;
 
   @override
-  State<MediaViewSizing> createState() => _MediaViewSizingState();
+  State<MediaViewSizingHelper> createState() => _MediaViewSizingHelperState();
 }
 
-class _MediaViewSizingState extends State<MediaViewSizing> {
+class _MediaViewSizingHelperState extends State<MediaViewSizingHelper> {
   @override
   Widget build(BuildContext context) {
     var needToDownSizeImage = false;
diff --git a/lib/src/utils/screenshot.dart b/lib/src/visual/helpers/screenshot.helper.dart
similarity index 92%
rename from lib/src/utils/screenshot.dart
rename to lib/src/visual/helpers/screenshot.helper.dart
index 1bf4517b..02c906d9 100644
--- a/lib/src/utils/screenshot.dart
+++ b/lib/src/visual/helpers/screenshot.helper.dart
@@ -7,8 +7,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:twonly/src/utils/log.dart';
 
-class ScreenshotImage {
-  ScreenshotImage({
+class ScreenshotImageHelper {
+  ScreenshotImageHelper({
     this.image,
     this.imageBytes,
     this.imageBytesFuture,
@@ -46,7 +46,7 @@ class ScreenshotController {
   }
   late GlobalKey _containerKey;
 
-  Future<ScreenshotImage?> capture({double? pixelRatio}) async {
+  Future<ScreenshotImageHelper?> capture({double? pixelRatio}) async {
     try {
       final findRenderObject = _containerKey.currentContext?.findRenderObject();
       if (findRenderObject == null) {
@@ -62,7 +62,7 @@ class ScreenshotController {
         }
       }
       final image = await boundary.toImage(pixelRatio: tmpPixelRatio ?? 1);
-      return ScreenshotImage(image: image);
+      return ScreenshotImageHelper(image: image);
     } catch (e) {
       Log.error(e);
     }
diff --git a/lib/src/visual/helpers/video_player.helper.dart b/lib/src/visual/helpers/video_player.helper.dart
new file mode 100644
index 00000000..cf3048bb
--- /dev/null
+++ b/lib/src/visual/helpers/video_player.helper.dart
@@ -0,0 +1,121 @@
+import 'package:flutter/material.dart';
+import 'package:video_player/video_player.dart';
+
+class VideoPlayerHelper extends StatefulWidget {
+  const VideoPlayerHelper({
+    required this.controller,
+    this.onDoubleTap,
+    super.key,
+  });
+
+  final VideoPlayerController controller;
+  final VoidCallback? onDoubleTap;
+
+  @override
+  State<VideoPlayerHelper> createState() => _VideoPlayerHelperState();
+}
+
+class _VideoPlayerHelperState extends State<VideoPlayerHelper>
+    with SingleTickerProviderStateMixin {
+  late final AnimationController _iconAnim;
+  late final Animation<double> _opacity;
+  late final Animation<double> _scale;
+
+  bool _isPaused = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _iconAnim = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 800),
+    );
+
+    // Opacity: flash in quickly, hold, fade out
+    _opacity = TweenSequence<double>([
+      TweenSequenceItem(tween: Tween(begin: 0, end: 1), weight: 15),
+      TweenSequenceItem(tween: ConstantTween(1), weight: 30),
+      TweenSequenceItem(tween: Tween(begin: 1, end: 0), weight: 55),
+    ]).animate(_iconAnim);
+
+    // Scale: pop in slightly over-sized then settle
+    _scale = TweenSequence<double>([
+      TweenSequenceItem(tween: Tween(begin: 0.6, end: 1.15), weight: 20),
+      TweenSequenceItem(tween: Tween(begin: 1.15, end: 1), weight: 15),
+      TweenSequenceItem(tween: ConstantTween(1), weight: 65),
+    ]).animate(CurvedAnimation(parent: _iconAnim, curve: Curves.easeOut));
+
+    widget.controller.addListener(_onControllerUpdate);
+  }
+
+  void _onControllerUpdate() {
+    final paused = !widget.controller.value.isPlaying;
+    if (paused != _isPaused && mounted) {
+      setState(() => _isPaused = paused);
+    }
+  }
+
+  @override
+  void dispose() {
+    widget.controller.removeListener(_onControllerUpdate);
+    _iconAnim.dispose();
+    super.dispose();
+  }
+
+  void _togglePlayPause() {
+    if (widget.controller.value.isPlaying) {
+      widget.controller.pause();
+    } else {
+      widget.controller.play();
+    }
+    _iconAnim.forward(from: 0);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: _togglePlayPause,
+      onDoubleTap: widget.onDoubleTap,
+      child: Stack(
+        alignment: Alignment.center,
+        children: [
+          VideoPlayer(widget.controller),
+          AnimatedBuilder(
+            animation: _iconAnim,
+            builder: (context, _) {
+              // While paused and the flash has finished, show a dim persistent icon
+              final opacity = _iconAnim.isAnimating
+                  ? _opacity.value
+                  : (_isPaused ? 0.1 : 0.0);
+              final scale = _iconAnim.isAnimating ? _scale.value : 1.0;
+
+              if (opacity == 0.0) return const SizedBox.shrink();
+
+              return Opacity(
+                opacity: opacity,
+                child: Transform.scale(
+                  scale: scale,
+                  child: Container(
+                    width: 64,
+                    height: 64,
+                    decoration: const BoxDecoration(
+                      color: Colors.black54,
+                      shape: BoxShape.circle,
+                    ),
+                    child: Icon(
+                      _isPaused
+                          ? Icons.pause_rounded
+                          : Icons.play_arrow_rounded,
+                      color: Colors.white,
+                      size: 36,
+                    ),
+                  ),
+                ),
+              );
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/src/views/components/video_player_wrapper.dart b/lib/src/visual/helpers/video_player_file.helper.dart
similarity index 71%
rename from lib/src/views/components/video_player_wrapper.dart
rename to lib/src/visual/helpers/video_player_file.helper.dart
index be470fc9..06931235 100644
--- a/lib/src/views/components/video_player_wrapper.dart
+++ b/lib/src/visual/helpers/video_player_file.helper.dart
@@ -2,20 +2,21 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:flutter/material.dart';
+import 'package:twonly/src/visual/helpers/video_player.helper.dart';
 import 'package:video_player/video_player.dart';
 
-class VideoPlayerWrapper extends StatefulWidget {
-  const VideoPlayerWrapper({
+class VideoPlayerFileHelper extends StatefulWidget {
+  const VideoPlayerFileHelper({
     required this.videoPath,
     super.key,
   });
   final File videoPath;
 
   @override
-  State<VideoPlayerWrapper> createState() => _VideoPlayerWrapperState();
+  State<VideoPlayerFileHelper> createState() => _VideoPlayerFileHelperState();
 }
 
-class _VideoPlayerWrapperState extends State<VideoPlayerWrapper> {
+class _VideoPlayerFileHelperState extends State<VideoPlayerFileHelper> {
   late VideoPlayerController _controller;
 
   @override
@@ -51,9 +52,9 @@ class _VideoPlayerWrapperState extends State<VideoPlayerWrapper> {
       child: _controller.value.isInitialized
           ? AspectRatio(
               aspectRatio: _controller.value.aspectRatio,
-              child: VideoPlayer(_controller),
+              child: VideoPlayerHelper(controller: _controller),
             )
-          : const CircularProgressIndicator(), // Show loading indicator while initializing
+          : const CircularProgressIndicator(),
     );
   }
 }
diff --git a/lib/src/views/components/loader/ripple.loader.dart b/lib/src/visual/loader/ripple.loader.dart
similarity index 100%
rename from lib/src/views/components/loader/ripple.loader.dart
rename to lib/src/visual/loader/ripple.loader.dart
diff --git a/lib/src/views/components/loader/three_rotating_dots.loader.dart b/lib/src/visual/loader/three_rotating_dots.loader.dart
similarity index 100%
rename from lib/src/views/components/loader/three_rotating_dots.loader.dart
rename to lib/src/visual/loader/three_rotating_dots.loader.dart
diff --git a/lib/src/visual/themes/colors.dart b/lib/src/visual/themes/colors.dart
new file mode 100644
index 00000000..c3d88865
--- /dev/null
+++ b/lib/src/visual/themes/colors.dart
@@ -0,0 +1,39 @@
+import 'package:flutter/material.dart';
+import 'package:twonly/src/database/tables/mediafiles.table.dart';
+import 'package:twonly/src/database/tables/messages.table.dart';
+import 'package:twonly/src/database/twonly.db.dart';
+import 'package:twonly/src/utils/misc.dart';
+
+class DefaultColors {
+  static const messageSelf = Color.fromARGB(255, 58, 136, 102);
+  static const messageOther = Color.fromARGB(233, 68, 137, 255);
+}
+
+Color getMessageColorFromType(
+  Message message,
+  MediaFile? mediaFile,
+  BuildContext context,
+) {
+  Color color;
+
+  if (message.type == MessageType.restoreFlameCounter.name) {
+    color = Colors.orange;
+  } else if (message.type == MessageType.text.name) {
+    color = Colors.blueAccent;
+  } else if (mediaFile != null) {
+    if (mediaFile.requiresAuthentication) {
+      color = context.color.primary;
+    } else {
+      if (mediaFile.type == MediaType.video) {
+        color = const Color.fromARGB(255, 243, 33, 208);
+      } else if (mediaFile.type == MediaType.audio) {
+        color = const Color.fromARGB(255, 252, 149, 85);
+      } else {
+        color = Colors.redAccent;
+      }
+    }
+  } else {
+    return (isDarkMode(context)) ? Colors.white : Colors.black;
+  }
+  return color;
+}
diff --git a/lib/src/themes/dark.dart b/lib/src/visual/themes/dark.dart
similarity index 100%
rename from lib/src/themes/dark.dart
rename to lib/src/visual/themes/dark.dart
diff --git a/lib/src/visual/themes/light.dart b/lib/src/visual/themes/light.dart
new file mode 100644
index 00000000..e7a0df8d
--- /dev/null
+++ b/lib/src/visual/themes/light.dart
@@ -0,0 +1,33 @@
+import 'package:flutter/material.dart';
+import 'package:twonly/src/utils/misc.dart';
+
+const primaryColor = Color(0xFF57CC99);
+
+final ThemeData lightTheme = ThemeData(
+  colorScheme: ColorScheme.fromSeed(
+    seedColor: primaryColor,
+  ),
+  inputDecorationTheme: const InputDecorationTheme(
+    border: OutlineInputBorder(),
+  ),
+);
+
+final ButtonStyle primaryColorButtonStyle = FilledButton.styleFrom(
+  backgroundColor: primaryColor,
+  foregroundColor: Colors.black87,
+  padding: const EdgeInsets.symmetric(horizontal: 32, vertical: 16),
+  shape: RoundedRectangleBorder(
+    borderRadius: BorderRadius.circular(8),
+  ),
+);
+
+ButtonStyle secondaryGreyButtonStyle(BuildContext context) {
+  return FilledButton.styleFrom(
+    backgroundColor: isDarkMode(context) ? Colors.grey[800] : Colors.grey[200],
+    foregroundColor: isDarkMode(context) ? Colors.white : Colors.black87,
+    padding: const EdgeInsets.symmetric(horizontal: 32, vertical: 16),
+    shape: RoundedRectangleBorder(
+      borderRadius: BorderRadius.circular(8),
+    ),
+  );
+}
diff --git a/lib/src/views/camera/camera_preview_components/camera_preview.dart b/lib/src/visual/views/camera/camera_preview_components/camera_preview.dart
similarity index 66%
rename from lib/src/views/camera/camera_preview_components/camera_preview.dart
rename to lib/src/visual/views/camera/camera_preview_components/camera_preview.dart
index 648e34bc..15f05ad3 100644
--- a/lib/src/views/camera/camera_preview_components/camera_preview.dart
+++ b/lib/src/visual/views/camera/camera_preview_components/camera_preview.dart
@@ -1,8 +1,8 @@
 import 'package:camera/camera.dart';
 import 'package:flutter/material.dart';
-import 'package:twonly/src/utils/screenshot.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/main_camera_controller.dart';
-import 'package:twonly/src/views/components/media_view_sizing.dart';
+import 'package:twonly/src/visual/helpers/media_view_sizing.helper.dart';
+import 'package:twonly/src/visual/helpers/screenshot.helper.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/main_camera_controller.dart';
 
 class MainCameraPreview extends StatelessWidget {
   const MainCameraPreview({
@@ -19,7 +19,7 @@ class MainCameraPreview extends StatelessWidget {
       return Container();
     }
     return Positioned.fill(
-      child: MediaViewSizing(
+      child: MediaViewSizingHelper(
         requiredHeight: 0,
         additionalPadding: 59,
         bottomNavigation: Container(),
@@ -48,10 +48,6 @@ class MainCameraPreview extends StatelessWidget {
                         mainCameraController.cameraController!,
                         child: Stack(
                           children: [
-                            if (mainCameraController.customPaint != null)
-                              Positioned.fill(
-                                child: mainCameraController.customPaint!,
-                              ),
                             if (mainCameraController.facePaint != null)
                               Positioned.fill(
                                 child: mainCameraController.facePaint!,
@@ -64,8 +60,7 @@ class MainCameraPreview extends StatelessWidget {
                 ),
               ),
             ),
-            if (mainCameraController.focusPointOffset != null &&
-                !mainCameraController.isSharePreviewIsShown)
+            if (!mainCameraController.isSharePreviewIsShown)
               AspectRatio(
                 aspectRatio: 9 / 16,
                 child: ClipRect(
@@ -84,22 +79,30 @@ class MainCameraPreview extends StatelessWidget {
                           .width,
                       child: Stack(
                         children: [
-                          Positioned(
-                            top: mainCameraController.focusPointOffset!.dy - 40,
-                            left:
-                                mainCameraController.focusPointOffset!.dx - 40,
-                            child: Container(
-                              height: 80,
-                              width: 80,
-                              clipBehavior: Clip.antiAliasWithSaveLayer,
-                              decoration: BoxDecoration(
-                                shape: BoxShape.circle,
-                                border: Border.all(
-                                  color: Colors.white.withAlpha(150),
+                          if (mainCameraController.qrCodePain != null)
+                            Positioned.fill(
+                              child: mainCameraController.qrCodePain!,
+                            ),
+                          if (mainCameraController.focusPointOffset != null)
+                            Positioned(
+                              top:
+                                  mainCameraController.focusPointOffset!.dy -
+                                  40,
+                              left:
+                                  mainCameraController.focusPointOffset!.dx -
+                                  40,
+                              child: Container(
+                                height: 80,
+                                width: 80,
+                                clipBehavior: Clip.antiAliasWithSaveLayer,
+                                decoration: BoxDecoration(
+                                  shape: BoxShape.circle,
+                                  border: Border.all(
+                                    color: Colors.white.withAlpha(150),
+                                  ),
                                 ),
                               ),
                             ),
-                          ),
                         ],
                       ),
                     ),
diff --git a/lib/src/visual/views/camera/camera_preview_components/camera_preview_controller_components/camera_bottom_controls.dart b/lib/src/visual/views/camera/camera_preview_components/camera_preview_controller_components/camera_bottom_controls.dart
new file mode 100644
index 00000000..a8475c34
--- /dev/null
+++ b/lib/src/visual/views/camera/camera_preview_components/camera_preview_controller_components/camera_bottom_controls.dart
@@ -0,0 +1,252 @@
+import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+
+import 'package:twonly/src/visual/views/camera/camera_preview_components/face_filters.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/main_camera_controller.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/zoom_selector.dart';
+
+class CameraBottomControls extends StatelessWidget {
+  const CameraBottomControls({
+    required this.mainController,
+    required this.isVideoRecording,
+    required this.videoRecordingLocked,
+    required this.isFront,
+    required this.keyTriggerButton,
+    required this.keyLockButton,
+    required this.onTakePicture,
+    required this.onPressSideButtonLeft,
+    required this.onPressSideButtonRight,
+    required this.updateScaleFactor,
+    required this.onStopVideoRecording,
+    super.key,
+  });
+
+  final MainCameraController mainController;
+  final bool isVideoRecording;
+  final bool videoRecordingLocked;
+  final bool isFront;
+  final GlobalKey keyTriggerButton;
+  final GlobalKey keyLockButton;
+  final VoidCallback onTakePicture;
+  final VoidCallback onPressSideButtonLeft;
+  final VoidCallback onPressSideButtonRight;
+  final Future<void> Function(double) updateScaleFactor;
+  final VoidCallback onStopVideoRecording;
+
+  MainCameraController get mc => mainController;
+
+  @override
+  Widget build(BuildContext context) {
+    return Positioned(
+      bottom: 30,
+      left: 0,
+      right: 0,
+      child: Align(
+        alignment: Alignment.bottomCenter,
+        child: Column(
+          children: [
+            if (mc.cameraController?.value.isInitialized == true &&
+                mc.selectedCameraDetails.isZoomAble &&
+                !isVideoRecording)
+              SizedBox(
+                width: 120,
+                child: CameraZoomButtons(
+                  key: mc.zoomButtonKey,
+                  scaleFactor: mc.selectedCameraDetails.scaleFactor,
+                  updateScaleFactor: updateScaleFactor,
+                  selectCamera: mc.selectCamera,
+                  selectedCameraDetails: mc.selectedCameraDetails,
+                  controller: mc.cameraController!,
+                ),
+              ),
+            const SizedBox(height: 30),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                if (!isVideoRecording)
+                  _buildSideButtonLeft()
+                else
+                  _buildLockOrStopButton(),
+                _buildShutterButton(),
+                if (!isVideoRecording)
+                  if (isFront)
+                    _buildSideButtonRight()
+                  else
+                    const SizedBox(width: 80)
+                else
+                  const SizedBox(width: 80),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildLockOrStopButton() {
+    if (videoRecordingLocked) {
+      // Show stop button
+      return GestureDetector(
+        onTap: onStopVideoRecording,
+        child: Container(
+          key: keyLockButton,
+          height: 50,
+          width: 80,
+          padding: const EdgeInsets.all(2),
+          child: Center(
+            child: Container(
+              width: 34,
+              height: 34,
+              decoration: BoxDecoration(
+                color: Colors.red,
+                borderRadius: BorderRadius.circular(6),
+              ),
+            ),
+          ),
+        ),
+      );
+    } else {
+      // Show animated lock icon (slide here to lock)
+      return _AnimatedLockButton(keyLockButton: keyLockButton);
+    }
+  }
+
+  Widget _buildSideButtonLeft() {
+    return GestureDetector(
+      onTap: onPressSideButtonLeft,
+      child: Align(
+        child: Container(
+          height: 50,
+          width: 80,
+          padding: const EdgeInsets.all(2),
+          child: Center(
+            child: FaIcon(
+              mc.isSelectingFaceFilters
+                  ? mc.currentFilterType.index == 1
+                        ? FontAwesomeIcons.xmark
+                        : FontAwesomeIcons.arrowLeft
+                  : FontAwesomeIcons.photoFilm,
+              color: Colors.white,
+              size: 25,
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildShutterButton() {
+    return GestureDetector(
+      onTap: onTakePicture,
+      key: keyTriggerButton,
+      child: Align(
+        child: Container(
+          height: 100,
+          width: 100,
+          clipBehavior: Clip.antiAliasWithSaveLayer,
+          padding: const EdgeInsets.all(2),
+          decoration: BoxDecoration(
+            shape: BoxShape.circle,
+            border: Border.all(
+              width: 7,
+              color: isVideoRecording ? Colors.red : Colors.white,
+            ),
+          ),
+          child: mc.currentFilterType.preview,
+        ),
+      ),
+    );
+  }
+
+  Widget _buildSideButtonRight() {
+    return GestureDetector(
+      onTap: onPressSideButtonRight,
+      child: Align(
+        child: Container(
+          height: 50,
+          width: 80,
+          padding: const EdgeInsets.all(2),
+          child: Center(
+            child: FaIcon(
+              mc.isSelectingFaceFilters
+                  ? mc.currentFilterType.index ==
+                            FaceFilterType.values.length - 1
+                        ? FontAwesomeIcons.xmark
+                        : FontAwesomeIcons.arrowRight
+                  : FontAwesomeIcons.faceGrinTongueSquint,
+              color: Colors.white,
+              size: 25,
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _AnimatedLockButton extends StatefulWidget {
+  const _AnimatedLockButton({required this.keyLockButton});
+
+  final GlobalKey keyLockButton;
+
+  @override
+  State<_AnimatedLockButton> createState() => _AnimatedLockButtonState();
+}
+
+class _AnimatedLockButtonState extends State<_AnimatedLockButton>
+    with SingleTickerProviderStateMixin {
+  late AnimationController _controller;
+  late Animation<double> _scaleAnim;
+  late Animation<double> _opacityAnim;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 900),
+    )..repeat(reverse: true);
+
+    _scaleAnim = Tween<double>(begin: 0.85, end: 1.15).animate(
+      CurvedAnimation(parent: _controller, curve: Curves.easeInOut),
+    );
+    _opacityAnim = Tween<double>(begin: 0.5, end: 1).animate(
+      CurvedAnimation(parent: _controller, curve: Curves.easeInOut),
+    );
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AnimatedBuilder(
+      animation: _controller,
+      builder: (context, child) {
+        return Opacity(
+          opacity: _opacityAnim.value,
+          child: Transform.scale(
+            scale: _scaleAnim.value,
+            child: child,
+          ),
+        );
+      },
+      child: Container(
+        key: widget.keyLockButton,
+        height: 50,
+        width: 80,
+        padding: const EdgeInsets.all(2),
+        child: const Center(
+          child: FaIcon(
+            FontAwesomeIcons.lock,
+            color: Colors.white,
+            size: 25,
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/src/visual/views/camera/camera_preview_components/camera_preview_controller_components/camera_scanned_overlay.dart b/lib/src/visual/views/camera/camera_preview_components/camera_preview_controller_components/camera_scanned_overlay.dart
new file mode 100644
index 00000000..05ee4ff3
--- /dev/null
+++ b/lib/src/visual/views/camera/camera_preview_components/camera_preview_controller_components/camera_scanned_overlay.dart
@@ -0,0 +1,170 @@
+import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:lottie/lottie.dart';
+import 'package:twonly/src/database/daos/contacts.dao.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/utils/qr.utils.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/main_camera_controller.dart';
+import 'package:url_launcher/url_launcher_string.dart';
+
+class CameraScannedOverlay extends StatelessWidget {
+  const CameraScannedOverlay({
+    required this.mainController,
+    super.key,
+  });
+
+  final MainCameraController mainController;
+
+  @override
+  Widget build(BuildContext context) {
+    return Positioned(
+      right: 8,
+      top: 170,
+      child: SizedBox(
+        height: 200,
+        width: 150,
+        child: ListView(
+          children: [
+            ...mainController.scannedNewProfiles.values.map(
+              (c) => _buildScannedProfileTile(context, c),
+            ),
+            ...mainController.contactsVerified.values.map(
+              (c) => _buildVerifiedContactTile(context, c),
+            ),
+            if (mainController.scannedUrl != null)
+              _buildScannedUrlTile(context, mainController.scannedUrl!),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildScannedProfileTile(BuildContext context, ScannedNewProfile c) {
+    if (c.isLoading) return Container();
+    return GestureDetector(
+      onTap: () async {
+        c.isLoading = true;
+        mainController.setState();
+        if (await addNewContactFromPublicProfile(c.profile) &&
+            context.mounted) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(
+              content: Text(
+                context.lang.requestedUserToastText(c.profile.username),
+              ),
+              duration: const Duration(seconds: 8),
+            ),
+          );
+        }
+      },
+      child: Container(
+        padding: const EdgeInsets.all(12),
+        margin: const EdgeInsets.only(bottom: 10),
+        decoration: BoxDecoration(
+          borderRadius: BorderRadius.circular(12),
+          color: context.color.surfaceContainer,
+        ),
+        child: Row(
+          children: [
+            Text(c.profile.username),
+            Expanded(child: Container()),
+            if (c.isLoading)
+              const SizedBox(
+                width: 12,
+                height: 12,
+                child: CircularProgressIndicator(strokeWidth: 2),
+              )
+            else
+              ColoredBox(
+                color: Colors.transparent,
+                child: FaIcon(
+                  FontAwesomeIcons.userPlus,
+                  color: isDarkMode(context) ? Colors.white : Colors.black,
+                  size: 17,
+                ),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildVerifiedContactTile(
+    BuildContext context,
+    ScannedVerifiedContact c,
+  ) {
+    return Container(
+      padding: const EdgeInsets.all(8),
+      margin: const EdgeInsets.only(bottom: 10),
+      decoration: BoxDecoration(
+        borderRadius: BorderRadius.circular(12),
+        color: context.color.surfaceContainer,
+      ),
+      child: Row(
+        children: [
+          AvatarIcon(
+            contactId: c.contact.userId,
+            fontSize: 14,
+          ),
+          const SizedBox(width: 10),
+          Text(
+            getContactDisplayName(c.contact, maxLength: 13),
+          ),
+          Expanded(child: Container()),
+          ColoredBox(
+            color: Colors.transparent,
+            child: SizedBox(
+              width: 30,
+              child: Lottie.asset(
+                c.verificationOk
+                    ? 'assets/animations/success.lottie'
+                    : 'assets/animations/failed.lottie',
+                repeat: false,
+                onLoaded: (p0) {
+                  Future.delayed(const Duration(seconds: 4), () {
+                    mainController.setState();
+                  });
+                },
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildScannedUrlTile(BuildContext context, String url) {
+    return GestureDetector(
+      onTap: () {
+        launchUrlString(url);
+      },
+      child: Container(
+        padding: const EdgeInsets.all(8),
+        margin: const EdgeInsets.only(bottom: 10),
+        decoration: BoxDecoration(
+          borderRadius: BorderRadius.circular(12),
+          color: context.color.surfaceContainer,
+        ),
+        child: Row(
+          children: [
+            Text(
+              substringBy(url, 25),
+              style: const TextStyle(fontSize: 8),
+            ),
+            Expanded(child: Container()),
+            Expanded(child: Container()),
+            ColoredBox(
+              color: Colors.transparent,
+              child: FaIcon(
+                FontAwesomeIcons.shareFromSquare,
+                color: isDarkMode(context) ? Colors.white : Colors.black,
+                size: 17,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/src/visual/views/camera/camera_preview_components/camera_preview_controller_components/camera_selfie_flash.dart b/lib/src/visual/views/camera/camera_preview_components/camera_preview_controller_components/camera_selfie_flash.dart
new file mode 100644
index 00000000..8d5edf44
--- /dev/null
+++ b/lib/src/visual/views/camera/camera_preview_components/camera_preview_controller_components/camera_selfie_flash.dart
@@ -0,0 +1,19 @@
+import 'package:flutter/material.dart';
+
+/// Full-screen white overlay used as a "flash" when taking selfies
+/// with the front camera and flash enabled.
+class CameraSelfieFlash extends StatelessWidget {
+  const CameraSelfieFlash({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Positioned.fill(
+      child: ClipRRect(
+        borderRadius: BorderRadius.circular(22),
+        child: Container(
+          color: Colors.white,
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/src/visual/views/camera/camera_preview_components/camera_preview_controller_components/camera_top_actions.dart b/lib/src/visual/views/camera/camera_preview_components/camera_preview_controller_components/camera_top_actions.dart
new file mode 100644
index 00000000..4f57de8c
--- /dev/null
+++ b/lib/src/visual/views/camera/camera_preview_components/camera_preview_controller_components/camera_top_actions.dart
@@ -0,0 +1,62 @@
+import 'package:flutter/material.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/camera_preview_controller_view.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/action_button.dart';
+
+class CameraTopActions extends StatelessWidget {
+  const CameraTopActions({
+    required this.selectedCameraDetails,
+    required this.hasAudioPermission,
+    required this.onSwitchCamera,
+    required this.onToggleFlash,
+    required this.onRequestMicrophone,
+    super.key,
+  });
+
+  final SelectedCameraDetails selectedCameraDetails;
+  final bool hasAudioPermission;
+  final VoidCallback onSwitchCamera;
+  final VoidCallback onToggleFlash;
+  final VoidCallback onRequestMicrophone;
+
+  @override
+  Widget build(BuildContext context) {
+    return Positioned(
+      right: 5,
+      top: 0,
+      child: Container(
+        alignment: Alignment.bottomCenter,
+        padding: const EdgeInsets.symmetric(vertical: 16),
+        child: SafeArea(
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: <Widget>[
+              ActionButton(
+                Icons.repeat_rounded,
+                tooltipText: context.lang.switchFrontAndBackCamera,
+                onPressed: onSwitchCamera,
+              ),
+              ActionButton(
+                selectedCameraDetails.isFlashOn
+                    ? Icons.flash_on_rounded
+                    : Icons.flash_off_rounded,
+                tooltipText: context.lang.toggleFlashLight,
+                color: selectedCameraDetails.isFlashOn
+                    ? Colors.white
+                    : Colors.white.withAlpha(160),
+                onPressed: onToggleFlash,
+              ),
+              if (!hasAudioPermission)
+                ActionButton(
+                  Icons.mic_off_rounded,
+                  color: Colors.white.withAlpha(160),
+                  tooltipText: 'Allow microphone access for video recording.',
+                  onPressed: onRequestMicrophone,
+                ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/src/visual/views/camera/camera_preview_components/camera_preview_controller_view.dart b/lib/src/visual/views/camera/camera_preview_components/camera_preview_controller_view.dart
new file mode 100644
index 00000000..6b7a8a1c
--- /dev/null
+++ b/lib/src/visual/views/camera/camera_preview_components/camera_preview_controller_view.dart
@@ -0,0 +1,770 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:camera/camera.dart';
+import 'package:clock/clock.dart';
+import 'package:device_info_plus/device_info_plus.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_android_volume_keydown/flutter_android_volume_keydown.dart';
+import 'package:flutter_volume_controller/flutter_volume_controller.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:image_picker/image_picker.dart';
+import 'package:permission_handler/permission_handler.dart';
+import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/database/tables/mediafiles.table.dart';
+import 'package:twonly/src/database/twonly.db.dart';
+import 'package:twonly/src/services/api/mediafiles/upload.api.dart';
+import 'package:twonly/src/services/user.service.dart';
+import 'package:twonly/src/utils/log.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/helpers/media_view_sizing.helper.dart';
+import 'package:twonly/src/visual/helpers/screenshot.helper.dart';
+import 'package:twonly/src/visual/loader/three_rotating_dots.loader.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/camera_preview_controller_components/camera_bottom_controls.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/camera_preview_controller_components/camera_scanned_overlay.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/camera_preview_controller_components/camera_selfie_flash.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/camera_preview_controller_components/camera_top_actions.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/face_filters.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/main_camera_controller.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/permissions_view.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/send_to.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/video_recording_time.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor.view.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/action_button.dart';
+import 'package:twonly/src/visual/views/home.view.dart';
+
+int maxVideoRecordingTime = 60;
+
+class SelectedCameraDetails {
+  double maxAvailableZoom = 1;
+  double minAvailableZoom = 1;
+  int cameraId = 0;
+  bool isZoomAble = false;
+  bool isFlashOn = false;
+  double scaleFactor = 1;
+  bool cameraLoaded = false;
+}
+
+class CameraPreviewControllerView extends StatelessWidget {
+  const CameraPreviewControllerView({
+    required this.mainController,
+    required this.isVisible,
+    this.hideControllers = false,
+    super.key,
+    this.sendToGroup,
+  });
+
+  final MainCameraController mainController;
+  final Group? sendToGroup;
+  final bool isVisible;
+  final bool hideControllers;
+
+  @override
+  Widget build(BuildContext context) {
+    return FutureBuilder(
+      future: checkPermissions(),
+      builder: (context, snap) {
+        if (snap.hasData) {
+          if (snap.data!) {
+            return CameraPreviewView(
+              sendToGroup: sendToGroup,
+              mainCameraController: mainController,
+              isVisible: isVisible,
+              hideControllers: hideControllers,
+            );
+          } else {
+            return PermissionHandlerView(
+              onSuccess: () {
+                mainController.selectCamera(0, true);
+              },
+            );
+          }
+        } else {
+          return Container();
+        }
+      },
+    );
+  }
+}
+
+class CameraPreviewView extends StatefulWidget {
+  const CameraPreviewView({
+    required this.mainCameraController,
+    required this.isVisible,
+    required this.hideControllers,
+    super.key,
+    this.sendToGroup,
+  });
+
+  final MainCameraController mainCameraController;
+  final Group? sendToGroup;
+  final bool isVisible;
+  final bool hideControllers;
+
+  @override
+  State<CameraPreviewView> createState() => _CameraPreviewViewState();
+}
+
+class _CameraPreviewViewState extends State<CameraPreviewView> {
+  bool _galleryLoadedImageIsShown = false;
+  bool _showSelfieFlash = false;
+  double _basePanY = 0;
+  double _baseScaleFactor = 0;
+  bool _hasAudioPermission = true;
+  DateTime? _videoRecordingStarted;
+  Timer? _videoRecordingTimer;
+  bool _videoRecordingLocked = false;
+
+  DateTime _currentTime = clock.now();
+  final GlobalKey keyTriggerButton = GlobalKey();
+  final GlobalKey keyLockButton = GlobalKey();
+  final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
+
+  MainCameraController get mc => widget.mainCameraController;
+
+  StreamSubscription<HardwareButton>? androidVolumeDownSub;
+
+  @override
+  void initState() {
+    super.initState();
+    initVolumeControl();
+    initAsync();
+  }
+
+  @override
+  void didUpdateWidget(covariant CameraPreviewView oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.isVisible != widget.isVisible) {
+      if (widget.isVisible) {
+        initVolumeControl();
+      } else {
+        _deInitVolumeControl();
+      }
+    }
+  }
+
+  @override
+  void dispose() {
+    _videoRecordingTimer?.cancel();
+    _deInitVolumeControl();
+    super.dispose();
+  }
+
+  Future<void> initVolumeControl() async {
+    if (Platform.isIOS) {
+      await FlutterVolumeController.updateShowSystemUI(false);
+      double? startedVolume;
+
+      FlutterVolumeController.addListener(
+        (volume) async {
+          if (!widget.isVisible) {
+            await _deInitVolumeControl();
+            return;
+          }
+          if (startedVolume == null) {
+            startedVolume = volume;
+            return;
+          }
+          if (startedVolume == volume) {
+            return;
+          }
+          // reset the volume back to the original value
+          await FlutterVolumeController.setVolume(startedVolume!);
+          await takePicture();
+        },
+      );
+    }
+    if (Platform.isAndroid) {
+      if ((await DeviceInfoPlugin().androidInfo).version.release == '9') {
+        // MissingPluginException: MissingPluginException(No implementation found for method cancel on channel dart-tools.dev/flutter_…
+        // Maybe this is the reason?
+        return;
+      } else {
+        androidVolumeDownSub = FlutterAndroidVolumeKeydown.stream.listen((
+          event,
+        ) {
+          if (widget.isVisible) {
+            takePicture();
+          } else {
+            _deInitVolumeControl();
+            return;
+          }
+        });
+      }
+    }
+  }
+
+  Future<void> _deInitVolumeControl() async {
+    if (Platform.isIOS) {
+      await FlutterVolumeController.updateShowSystemUI(true);
+      FlutterVolumeController.removeListener();
+    }
+    if (Platform.isAndroid) {
+      await androidVolumeDownSub?.cancel();
+    }
+  }
+
+  Future<void> initAsync() async {
+    _hasAudioPermission = await Permission.microphone.isGranted;
+
+    if (!_hasAudioPermission &&
+        !userService.currentUser.requestedAudioPermission) {
+      await UserService.update((u) => u.requestedAudioPermission = true);
+      await requestMicrophonePermission();
+    }
+  }
+
+  Future<void> requestMicrophonePermission() async {
+    final statuses = await [
+      Permission.microphone,
+    ].request();
+    if (statuses[Permission.microphone]!.isPermanentlyDenied) {
+      await openAppSettings();
+    } else {
+      _hasAudioPermission = await Permission.microphone.isGranted;
+      setState(() {
+        // _hasAudioPermission
+      });
+    }
+  }
+
+  Future<void> updateScaleFactor(double newScale) async {
+    if (mc.selectedCameraDetails.scaleFactor == newScale ||
+        mc.cameraController == null) {
+      return;
+    }
+    await mc.cameraController?.setZoomLevel(
+      newScale.clamp(
+        mc.selectedCameraDetails.minAvailableZoom,
+        mc.selectedCameraDetails.maxAvailableZoom,
+      ),
+    );
+    setState(() {
+      mc.selectedCameraDetails.scaleFactor = newScale;
+    });
+  }
+
+  Future<Uint8List?> loadAndDeletePictureFromFile(XFile picture) async {
+    try {
+      // Load the image into bytes
+      final imageBytes = await picture.readAsBytes();
+      // Remove the image file
+      await File(picture.path).delete();
+      return imageBytes;
+    } catch (e) {
+      if (context.mounted) {
+        // ignore: use_build_context_synchronously
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text('Error loading picture: $e'),
+            duration: const Duration(seconds: 3),
+          ),
+        );
+      }
+      return null;
+    }
+  }
+
+  Future<void> takePicture() async {
+    if (mc.isSharePreviewIsShown || mc.isVideoRecording) return;
+
+    setState(() {
+      mc.isSharePreviewIsShown = true;
+    });
+    if (mc.selectedCameraDetails.isFlashOn) {
+      if (isFront) {
+        setState(() {
+          _showSelfieFlash = true;
+        });
+      } else {
+        await mc.cameraController?.setFlashMode(FlashMode.torch);
+      }
+      await Future.delayed(const Duration(milliseconds: 1000));
+    }
+
+    await mc.cameraController?.pausePreview();
+    if (!mounted) {
+      return;
+    }
+
+    if (mc.cameraController?.value.flashMode != FlashMode.off) {
+      await mc.cameraController?.setFlashMode(FlashMode.off);
+    }
+
+    if (!mounted) {
+      return;
+    }
+
+    final image = await mc.screenshotController.capture(
+      pixelRatio: MediaQuery.of(context).devicePixelRatio,
+    );
+
+    if (await pushMediaEditor(image, null)) {
+      return;
+    }
+    setState(() {
+      mc.isSharePreviewIsShown = false;
+    });
+  }
+
+  Future<bool> pushMediaEditor(
+    ScreenshotImageHelper? screenshotImage,
+    File? videoFilePath, {
+    bool sharedFromGallery = false,
+    MediaType? mediaType,
+  }) async {
+    final type =
+        mediaType ??
+        ((videoFilePath != null) ? MediaType.video : MediaType.image);
+    final mediaFileService = await initializeMediaUpload(
+      type,
+      userService.currentUser.defaultShowTime,
+      isDraftMedia: true,
+    );
+    if (!mounted) return true;
+
+    if (mediaFileService == null) {
+      Log.error('Could not generate media file service');
+      return false;
+    }
+
+    if (videoFilePath != null) {
+      videoFilePath
+        ..copySync(mediaFileService.originalPath.path)
+        ..deleteSync();
+
+      // Start with compressing the video, to speed up the process in case the video is not changed.
+      // unawaited(mediaFileService.compressMedia());
+    }
+
+    await _deInitVolumeControl();
+    if (!mounted) return true;
+
+    final shouldReturn =
+        await Navigator.push(
+              context,
+              PageRouteBuilder(
+                opaque: false,
+                pageBuilder: (context, a1, a2) => ShareImageEditorView(
+                  screenshotImage: screenshotImage,
+                  sharedFromGallery: sharedFromGallery,
+                  sendToGroup: widget.sendToGroup,
+                  mediaFileService: mediaFileService,
+                  mainCameraController: mc,
+                  previewLink: mc.sharedLinkForPreview,
+                ),
+                transitionsBuilder:
+                    (context, animation, secondaryAnimation, child) {
+                      return child;
+                    },
+                transitionDuration: Duration.zero,
+                reverseTransitionDuration: Duration.zero,
+              ),
+            )
+            as bool?;
+    if (mounted) {
+      setState(() {
+        mc.isSharePreviewIsShown = false;
+        _showSelfieFlash = false;
+      });
+    }
+    if (!mounted) return true;
+    await initVolumeControl();
+    // shouldReturn is null when the user used the back button
+    if (shouldReturn != null && shouldReturn) {
+      if (widget.sendToGroup == null) {
+        HomeViewState.streamHomeViewPageIndex.add(0);
+      } else if (mounted) {
+        Navigator.pop(context);
+      }
+      return true;
+    }
+    await mc.selectCamera(
+      mc.selectedCameraDetails.cameraId,
+      false,
+    );
+    return false;
+  }
+
+  bool get isFront =>
+      mc.cameraController?.description.lensDirection ==
+      CameraLensDirection.front;
+
+  Future<void> onPanUpdate(dynamic details) async {
+    if (details == null) {
+      return;
+    }
+    if (mc.cameraController == null ||
+        !mc.cameraController!.value.isInitialized) {
+      return;
+    }
+
+    // Check if the finger moved over the lock button during video recording
+    if (mc.isVideoRecording && !_videoRecordingLocked) {
+      final lockContext = keyLockButton.currentContext;
+      if (lockContext != null) {
+        final lockRenderBox = lockContext.findRenderObject() as RenderBox?;
+        if (lockRenderBox != null) {
+          final lockLocalPosition = lockRenderBox.globalToLocal(
+            // ignore: avoid_dynamic_calls
+            details.globalPosition as Offset,
+          );
+          final lockRect = Rect.fromLTWH(
+            0,
+            0,
+            lockRenderBox.size.width,
+            lockRenderBox.size.height,
+          );
+          if (lockRect.contains(lockLocalPosition)) {
+            setState(() {
+              _videoRecordingLocked = true;
+            });
+            await HapticFeedback.heavyImpact();
+          }
+        }
+      }
+    }
+
+    setState(() {
+      mc.selectedCameraDetails.scaleFactor =
+          (_baseScaleFactor +
+                  // ignore: avoid_dynamic_calls
+                  (_basePanY - (details.localPosition.dy as double)) / 30)
+              .clamp(1, mc.selectedCameraDetails.maxAvailableZoom);
+    });
+    await mc.cameraController!.setZoomLevel(
+      mc.selectedCameraDetails.scaleFactor,
+    );
+  }
+
+  Future<void> pickImageFromGallery() async {
+    setState(() {
+      _galleryLoadedImageIsShown = true;
+      mc.isSharePreviewIsShown = true;
+    });
+    final picker = ImagePicker();
+    final pickedFile = await picker.pickMedia();
+
+    if (pickedFile != null) {
+      final imageExtensions = [
+        '.png',
+        '.jpg',
+        '.jpeg',
+        '.gif',
+        '.webp',
+        '.heic',
+        '.heif',
+        '.avif',
+      ];
+
+      Log.info('Picket from gallery: ${pickedFile.path}');
+
+      File? videoFilePath;
+      ScreenshotImageHelper? image;
+      MediaType? mediaType;
+
+      final isImage = imageExtensions.any(
+        (ext) => pickedFile.name.contains(ext),
+      );
+      if (isImage) {
+        if (pickedFile.name.contains('.gif')) {
+          mediaType = MediaType.gif;
+        }
+        image = ScreenshotImageHelper(
+          imageBytesFuture: pickedFile.readAsBytes(),
+        );
+      } else {
+        videoFilePath = File(pickedFile.path);
+      }
+
+      await pushMediaEditor(
+        image,
+        videoFilePath,
+        sharedFromGallery: true,
+        mediaType: mediaType,
+      );
+    }
+    setState(() {
+      _galleryLoadedImageIsShown = false;
+      mc.isSharePreviewIsShown = false;
+    });
+  }
+
+  Future<void> pressSideButtonLeft() async {
+    if (!mc.isSelectingFaceFilters) {
+      return pickImageFromGallery();
+    }
+    if (mc.currentFilterType.index == 1) {
+      mc.setFilter(FaceFilterType.none);
+      setState(() {
+        mc.isSelectingFaceFilters = false;
+      });
+      return;
+    }
+    mc.setFilter(mc.currentFilterType.goLeft());
+  }
+
+  Future<void> pressSideButtonRight() async {
+    if (!mc.isSelectingFaceFilters) {
+      setState(() {
+        mc.isSelectingFaceFilters = true;
+      });
+    }
+    if (mc.currentFilterType.index == FaceFilterType.values.length - 1) {
+      mc.setFilter(FaceFilterType.none);
+      setState(() {
+        mc.isSelectingFaceFilters = false;
+      });
+      return;
+    }
+    mc.setFilter(mc.currentFilterType.goRight());
+  }
+
+  Future<void> startVideoRecording() async {
+    if (mc.cameraController != null &&
+        mc.cameraController!.value.isRecordingVideo) {
+      return;
+    }
+    setState(() {
+      mc.isVideoRecording = true;
+    });
+
+    if (mc.selectedCameraDetails.isFlashOn) {
+      await mc.cameraController?.setFlashMode(FlashMode.torch);
+    }
+
+    try {
+      await mc.cameraController?.startVideoRecording();
+      _videoRecordingTimer = Timer.periodic(const Duration(milliseconds: 15), (
+        timer,
+      ) {
+        setState(() {
+          _currentTime = clock.now();
+        });
+        if (_videoRecordingStarted != null &&
+            _currentTime.difference(_videoRecordingStarted!).inSeconds >=
+                maxVideoRecordingTime) {
+          timer.cancel();
+          _videoRecordingTimer = null;
+          stopVideoRecording();
+        }
+      });
+      setState(() {
+        _videoRecordingStarted = clock.now();
+        mc.isVideoRecording = true;
+      });
+    } on CameraException catch (e) {
+      setState(() {
+        mc.isVideoRecording = false;
+      });
+      _showCameraException(e);
+      await mc.cameraController?.setFlashMode(FlashMode.off);
+      return;
+    }
+  }
+
+  Future<void> stopVideoRecording({bool force = false}) async {
+    // If recording is locked, only stop when explicitly forced (e.g. stop button tap)
+    if (_videoRecordingLocked && !force) return;
+
+    if (_videoRecordingTimer != null) {
+      _videoRecordingTimer?.cancel();
+      _videoRecordingTimer = null;
+    }
+
+    await mc.cameraController?.setFlashMode(FlashMode.off);
+
+    setState(() {
+      _videoRecordingStarted = null;
+      mc.isVideoRecording = false;
+      _videoRecordingLocked = false;
+    });
+
+    if (mc.cameraController == null ||
+        !mc.cameraController!.value.isRecordingVideo) {
+      return;
+    }
+
+    setState(() {
+      mc.isSharePreviewIsShown = true;
+    });
+
+    try {
+      final videoPath = await mc.cameraController?.stopVideoRecording();
+      if (videoPath == null) return;
+      await mc.cameraController?.pausePreview();
+      if (await pushMediaEditor(null, File(videoPath.path))) {
+        return;
+      }
+    } on CameraException catch (e) {
+      _showCameraException(e);
+      return;
+    }
+  }
+
+  void _showCameraException(dynamic e) {
+    Log.error('$e');
+    try {
+      if (context.mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text('Error: $e'),
+            duration: const Duration(seconds: 3),
+          ),
+        );
+      }
+      // ignore: empty_catches
+    } catch (e) {}
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (mc.selectedCameraDetails.cameraId >= AppEnvironment.cameras.length ||
+        mc.cameraController == null) {
+      return Container();
+    }
+    return StreamBuilder(
+      stream: userService.onUserUpdated,
+      builder: (context, asyncSnapshot) {
+        return MediaViewSizingHelper(
+          requiredHeight: 0,
+          additionalPadding: 59,
+          bottomNavigation: Container(),
+          child: GestureDetector(
+            onPanStart: (details) async {
+              setState(() {
+                _basePanY = details.localPosition.dy;
+                _baseScaleFactor = mc.selectedCameraDetails.scaleFactor;
+              });
+            },
+            onLongPressMoveUpdate: onPanUpdate,
+            onLongPressStart: (details) {
+              setState(() {
+                _basePanY = details.localPosition.dy;
+                _baseScaleFactor = mc.selectedCameraDetails.scaleFactor;
+              });
+              // Get the position of the pointer
+              final renderBox =
+                  keyTriggerButton.currentContext!.findRenderObject()!
+                      as RenderBox;
+              final localPosition = renderBox.globalToLocal(
+                details.globalPosition,
+              );
+
+              final containerRect = Rect.fromLTWH(
+                0,
+                0,
+                renderBox.size.width,
+                renderBox.size.height,
+              );
+
+              if (containerRect.contains(localPosition)) {
+                startVideoRecording();
+              }
+            },
+            onLongPressEnd: (a) {
+              stopVideoRecording();
+            },
+            onPanEnd: (a) {
+              stopVideoRecording();
+            },
+            onPanUpdate: onPanUpdate,
+            child: Stack(
+              children: [
+                if (_galleryLoadedImageIsShown)
+                  Center(
+                    child: SizedBox(
+                      height: 60,
+                      width: 60,
+                      child: ThreeRotatingDots(
+                        size: 40,
+                        color: context.color.primary,
+                      ),
+                    ),
+                  ),
+                if (!mc.isSharePreviewIsShown &&
+                    widget.sendToGroup != null &&
+                    !mc.isVideoRecording)
+                  ShowTitleText(
+                    title: widget.sendToGroup!.groupName,
+                    desc: context.lang.cameraPreviewSendTo,
+                  ),
+                if (!mc.isSharePreviewIsShown &&
+                    mc.sharedLinkForPreview != null &&
+                    !mc.isVideoRecording)
+                  ShowTitleText(
+                    title: mc.sharedLinkForPreview?.host ?? '',
+                    desc: 'Link',
+                    isLink: true,
+                  ),
+                if (!mc.isSharePreviewIsShown &&
+                    !mc.isVideoRecording &&
+                    !widget.hideControllers)
+                  CameraTopActions(
+                    selectedCameraDetails: mc.selectedCameraDetails,
+                    hasAudioPermission: _hasAudioPermission,
+                    onSwitchCamera: () async {
+                      await mc.selectCamera(
+                        (mc.selectedCameraDetails.cameraId + 1) % 2,
+                        false,
+                      );
+                    },
+                    onToggleFlash: () async {
+                      if (mc.selectedCameraDetails.isFlashOn) {
+                        await mc.cameraController?.setFlashMode(FlashMode.off);
+                        mc.selectedCameraDetails.isFlashOn = false;
+                      } else {
+                        await mc.cameraController?.setFlashMode(
+                          FlashMode.always,
+                        );
+                        mc.selectedCameraDetails.isFlashOn = true;
+                      }
+                      setState(() {
+                        // mc.selectedCameraDetails.isFlashOn
+                      });
+                    },
+                    onRequestMicrophone: requestMicrophonePermission,
+                  ),
+                if (!mc.isSharePreviewIsShown && !widget.hideControllers)
+                  CameraBottomControls(
+                    mainController: mc,
+                    isVideoRecording: mc.isVideoRecording,
+                    videoRecordingLocked: _videoRecordingLocked,
+                    isFront: isFront,
+                    keyTriggerButton: keyTriggerButton,
+                    keyLockButton: keyLockButton,
+                    onTakePicture: takePicture,
+                    onPressSideButtonLeft: pressSideButtonLeft,
+                    onPressSideButtonRight: pressSideButtonRight,
+                    updateScaleFactor: updateScaleFactor,
+                    onStopVideoRecording: () => stopVideoRecording(force: true),
+                  ),
+                VideoRecordingTimer(
+                  videoRecordingStarted: _videoRecordingStarted,
+                  maxVideoRecordingTime: maxVideoRecordingTime,
+                ),
+                if (!mc.isSharePreviewIsShown && widget.sendToGroup != null ||
+                    widget.hideControllers)
+                  Positioned(
+                    left: 5,
+                    top: 10,
+                    child: ActionButton(
+                      FontAwesomeIcons.xmark,
+                      tooltipText: context.lang.close,
+                      onPressed: () async {
+                        Navigator.pop(context);
+                      },
+                    ),
+                  ),
+                if (_showSelfieFlash) const CameraSelfieFlash(),
+                CameraScannedOverlay(mainController: mc),
+              ],
+            ),
+          ),
+        );
+      },
+    );
+  }
+}
diff --git a/lib/src/views/camera/camera_preview_components/face_filters.dart b/lib/src/visual/views/camera/camera_preview_components/face_filters.dart
similarity index 76%
rename from lib/src/views/camera/camera_preview_components/face_filters.dart
rename to lib/src/visual/views/camera/camera_preview_components/face_filters.dart
index 11c5e197..c555742a 100644
--- a/lib/src/views/camera/camera_preview_components/face_filters.dart
+++ b/lib/src/visual/views/camera/camera_preview_components/face_filters.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/painters/face_filters/beard_filter_painter.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/painters/face_filters/dog_filter_painter.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/painters/face_filters/beard_filter_painter.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/painters/face_filters/dog_filter_painter.dart';
 
 enum FaceFilterType {
   none,
diff --git a/lib/src/views/camera/camera_preview_components/main_camera_controller.dart b/lib/src/visual/views/camera/camera_preview_components/main_camera_controller.dart
similarity index 76%
rename from lib/src/views/camera/camera_preview_components/main_camera_controller.dart
rename to lib/src/visual/views/camera/camera_preview_components/main_camera_controller.dart
index 2cc6357f..d0d0672a 100644
--- a/lib/src/views/camera/camera_preview_components/main_camera_controller.dart
+++ b/lib/src/visual/views/camera/camera_preview_components/main_camera_controller.dart
@@ -1,9 +1,8 @@
 import 'dart:async';
 import 'dart:io';
+
 import 'package:camera/camera.dart';
 import 'package:clock/clock.dart';
-import 'package:collection/collection.dart';
-import 'package:drift/drift.dart' show Value;
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -11,20 +10,20 @@ import 'package:google_mlkit_barcode_scanning/google_mlkit_barcode_scanning.dart
 import 'package:google_mlkit_face_detection/google_mlkit_face_detection.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/protobuf/client/generated/qr.pb.dart';
-import 'package:twonly/src/services/signal/session.signal.dart';
 import 'package:twonly/src/utils/log.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/qr.dart';
-import 'package:twonly/src/utils/screenshot.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/camera_preview_controller_view.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/face_filters.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/painters/barcode_detector_painter.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/painters/face_filters/beard_filter_painter.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/painters/face_filters/dog_filter_painter.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/painters/face_filters/face_filter_painter.dart';
+import 'package:twonly/src/utils/qr.utils.dart';
+import 'package:twonly/src/visual/helpers/screenshot.helper.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/camera_preview_controller_view.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/face_filters.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/painters/barcode_detector_painter.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/painters/face_filters/beard_filter_painter.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/painters/face_filters/dog_filter_painter.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/painters/face_filters/face_filter_painter.dart';
 
 class ScannedVerifiedContact {
   ScannedVerifiedContact({required this.contact, required this.verificationOk});
@@ -46,6 +45,7 @@ class MainCameraController {
   bool initCameraStarted = true;
   Map<int, ScannedVerifiedContact> contactsVerified = {};
   Map<int, ScannedNewProfile> scannedNewProfiles = {};
+  final Set<String> _handledProfileLinks = {};
   String? scannedUrl;
   GlobalKey zoomButtonKey = GlobalKey();
   GlobalKey cameraPreviewKey = GlobalKey();
@@ -76,7 +76,7 @@ class MainCameraController {
   );
   bool _isBusy = false;
   bool _isBusyFaces = false;
-  CustomPaint? customPaint;
+  CustomPaint? qrCodePain;
   CustomPaint? facePaint;
   Offset? focusPointOffset;
 
@@ -104,17 +104,22 @@ class MainCameraController {
   Future<void> selectCamera(int sCameraId, bool init) async {
     initCameraStarted = true;
 
+    if (AppEnvironment.cameras.isEmpty) {
+      AppEnvironment.cameras = await availableCameras();
+    }
+
     var cameraId = sCameraId;
-    if (cameraId >= gCameras.length) {
+    if (cameraId >= AppEnvironment.cameras.length) {
       Log.warn(
-        'Trying to select a non existing camera $cameraId >= ${gCameras.length}',
+        'Trying to select a non existing camera $cameraId >= ${AppEnvironment.cameras.length}',
       );
       return;
     }
 
     if (init) {
-      for (; cameraId < gCameras.length; cameraId++) {
-        if (gCameras[cameraId].lensDirection == CameraLensDirection.back) {
+      for (; cameraId < AppEnvironment.cameras.length; cameraId++) {
+        if (AppEnvironment.cameras[cameraId].lensDirection ==
+            CameraLensDirection.back) {
           break;
         }
       }
@@ -124,7 +129,7 @@ class MainCameraController {
 
     if (cameraController == null) {
       cameraController = CameraController(
-        gCameras[cameraId],
+        AppEnvironment.cameras[cameraId],
         ResolutionPreset.high,
         enableAudio: await Permission.microphone.isGranted,
         imageFormatGroup: Platform.isAndroid
@@ -134,7 +139,7 @@ class MainCameraController {
       await cameraController?.initialize();
       await cameraController?.startImageStream(_processCameraImage);
       await cameraController?.setZoomLevel(selectedCameraDetails.scaleFactor);
-      if (gUser.videoStabilizationEnabled && !kDebugMode) {
+      if (userService.currentUser.videoStabilizationEnabled && !kDebugMode) {
         await cameraController?.setVideoStabilizationMode(
           VideoStabilizationMode.level1,
         );
@@ -150,7 +155,7 @@ class MainCameraController {
       selectedCameraDetails.scaleFactor = 1;
 
       await cameraController?.setZoomLevel(1);
-      await cameraController?.setDescription(gCameras[cameraId]);
+      await cameraController?.setDescription(AppEnvironment.cameras[cameraId]);
       try {
         if (!isVideoRecording) {
           await cameraController?.startImageStream(_processCameraImage);
@@ -178,7 +183,7 @@ class MainCameraController {
       ..cameraId = cameraId;
 
     facePaint = null;
-    customPaint = null;
+    qrCodePain = null;
     isSelectingFaceFilters = false;
     setFilter(FaceFilterType.none);
     zoomButtonKey = GlobalKey();
@@ -197,8 +202,8 @@ class MainCameraController {
 
     focusPointOffset = Offset(localPosition.dx, localPosition.dy);
 
-    final dx = localPosition.dx / box.size.width;
-    final dy = localPosition.dy / box.size.height;
+    final dx = (localPosition.dx / box.size.width).clamp(0.0, 1.0);
+    final dy = (localPosition.dy / box.size.height).clamp(0.0, 1.0);
 
     setState();
 
@@ -207,7 +212,12 @@ class MainCameraController {
       await cameraController?.setFocusPoint(Offset(dx, dy));
       await cameraController?.setFocusMode(FocusMode.auto);
     } catch (e) {
-      Log.error(e);
+      if (e is CameraException &&
+          (e.code == 'setFocusPointFailed' || e.code == 'setFocusModeFailed')) {
+        Log.info('Focus point or mode not supported on this device');
+      } else {
+        Log.error(e);
+      }
     }
 
     // display the focus point at least 500ms
@@ -276,10 +286,8 @@ class MainCameraController {
             (sensorOrientation - rotationCompensation + 360) % 360;
       }
       rotation = InputImageRotationValue.fromRawValue(rotationCompensation);
-      // print('rotationCompensation: $rotationCompensation');
     }
     if (rotation == null) return null;
-    // print('final rotation: $rotation');
 
     // get image format
     var format = InputImageFormatValue.fromRawValue(image.format.raw as int);
@@ -326,7 +334,7 @@ class MainCameraController {
         inputImage.metadata!.rotation,
         cameraController!.description.lensDirection,
       );
-      customPaint = CustomPaint(painter: painter);
+      qrCodePain = CustomPaint(painter: painter);
 
       if (barcodes.isEmpty && timeSharedLinkWasSetWithQr != null) {
         if (timeSharedLinkWasSetWithQr!.isAfter(
@@ -337,70 +345,57 @@ class MainCameraController {
       }
 
       for (final barcode in barcodes) {
-        if (barcode.displayValue != null) {
-          if (barcode.displayValue!.startsWith('http://') ||
-              barcode.displayValue!.startsWith('https://')) {
-            scannedUrl = barcode.displayValue;
-            if (sharedLinkForPreview == null) {
-              timeSharedLinkWasSetWithQr = clock.now();
-              setSharedLinkForPreview(Uri.parse(scannedUrl!));
-            }
-          }
-        }
-        if (barcode.rawBytes == null) continue;
+        if (barcode.displayValue == null) continue;
+        final link = barcode.displayValue!;
 
-        final profile = parseQrCodeData(barcode.rawBytes!);
+        if (link.startsWith(QrCodeUtils.linkPrefix)) {
+          if (_handledProfileLinks.contains(link)) continue;
+          _handledProfileLinks.add(link);
 
-        if (profile == null) continue;
+          final res = await QrCodeUtils.handleQrCodeLink(link);
+          if (res == null) continue;
+          final (profile, contact, verificationOk) = res;
 
-        final contact = await twonlyDB.contactsDao.getContactById(
-          profile.userId.toInt(),
-        );
-
-        if (contact != null && contact.accepted) {
-          if (contactsVerified[contact.userId] == null) {
-            final storedPublicKey = await getPublicKeyFromContact(
-              contact.userId,
-            );
-            if (storedPublicKey != null) {
-              final verificationOk = profile.publicIdentityKey.equals(
-                storedPublicKey.toList(),
-              );
-              contactsVerified[contact.userId] = ScannedVerifiedContact(
-                contact: contact,
-                verificationOk: verificationOk,
-              );
-              if (verificationOk) {
-                await twonlyDB.contactsDao.updateContact(
-                  contact.userId,
-                  const ContactsCompanion(verified: Value(true)),
-                );
-              }
-              await HapticFeedback.heavyImpact();
-              if (verificationOk) {
-                globalRootScaffoldMessengerKey.currentState?.showSnackBar(
-                  SnackBar(
-                    content: Text(
-                      globalRootScaffoldMessengerKey.currentContext?.lang
-                              .verifiedPublicKey(
-                                getContactDisplayName(contact),
-                              ) ??
-                          '',
-                    ),
-                    duration: const Duration(seconds: 6),
-                  ),
-                );
-              }
-            }
-          }
-        } else {
-          if (profile.username != gUser.username) {
+          if (contact == null) {
             if (scannedNewProfiles[profile.userId.toInt()] == null) {
               await HapticFeedback.heavyImpact();
               scannedNewProfiles[profile.userId.toInt()] = ScannedNewProfile(
                 profile: profile,
               );
             }
+            continue;
+          }
+
+          if (contactsVerified[contact.userId] == null) {
+            contactsVerified[contact.userId] = ScannedVerifiedContact(
+              contact: contact,
+              verificationOk: verificationOk,
+            );
+
+            await HapticFeedback.heavyImpact();
+            if (verificationOk) {
+              AppGlobalKeys.scaffoldMessengerKey.currentState?.showSnackBar(
+                SnackBar(
+                  content: Text(
+                    AppGlobalKeys.scaffoldMessengerKey.currentContext?.lang
+                            .verifiedPublicKey(
+                              getContactDisplayName(contact),
+                            ) ??
+                        '',
+                  ),
+                  duration: const Duration(seconds: 6),
+                ),
+              );
+            }
+          }
+          continue;
+        }
+
+        if (link.startsWith('http://') || link.startsWith('https://')) {
+          scannedUrl = link;
+          if (sharedLinkForPreview == null) {
+            timeSharedLinkWasSetWithQr = clock.now();
+            setSharedLinkForPreview(Uri.parse(scannedUrl!));
           }
         }
       }
diff --git a/lib/src/views/camera/camera_preview_components/painters/barcode_detector_painter.dart b/lib/src/visual/views/camera/camera_preview_components/painters/barcode_detector_painter.dart
similarity index 100%
rename from lib/src/views/camera/camera_preview_components/painters/barcode_detector_painter.dart
rename to lib/src/visual/views/camera/camera_preview_components/painters/barcode_detector_painter.dart
diff --git a/lib/src/views/camera/camera_preview_components/painters/coordinates_translator.dart b/lib/src/visual/views/camera/camera_preview_components/painters/coordinates_translator.dart
similarity index 100%
rename from lib/src/views/camera/camera_preview_components/painters/coordinates_translator.dart
rename to lib/src/visual/views/camera/camera_preview_components/painters/coordinates_translator.dart
diff --git a/lib/src/views/camera/camera_preview_components/painters/face_filters/beard_filter_painter.dart b/lib/src/visual/views/camera/camera_preview_components/painters/face_filters/beard_filter_painter.dart
similarity index 93%
rename from lib/src/views/camera/camera_preview_components/painters/face_filters/beard_filter_painter.dart
rename to lib/src/visual/views/camera/camera_preview_components/painters/face_filters/beard_filter_painter.dart
index 2380273e..4804ac75 100644
--- a/lib/src/views/camera/camera_preview_components/painters/face_filters/beard_filter_painter.dart
+++ b/lib/src/visual/views/camera/camera_preview_components/painters/face_filters/beard_filter_painter.dart
@@ -6,9 +6,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:google_mlkit_face_detection/google_mlkit_face_detection.dart';
 import 'package:twonly/src/utils/log.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/face_filters.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/painters/coordinates_translator.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/painters/face_filters/face_filter_painter.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/face_filters.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/painters/coordinates_translator.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/painters/face_filters/face_filter_painter.dart';
 
 class BeardFilterPainter extends FaceFilterPainter {
   BeardFilterPainter(
diff --git a/lib/src/views/camera/camera_preview_components/painters/face_filters/dog_filter_painter.dart b/lib/src/visual/views/camera/camera_preview_components/painters/face_filters/dog_filter_painter.dart
similarity index 96%
rename from lib/src/views/camera/camera_preview_components/painters/face_filters/dog_filter_painter.dart
rename to lib/src/visual/views/camera/camera_preview_components/painters/face_filters/dog_filter_painter.dart
index 5a6492f3..78a6cdd6 100644
--- a/lib/src/views/camera/camera_preview_components/painters/face_filters/dog_filter_painter.dart
+++ b/lib/src/visual/views/camera/camera_preview_components/painters/face_filters/dog_filter_painter.dart
@@ -6,8 +6,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:google_mlkit_face_detection/google_mlkit_face_detection.dart';
 import 'package:twonly/src/utils/log.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/painters/coordinates_translator.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/painters/face_filters/face_filter_painter.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/painters/coordinates_translator.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/painters/face_filters/face_filter_painter.dart';
 
 class DogFilterPainter extends FaceFilterPainter {
   DogFilterPainter(
diff --git a/lib/src/views/camera/camera_preview_components/painters/face_filters/face_filter_painter.dart b/lib/src/visual/views/camera/camera_preview_components/painters/face_filters/face_filter_painter.dart
similarity index 100%
rename from lib/src/views/camera/camera_preview_components/painters/face_filters/face_filter_painter.dart
rename to lib/src/visual/views/camera/camera_preview_components/painters/face_filters/face_filter_painter.dart
diff --git a/lib/src/views/camera/camera_preview_components/permissions_view.dart b/lib/src/visual/views/camera/camera_preview_components/permissions_view.dart
similarity index 100%
rename from lib/src/views/camera/camera_preview_components/permissions_view.dart
rename to lib/src/visual/views/camera/camera_preview_components/permissions_view.dart
diff --git a/lib/src/views/camera/camera_preview_components/save_to_gallery.dart b/lib/src/visual/views/camera/camera_preview_components/save_to_gallery.dart
similarity index 95%
rename from lib/src/views/camera/camera_preview_components/save_to_gallery.dart
rename to lib/src/visual/views/camera/camera_preview_components/save_to_gallery.dart
index efb57d43..8b70c224 100644
--- a/lib/src/views/camera/camera_preview_components/save_to_gallery.dart
+++ b/lib/src/visual/views/camera/camera_preview_components/save_to_gallery.dart
@@ -1,13 +1,14 @@
 import 'dart:async';
+
 import 'package:clock/clock.dart';
 import 'package:drift/drift.dart' show Value;
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/services/mediafiles/mediafile.service.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/screenshot.dart';
+import 'package:twonly/src/visual/helpers/screenshot.helper.dart';
 
 class SaveToGalleryButton extends StatefulWidget {
   const SaveToGalleryButton({
@@ -17,7 +18,7 @@ class SaveToGalleryButton extends StatefulWidget {
     this.storeImageAsOriginal,
     super.key,
   });
-  final Future<ScreenshotImage?> Function()? storeImageAsOriginal;
+  final Future<ScreenshotImageHelper?> Function()? storeImageAsOriginal;
   final bool displayButtonLabel;
   final MediaFileService mediaService;
   final bool isLoading;
diff --git a/lib/src/views/camera/camera_preview_components/send_to.dart b/lib/src/visual/views/camera/camera_preview_components/send_to.dart
similarity index 100%
rename from lib/src/views/camera/camera_preview_components/send_to.dart
rename to lib/src/visual/views/camera/camera_preview_components/send_to.dart
diff --git a/lib/src/views/camera/camera_preview_components/video_recording_time.dart b/lib/src/visual/views/camera/camera_preview_components/video_recording_time.dart
similarity index 100%
rename from lib/src/views/camera/camera_preview_components/video_recording_time.dart
rename to lib/src/visual/views/camera/camera_preview_components/video_recording_time.dart
diff --git a/lib/src/views/camera/camera_preview_components/zoom_selector.dart b/lib/src/visual/views/camera/camera_preview_components/zoom_selector.dart
similarity index 96%
rename from lib/src/views/camera/camera_preview_components/zoom_selector.dart
rename to lib/src/visual/views/camera/camera_preview_components/zoom_selector.dart
index ab7a5eb1..b0a22bf5 100644
--- a/lib/src/views/camera/camera_preview_components/zoom_selector.dart
+++ b/lib/src/visual/views/camera/camera_preview_components/zoom_selector.dart
@@ -6,7 +6,7 @@ import 'dart:math';
 import 'package:camera/camera.dart';
 import 'package:flutter/material.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/camera_preview_controller_view.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/camera_preview_controller_view.dart';
 
 class CameraZoomButtons extends StatefulWidget {
   const CameraZoomButtons({
@@ -51,11 +51,11 @@ class _CameraZoomButtonsState extends State<CameraZoomButtons> {
   Future<void> initAsync() async {
     showWideAngleZoom = (await widget.controller.getMinZoomLevel()) < 1;
 
-    var index = gCameras.indexWhere(
+    var index = AppEnvironment.cameras.indexWhere(
       (t) => t.lensType == CameraLensType.ultraWide,
     );
     if (index == -1) {
-      index = gCameras.indexWhere(
+      index = AppEnvironment.cameras.indexWhere(
         (t) => t.lensType == CameraLensType.wide,
       );
     }
diff --git a/lib/src/views/camera/camera_qr_scanner.view.dart b/lib/src/visual/views/camera/camera_qr_scanner.view.dart
similarity index 80%
rename from lib/src/views/camera/camera_qr_scanner.view.dart
rename to lib/src/visual/views/camera/camera_qr_scanner.view.dart
index 6d6201bf..1ef5d9e6 100644
--- a/lib/src/views/camera/camera_qr_scanner.view.dart
+++ b/lib/src/visual/views/camera/camera_qr_scanner.view.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 import 'package:flutter/material.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/camera_preview.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/camera_preview_controller_view.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/main_camera_controller.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/camera_preview.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/camera_preview_controller_view.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/main_camera_controller.dart';
 
 class QrCodeScannerView extends StatefulWidget {
   const QrCodeScannerView({super.key});
diff --git a/lib/src/views/camera/camera_send_to.view.dart b/lib/src/visual/views/camera/camera_send_to.view.dart
similarity index 81%
rename from lib/src/views/camera/camera_send_to.view.dart
rename to lib/src/visual/views/camera/camera_send_to.view.dart
index cdda1331..0f53fe8b 100644
--- a/lib/src/views/camera/camera_send_to.view.dart
+++ b/lib/src/visual/views/camera/camera_send_to.view.dart
@@ -1,9 +1,9 @@
 import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:twonly/src/database/twonly.db.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/camera_preview.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/camera_preview_controller_view.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/main_camera_controller.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/camera_preview.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/camera_preview_controller_view.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/main_camera_controller.dart';
 
 class CameraSendToView extends StatefulWidget {
   const CameraSendToView(this.sendToGroup, {super.key});
diff --git a/lib/src/views/camera/share_image_contact_selection.view.dart b/lib/src/visual/views/camera/share_image_contact_selection.view.dart
similarity index 82%
rename from lib/src/views/camera/share_image_contact_selection.view.dart
rename to lib/src/visual/views/camera/share_image_contact_selection.view.dart
index b4505f09..74433e08 100644
--- a/lib/src/views/camera/share_image_contact_selection.view.dart
+++ b/lib/src/visual/views/camera/share_image_contact_selection.view.dart
@@ -1,22 +1,26 @@
 import 'dart:async';
 import 'dart:collection';
+
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:twonly/globals.dart';
+import 'package:go_router/go_router.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/constants/routes.keys.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/protobuf/client/generated/data.pb.dart';
-import 'package:twonly/src/services/api/mediafiles/upload.service.dart';
+import 'package:twonly/src/services/api/mediafiles/upload.api.dart';
 import 'package:twonly/src/services/flame.service.dart';
 import 'package:twonly/src/services/mediafiles/mediafile.service.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/screenshot.dart';
-import 'package:twonly/src/views/camera/share_image_contact_selection/best_friends_selector.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/background.layer.dart';
-import 'package:twonly/src/views/components/avatar_icon.component.dart';
-import 'package:twonly/src/views/components/flame.dart';
-import 'package:twonly/src/views/components/headline.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
+import 'package:twonly/src/visual/components/flame_counter.comp.dart';
+import 'package:twonly/src/visual/decorations/input_text.decoration.dart';
+import 'package:twonly/src/visual/elements/headline.element.dart';
+import 'package:twonly/src/visual/helpers/screenshot.helper.dart';
+import 'package:twonly/src/visual/views/camera/share_image_contact_selection_components/best_friends_selector.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/background.layer.dart';
 
 class ShareImageView extends StatefulWidget {
   const ShareImageView({
@@ -29,7 +33,7 @@ class ShareImageView extends StatefulWidget {
   });
   final HashSet<String> selectedGroupIds;
   final void Function(String, bool) updateSelectedGroupIds;
-  final Future<ScreenshotImage?>? mediaStoreFuture;
+  final Future<ScreenshotImageHelper?>? mediaStoreFuture;
   final MediaFileService mediaFileService;
   final AdditionalMessageData? additionalData;
 
@@ -38,14 +42,14 @@ class ShareImageView extends StatefulWidget {
 }
 
 class _ShareImageView extends State<ShareImageView> {
-  List<Group> contacts = [];
+  List<Group> _allGroups = [];
   List<Group> _otherUsers = [];
   List<Group> _bestFriends = [];
   List<Group> _pinnedContacts = [];
 
   bool sendingImage = false;
   bool mediaStoreFutureReady = false;
-  ScreenshotImage? _screenshotImage;
+  ScreenshotImageHelper? _screenshotImage;
   bool hideArchivedUsers = true;
   final TextEditingController searchUserName = TextEditingController();
   late StreamSubscription<List<Group>> allGroupSub;
@@ -59,9 +63,9 @@ class _ShareImageView extends State<ShareImageView> {
       allGroups,
     ) async {
       setState(() {
-        contacts = allGroups;
+        _allGroups = allGroups;
       });
-      await updateGroups(allGroups.where((x) => !x.archived).toList());
+      await updateGroups(_allGroups.where((x) => !x.archived).toList());
     });
 
     unawaited(initAsync());
@@ -89,7 +93,7 @@ class _ShareImageView extends State<ShareImageView> {
 
       final flameComparison = getFlameCounterFromGroup(
         b,
-      ).compareTo(getFlameCounterFromGroup(a));
+      ).counter.compareTo(getFlameCounterFromGroup(a).counter);
       if (flameComparison != 0) {
         return flameComparison; // Sort by flameCounter in descending order
       }
@@ -107,7 +111,7 @@ class _ShareImageView extends State<ShareImageView> {
     for (final group in groups) {
       if (group.pinned) continue;
       if (!group.archived &&
-          (getFlameCounterFromGroup(group)) > 0 &&
+          getFlameCounterFromGroup(group).counter > 0 &&
           bestFriends.length < 6) {
         bestFriends.add(group);
       } else {
@@ -126,7 +130,7 @@ class _ShareImageView extends State<ShareImageView> {
     lastQuery = query;
     if (query.isEmpty) {
       await updateGroups(
-        contacts
+        _allGroups
             .where(
               (x) =>
                   !x.archived ||
@@ -137,7 +141,7 @@ class _ShareImageView extends State<ShareImageView> {
       );
       return;
     }
-    final usersFiltered = contacts
+    final usersFiltered = _allGroups
         .where(
           (user) => user.groupName.toLowerCase().contains(query.toLowerCase()),
         )
@@ -166,16 +170,30 @@ class _ShareImageView extends State<ShareImageView> {
           ),
           child: Column(
             children: [
-              Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 10),
-                child: TextField(
-                  onChanged: _filterUsers,
-                  decoration: getInputDecoration(
-                    context,
-                    context.lang.shareImageSearchAllContacts,
+              if (_allGroups.isEmpty)
+                Expanded(
+                  child: Center(
+                    child: FilledButton.icon(
+                      icon: const Icon(Icons.person_add),
+                      onPressed: () => context.push(Routes.chatsAddNewUser),
+                      label: Text(
+                        context.lang.chatListViewSearchUserNameBtn,
+                      ),
+                    ),
+                  ),
+                ),
+
+              if (_allGroups.isNotEmpty)
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 10),
+                  child: TextField(
+                    onChanged: _filterUsers,
+                    decoration: getInputDecoration(
+                      context,
+                      context.lang.shareImageSearchAllContacts,
+                    ),
                   ),
                 ),
-              ),
               if (_pinnedContacts.isNotEmpty) const SizedBox(height: 10),
               BestFriendsSelector(
                 groups: _pinnedContacts,
@@ -199,8 +217,8 @@ class _ShareImageView extends State<ShareImageView> {
                 Row(
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
-                    HeadLineComponent(context.lang.shareImageAllUsers),
-                    if (contacts.any((x) => x.archived))
+                    HeadLineComp(context.lang.shareImageAllUsers),
+                    if (_allGroups.any((x) => x.archived))
                       Row(
                         children: [
                           Text(
@@ -234,13 +252,14 @@ class _ShareImageView extends State<ShareImageView> {
                       ),
                   ],
                 ),
-              Expanded(
-                child: UserList(
-                  List.from(_otherUsers),
-                  selectedGroupIds: widget.selectedGroupIds,
-                  updateSelectedGroupIds: updateSelectedGroupIds,
+              if (_otherUsers.isNotEmpty)
+                Expanded(
+                  child: UserList(
+                    List.from(_otherUsers),
+                    selectedGroupIds: widget.selectedGroupIds,
+                    updateSelectedGroupIds: updateSelectedGroupIds,
+                  ),
                 ),
-              ),
             ],
           ),
         ),
@@ -254,7 +273,7 @@ class _ShareImageView extends State<ShareImageView> {
             children: [
               if (widget.mediaFileService.mediaFile.type == MediaType.image &&
                   _screenshotImage?.image != null &&
-                  gUser.showShowImagePreviewWhenSending)
+                  userService.currentUser.showShowImagePreviewWhenSending)
                 SizedBox(
                   height: 100,
                   width: 100 * 9 / 16,
diff --git a/lib/src/views/camera/share_image_contact_selection/best_friends_selector.dart b/lib/src/visual/views/camera/share_image_contact_selection_components/best_friends_selector.dart
similarity index 95%
rename from lib/src/views/camera/share_image_contact_selection/best_friends_selector.dart
rename to lib/src/visual/views/camera/share_image_contact_selection_components/best_friends_selector.dart
index a15b23eb..78c87516 100644
--- a/lib/src/views/camera/share_image_contact_selection/best_friends_selector.dart
+++ b/lib/src/visual/views/camera/share_image_contact_selection_components/best_friends_selector.dart
@@ -1,11 +1,12 @@
 import 'dart:collection';
+
 import 'package:flutter/material.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/avatar_icon.component.dart';
-import 'package:twonly/src/views/components/flame.dart';
-import 'package:twonly/src/views/components/headline.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
+import 'package:twonly/src/visual/components/flame_counter.comp.dart';
+import 'package:twonly/src/visual/elements/headline.element.dart';
 
 class BestFriendsSelector extends StatelessWidget {
   const BestFriendsSelector({
@@ -32,7 +33,7 @@ class BestFriendsSelector extends StatelessWidget {
         Row(
           children: [
             Expanded(
-              child: HeadLineComponent(title),
+              child: HeadLineComp(title),
             ),
             if (showSelectAll)
               GestureDetector(
diff --git a/lib/src/views/camera/share_image_contact_selection/select_show_time.dart b/lib/src/visual/views/camera/share_image_contact_selection_components/select_show_time.dart
similarity index 100%
rename from lib/src/views/camera/share_image_contact_selection/select_show_time.dart
rename to lib/src/visual/views/camera/share_image_contact_selection_components/select_show_time.dart
diff --git a/lib/src/views/camera/share_image_editor.view.dart b/lib/src/visual/views/camera/share_image_editor.view.dart
similarity index 92%
rename from lib/src/views/camera/share_image_editor.view.dart
rename to lib/src/visual/views/camera/share_image_editor.view.dart
index 6f9e96ec..d2b29bc7 100644
--- a/lib/src/views/camera/share_image_editor.view.dart
+++ b/lib/src/visual/views/camera/share_image_editor.view.dart
@@ -6,28 +6,28 @@ import 'dart:collection';
 import 'package:drift/drift.dart' show Value;
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/protobuf/client/generated/data.pb.dart';
-import 'package:twonly/src/services/api/mediafiles/upload.service.dart';
+import 'package:twonly/src/services/api/mediafiles/upload.api.dart';
 import 'package:twonly/src/services/mediafiles/mediafile.service.dart';
+import 'package:twonly/src/services/user.service.dart';
 import 'package:twonly/src/utils/log.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/screenshot.dart';
-import 'package:twonly/src/utils/storage.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/main_camera_controller.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/save_to_gallery.dart';
-import 'package:twonly/src/views/camera/share_image_contact_selection.view.dart';
-import 'package:twonly/src/views/camera/share_image_contact_selection/select_show_time.dart';
-import 'package:twonly/src/views/camera/share_image_editor/action_button.dart';
-import 'package:twonly/src/views/camera/share_image_editor/image_item.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layer_data.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers_viewer.dart';
-import 'package:twonly/src/views/components/emoji_picker.bottom.dart';
-import 'package:twonly/src/views/components/media_view_sizing.dart';
-import 'package:twonly/src/views/components/notification_badge.dart';
+import 'package:twonly/src/visual/components/emoji_picker.bottom.dart';
+import 'package:twonly/src/visual/components/notification_badge.comp.dart';
+import 'package:twonly/src/visual/helpers/media_view_sizing.helper.dart';
+import 'package:twonly/src/visual/helpers/screenshot.helper.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/main_camera_controller.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/save_to_gallery.dart';
+import 'package:twonly/src/visual/views/camera/share_image_contact_selection.view.dart';
+import 'package:twonly/src/visual/views/camera/share_image_contact_selection_components/select_show_time.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/action_button.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/image_item.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layer_data.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers_viewer.dart';
 import 'package:video_player/video_player.dart';
 
 List<Layer> layers = [];
@@ -44,7 +44,7 @@ class ShareImageEditorView extends StatefulWidget {
     this.sendToGroup,
     this.mainCameraController,
   });
-  final ScreenshotImage? screenshotImage;
+  final ScreenshotImageHelper? screenshotImage;
   final Group? sendToGroup;
   final bool sharedFromGallery;
   final MediaFileService mediaFileService;
@@ -95,10 +95,12 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
         loadImage(widget.screenshotImage!);
       } else {
         if (widget.mediaFileService.tempPath.existsSync()) {
-          loadImage(ScreenshotImage(file: widget.mediaFileService.tempPath));
+          loadImage(
+            ScreenshotImageHelper(file: widget.mediaFileService.tempPath),
+          );
         } else if (widget.mediaFileService.originalPath.existsSync()) {
           loadImage(
-            ScreenshotImage(file: widget.mediaFileService.originalPath),
+            ScreenshotImageHelper(file: widget.mediaFileService.originalPath),
           );
         }
       }
@@ -158,9 +160,8 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
     if (!mounted) return;
     setState(() {});
     if (storeAsDefault) {
-      await updateUserdata((user) {
+      await UserService.update((user) {
         user.defaultShowTime = maxShowTime;
-        return user;
       });
     }
   }
@@ -271,7 +272,7 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
           },
         ),
       const SizedBox(height: 8),
-      NotificationBadge(
+      NotificationBadgeComp(
         count: (media.type == MediaType.video)
             ? '0'
             : media.displayLimitInMilliseconds == null
@@ -467,7 +468,7 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
     }
   }
 
-  Future<ScreenshotImage?> getEditedImageBytes() async {
+  Future<ScreenshotImageHelper?> getEditedImageBytes() async {
     if (layers.length == 1) {
       if (layers.first is BackgroundLayerData) {
         return (layers.first as BackgroundLayerData).image.image;
@@ -499,7 +500,7 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
     return image;
   }
 
-  Future<ScreenshotImage?> storeImageAsOriginal() async {
+  Future<ScreenshotImageHelper?> storeImageAsOriginal() async {
     if (mediaService.overlayImagePath.existsSync()) {
       mediaService.overlayImagePath.deleteSync();
     }
@@ -511,7 +512,7 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
         mediaService.originalPath.deleteSync();
       }
     }
-    ScreenshotImage? image;
+    ScreenshotImageHelper? image;
     var bytes = await widget.screenshotImage?.getBytes();
     if (media.type == MediaType.gif) {
       if (bytes != null) {
@@ -536,12 +537,14 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
     return image;
   }
 
-  Future<void> storeIoImageAsDraft(ScreenshotImage screenshotImage) async {
+  Future<void> storeIoImageAsDraft(
+    ScreenshotImageHelper screenshotImage,
+  ) async {
     final imageBytes = await screenshotImage.getBytes();
     mediaService.originalPath.writeAsBytesSync(imageBytes!.toList());
   }
 
-  Future<void> loadImage(ScreenshotImage screenshotImage) async {
+  Future<void> loadImage(ScreenshotImageHelper screenshotImage) async {
     if (screenshotImage.image == null &&
         screenshotImage.imageBytes == null &&
         screenshotImage.imageBytesFuture != null) {
@@ -685,7 +688,7 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
                 );
                 setState(() {});
               },
-              child: MediaViewSizing(
+              child: MediaViewSizingHelper(
                 requiredHeight: 59,
                 bottomNavigation: ColoredBox(
                   color: Theme.of(context).colorScheme.surface,
diff --git a/lib/src/views/camera/share_image_editor/action_button.dart b/lib/src/visual/views/camera/share_image_editor_components/action_button.dart
similarity index 100%
rename from lib/src/views/camera/share_image_editor/action_button.dart
rename to lib/src/visual/views/camera/share_image_editor_components/action_button.dart
diff --git a/lib/src/views/camera/share_image_editor/image_item.dart b/lib/src/visual/views/camera/share_image_editor_components/image_item.dart
similarity index 65%
rename from lib/src/views/camera/share_image_editor/image_item.dart
rename to lib/src/visual/views/camera/share_image_editor_components/image_item.dart
index c2511d57..6bf97f97 100755
--- a/lib/src/views/camera/share_image_editor/image_item.dart
+++ b/lib/src/visual/views/camera/share_image_editor_components/image_item.dart
@@ -1,14 +1,14 @@
 import 'dart:async';
-import 'package:twonly/src/utils/screenshot.dart';
+import 'package:twonly/src/visual/helpers/screenshot.helper.dart';
 
 class ImageItem {
   ImageItem();
   int width = 1;
   int height = 1;
-  ScreenshotImage? image;
+  ScreenshotImageHelper? image;
   Completer<bool> loader = Completer<bool>();
 
-  void load(ScreenshotImage img) {
+  void load(ScreenshotImageHelper img) {
     image = img;
     if (image?.image != null) {
       height = image!.image!.height;
diff --git a/lib/src/views/camera/share_image_editor/layer_data.dart b/lib/src/visual/views/camera/share_image_editor_components/layer_data.dart
similarity index 90%
rename from lib/src/views/camera/share_image_editor/layer_data.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layer_data.dart
index ffee88ad..96153d07 100755
--- a/lib/src/views/camera/share_image_editor/layer_data.dart
+++ b/lib/src/visual/views/camera/share_image_editor_components/layer_data.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:hand_signature/signature.dart';
-import 'package:twonly/src/views/camera/share_image_editor/image_item.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/parser/base.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/image_item.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/base.dart';
 
 /// Layer class with some common properties
 class Layer {
diff --git a/lib/src/views/camera/share_image_editor/layers/background.layer.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/background.layer.dart
similarity index 93%
rename from lib/src/views/camera/share_image_editor/layers/background.layer.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers/background.layer.dart
index 96213423..f862e005 100755
--- a/lib/src/views/camera/share_image_editor/layers/background.layer.dart
+++ b/lib/src/visual/views/camera/share_image_editor_components/layers/background.layer.dart
@@ -4,8 +4,8 @@ import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:photo_view/photo_view.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/camera/share_image_editor/action_button.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layer_data.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/action_button.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layer_data.dart';
 
 class BackgroundLayer extends StatefulWidget {
   const BackgroundLayer({
@@ -23,10 +23,10 @@ class BackgroundLayer extends StatefulWidget {
 class _BackgroundLayerState extends State<BackgroundLayer> {
   @override
   void initState() {
+    super.initState();
     WidgetsBinding.instance.addPostFrameCallback((_) {
       widget.layerData.imageLoaded = true;
     });
-    super.initState();
   }
 
   @override
diff --git a/lib/src/views/camera/share_image_editor/layers/draw.layer.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/draw.layer.dart
similarity index 95%
rename from lib/src/views/camera/share_image_editor/layers/draw.layer.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers/draw.layer.dart
index aabddfd2..fe71acac 100644
--- a/lib/src/views/camera/share_image_editor/layers/draw.layer.dart
+++ b/lib/src/visual/views/camera/share_image_editor_components/layers/draw.layer.dart
@@ -3,9 +3,9 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:hand_signature/signature.dart';
 
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/camera/share_image_editor/action_button.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layer_data.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/draw/custom_hand_signature.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/action_button.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layer_data.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/draw/custom_hand_signature.dart';
 
 class DrawLayer extends StatefulWidget {
   const DrawLayer({
@@ -28,6 +28,7 @@ class _DrawLayerState extends State<DrawLayer> {
 
   @override
   void initState() {
+    super.initState();
     widget.layerData.control.addListener(() {
       if (widget.layerData.control.hasActivePath) return;
 
@@ -40,8 +41,6 @@ class _DrawLayerState extends State<DrawLayer> {
       undoList = [];
       setState(() {});
     });
-
-    super.initState();
   }
 
   double _sliderValue = 0.125;
diff --git a/lib/src/views/camera/share_image_editor/layers/draw/custom_hand_signature.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/draw/custom_hand_signature.dart
similarity index 100%
rename from lib/src/views/camera/share_image_editor/layers/draw/custom_hand_signature.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers/draw/custom_hand_signature.dart
diff --git a/lib/src/views/camera/share_image_editor/layers/emoji.layer.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/emoji.layer.dart
similarity index 97%
rename from lib/src/views/camera/share_image_editor/layers/emoji.layer.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers/emoji.layer.dart
index d01afc2a..133a79ea 100755
--- a/lib/src/views/camera/share_image_editor/layers/emoji.layer.dart
+++ b/lib/src/visual/views/camera/share_image_editor_components/layers/emoji.layer.dart
@@ -5,8 +5,8 @@ import 'package:flutter/rendering.dart';
 import 'package:flutter/services.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:twonly/src/utils/log.dart';
-import 'package:twonly/src/views/camera/share_image_editor/action_button.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layer_data.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/action_button.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layer_data.dart';
 
 /// Emoji layer
 class EmojiLayer extends StatefulWidget {
@@ -131,7 +131,6 @@ class _EmojiLayerState extends State<EmojiLayer> {
                   setState(() {
                     twoPointerWhereDown = details.pointerCount >= 2;
                     widget.layerData.size = initialScale * details.scale;
-                    // print(widget.layerData.size);
                     widget.layerData.rotation =
                         initialRotation + details.rotation;
 
diff --git a/lib/src/views/camera/share_image_editor/layers/filter.layer.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/filter.layer.dart
similarity index 87%
rename from lib/src/views/camera/share_image_editor/layers/filter.layer.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers/filter.layer.dart
index 9b9e0154..954d34c3 100644
--- a/lib/src/views/camera/share_image_editor/layers/filter.layer.dart
+++ b/lib/src/visual/views/camera/share_image_editor_components/layers/filter.layer.dart
@@ -2,10 +2,10 @@ import 'dart:async';
 
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layer_data.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/filters/datetime_filter.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/filters/image_filter.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/filters/location_filter.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layer_data.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/filters/datetime_filter.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/filters/image_filter.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/filters/location_filter.dart';
 
 /// Main layer
 class FilterLayer extends StatefulWidget {
diff --git a/lib/src/views/camera/share_image_editor/layers/filters/datetime_filter.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/filters/datetime_filter.dart
similarity index 88%
rename from lib/src/views/camera/share_image_editor/layers/filters/datetime_filter.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers/filters/datetime_filter.dart
index 78bae80f..72f5564d 100644
--- a/lib/src/views/camera/share_image_editor/layers/filters/datetime_filter.dart
+++ b/lib/src/visual/views/camera/share_image_editor_components/layers/filters/datetime_filter.dart
@@ -1,7 +1,7 @@
 import 'package:clock/clock.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/filter.layer.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/filter.layer.dart';
 
 class DateTimeFilter extends StatelessWidget {
   const DateTimeFilter({super.key, this.color = Colors.white});
diff --git a/lib/src/views/camera/share_image_editor/layers/filters/image_filter.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/filters/image_filter.dart
similarity index 84%
rename from lib/src/views/camera/share_image_editor/layers/filters/image_filter.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers/filters/image_filter.dart
index 920a9e47..8c6bfdcd 100644
--- a/lib/src/views/camera/share_image_editor/layers/filters/image_filter.dart
+++ b/lib/src/visual/views/camera/share_image_editor_components/layers/filters/image_filter.dart
@@ -1,6 +1,6 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/filter.layer.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/filter.layer.dart';
 
 class ImageFilter extends StatelessWidget {
   const ImageFilter({required this.imagePath, super.key});
diff --git a/lib/src/views/camera/share_image_editor/layers/filters/location_filter.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/filters/location_filter.dart
similarity index 94%
rename from lib/src/views/camera/share_image_editor/layers/filters/location_filter.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers/filters/location_filter.dart
index e3979327..55021aa8 100644
--- a/lib/src/views/camera/share_image_editor/layers/filters/location_filter.dart
+++ b/lib/src/visual/views/camera/share_image_editor_components/layers/filters/location_filter.dart
@@ -8,11 +8,11 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart' as http;
 import 'package:path_provider/path_provider.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/model/protobuf/api/websocket/server_to_client.pb.dart';
 import 'package:twonly/src/utils/log.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/filter.layer.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/filters/datetime_filter.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/filter.layer.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/filters/datetime_filter.dart';
 
 class LocationFilter extends StatefulWidget {
   const LocationFilter({super.key});
diff --git a/lib/src/views/camera/share_image_editor/layers/link_preview.layer.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview.layer.dart
similarity index 63%
rename from lib/src/views/camera/share_image_editor/layers/link_preview.layer.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers/link_preview.layer.dart
index 4de15b01..14874d08 100644
--- a/lib/src/views/camera/share_image_editor/layers/link_preview.layer.dart
+++ b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview.layer.dart
@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layer_data.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/cards/custom.card.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/cards/mastodon.card.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/cards/twitter.card.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/cards/youtube.card.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/parse_link.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/parser/base.dart';
-import 'package:twonly/src/views/components/loader/three_rotating_dots.loader.dart';
+import 'package:twonly/src/visual/loader/three_rotating_dots.loader.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layer_data.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/cards/custom.card.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/cards/mastodon.card.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/cards/twitter.card.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/cards/youtube.card.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/parse_link.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/base.dart';
 
 class LinkPreviewLayer extends StatefulWidget {
   const LinkPreviewLayer({
@@ -26,8 +26,8 @@ class _LinkPreviewLayerState extends State<LinkPreviewLayer> {
 
   @override
   void initState() {
-    initAsync();
     super.initState();
+    initAsync();
   }
 
   Future<void> initAsync() async {
diff --git a/lib/src/views/camera/share_image_editor/layers/link_preview/cards/custom.card.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/cards/custom.card.dart
similarity index 96%
rename from lib/src/views/camera/share_image_editor/layers/link_preview/cards/custom.card.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/cards/custom.card.dart
index f7d7e230..bf30b80e 100644
--- a/lib/src/views/camera/share_image_editor/layers/link_preview/cards/custom.card.dart
+++ b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/cards/custom.card.dart
@@ -2,7 +2,7 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/parser/base.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/base.dart';
 
 class CustomLinkCard extends StatelessWidget {
   const CustomLinkCard({required this.info, super.key});
diff --git a/lib/src/views/camera/share_image_editor/layers/link_preview/cards/mastodon.card.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/cards/mastodon.card.dart
similarity index 95%
rename from lib/src/views/camera/share_image_editor/layers/link_preview/cards/mastodon.card.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/cards/mastodon.card.dart
index f2fe80a8..40041bdb 100644
--- a/lib/src/views/camera/share_image_editor/layers/link_preview/cards/mastodon.card.dart
+++ b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/cards/mastodon.card.dart
@@ -2,8 +2,8 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/parser/base.dart';
-import 'package:twonly/src/views/components/loader/three_rotating_dots.loader.dart';
+import 'package:twonly/src/visual/loader/three_rotating_dots.loader.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/base.dart';
 
 class MastodonPostCard extends StatelessWidget {
   const MastodonPostCard({required this.info, super.key});
diff --git a/lib/src/views/camera/share_image_editor/layers/link_preview/cards/twitter.card.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/cards/twitter.card.dart
similarity index 96%
rename from lib/src/views/camera/share_image_editor/layers/link_preview/cards/twitter.card.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/cards/twitter.card.dart
index a822c595..0a076d64 100644
--- a/lib/src/views/camera/share_image_editor/layers/link_preview/cards/twitter.card.dart
+++ b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/cards/twitter.card.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 // Assuming the same Metadata import structure
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/parser/base.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/base.dart';
 
 class TwitterPostCard extends StatelessWidget {
   const TwitterPostCard({required this.info, super.key});
diff --git a/lib/src/views/camera/share_image_editor/layers/link_preview/cards/youtube.card.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/cards/youtube.card.dart
similarity index 96%
rename from lib/src/views/camera/share_image_editor/layers/link_preview/cards/youtube.card.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/cards/youtube.card.dart
index c9bbb855..4c253125 100644
--- a/lib/src/views/camera/share_image_editor/layers/link_preview/cards/youtube.card.dart
+++ b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/cards/youtube.card.dart
@@ -2,7 +2,7 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/parser/base.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/base.dart';
 
 class YouTubePostCard extends StatelessWidget {
   const YouTubePostCard({required this.info, super.key});
diff --git a/lib/src/views/camera/share_image_editor/layers/link_preview/parse_link.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/parse_link.dart
similarity index 72%
rename from lib/src/views/camera/share_image_editor/layers/link_preview/parse_link.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/parse_link.dart
index 0923f5ca..a0df2ec4 100644
--- a/lib/src/views/camera/share_image_editor/layers/link_preview/parse_link.dart
+++ b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/parse_link.dart
@@ -7,16 +7,16 @@ import 'package:html/dom.dart' show Document;
 import 'package:html/parser.dart';
 import 'package:http/http.dart' as http;
 import 'package:twonly/src/utils/log.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/parser/base.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/parser/html.parser.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/parser/json_ld.parser.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/parser/mastodon.parser.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/parser/og.parser.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/parser/other.parser.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/parser/twitter.parser.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/parser/util.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/parser/youtube.parser.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/utils.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/base.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/html.parser.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/json_ld.parser.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/mastodon.parser.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/og.parser.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/other.parser.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/twitter.parser.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/util.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/youtube.parser.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/utils.dart';
 
 Future<Metadata?> getMetadata(String link) async {
   const userAgent = 'WhatsApp/2.21.12.21 A';
diff --git a/lib/src/views/camera/share_image_editor/layers/link_preview/parser/base.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/base.dart
similarity index 100%
rename from lib/src/views/camera/share_image_editor/layers/link_preview/parser/base.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/base.dart
diff --git a/lib/src/views/camera/share_image_editor/layers/link_preview/parser/html.parser.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/html.parser.dart
similarity index 100%
rename from lib/src/views/camera/share_image_editor/layers/link_preview/parser/html.parser.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/html.parser.dart
diff --git a/lib/src/views/camera/share_image_editor/layers/link_preview/parser/json_ld.parser.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/json_ld.parser.dart
similarity index 88%
rename from lib/src/views/camera/share_image_editor/layers/link_preview/parser/json_ld.parser.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/json_ld.parser.dart
index beb8ef3e..6ca5f7fe 100644
--- a/lib/src/views/camera/share_image_editor/layers/link_preview/parser/json_ld.parser.dart
+++ b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/json_ld.parser.dart
@@ -1,9 +1,9 @@
 import 'dart:convert';
 
 import 'package:html/dom.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/parser/base.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/parser/og.parser.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/parser/util.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/base.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/og.parser.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/util.dart';
 
 /// Parses [Metadata] from `json-ld` data in `<script>` tags.
 class JsonLdParser with BaseMetaInfo {
diff --git a/lib/src/views/camera/share_image_editor/layers/link_preview/parser/mastodon.parser.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/mastodon.parser.dart
similarity index 79%
rename from lib/src/views/camera/share_image_editor/layers/link_preview/parser/mastodon.parser.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/mastodon.parser.dart
index a3f87287..e43d202f 100644
--- a/lib/src/views/camera/share_image_editor/layers/link_preview/parser/mastodon.parser.dart
+++ b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/mastodon.parser.dart
@@ -1,5 +1,5 @@
 import 'package:html/dom.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/parser/base.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/base.dart';
 
 class MastodonParser with BaseMetaInfo {
   MastodonParser(this._document);
diff --git a/lib/src/views/camera/share_image_editor/layers/link_preview/parser/og.parser.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/og.parser.dart
similarity index 100%
rename from lib/src/views/camera/share_image_editor/layers/link_preview/parser/og.parser.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/og.parser.dart
diff --git a/lib/src/views/camera/share_image_editor/layers/link_preview/parser/other.parser.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/other.parser.dart
similarity index 100%
rename from lib/src/views/camera/share_image_editor/layers/link_preview/parser/other.parser.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/other.parser.dart
diff --git a/lib/src/views/camera/share_image_editor/layers/link_preview/parser/twitter.parser.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/twitter.parser.dart
similarity index 80%
rename from lib/src/views/camera/share_image_editor/layers/link_preview/parser/twitter.parser.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/twitter.parser.dart
index 3e8ee04a..f9050611 100644
--- a/lib/src/views/camera/share_image_editor/layers/link_preview/parser/twitter.parser.dart
+++ b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/twitter.parser.dart
@@ -1,6 +1,6 @@
 import 'package:html/dom.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/parser/base.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/parser/util.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/base.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/util.dart';
 
 /// Parses [Metadata] from `<meta property='twitter:*'>` tags.
 class TwitterParser with BaseMetaInfo {
diff --git a/lib/src/views/camera/share_image_editor/layers/link_preview/parser/util.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/util.dart
similarity index 100%
rename from lib/src/views/camera/share_image_editor/layers/link_preview/parser/util.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/util.dart
diff --git a/lib/src/views/camera/share_image_editor/layers/link_preview/parser/youtube.parser.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/youtube.parser.dart
similarity index 100%
rename from lib/src/views/camera/share_image_editor/layers/link_preview/parser/youtube.parser.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/youtube.parser.dart
diff --git a/lib/src/views/camera/share_image_editor/layers/link_preview/utils.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/utils.dart
similarity index 100%
rename from lib/src/views/camera/share_image_editor/layers/link_preview/utils.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/utils.dart
diff --git a/lib/src/views/camera/share_image_editor/layers/text.layer.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/text.layer.dart
similarity index 97%
rename from lib/src/views/camera/share_image_editor/layers/text.layer.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers/text.layer.dart
index b8ac662a..8b93bc99 100755
--- a/lib/src/views/camera/share_image_editor/layers/text.layer.dart
+++ b/lib/src/visual/views/camera/share_image_editor_components/layers/text.layer.dart
@@ -5,8 +5,8 @@ import 'package:flutter/services.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
 import 'package:twonly/src/providers/image_editor.provider.dart';
-import 'package:twonly/src/views/camera/share_image_editor/action_button.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layer_data.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/action_button.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layer_data.dart';
 
 /// Text layer
 class TextLayer extends StatefulWidget {
diff --git a/lib/src/views/camera/share_image_editor/layers_viewer.dart b/lib/src/visual/views/camera/share_image_editor_components/layers_viewer.dart
similarity index 78%
rename from lib/src/views/camera/share_image_editor/layers_viewer.dart
rename to lib/src/visual/views/camera/share_image_editor_components/layers_viewer.dart
index 390dcabf..581535a3 100644
--- a/lib/src/views/camera/share_image_editor/layers_viewer.dart
+++ b/lib/src/visual/views/camera/share_image_editor_components/layers_viewer.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layer_data.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/background.layer.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/draw.layer.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/emoji.layer.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/filter.layer.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview.layer.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/text.layer.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layer_data.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/background.layer.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/draw.layer.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/emoji.layer.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/filter.layer.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview.layer.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/text.layer.dart';
 
 /// View stacked layers (unbounded height, width)
 class LayersViewer extends StatelessWidget {
diff --git a/lib/src/views/chats/archived_chats.view.dart b/lib/src/visual/views/chats/archived_chats.view.dart
similarity index 87%
rename from lib/src/views/chats/archived_chats.view.dart
rename to lib/src/visual/views/chats/archived_chats.view.dart
index 0f0847ab..78251def 100644
--- a/lib/src/views/chats/archived_chats.view.dart
+++ b/lib/src/visual/views/chats/archived_chats.view.dart
@@ -1,9 +1,10 @@
 import 'dart:async';
+
 import 'package:flutter/material.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/chats/chat_list_components/group_list_item.dart';
+import 'package:twonly/src/visual/views/chats/chat_list_components/group_list_item.comp.dart';
 
 class ArchivedChatsView extends StatefulWidget {
   const ArchivedChatsView({super.key});
@@ -18,8 +19,8 @@ class _ArchivedChatsViewState extends State<ArchivedChatsView> {
 
   @override
   void initState() {
-    initAsync();
     super.initState();
+    initAsync();
   }
 
   Future<void> initAsync() async {
@@ -45,7 +46,7 @@ class _ArchivedChatsViewState extends State<ArchivedChatsView> {
       ),
       body: ListView(
         children: _groupsArchived.map((group) {
-          return GroupListItem(
+          return GroupListItemComp(
             group: group,
           );
         }).toList(),
diff --git a/lib/src/visual/views/chats/chat_list.view.dart b/lib/src/visual/views/chats/chat_list.view.dart
new file mode 100644
index 00000000..64aba01d
--- /dev/null
+++ b/lib/src/visual/views/chats/chat_list.view.dart
@@ -0,0 +1,328 @@
+import 'dart:async';
+
+import 'package:cryptography_plus/cryptography_plus.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:go_router/go_router.dart';
+import 'package:provider/provider.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/constants/routes.keys.dart';
+import 'package:twonly/src/database/twonly.db.dart';
+import 'package:twonly/src/providers/purchases.provider.dart';
+import 'package:twonly/src/services/subscription.service.dart';
+import 'package:twonly/src/services/user.service.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
+import 'package:twonly/src/visual/components/connection_status.comp.dart';
+import 'package:twonly/src/visual/components/notification_badge.comp.dart';
+import 'package:twonly/src/visual/themes/light.dart';
+import 'package:twonly/src/visual/views/chats/chat_list_components/feedback_btn.comp.dart';
+import 'package:twonly/src/visual/views/chats/chat_list_components/group_list_item.comp.dart';
+import 'package:twonly/src/visual/views/onboarding/setup/components/finish_setup.comp.dart';
+
+class ChatListView extends StatefulWidget {
+  const ChatListView({super.key});
+  @override
+  State<ChatListView> createState() => _ChatListViewState();
+}
+
+class _ChatListViewState extends State<ChatListView> {
+  StreamSubscription<void>? _userSub;
+  late StreamSubscription<List<Group>> _contactsSub;
+  List<Group> _groupsNotPinned = [];
+  List<Group> _groupsPinned = [];
+  List<Group> _groupsArchived = [];
+
+  GlobalKey searchForOtherUsers = GlobalKey();
+  bool showFeedbackShortcut = false;
+
+  int _countContactRequest = 0;
+  int _countAnnouncedUsers = 0;
+  late StreamSubscription<int?> _countContactRequestStream;
+  late StreamSubscription<int?> _countAnnouncedStream;
+
+  @override
+  void initState() {
+    super.initState();
+    initAsync();
+    _userSub = userService.onUserUpdated.listen((_) {
+      if (mounted) setState(() {});
+    });
+  }
+
+  Future<void> initAsync() async {
+    final stream = twonlyDB.groupsDao.watchGroupsForChatList();
+    _contactsSub = stream.listen((groups) {
+      if (!mounted) return;
+      setState(() {
+        _groupsNotPinned = groups
+            .where((x) => !x.pinned && !x.archived)
+            .toList();
+        _groupsPinned = groups.where((x) => x.pinned && !x.archived).toList();
+        _groupsArchived = groups.where((x) => x.archived).toList();
+      });
+    });
+
+    _countContactRequestStream = twonlyDB.contactsDao
+        .watchContactsRequestedCount()
+        .listen((update) {
+          if (update != null) {
+            if (!mounted) return;
+            setState(() {
+              _countContactRequest = update;
+            });
+          }
+        });
+
+    _countAnnouncedStream = twonlyDB.userDiscoveryDao
+        .watchNewAnnouncementsWithDataCount()
+        .listen((update) {
+          if (!mounted) return;
+          setState(() {
+            _countAnnouncedUsers = update;
+          });
+        });
+
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
+      final changeLog = await rootBundle.loadString('CHANGELOG.md');
+      final changeLogHash = (await compute(
+        Sha256().hash,
+        changeLog.codeUnits,
+      )).bytes;
+      if (!userService.currentUser.hideChangeLog &&
+          userService.currentUser.lastChangeLogHash.toString() !=
+              changeLogHash.toString()) {
+        await UserService.update((u) {
+          u.lastChangeLogHash = changeLogHash;
+        });
+        if (!mounted) return;
+        // only show changelog to people who already have contacts
+        // this prevents that this is shown directly after the user registered
+        if (_groupsNotPinned.isNotEmpty) {
+          await context.push(
+            Routes.settingsHelpChangelog,
+            extra: changeLog,
+          );
+        }
+      }
+    });
+  }
+
+  @override
+  void dispose() {
+    _contactsSub.cancel();
+    _countContactRequestStream.cancel();
+    _countAnnouncedStream.cancel();
+    _userSub?.cancel();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final plan = context.watch<PurchasesProvider>().plan;
+    return Scaffold(
+      appBar: AppBar(
+        title: Row(
+          children: [
+            ConnectionStatusComp(
+              child: GestureDetector(
+                onTap: () => context.push(Routes.settingsProfile),
+                child: AvatarIcon(
+                  myAvatar: true,
+                  fontSize: 14,
+                  color: context.color.onSurface.withAlpha(20),
+                ),
+              ),
+            ),
+            const SizedBox(width: 10),
+            const Text('twonly '),
+            if (plan != SubscriptionPlan.Free)
+              GestureDetector(
+                onTap: () => context.push(Routes.settingsSubscription),
+                child: Container(
+                  decoration: BoxDecoration(
+                    color: context.color.primary,
+                    borderRadius: BorderRadius.circular(15),
+                  ),
+                  padding: const EdgeInsets.symmetric(
+                    horizontal: 5,
+                    vertical: 3,
+                  ),
+                  child: Text(
+                    plan.name,
+                    style: TextStyle(
+                      fontSize: 10,
+                      fontWeight: FontWeight.bold,
+                      color: isDarkMode(context) ? Colors.black : Colors.white,
+                    ),
+                  ),
+                ),
+              ),
+          ],
+        ),
+        actions: [
+          const FeedbackIconButtonComp(),
+          Stack(
+            children: [
+              if (_countAnnouncedUsers + _countContactRequest > 0)
+                Positioned.fill(
+                  child: Center(
+                    child: Container(
+                      width: 40,
+                      height: 40,
+                      decoration: const BoxDecoration(
+                        color: primaryColor,
+                        shape: BoxShape.circle,
+                      ),
+                    ),
+                  ),
+                ),
+              Center(
+                child: NotificationBadgeComp(
+                  backgroundColor: isDarkMode(context)
+                      ? Colors.white
+                      : Colors.black,
+                  textColor: isDarkMode(context) ? Colors.black : Colors.white,
+                  count: (_countAnnouncedUsers + _countContactRequest)
+                      .toString(),
+                  child: IconButton(
+                    color: (_countAnnouncedUsers + _countContactRequest > 0)
+                        ? Colors.black
+                        : null,
+                    key: searchForOtherUsers,
+                    icon: const FaIcon(FontAwesomeIcons.userPlus, size: 18),
+                    onPressed: () => context.push(Routes.chatsAddNewUser),
+                  ),
+                ),
+              ),
+            ],
+          ),
+
+          IconButton(
+            onPressed: () => context.push(Routes.settings),
+            icon: const FaIcon(FontAwesomeIcons.gear, size: 19),
+          ),
+        ],
+      ),
+      body: RefreshIndicator(
+        onRefresh: () async {
+          await apiService.close(() {});
+          await apiService.connect();
+          await Future.delayed(const Duration(seconds: 1));
+        },
+        child: Column(
+          children: [
+            const FinishSetupComp(),
+            if (_groupsNotPinned.isEmpty &&
+                _groupsPinned.isEmpty &&
+                _groupsArchived.isEmpty)
+              Expanded(
+                child: Center(
+                  child: Padding(
+                    padding: const EdgeInsets.all(10),
+                    child: FilledButton.icon(
+                      icon: const Icon(Icons.person_add),
+                      onPressed: () => context.push(Routes.chatsAddNewUser),
+                      label: Text(
+                        context.lang.chatListViewSearchUserNameBtn,
+                      ),
+                    ),
+                  ),
+                ),
+              )
+            else
+              Expanded(
+                child: ListView.builder(
+                  itemCount:
+                      _groupsPinned.length +
+                      (_groupsPinned.isNotEmpty ? 1 : 0) +
+                      _groupsNotPinned.length +
+                      (_groupsArchived.isNotEmpty ? 1 : 0),
+                  itemBuilder: (context, index) {
+                    if (index >=
+                        _groupsNotPinned.length +
+                            _groupsPinned.length +
+                            (_groupsPinned.isNotEmpty ? 1 : 0)) {
+                      if (_groupsArchived.isEmpty) return Container();
+                      return ListTile(
+                        title: Text(
+                          '${context.lang.archivedChats} (${_groupsArchived.length})',
+                          textAlign: TextAlign.center,
+                          style: const TextStyle(fontSize: 13),
+                        ),
+                        onTap: () => context.push(Routes.chatsArchived),
+                      );
+                    }
+                    // Check if the index is for the pinned users
+                    if (index < _groupsPinned.length) {
+                      final group = _groupsPinned[index];
+                      return GroupListItemComp(
+                        key: ValueKey(group.groupId),
+                        group: group,
+                      );
+                    }
+
+                    // If there are pinned users, account for the Divider
+                    var adjustedIndex = index - _groupsPinned.length;
+                    if (_groupsPinned.isNotEmpty && adjustedIndex == 0) {
+                      return const Divider();
+                    }
+
+                    // Adjust the index for the contacts list
+                    adjustedIndex -= (_groupsPinned.isNotEmpty ? 1 : 0);
+
+                    // Get the contacts that are not pinned
+                    final group = _groupsNotPinned.elementAt(
+                      adjustedIndex,
+                    );
+                    return GroupListItemComp(
+                      key: ValueKey(group.groupId),
+                      group: group,
+                    );
+                  },
+                ),
+              ),
+          ],
+        ),
+      ),
+      floatingActionButton: Padding(
+        padding: const EdgeInsets.only(bottom: 30),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.end,
+          children: [
+            Material(
+              elevation: 3,
+              shape: const CircleBorder(),
+              color: context.color.primary,
+              child: InkWell(
+                borderRadius: BorderRadius.circular(12),
+                onTap: () => context.push(Routes.settingsPublicProfile),
+                child: SizedBox(
+                  width: 45,
+                  height: 45,
+                  child: Center(
+                    child: FaIcon(
+                      FontAwesomeIcons.qrcode,
+                      color: isDarkMode(context) ? Colors.black : Colors.white,
+                    ),
+                  ),
+                ),
+              ),
+            ),
+            const SizedBox(height: 12),
+            FloatingActionButton(
+              backgroundColor: context.color.primary,
+              onPressed: () => context.push(Routes.chatsStartNewChat),
+              child: FaIcon(
+                FontAwesomeIcons.penToSquare,
+                color: isDarkMode(context) ? Colors.black : Colors.white,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/src/visual/views/chats/chat_list_components/feedback_btn.comp.dart b/lib/src/visual/views/chats/chat_list_components/feedback_btn.comp.dart
new file mode 100644
index 00000000..498af280
--- /dev/null
+++ b/lib/src/visual/views/chats/chat_list_components/feedback_btn.comp.dart
@@ -0,0 +1,28 @@
+import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:go_router/go_router.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/constants/routes.keys.dart';
+import 'package:twonly/src/utils/misc.dart';
+
+class FeedbackIconButtonComp extends StatelessWidget {
+  const FeedbackIconButtonComp({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return StreamBuilder(
+      stream: userService.onUserUpdated,
+      builder: (context, asyncSnapshot) {
+        if (!userService.currentUser.showFeedbackShortcut) {
+          return const SizedBox.shrink();
+        }
+        return IconButton(
+          onPressed: () => context.push(Routes.settingsHelpContactUs),
+          color: Colors.grey,
+          tooltip: context.lang.feedbackTooltip,
+          icon: const FaIcon(FontAwesomeIcons.commentDots, size: 19),
+        );
+      },
+    );
+  }
+}
diff --git a/lib/src/views/chats/chat_list_components/group_list_item.dart b/lib/src/visual/views/chats/chat_list_components/group_list_item.comp.dart
similarity index 89%
rename from lib/src/views/chats/chat_list_components/group_list_item.dart
rename to lib/src/visual/views/chats/chat_list_components/group_list_item.comp.dart
index 00ccc1c9..225a3195 100644
--- a/lib/src/views/chats/chat_list_components/group_list_item.dart
+++ b/lib/src/visual/views/chats/chat_list_components/group_list_item.comp.dart
@@ -4,34 +4,34 @@ import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:go_router/go_router.dart';
 import 'package:mutex/mutex.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
 import 'package:twonly/src/database/tables/messages.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
-import 'package:twonly/src/services/api/mediafiles/download.service.dart';
+import 'package:twonly/src/services/api/mediafiles/download.api.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/chats/chat_list_components/last_message_time.dart';
-import 'package:twonly/src/views/chats/chat_list_components/typing_indicator_subtitle.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/message_send_state_icon.dart';
-import 'package:twonly/src/views/components/avatar_icon.component.dart';
-import 'package:twonly/src/views/components/flame.dart';
-import 'package:twonly/src/views/components/group_context_menu.component.dart';
-import 'package:twonly/src/views/components/verified_shield.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
+import 'package:twonly/src/visual/components/flame_counter.comp.dart';
+import 'package:twonly/src/visual/components/verification_badge.comp.dart';
+import 'package:twonly/src/visual/context_menu/group.context_menu.dart';
+import 'package:twonly/src/visual/views/chats/chat_list_components/last_message_time.comp.dart';
+import 'package:twonly/src/visual/views/chats/chat_list_components/typing_indicator_subtitle.comp.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/message_send_state_icon.dart';
 
-class GroupListItem extends StatefulWidget {
-  const GroupListItem({
+class GroupListItemComp extends StatefulWidget {
+  const GroupListItemComp({
     required this.group,
     super.key,
   });
   final Group group;
 
   @override
-  State<GroupListItem> createState() => _UserListItem();
+  State<GroupListItemComp> createState() => _UserListItem();
 }
 
-class _UserListItem extends State<GroupListItem> {
+class _UserListItem extends State<GroupListItemComp> {
   Message? _currentMessage;
 
   List<Message> _messagesNotOpened = [];
@@ -76,6 +76,7 @@ class _UserListItem extends State<GroupListItem> {
     _lastReactionStream = twonlyDB.reactionsDao
         .watchLastReactions(widget.group.groupId)
         .listen((update) {
+          if (!mounted) return;
           setState(() {
             _lastReaction = update;
           });
@@ -92,6 +93,7 @@ class _UserListItem extends State<GroupListItem> {
     _lastMediaFilesStream = twonlyDB.mediaFilesDao
         .watchNewestMediaFiles()
         .listen((mediaFiles) {
+          if (!mounted) return;
           for (final mediaFile in mediaFiles) {
             final index = _previewMediaFiles.indexWhere(
               (t) => t.mediaId == mediaFile.mediaId,
@@ -226,7 +228,7 @@ class _UserListItem extends State<GroupListItem> {
               substringBy(widget.group.groupName, 30),
             ),
             const SizedBox(width: 3),
-            VerifiedShield(
+            VerificationBadgeComp(
               group: widget.group,
               showOnlyIfVerified: true,
               clickable: false,
@@ -241,7 +243,7 @@ class _UserListItem extends State<GroupListItem> {
                   ? Text(context.lang.chatsTapToSend)
                   : Row(
                       children: [
-                        LastMessageTime(
+                        LastMessageTimeComp(
                           dateTime: widget.group.lastMessageExchange,
                         ),
                         FlameCounterWidget(
@@ -252,7 +254,7 @@ class _UserListItem extends State<GroupListItem> {
                     )
             : Row(
                 children: [
-                  TypingIndicatorSubtitle(
+                  TypingIndicatorSubtitleComp(
                     groupId: widget.group.groupId,
                   ),
                   MessageSendStateIcon(
@@ -264,7 +266,7 @@ class _UserListItem extends State<GroupListItem> {
                   const Text('•'),
                   const SizedBox(width: 5),
                   if (_currentMessage != null)
-                    LastMessageTime(message: _currentMessage),
+                    LastMessageTimeComp(message: _currentMessage),
                   FlameCounterWidget(
                     groupId: widget.group.groupId,
                     prefix: true,
diff --git a/lib/src/views/chats/chat_list_components/last_message_time.dart b/lib/src/visual/views/chats/chat_list_components/last_message_time.comp.dart
similarity index 82%
rename from lib/src/views/chats/chat_list_components/last_message_time.dart
rename to lib/src/visual/views/chats/chat_list_components/last_message_time.comp.dart
index 6f01aea8..3621e45a 100644
--- a/lib/src/views/chats/chat_list_components/last_message_time.dart
+++ b/lib/src/visual/views/chats/chat_list_components/last_message_time.comp.dart
@@ -2,21 +2,21 @@ import 'dart:async';
 
 import 'package:clock/clock.dart';
 import 'package:flutter/material.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/utils/misc.dart';
 
-class LastMessageTime extends StatefulWidget {
-  const LastMessageTime({this.message, this.dateTime, super.key});
+class LastMessageTimeComp extends StatefulWidget {
+  const LastMessageTimeComp({this.message, this.dateTime, super.key});
 
   final Message? message;
   final DateTime? dateTime;
 
   @override
-  State<LastMessageTime> createState() => _LastMessageTimeState();
+  State<LastMessageTimeComp> createState() => _LastMessageTimeCompState();
 }
 
-class _LastMessageTimeState extends State<LastMessageTime> {
+class _LastMessageTimeCompState extends State<LastMessageTimeComp> {
   Timer? updateTime;
   int lastMessageInSeconds = 0;
 
diff --git a/lib/src/views/chats/chat_list_components/typing_indicator_subtitle.dart b/lib/src/visual/views/chats/chat_list_components/typing_indicator_subtitle.comp.dart
similarity index 74%
rename from lib/src/views/chats/chat_list_components/typing_indicator_subtitle.dart
rename to lib/src/visual/views/chats/chat_list_components/typing_indicator_subtitle.comp.dart
index 8592f48a..c11e9084 100644
--- a/lib/src/views/chats/chat_list_components/typing_indicator_subtitle.dart
+++ b/lib/src/visual/views/chats/chat_list_components/typing_indicator_subtitle.comp.dart
@@ -1,22 +1,23 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/twonly.db.dart';
-import 'package:twonly/src/views/chats/chat_messages.view.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/typing_indicator.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages.view.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/typing_indicator.dart';
 
-class TypingIndicatorSubtitle extends StatefulWidget {
-  const TypingIndicatorSubtitle({required this.groupId, super.key});
+class TypingIndicatorSubtitleComp extends StatefulWidget {
+  const TypingIndicatorSubtitleComp({required this.groupId, super.key});
 
   final String groupId;
 
   @override
-  State<TypingIndicatorSubtitle> createState() =>
-      _TypingIndicatorSubtitleState();
+  State<TypingIndicatorSubtitleComp> createState() =>
+      _TypingIndicatorSubtitleCompState();
 }
 
-class _TypingIndicatorSubtitleState extends State<TypingIndicatorSubtitle> {
+class _TypingIndicatorSubtitleCompState
+    extends State<TypingIndicatorSubtitleComp> {
   List<GroupMember> _groupMembers = [];
 
   late StreamSubscription<List<(Contact, GroupMember)>> membersSub;
diff --git a/lib/src/views/chats/chat_messages.view.dart b/lib/src/visual/views/chats/chat_messages.view.dart
similarity index 84%
rename from lib/src/views/chats/chat_messages.view.dart
rename to lib/src/visual/views/chats/chat_messages.view.dart
index 8b30c0bd..62d8e1e8 100644
--- a/lib/src/views/chats/chat_messages.view.dart
+++ b/lib/src/visual/views/chats/chat_messages.view.dart
@@ -7,25 +7,26 @@ import 'package:go_router/go_router.dart';
 import 'package:mutex/mutex.dart';
 import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/tables/messages.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/memory_item.model.dart';
-import 'package:twonly/src/services/api/messages.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
 import 'package:twonly/src/services/notifications/background.notifications.dart';
-import 'package:twonly/src/themes/colors.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/blink.component.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/chat_group_action.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/chat_list_entry.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/entries/chat_date_chip.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/message_input.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/response_container.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/typing_indicator.dart';
-import 'package:twonly/src/views/components/avatar_icon.component.dart';
-import 'package:twonly/src/views/components/flame.dart';
-import 'package:twonly/src/views/components/verified_shield.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
+import 'package:twonly/src/visual/components/flame_counter.comp.dart';
+import 'package:twonly/src/visual/components/verification_badge.comp.dart';
+import 'package:twonly/src/visual/themes/colors.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/blink.component.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/chat_group_action.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/chat_list_entry.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/entries/chat_date_chip.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/message_input.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/response_container.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/typing_indicator.dart';
 
 class ChatMessagesView extends StatefulWidget {
   const ChatMessagesView(this.groupId, {super.key});
@@ -36,7 +37,8 @@ class ChatMessagesView extends StatefulWidget {
   State<ChatMessagesView> createState() => _ChatMessagesViewState();
 }
 
-class _ChatMessagesViewState extends State<ChatMessagesView> {
+class _ChatMessagesViewState extends State<ChatMessagesView>
+    with WidgetsBindingObserver {
   HashSet<int> alreadyReportedOpened = HashSet<int>();
   late StreamSubscription<Group?> userSub;
   late StreamSubscription<List<Message>> messageSub;
@@ -64,6 +66,7 @@ class _ChatMessagesViewState extends State<ChatMessagesView> {
   void initState() {
     super.initState();
     textFieldFocus = FocusNode();
+    WidgetsBinding.instance.addObserver(this);
     initStreams();
   }
 
@@ -74,15 +77,31 @@ class _ChatMessagesViewState extends State<ChatMessagesView> {
     contactSub?.cancel();
     groupActionsSub?.cancel();
     _nextTypingIndicator?.cancel();
+    WidgetsBinding.instance.removeObserver(this);
     super.dispose();
   }
 
   Mutex protectMessageUpdating = Mutex();
 
+  // @override
+  // void didChangeAppLifecycleState(AppLifecycleState state) {
+  //   if (state == AppLifecycleState.resumed) {
+  //     protectMessageUpdating.protect(() async {
+  //       await setMessages(allMessages, groupActions);
+  //     });
+  //   }
+  // }
+
+  bool _isViewActive() {
+    return !AppState.isAppInBackground &&
+        (ModalRoute.of(context)?.isCurrent ?? false);
+  }
+
   Future<void> initStreams() async {
     final groupStream = twonlyDB.groupsDao.watchGroup(widget.groupId);
     userSub = groupStream.listen((newGroup) {
       if (newGroup == null) return;
+      if (!mounted) return;
       setState(() {
         _group = newGroup;
       });
@@ -122,9 +141,9 @@ class _ChatMessagesViewState extends State<ChatMessagesView> {
       _receiverDeletedAccount = groupContacts.first.accountDeleted;
     }
 
-    if (gUser.typingIndicators) {
+    if (userService.currentUser.typingIndicators) {
       unawaited(sendTypingIndication(widget.groupId, false));
-      _nextTypingIndicator = Timer.periodic(const Duration(seconds: 4), (
+      _nextTypingIndicator = Timer.periodic(const Duration(seconds: 2), (
         _,
       ) async {
         await sendTypingIndication(widget.groupId, false);
@@ -136,7 +155,9 @@ class _ChatMessagesViewState extends State<ChatMessagesView> {
     List<Message> newMessages,
     List<GroupHistory> groupActions,
   ) async {
-    await flutterLocalNotificationsPlugin.cancelAll();
+    if (_isViewActive()) {
+      await flutterLocalNotificationsPlugin.cancelAll();
+    }
 
     final chatItems = <ChatItem>[];
     final storedMediaFiles = <Message>[];
@@ -188,11 +209,13 @@ class _ChatMessagesViewState extends State<ChatMessagesView> {
       }
     }
 
-    for (final contactId in openedMessages.keys) {
-      await notifyContactAboutOpeningMessage(
-        contactId,
-        openedMessages[contactId]!,
-      );
+    if (_isViewActive()) {
+      for (final contactId in openedMessages.keys) {
+        await notifyContactAboutOpeningMessage(
+          contactId,
+          openedMessages[contactId]!,
+        );
+      }
     }
 
     if (!mounted) return;
@@ -265,8 +288,11 @@ class _ChatMessagesViewState extends State<ChatMessagesView> {
                         Text(
                           substringBy(group.groupName, 20),
                         ),
-                        const SizedBox(width: 10),
-                        VerifiedShield(key: verifyShieldKey, group: group),
+                        const SizedBox(width: 5),
+                        VerificationBadgeComp(
+                          key: verifyShieldKey,
+                          group: group,
+                        ),
                         const SizedBox(width: 10),
                         FlameCounterWidget(groupId: group.groupId),
                       ],
@@ -287,7 +313,7 @@ class _ChatMessagesViewState extends State<ChatMessagesView> {
                   itemScrollController: itemScrollController,
                   itemBuilder: (context, i) {
                     if (i == 0) {
-                      return gUser.typingIndicators
+                      return userService.currentUser.typingIndicators
                           ? TypingIndicator(group: group)
                           : Container();
                     }
diff --git a/lib/src/views/chats/chat_messages_components/blink.component.dart b/lib/src/visual/views/chats/chat_messages_components/blink.component.dart
similarity index 100%
rename from lib/src/views/chats/chat_messages_components/blink.component.dart
rename to lib/src/visual/views/chats/chat_messages_components/blink.component.dart
diff --git a/lib/src/views/chats/chat_messages_components/bottom_sheets/all_reactions.bottom_sheet.dart b/lib/src/visual/views/chats/chat_messages_components/bottom_sheets/all_reactions.bottom_sheet.dart
similarity index 93%
rename from lib/src/views/chats/chat_messages_components/bottom_sheets/all_reactions.bottom_sheet.dart
rename to lib/src/visual/views/chats/chat_messages_components/bottom_sheets/all_reactions.bottom_sheet.dart
index c2cce585..26bb3cb7 100644
--- a/lib/src/views/chats/chat_messages_components/bottom_sheets/all_reactions.bottom_sheet.dart
+++ b/lib/src/visual/views/chats/chat_messages_components/bottom_sheets/all_reactions.bottom_sheet.dart
@@ -1,15 +1,15 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/protobuf/client/generated/messages.pb.dart'
     as pb;
-import 'package:twonly/src/services/api/messages.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/animate_icon.dart';
-import 'package:twonly/src/views/components/avatar_icon.component.dart';
+import 'package:twonly/src/visual/components/animate_icon.comp.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
 
 class AllReactionsView extends StatefulWidget {
   const AllReactionsView({required this.message, super.key});
@@ -26,8 +26,8 @@ class _AllReactionsViewState extends State<AllReactionsView> {
 
   @override
   void initState() {
-    initAsync();
     super.initState();
+    initAsync();
   }
 
   @override
@@ -42,6 +42,7 @@ class _AllReactionsViewState extends State<AllReactionsView> {
     );
 
     reactionsSub = stream.listen((update) {
+      if (!mounted) return;
       setState(() {
         reactionsUsers = update;
       });
@@ -140,12 +141,12 @@ class _AllReactionsViewState extends State<AllReactionsView> {
                               ],
                             ),
                           ),
-                          if (EmojiAnimation.animatedIcons.containsKey(
+                          if (EmojiAnimationComp.animatedIcons.containsKey(
                             entry.$1.emoji,
                           ))
                             SizedBox(
                               height: 25,
-                              child: EmojiAnimation(emoji: entry.$1.emoji),
+                              child: EmojiAnimationComp(emoji: entry.$1.emoji),
                             )
                           else
                             SizedBox(
diff --git a/lib/src/views/chats/chat_messages_components/bottom_sheets/message_history.bottom_sheet.dart b/lib/src/visual/views/chats/chat_messages_components/bottom_sheets/message_history.bottom_sheet.dart
similarity index 96%
rename from lib/src/views/chats/chat_messages_components/bottom_sheets/message_history.bottom_sheet.dart
rename to lib/src/visual/views/chats/chat_messages_components/bottom_sheets/message_history.bottom_sheet.dart
index 75693058..c33108fd 100644
--- a/lib/src/views/chats/chat_messages_components/bottom_sheets/message_history.bottom_sheet.dart
+++ b/lib/src/visual/views/chats/chat_messages_components/bottom_sheets/message_history.bottom_sheet.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/chat_list_entry.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/chat_list_entry.dart';
 
 class MessageHistoryView extends StatelessWidget {
   const MessageHistoryView({
diff --git a/lib/src/views/chats/chat_messages_components/bottom_sheets/share_additional.bottom_sheet.dart b/lib/src/visual/views/chats/chat_messages_components/bottom_sheets/share_additional.bottom_sheet.dart
similarity index 94%
rename from lib/src/views/chats/chat_messages_components/bottom_sheets/share_additional.bottom_sheet.dart
rename to lib/src/visual/views/chats/chat_messages_components/bottom_sheets/share_additional.bottom_sheet.dart
index fc9487b0..587be9d1 100644
--- a/lib/src/views/chats/chat_messages_components/bottom_sheets/share_additional.bottom_sheet.dart
+++ b/lib/src/visual/views/chats/chat_messages_components/bottom_sheets/share_additional.bottom_sheet.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:twonly/src/database/twonly.db.dart';
-import 'package:twonly/src/services/api/messages.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/shared/select_contacts.view.dart';
+import 'package:twonly/src/visual/views/shared/select_contacts.view.dart';
 
 class ShareAdditionalView extends StatefulWidget {
   const ShareAdditionalView({required this.group, super.key});
@@ -29,7 +29,7 @@ class _ShareAdditionalViewState extends State<ShareAdditionalView> {
     final selectedContacts =
         await context.navPush(
               SelectContactsView(
-                text: SelectedContactViewText(
+                text: SelectedContactView(
                   title: context.lang.shareContactsTitle,
                   submitButton: (_, _) => context.lang.shareContactsSubmit,
                   submitIcon: FontAwesomeIcons.shareNodes,
diff --git a/lib/src/views/chats/chat_messages_components/chat_group_action.dart b/lib/src/visual/views/chats/chat_messages_components/chat_group_action.dart
similarity index 99%
rename from lib/src/views/chats/chat_messages_components/chat_group_action.dart
rename to lib/src/visual/views/chats/chat_messages_components/chat_group_action.dart
index c5d6427b..167a6ea5 100644
--- a/lib/src/views/chats/chat_messages_components/chat_group_action.dart
+++ b/lib/src/visual/views/chats/chat_messages_components/chat_group_action.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/tables/groups.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
@@ -24,8 +24,8 @@ class _ChatGroupActionState extends State<ChatGroupAction> {
 
   @override
   void initState() {
-    initAsync();
     super.initState();
+    initAsync();
   }
 
   Future<void> initAsync() async {
diff --git a/lib/src/views/chats/chat_messages_components/chat_list_entry.dart b/lib/src/visual/views/chats/chat_messages_components/chat_list_entry.dart
similarity index 87%
rename from lib/src/views/chats/chat_messages_components/chat_list_entry.dart
rename to lib/src/visual/views/chats/chat_messages_components/chat_list_entry.dart
index fa3a9f26..eef515d6 100644
--- a/lib/src/views/chats/chat_messages_components/chat_list_entry.dart
+++ b/lib/src/visual/views/chats/chat_messages_components/chat_list_entry.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
 import 'package:twonly/src/database/tables/messages.table.dart'
@@ -11,18 +11,18 @@ import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/memory_item.model.dart';
 import 'package:twonly/src/services/mediafiles/mediafile.service.dart';
 import 'package:twonly/src/utils/log.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/chat_reaction_row.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/entries/chat_audio_entry.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/entries/chat_contacts.entry.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/entries/chat_flame_restored.entry.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/entries/chat_media_entry.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/entries/chat_text_entry.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/entries/chat_unknown.entry.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/entries/common.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/message_context_menu.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/message_reply_drag.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/response_container.dart';
-import 'package:twonly/src/views/components/avatar_icon.component.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/chat_reaction_row.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/entries/chat_audio_entry.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/entries/chat_contacts.entry.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/entries/chat_flame_restored.entry.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/entries/chat_media_entry.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/entries/chat_text_entry.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/entries/chat_unknown.entry.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/entries/common.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/message_context_menu.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/message_reply_drag.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/response_container.dart';
 
 class ChatListEntry extends StatefulWidget {
   const ChatListEntry({
@@ -61,8 +61,8 @@ class _ChatListEntryState extends State<ChatListEntry> {
 
   @override
   void initState() {
-    initAsync();
     super.initState();
+    initAsync();
   }
 
   @override
@@ -93,6 +93,7 @@ class _ChatListEntryState extends State<ChatListEntry> {
     );
 
     reactionsSub = stream.listen((update) {
+      if (!mounted) return;
       setState(() {
         reactions = update;
       });
diff --git a/lib/src/views/chats/chat_messages_components/chat_reaction_row.dart b/lib/src/visual/views/chats/chat_messages_components/chat_reaction_row.dart
similarity index 92%
rename from lib/src/views/chats/chat_messages_components/chat_reaction_row.dart
rename to lib/src/visual/views/chats/chat_messages_components/chat_reaction_row.dart
index 983aff80..881f5543 100644
--- a/lib/src/views/chats/chat_messages_components/chat_reaction_row.dart
+++ b/lib/src/visual/views/chats/chat_messages_components/chat_reaction_row.dart
@@ -5,8 +5,8 @@ import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/bottom_sheets/all_reactions.bottom_sheet.dart';
-import 'package:twonly/src/views/components/animate_icon.dart';
+import 'package:twonly/src/visual/components/animate_icon.comp.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/bottom_sheets/all_reactions.bottom_sheet.dart';
 
 class ReactionRow extends StatelessWidget {
   const ReactionRow({
@@ -36,10 +36,10 @@ class ReactionRow extends StatelessWidget {
     final emojis = <String, (Widget, int)>{};
     for (final reaction in reactions) {
       late Widget child;
-      if (EmojiAnimation.animatedIcons.containsKey(reaction.emoji)) {
+      if (EmojiAnimationComp.animatedIcons.containsKey(reaction.emoji)) {
         child = SizedBox(
           height: 18,
-          child: EmojiAnimation(emoji: reaction.emoji),
+          child: EmojiAnimationComp(emoji: reaction.emoji),
         );
       } else {
         child = SizedBox(
diff --git a/lib/src/views/chats/chat_messages_components/entries/chat_audio_entry.dart b/lib/src/visual/views/chats/chat_messages_components/entries/chat_audio_entry.dart
similarity index 93%
rename from lib/src/views/chats/chat_messages_components/entries/chat_audio_entry.dart
rename to lib/src/visual/views/chats/chat_messages_components/entries/chat_audio_entry.dart
index 77603558..91c43a3d 100644
--- a/lib/src/views/chats/chat_messages_components/entries/chat_audio_entry.dart
+++ b/lib/src/visual/views/chats/chat_messages_components/entries/chat_audio_entry.dart
@@ -3,12 +3,12 @@ import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
-import 'package:twonly/src/services/api/messages.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
 import 'package:twonly/src/services/mediafiles/mediafile.service.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/entries/common.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/entries/friendly_message_time.comp.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/message_send_state_icon.dart';
-import 'package:twonly/src/views/components/better_text.dart';
+import 'package:twonly/src/visual/elements/better_text.element.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/entries/common.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/entries/friendly_message_time.comp.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/message_send_state_icon.dart';
 
 class ChatAudioEntry extends StatelessWidget {
   const ChatAudioEntry({
@@ -139,7 +139,7 @@ class _InChatAudioPlayerState extends State<InChatAudioPlayer> {
           DurationType.max,
         );
         _maxDuration = _displayDuration;
-        setState(() {});
+        if (mounted) setState(() {});
       }
     });
 
diff --git a/lib/src/views/chats/chat_messages_components/entries/chat_contacts.entry.dart b/lib/src/visual/views/chats/chat_messages_components/entries/chat_contacts.entry.dart
similarity index 85%
rename from lib/src/views/chats/chat_messages_components/entries/chat_contacts.entry.dart
rename to lib/src/visual/views/chats/chat_messages_components/entries/chat_contacts.entry.dart
index fa346998..e8c69569 100644
--- a/lib/src/views/chats/chat_messages_components/entries/chat_contacts.entry.dart
+++ b/lib/src/visual/views/chats/chat_messages_components/entries/chat_contacts.entry.dart
@@ -1,17 +1,19 @@
 import 'dart:convert';
 
+import 'package:collection/collection.dart';
 import 'package:drift/drift.dart' show Value;
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:go_router/go_router.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
+import 'package:twonly/src/database/tables/contacts.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/protobuf/client/generated/data.pb.dart';
-import 'package:twonly/src/services/api/utils.dart';
+import 'package:twonly/src/services/api/utils.api.dart';
 import 'package:twonly/src/utils/log.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/entries/common.dart';
-import 'package:twonly/src/views/components/better_text.dart';
+import 'package:twonly/src/visual/elements/better_text.element.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/entries/common.dart';
 
 class ChatContactsEntry extends StatefulWidget {
   const ChatContactsEntry({
@@ -102,7 +104,7 @@ class _ContactRowState extends State<_ContactRow> {
   bool _isLoading = false;
 
   Future<void> _onContactClick(bool isAdded) async {
-    if (widget.contact.userId.toInt() == gUser.userId) {
+    if (widget.contact.userId.toInt() == userService.currentUser.userId) {
       await context.push(Routes.settingsProfile);
       return;
     }
@@ -120,15 +122,6 @@ class _ContactRowState extends State<_ContactRow> {
       );
       if (userdata == null) return;
 
-      var verified = false;
-      if (userdata.publicIdentityKey == widget.contact.publicIdentityKey) {
-        final sender = await twonlyDB.contactsDao.getContactById(
-          widget.message.senderId!,
-        );
-        // in case the sender is verified and the public keys are the same, this trust can be transferred
-        verified = sender != null && sender.verified;
-      }
-
       final added = await twonlyDB.contactsDao.insertOnConflictUpdate(
         ContactsCompanion(
           username: Value(utf8.decode(userdata.username)),
@@ -136,12 +129,23 @@ class _ContactRowState extends State<_ContactRow> {
           requested: const Value(false),
           blocked: const Value(false),
           deletedByUser: const Value(false),
-          verified: Value(
-            verified,
-          ),
         ),
       );
 
+      if (userdata.publicIdentityKey.equals(widget.contact.publicIdentityKey)) {
+        final verified = await twonlyDB.keyVerificationDao.isContactVerified(
+          widget.message.senderId!,
+        );
+
+        if (verified) {
+          Log.info('Verified a user which was shared by a verified contact');
+          await twonlyDB.keyVerificationDao.addKeyVerification(
+            userdata.userId.toInt(),
+            VerificationType.contactSharedByVerified,
+          );
+        }
+      }
+
       if (added > 0) await importSignalContactAndCreateRequest(userdata);
     } catch (e) {
       Log.error(e);
@@ -162,7 +166,7 @@ class _ContactRowState extends State<_ContactRow> {
         final contactInDb = snapshot.data;
         final isAdded =
             contactInDb != null ||
-            widget.contact.userId.toInt() == gUser.userId;
+            widget.contact.userId.toInt() == userService.currentUser.userId;
 
         return GestureDetector(
           onTap: _isLoading ? null : () => _onContactClick(isAdded),
diff --git a/lib/src/views/chats/chat_messages_components/entries/chat_date_chip.dart b/lib/src/visual/views/chats/chat_messages_components/entries/chat_date_chip.dart
similarity index 94%
rename from lib/src/views/chats/chat_messages_components/entries/chat_date_chip.dart
rename to lib/src/visual/views/chats/chat_messages_components/entries/chat_date_chip.dart
index 4df7be7c..fa8ccbe2 100644
--- a/lib/src/views/chats/chat_messages_components/entries/chat_date_chip.dart
+++ b/lib/src/visual/views/chats/chat_messages_components/entries/chat_date_chip.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/chats/chat_messages.view.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages.view.dart';
 
 class ChatDateChip extends StatelessWidget {
   const ChatDateChip({required this.item, super.key});
diff --git a/lib/src/views/chats/chat_messages_components/entries/chat_flame_restored.entry.dart b/lib/src/visual/views/chats/chat_messages_components/entries/chat_flame_restored.entry.dart
similarity index 95%
rename from lib/src/views/chats/chat_messages_components/entries/chat_flame_restored.entry.dart
rename to lib/src/visual/views/chats/chat_messages_components/entries/chat_flame_restored.entry.dart
index 6191b4e4..9ecf6e86 100644
--- a/lib/src/views/chats/chat_messages_components/entries/chat_flame_restored.entry.dart
+++ b/lib/src/visual/views/chats/chat_messages_components/entries/chat_flame_restored.entry.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/protobuf/client/generated/data.pb.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/better_text.dart';
+import 'package:twonly/src/visual/elements/better_text.element.dart';
 
 class ChatFlameRestoredEntry extends StatelessWidget {
   const ChatFlameRestoredEntry({
diff --git a/lib/src/views/chats/chat_messages_components/entries/chat_media_entry.dart b/lib/src/visual/views/chats/chat_messages_components/entries/chat_media_entry.dart
similarity index 90%
rename from lib/src/views/chats/chat_messages_components/entries/chat_media_entry.dart
rename to lib/src/visual/views/chats/chat_messages_components/entries/chat_media_entry.dart
index 2867938e..96c7607c 100644
--- a/lib/src/views/chats/chat_messages_components/entries/chat_media_entry.dart
+++ b/lib/src/visual/views/chats/chat_messages_components/entries/chat_media_entry.dart
@@ -1,7 +1,8 @@
 import 'dart:async';
+
 import 'package:drift/drift.dart' show Value;
 import 'package:flutter/material.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
 import 'package:twonly/src/database/tables/messages.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
@@ -9,15 +10,15 @@ import 'package:twonly/src/model/memory_item.model.dart';
 import 'package:twonly/src/model/protobuf/client/generated/data.pb.dart';
 import 'package:twonly/src/model/protobuf/client/generated/messages.pb.dart'
     hide Message;
-import 'package:twonly/src/services/api/mediafiles/download.service.dart'
+import 'package:twonly/src/services/api/mediafiles/download.api.dart'
     as received;
-import 'package:twonly/src/services/api/messages.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
 import 'package:twonly/src/services/mediafiles/mediafile.service.dart';
-import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/entries/common.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/in_chat_media_viewer.dart';
-import 'package:twonly/src/views/chats/media_viewer.view.dart';
-import 'package:twonly/src/views/components/better_text.dart';
+import 'package:twonly/src/visual/elements/better_text.element.dart';
+import 'package:twonly/src/visual/themes/colors.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/entries/common.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/in_chat_media_viewer.dart';
+import 'package:twonly/src/visual/views/chats/media_viewer.view.dart';
 
 class ChatMediaEntry extends StatefulWidget {
   const ChatMediaEntry({
@@ -87,7 +88,7 @@ class _ChatMediaEntryState extends State<ChatMediaEntry> {
   }
 
   Future<void> onTap() async {
-    if (widget.mediaService.mediaFile.downloadState == DownloadState.ready &&
+    if ((widget.mediaService.mediaFile.downloadState == DownloadState.ready) &&
         widget.message.openedAt == null) {
       if (!mounted) return;
       await Navigator.push(
diff --git a/lib/src/views/chats/chat_messages_components/entries/chat_text_entry.dart b/lib/src/visual/views/chats/chat_messages_components/entries/chat_text_entry.dart
similarity index 84%
rename from lib/src/views/chats/chat_messages_components/entries/chat_text_entry.dart
rename to lib/src/visual/views/chats/chat_messages_components/entries/chat_text_entry.dart
index 0d9f365b..5f9b6bfd 100644
--- a/lib/src/views/chats/chat_messages_components/entries/chat_text_entry.dart
+++ b/lib/src/visual/views/chats/chat_messages_components/entries/chat_text_entry.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:twonly/src/database/twonly.db.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/entries/common.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/entries/friendly_message_time.comp.dart';
-import 'package:twonly/src/views/components/animate_icon.dart';
-import 'package:twonly/src/views/components/better_text.dart';
+import 'package:twonly/src/visual/components/animate_icon.comp.dart';
+import 'package:twonly/src/visual/elements/better_text.element.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/entries/common.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/entries/friendly_message_time.comp.dart';
 
 class ChatTextEntry extends StatelessWidget {
   const ChatTextEntry({
@@ -27,7 +27,7 @@ class ChatTextEntry extends StatelessWidget {
   Widget build(BuildContext context) {
     final text = message.content ?? '';
 
-    if (EmojiAnimation.supported(text)) {
+    if (EmojiAnimationComp.supported(text)) {
       return Container(
         constraints: const BoxConstraints(
           maxWidth: 100,
@@ -36,7 +36,7 @@ class ChatTextEntry extends StatelessWidget {
           vertical: 4,
           horizontal: 10,
         ),
-        child: EmojiAnimation(emoji: text),
+        child: EmojiAnimationComp(emoji: text),
       );
     }
 
diff --git a/lib/src/views/chats/chat_messages_components/entries/chat_unknown.entry.dart b/lib/src/visual/views/chats/chat_messages_components/entries/chat_unknown.entry.dart
similarity index 92%
rename from lib/src/views/chats/chat_messages_components/entries/chat_unknown.entry.dart
rename to lib/src/visual/views/chats/chat_messages_components/entries/chat_unknown.entry.dart
index 6c221e6e..12fc0c4d 100644
--- a/lib/src/views/chats/chat_messages_components/entries/chat_unknown.entry.dart
+++ b/lib/src/visual/views/chats/chat_messages_components/entries/chat_unknown.entry.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/better_text.dart';
+import 'package:twonly/src/visual/elements/better_text.element.dart';
 
 class ChatUnknownEntry extends StatelessWidget {
   const ChatUnknownEntry({
diff --git a/lib/src/views/chats/chat_messages_components/entries/common.dart b/lib/src/visual/views/chats/chat_messages_components/entries/common.dart
similarity index 93%
rename from lib/src/views/chats/chat_messages_components/entries/common.dart
rename to lib/src/visual/views/chats/chat_messages_components/entries/common.dart
index 51625341..cf0c01eb 100644
--- a/lib/src/views/chats/chat_messages_components/entries/common.dart
+++ b/lib/src/visual/views/chats/chat_messages_components/entries/common.dart
@@ -3,8 +3,8 @@ import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/tables/messages.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/chats/chat_messages.view.dart';
-import 'package:twonly/src/views/components/animate_icon.dart';
+import 'package:twonly/src/visual/components/animate_icon.comp.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages.view.dart';
 
 class BubbleInfo {
   late String text;
@@ -89,7 +89,7 @@ bool combineTextMessageWithNext(Message message, Message? nextMessage) {
     if (nextMessage.senderId == message.senderId) {
       if (nextMessage.type == MessageType.text.name &&
           message.type == MessageType.text.name) {
-        if (!EmojiAnimation.supported(nextMessage.content!)) {
+        if (!EmojiAnimationComp.supported(nextMessage.content!)) {
           final diff = nextMessage.createdAt
               .difference(message.createdAt)
               .inMinutes;
diff --git a/lib/src/views/chats/chat_messages_components/entries/friendly_message_time.comp.dart b/lib/src/visual/views/chats/chat_messages_components/entries/friendly_message_time.comp.dart
similarity index 100%
rename from lib/src/views/chats/chat_messages_components/entries/friendly_message_time.comp.dart
rename to lib/src/visual/views/chats/chat_messages_components/entries/friendly_message_time.comp.dart
diff --git a/lib/src/views/chats/chat_messages_components/in_chat_media_viewer.dart b/lib/src/visual/views/chats/chat_messages_components/in_chat_media_viewer.dart
similarity index 92%
rename from lib/src/views/chats/chat_messages_components/in_chat_media_viewer.dart
rename to lib/src/visual/views/chats/chat_messages_components/in_chat_media_viewer.dart
index d3a01d76..9a10965c 100644
--- a/lib/src/views/chats/chat_messages_components/in_chat_media_viewer.dart
+++ b/lib/src/visual/views/chats/chat_messages_components/in_chat_media_viewer.dart
@@ -1,12 +1,13 @@
 import 'dart:async';
+
 import 'package:flutter/material.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/memory_item.model.dart';
 import 'package:twonly/src/services/mediafiles/mediafile.service.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/message_send_state_icon.dart';
-import 'package:twonly/src/views/memories/memories_item_thumbnail.dart';
-import 'package:twonly/src/views/memories/memories_photo_slider.view.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/message_send_state_icon.dart';
+import 'package:twonly/src/visual/views/shared/memory_item_slider.view.dart';
+import 'package:twonly/src/visual/views/shared/memory_item_thumbnail.comp.dart';
 
 class InChatMediaViewer extends StatefulWidget {
   const InChatMediaViewer({
@@ -147,7 +148,7 @@ class _InChatMediaViewerState extends State<InChatMediaViewer> {
         borderRadius: BorderRadius.circular(12),
       ),
       child: galleryItemIndex != null
-          ? MemoriesItemThumbnail(
+          ? MemoriesItemThumbnailComp(
               galleryItem: widget.galleryItems[galleryItemIndex!],
               onTap: onTap,
             )
diff --git a/lib/src/views/chats/chat_messages_components/message_context_menu.dart b/lib/src/visual/views/chats/chat_messages_components/message_context_menu.dart
similarity index 94%
rename from lib/src/views/chats/chat_messages_components/message_context_menu.dart
rename to lib/src/visual/views/chats/chat_messages_components/message_context_menu.dart
index f3ef4a43..6ea2155c 100644
--- a/lib/src/views/chats/chat_messages_components/message_context_menu.dart
+++ b/lib/src/visual/views/chats/chat_messages_components/message_context_menu.dart
@@ -6,21 +6,21 @@ import 'package:fixnum/fixnum.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/tables/messages.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/memory_item.model.dart';
 import 'package:twonly/src/model/protobuf/client/generated/messages.pbserver.dart'
     as pb;
-import 'package:twonly/src/services/api/messages.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
 import 'package:twonly/src/services/mediafiles/mediafile.service.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layer_data.dart';
-import 'package:twonly/src/views/chats/message_info.view.dart';
-import 'package:twonly/src/views/components/alert_dialog.dart';
-import 'package:twonly/src/views/components/context_menu.component.dart';
-import 'package:twonly/src/views/components/emoji_picker.bottom.dart';
-import 'package:twonly/src/views/memories/memories_photo_slider.view.dart';
+import 'package:twonly/src/visual/components/alert.dialog.dart';
+import 'package:twonly/src/visual/components/emoji_picker.bottom.dart';
+import 'package:twonly/src/visual/context_menu/context_menu.helper.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layer_data.dart';
+import 'package:twonly/src/visual/views/chats/message_info.view.dart';
+import 'package:twonly/src/visual/views/shared/memory_item_slider.view.dart';
 
 class MessageContextMenu extends StatelessWidget {
   const MessageContextMenu({
diff --git a/lib/src/views/chats/chat_messages_components/message_input.dart b/lib/src/visual/views/chats/chat_messages_components/message_input.dart
similarity index 96%
rename from lib/src/views/chats/chat_messages_components/message_input.dart
rename to lib/src/visual/views/chats/chat_messages_components/message_input.dart
index 8b19a12a..d00143fa 100644
--- a/lib/src/views/chats/chat_messages_components/message_input.dart
+++ b/lib/src/visual/views/chats/chat_messages_components/message_input.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:io';
+
 import 'package:audio_waveforms/audio_waveforms.dart';
 import 'package:drift/drift.dart' show Value;
 import 'package:emoji_picker_flutter/emoji_picker_flutter.dart';
@@ -8,15 +9,16 @@ import 'package:flutter/services.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:permission_handler/permission_handler.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
-import 'package:twonly/src/services/api/mediafiles/upload.service.dart';
-import 'package:twonly/src/services/api/messages.dart';
+import 'package:twonly/src/services/api/mediafiles/upload.api.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/camera/camera_send_to.view.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/bottom_sheets/share_additional.bottom_sheet.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/entries/chat_audio_entry.dart';
+import 'package:twonly/src/visual/views/camera/camera_send_to.view.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/bottom_sheets/share_additional.bottom_sheet.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/entries/chat_audio_entry.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/user_discovery_manual_approval.comp.dart';
 
 class MessageInput extends StatefulWidget {
   const MessageInput({
@@ -72,7 +74,7 @@ class _MessageInputState extends State<MessageInput> {
       _textFieldController.text = widget.group.draftMessage!;
     }
     widget.textFieldFocus.addListener(_handleTextFocusChange);
-    if (gUser.typingIndicators) {
+    if (userService.currentUser.typingIndicators) {
       _nextTypingIndicator = Timer.periodic(const Duration(seconds: 1), (
         _,
       ) async {
@@ -96,6 +98,7 @@ class _MessageInputState extends State<MessageInput> {
   void _initializeControllers() {
     recorderController = RecorderController();
     recorderController.onCurrentDuration.listen((duration) {
+      if (!mounted) return;
       setState(() {
         _currentDuration = duration.inMilliseconds;
       });
@@ -196,6 +199,7 @@ class _MessageInputState extends State<MessageInput> {
   Widget build(BuildContext context) {
     return Column(
       children: [
+        UserDiscoveryManualApprovalComp(group: widget.group),
         Padding(
           padding: const EdgeInsets.only(
             bottom: 10,
diff --git a/lib/src/views/chats/chat_messages_components/message_reply_drag.dart b/lib/src/visual/views/chats/chat_messages_components/message_reply_drag.dart
similarity index 100%
rename from lib/src/views/chats/chat_messages_components/message_reply_drag.dart
rename to lib/src/visual/views/chats/chat_messages_components/message_reply_drag.dart
diff --git a/lib/src/views/chats/chat_messages_components/message_send_state_icon.dart b/lib/src/visual/views/chats/chat_messages_components/message_send_state_icon.dart
similarity index 97%
rename from lib/src/views/chats/chat_messages_components/message_send_state_icon.dart
rename to lib/src/visual/views/chats/chat_messages_components/message_send_state_icon.dart
index 8aa54fdf..1d35e52f 100644
--- a/lib/src/views/chats/chat_messages_components/message_send_state_icon.dart
+++ b/lib/src/visual/views/chats/chat_messages_components/message_send_state_icon.dart
@@ -1,4 +1,5 @@
 import 'dart:collection';
+
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
@@ -9,7 +10,8 @@ import 'package:twonly/src/database/tables/mediafiles.table.dart';
 import 'package:twonly/src/database/tables/messages.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/animate_icon.dart';
+import 'package:twonly/src/visual/components/animate_icon.comp.dart';
+import 'package:twonly/src/visual/themes/colors.dart';
 
 enum MessageSendState {
   received,
@@ -249,13 +251,13 @@ class _MessageSendStateIconState extends State<MessageSendStateIcon> {
         if (!widget.messages.any(
           (m) => m.createdAt.isAfter(widget.lastReaction!.createdAt),
         )) {
-          if (EmojiAnimation.animatedIcons.containsKey(
+          if (EmojiAnimationComp.animatedIcons.containsKey(
             widget.lastReaction!.emoji,
           )) {
             icons = [
               SizedBox(
                 height: 18,
-                child: EmojiAnimation(emoji: widget.lastReaction!.emoji),
+                child: EmojiAnimationComp(emoji: widget.lastReaction!.emoji),
               ),
             ];
           } else {
diff --git a/lib/src/views/chats/chat_messages_components/response_container.dart b/lib/src/visual/views/chats/chat_messages_components/response_container.dart
similarity index 98%
rename from lib/src/views/chats/chat_messages_components/response_container.dart
rename to lib/src/visual/views/chats/chat_messages_components/response_container.dart
index f4ac97f2..c5029355 100644
--- a/lib/src/views/chats/chat_messages_components/response_container.dart
+++ b/lib/src/visual/views/chats/chat_messages_components/response_container.dart
@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
 import 'package:twonly/src/database/tables/messages.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/services/mediafiles/mediafile.service.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/chats/chat_messages.view.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages.view.dart';
 
 class ResponseContainer extends StatefulWidget {
   const ResponseContainer({
@@ -137,9 +137,9 @@ class _ResponsePreviewState extends State<ResponsePreview> {
 
   @override
   void initState() {
+    super.initState();
     _message = widget.message;
     initAsync();
-    super.initState();
   }
 
   Future<void> initAsync() async {
diff --git a/lib/src/views/chats/chat_messages_components/typing_indicator.dart b/lib/src/visual/views/chats/chat_messages_components/typing_indicator.dart
similarity index 96%
rename from lib/src/views/chats/chat_messages_components/typing_indicator.dart
rename to lib/src/visual/views/chats/chat_messages_components/typing_indicator.dart
index b48908b5..804974b2 100644
--- a/lib/src/views/chats/chat_messages_components/typing_indicator.dart
+++ b/lib/src/visual/views/chats/chat_messages_components/typing_indicator.dart
@@ -3,11 +3,11 @@ import 'dart:async';
 import 'package:clock/clock.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
 import 'package:twonly/src/database/twonly.db.dart';
-import 'package:twonly/src/views/chats/chat_messages.view.dart';
-import 'package:twonly/src/views/components/avatar_icon.component.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages.view.dart';
 
 bool isTyping(GroupMember member) {
   return member.lastTypeIndicator != null &&
@@ -28,7 +28,7 @@ bool hasChatOpen(GroupMember member) {
                 member.lastChatOpened!,
               )
               .inSeconds <=
-          6;
+          3;
 }
 
 class TypingIndicator extends StatefulWidget {
@@ -41,8 +41,6 @@ class TypingIndicator extends StatefulWidget {
 }
 
 class _TypingIndicatorState extends State<TypingIndicator> {
-  late AnimationController _controller;
-
   List<GroupMember> _groupMembers = [];
 
   late StreamSubscription<List<(Contact, GroupMember)>> membersSub;
@@ -75,7 +73,6 @@ class _TypingIndicatorState extends State<TypingIndicator> {
 
   @override
   void dispose() {
-    _controller.dispose();
     membersSub.cancel();
     _periodicUpdate.cancel();
     super.dispose();
@@ -183,6 +180,12 @@ class _AnimatedTypingDotsState extends State<AnimatedTypingDots>
     super.initState();
   }
 
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     return Row(
diff --git a/lib/src/visual/views/chats/chat_messages_components/user_discovery_manual_approval.comp.dart b/lib/src/visual/views/chats/chat_messages_components/user_discovery_manual_approval.comp.dart
new file mode 100644
index 00000000..46a0f46e
--- /dev/null
+++ b/lib/src/visual/views/chats/chat_messages_components/user_discovery_manual_approval.comp.dart
@@ -0,0 +1,112 @@
+import 'package:drift/drift.dart' show Value;
+import 'package:flutter/material.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/database/daos/contacts.dao.dart';
+import 'package:twonly/src/database/twonly.db.dart';
+import 'package:twonly/src/services/user_discovery.service.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
+
+class UserDiscoveryManualApprovalComp extends StatefulWidget {
+  const UserDiscoveryManualApprovalComp({required this.group, super.key});
+
+  final Group group;
+
+  @override
+  State<UserDiscoveryManualApprovalComp> createState() =>
+      _UserDiscoveryManualApprovalCompState();
+}
+
+class _UserDiscoveryManualApprovalCompState
+    extends State<UserDiscoveryManualApprovalComp> {
+  @override
+  Widget build(BuildContext context) {
+    return StreamBuilder<List<(Contact, GroupMember)>>(
+      stream: twonlyDB.groupsDao.watchGroupMembers(widget.group.groupId),
+      builder: (context, snapshot) {
+        if (!snapshot.hasData || snapshot.data!.isEmpty) {
+          return const SizedBox.shrink();
+        }
+
+        final contactsToApprove = snapshot.data!
+            .map((e) => e.$1)
+            .where(UserDiscoveryService.shouldRequestManualApproval)
+            .toList();
+
+        if (contactsToApprove.isEmpty) {
+          return const SizedBox.shrink();
+        }
+
+        return Column(
+          children: contactsToApprove.map((contact) {
+            return Container(
+              margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+              padding: const EdgeInsets.all(16),
+              decoration: BoxDecoration(
+                color: Theme.of(context).colorScheme.surfaceContainerHighest,
+                borderRadius: BorderRadius.circular(16),
+              ),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Row(
+                    children: [
+                      AvatarIcon(contactId: contact.userId, fontSize: 18),
+                      const SizedBox(width: 12),
+                      Expanded(
+                        child: Text(
+                          context.lang
+                              .userDiscoveryManualApprovalReachedThreshold(
+                                getContactDisplayName(contact),
+                              ),
+                          style: TextStyle(
+                            color: Theme.of(
+                              context,
+                            ).colorScheme.onSurfaceVariant,
+                            fontSize: 14,
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                  const SizedBox(height: 12),
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.end,
+                    children: [
+                      TextButton(
+                        onPressed: () async {
+                          await twonlyDB.contactsDao.updateContact(
+                            contact.userId,
+                            const ContactsCompanion(
+                              userDiscoveryExcluded: Value(true),
+                            ),
+                          );
+                        },
+                        child: Text(
+                          context.lang.userDiscoveryManualApprovalHideContact,
+                        ),
+                      ),
+                      FilledButton(
+                        onPressed: () async {
+                          await twonlyDB.contactsDao.updateContact(
+                            contact.userId,
+                            const ContactsCompanion(
+                              userDiscoveryManualApproved: Value(true),
+                            ),
+                          );
+                        },
+                        child: Text(
+                          context.lang.userDiscoveryManualApprovalShareContact,
+                        ),
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+            );
+          }).toList(),
+        );
+      },
+    );
+  }
+}
diff --git a/lib/src/views/chats/media_viewer.view.dart b/lib/src/visual/views/chats/media_viewer.view.dart
similarity index 75%
rename from lib/src/views/chats/media_viewer.view.dart
rename to lib/src/visual/views/chats/media_viewer.view.dart
index f942f4b6..5158ada4 100644
--- a/lib/src/views/chats/media_viewer.view.dart
+++ b/lib/src/visual/views/chats/media_viewer.view.dart
@@ -1,14 +1,17 @@
 import 'dart:async';
 import 'dart:collection';
+
 import 'package:clock/clock.dart';
 import 'package:drift/drift.dart' show Value;
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:go_router/go_router.dart';
 import 'package:lottie/lottie.dart';
-import 'package:no_screenshot/no_screenshot.dart';
+import 'package:mutex/mutex.dart';
 import 'package:photo_view/photo_view.dart';
+import 'package:screen_protector/screen_protector.dart';
 import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart'
@@ -16,23 +19,22 @@ import 'package:twonly/src/database/tables/mediafiles.table.dart'
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/protobuf/client/generated/messages.pb.dart'
     as pb;
-import 'package:twonly/src/services/api/mediafiles/download.service.dart';
-import 'package:twonly/src/services/api/messages.dart';
-import 'package:twonly/src/services/api/utils.dart';
+import 'package:twonly/src/services/api/mediafiles/download.api.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
+import 'package:twonly/src/services/api/utils.api.dart';
 import 'package:twonly/src/services/mediafiles/mediafile.service.dart';
 import 'package:twonly/src/services/notifications/background.notifications.dart';
 import 'package:twonly/src/utils/log.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/camera/camera_send_to.view.dart';
-import 'package:twonly/src/views/chats/media_viewer_components/additional_message_content.dart';
-import 'package:twonly/src/views/chats/media_viewer_components/reaction_buttons.component.dart';
-import 'package:twonly/src/views/components/animate_icon.dart';
-import 'package:twonly/src/views/components/loader/three_rotating_dots.loader.dart';
-import 'package:twonly/src/views/components/media_view_sizing.dart';
+import 'package:twonly/src/visual/components/animate_icon.comp.dart';
+import 'package:twonly/src/visual/decorations/input_text.decoration.dart';
+import 'package:twonly/src/visual/helpers/media_view_sizing.helper.dart';
+import 'package:twonly/src/visual/loader/three_rotating_dots.loader.dart';
+import 'package:twonly/src/visual/views/camera/camera_send_to.view.dart';
+import 'package:twonly/src/visual/views/chats/media_viewer_components/additional_message_content.dart';
+import 'package:twonly/src/visual/views/chats/media_viewer_components/reaction_buttons.comp.dart';
 import 'package:video_player/video_player.dart';
 
-final NoScreenshot _noScreenshot = NoScreenshot.instance;
-
 class MediaViewerView extends StatefulWidget {
   const MediaViewerView(this.group, {super.key, this.initialMessage});
   final Group group;
@@ -53,6 +55,8 @@ class _MediaViewerViewState extends State<MediaViewerView> {
   // current image related
   VideoPlayerController? videoController;
 
+  VoidCallback? _videoListener;
+
   MediaFileService? currentMedia;
   Message? currentMessage;
 
@@ -71,11 +75,13 @@ class _MediaViewerViewState extends State<MediaViewerView> {
   StreamSubscription<MediaFile?>? downloadStateListener;
 
   List<Message> allMediaFiles = [];
-  late StreamSubscription<List<Message>> _subscription;
+  StreamSubscription<List<Message>>? _subscription;
   TextEditingController textMessageController = TextEditingController();
 
   final HashSet<String> _alreadyOpenedMediaIds = HashSet();
 
+  bool _isTransitioning = false;
+
   @override
   void initState() {
     super.initState();
@@ -92,83 +98,110 @@ class _MediaViewerViewState extends State<MediaViewerView> {
   void dispose() {
     nextMediaTimer?.cancel();
     progressTimer?.cancel();
-    _noScreenshot.screenshotOn();
-    _subscription.cancel();
+    _subscription?.cancel();
     downloadStateListener?.cancel();
-    final tmp = videoController;
-    videoController = null;
-    tmp?.dispose();
+
+    ScreenProtector.preventScreenshotOff();
+
+    _disposeVideoController();
+
     super.dispose();
   }
 
+  void _disposeVideoController() {
+    final listener = _videoListener;
+    final controller = videoController;
+    _videoListener = null;
+    videoController = null;
+    if (listener != null) {
+      controller?.removeListener(listener);
+    }
+    controller?.dispose();
+  }
+
+  final Mutex _messageUpdateLock = Mutex();
+
+  bool _isViewActive() {
+    return !AppState.isAppInBackground &&
+        (ModalRoute.of(context)?.isCurrent ?? false);
+  }
+
   Future<void> asyncLoadNextMedia(bool firstRun) async {
-    final messages = twonlyDB.messagesDao.watchMediaNotOpened(
-      widget.group.groupId,
-    );
+    _subscription = twonlyDB.messagesDao
+        .watchMediaNotOpened(widget.group.groupId)
+        .listen((messages) async {
+          await _messageUpdateLock.protect(() async {
+            for (final msg in messages) {
+              if (_alreadyOpenedMediaIds.contains(msg.mediaId)) {
+                continue;
+              }
+              if (msg.mediaId == null) {
+                continue;
+              }
 
-    _subscription = messages.listen((messages) async {
-      for (final msg in messages) {
-        if (_alreadyOpenedMediaIds.contains(msg.mediaId)) {
-          continue;
-        }
-        if (msg.mediaId == null) {
-          continue;
-        }
+              if (msg.mediaId == currentMedia?.mediaFile.mediaId) {
+                // The update of the current Media in case of a download is done in loadCurrentMediaFile
+                continue;
+              }
 
-        if (msg.mediaId == currentMedia?.mediaFile.mediaId) {
-          // The update of the current Media in case of a download is done in loadCurrentMediaFile
-          continue;
-        }
+              /// If the messages was already there just replace it and go to the next...
 
-        /// If the messages was already there just replace it and go to the next...
+              final index = allMediaFiles.indexWhere(
+                (m) => m.messageId == msg.messageId,
+              );
 
-        final index = allMediaFiles.indexWhere(
-          (m) => m.messageId == msg.messageId,
-        );
-
-        if (index >= 1) {
-          allMediaFiles[index] = msg;
-        } else if (index == -1) {
-          // If the message does not exist, add it
-          allMediaFiles.add(msg);
-        }
-      }
-      setState(() {});
-      if (firstRun) {
-        firstRun = false;
-        await loadCurrentMediaFile();
-      }
-    });
+              if (index >= 1) {
+                allMediaFiles[index] = msg;
+              } else if (index == -1) {
+                // If the message does not exist, add it
+                allMediaFiles.add(msg);
+              }
+            }
+            if (mounted) setState(() {});
+            if (firstRun) {
+              firstRun = false;
+              await loadCurrentMediaFile();
+            }
+          });
+        });
   }
 
   Future<void> nextMediaOrExit() async {
-    /// Remove the current media file in case it is not set to unlimited
-    if (currentMedia != null) {
-      if (!imageSaved &&
-          currentMedia!.mediaFile.displayLimitInMilliseconds != null) {
-        currentMedia!.fullMediaRemoval();
-      }
-    }
+    if (_isTransitioning) return;
+    _isTransitioning = true;
 
-    await videoController?.dispose();
-    if (!mounted) return;
-
-    nextMediaTimer?.cancel();
-    progressTimer?.cancel();
-
-    if (allMediaFiles.isEmpty) {
-      final group = await twonlyDB.groupsDao.getGroup(widget.group.groupId);
-      if (mounted) {
-        if (group != null &&
-            group.draftMessage != null &&
-            group.draftMessage != '') {
-          context.replace(Routes.chatsMessages(group.groupId));
-        } else {
-          Navigator.pop(context);
+    try {
+      /// Remove the current media file in case it is not set to unlimited
+      if (currentMedia != null) {
+        if (!imageSaved &&
+            currentMedia!.mediaFile.displayLimitInMilliseconds != null) {
+          currentMedia!.fullMediaRemoval();
         }
       }
-    } else {
-      await loadCurrentMediaFile();
+
+      _disposeVideoController();
+
+      if (!mounted) return;
+
+      nextMediaTimer?.cancel();
+      progressTimer?.cancel();
+
+      if (allMediaFiles.isEmpty) {
+        final group = await twonlyDB.groupsDao.getGroup(widget.group.groupId);
+        if (mounted) {
+          if (group != null &&
+              group.draftMessage != null &&
+              group.draftMessage != '') {
+            context.replace(Routes.chatsMessages(group.groupId));
+          } else {
+            Navigator.pop(context);
+          }
+        }
+      } else {
+        await loadCurrentMediaFile();
+      }
+    } finally {
+      if (mounted) _isTransitioning = false;
     }
   }
 
@@ -177,7 +210,14 @@ class _MediaViewerViewState extends State<MediaViewerView> {
     if (allMediaFiles.isEmpty || allMediaFiles.first.mediaId == null) {
       return nextMediaOrExit();
     }
-    await _noScreenshot.screenshotOff();
+
+    try {
+      await ScreenProtector.preventScreenshotOn();
+    } catch (e) {
+      Log.error(e);
+    }
+
+    if (!mounted) return;
 
     setState(() {
       videoController = null;
@@ -190,7 +230,9 @@ class _MediaViewerViewState extends State<MediaViewerView> {
       showSendTextMessageInput = false;
     });
 
-    unawaited(flutterLocalNotificationsPlugin.cancelAll());
+    if (_isViewActive()) {
+      unawaited(flutterLocalNotificationsPlugin.cancelAll());
+    }
 
     final stream = twonlyDB.mediaFilesDao.watchMedia(
       allMediaFiles.first.mediaId!,
@@ -200,7 +242,13 @@ class _MediaViewerViewState extends State<MediaViewerView> {
 
     await downloadStateListener?.cancel();
     downloadStateListener = stream.listen((updated) async {
-      if (updated == null) return;
+      if (updated == null) {
+        // Media file record no longer exists — skip to next or exit rather
+        // than leaving the screen permanently black with no content/loader.
+        await downloadStateListener?.cancel();
+        await nextMediaOrExit();
+        return;
+      }
       if (updated.downloadState != DownloadState.ready) {
         setState(() {
           _showDownloadingLoader = true;
@@ -210,7 +258,12 @@ class _MediaViewerViewState extends State<MediaViewerView> {
           final mediaFile = await twonlyDB.mediaFilesDao.getMediaFileById(
             allMediaFiles.first.mediaId!,
           );
-          if (mediaFile == null) return;
+          if (mediaFile == null) {
+            // DB record gone — skip to next or exit.
+            await downloadStateListener?.cancel();
+            await nextMediaOrExit();
+            return;
+          }
           await startDownloadMedia(mediaFile, true);
           unawaited(tryDownloadAllMediaFiles(force: true));
         }
@@ -218,7 +271,12 @@ class _MediaViewerViewState extends State<MediaViewerView> {
       }
 
       await downloadStateListener?.cancel();
-      await handleNextDownloadedMedia(showTwonly);
+      try {
+        await handleNextDownloadedMedia(showTwonly);
+      } catch (e, st) {
+        Log.error('handleNextDownloadedMedia failed: $e\n$st');
+        await nextMediaOrExit();
+      }
       // start downloading all the other possible missing media files.
     });
   }
@@ -247,11 +305,15 @@ class _MediaViewerViewState extends State<MediaViewerView> {
         context.lang.mediaViewerAuthReason,
         force: false,
       );
+      if (!mounted) return;
+
       if (!isAuth) {
         await nextMediaOrExit();
-        setState(() {
-          displayTwonlyPresent = false;
-        });
+        if (mounted) {
+          setState(() {
+            displayTwonlyPresent = false;
+          });
+        }
         return;
       }
     }
@@ -267,6 +329,9 @@ class _MediaViewerViewState extends State<MediaViewerView> {
       final sender = await twonlyDB.contactsDao.getContactById(
         currentMessage!.senderId!,
       );
+
+      if (!mounted) return;
+
       if (sender != null) {
         _currentMediaSender =
             '${getContactDisplayName(sender)} (${widget.group.groupName})';
@@ -278,6 +343,8 @@ class _MediaViewerViewState extends State<MediaViewerView> {
       [currentMessage!.messageId],
     );
 
+    if (!mounted) return;
+
     if (!currentMediaLocal.tempPath.existsSync()) {
       Log.error('Temp media file not found...');
       await handleMediaError(currentMediaLocal.mediaFile);
@@ -287,7 +354,7 @@ class _MediaViewerViewState extends State<MediaViewerView> {
     var timerRequired = false;
 
     if (currentMediaLocal.mediaFile.type == MediaType.video) {
-      videoController = VideoPlayerController.file(
+      final controller = VideoPlayerController.file(
         currentMediaLocal.tempPath,
         videoPlayerOptions: VideoPlayerOptions(
           // only mix in case the video can be played multiple times,
@@ -296,32 +363,54 @@ class _MediaViewerViewState extends State<MediaViewerView> {
               currentMediaLocal.mediaFile.displayLimitInMilliseconds == null,
         ),
       );
-      await videoController?.setLooping(
+
+      await controller.setLooping(
         currentMediaLocal.mediaFile.displayLimitInMilliseconds == null,
       );
-      await videoController
-          ?.initialize()
+
+      if (!mounted) {
+        await controller.dispose();
+        return;
+      }
+
+      await controller
+          .initialize()
           .then((_) {
-            if (videoController == null) return;
-            videoController?.play();
-            videoController?.addListener(() {
-              setState(() {
-                progress =
-                    1 -
-                    videoController!.value.position.inSeconds /
-                        videoController!.value.duration.inSeconds;
-              });
+            if (!mounted || videoController != null) {
+              controller.dispose();
+              return;
+            }
+
+            void listener() {
+              if (!mounted) return;
+              final ctrl = videoController;
+              if (ctrl == null) return;
+
+              final duration = ctrl.value.duration.inSeconds;
+              if (duration > 0) {
+                setState(() {
+                  progress = 1 - ctrl.value.position.inSeconds / duration;
+                });
+              }
+
               if (currentMediaLocal.mediaFile.displayLimitInMilliseconds !=
                   null) {
-                if (videoController?.value.position ==
-                    videoController?.value.duration) {
+                if (ctrl.value.position == ctrl.value.duration) {
                   nextMediaOrExit();
                 }
               }
-            });
+            }
+
+            _videoListener = listener;
+            videoController = controller;
+            controller
+              ..addListener(listener)
+              ..play();
           })
           // ignore: argument_type_not_assignable_to_error_handler, invalid_return_type_for_catch_error
           .catchError(Log.error);
+
+      if (!mounted) return;
     } else {
       if (currentMediaLocal.mediaFile.displayLimitInMilliseconds != null) {
         canBeSeenUntil = clock.now().add(
@@ -452,8 +541,8 @@ class _MediaViewerViewState extends State<MediaViewerView> {
                     width: 8,
                     height: 8,
                     child: Center(
-                      child: EmojiAnimation(
-                        emoji: EmojiAnimation.animatedIcons.keys
+                      child: EmojiAnimationComp(
+                        emoji: EmojiAnimationComp.animatedIcons.keys
                             .toList()[index],
                       ),
                     ),
@@ -538,6 +627,17 @@ class _MediaViewerViewState extends State<MediaViewerView> {
     );
   }
 
+  void onTap() {
+    if (showSendTextMessageInput) {
+      setState(() {
+        showShortReactions = false;
+        showSendTextMessageInput = false;
+      });
+      return;
+    }
+    nextMediaOrExit();
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -549,17 +649,9 @@ class _MediaViewerViewState extends State<MediaViewerView> {
             if ((currentMedia != null || videoController != null) &&
                 (canBeSeenUntil == null || progress >= 0))
               GestureDetector(
-                onTap: () {
-                  if (showSendTextMessageInput) {
-                    setState(() {
-                      showShortReactions = false;
-                      showSendTextMessageInput = false;
-                    });
-                    return;
-                  }
-                  nextMediaOrExit();
-                },
-                child: MediaViewSizing(
+                onTap: onTap,
+                onDoubleTap: (videoController == null) ? null : onTap,
+                child: MediaViewSizingHelper(
                   bottomNavigation: bottomNavigation(),
                   requiredHeight: 55,
                   child: Stack(
@@ -569,12 +661,14 @@ class _MediaViewerViewState extends State<MediaViewerView> {
                           child: PhotoView.customChild(
                             initialScale: PhotoViewComputedScale.contained,
                             minScale: PhotoViewComputedScale.contained,
-                            child: VideoPlayer(videoController!),
+                            child: VideoPlayer(
+                              videoController!,
+                            ),
                           ),
                         )
                       else if (currentMedia != null &&
-                              currentMedia!.mediaFile.type == MediaType.image ||
-                          currentMedia!.mediaFile.type == MediaType.gif)
+                          (currentMedia!.mediaFile.type == MediaType.image ||
+                              currentMedia!.mediaFile.type == MediaType.gif))
                         Positioned.fill(
                           child: PhotoView(
                             imageProvider: FileImage(
@@ -704,7 +798,10 @@ class _MediaViewerViewState extends State<MediaViewerView> {
                               showShortReactions = false;
                             });
                           },
-                          decoration: inputTextMessageDeco(context),
+                          decoration: inputTextMessageDeco(
+                            context,
+                            context.lang.chatListDetailInput,
+                          ),
                         ),
                       ),
                       IconButton(
diff --git a/lib/src/views/chats/media_viewer_components/additional_message_content.dart b/lib/src/visual/views/chats/media_viewer_components/additional_message_content.dart
similarity index 100%
rename from lib/src/views/chats/media_viewer_components/additional_message_content.dart
rename to lib/src/visual/views/chats/media_viewer_components/additional_message_content.dart
diff --git a/lib/src/views/chats/media_viewer_components/emoji_reactions_row.component.dart b/lib/src/visual/views/chats/media_viewer_components/emoji_reactions_row.comp.dart
similarity index 87%
rename from lib/src/views/chats/media_viewer_components/emoji_reactions_row.component.dart
rename to lib/src/visual/views/chats/media_viewer_components/emoji_reactions_row.comp.dart
index 2f3a871d..98ded465 100644
--- a/lib/src/views/chats/media_viewer_components/emoji_reactions_row.component.dart
+++ b/lib/src/visual/views/chats/media_viewer_components/emoji_reactions_row.comp.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/model/protobuf/client/generated/messages.pb.dart';
-import 'package:twonly/src/services/api/messages.dart';
-import 'package:twonly/src/views/chats/media_viewer_components/reaction_buttons.component.dart';
-import 'package:twonly/src/views/components/animate_icon.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
+import 'package:twonly/src/visual/components/animate_icon.comp.dart';
+import 'package:twonly/src/visual/views/chats/media_viewer_components/reaction_buttons.comp.dart';
 
 Offset getGlobalOffset(GlobalKey targetKey) {
   final ctx = targetKey.currentContext;
@@ -83,7 +83,7 @@ class _EmojiReactionWidgetState extends State<EmojiReactionWidget> {
         child: SizedBox(
           width: widget.show ? 40 : 10,
           child: Center(
-            child: EmojiAnimation(
+            child: EmojiAnimationComp(
               emoji: widget.emoji,
             ),
           ),
diff --git a/lib/src/views/chats/media_viewer_components/reaction_buttons.component.dart b/lib/src/visual/views/chats/media_viewer_components/reaction_buttons.comp.dart
similarity index 94%
rename from lib/src/views/chats/media_viewer_components/reaction_buttons.component.dart
rename to lib/src/visual/views/chats/media_viewer_components/reaction_buttons.comp.dart
index 342fbf10..4e88e842 100644
--- a/lib/src/views/chats/media_viewer_components/reaction_buttons.component.dart
+++ b/lib/src/visual/views/chats/media_viewer_components/reaction_buttons.comp.dart
@@ -4,12 +4,12 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layer_data.dart';
-import 'package:twonly/src/views/chats/media_viewer_components/emoji_reactions_row.component.dart';
-import 'package:twonly/src/views/components/animate_icon.dart';
-import 'package:twonly/src/views/components/emoji_picker.bottom.dart';
+import 'package:twonly/src/visual/components/animate_icon.comp.dart';
+import 'package:twonly/src/visual/components/emoji_picker.bottom.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layer_data.dart';
+import 'package:twonly/src/visual/views/chats/media_viewer_components/emoji_reactions_row.comp.dart';
 
 class ReactionButtons extends StatefulWidget {
   const ReactionButtons({
@@ -39,7 +39,7 @@ class _ReactionButtonsState extends State<ReactionButtons> {
   int selectedShortReaction = -1;
   final GlobalKey _keyEmojiPicker = GlobalKey();
 
-  List<String> selectedEmojis = EmojiAnimation.animatedIcons.keys
+  List<String> selectedEmojis = EmojiAnimationComp.animatedIcons.keys
       .toList()
       .sublist(0, 6);
 
@@ -50,8 +50,8 @@ class _ReactionButtonsState extends State<ReactionButtons> {
   }
 
   Future<void> initAsync() async {
-    if (gUser.preSelectedEmojies != null) {
-      selectedEmojis = gUser.preSelectedEmojies!;
+    if (userService.currentUser.preSelectedEmojies != null) {
+      selectedEmojis = userService.currentUser.preSelectedEmojies!;
     }
     setState(() {});
   }
diff --git a/lib/src/views/chats/message_info.view.dart b/lib/src/visual/views/chats/message_info.view.dart
similarity index 93%
rename from lib/src/views/chats/message_info.view.dart
rename to lib/src/visual/views/chats/message_info.view.dart
index 612198eb..af83b06e 100644
--- a/lib/src/views/chats/message_info.view.dart
+++ b/lib/src/visual/views/chats/message_info.view.dart
@@ -1,17 +1,18 @@
 import 'dart:async';
+
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/tables/messages.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/memory_item.model.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/bottom_sheets/message_history.bottom_sheet.dart';
-import 'package:twonly/src/views/chats/chat_messages_components/chat_list_entry.dart';
-import 'package:twonly/src/views/components/avatar_icon.component.dart';
-import 'package:twonly/src/views/components/better_list_title.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
+import 'package:twonly/src/visual/elements/better_list_title.element.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/bottom_sheets/message_history.bottom_sheet.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages_components/chat_list_entry.dart';
 
 class MessageInfoView extends StatefulWidget {
   const MessageInfoView({
@@ -40,8 +41,8 @@ class _MessageInfoViewState extends State<MessageInfoView> {
 
   @override
   void initState() {
-    initAsync();
     super.initState();
+    initAsync();
   }
 
   @override
@@ -57,6 +58,7 @@ class _MessageInfoViewState extends State<MessageInfoView> {
       widget.message.messageId,
     );
     actionsStream = streamActions.listen((update) {
+      if (!mounted) return;
       setState(() {
         messageActions = update;
       });
@@ -66,6 +68,7 @@ class _MessageInfoViewState extends State<MessageInfoView> {
       widget.message.groupId,
     );
     groupMemberStream = streamGroup.listen((update) {
+      if (!mounted) return;
       setState(() {
         groupMembers = update;
       });
@@ -75,6 +78,7 @@ class _MessageInfoViewState extends State<MessageInfoView> {
       widget.message.messageId,
     );
     historyStream = streamHistory.listen((update) {
+      if (!mounted) return;
       setState(() {
         messageHistory = update;
       });
diff --git a/lib/src/views/chats/start_new_chat.view.dart b/lib/src/visual/views/chats/start_new_chat.view.dart
similarity index 90%
rename from lib/src/views/chats/start_new_chat.view.dart
rename to lib/src/visual/views/chats/start_new_chat.view.dart
index 14a9b834..68488bf0 100644
--- a/lib/src/views/chats/start_new_chat.view.dart
+++ b/lib/src/visual/views/chats/start_new_chat.view.dart
@@ -1,20 +1,23 @@
 // ignore_for_file: parameter_assignments
 
 import 'dart:async';
+
 import 'package:drift/drift.dart' hide Column;
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:go_router/go_router.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/chats/chat_messages.view.dart';
-import 'package:twonly/src/views/components/avatar_icon.component.dart';
-import 'package:twonly/src/views/components/flame.dart';
-import 'package:twonly/src/views/components/group_context_menu.component.dart';
-import 'package:twonly/src/views/components/user_context_menu.component.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
+import 'package:twonly/src/visual/components/flame_counter.comp.dart';
+import 'package:twonly/src/visual/components/verification_badge.comp.dart';
+import 'package:twonly/src/visual/context_menu/group.context_menu.dart';
+import 'package:twonly/src/visual/context_menu/user.context_menu.dart';
+import 'package:twonly/src/visual/decorations/input_text.decoration.dart';
+import 'package:twonly/src/visual/views/chats/chat_messages.view.dart';
 
 class StartNewChatView extends StatefulWidget {
   const StartNewChatView({super.key});
@@ -220,9 +223,17 @@ class _StartNewChatView extends State<StartNewChatView> {
                           title: Row(
                             children: [
                               Text(getContactDisplayName(filteredContacts[i])),
+                              Padding(
+                                padding: const EdgeInsets.only(
+                                  right: 8,
+                                  left: 1,
+                                ),
+                                child: VerificationBadgeComp(
+                                  contact: filteredContacts[i],
+                                ),
+                              ),
                               FlameCounterWidget(
                                 contactId: filteredContacts[i].userId,
-                                prefix: true,
                               ),
                             ],
                           ),
diff --git a/lib/src/visual/views/contact/add_contact_via_qr_link.view.dart b/lib/src/visual/views/contact/add_contact_via_qr_link.view.dart
new file mode 100644
index 00000000..cd23bc7e
--- /dev/null
+++ b/lib/src/visual/views/contact/add_contact_via_qr_link.view.dart
@@ -0,0 +1,154 @@
+import 'dart:convert';
+
+import 'package:drift/drift.dart' hide Column;
+import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:go_router/go_router.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/database/twonly.db.dart';
+import 'package:twonly/src/model/protobuf/api/websocket/server_to_client.pb.dart'
+    as server;
+import 'package:twonly/src/model/protobuf/client/generated/qr.pb.dart';
+import 'package:twonly/src/services/api/utils.api.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/utils/qr.utils.dart';
+
+class AddContactViaQrLinkView extends StatefulWidget {
+  const AddContactViaQrLinkView({
+    required this.profile,
+    this.qrCodeLink,
+    super.key,
+  });
+
+  final PublicProfile profile;
+  final String? qrCodeLink;
+
+  @override
+  State<AddContactViaQrLinkView> createState() =>
+      _AddContactViaQrLinkViewState();
+}
+
+class _AddContactViaQrLinkViewState extends State<AddContactViaQrLinkView> {
+  bool _isLoading = false;
+
+  Future<void> _sendFollowRequest() async {
+    setState(() {
+      _isLoading = true;
+    });
+
+    try {
+      final userData = server.Response_UserData(
+        userId: widget.profile.userId,
+        publicIdentityKey: widget.profile.publicIdentityKey,
+        signedPrekey: widget.profile.signedPrekey,
+        signedPrekeySignature: widget.profile.signedPrekeySignature,
+        signedPrekeyId: widget.profile.signedPrekeyId,
+        username: utf8.encode(widget.profile.username),
+        registrationId: widget.profile.registrationId,
+      );
+
+      final added = await twonlyDB.contactsDao.insertOnConflictUpdate(
+        ContactsCompanion(
+          username: Value(widget.profile.username),
+          userId: Value(widget.profile.userId.toInt()),
+          requested: const Value(false),
+          blocked: const Value(false),
+          deletedByUser: const Value(false),
+        ),
+      );
+
+      if (added > 0) {
+        await importSignalContactAndCreateRequest(userData);
+        if (widget.qrCodeLink != null) {
+          // As the user does now exist he can now be marked as verified
+          await QrCodeUtils.handleQrCodeLink(widget.qrCodeLink!);
+        }
+      }
+
+      if (mounted) {
+        context.pop();
+      }
+    } catch (e) {
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Error: $e')),
+        );
+      }
+    } finally {
+      if (mounted) {
+        setState(() {
+          _isLoading = false;
+        });
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(context.lang.addFriendTitle),
+      ),
+      body: SafeArea(
+        child: Padding(
+          padding: const EdgeInsets.all(20),
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              const Spacer(),
+              CircleAvatar(
+                radius: 50,
+                backgroundColor: context.color.primaryContainer,
+                child: FaIcon(
+                  FontAwesomeIcons.user,
+                  size: 40,
+                  color: context.color.onPrimaryContainer,
+                ),
+              ),
+              const SizedBox(height: 20),
+              Text(
+                widget.profile.username,
+                style: Theme.of(context).textTheme.headlineMedium?.copyWith(
+                  fontWeight: FontWeight.bold,
+                  color: context.color.onSurface,
+                ),
+              ),
+              const SizedBox(height: 10),
+              Text(
+                context.lang.userFoundBody,
+                textAlign: TextAlign.center,
+                style: Theme.of(context).textTheme.bodyLarge?.copyWith(
+                  color: context.color.onSurfaceVariant,
+                ),
+              ),
+              const Spacer(),
+              const SizedBox(width: 16),
+              Center(
+                child: FilledButton(
+                  onPressed: _isLoading ? null : _sendFollowRequest,
+                  child: _isLoading
+                      ? const SizedBox(
+                          height: 20,
+                          width: 20,
+                          child: CircularProgressIndicator(
+                            strokeWidth: 2,
+                          ),
+                        )
+                      : Text(context.lang.createContactRequest),
+                ),
+              ),
+              const SizedBox(height: 8),
+              Center(
+                child: OutlinedButton(
+                  onPressed: _isLoading ? null : () => context.pop(),
+                  child: Text(context.lang.cancel),
+                ),
+              ),
+              const SizedBox(height: 20),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/src/visual/views/contact/add_new_contact.view.dart b/lib/src/visual/views/contact/add_new_contact.view.dart
new file mode 100644
index 00000000..6808ce0c
--- /dev/null
+++ b/lib/src/visual/views/contact/add_new_contact.view.dart
@@ -0,0 +1,254 @@
+import 'dart:async';
+
+import 'package:collection/collection.dart';
+import 'package:drift/drift.dart' hide Column;
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:go_router/go_router.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/constants/routes.keys.dart';
+import 'package:twonly/src/database/daos/user_discovery.dao.dart';
+import 'package:twonly/src/database/tables/contacts.table.dart';
+import 'package:twonly/src/database/twonly.db.dart';
+import 'package:twonly/src/services/api/utils.api.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/components/alert.dialog.dart';
+import 'package:twonly/src/visual/views/contact/add_new_contact_components/friend_suggestions.comp.dart';
+import 'package:twonly/src/visual/views/contact/add_new_contact_components/open_requests_list.comp.dart';
+
+class AddNewUserView extends StatefulWidget {
+  const AddNewUserView({
+    this.username,
+    this.publicKey,
+    super.key,
+  });
+
+  final String? username;
+  final Uint8List? publicKey;
+
+  @override
+  State<AddNewUserView> createState() => _SearchUsernameView();
+}
+
+class _SearchUsernameView extends State<AddNewUserView> {
+  final TextEditingController _usernameController = TextEditingController();
+  bool _isLoading = false;
+  bool hasRequestedUsers = false;
+
+  List<Contact> _openRequestsContacts = [];
+  late StreamSubscription<List<Contact>> _contactsStream;
+
+  AnnouncedUsersWithRelations _newAnnouncedUsers = {};
+  late StreamSubscription<AnnouncedUsersWithRelations> _newAnnouncedUsersStream;
+
+  AnnouncedUsersWithRelations _allAnnouncedUsers = {};
+  late StreamSubscription<AnnouncedUsersWithRelations> _allAnnouncedUsersStream;
+
+  @override
+  void initState() {
+    super.initState();
+    _contactsStream = twonlyDB.contactsDao.watchNotAcceptedContacts().listen(
+      (update) {
+        if (mounted) {
+          setState(() {
+            _openRequestsContacts = update;
+          });
+        }
+      },
+    );
+    _newAnnouncedUsersStream = twonlyDB.userDiscoveryDao
+        .watchNewAnnouncedUsersWithRelations()
+        .listen((update) {
+          if (mounted) {
+            setState(() {
+              _newAnnouncedUsers = update;
+            });
+          }
+        });
+    _allAnnouncedUsersStream = twonlyDB.userDiscoveryDao
+        .watchAllAnnouncedUsersWithRelations()
+        .listen((update) {
+          if (mounted) {
+            setState(() {
+              _allAnnouncedUsers = update;
+            });
+          }
+        });
+
+    if (widget.username != null) {
+      _usernameController.text = widget.username!;
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        _requestNewUserByUsername(widget.username!);
+      });
+    }
+    twonlyDB.userDiscoveryDao.markAllValidAnnouncedUsersAsShown();
+  }
+
+  @override
+  void dispose() {
+    _contactsStream.cancel();
+    _newAnnouncedUsersStream.cancel();
+    _allAnnouncedUsersStream.cancel();
+    super.dispose();
+  }
+
+  Future<void> _requestNewUserByUsername(String username) async {
+    if (userService.currentUser.username == username) return;
+
+    setState(() {
+      _isLoading = true;
+    });
+
+    final userdata = await apiService.getUserData(username);
+    if (!mounted) return;
+
+    setState(() {
+      _isLoading = false;
+    });
+
+    if (userdata == null) {
+      await showAlertDialog(
+        context,
+        context.lang.searchUsernameNotFound,
+        context.lang.searchUsernameNotFoundBody(username),
+      );
+      return;
+    }
+
+    final addUser = await showAlertDialog(
+      context,
+      context.lang.userFound(username),
+      context.lang.userFoundBody,
+    );
+
+    if (!addUser || !mounted) return;
+
+    final added = await twonlyDB.contactsDao.insertOnConflictUpdate(
+      ContactsCompanion(
+        username: Value(username),
+        userId: Value(userdata.userId.toInt()),
+        requested: const Value(false),
+        blocked: const Value(false),
+        deletedByUser: const Value(false),
+      ),
+    );
+
+    if (widget.publicKey != null &&
+        mounted &&
+        widget.publicKey!.equals(userdata.publicIdentityKey)) {
+      final markAsVerified = await showAlertDialog(
+        context,
+        context.lang.linkFromUsername(username),
+        context.lang.linkFromUsernameLong,
+        customOk: context.lang.gotLinkFromFriend,
+      );
+      if (markAsVerified) {
+        await twonlyDB.keyVerificationDao.addKeyVerification(
+          userdata.userId.toInt(),
+          VerificationType.link,
+        );
+      }
+    }
+
+    if (added > 0) await importSignalContactAndCreateRequest(userdata);
+  }
+
+  InputDecoration _getInputDecoration(String hintText) {
+    return InputDecoration(
+      hintText: hintText,
+      focusedBorder: OutlineInputBorder(
+        borderRadius: BorderRadius.circular(9),
+        borderSide: BorderSide(color: context.color.primary),
+      ),
+      enabledBorder: OutlineInputBorder(
+        borderRadius: BorderRadius.circular(8),
+        borderSide: BorderSide(color: context.color.outline),
+      ),
+      contentPadding: const EdgeInsets.symmetric(vertical: 15, horizontal: 20),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(context.lang.addFriendTitle),
+      ),
+      body: SafeArea(
+        child: Padding(
+          padding: const EdgeInsets.symmetric(vertical: 20, horizontal: 10),
+          child: Column(
+            children: [
+              Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 10),
+                child: Row(
+                  children: [
+                    Expanded(
+                      child: TextField(
+                        onSubmitted: _requestNewUserByUsername,
+                        onChanged: (value) {
+                          _usernameController.text = value.toLowerCase();
+                          _usernameController.selection =
+                              TextSelection.fromPosition(
+                                TextPosition(
+                                  offset: _usernameController.text.length,
+                                ),
+                              );
+                          setState(() {});
+                        },
+                        inputFormatters: [
+                          LengthLimitingTextInputFormatter(12),
+                          FilteringTextInputFormatter.allow(
+                            RegExp('[a-z0-9A-Z._]'),
+                          ),
+                        ],
+                        controller: _usernameController,
+                        decoration: _getInputDecoration(
+                          context.lang.searchUsernameInput,
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              const SizedBox(
+                height: 20,
+              ),
+              Expanded(
+                child: ListView(
+                  children: [
+                    Center(
+                      child: OutlinedButton.icon(
+                        onPressed: () =>
+                            context.push(Routes.settingsPublicProfile),
+                        icon: const FaIcon(FontAwesomeIcons.qrcode),
+                        label: Text(context.lang.scanQrOrShow),
+                      ),
+                    ),
+                    OpenRequestsListComp(
+                      contacts: _openRequestsContacts,
+                      relations: _allAnnouncedUsers,
+                    ),
+                    FriendSuggestionsComp(_newAnnouncedUsers),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+      floatingActionButton: Padding(
+        padding: const EdgeInsets.only(bottom: 30),
+        child: FloatingActionButton(
+          onPressed: _isLoading || _usernameController.text.isEmpty
+              ? null
+              : () => _requestNewUserByUsername(_usernameController.text),
+          child: _isLoading
+              ? const Center(child: CircularProgressIndicator())
+              : const FaIcon(FontAwesomeIcons.magnifyingGlassPlus),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/src/visual/views/contact/add_new_contact_components/friend_suggestions.comp.dart b/lib/src/visual/views/contact/add_new_contact_components/friend_suggestions.comp.dart
new file mode 100644
index 00000000..73725388
--- /dev/null
+++ b/lib/src/visual/views/contact/add_new_contact_components/friend_suggestions.comp.dart
@@ -0,0 +1,175 @@
+import 'package:drift/drift.dart' show Value;
+import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/database/daos/contacts.dao.dart';
+import 'package:twonly/src/database/daos/user_discovery.dao.dart';
+import 'package:twonly/src/database/twonly.db.dart';
+import 'package:twonly/src/services/api/utils.api.dart';
+import 'package:twonly/src/services/user.service.dart';
+import 'package:twonly/src/utils/log.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
+import 'package:twonly/src/visual/elements/headline.element.dart';
+import 'package:twonly/src/visual/themes/light.dart';
+import 'package:twonly/src/visual/views/groups/group.view.dart';
+
+List<TextSpan> buildFriendsListText(
+  BuildContext context,
+  List<(Contact, DateTime?)> friends,
+) {
+  final names = friends.map((f) => getContactDisplayName(f.$1)).toList();
+  return buildFriendsListTextString(context, names);
+}
+
+List<TextSpan> buildFriendsListTextString(
+  BuildContext context,
+  List<String> friends,
+) {
+  final names = friends.map((f) => '*$f*').toList();
+
+  return formattedText(
+    context,
+    context.lang.friendSuggestionsFriendsWith(
+      joinWithAnd(names, context.lang.andWord),
+    ),
+  );
+}
+
+class FriendSuggestionsComp extends StatelessWidget {
+  const FriendSuggestionsComp(this.announcedUsers, {super.key});
+
+  final AnnouncedUsersWithRelations announcedUsers;
+
+  Future<void> _requestAnnouncedUser(
+    BuildContext context,
+    UserDiscoveryAnnouncedUser user,
+  ) async {
+    Log.info('Requesting user via friend suggestions');
+
+    final userdata = await apiService.getUserById(user.announcedUserId);
+
+    if (userdata == null) {
+      if (context.mounted) {
+        showNetworkIssue(context);
+      }
+      return;
+    }
+
+    final added = await twonlyDB.contactsDao.insertOnConflictUpdate(
+      ContactsCompanion(
+        username: Value(user.username!),
+        userId: Value(userdata.userId.toInt()),
+        requested: const Value(false),
+        blocked: const Value(false),
+        deletedByUser: const Value(false),
+      ),
+    );
+
+    if (added > 0) await importSignalContactAndCreateRequest(userdata);
+
+    await UserService.update(
+      (u) => u.userStudyCountNewFriendsViaSuggestion += 1,
+    );
+  }
+
+  Future<void> _hideAnnouncedUser(int userId) async {
+    await twonlyDB.userDiscoveryDao.updateAnnouncedUser(
+      userId,
+      const UserDiscoveryAnnouncedUsersCompanion(
+        isHidden: Value(true),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (announcedUsers.isEmpty) return Container();
+    return Column(
+      children: [
+        const SizedBox(height: 20),
+        HeadLineComp(
+          context.lang.friendSuggestionsTitle,
+        ),
+        ...announcedUsers.entries.map((
+          announcedUser,
+        ) {
+          final user = announcedUser.key;
+          final friends = announcedUser.value;
+
+          final friendsList = buildFriendsListText(context, friends);
+
+          return ListTile(
+            key: ValueKey(user.announcedUserId),
+            contentPadding: EdgeInsets.zero,
+            title: Text(substringBy(user.username!, 25)),
+            subtitle: StreamBuilder(
+              stream: twonlyDB.groupsDao.watchNonDirectGroupsForMember(
+                user.announcedUserId,
+              ),
+              builder: (context, snapshot) {
+                var text = friendsList;
+                if (snapshot.hasData && snapshot.data!.isNotEmpty) {
+                  text += formattedText(
+                    context,
+                    context.lang.friendSuggestionsGroupMemberIn(
+                      joinWithAnd(
+                        snapshot.data!.map((g) => '*${g.groupName}*').toList(),
+                        context.lang.andWord,
+                      ),
+                    ),
+                  );
+                }
+                return RichText(
+                  text: TextSpan(
+                    children: text,
+                    style: const TextStyle(fontSize: 11),
+                  ),
+                );
+              },
+            ),
+
+            leading: const AvatarIcon(
+              fontSize: 17,
+            ),
+            trailing: Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                SizedBox(
+                  height: 26,
+                  child: FilledButton(
+                    style: FilledButton.styleFrom(
+                      padding: const EdgeInsets.only(right: 8, left: 4),
+                    ).merge(secondaryGreyButtonStyle(context)),
+                    child: Row(
+                      children: [
+                        const Padding(
+                          padding: EdgeInsets.symmetric(horizontal: 6),
+                          child: FaIcon(FontAwesomeIcons.userPlus, size: 12),
+                        ),
+                        Text(
+                          context.lang.friendSuggestionsRequest,
+                          style: const TextStyle(fontSize: 10),
+                        ),
+                      ],
+                    ),
+                    onPressed: () => _requestAnnouncedUser(context, user),
+                  ),
+                ),
+                IconButton(
+                  style: IconButton.styleFrom(
+                    padding: const EdgeInsets.symmetric(horizontal: 8),
+                    tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                  ),
+                  constraints: const BoxConstraints(),
+                  icon: const Icon(Icons.close, size: 18),
+                  onPressed: () => _hideAnnouncedUser(user.announcedUserId),
+                ),
+              ],
+            ),
+          );
+        }),
+      ],
+    );
+  }
+}
diff --git a/lib/src/visual/views/contact/add_new_contact_components/open_requests_list.comp.dart b/lib/src/visual/views/contact/add_new_contact_components/open_requests_list.comp.dart
new file mode 100644
index 00000000..53a3a3c0
--- /dev/null
+++ b/lib/src/visual/views/contact/add_new_contact_components/open_requests_list.comp.dart
@@ -0,0 +1,191 @@
+import 'package:drift/drift.dart' hide Column;
+import 'package:flutter/material.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/database/daos/contacts.dao.dart';
+import 'package:twonly/src/database/daos/user_discovery.dao.dart';
+import 'package:twonly/src/database/twonly.db.dart';
+import 'package:twonly/src/model/protobuf/client/generated/messages.pb.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
+import 'package:twonly/src/visual/components/verification_badge.comp.dart';
+import 'package:twonly/src/visual/elements/headline.element.dart';
+import 'package:twonly/src/visual/themes/light.dart';
+import 'package:twonly/src/visual/views/contact/add_new_contact_components/friend_suggestions.comp.dart';
+
+class OpenRequestsListComp extends StatelessWidget {
+  const OpenRequestsListComp({
+    required this.contacts,
+    required this.relations,
+    super.key,
+  });
+  final List<Contact> contacts;
+  final AnnouncedUsersWithRelations relations;
+
+  List<Widget> sendRequestActions(BuildContext context, Contact contact) {
+    return [
+      Text(context.lang.searchUserNamePending),
+      IconButton(
+        style: IconButton.styleFrom(
+          padding: const EdgeInsets.symmetric(horizontal: 8),
+          tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+        ),
+        constraints: const BoxConstraints(),
+        icon: const Icon(Icons.close, size: 18),
+        onPressed: () async {
+          const update = ContactsCompanion(deletedByUser: Value(true));
+          await twonlyDB.contactsDao.updateContact(contact.userId, update);
+        },
+      ),
+    ];
+  }
+
+  List<Widget> requestedActions(BuildContext context, Contact contact) {
+    return [
+      SizedBox(
+        height: 26,
+        child: FilledButton(
+          style: FilledButton.styleFrom(
+            padding: const EdgeInsets.symmetric(
+              horizontal: 4,
+            ),
+          ).merge(secondaryGreyButtonStyle(context)),
+          child: Row(
+            children: [
+              const Icon(
+                Icons.person_off_rounded,
+                color: Color.fromARGB(164, 244, 67, 54),
+              ),
+              Text(
+                context.lang.contactActionBlock,
+                style: const TextStyle(fontSize: 10),
+              ),
+            ],
+          ),
+          onPressed: () async {
+            const update = ContactsCompanion(blocked: Value(true));
+            await twonlyDB.contactsDao.updateContact(contact.userId, update);
+          },
+        ),
+      ),
+      const SizedBox(width: 9),
+      SizedBox(
+        height: 26,
+        child: FilledButton(
+          style: FilledButton.styleFrom(
+            padding: const EdgeInsets.only(right: 8, left: 4),
+          ).merge(secondaryGreyButtonStyle(context)),
+          child: Row(
+            children: [
+              const Icon(Icons.check, color: Colors.green),
+              Text(
+                context.lang.contactActionAccept,
+                style: const TextStyle(fontSize: 10),
+              ),
+            ],
+          ),
+          onPressed: () async {
+            await twonlyDB.contactsDao.updateContact(
+              contact.userId,
+              const ContactsCompanion(
+                accepted: Value(true),
+                requested: Value(false),
+              ),
+            );
+            await twonlyDB.groupsDao.createNewDirectChat(
+              contact.userId,
+              GroupsCompanion(
+                groupName: Value(getContactDisplayName(contact)),
+              ),
+            );
+            await sendCipherText(
+              contact.userId,
+              EncryptedContent(
+                contactRequest: EncryptedContent_ContactRequest(
+                  type: EncryptedContent_ContactRequest_Type.ACCEPT,
+                ),
+              ),
+            );
+            await sendContactMyProfileData(contact.userId);
+          },
+        ),
+      ),
+      IconButton(
+        style: IconButton.styleFrom(
+          padding: const EdgeInsets.symmetric(horizontal: 8),
+          tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+        ),
+        constraints: const BoxConstraints(),
+        icon: const Icon(Icons.close, size: 18),
+        onPressed: () async {
+          await sendCipherText(
+            contact.userId,
+            EncryptedContent(
+              contactRequest: EncryptedContent_ContactRequest(
+                type: EncryptedContent_ContactRequest_Type.REJECT,
+              ),
+            ),
+          );
+          await twonlyDB.contactsDao.updateContact(
+            contact.userId,
+            const ContactsCompanion(
+              accepted: Value(false),
+              requested: Value(false),
+              deletedByUser: Value(true),
+            ),
+          );
+        },
+      ),
+    ];
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (contacts.isEmpty) return Container();
+    return Column(
+      children: [
+        const SizedBox(height: 20),
+        HeadLineComp(
+          context.lang.searchUsernameNewFollowerTitle,
+        ),
+        ...contacts.map((contact) {
+          Widget? subtitle;
+          for (final relation in relations.entries) {
+            if (relation.key.announcedUserId == contact.userId) {
+              subtitle = RichText(
+                text: TextSpan(
+                  children: buildFriendsListText(context, relation.value),
+                  style: const TextStyle(fontSize: 11),
+                ),
+              );
+
+              break;
+            }
+          }
+          return ListTile(
+            key: ValueKey(contact.userId),
+            contentPadding: EdgeInsets.zero,
+            title: Row(
+              children: [
+                Text(substringBy(contact.username, 25)),
+                const SizedBox(width: 3),
+                VerificationBadgeComp(contact: contact),
+              ],
+            ),
+            subtitle: subtitle,
+            leading: AvatarIcon(
+              contactId: contact.userId,
+              fontSize: 17,
+            ),
+            trailing: Row(
+              mainAxisSize: MainAxisSize.min,
+              children: contact.requested
+                  ? requestedActions(context, contact)
+                  : sendRequestActions(context, contact),
+            ),
+          );
+        }),
+      ],
+    );
+  }
+}
diff --git a/lib/src/views/contact/contact.view.dart b/lib/src/visual/views/contact/contact.view.dart
similarity index 50%
rename from lib/src/views/contact/contact.view.dart
rename to lib/src/visual/views/contact/contact.view.dart
index 2adf1058..4e3f187d 100644
--- a/lib/src/views/contact/contact.view.dart
+++ b/lib/src/visual/views/contact/contact.view.dart
@@ -1,21 +1,26 @@
 import 'dart:async';
+
 import 'package:drift/drift.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:go_router/go_router.dart';
-import 'package:twonly/globals.dart';
+import 'package:intl/intl.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
+import 'package:twonly/src/database/tables/contacts.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
+import 'package:twonly/src/services/user_discovery.service.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/alert_dialog.dart';
-import 'package:twonly/src/views/components/avatar_icon.component.dart';
-import 'package:twonly/src/views/components/better_list_title.dart';
-import 'package:twonly/src/views/components/flame.dart';
-import 'package:twonly/src/views/components/max_flame_list_title.dart';
-import 'package:twonly/src/views/components/select_chat_deletion_time.comp.dart';
-import 'package:twonly/src/views/components/verified_shield.dart';
-import 'package:twonly/src/views/groups/group.view.dart';
+import 'package:twonly/src/visual/components/alert.dialog.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
+import 'package:twonly/src/visual/components/flame_counter.comp.dart';
+import 'package:twonly/src/visual/components/select_chat_deletion_time.comp.dart';
+import 'package:twonly/src/visual/components/verification_badge.comp.dart';
+import 'package:twonly/src/visual/elements/better_list_title.element.dart';
+import 'package:twonly/src/visual/views/contact/contact_components/restore_flame.comp.dart';
+import 'package:twonly/src/visual/views/groups/group.view.dart';
+import 'package:twonly/src/visual/views/settings/privacy/user_discovery.view.dart';
 
 class ContactView extends StatefulWidget {
   const ContactView(this.userId, {super.key});
@@ -29,31 +34,58 @@ class ContactView extends StatefulWidget {
 class _ContactViewState extends State<ContactView> {
   Contact? _contact;
   List<GroupMember> _memberOfGroups = [];
+  List<KeyVerification> _keyVerifications = [];
+  List<(Contact, DateTime)> _transferredTrust = [];
 
-  late StreamSubscription<Contact?> _contactSub;
-  late StreamSubscription<List<GroupMember>> _groupMemberSub;
+  late StreamSubscription<Contact?> _streamContact;
+  late StreamSubscription<List<GroupMember>> _streamMemberOfGroups;
+  late StreamSubscription<List<KeyVerification>> _streamKeyVerifications;
+  late StreamSubscription<List<(Contact, DateTime)>> _streamTransferredTrust;
 
   @override
   void initState() {
-    _contactSub = twonlyDB.contactsDao.watchContact(widget.userId).listen((
+    super.initState();
+    _streamContact = twonlyDB.contactsDao.watchContact(widget.userId).listen((
       update,
     ) {
-      setState(() {
-        _contact = update;
-      });
+      if (update != null) {
+        setState(() {
+          _contact = update;
+        });
+      }
     });
-    _groupMemberSub = twonlyDB.groupsDao
+    _streamMemberOfGroups = twonlyDB.groupsDao
         .watchContactGroupMember(widget.userId)
         .listen((groups) async {
-          _memberOfGroups = groups;
+          if (!mounted) return;
+          setState(() {
+            _memberOfGroups = groups;
+          });
+        });
+    _streamKeyVerifications = twonlyDB.keyVerificationDao
+        .watchContactVerification(widget.userId)
+        .listen((update) {
+          if (!mounted) return;
+          setState(() {
+            _keyVerifications = update;
+          });
+        });
+    _streamTransferredTrust = twonlyDB.keyVerificationDao
+        .watchTransferredTrustVerifications(widget.userId)
+        .listen((update) {
+          if (!mounted) return;
+          setState(() {
+            _transferredTrust = update;
+          });
         });
-    super.initState();
   }
 
   @override
   void dispose() {
-    _contactSub.cancel();
-    _groupMemberSub.cancel();
+    _streamContact.cancel();
+    _streamMemberOfGroups.cancel();
+    _streamKeyVerifications.cancel();
+    _streamTransferredTrust.cancel();
     super.dispose();
   }
 
@@ -87,14 +119,15 @@ class _ContactViewState extends State<ContactView> {
       context.lang.contactRemoveBody,
     );
     if (remove) {
-      await twonlyDB.contactsDao.updateContact(
-        contact.userId,
-        const ContactsCompanion(
-          accepted: Value(false),
-          requested: Value(false),
-          deletedByUser: Value(true),
-        ),
-      );
+      await twonlyDB.contactsDao.deleteContactByUserId(contact.userId);
+      // await twonlyDB.contactsDao.updateContact(
+      //   contact.userId,
+      //   const ContactsCompanion(
+      //     accepted: Value(false),
+      //     requested: Value(false),
+      //     deletedByUser: Value(true),
+      //   ),
+      // );
       if (mounted) {
         Navigator.popUntil(context, (route) => route.isFirst);
       }
@@ -154,20 +187,18 @@ class _ContactViewState extends State<ContactView> {
           Row(
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
-              Padding(
-                padding: const EdgeInsets.only(right: 10),
-                child: VerifiedShield(
-                  key: GlobalKey(),
-                  contact: contact,
-                ),
-              ),
               Text(
                 getContactDisplayName(contact, maxLength: 20),
                 style: const TextStyle(fontSize: 20),
               ),
+              Padding(
+                padding: const EdgeInsets.only(left: 1, right: 8),
+                child: VerificationBadgeComp(
+                  contact: contact,
+                ),
+              ),
               FlameCounterWidget(
                 contactId: contact.userId,
-                prefix: true,
               ),
             ],
           ),
@@ -203,15 +234,18 @@ class _ContactViewState extends State<ContactView> {
             },
           ),
           SelectChatDeletionTimeListTitle(
-            groupId: getUUIDforDirectChat(widget.userId, gUser.userId),
+            groupId: getUUIDforDirectChat(
+              widget.userId,
+              userService.currentUser.userId,
+            ),
           ),
           const Divider(),
-          MaxFlameListTitle(
+          RestoreFlameComp(
             contactId: widget.userId,
           ),
-          if (!contact.verified)
+          if (_keyVerifications.isEmpty && _transferredTrust.isEmpty)
             BetterListTile(
-              leading: VerifiedShield(
+              leading: VerificationBadgeComp(
                 contact: contact,
                 size: 20,
               ),
@@ -221,6 +255,117 @@ class _ContactViewState extends State<ContactView> {
                 setState(() {});
               },
             ),
+          if (_keyVerifications.isNotEmpty || _transferredTrust.isNotEmpty)
+            ExpansionTile(
+              shape: const RoundedRectangleBorder(),
+              backgroundColor: context.color.surfaceContainer,
+              collapsedShape: const RoundedRectangleBorder(),
+              leading: Padding(
+                padding: const EdgeInsetsGeometry.only(left: 12, right: 12),
+                child: VerificationBadgeComp(
+                  contact: contact,
+                  size: 20,
+                ),
+              ),
+              title: Text(context.lang.userVerifiedTitle),
+              children: [
+                ..._keyVerifications.map(
+                  (kv) => ListTile(
+                    dense: true,
+                    title: Text(_verificationTypeLabel(context, kv.type)),
+                    trailing: Text(
+                      DateFormat.yMd(
+                        Localizations.localeOf(context).toString(),
+                      ).format(kv.createdAt),
+                      style: TextStyle(
+                        color: context.color.onSurfaceVariant,
+                        fontSize: 13,
+                      ),
+                    ),
+                  ),
+                ),
+                ..._transferredTrust.map(
+                  (tt) => ListTile(
+                    dense: true,
+                    title: Row(
+                      children: [
+                        Text(
+                          context.lang.contactVerifiedBy(
+                            getContactDisplayName(tt.$1),
+                          ),
+                        ),
+                        VerificationBadgeComp(
+                          contact: tt.$1,
+                        ),
+                      ],
+                    ),
+                    trailing: Text(
+                      DateFormat.yMd(
+                        Localizations.localeOf(context).toString(),
+                      ).format(tt.$2),
+                      style: TextStyle(
+                        color: context.color.onSurfaceVariant,
+                        fontSize: 13,
+                      ),
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          if (userService.currentUser.isUserDiscoveryEnabled)
+            if (userService.currentUser.userDiscoveryRequiresManualApproval &&
+                contact.userDiscoveryManualApproved != true)
+              BetterListTile(
+                icon: FontAwesomeIcons.usersViewfinder,
+                text: context.lang.userDiscoverySettingsTitle,
+                subtitle: Text(
+                  context.lang.contactUserDiscoveryManualApprovalPending,
+                  style: const TextStyle(fontSize: 10),
+                ),
+                trailing: TextButton(
+                  onPressed: () async {
+                    await twonlyDB.contactsDao.updateContact(
+                      contact.userId,
+                      const ContactsCompanion(
+                        userDiscoveryManualApproved: Value(true),
+                      ),
+                    );
+                  },
+                  child: Text(context.lang.contactUserDiscoveryManualApprovalApprove),
+                ),
+              )
+            else
+              BetterListTile(
+                icon: FontAwesomeIcons.usersViewfinder,
+                text: context.lang.userDiscoverySettingsTitle,
+                onTap: () => context.navPush(const UserDiscoverySettingsView()),
+                subtitle:
+                    !contact.userDiscoveryExcluded &&
+                        contact.mediaSendCounter <
+                            userService.currentUser.requiredSendImages
+                    ? Text(
+                        context.lang.contactUserDiscoveryImagesLeft(
+                          userService.currentUser.requiredSendImages -
+                              contact.mediaSendCounter,
+                          getContactDisplayName(contact),
+                        ),
+                        style: const TextStyle(fontSize: 9),
+                      )
+                    : null,
+                trailing: Transform.scale(
+                  scale: 0.8,
+                  child: Switch(
+                    value: !contact.userDiscoveryExcluded,
+                    onChanged: (a) async {
+                      await UserDiscoveryService.changeExclusionForContact(
+                        contact.userId,
+                        !a,
+                      );
+                    },
+                  ),
+                ),
+              ),
+
           BetterListTile(
             icon: FontAwesomeIcons.flag,
             text: context.lang.reportUser,
@@ -244,6 +389,19 @@ class _ContactViewState extends State<ContactView> {
   }
 }
 
+String _verificationTypeLabel(BuildContext context, VerificationType type) {
+  return switch (type) {
+    VerificationType.qrScanned => context.lang.verificationTypeQrScanned,
+    VerificationType.secretQrToken =>
+      context.lang.verificationTypeSecretQrToken,
+    VerificationType.link => context.lang.verificationTypeLink,
+    VerificationType.contactSharedByVerified =>
+      context.lang.verificationTypeContactSharedByVerified,
+    VerificationType.migratedFromOldVersion =>
+      context.lang.verificationTypeMigratedFromOldVersion,
+  };
+}
+
 Future<String?> showNicknameChangeDialog(
   BuildContext context,
   Contact contact,
diff --git a/lib/src/views/components/max_flame_list_title.dart b/lib/src/visual/views/contact/contact_components/restore_flame.comp.dart
similarity index 80%
rename from lib/src/views/components/max_flame_list_title.dart
rename to lib/src/visual/views/contact/contact_components/restore_flame.comp.dart
index a214b462..4b2852af 100644
--- a/lib/src/views/components/max_flame_list_title.dart
+++ b/lib/src/visual/views/contact/contact_components/restore_flame.comp.dart
@@ -1,49 +1,53 @@
 import 'dart:async';
+
 import 'package:clock/clock.dart';
 import 'package:drift/drift.dart' show Value;
 import 'package:fixnum/fixnum.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
 import 'package:twonly/src/database/tables/messages.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/protobuf/client/generated/data.pb.dart';
 import 'package:twonly/src/model/protobuf/client/generated/messages.pb.dart'
     as pb;
-import 'package:twonly/src/services/api/messages.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
 import 'package:twonly/src/services/flame.service.dart';
 import 'package:twonly/src/services/subscription.service.dart';
 import 'package:twonly/src/utils/log.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/animate_icon.dart';
-import 'package:twonly/src/views/components/better_list_title.dart';
+import 'package:twonly/src/visual/components/animate_icon.comp.dart';
+import 'package:twonly/src/visual/elements/better_list_title.element.dart';
 
-class MaxFlameListTitle extends StatefulWidget {
-  const MaxFlameListTitle({
+class RestoreFlameComp extends StatefulWidget {
+  const RestoreFlameComp({
     required this.contactId,
     super.key,
   });
   final int contactId;
 
   @override
-  State<MaxFlameListTitle> createState() => _MaxFlameListTitleState();
+  State<RestoreFlameComp> createState() => _RestoreFlameCompState();
 }
 
-class _MaxFlameListTitleState extends State<MaxFlameListTitle> {
+class _RestoreFlameCompState extends State<RestoreFlameComp> {
   Group? _group;
   late String _groupId;
   late StreamSubscription<Group?> _groupSub;
 
   @override
   void initState() {
-    _groupId = getUUIDforDirectChat(widget.contactId, gUser.userId);
+    super.initState();
+    _groupId = getUUIDforDirectChat(
+      widget.contactId,
+      userService.currentUser.userId,
+    );
     final stream = twonlyDB.groupsDao.watchGroup(_groupId);
     _groupSub = stream.listen((update) {
       if (mounted) setState(() => _group = update);
     });
-    super.initState();
   }
 
   @override
@@ -53,7 +57,10 @@ class _MaxFlameListTitleState extends State<MaxFlameListTitle> {
   }
 
   Future<void> _restoreFlames() async {
-    if (!isUserAllowed(getCurrentPlan(), PremiumFeatures.RestoreFlames) &&
+    final currentPlan = planFromString(
+      userService.currentUser.subscriptionPlan,
+    );
+    if (!isUserAllowed(currentPlan, PremiumFeatures.RestoreFlames) &&
         kReleaseMode) {
       await context.push(Routes.settingsSubscription);
       return;
@@ -113,7 +120,7 @@ class _MaxFlameListTitleState extends State<MaxFlameListTitle> {
       onTap: _restoreFlames,
       leading: const SizedBox(
         width: 24,
-        child: EmojiAnimation(
+        child: EmojiAnimationComp(
           emoji: '🔥',
         ),
       ),
diff --git a/lib/src/visual/views/critical_error.view.dart b/lib/src/visual/views/critical_error.view.dart
new file mode 100644
index 00000000..c39a7108
--- /dev/null
+++ b/lib/src/visual/views/critical_error.view.dart
@@ -0,0 +1,68 @@
+import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:restart_app/restart_app.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/views/onboarding/recover.view.dart';
+import 'package:twonly/src/visual/views/settings/help/contact_us.view.dart';
+
+class CriticalErrorView extends StatelessWidget {
+  const CriticalErrorView({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Center(
+        child: Padding(
+          padding: const EdgeInsets.all(24),
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              const FaIcon(
+                FontAwesomeIcons.triangleExclamation,
+                size: 80,
+                color: Colors.redAccent,
+              ),
+              const SizedBox(height: 24),
+              Text(
+                'Critical Error',
+                style: Theme.of(context).textTheme.headlineSmall?.copyWith(
+                  fontWeight: FontWeight.bold,
+                ),
+                textAlign: TextAlign.center,
+              ),
+              const SizedBox(height: 16),
+              const Text(
+                'Please try restarting twonly. If the error persists, please contact our support and upload your debug log so we can troubleshoot the issue.\n\nYou can restore your account using the button below. If you have forgotten your password, you will need to reinstall twonly and then register with a new account.',
+                textAlign: TextAlign.center,
+              ),
+              const SizedBox(height: 32),
+              FilledButton.icon(
+                onPressed: () async {
+                  await Restart.restartApp(
+                    notificationTitle: 'App restarted',
+                    notificationBody: 'Click here to open the app again',
+                    forceKill: true,
+                  );
+                },
+                icon: const Icon(Icons.refresh),
+                label: const Text('Try Again'),
+              ),
+              const SizedBox(height: 12),
+              OutlinedButton.icon(
+                onPressed: () async {
+                  await context.navPush(const BackupRecoveryView());
+                },
+                icon: const Icon(Icons.backup_rounded),
+                label: const Text('Recovery from backup'),
+              ),
+              TextButton(
+                onPressed: () => context.navPush(const ContactUsView()),
+                child: const Text('Contact Support'),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/src/views/groups/group.view.dart b/lib/src/visual/views/groups/group.view.dart
similarity index 89%
rename from lib/src/views/groups/group.view.dart
rename to lib/src/visual/views/groups/group.view.dart
index abee84b1..228a23a3 100644
--- a/lib/src/views/groups/group.view.dart
+++ b/lib/src/visual/views/groups/group.view.dart
@@ -1,23 +1,24 @@
 import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/tables/groups.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/services/group.services.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/alert_dialog.dart';
-import 'package:twonly/src/views/components/avatar_icon.component.dart';
-import 'package:twonly/src/views/components/better_list_title.dart';
-import 'package:twonly/src/views/components/flame.dart';
-import 'package:twonly/src/views/components/select_chat_deletion_time.comp.dart';
-import 'package:twonly/src/views/components/verified_shield.dart';
-import 'package:twonly/src/views/contact/contact.view.dart';
-import 'package:twonly/src/views/groups/group_create_select_members.view.dart';
-import 'package:twonly/src/views/groups/group_member.context.dart';
-import 'package:twonly/src/views/settings/profile/profile.view.dart';
+import 'package:twonly/src/visual/components/alert.dialog.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
+import 'package:twonly/src/visual/components/flame_counter.comp.dart';
+import 'package:twonly/src/visual/components/select_chat_deletion_time.comp.dart';
+import 'package:twonly/src/visual/components/verification_badge.comp.dart';
+import 'package:twonly/src/visual/elements/better_list_title.element.dart';
+import 'package:twonly/src/visual/views/contact/contact.view.dart';
+import 'package:twonly/src/visual/views/groups/group_create_select_members.view.dart';
+import 'package:twonly/src/visual/views/groups/group_member.context.dart';
+import 'package:twonly/src/visual/views/settings/profile/profile.view.dart';
 
 class GroupView extends StatefulWidget {
   const GroupView(this.groupId, {super.key});
@@ -38,8 +39,8 @@ class _GroupViewState extends State<GroupView> {
 
   @override
   void initState() {
-    initAsync();
     super.initState();
+    initAsync();
   }
 
   @override
@@ -139,11 +140,11 @@ class _GroupViewState extends State<GroupView> {
       final keyPair = IdentityKeyPair.fromSerialized(
         _group!.myGroupPrivateKey!,
       );
-      success = await removeMemberFromGroup(
+      success = !(await removeMemberFromGroup(
         _group!,
         keyPair.getPublicKey().serialize(),
-        gUser.userId,
-      );
+        userService.currentUser.userId,
+      ));
     } else {
       success = await leaveAsNonAdminFromGroup(_group!);
     }
@@ -177,17 +178,19 @@ class _GroupViewState extends State<GroupView> {
           Row(
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
-              Padding(
-                padding: const EdgeInsets.only(right: 10),
-                child: VerifiedShield(key: Key(_group!.groupId), group: _group),
-              ),
               Text(
                 substringBy(_group!.groupName, 25),
                 style: const TextStyle(fontSize: 20),
               ),
+              Padding(
+                padding: const EdgeInsets.only(right: 8, left: 1),
+                child: VerificationBadgeComp(
+                  key: Key(_group!.groupId),
+                  group: _group,
+                ),
+              ),
               FlameCounterWidget(
                 groupId: _group?.groupId,
-                prefix: true,
               ),
             ],
           ),
@@ -255,7 +258,7 @@ class _GroupViewState extends State<GroupView> {
                     Text(getContactDisplayName(member.$1, maxLength: 25)),
                     Padding(
                       padding: const EdgeInsets.only(left: 5),
-                      child: VerifiedShield(
+                      child: VerificationBadgeComp(
                         key: Key(member.$2.contactId.toString()),
                         contact: member.$1,
                       ),
diff --git a/lib/src/views/groups/group_create_select_group_name.view.dart b/lib/src/visual/views/groups/group_create_select_group_name.view.dart
similarity index 93%
rename from lib/src/views/groups/group_create_select_group_name.view.dart
rename to lib/src/visual/views/groups/group_create_select_group_name.view.dart
index 23397261..310da8c8 100644
--- a/lib/src/views/groups/group_create_select_group_name.view.dart
+++ b/lib/src/visual/views/groups/group_create_select_group_name.view.dart
@@ -4,9 +4,10 @@ import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/services/group.services.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/avatar_icon.component.dart';
-import 'package:twonly/src/views/components/flame.dart';
-import 'package:twonly/src/views/components/user_context_menu.component.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
+import 'package:twonly/src/visual/components/flame_counter.comp.dart';
+import 'package:twonly/src/visual/context_menu/user.context_menu.dart';
+import 'package:twonly/src/visual/decorations/input_text.decoration.dart';
 
 class GroupCreateSelectGroupNameView extends StatefulWidget {
   const GroupCreateSelectGroupNameView({
diff --git a/lib/src/views/groups/group_create_select_members.view.dart b/lib/src/visual/views/groups/group_create_select_members.view.dart
similarity index 95%
rename from lib/src/views/groups/group_create_select_members.view.dart
rename to lib/src/visual/views/groups/group_create_select_members.view.dart
index f2092ef3..1abc5c71 100644
--- a/lib/src/views/groups/group_create_select_members.view.dart
+++ b/lib/src/visual/views/groups/group_create_select_members.view.dart
@@ -2,16 +2,18 @@
 
 import 'dart:async';
 import 'dart:collection';
+
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/avatar_icon.component.dart';
-import 'package:twonly/src/views/components/flame.dart';
-import 'package:twonly/src/views/components/user_context_menu.component.dart';
-import 'package:twonly/src/views/groups/group_create_select_group_name.view.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
+import 'package:twonly/src/visual/components/flame_counter.comp.dart';
+import 'package:twonly/src/visual/context_menu/user.context_menu.dart';
+import 'package:twonly/src/visual/decorations/input_text.decoration.dart';
+import 'package:twonly/src/visual/views/groups/group_create_select_group_name.view.dart';
 
 class GroupCreateSelectMembersView extends StatefulWidget {
   const GroupCreateSelectMembersView({this.groupId, super.key});
diff --git a/lib/src/views/groups/group_member.context.dart b/lib/src/visual/views/groups/group_member.context.dart
similarity index 94%
rename from lib/src/views/groups/group_member.context.dart
rename to lib/src/visual/views/groups/group_member.context.dart
index 8bbcd088..7905871f 100644
--- a/lib/src/views/groups/group_member.context.dart
+++ b/lib/src/visual/views/groups/group_member.context.dart
@@ -2,18 +2,18 @@ import 'package:drift/drift.dart' show Value;
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:go_router/go_router.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/tables/groups.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/protobuf/client/generated/messages.pb.dart';
-import 'package:twonly/src/services/api/messages.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
 import 'package:twonly/src/services/group.services.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/alert_dialog.dart';
-import 'package:twonly/src/views/components/context_menu.component.dart';
-import 'package:twonly/src/views/groups/group.view.dart';
+import 'package:twonly/src/visual/components/alert.dialog.dart';
+import 'package:twonly/src/visual/context_menu/context_menu.helper.dart';
+import 'package:twonly/src/visual/views/groups/group.view.dart';
 
 class GroupMemberContextMenu extends StatelessWidget {
   const GroupMemberContextMenu({
diff --git a/lib/src/views/home.view.dart b/lib/src/visual/views/home.view.dart
similarity index 71%
rename from lib/src/views/home.view.dart
rename to lib/src/visual/views/home.view.dart
index 8d5b889c..73a6fbf1 100644
--- a/lib/src/views/home.view.dart
+++ b/lib/src/visual/views/home.view.dart
@@ -1,9 +1,10 @@
 import 'dart:async';
+
 import 'package:app_links/app_links.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_sharing_intent/model/sharing_file.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
 import 'package:twonly/src/providers/routing.provider.dart';
 import 'package:twonly/src/services/intent/links.intent.dart';
@@ -11,14 +12,12 @@ import 'package:twonly/src/services/mediafiles/mediafile.service.dart';
 import 'package:twonly/src/services/notifications/setup.notifications.dart';
 import 'package:twonly/src/utils/log.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/camera_preview.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/camera_preview_controller_view.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/main_camera_controller.dart';
-import 'package:twonly/src/views/camera/share_image_editor.view.dart';
-import 'package:twonly/src/views/chats/chat_list.view.dart';
-import 'package:twonly/src/views/memories/memories.view.dart';
-
-void Function(int) globalUpdateOfHomeViewPageIndex = (a) {};
+import 'package:twonly/src/visual/views/camera/camera_preview_components/camera_preview.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/camera_preview_controller_view.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/main_camera_controller.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor.view.dart';
+import 'package:twonly/src/visual/views/chats/chat_list.view.dart';
+import 'package:twonly/src/visual/views/memories/memories.view.dart';
 
 class HomeView extends StatefulWidget {
   const HomeView({
@@ -31,68 +30,19 @@ class HomeView extends StatefulWidget {
   State<HomeView> createState() => HomeViewState();
 }
 
-class Shade extends StatelessWidget {
-  const Shade({required this.opacity, super.key});
-  final double opacity;
-
-  @override
-  Widget build(BuildContext context) {
-    return Positioned.fill(
-      child: Opacity(
-        opacity: opacity,
-        child: Container(
-          color: context.color.surface,
-        ),
-      ),
-    );
-  }
-}
-
 class HomeViewState extends State<HomeView> {
   int _activePageIdx = 1;
+  double _offsetRatio = 0;
+  double _offsetFromOne = 0;
+  Timer? _disableCameraTimer;
 
   final MainCameraController _mainCameraController = MainCameraController();
-
   final PageController _homeViewPageController = PageController(initialPage: 1);
+
   late StreamSubscription<List<SharedFile>> _intentStreamSub;
   late StreamSubscription<Uri> _deepLinkSub;
 
-  double buttonDiameter = 100;
-  double offsetRatio = 0;
-  double offsetFromOne = 0;
-  double lastChange = 0;
-
-  Timer? disableCameraTimer;
-
-  bool onPageView(ScrollNotification notification) {
-    disableCameraTimer?.cancel();
-    if (notification.depth == 0 && notification is ScrollUpdateNotification) {
-      final page = _homeViewPageController.page ?? 0;
-      lastChange = page;
-      setState(() {
-        offsetFromOne = 1.0 - (_homeViewPageController.page ?? 0);
-        offsetRatio = offsetFromOne.abs();
-      });
-    }
-    if (_mainCameraController.cameraController == null &&
-        !_mainCameraController.initCameraStarted &&
-        offsetRatio < 1) {
-      unawaited(
-        _mainCameraController.selectCamera(
-          _mainCameraController.selectedCameraDetails.cameraId,
-          false,
-        ),
-      );
-    }
-    if (offsetRatio == 1) {
-      disableCameraTimer = Timer(const Duration(milliseconds: 500), () async {
-        await _mainCameraController.closeCamera();
-        _mainCameraController.sharedLinkForPreview = null;
-        disableCameraTimer = null;
-      });
-    }
-    return false;
-  }
+  static final streamHomeViewPageIndex = StreamController<int>.broadcast();
 
   @override
   void initState() {
@@ -101,31 +51,32 @@ class HomeViewState extends State<HomeView> {
       if (mounted) setState(() {});
     };
 
-    globalUpdateOfHomeViewPageIndex = (index) {
+    streamHomeViewPageIndex.stream.listen((index) {
       _homeViewPageController.jumpToPage(index);
       setState(() {
         _activePageIdx = index;
       });
-    };
+    });
+
     selectNotificationStream.stream.listen((response) async {
       if (response.payload != null &&
           response.payload!.startsWith(Routes.chats) &&
           response.payload! != Routes.chats) {
         await routerProvider.push(response.payload!);
       }
-      globalUpdateOfHomeViewPageIndex(0);
+      streamHomeViewPageIndex.add(0);
     });
+
     unawaited(_mainCameraController.selectCamera(0, true));
-    unawaited(initAsync());
+    unawaited(_initAsync());
 
     // Subscribe to all events (initial link and further)
     _deepLinkSub = AppLinks().uriLinkStream.listen((uri) async {
-      if (mounted) {
-        Log.info('Got link via app links: ${uri.scheme}');
-        if (!await handleIntentUrl(context, uri)) {
-          if (uri.scheme.startsWith('http')) {
-            _mainCameraController.setSharedLinkForPreview(uri);
-          }
+      if (!mounted) return;
+      Log.info('Got link via app links: ${uri.scheme}');
+      if (!await handleIntentUrl(context, uri)) {
+        if (uri.scheme.startsWith('http')) {
+          _mainCameraController.setSharedLinkForPreview(uri);
         }
       }
     });
@@ -134,25 +85,17 @@ class HomeViewState extends State<HomeView> {
       context,
       _mainCameraController.setSharedLinkForPreview,
     );
+
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (widget.initialPage == 1 && !gUser.startWithCameraOpen ||
+      if (widget.initialPage == 1 &&
+              !userService.currentUser.startWithCameraOpen ||
           widget.initialPage == 0) {
-        globalUpdateOfHomeViewPageIndex(0);
+        streamHomeViewPageIndex.add(0);
       }
     });
   }
 
-  @override
-  void dispose() {
-    unawaited(selectNotificationStream.close());
-    disableCameraTimer?.cancel();
-    _mainCameraController.closeCamera();
-    _intentStreamSub.cancel();
-    _deepLinkSub.cancel();
-    super.dispose();
-  }
-
-  Future<void> initAsync() async {
+  Future<void> _initAsync() async {
     final notificationAppLaunchDetails = await flutterLocalNotificationsPlugin
         .getNotificationAppLaunchDetails();
 
@@ -166,10 +109,10 @@ class HomeViewState extends State<HomeView> {
             payload.startsWith(Routes.chats) &&
             payload != Routes.chats) {
           await routerProvider.push(payload);
-          globalUpdateOfHomeViewPageIndex(0);
+          streamHomeViewPageIndex.add(0);
         }
         if (payload == Routes.chats) {
-          globalUpdateOfHomeViewPageIndex(0);
+          streamHomeViewPageIndex.add(0);
         }
       }
     }
@@ -189,22 +132,69 @@ class HomeViewState extends State<HomeView> {
     }
   }
 
+  @override
+  void dispose() {
+    selectNotificationStream.close();
+    streamHomeViewPageIndex.close();
+    _disableCameraTimer?.cancel();
+    _mainCameraController.closeCamera();
+    _intentStreamSub.cancel();
+    _deepLinkSub.cancel();
+    super.dispose();
+  }
+
+  bool _onPageView(ScrollNotification notification) {
+    _disableCameraTimer?.cancel();
+
+    if (notification.depth == 0 && notification is ScrollUpdateNotification) {
+      setState(() {
+        _offsetFromOne = 1.0 - (_homeViewPageController.page ?? 0);
+        _offsetRatio = _offsetFromOne.abs();
+      });
+    }
+
+    if (_mainCameraController.cameraController == null &&
+        !_mainCameraController.initCameraStarted &&
+        _offsetRatio < 1) {
+      unawaited(
+        _mainCameraController.selectCamera(
+          _mainCameraController.selectedCameraDetails.cameraId,
+          false,
+        ),
+      );
+    }
+
+    if (_offsetRatio == 1) {
+      _disableCameraTimer = Timer(const Duration(milliseconds: 500), () async {
+        await _mainCameraController.closeCamera();
+        _mainCameraController.sharedLinkForPreview = null;
+        _disableCameraTimer = null;
+      });
+    }
+    return false;
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       body: GestureDetector(
-        onDoubleTap: offsetRatio == 0
+        onDoubleTap: _offsetRatio == 0
             ? _mainCameraController.onDoubleTap
             : null,
-        onTapDown: offsetRatio == 0 ? _mainCameraController.onTapDown : null,
+        onTapDown: _offsetRatio == 0 ? _mainCameraController.onTapDown : null,
         child: Stack(
           children: <Widget>[
             MainCameraPreview(mainCameraController: _mainCameraController),
-            Shade(
-              opacity: offsetRatio,
+            Positioned.fill(
+              child: Opacity(
+                opacity: _offsetRatio,
+                child: Container(
+                  color: context.color.surface,
+                ),
+              ),
             ),
             NotificationListener<ScrollNotification>(
-              onNotification: onPageView,
+              onNotification: _onPageView,
               child: Positioned.fill(
                 child: PageView(
                   controller: _homeViewPageController,
@@ -225,15 +215,16 @@ class HomeViewState extends State<HomeView> {
               left: 0,
               top: 0,
               right: 0,
-              bottom: (offsetRatio > 0.25)
+              bottom: (_offsetRatio > 0.25)
                   ? MediaQuery.sizeOf(context).height * 2
                   : 0,
               child: Opacity(
-                opacity: 1 - (offsetRatio * 4) % 1,
+                opacity: 1 - (_offsetRatio * 4) % 1,
                 child: CameraPreviewControllerView(
                   mainController: _mainCameraController,
                   isVisible:
-                      ((1 - (offsetRatio * 4) % 1) == 1) && _activePageIdx == 1,
+                      ((1 - (_offsetRatio * 4) % 1) == 1) &&
+                      _activePageIdx == 1,
                 ),
               ),
             ),
diff --git a/lib/src/views/memories/memories.view.dart b/lib/src/visual/views/memories/memories.view.dart
similarity index 96%
rename from lib/src/views/memories/memories.view.dart
rename to lib/src/visual/views/memories/memories.view.dart
index 350e6959..d67f3efa 100644
--- a/lib/src/views/memories/memories.view.dart
+++ b/lib/src/visual/views/memories/memories.view.dart
@@ -1,18 +1,19 @@
 // ignore_for_file: parameter_assignments
 
 import 'dart:async';
+
 import 'package:clock/clock.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/memory_item.model.dart';
 import 'package:twonly/src/services/mediafiles/mediafile.service.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/loader/three_rotating_dots.loader.dart';
-import 'package:twonly/src/views/memories/memories_item_thumbnail.dart';
-import 'package:twonly/src/views/memories/memories_photo_slider.view.dart';
+import 'package:twonly/src/visual/loader/three_rotating_dots.loader.dart';
+import 'package:twonly/src/visual/views/shared/memory_item_slider.view.dart';
+import 'package:twonly/src/visual/views/shared/memory_item_thumbnail.comp.dart';
 
 class MemoriesView extends StatefulWidget {
   const MemoriesView({super.key});
@@ -234,7 +235,7 @@ class MemoriesViewState extends State<MemoriesView> {
             itemCount: orderedByMonth[months[index]]!.length,
             itemBuilder: (context, gIndex) {
               final gaIndex = orderedByMonth[months[index]]![gIndex];
-              return MemoriesItemThumbnail(
+              return MemoriesItemThumbnailComp(
                 galleryItem: galleryItems[gaIndex],
                 onTap: () async {
                   await open(context, galleryItems, gaIndex);
diff --git a/lib/src/views/onboarding/onboarding.view.dart b/lib/src/visual/views/onboarding/onboarding.view.dart
similarity index 100%
rename from lib/src/views/onboarding/onboarding.view.dart
rename to lib/src/visual/views/onboarding/onboarding.view.dart
diff --git a/lib/src/views/onboarding/recover.view.dart b/lib/src/visual/views/onboarding/recover.view.dart
similarity index 90%
rename from lib/src/views/onboarding/recover.view.dart
rename to lib/src/visual/views/onboarding/recover.view.dart
index 0d47932d..6599fe45 100644
--- a/lib/src/views/onboarding/recover.view.dart
+++ b/lib/src/visual/views/onboarding/recover.view.dart
@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:go_router/go_router.dart';
 import 'package:restart_app/restart_app.dart';
-import 'package:twonly/src/constants/routes.keys.dart';
-import 'package:twonly/src/model/json/userdata.dart';
+import 'package:twonly/src/model/json/userdata.model.dart';
 import 'package:twonly/src/services/backup/restore.backup.dart';
 import 'package:twonly/src/utils/log.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/alert_dialog.dart';
+import 'package:twonly/src/visual/components/alert.dialog.dart';
+import 'package:twonly/src/visual/decorations/input_text.decoration.dart';
+import 'package:twonly/src/visual/views/settings/backup/backup_server.view.dart';
 
 class BackupRecoveryView extends StatefulWidget {
   const BackupRecoveryView({super.key});
@@ -139,9 +139,11 @@ class _BackupRecoveryViewState extends State<BackupRecoveryView> {
             Center(
               child: OutlinedButton(
                 onPressed: () async {
-                  backupServer = await context.push(
-                    Routes.settingsBackupServer,
-                  );
+                  backupServer =
+                      await context.navPush(
+                            const BackupServerView(),
+                          )
+                          as BackupServer?;
                   setState(() {});
                 },
                 child: Text(context.lang.backupExpertSettings),
diff --git a/lib/src/views/onboarding/register.view.dart b/lib/src/visual/views/onboarding/register.view.dart
similarity index 94%
rename from lib/src/views/onboarding/register.view.dart
rename to lib/src/visual/views/onboarding/register.view.dart
index 86f6dcd8..01deebc8 100644
--- a/lib/src/views/onboarding/register.view.dart
+++ b/lib/src/visual/views/onboarding/register.view.dart
@@ -2,22 +2,25 @@
 
 import 'dart:async';
 import 'dart:convert';
+
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:go_router/go_router.dart';
 import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
-import 'package:twonly/src/constants/secure_storage_keys.dart';
-import 'package:twonly/src/model/json/userdata.dart';
+import 'package:twonly/src/constants/secure_storage.keys.dart';
+import 'package:twonly/src/model/json/userdata.model.dart';
 import 'package:twonly/src/model/protobuf/api/websocket/error.pb.dart';
 import 'package:twonly/src/services/signal/identity.signal.dart';
 import 'package:twonly/src/utils/log.dart';
 import 'package:twonly/src/utils/misc.dart';
 import 'package:twonly/src/utils/pow.dart';
+import 'package:twonly/src/utils/secure_storage.dart';
 import 'package:twonly/src/utils/storage.dart';
-import 'package:twonly/src/views/components/alert_dialog.dart';
-import 'package:twonly/src/views/groups/group.view.dart';
+import 'package:twonly/src/visual/components/alert.dialog.dart';
+import 'package:twonly/src/visual/views/groups/group.view.dart';
+import 'package:twonly/src/visual/views/onboarding/setup.view.dart';
 
 class RegisterView extends StatefulWidget {
   const RegisterView({
@@ -46,9 +49,9 @@ class _RegisterViewState extends State<RegisterView> {
 
   @override
   void initState() {
+    super.initState();
     proofOfWork = widget.proofOfWork.$1;
     _registrationDisabled = widget.proofOfWork.$2;
-    super.initState();
   }
 
   Future<void> createNewUser() async {
@@ -135,14 +138,15 @@ class _RegisterViewState extends State<RegisterView> {
       username: username,
       displayName: username,
       subscriptionPlan: 'Preview',
-    )..appVersion = 62;
+      currentSetupPage: SetupPages.profile.name,
+    )..appVersion = AppState.latestAppVersionId;
 
-    await const FlutterSecureStorage().write(
+    await SecureStorage.instance.write(
       key: SecureStorageKeys.userData,
       value: jsonEncode(userData),
     );
 
-    gUser = userData;
+    await userService.tryInit();
 
     await apiService.authenticate();
     widget.callbackOnSuccess();
diff --git a/lib/src/visual/views/onboarding/setup.view.dart b/lib/src/visual/views/onboarding/setup.view.dart
new file mode 100644
index 00000000..048f8b23
--- /dev/null
+++ b/lib/src/visual/views/onboarding/setup.view.dart
@@ -0,0 +1,170 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/services/user.service.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/views/onboarding/setup/add_new_contacts.setup.dart';
+import 'package:twonly/src/visual/views/onboarding/setup/backup.setup.dart';
+import 'package:twonly/src/visual/views/onboarding/setup/let_your_friends_find_you.setup.dart';
+import 'package:twonly/src/visual/views/onboarding/setup/profile.setup.dart';
+import 'package:twonly/src/visual/views/onboarding/setup/share_your_friends.setup.dart';
+import 'package:twonly/src/visual/views/onboarding/setup/verification_badge.setup.dart';
+import 'package:twonly/src/visual/views/settings/privacy/user_discovery/components/user_discovery_setup.comp.dart';
+
+enum SetupPages {
+  profile,
+  backup,
+  addNewContact,
+  verificationBadge,
+  shareYourFriends,
+  letYourFriendsFindYou,
+}
+
+extension SetupPagesExtension on SetupPages {
+  static SetupPages fromStr(String? name) {
+    return SetupPages.values.firstWhere(
+      (e) => e.name == name,
+      orElse: () => SetupPages.profile,
+    );
+  }
+
+  int get pageNumber => index + 1;
+  int get totalPages => SetupPages.values.length;
+  int get progressPercentage => ((pageNumber - 1) / totalPages * 100).round();
+  String get progressText => '$pageNumber / $totalPages';
+
+  bool get isLast => index == SetupPages.values.length - 1;
+
+  SetupPages? next() {
+    final nextIndex = index + 1;
+    if (nextIndex < SetupPages.values.length) {
+      return SetupPages.values[nextIndex];
+    }
+    return null;
+  }
+}
+
+class SetupView extends StatefulWidget {
+  const SetupView({this.onUpdate, super.key});
+
+  final VoidCallback? onUpdate;
+
+  @override
+  State<SetupView> createState() => _SetupViewState();
+}
+
+class _SetupViewState extends State<SetupView> {
+  StreamSubscription<void>? _userUpdateStream;
+  late UserDiscoverySetupState state;
+
+  @override
+  void initState() {
+    super.initState();
+    state = UserDiscoverySetupState(setState: setState);
+
+    if (widget.onUpdate != null) {
+      _userUpdateStream = userService.onUserUpdated.listen((u) {
+        if (userService.currentUser.currentSetupPage == null) {
+          widget.onUpdate?.call();
+        }
+      });
+    }
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+    _userUpdateStream?.cancel();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return StreamBuilder<void>(
+      stream: userService.onUserUpdated,
+      builder: (context, snapshot) {
+        final user = userService.currentUser;
+        final currentPageString = user.currentSetupPage;
+        if (currentPageString == null) return const SizedBox.shrink();
+        final currentPage = SetupPagesExtension.fromStr(currentPageString);
+
+        return Scaffold(
+          appBar: AppBar(
+            automaticallyImplyLeading: false,
+            title: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Row(
+                  children: List.generate(currentPage.totalPages, (index) {
+                    final isFinished = index < currentPage.pageNumber;
+                    return Expanded(
+                      child: Container(
+                        height: 6,
+                        margin: EdgeInsets.only(
+                          right: index == currentPage.totalPages - 1 ? 0 : 8,
+                        ),
+                        decoration: BoxDecoration(
+                          color: isFinished
+                              ? context.color.primary
+                              : context.color.surfaceContainer,
+                          borderRadius: BorderRadius.circular(10),
+                        ),
+                      ),
+                    );
+                  }),
+                ),
+              ],
+            ),
+            toolbarHeight: 48,
+          ),
+          body: ListView(
+            key: ValueKey(currentPage.name),
+            padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 30),
+            children: [
+              _buildPage(currentPage, state),
+              if (!currentPage.isLast)
+                SizedBox(
+                  height: 50,
+                  child: Center(
+                    child: TextButton(
+                      onPressed: () async {
+                        await UserService.update(
+                          (u) => u.skipSetupPages = true,
+                        );
+                        widget.onUpdate?.call();
+                      },
+                      child: Text(
+                        context.lang.onboardingFinishLater,
+                        style: TextStyle(
+                          color: context.color.primary,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
+              const SizedBox(height: 60),
+            ],
+          ),
+        );
+      },
+    );
+  }
+
+  Widget _buildPage(SetupPages page, UserDiscoverySetupState state) {
+    switch (page) {
+      case SetupPages.profile:
+        return const ProfileSetupPage();
+      case SetupPages.backup:
+        return const BackupSetupPage();
+      case SetupPages.addNewContact:
+        return const AddNewContactsPage();
+      case SetupPages.verificationBadge:
+        return const VerificationBadgeSetupPage();
+      case SetupPages.shareYourFriends:
+        return ShareYourFriendsSetupPage(state: state);
+      case SetupPages.letYourFriendsFindYou:
+        return LetYourFriendsFindYou(state: state);
+    }
+  }
+}
diff --git a/lib/src/visual/views/onboarding/setup/add_new_contacts.setup.dart b/lib/src/visual/views/onboarding/setup/add_new_contacts.setup.dart
new file mode 100644
index 00000000..f50687d4
--- /dev/null
+++ b/lib/src/visual/views/onboarding/setup/add_new_contacts.setup.dart
@@ -0,0 +1,130 @@
+import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
+import 'package:twonly/src/visual/views/onboarding/setup/components/next_button.comp.dart';
+import 'components/mock_contact_request_actions.comp.dart';
+
+class AddNewContactsPage extends StatelessWidget {
+  const AddNewContactsPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        Text(
+          context.lang.onboardingAddContactsTitle,
+          style: Theme.of(context).textTheme.headlineSmall?.copyWith(
+            fontWeight: FontWeight.bold,
+          ),
+          textAlign: TextAlign.center,
+        ),
+        const SizedBox(height: 8),
+        Text(
+          context.lang.onboardingAddContactsAcceptDesc,
+          textAlign: TextAlign.center,
+          style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+            color: context.color.onSurfaceVariant,
+          ),
+        ),
+        const SizedBox(height: 32),
+
+        Card(
+          elevation: 0,
+          color: context.color.surfaceContainerLow,
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.circular(16),
+          ),
+          child: const Padding(
+            padding: EdgeInsets.all(12),
+            child: Row(
+              children: [
+                AvatarIcon(fontSize: 16),
+                SizedBox(width: 12),
+                Expanded(
+                  child: Text(
+                    'max',
+                    style: TextStyle(fontWeight: FontWeight.bold),
+                  ),
+                ),
+                MockContactRequestActionsComp(),
+              ],
+            ),
+          ),
+        ),
+
+        const SizedBox(height: 32),
+
+        Text(
+          context.lang.onboardingAddContactsMethodHeading,
+          style: const TextStyle(fontWeight: FontWeight.bold),
+          textAlign: TextAlign.center,
+        ),
+        const SizedBox(height: 20),
+
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 40),
+
+          child: Column(
+            children: [
+              // List of ways to add contacts
+              _buildMethodItem(
+                context,
+                icon: FontAwesomeIcons.qrcode,
+                text: context.lang.onboardingAddContactsMethodScan,
+              ),
+              _buildMethodItem(
+                context,
+                icon: FontAwesomeIcons.magnifyingGlass,
+                text: context.lang.onboardingAddContactsMethodSearch,
+              ),
+              _buildMethodItem(
+                context,
+                icon: FontAwesomeIcons.shareNodes,
+                text: context.lang.onboardingAddContactsMethodShare,
+              ),
+            ],
+          ),
+        ),
+
+        const SizedBox(height: 60),
+        const NextButtonComp(),
+      ],
+    );
+  }
+
+  Widget _buildMethodItem(
+    BuildContext context, {
+    required IconData icon,
+    required String text,
+  }) {
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 16),
+      child: Row(
+        children: [
+          Container(
+            padding: const EdgeInsets.all(12),
+            decoration: BoxDecoration(
+              color: context.color.primary.withValues(alpha: 0.1),
+              shape: BoxShape.circle,
+            ),
+            child: FaIcon(
+              icon,
+              size: 20,
+              color: context.color.primary,
+            ),
+          ),
+          const SizedBox(width: 16),
+          Expanded(
+            child: Text(
+              text,
+              style: const TextStyle(fontSize: 14),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/src/visual/views/onboarding/setup/backup.setup.dart b/lib/src/visual/views/onboarding/setup/backup.setup.dart
new file mode 100644
index 00000000..1ad0ab41
--- /dev/null
+++ b/lib/src/visual/views/onboarding/setup/backup.setup.dart
@@ -0,0 +1,164 @@
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:go_router/go_router.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/constants/routes.keys.dart';
+import 'package:twonly/src/services/backup/common.backup.dart';
+import 'package:twonly/src/services/user.service.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/components/alert.dialog.dart';
+import 'package:twonly/src/visual/views/onboarding/setup.view.dart';
+import 'package:twonly/src/visual/views/onboarding/setup/components/next_button.comp.dart';
+import 'package:twonly/src/visual/views/settings/backup/components/backup_setup.comp.dart';
+
+class BackupSetupPage extends StatefulWidget {
+  const BackupSetupPage({super.key});
+
+  @override
+  State<BackupSetupPage> createState() => _BackupSetupPageState();
+}
+
+class _BackupSetupPageState extends State<BackupSetupPage> {
+  bool isLoading = false;
+  final TextEditingController passwordCtrl = TextEditingController();
+  final TextEditingController repeatedPasswordCtrl = TextEditingController();
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (userService.currentUser.twonlySafeBackup != null) {
+        // twonly safe is already configured...
+        UserService.update((user) {
+          user.currentSetupPage = SetupPages.backup.next()?.name;
+        });
+      }
+    });
+  }
+
+  Future<bool> onPressedEnableTwonlySafe() async {
+    setState(() {
+      isLoading = true;
+    });
+
+    if (!await isSecurePassword(passwordCtrl.text)) {
+      if (!mounted) return true;
+      final ignore = await showAlertDialog(
+        context,
+        context.lang.backupInsecurePassword,
+        context.lang.backupInsecurePasswordDesc,
+        customCancel: context.lang.backupInsecurePasswordOk,
+        customOk: context.lang.backupInsecurePasswordCancel,
+      );
+      if (!mounted) return true;
+      if (ignore) {
+        setState(() {
+          isLoading = false;
+        });
+        return true;
+      }
+    }
+
+    await Future.delayed(const Duration(milliseconds: 100));
+    await enableTwonlySafe(passwordCtrl.text);
+
+    await UserService.update((user) {
+      user.currentSetupPage = SetupPages.backup.next()?.name;
+    });
+
+    if (!mounted) return true;
+    setState(() {
+      isLoading = false;
+    });
+    return false;
+  }
+
+  @override
+  void dispose() {
+    passwordCtrl.dispose();
+    repeatedPasswordCtrl.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final isPasswordValid = passwordCtrl.text.length >= 10;
+    final isRepeatedPasswordValid =
+        passwordCtrl.text == repeatedPasswordCtrl.text;
+    final canSubmit =
+        !isLoading &&
+        (isPasswordValid && isRepeatedPasswordValid || !kReleaseMode);
+
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Text(
+          'twonly Backup',
+          style: Theme.of(context).textTheme.headlineSmall?.copyWith(
+            fontWeight: FontWeight.bold,
+          ),
+        ),
+        const SizedBox(height: 8),
+        Text(
+          context.lang.onboardingBackupBody,
+          textAlign: TextAlign.center,
+          style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+            color: context.color.onSurfaceVariant,
+          ),
+        ),
+        const SizedBox(height: 32),
+        BackupPasswordTextField(
+          controller: passwordCtrl,
+          labelText: context.lang.password,
+          onChanged: (_) => setState(() {}),
+        ),
+        PasswordRequirementText(
+          text: context.lang.backupPasswordRequirement,
+          showError: passwordCtrl.text.isNotEmpty && !isPasswordValid,
+        ),
+        const SizedBox(height: 8),
+        BackupPasswordTextField(
+          controller: repeatedPasswordCtrl,
+          labelText: context.lang.passwordRepeated,
+          onChanged: (_) => setState(() {}),
+        ),
+        PasswordRequirementText(
+          text: context.lang.passwordRepeatedNotEqual,
+          showError:
+              repeatedPasswordCtrl.text.isNotEmpty && !isRepeatedPasswordValid,
+        ),
+        const SizedBox(height: 10),
+        Row(
+          children: [
+            const FaIcon(
+              FontAwesomeIcons.circleInfo,
+              size: 14,
+              color: Colors.grey,
+            ),
+            const SizedBox(width: 8),
+            Expanded(
+              child: Text(
+                context.lang.backupNoPasswordRecovery,
+                style: const TextStyle(fontSize: 12, color: Colors.grey),
+              ),
+            ),
+          ],
+        ),
+        const SizedBox(height: 20),
+        Center(
+          child: TextButton(
+            onPressed: () => context.push(Routes.settingsBackupServer),
+            child: Text(context.lang.backupExpertSettings),
+          ),
+        ),
+        const SizedBox(height: 40),
+        NextButtonComp(
+          isLoading: isLoading,
+          canSubmit: canSubmit,
+          onPressed: onPressedEnableTwonlySafe,
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/src/visual/views/onboarding/setup/components/finish_setup.comp.dart b/lib/src/visual/views/onboarding/setup/components/finish_setup.comp.dart
new file mode 100644
index 00000000..c091586d
--- /dev/null
+++ b/lib/src/visual/views/onboarding/setup/components/finish_setup.comp.dart
@@ -0,0 +1,163 @@
+import 'package:flutter/material.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/views/onboarding/setup.view.dart';
+
+class FinishSetupComp extends StatefulWidget {
+  const FinishSetupComp({super.key});
+
+  @override
+  State<FinishSetupComp> createState() => _FinishSetupCompState();
+}
+
+class _FinishSetupCompState extends State<FinishSetupComp> {
+  Future<void> onTap() async {
+    await context.navPush(
+      SetupView(
+        onUpdate: () {
+          if (mounted) {
+            Navigator.pop(context);
+          }
+        },
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return StreamBuilder<void>(
+      stream: userService.onUserUpdated,
+      builder: (context, snapshot) {
+        final user = userService.currentUser;
+
+        if (user.currentSetupPage == null) {
+          return const SizedBox.shrink();
+        }
+
+        final currentPage = SetupPagesExtension.fromStr(user.currentSetupPage);
+        final progress = currentPage.progressPercentage / 100;
+
+        return Container(
+          margin: const EdgeInsets.all(16),
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(24),
+            gradient: LinearGradient(
+              colors: [
+                context.color.primaryContainer.withValues(alpha: 0.2),
+                context.color.primaryContainer.withValues(alpha: 0.1),
+              ],
+              begin: Alignment.topLeft,
+              end: Alignment.bottomRight,
+            ),
+            border: Border.all(
+              color: context.color.primary.withValues(alpha: 0.15),
+              width: 1.5,
+            ),
+            boxShadow: [
+              BoxShadow(
+                color: context.color.shadow.withValues(alpha: 0.05),
+                blurRadius: 10,
+                offset: const Offset(0, 4),
+              ),
+            ],
+          ),
+          child: Material(
+            color: Colors.transparent,
+            borderRadius: BorderRadius.circular(24),
+            clipBehavior: Clip.antiAlias,
+            child: InkWell(
+              onTap: onTap,
+              child: Padding(
+                padding: const EdgeInsets.all(16),
+                child: Row(
+                  children: [
+                    SizedBox(
+                      width: 68,
+                      height: 68,
+                      child: Stack(
+                        fit: StackFit.expand,
+                        children: [
+                          CircularProgressIndicator(
+                            value: progress,
+                            strokeWidth: 6,
+                            backgroundColor: context.color.onSurface.withValues(
+                              alpha: 0.12,
+                            ),
+                            color: context.color.primary,
+                            strokeCap: StrokeCap.round,
+                          ),
+                          Center(
+                            child: Text(
+                              '${currentPage.progressPercentage}%',
+                              style: TextStyle(
+                                fontWeight: FontWeight.w800,
+                                fontSize: 15,
+                                color: context.color.primary,
+                              ),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                    const SizedBox(width: 20),
+                    Expanded(
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Text(
+                            context.lang.finishSetupCardTitle,
+                            style: TextStyle(
+                              fontWeight: FontWeight.w900,
+                              fontSize: 17,
+                              color: context.color.onSurface,
+                              letterSpacing: -0.2,
+                            ),
+                          ),
+                          const SizedBox(height: 6),
+                          Text(
+                            context.lang.finishSetupCardDesc,
+                            style: TextStyle(
+                              fontSize: 13,
+                              color: context.color.onSurfaceVariant,
+                              height: 1.3,
+                            ),
+                          ),
+                          const SizedBox(height: 14),
+                          FilledButton.icon(
+                            onPressed: onTap,
+                            icon: const Icon(
+                              Icons.arrow_forward_rounded,
+                              size: 18,
+                            ),
+                            label: Text(
+                              context.lang.finishSetupCardAction,
+                              style: const TextStyle(
+                                fontWeight: FontWeight.bold,
+                              ),
+                            ),
+                            style: FilledButton.styleFrom(
+                              backgroundColor: context.color.primary,
+                              foregroundColor: context.color.onPrimary,
+                              minimumSize: const Size(0, 40),
+                              padding: const EdgeInsets.symmetric(
+                                horizontal: 16,
+                              ),
+                              shape: RoundedRectangleBorder(
+                                borderRadius: BorderRadius.circular(12),
+                              ),
+                              elevation: 0,
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ),
+        );
+      },
+    );
+  }
+}
diff --git a/lib/src/visual/views/onboarding/setup/components/mock_contact_request_actions.comp.dart b/lib/src/visual/views/onboarding/setup/components/mock_contact_request_actions.comp.dart
new file mode 100644
index 00000000..5599da39
--- /dev/null
+++ b/lib/src/visual/views/onboarding/setup/components/mock_contact_request_actions.comp.dart
@@ -0,0 +1,121 @@
+import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/themes/light.dart';
+
+class MockContactRequestActionsComp extends StatelessWidget {
+  const MockContactRequestActionsComp({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      // width: 125,
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          const SizedBox(width: 4),
+          SizedBox(
+            height: 20,
+            // width: 45,
+            child: FilledButton(
+              style: FilledButton.styleFrom(
+                padding: const EdgeInsets.only(right: 2, left: 4),
+                backgroundColor: context.color.surfaceContainerHigh,
+                foregroundColor: context.color.onSurface,
+              ),
+              onPressed: () {},
+              child: Row(
+                children: [
+                  const Icon(
+                    Icons.person_off_rounded,
+                    color: Color.fromARGB(164, 244, 67, 54),
+                    size: 12,
+                  ),
+                  Text(
+                    context.lang.contactActionBlock,
+                    style: const TextStyle(fontSize: 8),
+                  ),
+                ],
+              ),
+            ),
+          ),
+          const SizedBox(width: 6),
+          SizedBox(
+            height: 20,
+            // width: 50,
+            child: FilledButton(
+              style: FilledButton.styleFrom(
+                padding: const EdgeInsets.only(right: 2, left: 4),
+                backgroundColor: context.color.surfaceContainerHigh,
+                foregroundColor: context.color.onSurface,
+              ),
+              onPressed: () {},
+              child: Row(
+                children: [
+                  const Icon(Icons.check, color: Colors.green, size: 12),
+                  Text(
+                    context.lang.contactActionAccept,
+                    style: const TextStyle(fontSize: 8),
+                  ),
+                ],
+              ),
+            ),
+          ),
+          IconButton(
+            style: IconButton.styleFrom(
+              padding: const EdgeInsets.symmetric(horizontal: 2),
+              tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+            ),
+            constraints: const BoxConstraints(),
+            icon: const Icon(Icons.close, size: 12),
+            onPressed: () {},
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class MockContactSuggestedActionsComp extends StatelessWidget {
+  const MockContactSuggestedActionsComp({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        const SizedBox(width: 4),
+        SizedBox(
+          height: 20,
+          child: FilledButton(
+            style: FilledButton.styleFrom(
+              padding: const EdgeInsets.only(right: 8, left: 4),
+            ).merge(secondaryGreyButtonStyle(context)),
+            onPressed: () {},
+            child: Row(
+              children: [
+                const Padding(
+                  padding: EdgeInsets.symmetric(horizontal: 6),
+                  child: FaIcon(FontAwesomeIcons.userPlus, size: 10),
+                ),
+                Text(
+                  context.lang.friendSuggestionsRequest,
+                  style: const TextStyle(fontSize: 8),
+                ),
+              ],
+            ),
+          ),
+        ),
+        IconButton(
+          style: IconButton.styleFrom(
+            padding: const EdgeInsets.symmetric(horizontal: 2),
+            tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+          ),
+          constraints: const BoxConstraints(),
+          icon: const Icon(Icons.close, size: 12),
+          onPressed: () {},
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/src/visual/views/onboarding/setup/components/next_button.comp.dart b/lib/src/visual/views/onboarding/setup/components/next_button.comp.dart
new file mode 100644
index 00000000..40f22be4
--- /dev/null
+++ b/lib/src/visual/views/onboarding/setup/components/next_button.comp.dart
@@ -0,0 +1,60 @@
+import 'package:flutter/material.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/services/user.service.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/views/onboarding/setup.view.dart';
+
+class NextButtonComp extends StatelessWidget {
+  const NextButtonComp({
+    this.onPressed,
+    this.canSubmit = true,
+    this.isLoading = false,
+    super.key,
+  });
+
+  final Future<bool> Function()? onPressed;
+  final bool isLoading;
+  final bool canSubmit;
+
+  @override
+  Widget build(BuildContext context) {
+    final currentPage = SetupPagesExtension.fromStr(
+      userService.currentUser.currentSetupPage,
+    );
+    return ElevatedButton(
+      onPressed: canSubmit
+          ? () async {
+              if (onPressed != null) {
+                final error = await onPressed?.call();
+                if (error == true) return;
+              }
+              await UserService.update((user) {
+                user.currentSetupPage = currentPage.next()?.name;
+              });
+            }
+          : null,
+      style: ElevatedButton.styleFrom(
+        minimumSize: const Size(double.infinity, 56),
+        backgroundColor: context.color.primary,
+        foregroundColor: context.color.onPrimary,
+        elevation: 0,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(16),
+        ),
+      ),
+      child: isLoading
+          ? const SizedBox(
+              height: 24,
+              width: 24,
+              child: CircularProgressIndicator(
+                strokeWidth: 2,
+                valueColor: AlwaysStoppedAnimation<Color>(Colors.white),
+              ),
+            )
+          : Text(
+              currentPage.isLast ? context.lang.finishSetup : context.lang.next,
+              style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
+            ),
+    );
+  }
+}
diff --git a/lib/src/visual/views/onboarding/setup/components/setup_switch_card.comp.dart b/lib/src/visual/views/onboarding/setup/components/setup_switch_card.comp.dart
new file mode 100644
index 00000000..168a9a98
--- /dev/null
+++ b/lib/src/visual/views/onboarding/setup/components/setup_switch_card.comp.dart
@@ -0,0 +1,68 @@
+import 'package:flutter/material.dart';
+import 'package:twonly/src/utils/misc.dart';
+
+class SetupSwitchCard extends StatelessWidget {
+  const SetupSwitchCard({
+    required this.value,
+    required this.onChanged,
+    required this.title,
+    required this.expandedChild,
+    this.openIfNot = false,
+    super.key,
+  });
+
+  final bool value;
+  final bool openIfNot;
+  final ValueChanged<bool> onChanged;
+  final String title;
+  final Widget expandedChild;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: BoxDecoration(
+        color: context.color.surfaceContainerLow,
+        borderRadius: BorderRadius.circular(12),
+      ),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          SwitchListTile(
+            value: value,
+            onChanged: onChanged,
+            title: Text(
+              title,
+              style: const TextStyle(fontWeight: FontWeight.bold),
+            ),
+            tileColor: context.color.surfaceContainerLow,
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.circular(12),
+            ),
+            contentPadding: const EdgeInsets.symmetric(horizontal: 16),
+          ),
+          AnimatedSize(
+            duration: const Duration(milliseconds: 150),
+            curve: Curves.bounceInOut,
+            alignment: Alignment.topCenter,
+            child: SizedBox(
+              width: double.infinity,
+              child: (value && !openIfNot) || (!value && openIfNot)
+                  ? Container(
+                      decoration: BoxDecoration(
+                        color: context.color.surfaceContainerLow,
+                        borderRadius: BorderRadius.circular(12),
+                      ),
+                      child: Padding(
+                        padding: const EdgeInsets.only(top: 8),
+                        child: expandedChild,
+                      ),
+                    )
+                  : const SizedBox(height: 0),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/src/visual/views/onboarding/setup/let_your_friends_find_you.setup.dart b/lib/src/visual/views/onboarding/setup/let_your_friends_find_you.setup.dart
new file mode 100644
index 00000000..3f7275ef
--- /dev/null
+++ b/lib/src/visual/views/onboarding/setup/let_your_friends_find_you.setup.dart
@@ -0,0 +1,88 @@
+import 'package:flutter/material.dart';
+import 'package:lottie/lottie.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/services/user.service.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/views/onboarding/setup.view.dart';
+import 'package:twonly/src/visual/views/onboarding/setup/components/next_button.comp.dart';
+import 'package:twonly/src/visual/views/settings/privacy/user_discovery/components/user_discovery_setup.comp.dart';
+
+class LetYourFriendsFindYou extends StatefulWidget {
+  const LetYourFriendsFindYou({required this.state, super.key});
+
+  final UserDiscoverySetupState state;
+
+  @override
+  State<LetYourFriendsFindYou> createState() => _LetYourFriendsFindYouState();
+}
+
+class _LetYourFriendsFindYouState extends State<LetYourFriendsFindYou> {
+  @override
+  void initState() {
+    super.initState();
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (userService.currentUser.isUserDiscoveryEnabled &&
+          userService.currentUser.userDiscoverySharePromotion) {
+        // feature is already configured...
+        UserService.update((user) {
+          user.currentSetupPage = SetupPages.letYourFriendsFindYou.next()?.name;
+        });
+      }
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          if (widget.state.isUserDiscoveryEnabled)
+            UserDiscoverySetupComp(
+              state: widget.state,
+              showOnlySpecificPage: UserDiscoveryPages.letYourFriendsFindYou,
+            )
+          else
+            Container(
+              padding: const EdgeInsets.all(32),
+              child: Column(
+                children: [
+                  Lottie.asset(
+                    'assets/animations/takephoto.lottie',
+                    repeat: true,
+                    height: 150,
+                  ),
+                  const SizedBox(height: 60),
+                  Text(
+                    context.lang.onboardingSetupCompleteTitle(
+                      userService.currentUser.username,
+                    ),
+                    style: const TextStyle(
+                      fontSize: 24,
+                      fontWeight: FontWeight.bold,
+                    ),
+                    textAlign: TextAlign.center,
+                  ),
+                  const SizedBox(height: 12),
+                  Text(
+                    context.lang.onboardingSetupCompleteDesc,
+                    style: const TextStyle(
+                      fontSize: 16,
+                    ),
+                    textAlign: TextAlign.center,
+                  ),
+                ],
+              ),
+            ),
+          const SizedBox(height: 50),
+          NextButtonComp(
+            onPressed: () async {
+              return !(await widget.state.initializeOrUpdate());
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/src/visual/views/onboarding/setup/profile.setup.dart b/lib/src/visual/views/onboarding/setup/profile.setup.dart
new file mode 100644
index 00000000..c352055e
--- /dev/null
+++ b/lib/src/visual/views/onboarding/setup/profile.setup.dart
@@ -0,0 +1,129 @@
+import 'package:avatar_maker/avatar_maker.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:go_router/go_router.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/constants/routes.keys.dart';
+import 'package:twonly/src/services/user.service.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/views/onboarding/setup/components/next_button.comp.dart';
+import 'package:vector_graphics/vector_graphics.dart';
+
+class ProfileSetupPage extends StatefulWidget {
+  const ProfileSetupPage({super.key});
+
+  @override
+  State<ProfileSetupPage> createState() => _ProfileSetupPageState();
+}
+
+class _ProfileSetupPageState extends State<ProfileSetupPage> {
+  final AvatarMakerController _avatarMakerController =
+      PersistentAvatarMakerController(customizedPropertyCategories: []);
+  late final TextEditingController _displayNameController;
+
+  @override
+  void initState() {
+    super.initState();
+    _displayNameController = TextEditingController();
+  }
+
+  @override
+  void dispose() {
+    _displayNameController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Text(
+          context.lang.onboardingProfileTitle,
+          style: Theme.of(context).textTheme.headlineSmall?.copyWith(
+            fontWeight: FontWeight.bold,
+          ),
+        ),
+        const SizedBox(height: 8),
+        Text(
+          context.lang.onboardingProfileBody,
+          textAlign: TextAlign.center,
+          style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+            color: context.color.onSurfaceVariant,
+          ),
+        ),
+        const SizedBox(height: 40),
+        StreamBuilder(
+          stream: userService.onUserUpdated,
+          builder: (context, asyncSnapshot) {
+            return Container(
+              padding: const EdgeInsets.all(4),
+              decoration: BoxDecoration(
+                shape: BoxShape.circle,
+                border: Border.all(
+                  color: context.color.primary.withValues(alpha: 0.2),
+                  width: 4,
+                ),
+              ),
+              child: userService.currentUser.avatarSvg == null
+                  ? ClipRRect(
+                      borderRadius: BorderRadius.circular(80),
+                      child: Container(
+                        width: 160,
+                        height: 160,
+                        color: context.color.surfaceContainer,
+                        child: const SvgPicture(
+                          AssetBytesLoader(
+                            'assets/images/default_avatar.svg.vec',
+                          ),
+                        ),
+                      ),
+                    )
+                  : AvatarMakerAvatar(
+                      backgroundColor: context.color.surfaceContainer,
+                      radius: 80,
+                      controller: _avatarMakerController,
+                    ),
+            );
+          },
+        ),
+        const SizedBox(height: 16),
+        TextButton.icon(
+          onPressed: () async {
+            await context.push(Routes.settingsProfileModifyAvatar);
+            await _avatarMakerController.performRestore();
+          },
+          icon: const Icon(Icons.palette_outlined),
+          label: Text(context.lang.settingsProfileCustomizeAvatar),
+        ),
+        const SizedBox(height: 30),
+        TextField(
+          controller: _displayNameController,
+          decoration: InputDecoration(
+            labelText: context.lang.settingsProfileEditDisplayName,
+            hintText: context.lang.settingsProfileEditDisplayNameNew,
+            prefixIcon: const Icon(Icons.person_outline),
+            filled: true,
+            fillColor: context.color.surfaceContainerLow,
+            border: OutlineInputBorder(
+              borderRadius: BorderRadius.circular(16),
+              borderSide: BorderSide.none,
+            ),
+            floatingLabelBehavior: FloatingLabelBehavior.never,
+          ),
+        ),
+        const SizedBox(height: 40),
+        NextButtonComp(
+          onPressed: () async {
+            await UserService.update((user) {
+              if (_displayNameController.text.isNotEmpty) {
+                user.displayName = _displayNameController.text;
+              }
+            });
+            return false;
+          },
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/src/visual/views/onboarding/setup/share_your_friends.setup.dart b/lib/src/visual/views/onboarding/setup/share_your_friends.setup.dart
new file mode 100644
index 00000000..c2b6220e
--- /dev/null
+++ b/lib/src/visual/views/onboarding/setup/share_your_friends.setup.dart
@@ -0,0 +1,53 @@
+import 'package:flutter/material.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/services/user.service.dart';
+import 'package:twonly/src/visual/views/onboarding/setup.view.dart';
+import 'package:twonly/src/visual/views/onboarding/setup/components/next_button.comp.dart';
+import 'package:twonly/src/visual/views/settings/privacy/user_discovery/components/user_discovery_setup.comp.dart';
+
+class ShareYourFriendsSetupPage extends StatefulWidget {
+  const ShareYourFriendsSetupPage({required this.state, super.key});
+
+  final UserDiscoverySetupState state;
+
+  @override
+  State<ShareYourFriendsSetupPage> createState() =>
+      _ShareYourFriendsSetupPageState();
+}
+
+class _ShareYourFriendsSetupPageState extends State<ShareYourFriendsSetupPage> {
+  @override
+  void initState() {
+    super.initState();
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (userService.currentUser.isUserDiscoveryEnabled) {
+        // feature is already configured...
+        UserService.update((user) {
+          user.currentSetupPage = SetupPages.shareYourFriends.next()?.name;
+        });
+      }
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          UserDiscoverySetupComp(
+            state: widget.state,
+            showOnlySpecificPage: UserDiscoveryPages.shareYourFriends,
+          ),
+          const SizedBox(height: 60),
+          const NextButtonComp(
+            // onPressed: () async {
+            //   return !(await widget.state.initializeOrUpdate());
+            // },
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/src/visual/views/onboarding/setup/verification_badge.setup.dart b/lib/src/visual/views/onboarding/setup/verification_badge.setup.dart
new file mode 100644
index 00000000..555dfb4d
--- /dev/null
+++ b/lib/src/visual/views/onboarding/setup/verification_badge.setup.dart
@@ -0,0 +1,27 @@
+import 'package:flutter/material.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/components/verification_badge_info.comp.dart';
+import 'package:twonly/src/visual/views/onboarding/setup/components/next_button.comp.dart';
+
+class VerificationBadgeSetupPage extends StatelessWidget {
+  const VerificationBadgeSetupPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Text(
+          context.lang.onboardingVerificationBadgeTitle,
+          style: Theme.of(context).textTheme.headlineSmall?.copyWith(
+            fontWeight: FontWeight.bold,
+          ),
+        ),
+        const SizedBox(height: 30),
+        const VerificationBadgeInfo(),
+        const SizedBox(height: 60),
+        const NextButtonComp(),
+      ],
+    );
+  }
+}
diff --git a/lib/src/views/public_profile.view.dart b/lib/src/visual/views/public_profile.view.dart
similarity index 86%
rename from lib/src/views/public_profile.view.dart
rename to lib/src/visual/views/public_profile.view.dart
index a2bb355d..fa39166d 100644
--- a/lib/src/views/public_profile.view.dart
+++ b/lib/src/visual/views/public_profile.view.dart
@@ -1,16 +1,18 @@
 import 'dart:convert';
 import 'dart:typed_data';
+
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:go_router/go_router.dart';
 import 'package:qr_flutter/qr_flutter.dart';
 import 'package:share_plus/share_plus.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
+import 'package:twonly/src/services/signal/identity.signal.dart';
 import 'package:twonly/src/utils/avatars.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/qr.dart';
-import 'package:twonly/src/views/components/better_list_title.dart';
+import 'package:twonly/src/utils/qr.utils.dart';
+import 'package:twonly/src/visual/elements/better_list_title.element.dart';
 
 class PublicProfileView extends StatefulWidget {
   const PublicProfileView({super.key});
@@ -20,22 +22,21 @@ class PublicProfileView extends StatefulWidget {
 }
 
 class _PublicProfileViewState extends State<PublicProfileView> {
-  Uint8List? _qrCode;
+  String? _qrCode;
   Uint8List? _userAvatar;
   Uint8List? _publicKey;
 
   @override
   void initState() {
-    initAsync();
     super.initState();
+    initAsync();
   }
 
   Future<void> initAsync() async {
-    _qrCode = await getProfileQrCodeData();
+    _qrCode = await QrCodeUtils.publicProfileLink();
     _userAvatar = await getUserAvatar();
     _publicKey = await getUserPublicKey();
-
-    setState(() {});
+    if (mounted) setState(() {});
   }
 
   @override
@@ -82,7 +83,7 @@ class _PublicProfileViewState extends State<PublicProfileView> {
                 ],
               ),
               child: QrImageView.withQr(
-                qr: QrCode.fromUint8List(
+                qr: QrCode.fromData(
                   data: _qrCode!,
                   errorCorrectLevel: QrErrorCorrectLevel.M,
                 ),
@@ -107,7 +108,7 @@ class _PublicProfileViewState extends State<PublicProfileView> {
             ),
           const SizedBox(height: 20),
           Text(
-            gUser.username,
+            userService.currentUser.username,
             style: const TextStyle(fontSize: 24),
           ),
           const SizedBox(height: 20),
@@ -126,11 +127,13 @@ class _PublicProfileViewState extends State<PublicProfileView> {
             text: context.lang.shareYourProfile,
             subtitle: (_publicKey == null)
                 ? null
-                : Text('https://me.twonly.eu/${gUser.username}'),
+                : Text(
+                    'https://me.twonly.eu/${userService.currentUser.username}',
+                  ),
             onTap: () {
               final params = ShareParams(
                 text:
-                    'https://me.twonly.eu/${gUser.username}#${base64Url.encode(_publicKey!)}',
+                    'https://me.twonly.eu/${userService.currentUser.username}#${base64Url.encode(_publicKey!)}',
               );
               SharePlus.instance.share(params);
             },
diff --git a/lib/src/visual/views/settings/account.view.dart b/lib/src/visual/views/settings/account.view.dart
new file mode 100644
index 00000000..8f1fc07c
--- /dev/null
+++ b/lib/src/visual/views/settings/account.view.dart
@@ -0,0 +1,84 @@
+import 'package:flutter/material.dart';
+import 'package:restart_app/restart_app.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/utils/storage.dart';
+import 'package:twonly/src/visual/components/alert.dialog.dart';
+
+class AccountView extends StatelessWidget {
+  const AccountView({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(context.lang.settingsAccount),
+      ),
+      body: ListView(
+        children: [
+          // ListTile(
+          //   title: const Text('Transfer account'),
+          //   subtitle: const Text('Coming soon'),
+          //   onTap: () async {
+          //     await showAlertDialog(
+          //       context,
+          //       'Coming soon',
+          //       'This feature is not yet implemented!',
+          //     );
+          //   },
+          // ),
+          // const Divider(),
+          Container(
+            alignment: Alignment.center,
+            padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 20),
+            child: const Text(
+              'Danger Zone',
+              textAlign: TextAlign.center,
+              style: TextStyle(
+                fontSize: 20,
+                color: Colors.red,
+                fontWeight: FontWeight.bold,
+              ),
+            ),
+          ),
+          ListTile(
+            title: Text(
+              context.lang.settingsAccountDeleteAccount,
+              style: const TextStyle(color: Colors.red),
+            ),
+            subtitle: Text(context.lang.settingsAccountDeleteAccountNoBallance),
+            onTap: () async {
+              if (!context.mounted) return;
+              final ok = await showAlertDialog(
+                context,
+                context.lang.settingsAccountDeleteModalTitle,
+                context.lang.settingsAccountDeleteModalBody,
+              );
+              if (ok) {
+                final res = await apiService.deleteAccount();
+                if (res.isError) {
+                  if (!context.mounted) return;
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    const SnackBar(
+                      content: Text(
+                        'Could not delete the account. Please ensure you have a internet connection!',
+                      ),
+                      duration: Duration(seconds: 3),
+                    ),
+                  );
+                  return;
+                }
+                await deleteLocalUserData();
+                await Restart.restartApp(
+                  notificationTitle: 'Account successfully deleted',
+                  notificationBody: 'Click here to open the app again',
+                  forceKill: true,
+                );
+              }
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/src/views/settings/appearance.view.dart b/lib/src/visual/views/settings/appearance.view.dart
similarity index 59%
rename from lib/src/views/settings/appearance.view.dart
rename to lib/src/visual/views/settings/appearance.view.dart
index a23be18b..84555e36 100644
--- a/lib/src/views/settings/appearance.view.dart
+++ b/lib/src/visual/views/settings/appearance.view.dart
@@ -2,11 +2,11 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/providers/settings.provider.dart';
+import 'package:twonly/src/services/user.service.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/storage.dart';
-import 'package:twonly/src/views/components/radio_button.dart';
+import 'package:twonly/src/visual/elements/radio_button.element.dart';
 
 class AppearanceView extends StatefulWidget {
   const AppearanceView({super.key});
@@ -73,32 +73,20 @@ class _AppearanceViewState extends State<AppearanceView> {
   }
 
   Future<void> toggleShowFeedbackIcon() async {
-    await updateUserdata((u) {
+    await UserService.update((u) {
       u.showFeedbackShortcut = !u.showFeedbackShortcut;
-      return u;
-    });
-    setState(() {
-      // gUser
     });
   }
 
   Future<void> toggleStartWithCameraOpen() async {
-    await updateUserdata((u) {
+    await UserService.update((u) {
       u.startWithCameraOpen = !u.startWithCameraOpen;
-      return u;
-    });
-    setState(() {
-      // gUser
     });
   }
 
   Future<void> toggleShowImagePreviewWhenSending() async {
-    await updateUserdata((u) {
+    await UserService.update((u) {
       u.showShowImagePreviewWhenSending = !u.showShowImagePreviewWhenSending;
-      return u;
-    });
-    setState(() {
-      // gUser
     });
   }
 
@@ -109,43 +97,49 @@ class _AppearanceViewState extends State<AppearanceView> {
       appBar: AppBar(
         title: Text(context.lang.settingsAppearance),
       ),
-      body: ListView(
-        children: [
-          ListTile(
-            title: Text(context.lang.settingsAppearanceTheme),
-            subtitle: Text(
-              selectedTheme.name,
-              style: const TextStyle(color: Colors.grey),
-            ),
-            onTap: () async {
-              await _showSelectThemeMode(context);
-            },
-          ),
-          ListTile(
-            title: Text(context.lang.contactUsShortcut),
-            onTap: toggleShowFeedbackIcon,
-            trailing: Switch(
-              value: !gUser.showFeedbackShortcut,
-              onChanged: (a) => toggleShowFeedbackIcon(),
-            ),
-          ),
-          ListTile(
-            title: Text(context.lang.startWithCameraOpen),
-            onTap: toggleStartWithCameraOpen,
-            trailing: Switch(
-              value: gUser.startWithCameraOpen,
-              onChanged: (a) => toggleStartWithCameraOpen(),
-            ),
-          ),
-          ListTile(
-            title: Text(context.lang.showImagePreviewWhenSending),
-            onTap: toggleShowImagePreviewWhenSending,
-            trailing: Switch(
-              value: gUser.showShowImagePreviewWhenSending,
-              onChanged: (a) => toggleShowImagePreviewWhenSending(),
-            ),
-          ),
-        ],
+      body: StreamBuilder<void>(
+        stream: userService.onUserUpdated,
+        builder: (context, snapshot) {
+          return ListView(
+            children: [
+              ListTile(
+                title: Text(context.lang.settingsAppearanceTheme),
+                subtitle: Text(
+                  selectedTheme.name,
+                  style: const TextStyle(color: Colors.grey),
+                ),
+                onTap: () async {
+                  await _showSelectThemeMode(context);
+                },
+              ),
+              ListTile(
+                title: Text(context.lang.contactUsShortcut),
+                onTap: toggleShowFeedbackIcon,
+                trailing: Switch(
+                  value: !userService.currentUser.showFeedbackShortcut,
+                  onChanged: (a) => toggleShowFeedbackIcon(),
+                ),
+              ),
+              ListTile(
+                title: Text(context.lang.startWithCameraOpen),
+                onTap: toggleStartWithCameraOpen,
+                trailing: Switch(
+                  value: userService.currentUser.startWithCameraOpen,
+                  onChanged: (a) => toggleStartWithCameraOpen(),
+                ),
+              ),
+              ListTile(
+                title: Text(context.lang.showImagePreviewWhenSending),
+                onTap: toggleShowImagePreviewWhenSending,
+                trailing: Switch(
+                  value:
+                      userService.currentUser.showShowImagePreviewWhenSending,
+                  onChanged: (a) => toggleShowImagePreviewWhenSending(),
+                ),
+              ),
+            ],
+          );
+        },
       ),
     );
   }
diff --git a/lib/src/views/settings/backup/backup_server.view.dart b/lib/src/visual/views/settings/backup/backup_server.view.dart
similarity index 93%
rename from lib/src/views/settings/backup/backup_server.view.dart
rename to lib/src/visual/views/settings/backup/backup_server.view.dart
index de780810..161ce65e 100644
--- a/lib/src/views/settings/backup/backup_server.view.dart
+++ b/lib/src/visual/views/settings/backup/backup_server.view.dart
@@ -2,14 +2,15 @@
 
 import 'dart:async';
 import 'dart:convert';
+
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:http/http.dart' as http;
-import 'package:twonly/globals.dart';
-import 'package:twonly/src/model/json/userdata.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/model/json/userdata.model.dart';
+import 'package:twonly/src/services/user.service.dart';
 import 'package:twonly/src/utils/log.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/storage.dart';
 
 class BackupServerView extends StatefulWidget {
   const BackupServerView({super.key});
@@ -25,14 +26,14 @@ class _BackupServerViewState extends State<BackupServerView> {
 
   @override
   void initState() {
-    _urlController.text = 'https://';
     super.initState();
+    _urlController.text = 'https://';
     unawaited(initAsync());
   }
 
   Future<void> initAsync() async {
-    if (gUser.backupServer != null) {
-      final uri = Uri.parse(gUser.backupServer!.serverUrl);
+    if (userService.currentUser.backupServer != null) {
+      final uri = Uri.parse(userService.currentUser.backupServer!.serverUrl);
       // remove user auth data
       final serverUrl = Uri(
         scheme: uri.scheme,
@@ -79,9 +80,8 @@ class _BackupServerViewState extends State<BackupServerView> {
           retentionDays: data['retentionDays']! as int,
           maxBackupBytes: data['maxBackupBytes']! as int,
         );
-        await updateUserdata((user) {
+        await UserService.update((user) {
           user.backupServer = backupServer;
-          return user;
         });
         if (mounted) Navigator.pop(context, backupServer);
       } else {
@@ -166,9 +166,8 @@ class _BackupServerViewState extends State<BackupServerView> {
             Center(
               child: OutlinedButton(
                 onPressed: () async {
-                  await updateUserdata((user) {
+                  await UserService.update((user) {
                     user.backupServer = null;
-                    return user;
                   });
                   if (context.mounted) Navigator.pop(context);
                 },
diff --git a/lib/src/visual/views/settings/backup/backup_settings.view.dart b/lib/src/visual/views/settings/backup/backup_settings.view.dart
new file mode 100644
index 00000000..e321debf
--- /dev/null
+++ b/lib/src/visual/views/settings/backup/backup_settings.view.dart
@@ -0,0 +1,172 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/constants/routes.keys.dart';
+import 'package:twonly/src/model/json/userdata.model.dart';
+import 'package:twonly/src/services/backup/create.backup.dart';
+import 'package:twonly/src/utils/misc.dart';
+
+class BackupView extends StatefulWidget {
+  const BackupView({super.key});
+
+  @override
+  State<BackupView> createState() => _BackupViewState();
+}
+
+BackupServer _defaultBackupServer = BackupServer(
+  serverUrl: 'Default',
+  retentionDays: 180,
+  maxBackupBytes: 2097152,
+);
+
+class _BackupViewState extends State<BackupView> {
+  bool _isLoading = false;
+
+  String _backupStatus(LastBackupUploadState status) {
+    switch (status) {
+      case LastBackupUploadState.none:
+        return context.lang.backupPending;
+      case LastBackupUploadState.pending:
+        return context.lang.backupPending;
+      case LastBackupUploadState.failed:
+        return context.lang.backupFailed;
+      case LastBackupUploadState.success:
+        return context.lang.backupSuccess;
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return StreamBuilder<void>(
+      stream: userService.onUserUpdated,
+      builder: (context, _) {
+        final backupServer =
+            userService.currentUser.backupServer ?? _defaultBackupServer;
+        return Scaffold(
+          appBar: AppBar(
+            title: Text(context.lang.settingsBackup),
+          ),
+          body: Padding(
+            padding: const EdgeInsets.all(16),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const SizedBox(height: 8),
+                Text(
+                  context.lang.backupTwonlySafeDesc,
+                  textAlign: TextAlign.center,
+                ),
+                const SizedBox(height: 8),
+                if (userService.currentUser.twonlySafeBackup != null)
+                  Column(
+                    children: [
+                      const SizedBox(height: 32),
+                      Table(
+                        defaultVerticalAlignment:
+                            TableCellVerticalAlignment.middle,
+                        children: [
+                          ...[
+                            (
+                              context.lang.backupServer,
+                              (backupServer.serverUrl.contains('@'))
+                                  ? backupServer.serverUrl.split('@')[1]
+                                  : backupServer.serverUrl.replaceAll(
+                                      'https://',
+                                      '',
+                                    ),
+                            ),
+                            (
+                              context.lang.backupMaxBackupSize,
+                              formatBytes(backupServer.maxBackupBytes),
+                            ),
+                            (
+                              context.lang.backupStorageRetention,
+                              '${backupServer.retentionDays} Days',
+                            ),
+                            (
+                              context.lang.backupLastBackupDate,
+                              formatDateTime(
+                                context,
+                                userService
+                                    .currentUser
+                                    .twonlySafeBackup!
+                                    .lastBackupDone,
+                              ),
+                            ),
+                            (
+                              context.lang.backupLastBackupSize,
+                              formatBytes(
+                                userService
+                                    .currentUser
+                                    .twonlySafeBackup!
+                                    .lastBackupSize,
+                              ),
+                            ),
+                            (
+                              context.lang.backupLastBackupResult,
+                              _backupStatus(
+                                userService
+                                    .currentUser
+                                    .twonlySafeBackup!
+                                    .backupUploadState,
+                              ),
+                            ),
+                          ].map((pair) {
+                            return TableRow(
+                              children: [
+                                TableCell(
+                                  child: Text(pair.$1),
+                                ),
+                                TableCell(
+                                  child: Padding(
+                                    padding: const EdgeInsets.symmetric(
+                                      vertical: 4,
+                                    ),
+                                    child: Text(
+                                      pair.$2,
+                                      textAlign: TextAlign.right,
+                                    ),
+                                  ),
+                                ),
+                              ],
+                            );
+                          }),
+                        ],
+                      ),
+                      const SizedBox(height: 10),
+                      OutlinedButton(
+                        onPressed: _isLoading
+                            ? null
+                            : () async {
+                                setState(() {
+                                  _isLoading = true;
+                                });
+                                await performTwonlySafeBackup(force: true);
+                                setState(() {
+                                  _isLoading = false;
+                                });
+                              },
+                        child: Text(context.lang.backupTwonlySaveNow),
+                      ),
+                    ],
+                  ),
+                const SizedBox(height: 32),
+                Center(
+                  child: FilledButton(
+                    onPressed: () =>
+                        context.push(Routes.settingsBackupSetup, extra: true),
+                    child: Text(
+                      userService.currentUser.twonlySafeBackup == null
+                          ? context.lang.backupEnableBackup
+                          : context.lang.backupChangePassword,
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        );
+      },
+    );
+  }
+}
diff --git a/lib/src/views/settings/backup/setup_backup.view.dart b/lib/src/visual/views/settings/backup/backup_setup.view.dart
similarity index 59%
rename from lib/src/views/settings/backup/setup_backup.view.dart
rename to lib/src/visual/views/settings/backup/backup_setup.view.dart
index 95091d37..52968435 100644
--- a/lib/src/views/settings/backup/setup_backup.view.dart
+++ b/lib/src/visual/views/settings/backup/backup_setup.view.dart
@@ -1,16 +1,16 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart' show rootBundle;
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:go_router/go_router.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
 import 'package:twonly/src/services/backup/common.backup.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/alert_dialog.dart';
+import 'package:twonly/src/visual/components/alert.dialog.dart';
+import 'package:twonly/src/visual/views/settings/backup/components/backup_setup.comp.dart';
 
 class SetupBackupView extends StatefulWidget {
   const SetupBackupView({
-    this.isPasswordChangeOnly = false,
     this.callBack,
     super.key,
   });
@@ -18,14 +18,12 @@ class SetupBackupView extends StatefulWidget {
   // in case a callback is defined the callback
   // is called instead of the Navigator.pop()
   final VoidCallback? callBack;
-  final bool isPasswordChangeOnly;
 
   @override
   State<SetupBackupView> createState() => _SetupBackupViewState();
 }
 
 class _SetupBackupViewState extends State<SetupBackupView> {
-  bool obscureText = true;
   bool isLoading = false;
   final TextEditingController passwordCtrl = TextEditingController();
   final TextEditingController repeatedPasswordCtrl = TextEditingController();
@@ -53,10 +51,6 @@ class _SetupBackupViewState extends State<SetupBackupView> {
       }
     }
 
-    setState(() {
-      isLoading = true;
-    });
-
     await Future.delayed(const Duration(milliseconds: 100));
     await enableTwonlySafe(passwordCtrl.text);
 
@@ -105,80 +99,28 @@ class _SetupBackupViewState extends State<SetupBackupView> {
                 textAlign: TextAlign.center,
               ),
               const SizedBox(height: 30),
-              Stack(
-                children: [
-                  TextField(
-                    controller: passwordCtrl,
-                    onChanged: (value) {
-                      setState(() {});
-                    },
-                    style: const TextStyle(fontSize: 17),
-                    obscureText: obscureText,
-                    decoration: getInputDecoration(
-                      context,
-                      context.lang.password,
-                    ),
-                  ),
-                  Positioned(
-                    right: 0,
-                    top: 0,
-                    bottom: 0,
-                    child: IconButton(
-                      onPressed: () {
-                        setState(() {
-                          obscureText = !obscureText;
-                        });
-                      },
-                      icon: FaIcon(
-                        obscureText
-                            ? FontAwesomeIcons.eye
-                            : FontAwesomeIcons.eyeSlash,
-                        size: 16,
-                      ),
-                    ),
-                  ),
-                ],
+              BackupPasswordTextField(
+                controller: passwordCtrl,
+                labelText: context.lang.password,
+                onChanged: (value) => setState(() {}),
               ),
-              Padding(
-                padding: const EdgeInsetsGeometry.all(5),
-                child: Text(
-                  context.lang.backupPasswordRequirement,
-                  style: TextStyle(
-                    fontSize: 13,
-                    color:
-                        (passwordCtrl.text.length < 8 &&
-                            passwordCtrl.text.isNotEmpty)
-                        ? Colors.red
-                        : Colors.transparent,
-                  ),
-                ),
+              PasswordRequirementText(
+                text: context.lang.backupPasswordRequirement,
+                showError:
+                    passwordCtrl.text.length < 8 &&
+                    passwordCtrl.text.isNotEmpty,
               ),
               const SizedBox(height: 5),
-              TextField(
+              BackupPasswordTextField(
                 controller: repeatedPasswordCtrl,
-                onChanged: (value) {
-                  setState(() {});
-                },
-                style: const TextStyle(fontSize: 17),
-                obscureText: true,
-                decoration: getInputDecoration(
-                  context,
-                  context.lang.passwordRepeated,
-                ),
+                labelText: context.lang.passwordRepeated,
+                onChanged: (value) => setState(() {}),
               ),
-              Padding(
-                padding: const EdgeInsetsGeometry.all(5),
-                child: Text(
-                  context.lang.passwordRepeatedNotEqual,
-                  style: TextStyle(
-                    fontSize: 13,
-                    color:
-                        (passwordCtrl.text != repeatedPasswordCtrl.text &&
-                            repeatedPasswordCtrl.text.isNotEmpty)
-                        ? Colors.red
-                        : Colors.transparent,
-                  ),
-                ),
+              PasswordRequirementText(
+                text: context.lang.passwordRepeatedNotEqual,
+                showError:
+                    passwordCtrl.text != repeatedPasswordCtrl.text &&
+                    repeatedPasswordCtrl.text.isNotEmpty,
               ),
               const SizedBox(height: 10),
               Center(
@@ -211,9 +153,9 @@ class _SetupBackupViewState extends State<SetupBackupView> {
                         )
                       : const Icon(Icons.lock_clock_rounded),
                   label: Text(
-                    widget.isPasswordChangeOnly
-                        ? context.lang.backupChangePassword
-                        : context.lang.backupEnableBackup,
+                    userService.currentUser.twonlySafeBackup == null
+                        ? context.lang.backupEnableBackup
+                        : context.lang.backupChangePassword,
                   ),
                 ),
               ),
@@ -239,17 +181,3 @@ class _SetupBackupViewState extends State<SetupBackupView> {
     );
   }
 }
-
-Future<bool> isSecurePassword(String password) async {
-  final badPasswordsStr = await rootBundle.loadString(
-    'assets/passwords/bad_passwords.txt',
-  );
-  final badPasswords = badPasswordsStr.split('\n');
-  if (badPasswords.contains(password)) {
-    return false;
-  }
-  // Check if the password meets all criteria
-  return RegExp('[A-Z]').hasMatch(password) &&
-      RegExp('[a-z]').hasMatch(password) &&
-      RegExp('[0-9]').hasMatch(password);
-}
diff --git a/lib/src/visual/views/settings/backup/components/backup_setup.comp.dart b/lib/src/visual/views/settings/backup/components/backup_setup.comp.dart
new file mode 100644
index 00000000..d62ce050
--- /dev/null
+++ b/lib/src/visual/views/settings/backup/components/backup_setup.comp.dart
@@ -0,0 +1,101 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart' show rootBundle;
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:twonly/src/utils/misc.dart';
+
+Future<bool> isSecurePassword(String password) async {
+  final badPasswordsStr = await rootBundle.loadString(
+    'assets/passwords/bad_passwords.txt',
+  );
+  final badPasswords = badPasswordsStr.split('\n');
+  if (badPasswords.contains(password)) {
+    return false;
+  }
+  // Check if the password meets all criteria
+  return RegExp('[A-Z]').hasMatch(password) &&
+      RegExp('[a-z]').hasMatch(password) &&
+      RegExp('[0-9]').hasMatch(password);
+}
+
+class BackupPasswordTextField extends StatefulWidget {
+  const BackupPasswordTextField({
+    required this.controller,
+    required this.labelText,
+    this.onChanged,
+    this.obscureByDefault = true,
+    super.key,
+  });
+
+  final TextEditingController controller;
+  final String labelText;
+  final ValueChanged<String>? onChanged;
+  final bool obscureByDefault;
+
+  @override
+  State<BackupPasswordTextField> createState() => _BackupPasswordTextFieldState();
+}
+
+class _BackupPasswordTextFieldState extends State<BackupPasswordTextField> {
+  late bool _obscureText;
+
+  @override
+  void initState() {
+    super.initState();
+    _obscureText = widget.obscureByDefault;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return TextField(
+      controller: widget.controller,
+      onChanged: widget.onChanged,
+      obscureText: _obscureText,
+      decoration: InputDecoration(
+        labelText: widget.labelText,
+        filled: true,
+        fillColor: context.color.surfaceContainerLow,
+        border: OutlineInputBorder(
+          borderRadius: BorderRadius.circular(16),
+          borderSide: BorderSide.none,
+        ),
+        floatingLabelBehavior: FloatingLabelBehavior.never,
+        suffixIcon: IconButton(
+          onPressed: () {
+            setState(() {
+              _obscureText = !_obscureText;
+            });
+          },
+          icon: FaIcon(
+            _obscureText ? FontAwesomeIcons.eye : FontAwesomeIcons.eyeSlash,
+            size: 16,
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class PasswordRequirementText extends StatelessWidget {
+  const PasswordRequirementText({
+    required this.text,
+    required this.showError,
+    super.key,
+  });
+
+  final String text;
+  final bool showError;
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
+      child: Text(
+        text,
+        style: TextStyle(
+          fontSize: 12,
+          color: showError ? Colors.red : Colors.transparent,
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/src/visual/views/settings/chat/chat_reactions.view.dart b/lib/src/visual/views/settings/chat/chat_reactions.view.dart
new file mode 100644
index 00000000..c43dabe6
--- /dev/null
+++ b/lib/src/visual/views/settings/chat/chat_reactions.view.dart
@@ -0,0 +1,107 @@
+import 'package:flutter/material.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/services/user.service.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/components/animate_icon.comp.dart';
+
+class ChatReactionSelectionView extends StatefulWidget {
+  const ChatReactionSelectionView({super.key});
+
+  @override
+  State<ChatReactionSelectionView> createState() =>
+      _ChatReactionSelectionView();
+}
+
+class _ChatReactionSelectionView extends State<ChatReactionSelectionView> {
+  List<String> _selectedEmojis = [];
+
+  List<String> _emojisFromSession() {
+    final user = userService.currentUser;
+    if (user.preSelectedEmojies != null) {
+      return user.preSelectedEmojies!;
+    }
+    return EmojiAnimationComp.animatedIcons.keys.toList().sublist(0, 6);
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _selectedEmojis = _emojisFromSession();
+  }
+
+  Future<void> _onEmojiSelected(String emoji) async {
+    if (_selectedEmojis.contains(emoji)) {
+      _selectedEmojis.remove(emoji);
+    } else {
+      if (_selectedEmojis.length < 12) {
+        _selectedEmojis.add(emoji);
+        await UserService.update((user) {
+          user.preSelectedEmojies = _selectedEmojis;
+        });
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(context.lang.settingsPreSelectedReactionsError),
+            duration: const Duration(seconds: 3),
+          ),
+        );
+      }
+    }
+    setState(() {});
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return StreamBuilder<void>(
+      stream: userService.onUserUpdated,
+      builder: (context, _) {
+        _selectedEmojis = _emojisFromSession();
+        return Scaffold(
+          appBar: AppBar(
+            title: const Text('Select Reactions'),
+          ),
+          body: GridView.builder(
+            gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+              crossAxisCount: 4,
+            ),
+            itemCount: EmojiAnimationComp.animatedIcons.keys.length,
+            itemBuilder: (context, index) {
+              final emoji = EmojiAnimationComp.animatedIcons.keys.elementAt(
+                index,
+              );
+              return GestureDetector(
+                onTap: () => _onEmojiSelected(emoji),
+                child: Card(
+                  color: _selectedEmojis.contains(emoji)
+                      ? context.color.primary.withAlpha(150)
+                      : context.color.surface,
+                  child: Center(
+                    child: SizedBox(
+                      width: 40,
+                      height: 40,
+                      child: EmojiAnimationComp(emoji: emoji),
+                    ),
+                  ),
+                ),
+              );
+            },
+          ),
+          floatingActionButton: Padding(
+            padding: const EdgeInsets.only(bottom: 30),
+            child: FloatingActionButton(
+              foregroundColor: Colors.white,
+              onPressed: () => UserService.update(
+                (u) => u.preSelectedEmojies = EmojiAnimationComp
+                    .animatedIcons
+                    .keys
+                    .toList()
+                    .sublist(0, 6),
+              ),
+              child: const Icon(Icons.settings_backup_restore_rounded),
+            ),
+          ),
+        );
+      },
+    );
+  }
+}
diff --git a/lib/src/views/settings/chat/chat_settings.view.dart b/lib/src/visual/views/settings/chat/chat_settings.view.dart
similarity index 100%
rename from lib/src/views/settings/chat/chat_settings.view.dart
rename to lib/src/visual/views/settings/chat/chat_settings.view.dart
diff --git a/lib/src/views/settings/data_and_storage.view.dart b/lib/src/visual/views/settings/data_and_storage.view.dart
similarity index 51%
rename from lib/src/views/settings/data_and_storage.view.dart
rename to lib/src/visual/views/settings/data_and_storage.view.dart
index 7043785a..ce6a6b22 100644
--- a/lib/src/views/settings/data_and_storage.view.dart
+++ b/lib/src/visual/views/settings/data_and_storage.view.dart
@@ -1,13 +1,14 @@
 import 'dart:async';
 import 'dart:io';
+
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
-import 'package:twonly/src/services/api/mediafiles/download.service.dart';
+import 'package:twonly/src/services/api/mediafiles/download.api.dart';
+import 'package:twonly/src/services/user.service.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/storage.dart';
 
 class DataAndStorageView extends StatefulWidget {
   const DataAndStorageView({super.key});
@@ -27,110 +28,121 @@ class _DataAndStorageViewState extends State<DataAndStorageView> {
       builder: (context) {
         return AutoDownloadOptionsDialog(
           autoDownloadOptions:
-              gUser.autoDownloadOptions ?? defaultAutoDownloadOptions,
+              userService.currentUser.autoDownloadOptions ??
+              defaultAutoDownloadOptions,
           connectionMode: connectionMode,
-          onUpdate: () async {
-            setState(() {});
-          },
+          onUpdate: () {},
         );
       },
     );
   }
 
   Future<void> toggleStoreInGallery() async {
-    await updateUserdata((u) {
+    await UserService.update((u) {
       u.storeMediaFilesInGallery = !u.storeMediaFilesInGallery;
-      return u;
     });
-    setState(() {});
   }
 
   Future<void> toggleAutoStoreMediaFiles() async {
-    await updateUserdata((u) {
+    await UserService.update((u) {
       u.autoStoreAllSendUnlimitedMediaFiles =
           !u.autoStoreAllSendUnlimitedMediaFiles;
-      return u;
     });
-    setState(() {});
   }
 
   @override
   Widget build(BuildContext context) {
-    final autoDownloadOptions =
-        gUser.autoDownloadOptions ?? defaultAutoDownloadOptions;
     return Scaffold(
       appBar: AppBar(
         title: Text(context.lang.settingsStorageData),
       ),
-      body: ListView(
-        children: [
-          ListTile(
-            title: Text(context.lang.settingsStorageDataStoreInGTitle),
-            subtitle: Text(context.lang.settingsStorageDataStoreInGSubtitle),
-            onTap: toggleStoreInGallery,
-            trailing: Switch(
-              value: gUser.storeMediaFilesInGallery,
-              onChanged: (a) => toggleStoreInGallery(),
-            ),
-          ),
-          ListTile(
-            title: Text(context.lang.autoStoreAllSendUnlimitedMediaFiles),
-            subtitle: Text(
-              context.lang.autoStoreAllSendUnlimitedMediaFilesSubtitle,
-              style: const TextStyle(fontSize: 9),
-            ),
-            onTap: toggleAutoStoreMediaFiles,
-            trailing: Switch(
-              value: gUser.autoStoreAllSendUnlimitedMediaFiles,
-              onChanged: (a) => toggleAutoStoreMediaFiles(),
-            ),
-          ),
-          if (Platform.isAndroid)
-            ListTile(
-              title: Text(
-                context.lang.exportMemories,
+      body: StreamBuilder<void>(
+        stream: userService.onUserUpdated,
+        builder: (context, _) {
+          final autoDownloadOptions =
+              userService.currentUser.autoDownloadOptions ??
+              defaultAutoDownloadOptions;
+          return ListView(
+            children: [
+              ListTile(
+                title: Text(context.lang.settingsStorageDataStoreInGTitle),
+                subtitle: Text(
+                  context.lang.settingsStorageDataStoreInGSubtitle,
+                ),
+                onTap: toggleStoreInGallery,
+                trailing: Switch(
+                  value: userService.currentUser.storeMediaFilesInGallery,
+                  onChanged: (a) => toggleStoreInGallery(),
+                ),
               ),
-              onTap: () => context.push(Routes.settingsStorageExport),
-            ),
-          if (Platform.isAndroid)
-            ListTile(
-              title: Text(
-                context.lang.importMemories,
+              ListTile(
+                title: Text(context.lang.autoStoreAllSendUnlimitedMediaFiles),
+                subtitle: Text(
+                  context.lang.autoStoreAllSendUnlimitedMediaFilesSubtitle,
+                  style: const TextStyle(fontSize: 9),
+                ),
+                onTap: toggleAutoStoreMediaFiles,
+                trailing: Switch(
+                  value: userService
+                      .currentUser
+                      .autoStoreAllSendUnlimitedMediaFiles,
+                  onChanged: (a) => toggleAutoStoreMediaFiles(),
+                ),
               ),
-              onTap: () => context.push(Routes.settingsStorageImport),
-            ),
-          const Divider(),
-          ListTile(
-            title: Text(
-              context.lang.settingsStorageDataMediaAutoDownload,
-              style: const TextStyle(fontSize: 13),
-            ),
-          ),
-          ListTile(
-            title: Text(context.lang.settingsStorageDataAutoDownMobile),
-            subtitle: Text(
-              autoDownloadOptions[ConnectivityResult.mobile.name]!
-                  .where((e) => e != 'audio')
-                  .join(', '),
-              style: const TextStyle(color: Colors.grey),
-            ),
-            onTap: () async {
-              await showAutoDownloadOptions(context, ConnectivityResult.mobile);
-            },
-          ),
-          ListTile(
-            title: Text(context.lang.settingsStorageDataAutoDownWifi),
-            subtitle: Text(
-              autoDownloadOptions[ConnectivityResult.wifi.name]!
-                  .where((e) => e != 'audio')
-                  .join(', '),
-              style: const TextStyle(color: Colors.grey),
-            ),
-            onTap: () async {
-              await showAutoDownloadOptions(context, ConnectivityResult.wifi);
-            },
-          ),
-        ],
+              if (Platform.isAndroid)
+                ListTile(
+                  title: Text(
+                    context.lang.exportMemories,
+                  ),
+                  onTap: () => context.push(Routes.settingsStorageExport),
+                ),
+              if (Platform.isAndroid)
+                ListTile(
+                  title: Text(
+                    context.lang.importMemories,
+                  ),
+                  onTap: () => context.push(Routes.settingsStorageImport),
+                ),
+              const Divider(),
+              ListTile(
+                title: Text(
+                  context.lang.settingsStorageDataMediaAutoDownload,
+                  style: const TextStyle(fontSize: 13),
+                ),
+              ),
+              ListTile(
+                title: Text(context.lang.settingsStorageDataAutoDownMobile),
+                subtitle: Text(
+                  autoDownloadOptions[ConnectivityResult.mobile.name]!
+                      .where((e) => e != 'audio')
+                      .join(', '),
+                  style: const TextStyle(color: Colors.grey),
+                ),
+                onTap: () async {
+                  await showAutoDownloadOptions(
+                    context,
+                    ConnectivityResult.mobile,
+                  );
+                },
+              ),
+              ListTile(
+                title: Text(context.lang.settingsStorageDataAutoDownWifi),
+                subtitle: Text(
+                  autoDownloadOptions[ConnectivityResult.wifi.name]!
+                      .where((e) => e != 'audio')
+                      .join(', '),
+                  style: const TextStyle(color: Colors.grey),
+                ),
+                onTap: () async {
+                  await showAutoDownloadOptions(
+                    context,
+                    ConnectivityResult.wifi,
+                  );
+                },
+              ),
+            ],
+          );
+        },
       ),
     );
   }
@@ -215,9 +227,8 @@ class _AutoDownloadOptionsDialogState extends State<AutoDownloadOptionsDialog> {
 
     // Call the onUpdate callback to notify the parent widget
 
-    await updateUserdata((u) {
+    await UserService.update((u) {
       u.autoDownloadOptions = autoDownloadOptions;
-      return u;
     });
 
     widget.onUpdate();
diff --git a/lib/src/views/settings/data_and_storage/export_media.view.dart b/lib/src/visual/views/settings/data_and_storage/export_media.view.dart
similarity index 99%
rename from lib/src/views/settings/data_and_storage/export_media.view.dart
rename to lib/src/visual/views/settings/data_and_storage/export_media.view.dart
index 9c3426a2..f5e3aeca 100644
--- a/lib/src/views/settings/data_and_storage/export_media.view.dart
+++ b/lib/src/visual/views/settings/data_and_storage/export_media.view.dart
@@ -48,7 +48,7 @@ class _ExportMediaViewState extends State<ExportMediaView> {
   Directory _mediaFolder() {
     final dir = MediaFileService.buildDirectoryPath(
       'stored',
-      globalApplicationSupportDirectory,
+      AppEnvironment.supportDir,
     );
     if (!dir.existsSync()) dir.createSync(recursive: true);
     return dir;
diff --git a/lib/src/views/settings/data_and_storage/import_media.view.dart b/lib/src/visual/views/settings/data_and_storage/import_media.view.dart
similarity index 99%
rename from lib/src/views/settings/data_and_storage/import_media.view.dart
rename to lib/src/visual/views/settings/data_and_storage/import_media.view.dart
index bd8e8a59..d2ffd6a6 100644
--- a/lib/src/views/settings/data_and_storage/import_media.view.dart
+++ b/lib/src/visual/views/settings/data_and_storage/import_media.view.dart
@@ -1,10 +1,11 @@
 import 'dart:io';
+
 import 'package:archive/archive_io.dart';
 import 'package:drift/drift.dart' show Value;
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:path/path.dart' as p;
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/services/mediafiles/mediafile.service.dart';
diff --git a/lib/src/views/settings/developer/automated_testing.view.dart b/lib/src/visual/views/settings/developer/automated_testing.view.dart
similarity index 97%
rename from lib/src/views/settings/developer/automated_testing.view.dart
rename to lib/src/visual/views/settings/developer/automated_testing.view.dart
index deb527ab..adaa8d66 100644
--- a/lib/src/views/settings/developer/automated_testing.view.dart
+++ b/lib/src/visual/views/settings/developer/automated_testing.view.dart
@@ -3,8 +3,8 @@ import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
-import 'package:twonly/globals.dart';
-import 'package:twonly/src/services/api/messages.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
 import 'package:twonly/src/services/signal/utils.signal.dart';
 import 'package:twonly/src/utils/log.dart';
 import 'package:twonly/src/utils/misc.dart';
diff --git a/lib/src/visual/views/settings/developer/developer.view.dart b/lib/src/visual/views/settings/developer/developer.view.dart
new file mode 100644
index 00000000..8fd830e8
--- /dev/null
+++ b/lib/src/visual/views/settings/developer/developer.view.dart
@@ -0,0 +1,151 @@
+import 'dart:async';
+
+import 'package:clock/clock.dart';
+import 'package:drift/drift.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:go_router/go_router.dart';
+import 'package:restart_app/restart_app.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/constants/routes.keys.dart';
+import 'package:twonly/src/database/twonly.db.dart';
+import 'package:twonly/src/services/user.service.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/utils/storage.dart';
+import 'package:twonly/src/visual/components/alert.dialog.dart';
+import 'package:twonly/src/visual/views/onboarding/setup.view.dart';
+import 'package:twonly/src/visual/views/settings/developer/user_discovery_developer.view.dart';
+
+class DeveloperSettingsView extends StatefulWidget {
+  const DeveloperSettingsView({super.key});
+
+  @override
+  State<DeveloperSettingsView> createState() => _DeveloperSettingsViewState();
+}
+
+class _DeveloperSettingsViewState extends State<DeveloperSettingsView> {
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  Future<void> toggleDeveloperSettings() async {
+    await UserService.update((u) => u.isDeveloper = !u.isDeveloper);
+  }
+
+  Future<void> toggleVideoStabilization() async {
+    await UserService.update(
+      (u) => u.videoStabilizationEnabled = !u.videoStabilizationEnabled,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Developer Settings'),
+      ),
+      body: StreamBuilder<void>(
+        stream: userService.onUserUpdated,
+        builder: (context, _) {
+          return ListView(
+            children: [
+              ListTile(
+                title: const Text('Show Developer Settings'),
+                onTap: toggleDeveloperSettings,
+                trailing: Switch(
+                  value: userService.currentUser.isDeveloper,
+                  onChanged: (_) => toggleDeveloperSettings(),
+                ),
+              ),
+              ListTile(
+                title: const Text('User ID'),
+                subtitle: Text(userService.currentUser.userId.toString()),
+              ),
+              ListTile(
+                title: const Text('Show Retransmission Database'),
+                onTap: () => context.push(
+                  Routes.settingsDeveloperRetransmissionDatabase,
+                ),
+              ),
+              ListTile(
+                title: const Text('Show User Discovery Database'),
+                onTap: () =>
+                    context.navPush(const UserDiscoveryDeveloperView()),
+              ),
+              ListTile(
+                title: const Text('Toggle Video Stabilization'),
+                onTap: toggleVideoStabilization,
+                trailing: Switch(
+                  value: userService.currentUser.videoStabilizationEnabled,
+                  onChanged: (a) => toggleVideoStabilization(),
+                ),
+              ),
+              ListTile(
+                title: const Text('Delete all (!) app data'),
+                onTap: () async {
+                  final ok = await showAlertDialog(
+                    context,
+                    'Sure?',
+                    'If you do not have a backup, you have to register with a new account.',
+                  );
+                  if (ok) {
+                    await deleteLocalUserData();
+                    await Restart.restartApp(
+                      notificationTitle: 'Account successfully deleted',
+                      notificationBody: 'Click here to open the app again',
+                      forceKill: true,
+                    );
+                  }
+                },
+              ),
+              ListTile(
+                title: const Text('Reduce flames'),
+                onTap: () => context.push(Routes.settingsDeveloperReduceFlames),
+              ),
+              if (!kReleaseMode)
+                ListTile(
+                  title: const Text('Make it possible to reset flames'),
+                  onTap: () async {
+                    final chats = await twonlyDB.groupsDao.getAllDirectChats();
+
+                    for (final chat in chats) {
+                      await twonlyDB.groupsDao.updateGroup(
+                        chat.groupId,
+                        GroupsCompanion(
+                          flameCounter: const Value(0),
+                          maxFlameCounter: const Value(365),
+                          lastFlameCounterChange: Value(clock.now()),
+                          maxFlameCounterFrom: Value(
+                            clock.now().subtract(const Duration(days: 1)),
+                          ),
+                        ),
+                      );
+                    }
+                    await HapticFeedback.heavyImpact();
+                  },
+                ),
+              if (!kReleaseMode)
+                ListTile(
+                  title: const Text('Automated Testing'),
+                  onTap: () =>
+                      context.push(Routes.settingsDeveloperAutomatedTesting),
+                ),
+              ListTile(
+                title: const Text('Reopen Setup'),
+                onTap: () async {
+                  await UserService.update((u) {
+                    u
+                      ..currentSetupPage = SetupPages.profile.name
+                      ..isUserDiscoveryEnabled = false;
+                  });
+                },
+              ),
+            ],
+          );
+        },
+      ),
+    );
+  }
+}
diff --git a/lib/src/views/settings/developer/reduce_flames.view.dart b/lib/src/visual/views/settings/developer/reduce_flames.view.dart
similarity index 95%
rename from lib/src/views/settings/developer/reduce_flames.view.dart
rename to lib/src/visual/views/settings/developer/reduce_flames.view.dart
index 824a1e42..a9606b63 100644
--- a/lib/src/views/settings/developer/reduce_flames.view.dart
+++ b/lib/src/visual/views/settings/developer/reduce_flames.view.dart
@@ -1,11 +1,12 @@
 import 'dart:async';
 import 'dart:collection';
+
 import 'package:drift/drift.dart' show Value;
 import 'package:flutter/material.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/twonly.db.dart';
-import 'package:twonly/src/views/components/avatar_icon.component.dart';
-import 'package:twonly/src/views/components/flame.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
+import 'package:twonly/src/visual/components/flame_counter.comp.dart';
 
 class ReduceFlamesView extends StatefulWidget {
   const ReduceFlamesView({super.key});
diff --git a/lib/src/views/settings/developer/retransmission_data.view.dart b/lib/src/visual/views/settings/developer/retransmission_data.view.dart
similarity index 96%
rename from lib/src/views/settings/developer/retransmission_data.view.dart
rename to lib/src/visual/views/settings/developer/retransmission_data.view.dart
index b15446a7..a7cc1386 100644
--- a/lib/src/views/settings/developer/retransmission_data.view.dart
+++ b/lib/src/visual/views/settings/developer/retransmission_data.view.dart
@@ -1,17 +1,18 @@
 import 'dart:async';
+
 import 'package:drift/drift.dart' hide Column;
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:hashlib/random.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/model/protobuf/client/generated/messages.pb.dart'
     as pb;
-import 'package:twonly/src/services/api/messages.dart';
+import 'package:twonly/src/services/api/messages.api.dart';
 import 'package:twonly/src/services/notifications/pushkeys.notifications.dart';
-import 'package:twonly/src/views/components/alert_dialog.dart';
-import 'package:twonly/src/views/components/avatar_icon.component.dart';
+import 'package:twonly/src/visual/components/alert.dialog.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
 
 class RetransmissionDataView extends StatefulWidget {
   const RetransmissionDataView({super.key});
@@ -73,6 +74,7 @@ class _RetransmissionDataViewState extends State<RetransmissionDataView> {
     subscriptionContacts = twonlyDB.contactsDao.watchAllContacts().listen((
       updated,
     ) {
+      if (!mounted) return;
       for (final contact in updated) {
         contacts[contact.userId] = contact;
       }
@@ -84,6 +86,7 @@ class _RetransmissionDataViewState extends State<RetransmissionDataView> {
     subscriptionRetransmission = twonlyDB.receiptsDao.watchAll().listen((
       updated,
     ) {
+      if (!mounted) return;
       retransmissions = updated.reversed.toList();
       if (contacts.isNotEmpty) {
         messages = RetransMsg.fromRaw(retransmissions, contacts);
diff --git a/lib/src/visual/views/settings/developer/user_discovery_developer.view.dart b/lib/src/visual/views/settings/developer/user_discovery_developer.view.dart
new file mode 100644
index 00000000..0b3af71b
--- /dev/null
+++ b/lib/src/visual/views/settings/developer/user_discovery_developer.view.dart
@@ -0,0 +1,135 @@
+import 'package:flutter/material.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/database/daos/user_discovery.dao.dart';
+import 'package:twonly/src/database/twonly.db.dart';
+
+class UserDiscoveryDeveloperView extends StatefulWidget {
+  const UserDiscoveryDeveloperView({super.key});
+
+  @override
+  State<UserDiscoveryDeveloperView> createState() =>
+      _UserDiscoveryDeveloperViewState();
+}
+
+class _UserDiscoveryDeveloperViewState
+    extends State<UserDiscoveryDeveloperView> {
+  UserDiscoveryDao get dao => twonlyDB.userDiscoveryDao;
+
+  @override
+  Widget build(BuildContext context) {
+    return StreamBuilder<List<Contact>>(
+      stream: twonlyDB.contactsDao.watchAllContacts(),
+      builder: (context, contactSnapshot) {
+        final contacts = contactSnapshot.data ?? [];
+        final contactNames = {for (final c in contacts) c.userId: c.username};
+
+        String getName(int? id) {
+          if (id == null) return 'None';
+          return contactNames[id] ?? 'ID: $id';
+        }
+
+        return Scaffold(
+          appBar: AppBar(
+            title: const Text('User Discovery Debug'),
+          ),
+          body: ListView(
+            children: [
+              _TableExpansionTile<UserDiscoveryAnnouncedUser>(
+                title: 'Announced Users',
+                stream: dao.watchAllAnnouncedUsers(),
+                itemBuilder: (context, user) => ListTile(
+                  title: Text(user.username ?? 'No Username'),
+                  subtitle: Text(
+                    'ID: ${getName(user.announcedUserId)}\n'
+                    'Public ID: ${user.publicId}\n'
+                    'Shown: ${user.wasShownToTheUser}, Hidden: ${user.isHidden}',
+                  ),
+                  isThreeLine: true,
+                ),
+              ),
+              _TableExpansionTile<UserDiscoveryUserRelation>(
+                title: 'User Relations',
+                stream: dao.watchAllUserRelations(),
+                itemBuilder: (context, relation) => ListTile(
+                  title: Text(
+                    'From: ${getName(relation.fromContactId)} → To: ${getName(relation.announcedUserId)}',
+                  ),
+                  subtitle: Text(
+                    'Verified: ${relation.publicKeyVerifiedTimestamp}',
+                  ),
+                ),
+              ),
+              _TableExpansionTile<UserDiscoveryOtherPromotion>(
+                title: 'Other Promotions',
+                stream: dao.watchAllOtherPromotions(),
+                itemBuilder: (context, promotion) => ListTile(
+                  title: Text(
+                    'From: ${getName(promotion.fromContactId)}, Public ID: ${promotion.publicId}',
+                  ),
+                  subtitle: Text(
+                    'ID: ${promotion.promotionId}, Threshold: ${promotion.threshold}\n'
+                    'Verified: ${promotion.publicKeyVerifiedTimestamp}',
+                  ),
+                  isThreeLine: true,
+                ),
+              ),
+              _TableExpansionTile<UserDiscoveryOwnPromotion>(
+                title: 'Own Promotions',
+                stream: dao.watchAllOwnPromotions(),
+                itemBuilder: (context, promotion) => ListTile(
+                  title: Text('Contact: ${getName(promotion.contactId)}'),
+                  subtitle: Text('Version: ${promotion.versionId}'),
+                ),
+              ),
+              _TableExpansionTile<UserDiscoveryShare>(
+                title: 'Shares',
+                stream: dao.watchAllShares(),
+                itemBuilder: (context, share) => ListTile(
+                  title: Text('Share ID: ${share.shareId}'),
+                  subtitle: Text('Contact: ${getName(share.contactId)}'),
+                ),
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}
+
+class _TableExpansionTile<T> extends StatelessWidget {
+  const _TableExpansionTile({
+    required this.title,
+    required this.stream,
+    required this.itemBuilder,
+  });
+  final String title;
+  final Stream<List<T>> stream;
+  final Widget Function(BuildContext, T) itemBuilder;
+
+  @override
+  Widget build(BuildContext context) {
+    return StreamBuilder<List<T>>(
+      stream: stream,
+      builder: (context, snapshot) {
+        final data = snapshot.data ?? [];
+        return ExpansionTile(
+          title: Text(
+            '$title (${data.length})',
+            style: const TextStyle(fontWeight: FontWeight.bold),
+          ),
+          children: data.isNotEmpty
+              ? data.map((item) => itemBuilder(context, item)).toList()
+              : [
+                  const ListTile(
+                    title: Text(
+                      'No entries',
+                      style: TextStyle(color: Colors.grey),
+                    ),
+                  ),
+                ],
+        );
+      },
+    );
+  }
+}
diff --git a/lib/src/views/settings/help/changelog.view.dart b/lib/src/visual/views/settings/help/changelog.view.dart
similarity index 69%
rename from lib/src/views/settings/help/changelog.view.dart
rename to lib/src/visual/views/settings/help/changelog.view.dart
index bd2402f7..a8520418 100644
--- a/lib/src/views/settings/help/changelog.view.dart
+++ b/lib/src/visual/views/settings/help/changelog.view.dart
@@ -2,8 +2,9 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/services/user.service.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/storage.dart';
 
 List<Widget> parseMarkdown(BuildContext context, String markdown) {
   final widgets = <Widget>[];
@@ -73,7 +74,6 @@ class ChangeLogView extends StatefulWidget {
 
 class _ChangeLogViewState extends State<ChangeLogView> {
   String changeLog = '';
-  bool hideChangeLog = false;
 
   @override
   void initState() {
@@ -87,49 +87,42 @@ class _ChangeLogViewState extends State<ChangeLogView> {
 
   Future<void> initAsync() async {
     changeLog = await rootBundle.loadString('CHANGELOG.md');
-    final user = await getUser();
-    if (user != null) {
-      hideChangeLog = user.hideChangeLog;
-    }
-    setState(() {});
-  }
-
-  Future<void> _toggleAutoOpen(bool value) async {
-    await updateUserdata((u) {
-      u.hideChangeLog = !hideChangeLog;
-      return u;
-    });
-    setState(() {
-      hideChangeLog = !value;
-    });
+    if (mounted) setState(() {});
   }
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: const Text('Changelog'),
-      ),
-      body: SafeArea(
-        child: Padding(
-          padding: const EdgeInsets.all(8),
-          child: ListView(
-            children: parseMarkdown(context, changeLog),
+    return StreamBuilder<void>(
+      stream: userService.onUserUpdated,
+      builder: (context, _) {
+        return Scaffold(
+          appBar: AppBar(
+            title: const Text('Changelog'),
           ),
-        ),
-      ),
-      bottomNavigationBar: BottomAppBar(
-        child: Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            Text(context.lang.openChangeLog),
-            Switch(
-              value: !hideChangeLog,
-              onChanged: _toggleAutoOpen,
+          body: SafeArea(
+            child: Padding(
+              padding: const EdgeInsets.all(8),
+              child: ListView(
+                children: parseMarkdown(context, changeLog),
+              ),
             ),
-          ],
-        ),
-      ),
+          ),
+          bottomNavigationBar: BottomAppBar(
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Text(context.lang.openChangeLog),
+                Switch(
+                  value: !userService.currentUser.hideChangeLog,
+                  onChanged: (_) => UserService.update(
+                    (u) => u.hideChangeLog = !u.hideChangeLog,
+                  ),
+                ),
+              ],
+            ),
+          ),
+        );
+      },
     );
   }
 }
diff --git a/lib/src/views/settings/help/contact_us.view.dart b/lib/src/visual/views/settings/help/contact_us.view.dart
similarity index 90%
rename from lib/src/views/settings/help/contact_us.view.dart
rename to lib/src/visual/views/settings/help/contact_us.view.dart
index c90710f1..26840839 100644
--- a/lib/src/views/settings/help/contact_us.view.dart
+++ b/lib/src/visual/views/settings/help/contact_us.view.dart
@@ -1,18 +1,21 @@
 import 'dart:convert';
+
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:fixnum/fixnum.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:go_router/go_router.dart';
 import 'package:http/http.dart' as http;
 import 'package:package_info_plus/package_info_plus.dart';
-import 'package:twonly/globals.dart';
-import 'package:twonly/src/constants/secure_storage_keys.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/constants/routes.keys.dart';
+import 'package:twonly/src/constants/secure_storage.keys.dart';
 import 'package:twonly/src/model/protobuf/api/http/http_requests.pb.dart';
 import 'package:twonly/src/utils/log.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/settings/help/contact_us/submit_message.view.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:twonly/src/utils/secure_storage.dart';
+import 'package:twonly/src/visual/views/settings/help/contact_us/submit_message.view.dart';
+import 'package:twonly/src/visual/views/settings/help/faq.view.dart';
 
 class ContactUsView extends StatefulWidget {
   const ContactUsView({super.key});
@@ -47,7 +50,7 @@ class _ContactUsState extends State<ContactUsView> {
 
     final uploadRequestBytes = uploadRequest.writeToBuffer();
 
-    final apiAuthTokenRaw = await const FlutterSecureStorage().read(
+    final apiAuthTokenRaw = await SecureStorage.instance.read(
       key: SecureStorageKeys.apiAuthToken,
     );
     if (apiAuthTokenRaw == null) {
@@ -236,9 +239,7 @@ $debugLogToken
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
               GestureDetector(
-                onTap: () async {
-                  await launchUrl(Uri.parse('https://twonly.eu/en/faq/'));
-                },
+                onTap: () => context.push(Routes.settingsHelpFaq),
                 child: Text(
                   context.lang.contactUsFaq,
                   style: const TextStyle(
@@ -263,15 +264,8 @@ $debugLogToken
                         final fullMessage = await _getFeedbackText();
                         if (!context.mounted || fullMessage == null) return;
 
-                        final feedbackSend = await Navigator.push(
-                          context,
-                          MaterialPageRoute(
-                            builder: (context) {
-                              return SubmitMessage(
-                                fullMessage: fullMessage,
-                              );
-                            },
-                          ),
+                        final feedbackSend = await context.navPush(
+                          SubmitMessage(fullMessage: fullMessage),
                         );
 
                         if (feedbackSend == true && context.mounted) {
@@ -302,15 +296,6 @@ class IncludeDebugLog extends StatefulWidget {
 }
 
 class _IncludeDebugLogState extends State<IncludeDebugLog> {
-  Future<void> _launchURL() async {
-    const url = 'https://twonly.eu/en/faq/troubleshooting/debug-log.html';
-    if (await launchUrl(Uri.parse(url))) {
-    } else {
-      // ignore: only_throw_errors
-      throw 'Could not launch $url';
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
     return Row(
@@ -327,7 +312,11 @@ class _IncludeDebugLogState extends State<IncludeDebugLog> {
         Text(context.lang.contactUsIncludeLog),
         const SizedBox(width: 20),
         GestureDetector(
-          onTap: _launchURL,
+          onTap: () => context.navPush(
+            const FaqView(
+              questionId: 'debug-log',
+            ),
+          ),
           child: Text(
             context.lang.contactUsWhatsThat,
             style: const TextStyle(
diff --git a/lib/src/views/settings/help/contact_us/submit_message.view.dart b/lib/src/visual/views/settings/help/contact_us/submit_message.view.dart
similarity index 100%
rename from lib/src/views/settings/help/contact_us/submit_message.view.dart
rename to lib/src/visual/views/settings/help/contact_us/submit_message.view.dart
diff --git a/lib/src/views/settings/help/credits.view.dart b/lib/src/visual/views/settings/help/credits.view.dart
similarity index 97%
rename from lib/src/views/settings/help/credits.view.dart
rename to lib/src/visual/views/settings/help/credits.view.dart
index 4a3cfaa4..dbd27058 100644
--- a/lib/src/views/settings/help/credits.view.dart
+++ b/lib/src/visual/views/settings/help/credits.view.dart
@@ -4,7 +4,7 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/filters/location_filter.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/filters/location_filter.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class UrlListTitle extends StatelessWidget {
diff --git a/lib/src/views/settings/help/diagnostics.view.dart b/lib/src/visual/views/settings/help/diagnostics.view.dart
similarity index 99%
rename from lib/src/views/settings/help/diagnostics.view.dart
rename to lib/src/visual/views/settings/help/diagnostics.view.dart
index d8b95a3d..1ff5573e 100644
--- a/lib/src/views/settings/help/diagnostics.view.dart
+++ b/lib/src/visual/views/settings/help/diagnostics.view.dart
@@ -4,7 +4,7 @@ import 'package:go_router/go_router.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
 import 'package:twonly/src/utils/log.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/loader/three_rotating_dots.loader.dart';
+import 'package:twonly/src/visual/loader/three_rotating_dots.loader.dart';
 
 class DiagnosticsView extends StatefulWidget {
   const DiagnosticsView({super.key});
diff --git a/lib/src/visual/views/settings/help/faq.view.dart b/lib/src/visual/views/settings/help/faq.view.dart
new file mode 100644
index 00000000..83a56626
--- /dev/null
+++ b/lib/src/visual/views/settings/help/faq.view.dart
@@ -0,0 +1,162 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:http/http.dart' as http;
+import 'package:twonly/globals.dart';
+import 'package:twonly/src/model/json/faq.model.dart';
+import 'package:twonly/src/utils/log.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/views/settings/help/faq/faq_markdown.view.dart';
+
+class FaqView extends StatefulWidget {
+  const FaqView({this.questionId, super.key});
+
+  final String? questionId;
+
+  @override
+  State<FaqView> createState() => _FaqViewState();
+}
+
+class _FaqViewState extends State<FaqView> {
+  Map<String, FaqCategory>? _faqData;
+  late String domain;
+  bool _noInternet = false;
+
+  @override
+  void initState() {
+    super.initState();
+    domain = 'https://twonly.eu';
+    unawaited(_fetchFAQData());
+  }
+
+  Future<void> _fetchFAQData() async {
+    final cacheFile = File('${AppEnvironment.cacheDir}/faq.json');
+    FaqData? faqData;
+    try {
+      final response = await http.get(Uri.parse('$domain/faq.json'));
+
+      if (response.statusCode == 200) {
+        final jsonData = utf8.decode(response.bodyBytes);
+        setState(() {
+          faqData = FaqData.fromJson(
+            json.decode(jsonData) as Map<String, dynamic>,
+          );
+          _noInternet = false;
+        });
+        cacheFile.writeAsStringSync(jsonData);
+      } else {
+        Log.error('FAQ got ${response.statusCode}');
+      }
+    } catch (e) {
+      Log.error(e);
+      setState(() {
+        _noInternet = true;
+      });
+    }
+    if (_noInternet && cacheFile.existsSync()) {
+      final jsonData = cacheFile.readAsStringSync();
+      setState(() {
+        faqData = FaqData.fromJson(
+          json.decode(jsonData) as Map<String, dynamic>,
+        );
+        _noInternet = false;
+      });
+    }
+
+    if (!mounted) return;
+
+    final locale = Localizations.localeOf(context).languageCode;
+    _faqData = faqData!.languages[locale] ?? faqData!.languages['en'];
+
+    if (widget.questionId != null && _faqData != null) {
+      if (!_navigateToQuestion(widget.questionId!, _faqData!)) {
+        final englishData = faqData!.languages['en'];
+        if (englishData != null && englishData != _faqData) {
+          _navigateToQuestion(widget.questionId!, englishData);
+        }
+      }
+    }
+  }
+
+  bool _navigateToQuestion(String questionId, Map<String, FaqCategory> data) {
+    for (final category in data.values) {
+      for (final question in category.questions) {
+        if (question.id == questionId) {
+          unawaited(
+            context.navPush(
+              FaqMarkdownView(
+                markdown: question.body,
+                title: question.title,
+              ),
+            ),
+          );
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (_noInternet) {
+      return Scaffold(
+        appBar: AppBar(
+          title: Text(context.lang.settingsHelpFAQ),
+        ),
+        body: const Center(
+          child: Text('Could not load the FAQ.'),
+        ),
+      );
+    }
+
+    if (_faqData == null) {
+      return Scaffold(
+        appBar: AppBar(
+          title: Text(context.lang.settingsHelpFAQ),
+        ),
+        body: const Center(child: CircularProgressIndicator()),
+      );
+    }
+
+    final sortedCategories = _faqData!.entries.toList()
+      ..sort((a, b) {
+        return b.value.meta.priority.compareTo(a.value.meta.priority);
+      });
+
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(context.lang.settingsHelpFAQ),
+      ),
+      body: ListView.builder(
+        itemCount: sortedCategories.length,
+        itemBuilder: (context, index) {
+          final categoryData = sortedCategories[index].value;
+
+          return Card(
+            child: ExpansionTile(
+              title: Text(categoryData.meta.title),
+              subtitle: Text(categoryData.meta.desc),
+              shape: const RoundedRectangleBorder(),
+              backgroundColor: context.color.surfaceContainer,
+              collapsedShape: const RoundedRectangleBorder(),
+              children: categoryData.questions.map<Widget>((question) {
+                return ListTile(
+                  title: Text(question.title),
+                  onTap: () => context.navPush(
+                    FaqMarkdownView(
+                      markdown: question.body,
+                      title: question.title,
+                    ),
+                  ),
+                );
+              }).toList(),
+            ),
+          );
+        },
+      ),
+    );
+  }
+}
diff --git a/lib/src/visual/views/settings/help/faq/faq_markdown.view.dart b/lib/src/visual/views/settings/help/faq/faq_markdown.view.dart
new file mode 100644
index 00000000..f4876137
--- /dev/null
+++ b/lib/src/visual/views/settings/help/faq/faq_markdown.view.dart
@@ -0,0 +1,32 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_markdown_plus/flutter_markdown_plus.dart';
+import 'package:twonly/src/database/daos/contacts.dao.dart';
+
+class FaqMarkdownView extends StatelessWidget {
+  const FaqMarkdownView({
+    required this.markdown,
+    required this.title,
+    super.key,
+  });
+
+  final String title;
+  final String markdown;
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(substringBy(title, 30)),
+      ),
+      body: Markdown(
+        data: markdown,
+        padding: const EdgeInsets.only(
+          top: 16,
+          left: 16,
+          right: 16,
+          bottom: 40,
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/src/visual/views/settings/help/faq/verification_badge_faq.view.dart b/lib/src/visual/views/settings/help/faq/verification_badge_faq.view.dart
new file mode 100644
index 00000000..809e1310
--- /dev/null
+++ b/lib/src/visual/views/settings/help/faq/verification_badge_faq.view.dart
@@ -0,0 +1,43 @@
+import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:go_router/go_router.dart';
+import 'package:twonly/src/constants/routes.keys.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/components/verification_badge_info.comp.dart';
+import 'package:twonly/src/visual/elements/better_list_title.element.dart';
+
+class VerificationBadeFaqView extends StatefulWidget {
+  const VerificationBadeFaqView({super.key});
+
+  @override
+  State<VerificationBadeFaqView> createState() =>
+      _VerificationBadeFaqViewState();
+}
+
+class _VerificationBadeFaqViewState extends State<VerificationBadeFaqView> {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(context.lang.verificationBadgeTitle),
+      ),
+      body: ListView(
+        padding: const EdgeInsets.all(40),
+        children: [
+          const VerificationBadgeInfo(),
+          const SizedBox(height: 20),
+          BetterListTile(
+            leading: const FaIcon(FontAwesomeIcons.camera),
+            text: context.lang.scanOtherProfile,
+            onTap: () => context.push(Routes.cameraQRScanner),
+          ),
+          BetterListTile(
+            leading: const FaIcon(FontAwesomeIcons.qrcode),
+            text: context.lang.openYourOwnQRcode,
+            onTap: () => context.push(Routes.settingsPublicProfile),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/src/visual/views/settings/help/help.view.dart b/lib/src/visual/views/settings/help/help.view.dart
new file mode 100644
index 00000000..ef09109a
--- /dev/null
+++ b/lib/src/visual/views/settings/help/help.view.dart
@@ -0,0 +1,145 @@
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:go_router/go_router.dart';
+import 'package:package_info_plus/package_info_plus.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/constants/routes.keys.dart';
+import 'package:twonly/src/services/user.service.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/components/alert.dialog.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+class HelpView extends StatefulWidget {
+  const HelpView({super.key});
+
+  @override
+  State<HelpView> createState() => _HelpViewState();
+}
+
+class _HelpViewState extends State<HelpView> {
+  Future<void> toggleAllowErrorTrackingViaSentry() async {
+    await UserService.update(
+      (u) => u.allowErrorTrackingViaSentry = !u.allowErrorTrackingViaSentry,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(context.lang.settingsHelp),
+      ),
+      body: StreamBuilder<void>(
+        stream: userService.onUserUpdated,
+        builder: (context, _) {
+          return ListView(
+            children: [
+              ListTile(
+                title: Text(context.lang.settingsHelpFAQ),
+                onTap: () => context.push(Routes.settingsHelpFaq),
+              ),
+              ListTile(
+                title: Text(context.lang.settingsHelpContactUs),
+                onTap: () => context.push(Routes.settingsHelpContactUs),
+              ),
+              const Divider(),
+              ListTile(
+                title: Text(context.lang.allowErrorTracking),
+                subtitle: Text(
+                  context.lang.allowErrorTrackingSubtitle,
+                  style: const TextStyle(fontSize: 10),
+                ),
+                onTap: toggleAllowErrorTrackingViaSentry,
+                trailing: Switch(
+                  value: userService.currentUser.allowErrorTrackingViaSentry,
+                  onChanged: (a) => toggleAllowErrorTrackingViaSentry(),
+                ),
+              ),
+              ListTile(
+                title: Text(context.lang.settingsHelpDiagnostics),
+                onTap: () => context.push(Routes.settingsHelpDiagnostics),
+              ),
+              const Divider(),
+              if (userService.currentUser.userStudyParticipantsToken == null ||
+                  kDebugMode)
+                ListTile(
+                  title: const Text('Teilnahme an Nutzerstudie'),
+                  onTap: () => context.push(Routes.settingsHelpUserStudy),
+                ),
+              FutureBuilder(
+                future: PackageInfo.fromPlatform(),
+                builder: (context, snap) {
+                  if (snap.hasData) {
+                    return ListTile(
+                      title: Text(context.lang.settingsHelpVersion),
+                      subtitle: Text(snap.data!.version),
+                    );
+                  } else {
+                    return Container();
+                  }
+                },
+              ),
+              ListTile(
+                title: Text(context.lang.settingsHelpLicenses),
+                onTap: () => showLicensePage(context: context),
+              ),
+              ListTile(
+                title: Text(context.lang.settingsHelpCredits),
+                onTap: () => context.push(Routes.settingsHelpCredits),
+              ),
+              ListTile(
+                title: const Text('Changelog'),
+                onTap: () => context.push(Routes.settingsHelpChangelog),
+              ),
+              ListTile(
+                title: const Text('Open Source'),
+                onTap: () => launchUrl(
+                  Uri.parse('https://github.com/twonlyapp/twonly-app'),
+                ),
+                trailing: const FaIcon(
+                  FontAwesomeIcons.arrowUpRightFromSquare,
+                  size: 15,
+                ),
+              ),
+              ListTile(
+                title: Text(context.lang.settingsHelpImprint),
+                onTap: () =>
+                    launchUrl(Uri.parse('https://twonly.eu/de/legal/')),
+                trailing: const FaIcon(
+                  FontAwesomeIcons.arrowUpRightFromSquare,
+                  size: 15,
+                ),
+              ),
+              ListTile(
+                title: Text(context.lang.settingsHelpTerms),
+                onTap: () =>
+                    launchUrl(Uri.parse('https://twonly.eu/de/legal/agb.html')),
+                trailing: const FaIcon(
+                  FontAwesomeIcons.arrowUpRightFromSquare,
+                  size: 15,
+                ),
+              ),
+              ListTile(
+                onLongPress: () async {
+                  final okay = await showAlertDialog(
+                    context,
+                    'Developer Settings',
+                    'Do you want to enable the developer settings?',
+                  );
+                  if (okay) {
+                    await UserService.update((u) => u.isDeveloper = true);
+                  }
+                },
+                title: const Text(
+                  'Copyright twonly',
+                  style: TextStyle(color: Colors.grey, fontSize: 13),
+                ),
+              ),
+            ],
+          );
+        },
+      ),
+    );
+  }
+}
diff --git a/lib/src/views/settings/notification.view.dart b/lib/src/visual/views/settings/notification.view.dart
similarity index 82%
rename from lib/src/views/settings/notification.view.dart
rename to lib/src/visual/views/settings/notification.view.dart
index 4319afaa..4c33d9ee 100644
--- a/lib/src/views/settings/notification.view.dart
+++ b/lib/src/visual/views/settings/notification.view.dart
@@ -1,17 +1,17 @@
 import 'dart:io';
+
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:hashlib/random.dart';
-import 'package:twonly/globals.dart';
-import 'package:twonly/src/constants/secure_storage_keys.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/constants/secure_storage.keys.dart';
 import 'package:twonly/src/model/protobuf/client/generated/push_notification.pb.dart';
 import 'package:twonly/src/services/notifications/fcm.notifications.dart';
 import 'package:twonly/src/services/notifications/pushkeys.notifications.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/storage.dart';
-import 'package:twonly/src/views/components/alert_dialog.dart';
+import 'package:twonly/src/utils/secure_storage.dart';
+import 'package:twonly/src/visual/components/alert.dialog.dart';
 
 class NotificationView extends StatefulWidget {
   const NotificationView({super.key});
@@ -32,9 +32,9 @@ class _NotificationViewState extends State<NotificationView> {
 
     await initFCMAfterAuthenticated(force: true);
 
-    final storedToken = await (const FlutterSecureStorage().read(
+    final storedToken = await SecureStorage.instance.read(
       key: SecureStorageKeys.googleFcm,
-    ));
+    );
 
     await setupNotificationWithUsers(force: true);
 
@@ -55,21 +55,18 @@ class _NotificationViewState extends State<NotificationView> {
       );
 
       if (run) {
-        final user = await getUser();
-        if (user != null) {
-          final pushData = await encryptPushNotification(
-            user.userId,
-            PushNotification(
-              messageId: uuid.v4(),
-              kind: PushKind.testNotification,
-            ),
-          );
-          await apiService.sendTextMessage(
-            user.userId,
-            Uint8List(0),
-            pushData,
-          );
-        }
+        final pushData = await encryptPushNotification(
+          userService.currentUser.userId,
+          PushNotification(
+            messageId: uuid.v4(),
+            kind: PushKind.TEST_NOTIFICATION,
+          ),
+        );
+        await apiService.sendTextMessage(
+          userService.currentUser.userId,
+          Uint8List(0),
+          pushData,
+        );
         _troubleshootingDidRun = true;
       }
     }
diff --git a/lib/src/views/settings/privacy.view.dart b/lib/src/visual/views/settings/privacy.view.dart
similarity index 82%
rename from lib/src/views/settings/privacy.view.dart
rename to lib/src/visual/views/settings/privacy.view.dart
index 3607b30a..2f6561f3 100644
--- a/lib/src/views/settings/privacy.view.dart
+++ b/lib/src/visual/views/settings/privacy.view.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
+import 'package:twonly/src/services/user.service.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/storage.dart';
 
 class PrivacyView extends StatefulWidget {
   const PrivacyView({super.key});
@@ -20,22 +20,20 @@ class _PrivacyViewState extends State<PrivacyView> {
 
   Future<void> toggleAuthRequirementOnStartup() async {
     final isAuth = await authenticateUser(
-      gUser.screenLockEnabled
+      userService.currentUser.screenLockEnabled
           ? context.lang.settingsScreenLockAuthMessageDisable
           : context.lang.settingsScreenLockAuthMessageEnable,
     );
     if (!isAuth) return;
-    await updateUserdata((u) {
+    await UserService.update((u) {
       u.screenLockEnabled = !u.screenLockEnabled;
-      return u;
     });
     setState(() {});
   }
 
   Future<void> toggleTypingIndicators() async {
-    await updateUserdata((u) {
+    await UserService.update((u) {
       u.typingIndicators = !u.typingIndicators;
-      return u;
     });
     setState(() {});
   }
@@ -73,13 +71,20 @@ class _PrivacyViewState extends State<PrivacyView> {
               setState(() {});
             },
           ),
+          ListTile(
+            title: Text(context.lang.userDiscoverySettingsTitle),
+            onTap: () async {
+              await context.push(Routes.settingsPrivacyUserDiscovery);
+              setState(() {});
+            },
+          ),
           const Divider(),
           ListTile(
             title: Text(context.lang.settingsTypingIndication),
             subtitle: Text(context.lang.settingsTypingIndicationSubtitle),
             onTap: toggleTypingIndicators,
             trailing: Switch(
-              value: gUser.typingIndicators,
+              value: userService.currentUser.typingIndicators,
               onChanged: (a) => toggleTypingIndicators(),
             ),
           ),
@@ -89,7 +94,7 @@ class _PrivacyViewState extends State<PrivacyView> {
             subtitle: Text(context.lang.settingsScreenLockSubtitle),
             onTap: toggleAuthRequirementOnStartup,
             trailing: Switch(
-              value: gUser.screenLockEnabled,
+              value: userService.currentUser.screenLockEnabled,
               onChanged: (a) => toggleAuthRequirementOnStartup(),
             ),
           ),
diff --git a/lib/src/views/settings/privacy_view_block.view.dart b/lib/src/visual/views/settings/privacy/block_users.view.dart
similarity index 88%
rename from lib/src/views/settings/privacy_view_block.view.dart
rename to lib/src/visual/views/settings/privacy/block_users.view.dart
index d9b835d2..3947133c 100644
--- a/lib/src/views/settings/privacy_view_block.view.dart
+++ b/lib/src/visual/views/settings/privacy/block_users.view.dart
@@ -1,20 +1,21 @@
 import 'package:drift/drift.dart' hide Column;
 import 'package:flutter/material.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/avatar_icon.component.dart';
-import 'package:twonly/src/views/components/user_context_menu.component.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
+import 'package:twonly/src/visual/context_menu/user.context_menu.dart';
+import 'package:twonly/src/visual/decorations/input_text.decoration.dart';
 
-class PrivacyViewBlockUsersView extends StatefulWidget {
-  const PrivacyViewBlockUsersView({super.key});
+class BlockUsersView extends StatefulWidget {
+  const BlockUsersView({super.key});
 
   @override
-  State<PrivacyViewBlockUsersView> createState() => _PrivacyViewBlockUsers();
+  State<BlockUsersView> createState() => _PrivacyViewBlockUsers();
 }
 
-class _PrivacyViewBlockUsers extends State<PrivacyViewBlockUsersView> {
+class _PrivacyViewBlockUsers extends State<BlockUsersView> {
   late Stream<List<Contact>> allUsers;
   List<Contact> filteredUsers = [];
   String filter = '';
diff --git a/lib/src/visual/views/settings/privacy/user_discovery.view.dart b/lib/src/visual/views/settings/privacy/user_discovery.view.dart
new file mode 100644
index 00000000..23a13f0b
--- /dev/null
+++ b/lib/src/visual/views/settings/privacy/user_discovery.view.dart
@@ -0,0 +1,32 @@
+import 'package:flutter/material.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/views/settings/privacy/user_discovery/components/user_discovery_disabled.comp.dart';
+import 'package:twonly/src/visual/views/settings/privacy/user_discovery/components/user_discovery_enabled.comp.dart';
+
+class UserDiscoverySettingsView extends StatefulWidget {
+  const UserDiscoverySettingsView({super.key});
+
+  @override
+  State<UserDiscoverySettingsView> createState() =>
+      _UserDiscoverySettingsViewState();
+}
+
+class _UserDiscoverySettingsViewState extends State<UserDiscoverySettingsView> {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(context.lang.userDiscoverySettingsTitle),
+      ),
+      body: StreamBuilder<void>(
+        stream: userService.onUserUpdated,
+        builder: (context, _) {
+          return userService.currentUser.isUserDiscoveryEnabled
+              ? const UserDiscoveryEnabledComp()
+              : const UserDiscoveryDisabledComp();
+        },
+      ),
+    );
+  }
+}
diff --git a/lib/src/visual/views/settings/privacy/user_discovery/components/user_discovery_disabled.comp.dart b/lib/src/visual/views/settings/privacy/user_discovery/components/user_discovery_disabled.comp.dart
new file mode 100644
index 00000000..ea261664
--- /dev/null
+++ b/lib/src/visual/views/settings/privacy/user_discovery/components/user_discovery_disabled.comp.dart
@@ -0,0 +1,77 @@
+import 'package:flutter/material.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/views/settings/privacy/user_discovery/components/user_discovery_setup.comp.dart';
+
+class UserDiscoveryDisabledComp extends StatefulWidget {
+  const UserDiscoveryDisabledComp({super.key});
+
+  @override
+  State<UserDiscoveryDisabledComp> createState() =>
+      _UserDiscoveryDisabledCompState();
+}
+
+class _UserDiscoveryDisabledCompState extends State<UserDiscoveryDisabledComp> {
+  late UserDiscoverySetupState state;
+
+  @override
+  void initState() {
+    super.initState();
+    state = UserDiscoverySetupState(setState: setState);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 40),
+      child: ListView(
+        children: [
+          const SizedBox(height: 60),
+          Container(
+            padding: const EdgeInsets.all(16),
+            decoration: BoxDecoration(
+              color: context.color.surfaceContainerHigh,
+              borderRadius: BorderRadius.circular(16),
+            ),
+            child: Row(
+              children: [
+                Icon(
+                  Icons.info_rounded,
+                  color: context.color.onSurfaceVariant,
+                ),
+                const SizedBox(width: 16),
+                Expanded(
+                  child: Text(
+                    context.lang.userDiscoverySettingsCurrentlyDisabled,
+                    style: TextStyle(
+                      color: context.color.onSurfaceVariant,
+                      fontWeight: FontWeight.w500,
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ),
+          const SizedBox(height: 60),
+          UserDiscoverySetupComp(state: state),
+          const SizedBox(height: 60),
+          ElevatedButton(
+            onPressed: () {
+              state.initializeOrUpdate();
+            },
+            style: ElevatedButton.styleFrom(
+              minimumSize: const Size(double.infinity, 56),
+              backgroundColor: context.color.primary,
+              foregroundColor: context.color.onPrimary,
+              elevation: 0,
+              shape: RoundedRectangleBorder(
+                borderRadius: BorderRadius.circular(16),
+              ),
+            ),
+            child: Text(context.lang.userDiscoverySettingsApply),
+          ),
+          const SizedBox(height: 60),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/src/visual/views/settings/privacy/user_discovery/components/user_discovery_enabled.comp.dart b/lib/src/visual/views/settings/privacy/user_discovery/components/user_discovery_enabled.comp.dart
new file mode 100644
index 00000000..e8e93092
--- /dev/null
+++ b/lib/src/visual/views/settings/privacy/user_discovery/components/user_discovery_enabled.comp.dart
@@ -0,0 +1,183 @@
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/database/daos/contacts.dao.dart';
+import 'package:twonly/src/database/twonly.db.dart';
+import 'package:twonly/src/model/protobuf/client/generated/user_discovery/types.pb.dart';
+import 'package:twonly/src/services/user_discovery.service.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/components/alert.dialog.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
+import 'package:twonly/src/visual/context_menu/user.context_menu.dart';
+import 'package:twonly/src/visual/themes/light.dart';
+import 'package:twonly/src/visual/views/settings/help/faq.view.dart';
+import 'package:twonly/src/visual/views/settings/privacy/user_discovery/user_discovery_settings.view.dart';
+
+class UserDiscoveryEnabledComp extends StatefulWidget {
+  const UserDiscoveryEnabledComp({super.key});
+
+  @override
+  State<UserDiscoveryEnabledComp> createState() =>
+      _UserDiscoveryEnabledCompState();
+}
+
+class _UserDiscoveryEnabledCompState extends State<UserDiscoveryEnabledComp> {
+  UserDiscoveryVersion? _version;
+
+  List<Contact> _contactsGettingAnnounced = [];
+  late StreamSubscription<List<Contact>> _contactsGettingAnnouncedStream;
+
+  @override
+  void initState() {
+    super.initState();
+    _contactsGettingAnnouncedStream = twonlyDB.contactsDao
+        .watchContactsAnnouncedViaUserDiscovery()
+        .listen((contacts) {
+          setState(() {
+            _contactsGettingAnnounced = contacts;
+          });
+        });
+    _initAsync();
+  }
+
+  @override
+  void dispose() {
+    _contactsGettingAnnouncedStream.cancel();
+    super.dispose();
+  }
+
+  Future<void> _initAsync() async {
+    final version = await UserDiscoveryService.getCurrentVersionTyped();
+    if (mounted) {
+      setState(() {
+        _version = version;
+      });
+    }
+  }
+
+  Future<void> _disableUserDiscovery() async {
+    final ok = await showAlertDialog(
+      context,
+      context.lang.userDiscoveryEnabledDialogTitle,
+      context.lang.userDiscoveryEnabledDisableWarning,
+    );
+
+    if (ok) {
+      await UserDiscoveryService.disable();
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.only(top: 10),
+      child: ListView(
+        children: [
+          ExpansionTile(
+            shape: const RoundedRectangleBorder(),
+            backgroundColor: context.color.surfaceContainer,
+            collapsedShape: const RoundedRectangleBorder(),
+            tilePadding: const EdgeInsets.symmetric(horizontal: 17),
+            title: Text(context.lang.userDiscoveryEnabledFriendsShared),
+            subtitle: Text(
+              context.lang.userDiscoveryEnabledFriendsSharedDesc,
+              style: const TextStyle(fontSize: 10),
+            ),
+            children: _contactsGettingAnnounced.isEmpty
+                ? [
+                    Padding(
+                      padding: const EdgeInsetsGeometry.symmetric(vertical: 12),
+                      child: Text(
+                        context.lang.userDiscoveryEnabledNoFriendsShared,
+                      ),
+                    ),
+                  ]
+                : _contactsGettingAnnounced.map((contact) {
+                    final version =
+                        UserDiscoveryService.getContactVersionTypedFromContact(
+                          contact,
+                        );
+
+                    return UserContextMenu(
+                      key: ValueKey(contact.userId),
+                      contact: contact,
+                      child: ListTile(
+                        dense: true,
+                        visualDensity: VisualDensity.compact,
+                        minVerticalPadding: 0,
+                        title: Text(getContactDisplayName(contact)),
+                        leading: AvatarIcon(
+                          contactId: contact.userId,
+                          fontSize: 17,
+                        ),
+                        subtitle:
+                            (version != null &&
+                                (userService.currentUser.isDeveloper ||
+                                    !kReleaseMode))
+                            ? Text(
+                                context.lang.userDiscoveryEnabledVersion(
+                                  '${version.announcement}.${version.promotion}',
+                                ),
+                                style: const TextStyle(fontSize: 10),
+                              )
+                            : null,
+                        trailing: SizedBox(
+                          height: 26,
+                          child: FilledButton(
+                            style: FilledButton.styleFrom(
+                              padding: const EdgeInsets.only(right: 8, left: 8),
+                            ).merge(secondaryGreyButtonStyle(context)),
+                            child: Text(
+                              context.lang.userDiscoveryEnabledStopSharing,
+                              style: const TextStyle(fontSize: 10),
+                            ),
+                            onPressed: () =>
+                                UserDiscoveryService.changeExclusionForContact(
+                                  contact.userId,
+                                  true,
+                                ),
+                          ),
+                        ),
+                      ),
+                    );
+                  }).toList(),
+          ),
+          ListTile(
+            title: Text(context.lang.userDiscoveryEnabledChangeSettings),
+            onTap: () async {
+              await context.navPush(const UserDiscoverySettingsView());
+              await _initAsync();
+            },
+          ),
+          const Divider(),
+          ListTile(
+            title: Text(context.lang.userDiscoveryDisabledLearnMore),
+            subtitle: Text(
+              context.lang.userDiscoveryEnabledFaq,
+            ),
+            onTap: () => context.navPush(
+              const FaqView(questionId: 'mutual-friends'),
+            ),
+          ),
+          const Divider(),
+          ListTile(
+            title: Text(context.lang.userDiscoveryActionDisable),
+            onTap: _disableUserDiscovery,
+          ),
+          if (_version != null &&
+              (userService.currentUser.isDeveloper || !kReleaseMode))
+            ListTile(
+              title: Text(
+                context.lang.userDiscoveryEnabledYourVersion(
+                  '${_version!.announcement}.${_version!.promotion}',
+                ),
+                style: const TextStyle(color: Colors.grey, fontSize: 13),
+              ),
+            ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/src/visual/views/settings/privacy/user_discovery/components/user_discovery_setup.comp.dart b/lib/src/visual/views/settings/privacy/user_discovery/components/user_discovery_setup.comp.dart
new file mode 100644
index 00000000..17c7f8c7
--- /dev/null
+++ b/lib/src/visual/views/settings/privacy/user_discovery/components/user_discovery_setup.comp.dart
@@ -0,0 +1,444 @@
+import 'package:flutter/material.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/services/user.service.dart';
+import 'package:twonly/src/services/user_discovery.service.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
+import 'package:twonly/src/visual/components/verification_badge.comp.dart';
+import 'package:twonly/src/visual/views/contact/add_new_contact_components/friend_suggestions.comp.dart';
+import 'package:twonly/src/visual/views/onboarding/setup/components/mock_contact_request_actions.comp.dart';
+import 'package:twonly/src/visual/views/onboarding/setup/components/setup_switch_card.comp.dart';
+
+const exampleUsers = [
+  'james',
+  'mary',
+  'john',
+  'patricia',
+  'robert',
+  'jennifer',
+  'michael',
+  'linda',
+  'william',
+  'lena',
+  'david',
+];
+
+class UserDiscoverySetupState {
+  UserDiscoverySetupState({
+    required this.setState,
+    this.isUserDiscoveryEnabled = true,
+    this.sharePromotion = true,
+    this.isManualApprovalEnabled = false,
+    this.threshold = 2,
+    this.requiredSendImages = 4,
+  });
+
+  bool wasChanged = false;
+
+  bool isUserDiscoveryEnabled;
+  int threshold;
+  bool sharePromotion;
+
+  bool isManualApprovalEnabled;
+  int requiredSendImages;
+
+  void Function(void Function()) setState;
+
+  void update(void Function() update) {
+    update();
+    setState(() {
+      wasChanged = true;
+    });
+  }
+
+  Future<bool> initializeOrUpdate() async {
+    if (isUserDiscoveryEnabled) {
+      await UserDiscoveryService.initializeOrUpdate(
+        threshold: threshold,
+        sharePromotion: sharePromotion,
+      );
+    }
+
+    await UserService.update((u) {
+      u
+        ..isUserDiscoveryEnabled = isUserDiscoveryEnabled
+        ..requiredSendImages = requiredSendImages
+        ..userDiscoveryRequiresManualApproval = isManualApprovalEnabled;
+    });
+
+    return true;
+  }
+}
+
+enum UserDiscoveryPages { all, shareYourFriends, letYourFriendsFindYou }
+
+class UserDiscoverySetupComp extends StatelessWidget {
+  const UserDiscoverySetupComp({
+    required this.state,
+    this.showOnlySpecificPage = UserDiscoveryPages.all,
+    super.key,
+  });
+
+  final UserDiscoverySetupState state;
+  final UserDiscoveryPages showOnlySpecificPage;
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          if (showOnlySpecificPage == UserDiscoveryPages.all ||
+              showOnlySpecificPage == UserDiscoveryPages.shareYourFriends) ...[
+            Text(
+              context.lang.onboardingUserDiscoveryShareFriends,
+              style: Theme.of(context).textTheme.headlineSmall,
+              textAlign: TextAlign.center,
+            ),
+            const SizedBox(height: 32),
+
+            RichText(
+              text: TextSpan(
+                children: formattedText(
+                  context,
+                  context.lang.onboardingUserDiscoveryShareFriendsDesc,
+                ),
+              ),
+              textAlign: TextAlign.center,
+            ),
+
+            const SizedBox(height: 32),
+
+            SetupSwitchCard(
+              value: state.isUserDiscoveryEnabled,
+              onChanged: (val) => state.update(() {
+                state.isUserDiscoveryEnabled = val;
+                if (!val) {
+                  state.sharePromotion = false;
+                }
+              }),
+              title: context.lang.onboardingUserDiscoveryShareFriends,
+              expandedChild: Column(
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                children: [
+                  SwitchListTile(
+                    value: state.isManualApprovalEnabled,
+                    onChanged: (val) => state.update(
+                      () => state.isManualApprovalEnabled = val,
+                    ),
+                    title: Text(
+                      context.lang.userDiscoverySettingsManualApproval,
+                      style: const TextStyle(fontSize: 13),
+                    ),
+                    subtitle: Text(
+                      context.lang.userDiscoverySettingsManualApprovalDesc,
+                      style: const TextStyle(fontSize: 10),
+                    ),
+                    tileColor: context.color.surfaceContainerLow,
+                    shape: RoundedRectangleBorder(
+                      borderRadius: BorderRadius.circular(12),
+                    ),
+                    contentPadding: const EdgeInsets.symmetric(
+                      horizontal: 16,
+                    ),
+                  ),
+                  const Padding(
+                    padding: EdgeInsets.symmetric(vertical: 8),
+                    child: Divider(),
+                  ),
+                  Text(
+                    context.lang.onboardingUserDiscoveryContactsVerifiedBadge,
+                    style: TextStyle(
+                      color: context.color.onSurfaceVariant,
+                      fontSize: 12,
+                    ),
+                    textAlign: TextAlign.center,
+                  ),
+                  const SizedBox(height: 16),
+                  Center(
+                    child: Container(
+                      width: 100,
+                      height: 40,
+                      decoration: BoxDecoration(
+                        border: Border.all(color: Colors.grey, width: 0.5),
+                        borderRadius: BorderRadius.circular(12),
+                      ),
+                      child: const Row(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [
+                          AvatarIcon(fontSize: 12),
+                          SizedBox(width: 5),
+                          Text(
+                            'jane',
+                            style: TextStyle(
+                              fontWeight: FontWeight.bold,
+                            ),
+                          ),
+                          SizedBox(width: 5),
+                          VerificationBadgeComp(
+                            isVerifiedByTransferredTrust: true,
+                            size: 14,
+                            clickable: false,
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                  const SizedBox(height: 24),
+                  Text(
+                    context.lang.onboardingUserDiscoveryWhoIsRequesting,
+                    style: TextStyle(
+                      color: context.color.onSurfaceVariant,
+                      fontSize: 12,
+                    ),
+                    textAlign: TextAlign.center,
+                  ),
+                  const SizedBox(height: 16),
+                  Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 24),
+                    child: Container(
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: 6,
+                        vertical: 3,
+                      ),
+                      decoration: BoxDecoration(
+                        border: Border.all(color: Colors.grey, width: 0.5),
+                        borderRadius: BorderRadius.circular(12),
+                      ),
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [
+                          const AvatarIcon(fontSize: 14),
+                          const SizedBox(width: 5),
+                          Expanded(
+                            child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                const Text(
+                                  'jane',
+                                  style: TextStyle(
+                                    fontWeight: FontWeight.bold,
+                                    fontSize: 13,
+                                  ),
+                                ),
+                                RichText(
+                                  text: TextSpan(
+                                    children: buildFriendsListTextString(
+                                      context,
+                                      [
+                                        'mary',
+                                        'james',
+                                      ],
+                                    ),
+                                    style: const TextStyle(fontSize: 10),
+                                  ),
+                                ),
+                              ],
+                            ),
+                          ),
+                          const MockContactRequestActionsComp(),
+                        ],
+                      ),
+                    ),
+                  ),
+                  const SizedBox(height: 16),
+                ],
+              ),
+            ),
+
+            if (showOnlySpecificPage == UserDiscoveryPages.all)
+              const SizedBox(height: 80),
+          ],
+
+          if (showOnlySpecificPage == UserDiscoveryPages.all ||
+              showOnlySpecificPage ==
+                  UserDiscoveryPages.letYourFriendsFindYou) ...[
+            Text(
+              context.lang.onboardingUserDiscoveryLetFriendsFindYou,
+              style: Theme.of(context).textTheme.headlineSmall,
+              textAlign: TextAlign.center,
+            ),
+            const SizedBox(height: 32),
+
+            RichText(
+              text: TextSpan(
+                children: formattedText(
+                  context,
+                  context.lang.userDiscoveryDisabledIntro,
+                ),
+              ),
+              textAlign: TextAlign.center,
+            ),
+
+            const SizedBox(height: 32),
+
+            SetupSwitchCard(
+              value: state.sharePromotion,
+              onChanged: (val) => state.update(() {
+                if (val) {
+                  state.isUserDiscoveryEnabled = true;
+                }
+                state.sharePromotion = val;
+              }),
+              title: context.lang.onboardingUserDiscoveryBeRecommended,
+              expandedChild: Padding(
+                padding: const EdgeInsets.all(12),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  children: [
+                    Row(
+                      children: [
+                        Expanded(
+                          child: Text(
+                            context.lang.userDiscoverySettingsMutualFriends,
+                            style: const TextStyle(fontSize: 12),
+                          ),
+                        ),
+                        const SizedBox(width: 12),
+                        DropdownButtonHideUnderline(
+                          child: DropdownButton<int>(
+                            value: state.threshold,
+                            items: List.generate(
+                              9,
+                              (index) {
+                                final value = index + 2;
+                                return DropdownMenuItem<int>(
+                                  value: value,
+                                  child: Text('$value'),
+                                );
+                              },
+                            ),
+                            onChanged: (newValue) {
+                              if (newValue != null) {
+                                state.update(() {
+                                  state.threshold = newValue;
+                                });
+                              }
+                            },
+                          ),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 16),
+                    Text(
+                      context.lang.onboardingUserDiscoveryWhatOthersSee,
+                      style: TextStyle(
+                        color: context.color.onSurfaceVariant,
+                        fontSize: 12,
+                      ),
+                      textAlign: TextAlign.center,
+                    ),
+                    const SizedBox(height: 16),
+                    Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 16),
+                      child: Container(
+                        padding: const EdgeInsets.symmetric(
+                          horizontal: 6,
+                          vertical: 3,
+                        ),
+                        decoration: BoxDecoration(
+                          border: Border.all(color: Colors.grey, width: 0.5),
+                          borderRadius: BorderRadius.circular(12),
+                        ),
+                        child: Row(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: [
+                            const AvatarIcon(fontSize: 14),
+                            const SizedBox(width: 5),
+                            Expanded(
+                              child: Column(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  Text(
+                                    userService.currentUser.username,
+                                    style: const TextStyle(
+                                      fontWeight: FontWeight.bold,
+                                    ),
+                                  ),
+                                  RichText(
+                                    text: TextSpan(
+                                      children: buildFriendsListTextString(
+                                        context,
+                                        exampleUsers.sublist(
+                                          0,
+                                          state.threshold,
+                                        ),
+                                      ),
+                                      style: const TextStyle(fontSize: 11),
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            ),
+                            const MockContactSuggestedActionsComp(),
+                          ],
+                        ),
+                      ),
+                    ),
+                    const SizedBox(height: 16),
+                    Text(
+                      context.lang.onboardingUserDiscoveryWhatYouSee,
+                      style: TextStyle(
+                        color: context.color.onSurfaceVariant,
+                        fontSize: 12,
+                      ),
+                      textAlign: TextAlign.center,
+                    ),
+                    const SizedBox(height: 16),
+                    Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 16),
+                      child: Container(
+                        padding: const EdgeInsets.symmetric(
+                          horizontal: 6,
+                          vertical: 3,
+                        ),
+                        decoration: BoxDecoration(
+                          border: Border.all(color: Colors.grey, width: 0.5),
+                          borderRadius: BorderRadius.circular(12),
+                        ),
+                        child: Row(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: [
+                            const AvatarIcon(fontSize: 14),
+                            const SizedBox(width: 5),
+                            Expanded(
+                              child: Column(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  const Text(
+                                    'jane',
+                                    style: TextStyle(
+                                      fontWeight: FontWeight.bold,
+                                      fontSize: 13,
+                                    ),
+                                  ),
+                                  RichText(
+                                    text: TextSpan(
+                                      children: buildFriendsListTextString(
+                                        context,
+                                        exampleUsers.sublist(
+                                          0,
+                                          state.threshold,
+                                        ),
+                                      ),
+                                      style: const TextStyle(fontSize: 10),
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            ),
+                            const MockContactRequestActionsComp(),
+                          ],
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ],
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/src/visual/views/settings/privacy/user_discovery/user_discovery_settings.view.dart b/lib/src/visual/views/settings/privacy/user_discovery/user_discovery_settings.view.dart
new file mode 100644
index 00000000..06b926ad
--- /dev/null
+++ b/lib/src/visual/views/settings/privacy/user_discovery/user_discovery_settings.view.dart
@@ -0,0 +1,116 @@
+import 'dart:async';
+import 'package:flutter/material.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/themes/light.dart';
+import 'package:twonly/src/visual/views/settings/privacy/user_discovery/components/user_discovery_setup.comp.dart';
+
+class UserDiscoverySettingsView extends StatefulWidget {
+  const UserDiscoverySettingsView({super.key});
+
+  @override
+  State<UserDiscoverySettingsView> createState() =>
+      _UserDiscoverySettingsViewState();
+}
+
+class _UserDiscoverySettingsViewState extends State<UserDiscoverySettingsView> {
+  late UserDiscoverySetupState state;
+
+  @override
+  void initState() {
+    super.initState();
+    final u = userService.currentUser;
+    state = UserDiscoverySetupState(
+      setState: setState,
+      requiredSendImages: u.requiredSendImages,
+      isUserDiscoveryEnabled: u.isUserDiscoveryEnabled,
+      sharePromotion: u.userDiscoverySharePromotion,
+      isManualApprovalEnabled: u.userDiscoveryRequiresManualApproval,
+      threshold: u.userDiscoveryThreshold,
+    );
+  }
+
+  Future<void> _saveChanges() async {
+    await state.initializeOrUpdate();
+    if (!mounted) return;
+    Navigator.pop(context, true);
+  }
+
+  Future<bool?> _showBackDialog() {
+    return showDialog<bool>(
+      context: context,
+      builder: (context) {
+        return AlertDialog(
+          title: Text(
+            context.lang.avatarSaveChanges,
+          ),
+          actions: [
+            FilledButton(
+              child: Text(context.lang.avatarSaveChangesStore),
+              onPressed: () async {
+                await _saveChanges();
+              },
+            ),
+            TextButton(
+              child: Text(context.lang.avatarSaveChangesDiscard),
+              onPressed: () {
+                Navigator.pop(context, true);
+              },
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return PopScope<bool?>(
+      canPop: false,
+      onPopInvokedWithResult: (didPop, result) async {
+        if (didPop) return;
+        if (state.wasChanged) {
+          // there where changes
+          final shouldPop = await _showBackDialog() ?? false;
+          if (context.mounted && shouldPop) {
+            Navigator.pop(context);
+          }
+        } else {
+          Navigator.pop(context);
+        }
+      },
+      child: Scaffold(
+        appBar: AppBar(
+          title: Text(context.lang.userDiscoverySettingsTitle),
+        ),
+        body: Padding(
+          padding: const EdgeInsets.only(top: 10, left: 24, right: 24),
+          child: ListView(
+            children: [
+              const SizedBox(height: 30),
+              UserDiscoverySetupComp(state: state),
+              const SizedBox(height: 30),
+              if (state.wasChanged)
+                Padding(
+                  padding: const EdgeInsets.all(17),
+                  child: FilledButton(
+                    onPressed: _saveChanges,
+                    style: primaryColorButtonStyle.merge(
+                      FilledButton.styleFrom(
+                        padding: const EdgeInsets.symmetric(
+                          horizontal: 32,
+                          vertical: 24,
+                        ),
+                      ),
+                    ),
+                    child: Text(context.lang.userDiscoverySettingsApply),
+                  ),
+                ),
+              const SizedBox(height: 30),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/src/views/settings/profile/modify_avatar.view.dart b/lib/src/visual/views/settings/profile/modify_avatar.view.dart
similarity index 95%
rename from lib/src/views/settings/profile/modify_avatar.view.dart
rename to lib/src/visual/views/settings/profile/modify_avatar.view.dart
index 4fb0f946..50bfdcaa 100644
--- a/lib/src/views/settings/profile/modify_avatar.view.dart
+++ b/lib/src/visual/views/settings/profile/modify_avatar.view.dart
@@ -1,10 +1,11 @@
 import 'dart:math';
+
 import 'package:avatar_maker/avatar_maker.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/services/user.service.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/storage.dart';
 
 class ModifyAvatarView extends StatefulWidget {
   const ModifyAvatarView({super.key});
@@ -23,13 +24,12 @@ class _ModifyAvatarViewState extends State<ModifyAvatarView> {
   }
 
   Future<void> updateUserAvatar(String json, String svg) async {
-    await updateUserdata((user) {
-      user
+    await UserService.update(
+      (u) => u
         ..avatarJson = json
         ..avatarSvg = svg
-        ..avatarCounter = user.avatarCounter + 1;
-      return user;
-    });
+        ..avatarCounter = u.avatarCounter + 1,
+    );
   }
 
   AvatarMakerThemeData getAvatarMakerTheme(BuildContext context) {
@@ -121,7 +121,8 @@ class _ModifyAvatarViewState extends State<ModifyAvatarView> {
       canPop: false,
       onPopInvokedWithResult: (didPop, result) async {
         if (didPop) return;
-        if (_avatarMakerController.getJsonOptionsSync() != gUser.avatarJson) {
+        if (_avatarMakerController.getJsonOptionsSync() !=
+            userService.currentUser.avatarJson) {
           // there where changes
           final shouldPop = await _showBackDialog() ?? false;
           if (context.mounted && shouldPop) {
diff --git a/lib/src/visual/views/settings/profile/profile.view.dart b/lib/src/visual/views/settings/profile/profile.view.dart
new file mode 100644
index 00000000..100a9811
--- /dev/null
+++ b/lib/src/visual/views/settings/profile/profile.view.dart
@@ -0,0 +1,256 @@
+import 'dart:async';
+
+import 'package:avatar_maker/avatar_maker.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:go_router/go_router.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/constants/routes.keys.dart';
+import 'package:twonly/src/model/protobuf/api/websocket/error.pb.dart';
+import 'package:twonly/src/services/backup/common.backup.dart';
+import 'package:twonly/src/services/backup/create.backup.dart';
+import 'package:twonly/src/services/user.service.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/elements/better_list_title.element.dart';
+import 'package:twonly/src/visual/views/groups/group.view.dart';
+
+class ProfileView extends StatefulWidget {
+  const ProfileView({super.key});
+
+  @override
+  State<ProfileView> createState() => _ProfileViewState();
+}
+
+class _ProfileViewState extends State<ProfileView> {
+  final AvatarMakerController _avatarMakerController =
+      PersistentAvatarMakerController(customizedPropertyCategories: []);
+
+  int twonlyScore = 0;
+  late StreamSubscription<int> twonlyScoreSub;
+
+  @override
+  void initState() {
+    super.initState();
+    twonlyScoreSub = twonlyDB.groupsDao.watchSumTotalMediaCounter().listen((
+      update,
+    ) {
+      setState(() {
+        twonlyScore = update;
+      });
+    });
+  }
+
+  @override
+  void dispose() {
+    twonlyScoreSub.cancel();
+    super.dispose();
+  }
+
+  Future<void> updateUserDisplayName(String displayName) async {
+    await UserService.update(
+      (u) => u
+        ..displayName = displayName
+        ..avatarCounter = u.avatarCounter + 1,
+    );
+  }
+
+  Future<void> _updateUsername(String username) async {
+    var filteredUsername = username.replaceAll(
+      RegExp('[^a-zA-Z0-9._]'),
+      '',
+    );
+
+    if (filteredUsername.length > 12) {
+      filteredUsername = filteredUsername.substring(0, 12);
+    }
+
+    final result = await apiService.changeUsername(filteredUsername);
+    if (result.isError) {
+      if (!mounted) return;
+
+      if (result.error == ErrorCode.UsernameAlreadyTaken ||
+          result.error == ErrorCode.UsernameNotValid) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text(
+              result.error == ErrorCode.UsernameAlreadyTaken
+                  ? context.lang.errorUsernameAlreadyTaken
+                  : context.lang.errorUsernameNotValid,
+            ),
+            duration: const Duration(seconds: 3),
+          ),
+        );
+        return;
+      }
+
+      showNetworkIssue(context);
+
+      return;
+    }
+
+    // as the username has changes, remove the old from the server and then upload it again.
+    await removeTwonlySafeFromServer();
+    unawaited(performTwonlySafeBackup(force: true));
+
+    await UserService.update(
+      (u) => u
+        ..username = username
+        ..avatarCounter = u.avatarCounter + 1,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(context.lang.settingsProfile),
+      ),
+      body: StreamBuilder<void>(
+        stream: userService.onUserUpdated,
+        builder: (context, _) {
+          return ListView(
+            physics: const BouncingScrollPhysics(),
+            children: <Widget>[
+              const SizedBox(height: 25),
+              AvatarMakerAvatar(
+                backgroundColor: Colors.transparent,
+                radius: 80,
+                controller: _avatarMakerController,
+              ),
+              const SizedBox(height: 10),
+              Center(
+                child: SizedBox(
+                  height: 35,
+                  child: ElevatedButton.icon(
+                    icon: const Icon(Icons.edit),
+                    label: Text(context.lang.settingsProfileCustomizeAvatar),
+                    onPressed: () async {
+                      await context.push(Routes.settingsProfileModifyAvatar);
+                      await _avatarMakerController.performRestore();
+                    },
+                  ),
+                ),
+              ),
+              const SizedBox(height: 20),
+              const Divider(),
+              BetterListTile(
+                leading: const Padding(
+                  padding: EdgeInsets.only(right: 5, left: 1),
+                  child: FaIcon(
+                    FontAwesomeIcons.qrcode,
+                    size: 20,
+                  ),
+                ),
+                onTap: () => context.push(Routes.settingsPublicProfile),
+                text: context.lang.profileYourQrCode,
+              ),
+              BetterListTile(
+                leading: const Padding(
+                  padding: EdgeInsets.only(right: 5, left: 1),
+                  child: FaIcon(
+                    FontAwesomeIcons.at,
+                    size: 20,
+                  ),
+                ),
+                text: context.lang.registerUsernameDecoration,
+                subtitle: Text(userService.currentUser.username),
+                onTap: () async {
+                  final username = await showDisplayNameChangeDialog(
+                    context,
+                    userService.currentUser.username,
+                    context.lang.registerUsernameDecoration,
+                    context.lang.registerUsernameDecoration,
+                    maxLength: 12,
+                    inputFormatters: [
+                      LengthLimitingTextInputFormatter(12),
+                      FilteringTextInputFormatter.allow(
+                        RegExp('[a-z0-9A-Z._]'),
+                      ),
+                    ],
+                  );
+                  if (context.mounted && username != null && username != '') {
+                    await _updateUsername(username);
+                  }
+                },
+              ),
+              BetterListTile(
+                icon: FontAwesomeIcons.userPen,
+                text: context.lang.settingsProfileEditDisplayName,
+                subtitle: Text(userService.currentUser.displayName),
+                onTap: () async {
+                  final displayName = await showDisplayNameChangeDialog(
+                    context,
+                    userService.currentUser.displayName,
+                    context.lang.settingsProfileEditDisplayName,
+                    context.lang.settingsProfileEditDisplayNameNew,
+                    maxLength: 30,
+                  );
+                  if (context.mounted &&
+                      displayName != null &&
+                      displayName != '') {
+                    await updateUserDisplayName(displayName);
+                  }
+                },
+              ),
+              BetterListTile(
+                text: context.lang.yourTwonlyScore,
+                icon: FontAwesomeIcons.trophy,
+                trailing: Text(
+                  twonlyScore.toString(),
+                  style: TextStyle(
+                    color: context.color.primary,
+                    fontSize: 18,
+                  ),
+                ),
+              ),
+            ],
+          );
+        },
+      ),
+    );
+  }
+}
+
+Future<String?> showDisplayNameChangeDialog(
+  BuildContext context,
+  String currentName,
+  String title,
+  String hintText, {
+  List<TextInputFormatter>? inputFormatters,
+  int? maxLength,
+}) {
+  final controller = TextEditingController(text: currentName);
+
+  return showDialog<String>(
+    context: context,
+    builder: (context) {
+      return AlertDialog(
+        title: Text(title),
+        content: TextField(
+          controller: controller,
+          autofocus: true,
+          inputFormatters: inputFormatters,
+          maxLength: maxLength,
+          decoration: InputDecoration(
+            hintText: hintText,
+          ),
+        ),
+        actions: <Widget>[
+          TextButton(
+            child: Text(context.lang.cancel),
+            onPressed: () {
+              Navigator.of(context).pop();
+            },
+          ),
+          TextButton(
+            child: Text(context.lang.ok),
+            onPressed: () {
+              Navigator.of(context).pop(controller.text);
+            },
+          ),
+        ],
+      );
+    },
+  );
+}
diff --git a/lib/src/visual/views/settings/settings_main.view.dart b/lib/src/visual/views/settings/settings_main.view.dart
new file mode 100644
index 00000000..4ea798e3
--- /dev/null
+++ b/lib/src/visual/views/settings/settings_main.view.dart
@@ -0,0 +1,142 @@
+import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:go_router/go_router.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/constants/routes.keys.dart';
+import 'package:twonly/src/database/daos/contacts.dao.dart';
+import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
+import 'package:twonly/src/visual/elements/better_list_title.element.dart';
+
+class SettingsMainView extends StatelessWidget {
+  const SettingsMainView({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(context.lang.settingsTitle),
+      ),
+      body: StreamBuilder(
+        stream: userService.onUserUpdated,
+        builder: (context, asyncSnapshot) {
+          return ListView(
+            children: [
+              Padding(
+                padding: const EdgeInsets.all(30),
+                child: Row(
+                  children: [
+                    Expanded(
+                      child: GestureDetector(
+                        onTap: () => context.push(Routes.settingsProfile),
+                        child: ColoredBox(
+                          color: context.color.surface.withAlpha(0),
+                          child: Row(
+                            children: [
+                              const AvatarIcon(
+                                myAvatar: true,
+                                fontSize: 30,
+                              ),
+                              Container(width: 20, color: Colors.transparent),
+                              Column(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  Text(
+                                    substringBy(
+                                      userService.currentUser.displayName,
+                                      27,
+                                    ),
+                                    style: const TextStyle(fontSize: 20),
+                                    textAlign: TextAlign.left,
+                                  ),
+                                  Text(
+                                    userService.currentUser.username,
+                                    style: const TextStyle(
+                                      fontSize: 14,
+                                    ),
+                                    textAlign: TextAlign.left,
+                                  ),
+                                ],
+                              ),
+                            ],
+                          ),
+                        ),
+                      ),
+                    ),
+                    Align(
+                      alignment: Alignment.centerRight,
+                      child: IconButton(
+                        onPressed: () =>
+                            context.push(Routes.settingsPublicProfile),
+                        icon: const FaIcon(FontAwesomeIcons.qrcode),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              BetterListTile(
+                icon: FontAwesomeIcons.user,
+                text: context.lang.settingsAccount,
+                onTap: () => context.push(Routes.settingsAccount),
+              ),
+              BetterListTile(
+                icon: FontAwesomeIcons.shieldHeart,
+                text: context.lang.settingsSubscription,
+                onTap: () => context.push(Routes.settingsSubscription),
+              ),
+              BetterListTile(
+                icon: Icons.lock_clock_rounded,
+                text: context.lang.settingsBackup,
+                onTap: () => context.push(Routes.settingsBackup),
+              ),
+              const Divider(),
+              BetterListTile(
+                icon: FontAwesomeIcons.sun,
+                text: context.lang.settingsAppearance,
+                onTap: () => context.push(Routes.settingsAppearance),
+              ),
+              BetterListTile(
+                icon: FontAwesomeIcons.comment,
+                text: context.lang.settingsChats,
+                onTap: () => context.push(Routes.settingsChats),
+              ),
+              BetterListTile(
+                icon: FontAwesomeIcons.lock,
+                text: context.lang.settingsPrivacy,
+                onTap: () => context.push(Routes.settingsPrivacy),
+              ),
+              BetterListTile(
+                icon: FontAwesomeIcons.bell,
+                text: context.lang.settingsNotification,
+                onTap: () => context.push(Routes.settingsNotification),
+              ),
+              BetterListTile(
+                icon: FontAwesomeIcons.chartPie,
+                iconSize: 15,
+                text: context.lang.settingsStorageData,
+                onTap: () => context.push(Routes.settingsStorage),
+              ),
+              const Divider(),
+              BetterListTile(
+                icon: FontAwesomeIcons.circleQuestion,
+                text: context.lang.settingsHelp,
+                onTap: () => context.push(Routes.settingsHelp),
+              ),
+              if (userService.currentUser.isDeveloper)
+                BetterListTile(
+                  icon: FontAwesomeIcons.code,
+                  text: 'Developer Settings',
+                  onTap: () => context.push(Routes.settingsDeveloper),
+                ),
+              BetterListTile(
+                icon: FontAwesomeIcons.shareFromSquare,
+                text: context.lang.inviteFriends,
+                onTap: () => context.push(Routes.settingsInvite),
+              ),
+            ],
+          );
+        },
+      ),
+    );
+  }
+}
diff --git a/lib/src/views/settings/share_with_friends.view.dart b/lib/src/visual/views/settings/share_with_friends.view.dart
similarity index 100%
rename from lib/src/views/settings/share_with_friends.view.dart
rename to lib/src/visual/views/settings/share_with_friends.view.dart
diff --git a/lib/src/views/settings/subscription/additional_users.view.dart b/lib/src/visual/views/settings/subscription/additional_users.view.dart
similarity index 95%
rename from lib/src/views/settings/subscription/additional_users.view.dart
rename to lib/src/visual/views/settings/subscription/additional_users.view.dart
index dd6c190e..14cd4353 100644
--- a/lib/src/views/settings/subscription/additional_users.view.dart
+++ b/lib/src/visual/views/settings/subscription/additional_users.view.dart
@@ -1,18 +1,18 @@
 import 'dart:async';
+
 import 'package:fixnum/fixnum.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/model/protobuf/api/websocket/error.pbserver.dart';
 import 'package:twonly/src/model/protobuf/api/websocket/server_to_client.pb.dart';
 import 'package:twonly/src/providers/purchases.provider.dart';
 import 'package:twonly/src/services/subscription.service.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/alert_dialog.dart';
-import 'package:twonly/src/views/settings/subscription/select_additional_users.view.dart';
-import 'package:twonly/src/views/settings/subscription_custom/subscription.view.dart';
+import 'package:twonly/src/visual/components/alert.dialog.dart';
+import 'package:twonly/src/visual/views/settings/subscription/select_additional_users.view.dart';
 
 class AdditionalUsersView extends StatefulWidget {
   const AdditionalUsersView({required this.ballance, super.key});
@@ -48,7 +48,7 @@ class _AdditionalUsersViewState extends State<AdditionalUsersView> {
 
   Future<void> initAsync({required bool force}) async {
     if (force) {
-      ballance = await loadPlanBalance();
+      ballance = await apiService.loadPlanBalance();
       _unusedAdditionalAccounts =
           _planLimit - (ballance?.additionalAccounts.length ?? _planLimit);
     }
diff --git a/lib/src/views/settings/subscription/select_additional_users.view.dart b/lib/src/visual/views/settings/subscription/select_additional_users.view.dart
similarity index 96%
rename from lib/src/views/settings/subscription/select_additional_users.view.dart
rename to lib/src/visual/views/settings/subscription/select_additional_users.view.dart
index bb85ef7a..21252dcd 100644
--- a/lib/src/views/settings/subscription/select_additional_users.view.dart
+++ b/lib/src/visual/views/settings/subscription/select_additional_users.view.dart
@@ -2,15 +2,17 @@
 
 import 'dart:async';
 import 'dart:collection';
+
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/avatar_icon.component.dart';
-import 'package:twonly/src/views/components/flame.dart';
-import 'package:twonly/src/views/components/user_context_menu.component.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
+import 'package:twonly/src/visual/components/flame_counter.comp.dart';
+import 'package:twonly/src/visual/context_menu/user.context_menu.dart';
+import 'package:twonly/src/visual/decorations/input_text.decoration.dart';
 
 class SelectAdditionalUsers extends StatefulWidget {
   const SelectAdditionalUsers({
diff --git a/lib/src/views/settings/subscription/subscription.view.dart b/lib/src/visual/views/settings/subscription/subscription.view.dart
similarity index 96%
rename from lib/src/views/settings/subscription/subscription.view.dart
rename to lib/src/visual/views/settings/subscription/subscription.view.dart
index 12839923..6d608643 100644
--- a/lib/src/views/settings/subscription/subscription.view.dart
+++ b/lib/src/visual/views/settings/subscription/subscription.view.dart
@@ -5,15 +5,15 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/model/protobuf/api/websocket/server_to_client.pb.dart';
-import 'package:twonly/src/model/purchases/purchasable_product.dart';
+import 'package:twonly/src/model/purchasable_product.model.dart';
 import 'package:twonly/src/providers/purchases.provider.dart';
 import 'package:twonly/src/services/subscription.service.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/better_list_title.dart';
-import 'package:twonly/src/views/settings/subscription/additional_users.view.dart';
+import 'package:twonly/src/visual/elements/better_list_title.element.dart';
+import 'package:twonly/src/visual/views/settings/subscription/additional_users.view.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class SubscriptionView extends StatefulWidget {
@@ -290,7 +290,7 @@ class _PlanCardState extends State<PlanCard> {
                     var url = 'https://apps.apple.com/account/subscriptions';
                     if (Platform.isAndroid) {
                       url =
-                          'https://play.google.com/store/account/subscriptions?sku=${gUser.subscriptionPlanIdStore}&package=eu.twonly';
+                          'https://play.google.com/store/account/subscriptions?sku=${userService.currentUser.subscriptionPlanIdStore}&package=eu.twonly';
                     }
                     await launchUrl(
                       Uri.parse(url),
diff --git a/lib/src/views/memories/memories_photo_slider.view.dart b/lib/src/visual/views/shared/memory_item_slider.view.dart
similarity index 93%
rename from lib/src/views/memories/memories_photo_slider.view.dart
rename to lib/src/visual/views/shared/memory_item_slider.view.dart
index a44dbecd..1a13c11f 100644
--- a/lib/src/views/memories/memories_photo_slider.view.dart
+++ b/lib/src/visual/views/shared/memory_item_slider.view.dart
@@ -2,17 +2,17 @@ import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:photo_view/photo_view.dart';
 import 'package:photo_view/photo_view_gallery.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
 import 'package:twonly/src/model/memory_item.model.dart';
-import 'package:twonly/src/services/api/mediafiles/upload.service.dart';
+import 'package:twonly/src/services/api/mediafiles/upload.api.dart';
 import 'package:twonly/src/utils/log.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/camera/camera_preview_components/save_to_gallery.dart';
-import 'package:twonly/src/views/camera/share_image_editor.view.dart';
-import 'package:twonly/src/views/components/alert_dialog.dart';
-import 'package:twonly/src/views/components/media_view_sizing.dart';
-import 'package:twonly/src/views/components/video_player_wrapper.dart';
+import 'package:twonly/src/visual/components/alert.dialog.dart';
+import 'package:twonly/src/visual/helpers/media_view_sizing.helper.dart';
+import 'package:twonly/src/visual/helpers/video_player_file.helper.dart';
+import 'package:twonly/src/visual/views/camera/camera_preview_components/save_to_gallery.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor.view.dart';
 
 class MemoriesPhotoSliderView extends StatefulWidget {
   MemoriesPhotoSliderView({
@@ -98,7 +98,7 @@ class _MemoriesPhotoSliderViewState extends State<MemoriesPhotoSliderView> {
 
     final newMediaService = await initializeMediaUpload(
       orgMediaService.mediaFile.type,
-      gUser.defaultShowTime,
+      userService.currentUser.defaultShowTime,
     );
     if (newMediaService == null) {
       Log.error('Could not create new mediaFIle');
@@ -144,7 +144,7 @@ class _MemoriesPhotoSliderViewState extends State<MemoriesPhotoSliderView> {
           child: Stack(
             alignment: Alignment.bottomRight,
             children: <Widget>[
-              MediaViewSizing(
+              MediaViewSizingHelper(
                 bottomNavigation: ColoredBox(
                   color: context.color.surface,
                   child: Row(
@@ -239,7 +239,7 @@ class _MemoriesPhotoSliderViewState extends State<MemoriesPhotoSliderView> {
 
     return item.mediaService.mediaFile.type == MediaType.video
         ? PhotoViewGalleryPageOptions.customChild(
-            child: VideoPlayerWrapper(
+            child: VideoPlayerFileHelper(
               videoPath: filePath,
             ),
             initialScale: PhotoViewComputedScale.contained,
diff --git a/lib/src/views/memories/memories_item_thumbnail.dart b/lib/src/visual/views/shared/memory_item_thumbnail.comp.dart
similarity index 88%
rename from lib/src/views/memories/memories_item_thumbnail.dart
rename to lib/src/visual/views/shared/memory_item_thumbnail.comp.dart
index c1486bfb..9b2638d1 100644
--- a/lib/src/views/memories/memories_item_thumbnail.dart
+++ b/lib/src/visual/views/shared/memory_item_thumbnail.comp.dart
@@ -3,8 +3,8 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
 import 'package:twonly/src/model/memory_item.model.dart';
 
-class MemoriesItemThumbnail extends StatefulWidget {
-  const MemoriesItemThumbnail({
+class MemoriesItemThumbnailComp extends StatefulWidget {
+  const MemoriesItemThumbnailComp({
     required this.galleryItem,
     required this.onTap,
     super.key,
@@ -14,14 +14,15 @@ class MemoriesItemThumbnail extends StatefulWidget {
   final GestureTapCallback onTap;
 
   @override
-  State<MemoriesItemThumbnail> createState() => _MemoriesItemThumbnailState();
+  State<MemoriesItemThumbnailComp> createState() =>
+      _MemoriesItemThumbnailCompState();
 }
 
-class _MemoriesItemThumbnailState extends State<MemoriesItemThumbnail> {
+class _MemoriesItemThumbnailCompState extends State<MemoriesItemThumbnailComp> {
   @override
   void initState() {
-    initAsync();
     super.initState();
+    initAsync();
   }
 
   Future<void> initAsync() async {
diff --git a/lib/src/views/shared/select_contacts.view.dart b/lib/src/visual/views/shared/select_contacts.view.dart
similarity index 95%
rename from lib/src/views/shared/select_contacts.view.dart
rename to lib/src/visual/views/shared/select_contacts.view.dart
index 22fc4a96..53684c33 100644
--- a/lib/src/views/shared/select_contacts.view.dart
+++ b/lib/src/visual/views/shared/select_contacts.view.dart
@@ -2,18 +2,20 @@
 
 import 'dart:async';
 import 'dart:collection';
+
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/components/avatar_icon.component.dart';
-import 'package:twonly/src/views/components/flame.dart';
-import 'package:twonly/src/views/components/user_context_menu.component.dart';
+import 'package:twonly/src/visual/components/avatar_icon.comp.dart';
+import 'package:twonly/src/visual/components/flame_counter.comp.dart';
+import 'package:twonly/src/visual/context_menu/user.context_menu.dart';
+import 'package:twonly/src/visual/decorations/input_text.decoration.dart';
 
-class SelectedContactViewText {
-  const SelectedContactViewText({
+class SelectedContactView {
+  const SelectedContactView({
     required this.title,
     required this.submitButton,
     required this.submitIcon,
@@ -30,7 +32,7 @@ class SelectContactsView extends StatefulWidget {
     this.limit,
     super.key,
   });
-  final SelectedContactViewText text;
+  final SelectedContactView text;
   final List<int>? alreadySelected;
   final int? limit;
   @override
diff --git a/lib/src/views/unlock_twonly.view.dart b/lib/src/visual/views/unlock_twonly.view.dart
similarity index 100%
rename from lib/src/views/unlock_twonly.view.dart
rename to lib/src/visual/views/unlock_twonly.view.dart
diff --git a/lib/src/views/user_study/user_study_questionnaire.view.dart b/lib/src/visual/views/user_study/user_study_questionnaire.view.dart
similarity index 97%
rename from lib/src/views/user_study/user_study_questionnaire.view.dart
rename to lib/src/visual/views/user_study/user_study_questionnaire.view.dart
index 96cbc9dd..180c58ab 100644
--- a/lib/src/views/user_study/user_study_questionnaire.view.dart
+++ b/lib/src/visual/views/user_study/user_study_questionnaire.view.dart
@@ -3,10 +3,10 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
+import 'package:twonly/src/services/user.service.dart';
+import 'package:twonly/src/services/user_study.service.dart';
 import 'package:twonly/src/utils/keyvalue.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/utils/storage.dart';
-import 'package:twonly/src/views/user_study/user_study_data_collection.dart';
 
 class UserStudyQuestionnaireView extends StatefulWidget {
   const UserStudyQuestionnaireView({super.key});
@@ -50,12 +50,11 @@ class _UserStudyQuestionnaireViewState
   Future<void> _submitData() async {
     await KeyValueStore.put(userStudySurveyKey, _responses);
 
-    await updateUserdata((u) {
+    await UserService.update((u) {
       // generate a random participants id to identify data send later while keeping the user anonym
       u
         ..userStudyParticipantsToken = getRandomString(25)
         ..askedForUserStudyPermission = true;
-      return u;
     });
 
     await handleUserStudyUpload();
diff --git a/lib/src/views/user_study/user_study_welcome.view.dart b/lib/src/visual/views/user_study/user_study_welcome.view.dart
similarity index 95%
rename from lib/src/views/user_study/user_study_welcome.view.dart
rename to lib/src/visual/views/user_study/user_study_welcome.view.dart
index 4598d013..a1a5ce2b 100644
--- a/lib/src/views/user_study/user_study_welcome.view.dart
+++ b/lib/src/visual/views/user_study/user_study_welcome.view.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
-import 'package:twonly/src/utils/storage.dart';
+import 'package:twonly/src/services/user.service.dart';
 
 class UserStudyWelcomeView extends StatefulWidget {
   const UserStudyWelcomeView({super.key, this.wasOpenedAutomatic = false});
@@ -86,10 +86,9 @@ class _UserStudyWelcomeViewState extends State<UserStudyWelcomeView> {
               Center(
                 child: GestureDetector(
                   onTap: () async {
-                    await updateUserdata((u) {
-                      u.askedForUserStudyPermission = true;
-                      return u;
-                    });
+                    await UserService.update(
+                      (u) => u.askedForUserStudyPermission = true,
+                    );
                     if (context.mounted) context.pop();
                   },
                   child: const Text(
diff --git a/pubspec.lock b/pubspec.lock
index 522e1cc5..fb45dac6 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -128,6 +128,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.5"
+  build_cli_annotations:
+    dependency: transitive
+    description:
+      name: build_cli_annotations
+      sha256: e563c2e01de8974566a1998410d3f6f03521788160a02503b0b1f1a46c7b3d95
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
   build_config:
     dependency: transitive
     description:
@@ -404,26 +412,26 @@ packages:
     dependency: "direct main"
     description:
       name: drift
-      sha256: "970cd188fddb111b26ea6a9b07a62bf5c2432d74147b8122c67044ae3b97e99e"
+      sha256: "055c249d1f91be5a47fe447f88afc24c4ca6f4cd6c5ed66767b4797d48acc2e5"
       url: "https://pub.dev"
     source: hosted
-    version: "2.31.0"
+    version: "2.32.1"
   drift_dev:
     dependency: "direct dev"
     description:
       name: drift_dev
-      sha256: "917184b2fb867b70a548a83bf0d36268423b38d39968c06cce4905683da49587"
+      sha256: "88a9de3af8571518148a6d8a513b57779fd1e60a026d3ab8a481a878fba01d91"
       url: "https://pub.dev"
     source: hosted
-    version: "2.31.0"
+    version: "2.32.1"
   drift_flutter:
     dependency: "direct main"
     description:
       name: drift_flutter
-      sha256: c07120854742a0cae2f7501a0da02493addde550db6641d284983c08762e60a7
+      sha256: "887fdec622174dc7eaefd0048403e34ee07cc18626ac8a7544cc3b8a4a172166"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.8"
+    version: "0.3.0"
   ed25519_edwards:
     dependency: "direct overridden"
     description:
@@ -606,6 +614,11 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.4.1"
+  flutter_driver:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   flutter_image_compress:
     dependency: "direct main"
     description:
@@ -747,6 +760,13 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_markdown_plus:
+    dependency: "direct main"
+    description:
+      path: "dependencies/flutter_markdown_plus"
+      relative: true
+    source: path
+    version: "1.0.7"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -755,6 +775,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.34"
+  flutter_rust_bridge:
+    dependency: "direct main"
+    description:
+      name: flutter_rust_bridge
+      sha256: e87d6b9ee934dcd24a128ccb2bd91905d2d5fe5c06245d6a8f5477d4907a437a
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.12.0"
   flutter_secure_storage:
     dependency: "direct main"
     description:
@@ -844,6 +872,11 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "10.12.0"
+  fuchsia_remote_debug_protocol:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   gal:
     dependency: "direct main"
     description:
@@ -860,6 +893,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.7.3"
+  get_it:
+    dependency: "direct main"
+    description:
+      name: get_it
+      sha256: "568d62f0e68666fb5d95519743b3c24a34c7f19d834b0658c46e26d778461f66"
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.2.1"
   glob:
     dependency: transitive
     description:
@@ -1081,6 +1122,11 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.4.8+1"
+  integration_test:
+    dependency: "direct dev"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   intl:
     dependency: "direct main"
     description:
@@ -1158,7 +1204,7 @@ packages:
       path: "dependencies/libsignal_protocol_dart"
       relative: true
     source: path
-    version: "0.7.4"
+    version: "0.8.0"
   lints:
     dependency: transitive
     description:
@@ -1222,14 +1268,22 @@ packages:
       relative: true
     source: path
     version: "3.3.2"
+  markdown:
+    dependency: transitive
+    description:
+      name: markdown
+      sha256: ee85086ad7698b42522c6ad42fe195f1b9898e4d974a1af4576c1a3a176cada9
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.3.1"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6"
+      sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.18"
+    version: "0.12.19"
   material_color_utilities:
     dependency: transitive
     description:
@@ -1285,13 +1339,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.5.0"
-  no_screenshot:
-    dependency: "direct main"
-    description:
-      path: "dependencies/no_screenshot"
-      relative: true
-    source: path
-    version: "1.0.0"
   objective_c:
     dependency: transitive
     description:
@@ -1513,14 +1560,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.14.2"
+  process:
+    dependency: transitive
+    description:
+      name: process
+      sha256: c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.0.5"
   protobuf:
     dependency: "direct main"
     description:
       name: protobuf
-      sha256: de9c9eb2c33f8e933a42932fe1dc504800ca45ebc3d673e6ed7f39754ee4053e
+      sha256: "75ec242d22e950bdcc79ee38dd520ce4ee0bc491d7fadc4ea47694604d22bf06"
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.0"
+    version: "6.0.0"
   provider:
     dependency: "direct main"
     description:
@@ -1574,6 +1629,13 @@ packages:
       relative: true
     source: path
     version: "1.7.3"
+  rust_lib_twonly:
+    dependency: "direct main"
+    description:
+      path: rust_builder
+      relative: true
+    source: path
+    version: "0.0.1"
   rxdart:
     dependency: transitive
     description:
@@ -1582,6 +1644,13 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.28.0"
+  screen_protector:
+    dependency: "direct main"
+    description:
+      path: "dependencies/screen_protector"
+      relative: true
+    source: path
+    version: "1.5.1"
   scrollable_positioned_list:
     dependency: "direct main"
     description:
@@ -1763,30 +1832,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.4.0"
+  sqlcipher_flutter_libs:
+    dependency: transitive
+    description:
+      name: sqlcipher_flutter_libs
+      sha256: "38d62d659d2fb8739bf25a42c9a350d1fdd6c29a5a61f13a946778ec75d27929"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.0+eol"
   sqlite3:
     dependency: transitive
     description:
       name: sqlite3
-      sha256: "3145bd74dcdb4fd6f5c6dda4d4e4490a8087d7f286a14dee5d37087290f0f8a2"
+      sha256: "56da3e13ed7d28a66f930aa2b2b29db6736a233f08283326e96321dd812030f5"
       url: "https://pub.dev"
     source: hosted
-    version: "2.9.4"
+    version: "3.3.1"
   sqlite3_flutter_libs:
     dependency: transitive
     description:
       name: sqlite3_flutter_libs
-      sha256: eeb9e3a45207649076b808f8a5a74d68770d0b7f26ccef6d5f43106eee5375ad
+      sha256: "3ed7553eee7bb368f8950f58ba29f634e06e813c029aff6a0d60862b96de8454"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.42"
+    version: "0.6.0+eol"
   sqlparser:
     dependency: transitive
     description:
       name: sqlparser
-      sha256: "337e9997f7141ffdd054259128553c348635fa318f7ca492f07a4ab76f850d19"
+      sha256: ab2b467425f1d4f3acfa5fd11a08226f7d6c26ff102c06be1807e1dff34e050b
       url: "https://pub.dev"
     source: hosted
-    version: "0.43.1"
+    version: "0.44.3"
   stack_trace:
     dependency: transitive
     description:
@@ -1819,6 +1896,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.1"
+  sync_http:
+    dependency: transitive
+    description:
+      name: sync_http
+      sha256: "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.1"
   synchronized:
     dependency: transitive
     description:
@@ -1839,10 +1924,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636"
+      sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.9"
+    version: "0.7.10"
   timezone:
     dependency: transitive
     description:
@@ -2051,6 +2136,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.3"
+  webdriver:
+    dependency: transitive
+    description:
+      name: webdriver
+      sha256: "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.0"
   win32:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index ccba3d24..7b75d1a6 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: "twonly, a privacy-friendly way to connect with friends through sec
 
 publish_to: 'none'
 
-version: 0.1.8+108
+version: 0.2.2+111
 
 environment:
   sdk: ^3.11.0
@@ -56,14 +56,15 @@ dependencies:
   firebase_messaging: ^16.1.0  # firebase.google.com
   firebase_app_installations: ^0.4.1 # firebase.google.com
   json_annotation: ^4.9.0 # google.dev
-  protobuf: ^4.0.0 # google.dev
+  protobuf: ^6.0.0 # google.dev
   scrollable_positioned_list: ^0.3.8 # google.dev
+  drift: ^2.32.0
+  drift_flutter: ^0.3.0
+  get_it: ^9.2.1
 
 
   # Flutter Favorite 
   provider: ^6.1.2
-  drift: ^2.25.1
-  drift_flutter: ^0.2.4
   flutter_local_notifications: ^19.1.0
   sentry_flutter: ^9.14.0
 
@@ -83,7 +84,8 @@ dependencies:
   qr_flutter: ^4.1.0
   hand_signature: ^3.0.3
   flutter_sharing_intent: ^2.0.4
-  no_screenshot: ^0.3.1
+  screen_protector: ^1.5.1
+  flutter_markdown_plus: ^1.0.7
 
   # With high download. (But should be checked nonetheless.)
   app_links: ^7.0.0 # 1.6 mio
@@ -108,6 +110,10 @@ dependencies:
   google_mlkit_barcode_scanning: ^0.14.1
   google_mlkit_face_detection: ^0.13.1
   pro_video_editor: ^1.6.1
+  rust_lib_twonly:
+    path: rust_builder
+  flutter_rust_bridge: 2.12.0
+
 
 dependency_overrides:
   dots_indicator:
@@ -146,8 +152,10 @@ dependency_overrides:
     path: ./dependencies/x25519
   qr_flutter:
     path: ./dependencies/qr_flutter
-  no_screenshot:
-    path: ./dependencies/no_screenshot
+  screen_protector:
+    path: ./dependencies/screen_protector
+  flutter_markdown_plus:
+    path: ./dependencies/flutter_markdown_plus
   camera_android_camerax: 
     # path: ../flutter-packages/packages/camera/camera_android_camerax
     git:
@@ -174,6 +182,8 @@ dev_dependencies:
   json_serializable: ^6.8.0
   very_good_analysis: ^10.0.0
   in_app_purchase_platform_interface: ^1.4.0
+  integration_test:
+    sdk: flutter
 
 flutter_launcher_icons:
   android: true
diff --git a/rust/.gitignore b/rust/.gitignore
new file mode 100644
index 00000000..dfb400ce
--- /dev/null
+++ b/rust/.gitignore
@@ -0,0 +1,3 @@
+/target
+
+tests/tmp_testing.db*
\ No newline at end of file
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
new file mode 100644
index 00000000..0fccb096
--- /dev/null
+++ b/rust/Cargo.lock
@@ -0,0 +1,2920 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "addr2line"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "allo-isolate"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "449e356a4864c017286dbbec0e12767ea07efba29e3b7d984194c2a7ff3c4550"
+dependencies = [
+ "anyhow",
+ "atomic",
+ "backtrace",
+]
+
+[[package]]
+name = "allocator-api2"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+
+[[package]]
+name = "android_log-sys"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84521a3cf562bc62942e294181d9eef17eb38ceb8c68677bc49f144e4c3d4f8d"
+
+[[package]]
+name = "android_logger"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbb4e440d04be07da1f1bf44fb4495ebd58669372fe0cffa6e48595ac5bd88a3"
+dependencies = [
+ "android_log-sys",
+ "env_filter",
+ "log",
+]
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.102"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
+
+[[package]]
+name = "atoi"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "atomic"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba"
+
+[[package]]
+name = "autocfg"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+
+[[package]]
+name = "backtrace"
+version = "0.3.76"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6"
+dependencies = [
+ "addr2line",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+ "windows-link",
+]
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "base64ct"
+version = "1.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
+
+[[package]]
+name = "bitflags"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "blahaj"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5106bf2680d585dc5f29711b8aa5dde353180b8e14af89b7f0424f760c84e7ce"
+dependencies = [
+ "hashbrown 0.15.5",
+ "rand 0.8.6",
+ "zeroize",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdd35008169921d80bc60d3d0ab416eecb028c4cd653352907921d95084790be"
+dependencies = [
+ "hybrid-array",
+]
+
+[[package]]
+name = "build-target"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "832133bbabbbaa9fbdba793456a2827627a7d2b8fb96032fa1e7666d7895832b"
+
+[[package]]
+name = "bumpalo"
+version = "3.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
+
+[[package]]
+name = "bytemuck"
+version = "1.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
+
+[[package]]
+name = "cc"
+version = "1.2.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20"
+dependencies = [
+ "find-msvc-tools",
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "chacha20"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.3.0",
+ "rand_core 0.10.1",
+]
+
+[[package]]
+name = "chrono"
+version = "0.4.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0"
+dependencies = [
+ "iana-time-zone",
+ "num-traits",
+ "windows-link",
+]
+
+[[package]]
+name = "cmov"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f88a43d011fc4a6876cb7344703e297c71dda42494fee094d5f7c76bf13f746"
+
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "console_error_panic_hook"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "const-oid"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+
+[[package]]
+name = "const-oid"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c"
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d"
+dependencies = [
+ "crc-catalog",
+]
+
+[[package]]
+name = "crc-catalog"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77727bb15fa921304124b128af125e7e3b968275d1b108b379190264f4423710"
+dependencies = [
+ "hybrid-array",
+]
+
+[[package]]
+name = "ctutils"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e"
+dependencies = [
+ "cmov",
+]
+
+[[package]]
+name = "dart-sys"
+version = "4.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57967e4b200d767d091b961d6ab42cc7d0cc14fe9e052e75d0d3cf9eb732d895"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "dashmap"
+version = "5.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
+dependencies = [
+ "cfg-if",
+ "hashbrown 0.14.5",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "delegate-attr"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51aac4c99b2e6775164b412ea33ae8441b2fde2dbf05a20bc0052a63d08c475b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "der"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
+dependencies = [
+ "const-oid 0.9.6",
+ "pem-rfc7468",
+ "zeroize",
+]
+
+[[package]]
+name = "deranged"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
+dependencies = [
+ "powerfmt",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer 0.10.4",
+ "const-oid 0.9.6",
+ "crypto-common 0.1.7",
+ "subtle",
+]
+
+[[package]]
+name = "digest"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4850db49bf08e663084f7fb5c87d202ef91a3907271aff24a94eb97ff039153c"
+dependencies = [
+ "block-buffer 0.12.0",
+ "const-oid 0.10.2",
+ "crypto-common 0.2.1",
+ "ctutils",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "dotenvy"
+version = "0.15.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
+
+[[package]]
+name = "either"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "env_filter"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2"
+dependencies = [
+ "log",
+ "regex",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
+dependencies = [
+ "humantime",
+ "is-terminal",
+ "log",
+ "regex",
+ "termcolor",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "errno"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+dependencies = [
+ "libc",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "etcetera"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26c7b13d0780cb82722fd59f6f57f925e143427e4a75313a6c77243bf5326ae6"
+dependencies = [
+ "cfg-if",
+ "home",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "event-listener"
+version = "5.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
+
+[[package]]
+name = "fixedbitset"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
+
+[[package]]
+name = "flume"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+ "spin",
+]
+
+[[package]]
+name = "flutter_rust_bridge"
+version = "2.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0884853aae8a6517b5b58cf36f55da487f2fe110e1686938eb29b6640aae4a5"
+dependencies = [
+ "allo-isolate",
+ "android_logger",
+ "anyhow",
+ "build-target",
+ "bytemuck",
+ "byteorder",
+ "console_error_panic_hook",
+ "dart-sys",
+ "delegate-attr",
+ "flutter_rust_bridge_macros",
+ "futures",
+ "js-sys",
+ "lazy_static",
+ "log",
+ "oslog",
+ "portable-atomic",
+ "threadpool",
+ "tokio",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "flutter_rust_bridge_macros"
+version = "2.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b5ce32f35f710ced8c5aa557f023f1a624e737b5460cee2b70fcd3a8df09e1b"
+dependencies = [
+ "hex",
+ "md-5",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
+[[package]]
+name = "foldhash"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "futures"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-intrusive"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f"
+dependencies = [
+ "futures-core",
+ "lock_api",
+ "parking_lot",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
+
+[[package]]
+name = "futures-task"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
+
+[[package]]
+name = "futures-util"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "rand_core 0.10.1",
+ "wasip2",
+ "wasip3",
+]
+
+[[package]]
+name = "gimli"
+version = "0.32.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
+[[package]]
+name = "hashbrown"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash 0.1.5",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash 0.2.0",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"
+
+[[package]]
+name = "hashlink"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
+dependencies = [
+ "hashbrown 0.15.5",
+]
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hkdf"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
+dependencies = [
+ "hmac 0.12.1",
+]
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "hmac"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6303bc9732ae41b04cb554b844a762b4115a61bfaa81e3e83050991eeb56863f"
+dependencies = [
+ "digest 0.11.2",
+]
+
+[[package]]
+name = "home"
+version = "0.5.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "humantime"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424"
+
+[[package]]
+name = "hybrid-array"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3944cf8cf766b40e2a1a333ee5e9b563f854d5fa49d6a8ca2764e97c6eddb214"
+dependencies = [
+ "typenum",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "log",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "icu_collections"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c"
+dependencies = [
+ "displaydoc",
+ "potential_utf",
+ "utf8_iter",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locale_core"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4"
+dependencies = [
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38"
+
+[[package]]
+name = "icu_properties"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de"
+dependencies = [
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14"
+
+[[package]]
+name = "icu_provider"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421"
+dependencies = [
+ "displaydoc",
+ "icu_locale_core",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "id-arena"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
+
+[[package]]
+name = "idna"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.17.0",
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "is-terminal"
+version = "0.4.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
+
+[[package]]
+name = "js-sys"
+version = "0.3.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2964e92d1d9dc3364cae4d718d93f227e3abb088e747d92e0395bfdedf1c12ca"
+dependencies = [
+ "cfg-if",
+ "futures-util",
+ "once_cell",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+dependencies = [
+ "spin",
+]
+
+[[package]]
+name = "leb128fmt"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
+
+[[package]]
+name = "libc"
+version = "0.2.185"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f"
+
+[[package]]
+name = "libm"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
+
+[[package]]
+name = "libredox"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c"
+dependencies = [
+ "bitflags",
+ "libc",
+ "plain",
+ "redox_syscall 0.7.4",
+]
+
+[[package]]
+name = "libsqlite3-sys"
+version = "0.30.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149"
+dependencies = [
+ "cc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
+
+[[package]]
+name = "litemap"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"
+
+[[package]]
+name = "lock_api"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+dependencies = [
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
+
+[[package]]
+name = "matchers"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
+dependencies = [
+ "regex-automata",
+]
+
+[[package]]
+name = "md-5"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
+dependencies = [
+ "cfg-if",
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "memchr"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+]
+
+[[package]]
+name = "mio"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "multimap"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.50.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "num-bigint-dig"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7"
+dependencies = [
+ "lazy_static",
+ "libm",
+ "num-integer",
+ "num-iter",
+ "num-traits",
+ "rand 0.8.6",
+ "smallvec",
+ "zeroize",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967"
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+ "libm",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "object"
+version = "0.37.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
+
+[[package]]
+name = "oslog"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80d2043d1f61d77cb2f4b1f7b7b2295f40507f5f8e9d1c8bf10a1ca5f97a3969"
+dependencies = [
+ "cc",
+ "dashmap",
+ "log",
+]
+
+[[package]]
+name = "parking"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.5.18",
+ "smallvec",
+ "windows-link",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
+[[package]]
+name = "pem-rfc7468"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
+dependencies = [
+ "base64ct",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+
+[[package]]
+name = "petgraph"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455"
+dependencies = [
+ "fixedbitset",
+ "hashbrown 0.15.5",
+ "indexmap",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
+
+[[package]]
+name = "pkcs1"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
+dependencies = [
+ "der",
+ "pkcs8",
+ "spki",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der",
+ "spki",
+]
+
+[[package]]
+name = "pkg-config"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
+
+[[package]]
+name = "plain"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
+
+[[package]]
+name = "portable-atomic"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
+
+[[package]]
+name = "potential_utf"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564"
+dependencies = [
+ "zerovec",
+]
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "pretty_env_logger"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c"
+dependencies = [
+ "env_logger",
+ "log",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "prost"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2ea70524a2f82d518bce41317d0fae74151505651af45faf1ffbd6fd33f0568"
+dependencies = [
+ "bytes",
+ "prost-derive",
+]
+
+[[package]]
+name = "prost-build"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "343d3bd7056eda839b03204e68deff7d1b13aba7af2b2fd16890697274262ee7"
+dependencies = [
+ "heck",
+ "itertools",
+ "log",
+ "multimap",
+ "petgraph",
+ "prettyplease",
+ "prost",
+ "prost-types",
+ "regex",
+ "syn",
+ "tempfile",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b"
+dependencies = [
+ "anyhow",
+ "itertools",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8991c4cbdb8bc5b11f0b074ffe286c30e523de90fee5ba8132f1399f23cb3dd7"
+dependencies = [
+ "prost",
+]
+
+[[package]]
+name = "protocols"
+version = "0.1.0"
+dependencies = [
+ "base64",
+ "blahaj",
+ "hmac 0.13.0",
+ "prost",
+ "prost-build",
+ "rand 0.10.1",
+ "serde",
+ "serde_json",
+ "sha2 0.11.0",
+ "sqlx",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-efi"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
+
+[[package]]
+name = "rand"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
+dependencies = [
+ "chacha20",
+ "getrandom 0.4.2",
+ "rand_core 0.10.1",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.17",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f450ad9c3b1da563fb6948a8e0fb0fb9269711c9c73d9ea1de5058c79c8d643a"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "regex"
+version = "1.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
+
+[[package]]
+name = "rsa"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d"
+dependencies = [
+ "const-oid 0.9.6",
+ "digest 0.10.7",
+ "num-bigint-dig",
+ "num-integer",
+ "num-traits",
+ "pkcs1",
+ "pkcs8",
+ "rand_core 0.6.4",
+ "signature",
+ "spki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rust_lib_twonly"
+version = "0.1.0"
+dependencies = [
+ "flutter_rust_bridge",
+ "paste",
+ "pretty_env_logger",
+ "prost-build",
+ "protocols",
+ "rand 0.10.1",
+ "sqlx",
+ "tempfile",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "tracing-appender",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b50b8869d9fc858ce7266cce0194bd74df58b9d0e3f6df3a9fc8eb470d95c09d"
+
+[[package]]
+name = "rustix"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "ryu"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "semver"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
+
+[[package]]
+name = "serde"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.149"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
+dependencies = [
+ "itoa",
+ "memchr",
+ "serde",
+ "serde_core",
+ "zmij",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.2.17",
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.2.17",
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "sha2"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.3.0",
+ "digest 0.11.2",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b"
+dependencies = [
+ "errno",
+ "libc",
+]
+
+[[package]]
+name = "signature"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+dependencies = [
+ "digest 0.10.7",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "socket2"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
+dependencies = [
+ "libc",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
+
+[[package]]
+name = "spki"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
+[[package]]
+name = "sqlx"
+version = "0.9.0-alpha.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "decccfa5f2f3eac95eb68085cfe69a0172fa9711666c3a634cfc806d4fb74a47"
+dependencies = [
+ "sqlx-core",
+ "sqlx-macros",
+ "sqlx-mysql",
+ "sqlx-postgres",
+ "sqlx-sqlite",
+]
+
+[[package]]
+name = "sqlx-core"
+version = "0.9.0-alpha.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86854e8c6aba0dafcf1c04b4836b0b7fa3a20c560e3554567afefe1258fa4e60"
+dependencies = [
+ "base64",
+ "bytes",
+ "cfg-if",
+ "chrono",
+ "crc",
+ "crossbeam-queue",
+ "either",
+ "event-listener",
+ "futures-core",
+ "futures-intrusive",
+ "futures-io",
+ "futures-util",
+ "hashbrown 0.16.1",
+ "hashlink",
+ "indexmap",
+ "log",
+ "memchr",
+ "percent-encoding",
+ "serde",
+ "serde_json",
+ "sha2 0.10.9",
+ "smallvec",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "sqlx-macros"
+version = "0.9.0-alpha.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7aab9442ed1568e3aed6c368737226ee4e0e8d1deb0e0887fa6bf15282ace44"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "sqlx-core",
+ "sqlx-macros-core",
+ "syn",
+]
+
+[[package]]
+name = "sqlx-macros-core"
+version = "0.9.0-alpha.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34eb4976b8f02ac57ee98d4ce40cd1aad7ab31d9792977bc3171f787ba6ba2fb"
+dependencies = [
+ "cfg-if",
+ "dotenvy",
+ "either",
+ "heck",
+ "hex",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_json",
+ "sha2 0.10.9",
+ "sqlx-core",
+ "sqlx-mysql",
+ "sqlx-postgres",
+ "sqlx-sqlite",
+ "syn",
+ "thiserror",
+ "tokio",
+ "url",
+]
+
+[[package]]
+name = "sqlx-mysql"
+version = "0.9.0-alpha.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fef16f3d52a3710a672b48175b713e86476e2df85576a753c8b37ad11a483c0"
+dependencies = [
+ "atoi",
+ "base64",
+ "bitflags",
+ "byteorder",
+ "bytes",
+ "chrono",
+ "crc",
+ "digest 0.10.7",
+ "dotenvy",
+ "either",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-util",
+ "generic-array",
+ "hex",
+ "hkdf",
+ "hmac 0.12.1",
+ "itoa",
+ "log",
+ "md-5",
+ "memchr",
+ "percent-encoding",
+ "rand 0.8.6",
+ "rsa",
+ "serde",
+ "sha1",
+ "sha2 0.10.9",
+ "smallvec",
+ "sqlx-core",
+ "stringprep",
+ "thiserror",
+ "tracing",
+ "whoami",
+]
+
+[[package]]
+name = "sqlx-postgres"
+version = "0.9.0-alpha.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f053cf36ecb2793a9d9bb02d01bbad1ef66481d5db6ff5ab2dfb7b070cc0d13c"
+dependencies = [
+ "atoi",
+ "base64",
+ "bitflags",
+ "byteorder",
+ "chrono",
+ "crc",
+ "dotenvy",
+ "etcetera",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "hex",
+ "hkdf",
+ "hmac 0.12.1",
+ "home",
+ "itoa",
+ "log",
+ "md-5",
+ "memchr",
+ "rand 0.8.6",
+ "serde",
+ "serde_json",
+ "sha2 0.10.9",
+ "smallvec",
+ "sqlx-core",
+ "stringprep",
+ "thiserror",
+ "tracing",
+ "whoami",
+]
+
+[[package]]
+name = "sqlx-sqlite"
+version = "0.9.0-alpha.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe2cd6cee87120b1e1dd31356b5589911995c777707e49f2750eec7c7fe43eef"
+dependencies = [
+ "atoi",
+ "chrono",
+ "flume",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-intrusive",
+ "futures-util",
+ "libsqlite3-sys",
+ "log",
+ "percent-encoding",
+ "serde",
+ "serde_urlencoded",
+ "sqlx-core",
+ "thiserror",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
+
+[[package]]
+name = "stringprep"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+ "unicode-properties",
+]
+
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
+[[package]]
+name = "symlink"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7973cce6668464ea31f176d85b13c7ab3bba2cb3b77a2ed26abd7801688010a"
+
+[[package]]
+name = "syn"
+version = "2.0.117"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
+dependencies = [
+ "fastrand",
+ "getrandom 0.4.2",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "threadpool"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
+dependencies = [
+ "num_cpus",
+]
+
+[[package]]
+name = "time"
+version = "0.3.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
+dependencies = [
+ "deranged",
+ "itoa",
+ "num-conv",
+ "powerfmt",
+ "serde_core",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
+
+[[package]]
+name = "time-macros"
+version = "0.2.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokio"
+version = "1.52.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b67dee974fe86fd92cc45b7a95fdd2f99a36a6d7b0d431a231178d3d670bbcc6"
+dependencies = [
+ "bytes",
+ "libc",
+ "mio",
+ "parking_lot",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tokio-stream"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
+dependencies = [
+ "log",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-appender"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "050686193eb999b4bb3bc2acfa891a13da00f79734704c4b8b4ef1a10b368a3c"
+dependencies = [
+ "crossbeam-channel",
+ "symlink",
+ "thiserror",
+ "time",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex-automata",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+]
+
+[[package]]
+name = "typenum"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-properties"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
+[[package]]
+name = "url"
+version = "2.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+ "serde",
+]
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "valuable"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
+[[package]]
+name = "wasip2"
+version = "1.0.3+wasi-0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
+dependencies = [
+ "wit-bindgen 0.57.1",
+]
+
+[[package]]
+name = "wasip3"
+version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
+dependencies = [
+ "wit-bindgen 0.51.0",
+]
+
+[[package]]
+name = "wasite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.118"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf938a0bacb0469e83c1e148908bd7d5a6010354cf4fb73279b7447422e3a89"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f371d383f2fb139252e0bfac3b81b265689bf45b6874af544ffa4c975ac1ebf8"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.118"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eeff24f84126c0ec2db7a449f0c2ec963c6a49efe0698c4242929da037ca28ed"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.118"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d08065faf983b2b80a79fd87d8254c409281cf7de75fc4b773019824196c904"
+dependencies = [
+ "bumpalo",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.118"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fd04d9e306f1907bd13c6361b5c6bfc7b3b3c095ed3f8a9246390f8dbdee129"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "wasm-encoder"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
+dependencies = [
+ "leb128fmt",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasm-metadata"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
+dependencies = [
+ "anyhow",
+ "indexmap",
+ "wasm-encoder",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasmparser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
+dependencies = [
+ "bitflags",
+ "hashbrown 0.15.5",
+ "indexmap",
+ "semver",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f2dfbb17949fa2088e5d39408c48368947b86f7834484e87b73de55bc14d97d"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "whoami"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d"
+dependencies = [
+ "libredox",
+ "wasite",
+]
+
+[[package]]
+name = "winapi-util"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-link",
+ "windows-result",
+ "windows-strings",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-result"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "wit-bindgen"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
+dependencies = [
+ "wit-bindgen-rust-macro",
+]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.57.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
+
+[[package]]
+name = "wit-bindgen-core"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
+dependencies = [
+ "anyhow",
+ "heck",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-bindgen-rust"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
+dependencies = [
+ "anyhow",
+ "heck",
+ "indexmap",
+ "prettyplease",
+ "syn",
+ "wasm-metadata",
+ "wit-bindgen-core",
+ "wit-component",
+]
+
+[[package]]
+name = "wit-bindgen-rust-macro"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
+dependencies = [
+ "anyhow",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wit-bindgen-core",
+ "wit-bindgen-rust",
+]
+
+[[package]]
+name = "wit-component"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
+dependencies = [
+ "anyhow",
+ "bitflags",
+ "indexmap",
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "wasm-encoder",
+ "wasm-metadata",
+ "wasmparser",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-parser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
+dependencies = [
+ "anyhow",
+ "id-arena",
+ "indexmap",
+ "log",
+ "semver",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "unicode-xid",
+ "wasmparser",
+]
+
+[[package]]
+name = "writeable"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
+
+[[package]]
+name = "yoke"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
+dependencies = [
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zerotrie"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zmij"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
new file mode 100644
index 00000000..47ab6cf6
--- /dev/null
+++ b/rust/Cargo.toml
@@ -0,0 +1,35 @@
+[package]
+name = "rust_lib_twonly"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib", "staticlib"]
+
+[dependencies]
+flutter_rust_bridge = "=2.12.0"
+thiserror = "2.0.18"
+sqlx = { version = "0.9.0-alpha.1", default-features = false, features = [
+    "runtime-tokio",
+    "sqlite",
+    "migrate",
+    "macros",
+    "chrono",
+    "derive",
+    "json",
+] }
+tokio = { version = "1.44", features = ["full"] }
+tracing = "0.1.44"
+rand = "0.10.1"
+protocols = { path = "../rust_dependencies/protocols" }
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-appender = "0.2.5"
+paste = "1.0.15"
+
+[dev-dependencies]
+pretty_env_logger = "0.5.0"
+tempfile = "3.27.0"
+
+
+[build-dependencies]
+prost-build = "0.14.1"
diff --git a/rust/src/bridge/callbacks.rs b/rust/src/bridge/callbacks.rs
new file mode 100644
index 00000000..a2c81111
--- /dev/null
+++ b/rust/src/bridge/callbacks.rs
@@ -0,0 +1,48 @@
+pub(crate) mod log;
+mod macros;
+pub(crate) mod user_discovery;
+
+use flutter_rust_bridge::DartFnFuture;
+use protocols::user_discovery::traits::{AnnouncedUser, OtherPromotion};
+
+use super::error::Result;
+use crate::{callback_generator, frb_generated::StreamSink};
+use std::sync::{Arc, OnceLock};
+
+use crate::bridge::error::TwonlyError;
+
+static FLUTTER_CALLBACKS: OnceLock<FlutterCallbacks> = OnceLock::new();
+
+// This will also generate the function init_flutter_callbacks which MUST be called from Flutter to initialize the callbacks
+callback_generator! {
+    FlutterCallbacks {
+        Logging logging {
+            get_stream_sink: () => StreamSink<String>
+        },
+        UserDiscoveryCallbacks user_discovery {
+            // UserDiscoveryUtils
+            sign_data: (Vec<u8>) => Option<Vec<u8>>,
+            verify_signature: (Vec<u8>, Vec<u8>, Vec<u8>) => bool,
+            verify_stored_pubkey: (i64, Vec<u8>) => bool,
+
+            // UserDiscoveryStore
+            set_shares: (Vec<Vec<u8>>) => bool,
+            get_share_for_contact: (i64) => Option<Vec<u8>>,
+            push_own_promotion_and_clear_old_version: (i64, i64, Vec<u8>) => bool,
+            get_own_promotions_after_version: (i64) => Option<Vec<Vec<u8>>>,
+            store_other_promotion: (OtherPromotion) => bool,
+            get_other_promotions_by_public_id: (i64) => Option<Vec<OtherPromotion>>,
+            get_announced_user_by_public_id: (i64) => Option<AnnouncedUser>,
+            get_contact_version: (i64) => Option<Vec<u8>>,
+            set_contact_version: (i64, Vec<u8>) => bool,
+            push_new_user_relation: (i64, AnnouncedUser, Option<i64>) => bool,
+            get_contact_promotion: (i64) => Option<Vec<u8>>
+        }
+    }
+}
+
+pub(crate) fn get_callbacks() -> Result<&'static FlutterCallbacks> {
+    FLUTTER_CALLBACKS
+        .get()
+        .ok_or(TwonlyError::MissingCallbackInitialization)
+}
diff --git a/rust/src/bridge/callbacks/log.rs b/rust/src/bridge/callbacks/log.rs
new file mode 100644
index 00000000..e1525ed2
--- /dev/null
+++ b/rust/src/bridge/callbacks/log.rs
@@ -0,0 +1,28 @@
+use crate::frb_generated::StreamSink;
+use tracing_subscriber::fmt::MakeWriter;
+
+#[derive(Clone)]
+pub(crate) struct DartWriter {
+    pub(crate) sink: StreamSink<String>,
+}
+
+impl std::io::Write for DartWriter {
+    fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
+        if let Ok(msg) = std::str::from_utf8(buf) {
+            let _ = self.sink.add(msg.trim_end().to_string());
+        }
+        Ok(buf.len())
+    }
+
+    fn flush(&mut self) -> std::io::Result<()> {
+        Ok(())
+    }
+}
+
+impl<'a> MakeWriter<'a> for DartWriter {
+    type Writer = DartWriter;
+
+    fn make_writer(&'a self) -> Self::Writer {
+        self.clone()
+    }
+}
diff --git a/rust/src/bridge/callbacks/macros.rs b/rust/src/bridge/callbacks/macros.rs
new file mode 100644
index 00000000..7fd28918
--- /dev/null
+++ b/rust/src/bridge/callbacks/macros.rs
@@ -0,0 +1,57 @@
+#[macro_export]
+macro_rules! callback_generator {
+    (
+        $struct_name:ident {
+            $(
+                $sub_struct_name:ident $sub_struct_field:ident {
+                    $(
+                        $fn_name:ident : ($($input:ty),*) => $output:ty
+                    ),* $(,)?
+                }
+            ),* $(,)?
+        }
+    ) => {
+        // 1. Generate the Nested Sub-Structs
+        $(
+            pub(crate) struct $sub_struct_name {
+                $(
+                    pub(crate) $fn_name: Arc<dyn Fn($($input),*) -> DartFnFuture<$output> + Send + Sync + 'static>,
+                )*
+            }
+        )*
+
+        // 2. Generate the Main Container Struct
+        pub(crate) struct $struct_name {
+            $(
+                pub(crate) $sub_struct_field: $sub_struct_name,
+            )*
+        }
+
+        // 3. Generate the Automated Init Function
+        paste::paste! {
+            pub fn init_flutter_callbacks(
+                $(
+                    $(
+                        // Parameters: sub-struct_field + _ + fn_name
+                        [<$sub_struct_field _ $fn_name>]: impl Fn($($input),*) -> DartFnFuture<$output> + Send + Sync + 'static,
+                    )*
+                )*
+            ) {
+                let callbacks = $struct_name {
+                    $(
+                        $sub_struct_field: $sub_struct_name {
+                            $(
+                                $fn_name: Arc::new([<$sub_struct_field _ $fn_name>]),
+                            )*
+                        },
+                    )*
+                };
+
+                // Use the static global strictly named FLUTTER_CALLBACKS
+                FLUTTER_CALLBACKS.set(callbacks).unwrap_or_else(|_| {
+                    println!("Callbacks were already initialized!");
+                });
+            }
+        }
+    };
+}
diff --git a/rust/src/bridge/callbacks/user_discovery.rs b/rust/src/bridge/callbacks/user_discovery.rs
new file mode 100644
index 00000000..68fd03cf
--- /dev/null
+++ b/rust/src/bridge/callbacks/user_discovery.rs
@@ -0,0 +1,175 @@
+use crate::bridge::callbacks::get_callbacks;
+use crate::bridge::error::TwonlyError;
+use crate::bridge::get_twonly_flutter;
+use protocols::user_discovery::error::{Result, UserDiscoveryError};
+use protocols::user_discovery::traits::UserDiscoveryUtils;
+use protocols::user_discovery::traits::{AnnouncedUser, OtherPromotion, UserDiscoveryStore};
+use std::collections::HashMap;
+use std::path::PathBuf;
+
+#[derive(Clone)]
+pub(crate) struct UserDiscoveryStoreFlutter {}
+pub(crate) struct UserDiscoveryUtilsFlutter {}
+
+impl UserDiscoveryUtils for UserDiscoveryUtilsFlutter {
+    async fn sign_data(&self, input_data: &[u8]) -> Result<Vec<u8>> {
+        match (get_callbacks()?.user_discovery.sign_data)(input_data.to_vec()).await {
+            Some(signature) => Ok(signature),
+            None => Err(TwonlyError::DartError)?,
+        }
+    }
+
+    async fn verify_signature(
+        &self,
+        input_data: &[u8],
+        pubkey: &[u8],
+        signature: &[u8],
+    ) -> Result<bool> {
+        Ok((get_callbacks()?.user_discovery.verify_signature)(
+            input_data.to_vec(),
+            pubkey.to_vec(),
+            signature.to_vec(),
+        )
+        .await)
+    }
+
+    async fn verify_stored_pubkey(&self, from_contact_id: i64, pubkey: &[u8]) -> Result<bool> {
+        Ok(
+            (get_callbacks()?.user_discovery.verify_stored_pubkey)(
+                from_contact_id,
+                pubkey.to_vec(),
+            )
+            .await,
+        )
+    }
+}
+
+impl UserDiscoveryStore for UserDiscoveryStoreFlutter {
+    async fn get_config(&self) -> Result<String> {
+        let ws = get_twonly_flutter().unwrap();
+        let config_path =
+            PathBuf::from(&ws.config.data_directory).join("user_discovery_config.json");
+
+        if !config_path.is_file() {
+            return Err(UserDiscoveryError::NotInitialized);
+        }
+
+        tracing::debug!("Loading Config from {}", config_path.display());
+        Ok(std::fs::read_to_string(&config_path)?)
+    }
+
+    async fn update_config(&self, update: String) -> Result<()> {
+        tracing::debug!("Updating configuration file.");
+        let ws = get_twonly_flutter().unwrap();
+        let config_path =
+            PathBuf::from(&ws.config.data_directory).join("user_discovery_config.json");
+        std::fs::write(config_path, &update)?;
+        Ok(())
+    }
+
+    async fn set_shares(&self, shares: Vec<Vec<u8>>) -> Result<()> {
+        (get_callbacks()?.user_discovery.set_shares)(shares).await;
+        Ok(())
+    }
+
+    async fn get_share_for_contact(&self, contact_id: i64) -> Result<Vec<u8>> {
+        match (get_callbacks()?.user_discovery.get_share_for_contact)(contact_id).await {
+            Some(share) => Ok(share),
+            None => Err(UserDiscoveryError::NoSharesLeft),
+        }
+    }
+
+    async fn push_own_promotion_and_clear_old_version(
+        &self,
+        contact_id: i64,
+        version: u32,
+        promotion: Vec<u8>,
+    ) -> Result<()> {
+        (get_callbacks()?
+            .user_discovery
+            .push_own_promotion_and_clear_old_version)(contact_id, version as i64, promotion)
+        .await
+        .then_some(())
+        .ok_or(TwonlyError::DartError.into())
+    }
+
+    async fn get_own_promotions_after_version(&self, version: u32) -> Result<Vec<Vec<u8>>> {
+        match (get_callbacks()?
+            .user_discovery
+            .get_own_promotions_after_version)(version as i64)
+        .await
+        {
+            Some(share) => Ok(share),
+            None => Err(TwonlyError::DartError)?,
+        }
+    }
+
+    async fn store_other_promotion(&self, promotion: OtherPromotion) -> Result<()> {
+        (get_callbacks()?.user_discovery.store_other_promotion)(promotion)
+            .await
+            .then_some(())
+            .ok_or(TwonlyError::DartError.into())
+    }
+
+    async fn get_other_promotions_by_public_id(
+        &self,
+        public_id: i64,
+    ) -> Result<Vec<OtherPromotion>> {
+        match (get_callbacks()?
+            .user_discovery
+            .get_other_promotions_by_public_id)(public_id)
+        .await
+        {
+            Some(promotions) => Ok(promotions),
+            None => Err(TwonlyError::DartError)?,
+        }
+    }
+
+    async fn get_announced_user_by_public_id(
+        &self,
+        public_id: i64,
+    ) -> Result<Option<AnnouncedUser>> {
+        Ok((get_callbacks()?
+            .user_discovery
+            .get_announced_user_by_public_id)(public_id)
+        .await)
+    }
+
+    async fn push_new_user_relation(
+        &self,
+        from_contact_id: i64,
+        announced_user: AnnouncedUser,
+        public_key_verified_timestamp: Option<i64>,
+    ) -> Result<()> {
+        (get_callbacks()?.user_discovery.push_new_user_relation)(
+            from_contact_id,
+            announced_user,
+            public_key_verified_timestamp,
+        )
+        .await
+        .then_some(())
+        .ok_or(TwonlyError::DartError.into())
+    }
+
+    async fn get_all_announced_users(
+        &self,
+    ) -> Result<HashMap<AnnouncedUser, Vec<(i64, Option<i64>)>>> {
+        // This is never called from the RUST code.
+        Err(TwonlyError::DartError)?
+    }
+
+    async fn get_contact_version(&self, contact_id: i64) -> Result<Option<Vec<u8>>> {
+        Ok((get_callbacks()?.user_discovery.get_contact_version)(contact_id).await)
+    }
+
+    async fn set_contact_version(&self, contact_id: i64, update: Vec<u8>) -> Result<()> {
+        (get_callbacks()?.user_discovery.set_contact_version)(contact_id, update)
+            .await
+            .then_some(())
+            .ok_or(TwonlyError::DartError.into())
+    }
+
+    async fn get_contact_promotion(&self, contact_id: i64) -> Result<Option<Vec<u8>>> {
+        Ok((get_callbacks()?.user_discovery.get_contact_promotion)(contact_id).await)
+    }
+}
diff --git a/rust/src/bridge/error.rs b/rust/src/bridge/error.rs
new file mode 100644
index 00000000..7ad74628
--- /dev/null
+++ b/rust/src/bridge/error.rs
@@ -0,0 +1,26 @@
+use protocols::user_discovery::error::UserDiscoveryError;
+use thiserror::Error;
+
+pub type Result<T> = core::result::Result<T, TwonlyError>;
+
+#[derive(Error, Debug)]
+pub enum TwonlyError {
+    #[error("global twonly is not initialized")]
+    Initialization,
+    #[error("init_flutter_callbacks was not called")]
+    MissingCallbackInitialization,
+    #[error("Could not find the given database")]
+    DatabaseNotFound,
+    #[error("{0}")]
+    UserDiscoveryError(#[from] UserDiscoveryError),
+    #[error("Error in dart callback")]
+    DartError,
+    #[error("{0}")]
+    SqliteError(#[from] sqlx::Error),
+}
+
+impl From<TwonlyError> for UserDiscoveryError {
+    fn from(error: TwonlyError) -> Self {
+        UserDiscoveryError::Store(error.to_string())
+    }
+}
diff --git a/rust/src/bridge/log.rs b/rust/src/bridge/log.rs
new file mode 100644
index 00000000..db6a0935
--- /dev/null
+++ b/rust/src/bridge/log.rs
@@ -0,0 +1,73 @@
+use crate::bridge::callbacks::{get_callbacks, log::DartWriter};
+use std::sync::{Mutex, OnceLock};
+use tracing_appender::non_blocking::{NonBlocking, WorkerGuard};
+use tracing_subscriber::{
+    fmt::Layer, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Registry,
+};
+
+static TRACING_GUARDS: OnceLock<Mutex<Option<(WorkerGuard, WorkerGuard)>>> = OnceLock::new();
+static TRACING_INIT: OnceLock<()> = OnceLock::new();
+
+pub(crate) async fn init_tracing(logs_dir: &std::path::Path, is_dart_available: bool) {
+    let _ = std::fs::create_dir_all(logs_dir);
+
+    let mut dart_sink = None;
+
+    if is_dart_available {
+        if let Ok(callbacks) = get_callbacks() {
+            dart_sink = Some((callbacks.logging.get_stream_sink)().await);
+        }
+    }
+
+    TRACING_INIT.get_or_init(|| {
+        let (non_blocking_stdout, _non_blocking_file) = build_writers(logs_dir);
+
+        let stdout_layer = Layer::new()
+            .with_writer(non_blocking_stdout)
+            .with_ansi(true)
+            .with_target(true);
+
+        // let file_layer = Layer::new()
+        //     .with_writer(non_blocking_file)
+        //     .with_ansi(false)
+        //     .with_target(true);
+
+        // Replace stdout with our new DartWriter!
+
+        let registry = Registry::default()
+            .with(
+                EnvFilter::try_from_default_env()
+                    .unwrap_or_else(|_| EnvFilter::new("debug,refinery_core=warn,refinery=warn")),
+            )
+            .with(stdout_layer);
+
+        if let Some(sink) = dart_sink {
+            let dart_writer = DartWriter { sink };
+            let dart_layer = tracing_subscriber::fmt::Layer::new()
+                .with_writer(dart_writer)
+                .with_ansi(false)
+                .with_target(true);
+            let _ = registry.with(dart_layer).try_init();
+        } else {
+            let _ = registry.try_init();
+        }
+    });
+}
+
+fn build_writers(logs_dir: &std::path::Path) -> (NonBlocking, NonBlocking) {
+    let file_appender = tracing_appender::rolling::RollingFileAppender::builder()
+        .rotation(tracing_appender::rolling::Rotation::DAILY)
+        .filename_prefix("twonly")
+        .filename_suffix("log")
+        .build(logs_dir)
+        .expect("Failed to create file appender");
+
+    let (non_blocking_file, file_guard) = tracing_appender::non_blocking(file_appender);
+    let (non_blocking_stdout, stdout_guard) = tracing_appender::non_blocking(std::io::stdout());
+
+    TRACING_GUARDS
+        .set(Mutex::new(Some((file_guard, stdout_guard))))
+        .ok();
+
+    (non_blocking_stdout, non_blocking_file)
+}
diff --git a/rust/src/bridge/mod.rs b/rust/src/bridge/mod.rs
new file mode 100644
index 00000000..5b5c6422
--- /dev/null
+++ b/rust/src/bridge/mod.rs
@@ -0,0 +1,89 @@
+#![allow(unexpected_cfgs)]
+pub mod callbacks;
+pub mod error;
+pub mod log;
+pub mod wrapper;
+
+use crate::bridge::callbacks::user_discovery::{
+    UserDiscoveryStoreFlutter, UserDiscoveryUtilsFlutter,
+};
+use crate::bridge::log::init_tracing;
+use crate::utils::Shared;
+use error::Result;
+use error::TwonlyError;
+use flutter_rust_bridge::frb;
+use protocols::user_discovery::UserDiscovery;
+use std::path::PathBuf;
+use tokio::sync::OnceCell;
+
+pub use protocols::user_discovery::traits::AnnouncedUser;
+pub use protocols::user_discovery::traits::OtherPromotion;
+
+#[frb(mirror(OtherPromotion))]
+pub struct _OtherPromotion {
+    pub promotion_id: u32,
+    pub public_id: i64,
+    pub from_contact_id: i64,
+    pub threshold: u8,
+    pub announcement_share: Vec<u8>,
+    pub public_key_verified_timestamp: Option<i64>,
+}
+
+#[frb(mirror(AnnouncedUser))]
+pub struct _AnnouncedUser {
+    pub user_id: i64,
+    pub public_key: Vec<u8>,
+    pub public_id: i64,
+}
+
+pub struct TwonlyConfig {
+    pub database_path: String,
+    pub data_directory: String,
+}
+
+pub(crate) struct TwonlyFlutter {
+    #[allow(dead_code)]
+    pub(crate) config: TwonlyConfig,
+    // /// Rust runs in the same process as drift, the database can only be opened in readonly mode
+    // pub(crate) twonly_db_readonly: Arc<Database>,
+    pub(crate) user_discovery:
+        Shared<UserDiscovery<UserDiscoveryStoreFlutter, UserDiscoveryUtilsFlutter>>,
+}
+
+static GLOBAL_TWONLY: OnceCell<TwonlyFlutter> = OnceCell::const_new();
+
+pub(super) fn get_twonly_flutter() -> Result<&'static TwonlyFlutter> {
+    GLOBAL_TWONLY.get().ok_or(TwonlyError::Initialization)
+}
+
+pub async fn initialize_twonly_flutter(config: TwonlyConfig) -> Result<()> {
+    let log_dir = PathBuf::from(&config.data_directory).join("log");
+    init_tracing(&log_dir, true).await;
+    tracing::info!("Initialized twonly workspace.");
+    let twonly_res: Result<&'static TwonlyFlutter> = GLOBAL_TWONLY
+        .get_or_try_init(|| async {
+            // let database_dir = PathBuf::from(&config.database_path.clone());
+            // let Some(rust_db_path) = database_dir.parent() else {
+            //     return Err(TwonlyError::DatabaseNotFound);
+            // };
+            // let rust_db_path = rust_db_path.join("rust_db.sqlite").display().to_string();
+
+            // let twonly_db_readonly = Arc::new(Database::new(&config.database_path, true).await?);
+            // let rust_db = Arc::new(Database::new(&rust_db_path, false).await?);
+
+            Ok(TwonlyFlutter {
+                config,
+                // twonly_db_readonly,
+                // rust_db,
+                user_discovery: Shared::new(UserDiscovery::new(
+                    UserDiscoveryStoreFlutter {},
+                    UserDiscoveryUtilsFlutter {},
+                )?),
+            })
+        })
+        .await;
+
+    twonly_res?;
+
+    Ok(())
+}
diff --git a/rust/src/bridge/wrapper/mod.rs b/rust/src/bridge/wrapper/mod.rs
new file mode 100644
index 00000000..16456710
--- /dev/null
+++ b/rust/src/bridge/wrapper/mod.rs
@@ -0,0 +1 @@
+pub mod user_discovery;
diff --git a/rust/src/bridge/wrapper/user_discovery.rs b/rust/src/bridge/wrapper/user_discovery.rs
new file mode 100644
index 00000000..175184dd
--- /dev/null
+++ b/rust/src/bridge/wrapper/user_discovery.rs
@@ -0,0 +1,78 @@
+use crate::bridge::error::Result;
+use crate::bridge::get_twonly_flutter;
+
+pub struct FlutterUserDiscovery {}
+
+impl FlutterUserDiscovery {
+    pub async fn initialize_or_update(
+        threshold: u8,
+        user_id: i64,
+        public_key: Vec<u8>,
+        share_promotion: bool,
+    ) -> Result<()> {
+        Ok(get_twonly_flutter()?
+            .user_discovery
+            .get()
+            .await
+            .initialize_or_update(threshold, user_id, public_key, share_promotion)
+            .await?)
+    }
+
+    pub async fn get_current_version() -> Result<Vec<u8>> {
+        Ok(get_twonly_flutter()?
+            .user_discovery
+            .get()
+            .await
+            .get_current_version()
+            .await?)
+    }
+
+    pub async fn get_new_messages(
+        contact_id: i64,
+        received_version: &[u8],
+    ) -> Result<Vec<Vec<u8>>> {
+        Ok(get_twonly_flutter()?
+            .user_discovery
+            .get()
+            .await
+            .get_new_messages(contact_id, received_version)
+            .await?)
+    }
+
+    pub async fn should_request_new_messages(
+        contact_id: i64,
+        version: &[u8],
+    ) -> Result<Option<Vec<u8>>> {
+        Ok(get_twonly_flutter()?
+            .user_discovery
+            .get()
+            .await
+            .should_request_new_messages(contact_id, version)
+            .await?)
+    }
+
+    pub async fn handle_new_messages(
+        contact_id: i64,
+        public_key_verified_timestamp: Option<i64>,
+        messages: Vec<Vec<u8>>,
+    ) -> Result<()> {
+        Ok(get_twonly_flutter()?
+            .user_discovery
+            .get()
+            .await
+            .handle_new_messages(contact_id, public_key_verified_timestamp, messages)
+            .await?)
+    }
+
+    pub async fn update_verification_state_for_user(
+        contact_id: i64,
+        public_key_verified_timestamp: Option<i64>,
+    ) -> Result<()> {
+        Ok(get_twonly_flutter()?
+            .user_discovery
+            .get()
+            .await
+            .update_verification_state_for_user(contact_id, public_key_verified_timestamp)
+            .await?)
+    }
+}
diff --git a/rust/src/database/mod.rs b/rust/src/database/mod.rs
new file mode 100644
index 00000000..ee29f7e9
--- /dev/null
+++ b/rust/src/database/mod.rs
@@ -0,0 +1,65 @@
+// use crate::bridge::error::{Result, TwonlyError};
+// use sqlx::migrate::MigrateDatabase;
+// use sqlx::sqlite::{SqliteConnectOptions, SqlitePoolOptions};
+// use sqlx::{ConnectOptions, Sqlite, SqlitePool};
+// use std::time::Duration;
+
+// pub(crate) struct Database {
+//     pub(crate) pool: SqlitePool,
+// }
+
+// impl Database {
+//     pub(crate) async fn new(db_path: &String, read_only: bool) -> Result<Self> {
+//         let db_url = format!("sqlite://{}", db_path);
+
+//         match Sqlite::database_exists(&db_url).await {
+//             Ok(true) => {
+//                 tracing::debug!("database exists");
+//             }
+//             Ok(false) => {
+//                 tracing::error!("could not open the sqlite3 database");
+//                 return Err(TwonlyError::DatabaseNotFound);
+//             }
+//             Err(e) => {
+//                 tracing::error!(
+//                     "Could not check if database exists: {:?}, attempting to create",
+//                     e
+//                 );
+//                 return Err(TwonlyError::DatabaseNotFound);
+//             }
+//         }
+
+//         tracing::debug!("Creating database connection pool");
+
+//         let log_statements_level = if std::env::var("SQLX_LOG_STATEMENTS").is_ok() {
+//             tracing::log::LevelFilter::Info
+//         } else {
+//             tracing::log::LevelFilter::Off
+//         };
+
+//         let connect_options = format!("{db_url}?mode=rwc")
+//             .parse::<SqliteConnectOptions>()?
+//             .log_statements(log_statements_level)
+//             .read_only(read_only)
+//             .journal_mode(sqlx::sqlite::SqliteJournalMode::Wal)
+//             .foreign_keys(true)
+//             .busy_timeout(Duration::from_millis(5000))
+//             .pragma("recursive_triggers", "ON")
+//             .log_slow_statements(tracing::log::LevelFilter::Warn, Duration::from_millis(500));
+
+//         let pool = SqlitePoolOptions::new()
+//             .acquire_timeout(Duration::from_secs(5))
+//             .max_connections(10)
+//             .connect_with(connect_options)
+//             .await?;
+
+//         let row: (String, String) = sqlx::query_as("SELECT sqlite_version(), sqlite_source_id()")
+//             .fetch_one(&pool)
+//             .await?;
+
+//         tracing::info!("Rust SQLite Version: {}", row.0);
+//         tracing::info!("Rust SQLite Source ID: {}", row.1);
+
+//         Ok(Self { pool: pool })
+//     }
+// }
diff --git a/rust/src/frb_generated.rs b/rust/src/frb_generated.rs
new file mode 100644
index 00000000..5e0cb33a
--- /dev/null
+++ b/rust/src/frb_generated.rs
@@ -0,0 +1,1279 @@
+// This file is automatically generated, so please do not edit it.
+// @generated by `flutter_rust_bridge`@ 2.12.0.
+
+#![allow(
+    non_camel_case_types,
+    unused,
+    non_snake_case,
+    clippy::needless_return,
+    clippy::redundant_closure_call,
+    clippy::redundant_closure,
+    clippy::useless_conversion,
+    clippy::unit_arg,
+    clippy::unused_unit,
+    clippy::double_parens,
+    clippy::let_and_return,
+    clippy::too_many_arguments,
+    clippy::match_single_binding,
+    clippy::clone_on_copy,
+    clippy::let_unit_value,
+    clippy::deref_addrof,
+    clippy::explicit_auto_deref,
+    clippy::borrow_deref_ref,
+    clippy::uninlined_format_args,
+    clippy::needless_borrow
+)]
+
+// Section: imports
+
+use flutter_rust_bridge::for_generated::byteorder::{NativeEndian, ReadBytesExt, WriteBytesExt};
+use flutter_rust_bridge::for_generated::{transform_result_dco, Lifetimeable, Lockable};
+use flutter_rust_bridge::{Handler, IntoIntoDart};
+
+// Section: boilerplate
+
+flutter_rust_bridge::frb_generated_boilerplate!(
+    default_stream_sink_codec = SseCodec,
+    default_rust_opaque = RustOpaqueMoi,
+    default_rust_auto_opaque = RustAutoOpaqueMoi,
+);
+pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.12.0";
+pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = 1680338106;
+
+// Section: executor
+
+flutter_rust_bridge::frb_generated_default_handler!();
+
+// Section: wire_funcs
+
+fn wire__crate__bridge__wrapper__user_discovery__flutter_user_discovery_get_current_version_impl(
+    port_: flutter_rust_bridge::for_generated::MessagePort,
+    ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr,
+    rust_vec_len_: i32,
+    data_len_: i32,
+) {
+    FLUTTER_RUST_BRIDGE_HANDLER.wrap_async::<flutter_rust_bridge::for_generated::SseCodec,_,_,_>(flutter_rust_bridge::for_generated::TaskInfo{ debug_name: "flutter_user_discovery_get_current_version", port: Some(port_), mode: flutter_rust_bridge::for_generated::FfiCallMode::Normal }, move || { 
+            let message = unsafe { flutter_rust_bridge::for_generated::Dart2RustMessageSse::from_wire(ptr_, rust_vec_len_, data_len_) };
+            let mut deserializer = flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+            deserializer.end(); move |context| async move {
+                    transform_result_sse::<_, flutter_rust_bridge::for_generated::anyhow::Error>((move || async move {
+                         let output_ok = crate::bridge::wrapper::user_discovery::FlutterUserDiscovery::get_current_version().await?;   Ok(output_ok)
+                    })().await)
+                } })
+}
+fn wire__crate__bridge__wrapper__user_discovery__flutter_user_discovery_get_new_messages_impl(
+    port_: flutter_rust_bridge::for_generated::MessagePort,
+    ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr,
+    rust_vec_len_: i32,
+    data_len_: i32,
+) {
+    FLUTTER_RUST_BRIDGE_HANDLER.wrap_async::<flutter_rust_bridge::for_generated::SseCodec,_,_,_>(flutter_rust_bridge::for_generated::TaskInfo{ debug_name: "flutter_user_discovery_get_new_messages", port: Some(port_), mode: flutter_rust_bridge::for_generated::FfiCallMode::Normal }, move || { 
+            let message = unsafe { flutter_rust_bridge::for_generated::Dart2RustMessageSse::from_wire(ptr_, rust_vec_len_, data_len_) };
+            let mut deserializer = flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+            let api_contact_id = <i64>::sse_decode(&mut deserializer);
+let api_received_version = <Vec<u8>>::sse_decode(&mut deserializer);deserializer.end(); move |context| async move {
+                    transform_result_sse::<_, flutter_rust_bridge::for_generated::anyhow::Error>((move || async move {
+                         let output_ok = crate::bridge::wrapper::user_discovery::FlutterUserDiscovery::get_new_messages(api_contact_id, &api_received_version).await?;   Ok(output_ok)
+                    })().await)
+                } })
+}
+fn wire__crate__bridge__wrapper__user_discovery__flutter_user_discovery_handle_new_messages_impl(
+    port_: flutter_rust_bridge::for_generated::MessagePort,
+    ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr,
+    rust_vec_len_: i32,
+    data_len_: i32,
+) {
+    FLUTTER_RUST_BRIDGE_HANDLER.wrap_async::<flutter_rust_bridge::for_generated::SseCodec,_,_,_>(flutter_rust_bridge::for_generated::TaskInfo{ debug_name: "flutter_user_discovery_handle_new_messages", port: Some(port_), mode: flutter_rust_bridge::for_generated::FfiCallMode::Normal }, move || { 
+            let message = unsafe { flutter_rust_bridge::for_generated::Dart2RustMessageSse::from_wire(ptr_, rust_vec_len_, data_len_) };
+            let mut deserializer = flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+            let api_contact_id = <i64>::sse_decode(&mut deserializer);
+let api_public_key_verified_timestamp = <Option<i64>>::sse_decode(&mut deserializer);
+let api_messages = <Vec<Vec<u8>>>::sse_decode(&mut deserializer);deserializer.end(); move |context| async move {
+                    transform_result_sse::<_, flutter_rust_bridge::for_generated::anyhow::Error>((move || async move {
+                         let output_ok = crate::bridge::wrapper::user_discovery::FlutterUserDiscovery::handle_new_messages(api_contact_id, api_public_key_verified_timestamp, api_messages).await?;   Ok(output_ok)
+                    })().await)
+                } })
+}
+fn wire__crate__bridge__wrapper__user_discovery__flutter_user_discovery_initialize_or_update_impl(
+    port_: flutter_rust_bridge::for_generated::MessagePort,
+    ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr,
+    rust_vec_len_: i32,
+    data_len_: i32,
+) {
+    FLUTTER_RUST_BRIDGE_HANDLER.wrap_async::<flutter_rust_bridge::for_generated::SseCodec,_,_,_>(flutter_rust_bridge::for_generated::TaskInfo{ debug_name: "flutter_user_discovery_initialize_or_update", port: Some(port_), mode: flutter_rust_bridge::for_generated::FfiCallMode::Normal }, move || { 
+            let message = unsafe { flutter_rust_bridge::for_generated::Dart2RustMessageSse::from_wire(ptr_, rust_vec_len_, data_len_) };
+            let mut deserializer = flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+            let api_threshold = <u8>::sse_decode(&mut deserializer);
+let api_user_id = <i64>::sse_decode(&mut deserializer);
+let api_public_key = <Vec<u8>>::sse_decode(&mut deserializer);
+let api_share_promotion = <bool>::sse_decode(&mut deserializer);deserializer.end(); move |context| async move {
+                    transform_result_sse::<_, flutter_rust_bridge::for_generated::anyhow::Error>((move || async move {
+                         let output_ok = crate::bridge::wrapper::user_discovery::FlutterUserDiscovery::initialize_or_update(api_threshold, api_user_id, api_public_key, api_share_promotion).await?;   Ok(output_ok)
+                    })().await)
+                } })
+}
+fn wire__crate__bridge__wrapper__user_discovery__flutter_user_discovery_should_request_new_messages_impl(
+    port_: flutter_rust_bridge::for_generated::MessagePort,
+    ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr,
+    rust_vec_len_: i32,
+    data_len_: i32,
+) {
+    FLUTTER_RUST_BRIDGE_HANDLER.wrap_async::<flutter_rust_bridge::for_generated::SseCodec,_,_,_>(flutter_rust_bridge::for_generated::TaskInfo{ debug_name: "flutter_user_discovery_should_request_new_messages", port: Some(port_), mode: flutter_rust_bridge::for_generated::FfiCallMode::Normal }, move || { 
+            let message = unsafe { flutter_rust_bridge::for_generated::Dart2RustMessageSse::from_wire(ptr_, rust_vec_len_, data_len_) };
+            let mut deserializer = flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+            let api_contact_id = <i64>::sse_decode(&mut deserializer);
+let api_version = <Vec<u8>>::sse_decode(&mut deserializer);deserializer.end(); move |context| async move {
+                    transform_result_sse::<_, flutter_rust_bridge::for_generated::anyhow::Error>((move || async move {
+                         let output_ok = crate::bridge::wrapper::user_discovery::FlutterUserDiscovery::should_request_new_messages(api_contact_id, &api_version).await?;   Ok(output_ok)
+                    })().await)
+                } })
+}
+fn wire__crate__bridge__wrapper__user_discovery__flutter_user_discovery_update_verification_state_for_user_impl(
+    port_: flutter_rust_bridge::for_generated::MessagePort,
+    ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr,
+    rust_vec_len_: i32,
+    data_len_: i32,
+) {
+    FLUTTER_RUST_BRIDGE_HANDLER.wrap_async::<flutter_rust_bridge::for_generated::SseCodec,_,_,_>(flutter_rust_bridge::for_generated::TaskInfo{ debug_name: "flutter_user_discovery_update_verification_state_for_user", port: Some(port_), mode: flutter_rust_bridge::for_generated::FfiCallMode::Normal }, move || { 
+            let message = unsafe { flutter_rust_bridge::for_generated::Dart2RustMessageSse::from_wire(ptr_, rust_vec_len_, data_len_) };
+            let mut deserializer = flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+            let api_contact_id = <i64>::sse_decode(&mut deserializer);
+let api_public_key_verified_timestamp = <Option<i64>>::sse_decode(&mut deserializer);deserializer.end(); move |context| async move {
+                    transform_result_sse::<_, flutter_rust_bridge::for_generated::anyhow::Error>((move || async move {
+                         let output_ok = crate::bridge::wrapper::user_discovery::FlutterUserDiscovery::update_verification_state_for_user(api_contact_id, api_public_key_verified_timestamp).await?;   Ok(output_ok)
+                    })().await)
+                } })
+}
+fn wire__crate__bridge__callbacks__init_flutter_callbacks_impl(
+    port_: flutter_rust_bridge::for_generated::MessagePort,
+    ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr,
+    rust_vec_len_: i32,
+    data_len_: i32,
+) {
+    FLUTTER_RUST_BRIDGE_HANDLER.wrap_normal::<flutter_rust_bridge::for_generated::SseCodec,_,_>(flutter_rust_bridge::for_generated::TaskInfo{ debug_name: "init_flutter_callbacks", port: Some(port_), mode: flutter_rust_bridge::for_generated::FfiCallMode::Normal }, move || { 
+            let message = unsafe { flutter_rust_bridge::for_generated::Dart2RustMessageSse::from_wire(ptr_, rust_vec_len_, data_len_) };
+            let mut deserializer = flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+            let api_logging_get_stream_sink = decode_DartFn_Inputs__Output_StreamSink_String_Sse_AnyhowException(<flutter_rust_bridge::DartOpaque>::sse_decode(&mut deserializer));
+let api_user_discovery_sign_data = decode_DartFn_Inputs_list_prim_u_8_strict_Output_opt_list_prim_u_8_strict_AnyhowException(<flutter_rust_bridge::DartOpaque>::sse_decode(&mut deserializer));
+let api_user_discovery_verify_signature = decode_DartFn_Inputs_list_prim_u_8_strict_list_prim_u_8_strict_list_prim_u_8_strict_Output_bool_AnyhowException(<flutter_rust_bridge::DartOpaque>::sse_decode(&mut deserializer));
+let api_user_discovery_verify_stored_pubkey = decode_DartFn_Inputs_i_64_list_prim_u_8_strict_Output_bool_AnyhowException(<flutter_rust_bridge::DartOpaque>::sse_decode(&mut deserializer));
+let api_user_discovery_set_shares = decode_DartFn_Inputs_list_list_prim_u_8_strict_Output_bool_AnyhowException(<flutter_rust_bridge::DartOpaque>::sse_decode(&mut deserializer));
+let api_user_discovery_get_share_for_contact = decode_DartFn_Inputs_i_64_Output_opt_list_prim_u_8_strict_AnyhowException(<flutter_rust_bridge::DartOpaque>::sse_decode(&mut deserializer));
+let api_user_discovery_push_own_promotion_and_clear_old_version = decode_DartFn_Inputs_i_64_i_64_list_prim_u_8_strict_Output_bool_AnyhowException(<flutter_rust_bridge::DartOpaque>::sse_decode(&mut deserializer));
+let api_user_discovery_get_own_promotions_after_version = decode_DartFn_Inputs_i_64_Output_opt_list_list_prim_u_8_strict_AnyhowException(<flutter_rust_bridge::DartOpaque>::sse_decode(&mut deserializer));
+let api_user_discovery_store_other_promotion = decode_DartFn_Inputs_other_promotion_Output_bool_AnyhowException(<flutter_rust_bridge::DartOpaque>::sse_decode(&mut deserializer));
+let api_user_discovery_get_other_promotions_by_public_id = decode_DartFn_Inputs_i_64_Output_opt_list_other_promotion_AnyhowException(<flutter_rust_bridge::DartOpaque>::sse_decode(&mut deserializer));
+let api_user_discovery_get_announced_user_by_public_id = decode_DartFn_Inputs_i_64_Output_opt_box_autoadd_announced_user_AnyhowException(<flutter_rust_bridge::DartOpaque>::sse_decode(&mut deserializer));
+let api_user_discovery_get_contact_version = decode_DartFn_Inputs_i_64_Output_opt_list_prim_u_8_strict_AnyhowException(<flutter_rust_bridge::DartOpaque>::sse_decode(&mut deserializer));
+let api_user_discovery_set_contact_version = decode_DartFn_Inputs_i_64_list_prim_u_8_strict_Output_bool_AnyhowException(<flutter_rust_bridge::DartOpaque>::sse_decode(&mut deserializer));
+let api_user_discovery_push_new_user_relation = decode_DartFn_Inputs_i_64_announced_user_opt_box_autoadd_i_64_Output_bool_AnyhowException(<flutter_rust_bridge::DartOpaque>::sse_decode(&mut deserializer));
+let api_user_discovery_get_contact_promotion = decode_DartFn_Inputs_i_64_Output_opt_list_prim_u_8_strict_AnyhowException(<flutter_rust_bridge::DartOpaque>::sse_decode(&mut deserializer));deserializer.end(); move |context|  {
+                    transform_result_sse::<_, ()>((move ||  {
+                         let output_ok = Result::<_,()>::Ok({ crate::bridge::callbacks::init_flutter_callbacks(api_logging_get_stream_sink, api_user_discovery_sign_data, api_user_discovery_verify_signature, api_user_discovery_verify_stored_pubkey, api_user_discovery_set_shares, api_user_discovery_get_share_for_contact, api_user_discovery_push_own_promotion_and_clear_old_version, api_user_discovery_get_own_promotions_after_version, api_user_discovery_store_other_promotion, api_user_discovery_get_other_promotions_by_public_id, api_user_discovery_get_announced_user_by_public_id, api_user_discovery_get_contact_version, api_user_discovery_set_contact_version, api_user_discovery_push_new_user_relation, api_user_discovery_get_contact_promotion); })?;   Ok(output_ok)
+                    })())
+                } })
+}
+fn wire__crate__bridge__initialize_twonly_flutter_impl(
+    port_: flutter_rust_bridge::for_generated::MessagePort,
+    ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr,
+    rust_vec_len_: i32,
+    data_len_: i32,
+) {
+    FLUTTER_RUST_BRIDGE_HANDLER.wrap_async::<flutter_rust_bridge::for_generated::SseCodec, _, _, _>(
+        flutter_rust_bridge::for_generated::TaskInfo {
+            debug_name: "initialize_twonly_flutter",
+            port: Some(port_),
+            mode: flutter_rust_bridge::for_generated::FfiCallMode::Normal,
+        },
+        move || {
+            let message = unsafe {
+                flutter_rust_bridge::for_generated::Dart2RustMessageSse::from_wire(
+                    ptr_,
+                    rust_vec_len_,
+                    data_len_,
+                )
+            };
+            let mut deserializer =
+                flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+            let api_config = <crate::bridge::TwonlyConfig>::sse_decode(&mut deserializer);
+            deserializer.end();
+            move |context| async move {
+                transform_result_sse::<_, flutter_rust_bridge::for_generated::anyhow::Error>(
+                    (move || async move {
+                        let output_ok =
+                            crate::bridge::initialize_twonly_flutter(api_config).await?;
+                        Ok(output_ok)
+                    })()
+                    .await,
+                )
+            }
+        },
+    )
+}
+
+// Section: static_checks
+
+#[allow(clippy::unnecessary_literal_unwrap)]
+const _: fn() = || {
+    {
+        let AnnouncedUser = None::<crate::bridge::AnnouncedUser>.unwrap();
+        let _: i64 = AnnouncedUser.user_id;
+        let _: Vec<u8> = AnnouncedUser.public_key;
+        let _: i64 = AnnouncedUser.public_id;
+    }
+    {
+        let OtherPromotion = None::<crate::bridge::OtherPromotion>.unwrap();
+        let _: u32 = OtherPromotion.promotion_id;
+        let _: i64 = OtherPromotion.public_id;
+        let _: i64 = OtherPromotion.from_contact_id;
+        let _: u8 = OtherPromotion.threshold;
+        let _: Vec<u8> = OtherPromotion.announcement_share;
+        let _: Option<i64> = OtherPromotion.public_key_verified_timestamp;
+    }
+};
+
+// Section: related_funcs
+
+fn decode_DartFn_Inputs__Output_StreamSink_String_Sse_AnyhowException(
+    dart_opaque: flutter_rust_bridge::DartOpaque,
+) -> impl Fn() -> flutter_rust_bridge::DartFnFuture<
+    StreamSink<String, flutter_rust_bridge::for_generated::SseCodec>,
+> {
+    use flutter_rust_bridge::IntoDart;
+
+    async fn body(
+        dart_opaque: flutter_rust_bridge::DartOpaque,
+    ) -> StreamSink<String, flutter_rust_bridge::for_generated::SseCodec> {
+        let args = vec![];
+        let message = FLUTTER_RUST_BRIDGE_HANDLER
+            .dart_fn_invoke(dart_opaque, args)
+            .await;
+
+        let mut deserializer = flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+        let action = deserializer.cursor.read_u8().unwrap();
+        let ans = match action {
+            0 => std::result::Result::Ok(<StreamSink<
+                String,
+                flutter_rust_bridge::for_generated::SseCodec,
+            >>::sse_decode(&mut deserializer)),
+            1 => std::result::Result::Err(
+                <flutter_rust_bridge::for_generated::anyhow::Error>::sse_decode(&mut deserializer),
+            ),
+            _ => unreachable!(),
+        };
+        deserializer.end();
+        let ans = ans.expect("Dart throws exception but Rust side assume it is not failable");
+        ans
+    }
+
+    move || {
+        flutter_rust_bridge::for_generated::convert_into_dart_fn_future(body(dart_opaque.clone()))
+    }
+}
+fn decode_DartFn_Inputs_i_64_Output_opt_box_autoadd_announced_user_AnyhowException(
+    dart_opaque: flutter_rust_bridge::DartOpaque,
+) -> impl Fn(i64) -> flutter_rust_bridge::DartFnFuture<Option<crate::bridge::AnnouncedUser>> {
+    use flutter_rust_bridge::IntoDart;
+
+    async fn body(
+        dart_opaque: flutter_rust_bridge::DartOpaque,
+        arg0: i64,
+    ) -> Option<crate::bridge::AnnouncedUser> {
+        let args = vec![arg0.into_into_dart().into_dart()];
+        let message = FLUTTER_RUST_BRIDGE_HANDLER
+            .dart_fn_invoke(dart_opaque, args)
+            .await;
+
+        let mut deserializer = flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+        let action = deserializer.cursor.read_u8().unwrap();
+        let ans = match action {
+            0 => std::result::Result::Ok(<Option<crate::bridge::AnnouncedUser>>::sse_decode(
+                &mut deserializer,
+            )),
+            1 => std::result::Result::Err(
+                <flutter_rust_bridge::for_generated::anyhow::Error>::sse_decode(&mut deserializer),
+            ),
+            _ => unreachable!(),
+        };
+        deserializer.end();
+        let ans = ans.expect("Dart throws exception but Rust side assume it is not failable");
+        ans
+    }
+
+    move |arg0: i64| {
+        flutter_rust_bridge::for_generated::convert_into_dart_fn_future(body(
+            dart_opaque.clone(),
+            arg0,
+        ))
+    }
+}
+fn decode_DartFn_Inputs_i_64_Output_opt_list_list_prim_u_8_strict_AnyhowException(
+    dart_opaque: flutter_rust_bridge::DartOpaque,
+) -> impl Fn(i64) -> flutter_rust_bridge::DartFnFuture<Option<Vec<Vec<u8>>>> {
+    use flutter_rust_bridge::IntoDart;
+
+    async fn body(dart_opaque: flutter_rust_bridge::DartOpaque, arg0: i64) -> Option<Vec<Vec<u8>>> {
+        let args = vec![arg0.into_into_dart().into_dart()];
+        let message = FLUTTER_RUST_BRIDGE_HANDLER
+            .dart_fn_invoke(dart_opaque, args)
+            .await;
+
+        let mut deserializer = flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+        let action = deserializer.cursor.read_u8().unwrap();
+        let ans = match action {
+            0 => std::result::Result::Ok(<Option<Vec<Vec<u8>>>>::sse_decode(&mut deserializer)),
+            1 => std::result::Result::Err(
+                <flutter_rust_bridge::for_generated::anyhow::Error>::sse_decode(&mut deserializer),
+            ),
+            _ => unreachable!(),
+        };
+        deserializer.end();
+        let ans = ans.expect("Dart throws exception but Rust side assume it is not failable");
+        ans
+    }
+
+    move |arg0: i64| {
+        flutter_rust_bridge::for_generated::convert_into_dart_fn_future(body(
+            dart_opaque.clone(),
+            arg0,
+        ))
+    }
+}
+fn decode_DartFn_Inputs_i_64_Output_opt_list_other_promotion_AnyhowException(
+    dart_opaque: flutter_rust_bridge::DartOpaque,
+) -> impl Fn(i64) -> flutter_rust_bridge::DartFnFuture<Option<Vec<crate::bridge::OtherPromotion>>> {
+    use flutter_rust_bridge::IntoDart;
+
+    async fn body(
+        dart_opaque: flutter_rust_bridge::DartOpaque,
+        arg0: i64,
+    ) -> Option<Vec<crate::bridge::OtherPromotion>> {
+        let args = vec![arg0.into_into_dart().into_dart()];
+        let message = FLUTTER_RUST_BRIDGE_HANDLER
+            .dart_fn_invoke(dart_opaque, args)
+            .await;
+
+        let mut deserializer = flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+        let action = deserializer.cursor.read_u8().unwrap();
+        let ans = match action {
+            0 => std::result::Result::Ok(<Option<Vec<crate::bridge::OtherPromotion>>>::sse_decode(
+                &mut deserializer,
+            )),
+            1 => std::result::Result::Err(
+                <flutter_rust_bridge::for_generated::anyhow::Error>::sse_decode(&mut deserializer),
+            ),
+            _ => unreachable!(),
+        };
+        deserializer.end();
+        let ans = ans.expect("Dart throws exception but Rust side assume it is not failable");
+        ans
+    }
+
+    move |arg0: i64| {
+        flutter_rust_bridge::for_generated::convert_into_dart_fn_future(body(
+            dart_opaque.clone(),
+            arg0,
+        ))
+    }
+}
+fn decode_DartFn_Inputs_i_64_Output_opt_list_prim_u_8_strict_AnyhowException(
+    dart_opaque: flutter_rust_bridge::DartOpaque,
+) -> impl Fn(i64) -> flutter_rust_bridge::DartFnFuture<Option<Vec<u8>>> {
+    use flutter_rust_bridge::IntoDart;
+
+    async fn body(dart_opaque: flutter_rust_bridge::DartOpaque, arg0: i64) -> Option<Vec<u8>> {
+        let args = vec![arg0.into_into_dart().into_dart()];
+        let message = FLUTTER_RUST_BRIDGE_HANDLER
+            .dart_fn_invoke(dart_opaque, args)
+            .await;
+
+        let mut deserializer = flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+        let action = deserializer.cursor.read_u8().unwrap();
+        let ans = match action {
+            0 => std::result::Result::Ok(<Option<Vec<u8>>>::sse_decode(&mut deserializer)),
+            1 => std::result::Result::Err(
+                <flutter_rust_bridge::for_generated::anyhow::Error>::sse_decode(&mut deserializer),
+            ),
+            _ => unreachable!(),
+        };
+        deserializer.end();
+        let ans = ans.expect("Dart throws exception but Rust side assume it is not failable");
+        ans
+    }
+
+    move |arg0: i64| {
+        flutter_rust_bridge::for_generated::convert_into_dart_fn_future(body(
+            dart_opaque.clone(),
+            arg0,
+        ))
+    }
+}
+fn decode_DartFn_Inputs_i_64_announced_user_opt_box_autoadd_i_64_Output_bool_AnyhowException(
+    dart_opaque: flutter_rust_bridge::DartOpaque,
+) -> impl Fn(i64, crate::bridge::AnnouncedUser, Option<i64>) -> flutter_rust_bridge::DartFnFuture<bool>
+{
+    use flutter_rust_bridge::IntoDart;
+
+    async fn body(
+        dart_opaque: flutter_rust_bridge::DartOpaque,
+        arg0: i64,
+        arg1: crate::bridge::AnnouncedUser,
+        arg2: Option<i64>,
+    ) -> bool {
+        let args = vec![
+            arg0.into_into_dart().into_dart(),
+            arg1.into_into_dart().into_dart(),
+            arg2.into_into_dart().into_dart(),
+        ];
+        let message = FLUTTER_RUST_BRIDGE_HANDLER
+            .dart_fn_invoke(dart_opaque, args)
+            .await;
+
+        let mut deserializer = flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+        let action = deserializer.cursor.read_u8().unwrap();
+        let ans = match action {
+            0 => std::result::Result::Ok(<bool>::sse_decode(&mut deserializer)),
+            1 => std::result::Result::Err(
+                <flutter_rust_bridge::for_generated::anyhow::Error>::sse_decode(&mut deserializer),
+            ),
+            _ => unreachable!(),
+        };
+        deserializer.end();
+        let ans = ans.expect("Dart throws exception but Rust side assume it is not failable");
+        ans
+    }
+
+    move |arg0: i64, arg1: crate::bridge::AnnouncedUser, arg2: Option<i64>| {
+        flutter_rust_bridge::for_generated::convert_into_dart_fn_future(body(
+            dart_opaque.clone(),
+            arg0,
+            arg1,
+            arg2,
+        ))
+    }
+}
+fn decode_DartFn_Inputs_i_64_i_64_list_prim_u_8_strict_Output_bool_AnyhowException(
+    dart_opaque: flutter_rust_bridge::DartOpaque,
+) -> impl Fn(i64, i64, Vec<u8>) -> flutter_rust_bridge::DartFnFuture<bool> {
+    use flutter_rust_bridge::IntoDart;
+
+    async fn body(
+        dart_opaque: flutter_rust_bridge::DartOpaque,
+        arg0: i64,
+        arg1: i64,
+        arg2: Vec<u8>,
+    ) -> bool {
+        let args = vec![
+            arg0.into_into_dart().into_dart(),
+            arg1.into_into_dart().into_dart(),
+            arg2.into_into_dart().into_dart(),
+        ];
+        let message = FLUTTER_RUST_BRIDGE_HANDLER
+            .dart_fn_invoke(dart_opaque, args)
+            .await;
+
+        let mut deserializer = flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+        let action = deserializer.cursor.read_u8().unwrap();
+        let ans = match action {
+            0 => std::result::Result::Ok(<bool>::sse_decode(&mut deserializer)),
+            1 => std::result::Result::Err(
+                <flutter_rust_bridge::for_generated::anyhow::Error>::sse_decode(&mut deserializer),
+            ),
+            _ => unreachable!(),
+        };
+        deserializer.end();
+        let ans = ans.expect("Dart throws exception but Rust side assume it is not failable");
+        ans
+    }
+
+    move |arg0: i64, arg1: i64, arg2: Vec<u8>| {
+        flutter_rust_bridge::for_generated::convert_into_dart_fn_future(body(
+            dart_opaque.clone(),
+            arg0,
+            arg1,
+            arg2,
+        ))
+    }
+}
+fn decode_DartFn_Inputs_i_64_list_prim_u_8_strict_Output_bool_AnyhowException(
+    dart_opaque: flutter_rust_bridge::DartOpaque,
+) -> impl Fn(i64, Vec<u8>) -> flutter_rust_bridge::DartFnFuture<bool> {
+    use flutter_rust_bridge::IntoDart;
+
+    async fn body(dart_opaque: flutter_rust_bridge::DartOpaque, arg0: i64, arg1: Vec<u8>) -> bool {
+        let args = vec![
+            arg0.into_into_dart().into_dart(),
+            arg1.into_into_dart().into_dart(),
+        ];
+        let message = FLUTTER_RUST_BRIDGE_HANDLER
+            .dart_fn_invoke(dart_opaque, args)
+            .await;
+
+        let mut deserializer = flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+        let action = deserializer.cursor.read_u8().unwrap();
+        let ans = match action {
+            0 => std::result::Result::Ok(<bool>::sse_decode(&mut deserializer)),
+            1 => std::result::Result::Err(
+                <flutter_rust_bridge::for_generated::anyhow::Error>::sse_decode(&mut deserializer),
+            ),
+            _ => unreachable!(),
+        };
+        deserializer.end();
+        let ans = ans.expect("Dart throws exception but Rust side assume it is not failable");
+        ans
+    }
+
+    move |arg0: i64, arg1: Vec<u8>| {
+        flutter_rust_bridge::for_generated::convert_into_dart_fn_future(body(
+            dart_opaque.clone(),
+            arg0,
+            arg1,
+        ))
+    }
+}
+fn decode_DartFn_Inputs_list_list_prim_u_8_strict_Output_bool_AnyhowException(
+    dart_opaque: flutter_rust_bridge::DartOpaque,
+) -> impl Fn(Vec<Vec<u8>>) -> flutter_rust_bridge::DartFnFuture<bool> {
+    use flutter_rust_bridge::IntoDart;
+
+    async fn body(dart_opaque: flutter_rust_bridge::DartOpaque, arg0: Vec<Vec<u8>>) -> bool {
+        let args = vec![arg0.into_into_dart().into_dart()];
+        let message = FLUTTER_RUST_BRIDGE_HANDLER
+            .dart_fn_invoke(dart_opaque, args)
+            .await;
+
+        let mut deserializer = flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+        let action = deserializer.cursor.read_u8().unwrap();
+        let ans = match action {
+            0 => std::result::Result::Ok(<bool>::sse_decode(&mut deserializer)),
+            1 => std::result::Result::Err(
+                <flutter_rust_bridge::for_generated::anyhow::Error>::sse_decode(&mut deserializer),
+            ),
+            _ => unreachable!(),
+        };
+        deserializer.end();
+        let ans = ans.expect("Dart throws exception but Rust side assume it is not failable");
+        ans
+    }
+
+    move |arg0: Vec<Vec<u8>>| {
+        flutter_rust_bridge::for_generated::convert_into_dart_fn_future(body(
+            dart_opaque.clone(),
+            arg0,
+        ))
+    }
+}
+fn decode_DartFn_Inputs_list_prim_u_8_strict_Output_opt_list_prim_u_8_strict_AnyhowException(
+    dart_opaque: flutter_rust_bridge::DartOpaque,
+) -> impl Fn(Vec<u8>) -> flutter_rust_bridge::DartFnFuture<Option<Vec<u8>>> {
+    use flutter_rust_bridge::IntoDart;
+
+    async fn body(dart_opaque: flutter_rust_bridge::DartOpaque, arg0: Vec<u8>) -> Option<Vec<u8>> {
+        let args = vec![arg0.into_into_dart().into_dart()];
+        let message = FLUTTER_RUST_BRIDGE_HANDLER
+            .dart_fn_invoke(dart_opaque, args)
+            .await;
+
+        let mut deserializer = flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+        let action = deserializer.cursor.read_u8().unwrap();
+        let ans = match action {
+            0 => std::result::Result::Ok(<Option<Vec<u8>>>::sse_decode(&mut deserializer)),
+            1 => std::result::Result::Err(
+                <flutter_rust_bridge::for_generated::anyhow::Error>::sse_decode(&mut deserializer),
+            ),
+            _ => unreachable!(),
+        };
+        deserializer.end();
+        let ans = ans.expect("Dart throws exception but Rust side assume it is not failable");
+        ans
+    }
+
+    move |arg0: Vec<u8>| {
+        flutter_rust_bridge::for_generated::convert_into_dart_fn_future(body(
+            dart_opaque.clone(),
+            arg0,
+        ))
+    }
+}
+fn decode_DartFn_Inputs_list_prim_u_8_strict_list_prim_u_8_strict_list_prim_u_8_strict_Output_bool_AnyhowException(
+    dart_opaque: flutter_rust_bridge::DartOpaque,
+) -> impl Fn(Vec<u8>, Vec<u8>, Vec<u8>) -> flutter_rust_bridge::DartFnFuture<bool> {
+    use flutter_rust_bridge::IntoDart;
+
+    async fn body(
+        dart_opaque: flutter_rust_bridge::DartOpaque,
+        arg0: Vec<u8>,
+        arg1: Vec<u8>,
+        arg2: Vec<u8>,
+    ) -> bool {
+        let args = vec![
+            arg0.into_into_dart().into_dart(),
+            arg1.into_into_dart().into_dart(),
+            arg2.into_into_dart().into_dart(),
+        ];
+        let message = FLUTTER_RUST_BRIDGE_HANDLER
+            .dart_fn_invoke(dart_opaque, args)
+            .await;
+
+        let mut deserializer = flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+        let action = deserializer.cursor.read_u8().unwrap();
+        let ans = match action {
+            0 => std::result::Result::Ok(<bool>::sse_decode(&mut deserializer)),
+            1 => std::result::Result::Err(
+                <flutter_rust_bridge::for_generated::anyhow::Error>::sse_decode(&mut deserializer),
+            ),
+            _ => unreachable!(),
+        };
+        deserializer.end();
+        let ans = ans.expect("Dart throws exception but Rust side assume it is not failable");
+        ans
+    }
+
+    move |arg0: Vec<u8>, arg1: Vec<u8>, arg2: Vec<u8>| {
+        flutter_rust_bridge::for_generated::convert_into_dart_fn_future(body(
+            dart_opaque.clone(),
+            arg0,
+            arg1,
+            arg2,
+        ))
+    }
+}
+fn decode_DartFn_Inputs_other_promotion_Output_bool_AnyhowException(
+    dart_opaque: flutter_rust_bridge::DartOpaque,
+) -> impl Fn(crate::bridge::OtherPromotion) -> flutter_rust_bridge::DartFnFuture<bool> {
+    use flutter_rust_bridge::IntoDart;
+
+    async fn body(
+        dart_opaque: flutter_rust_bridge::DartOpaque,
+        arg0: crate::bridge::OtherPromotion,
+    ) -> bool {
+        let args = vec![arg0.into_into_dart().into_dart()];
+        let message = FLUTTER_RUST_BRIDGE_HANDLER
+            .dart_fn_invoke(dart_opaque, args)
+            .await;
+
+        let mut deserializer = flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+        let action = deserializer.cursor.read_u8().unwrap();
+        let ans = match action {
+            0 => std::result::Result::Ok(<bool>::sse_decode(&mut deserializer)),
+            1 => std::result::Result::Err(
+                <flutter_rust_bridge::for_generated::anyhow::Error>::sse_decode(&mut deserializer),
+            ),
+            _ => unreachable!(),
+        };
+        deserializer.end();
+        let ans = ans.expect("Dart throws exception but Rust side assume it is not failable");
+        ans
+    }
+
+    move |arg0: crate::bridge::OtherPromotion| {
+        flutter_rust_bridge::for_generated::convert_into_dart_fn_future(body(
+            dart_opaque.clone(),
+            arg0,
+        ))
+    }
+}
+
+// Section: dart2rust
+
+impl SseDecode for flutter_rust_bridge::for_generated::anyhow::Error {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        let mut inner = <String>::sse_decode(deserializer);
+        return flutter_rust_bridge::for_generated::anyhow::anyhow!("{}", inner);
+    }
+}
+
+impl SseDecode for flutter_rust_bridge::DartOpaque {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        let mut inner = <usize>::sse_decode(deserializer);
+        return unsafe { flutter_rust_bridge::for_generated::sse_decode_dart_opaque(inner) };
+    }
+}
+
+impl SseDecode for StreamSink<String, flutter_rust_bridge::for_generated::SseCodec> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        let mut inner = <String>::sse_decode(deserializer);
+        return StreamSink::deserialize(inner);
+    }
+}
+
+impl SseDecode for String {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        let mut inner = <Vec<u8>>::sse_decode(deserializer);
+        return String::from_utf8(inner).unwrap();
+    }
+}
+
+impl SseDecode for crate::bridge::AnnouncedUser {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        let mut var_userId = <i64>::sse_decode(deserializer);
+        let mut var_publicKey = <Vec<u8>>::sse_decode(deserializer);
+        let mut var_publicId = <i64>::sse_decode(deserializer);
+        return crate::bridge::AnnouncedUser {
+            user_id: var_userId,
+            public_key: var_publicKey,
+            public_id: var_publicId,
+        };
+    }
+}
+
+impl SseDecode for bool {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        deserializer.cursor.read_u8().unwrap() != 0
+    }
+}
+
+impl SseDecode for crate::bridge::wrapper::user_discovery::FlutterUserDiscovery {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        return crate::bridge::wrapper::user_discovery::FlutterUserDiscovery {};
+    }
+}
+
+impl SseDecode for i64 {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        deserializer.cursor.read_i64::<NativeEndian>().unwrap()
+    }
+}
+
+impl SseDecode for isize {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        deserializer.cursor.read_i64::<NativeEndian>().unwrap() as _
+    }
+}
+
+impl SseDecode for Vec<Vec<u8>> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        let mut len_ = <i32>::sse_decode(deserializer);
+        let mut ans_ = Vec::with_capacity(len_ as usize);
+        for idx_ in 0..len_ {
+            ans_.push(<Vec<u8>>::sse_decode(deserializer));
+        }
+        return ans_;
+    }
+}
+
+impl SseDecode for Vec<crate::bridge::OtherPromotion> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        let mut len_ = <i32>::sse_decode(deserializer);
+        let mut ans_ = Vec::with_capacity(len_ as usize);
+        for idx_ in 0..len_ {
+            ans_.push(<crate::bridge::OtherPromotion>::sse_decode(deserializer));
+        }
+        return ans_;
+    }
+}
+
+impl SseDecode for Vec<u8> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        let mut len_ = <i32>::sse_decode(deserializer);
+        let mut ans_ = Vec::with_capacity(len_ as usize);
+        for idx_ in 0..len_ {
+            ans_.push(<u8>::sse_decode(deserializer));
+        }
+        return ans_;
+    }
+}
+
+impl SseDecode for Option<crate::bridge::AnnouncedUser> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        if (<bool>::sse_decode(deserializer)) {
+            return Some(<crate::bridge::AnnouncedUser>::sse_decode(deserializer));
+        } else {
+            return None;
+        }
+    }
+}
+
+impl SseDecode for Option<i64> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        if (<bool>::sse_decode(deserializer)) {
+            return Some(<i64>::sse_decode(deserializer));
+        } else {
+            return None;
+        }
+    }
+}
+
+impl SseDecode for Option<Vec<Vec<u8>>> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        if (<bool>::sse_decode(deserializer)) {
+            return Some(<Vec<Vec<u8>>>::sse_decode(deserializer));
+        } else {
+            return None;
+        }
+    }
+}
+
+impl SseDecode for Option<Vec<crate::bridge::OtherPromotion>> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        if (<bool>::sse_decode(deserializer)) {
+            return Some(<Vec<crate::bridge::OtherPromotion>>::sse_decode(
+                deserializer,
+            ));
+        } else {
+            return None;
+        }
+    }
+}
+
+impl SseDecode for Option<Vec<u8>> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        if (<bool>::sse_decode(deserializer)) {
+            return Some(<Vec<u8>>::sse_decode(deserializer));
+        } else {
+            return None;
+        }
+    }
+}
+
+impl SseDecode for crate::bridge::OtherPromotion {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        let mut var_promotionId = <u32>::sse_decode(deserializer);
+        let mut var_publicId = <i64>::sse_decode(deserializer);
+        let mut var_fromContactId = <i64>::sse_decode(deserializer);
+        let mut var_threshold = <u8>::sse_decode(deserializer);
+        let mut var_announcementShare = <Vec<u8>>::sse_decode(deserializer);
+        let mut var_publicKeyVerifiedTimestamp = <Option<i64>>::sse_decode(deserializer);
+        return crate::bridge::OtherPromotion {
+            promotion_id: var_promotionId,
+            public_id: var_publicId,
+            from_contact_id: var_fromContactId,
+            threshold: var_threshold,
+            announcement_share: var_announcementShare,
+            public_key_verified_timestamp: var_publicKeyVerifiedTimestamp,
+        };
+    }
+}
+
+impl SseDecode for crate::bridge::TwonlyConfig {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        let mut var_databasePath = <String>::sse_decode(deserializer);
+        let mut var_dataDirectory = <String>::sse_decode(deserializer);
+        return crate::bridge::TwonlyConfig {
+            database_path: var_databasePath,
+            data_directory: var_dataDirectory,
+        };
+    }
+}
+
+impl SseDecode for u32 {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        deserializer.cursor.read_u32::<NativeEndian>().unwrap()
+    }
+}
+
+impl SseDecode for u8 {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        deserializer.cursor.read_u8().unwrap()
+    }
+}
+
+impl SseDecode for () {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {}
+}
+
+impl SseDecode for usize {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        deserializer.cursor.read_u64::<NativeEndian>().unwrap() as _
+    }
+}
+
+impl SseDecode for i32 {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        deserializer.cursor.read_i32::<NativeEndian>().unwrap()
+    }
+}
+
+fn pde_ffi_dispatcher_primary_impl(
+    func_id: i32,
+    port: flutter_rust_bridge::for_generated::MessagePort,
+    ptr: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr,
+    rust_vec_len: i32,
+    data_len: i32,
+) {
+    // Codec=Pde (Serialization + dispatch), see doc to use other codecs
+    match func_id {
+                        1 => wire__crate__bridge__wrapper__user_discovery__flutter_user_discovery_get_current_version_impl(port, ptr, rust_vec_len, data_len),
+2 => wire__crate__bridge__wrapper__user_discovery__flutter_user_discovery_get_new_messages_impl(port, ptr, rust_vec_len, data_len),
+3 => wire__crate__bridge__wrapper__user_discovery__flutter_user_discovery_handle_new_messages_impl(port, ptr, rust_vec_len, data_len),
+4 => wire__crate__bridge__wrapper__user_discovery__flutter_user_discovery_initialize_or_update_impl(port, ptr, rust_vec_len, data_len),
+5 => wire__crate__bridge__wrapper__user_discovery__flutter_user_discovery_should_request_new_messages_impl(port, ptr, rust_vec_len, data_len),
+6 => wire__crate__bridge__wrapper__user_discovery__flutter_user_discovery_update_verification_state_for_user_impl(port, ptr, rust_vec_len, data_len),
+7 => wire__crate__bridge__callbacks__init_flutter_callbacks_impl(port, ptr, rust_vec_len, data_len),
+8 => wire__crate__bridge__initialize_twonly_flutter_impl(port, ptr, rust_vec_len, data_len),
+                        _ => unreachable!(),
+                    }
+}
+
+fn pde_ffi_dispatcher_sync_impl(
+    func_id: i32,
+    ptr: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr,
+    rust_vec_len: i32,
+    data_len: i32,
+) -> flutter_rust_bridge::for_generated::WireSyncRust2DartSse {
+    // Codec=Pde (Serialization + dispatch), see doc to use other codecs
+    match func_id {
+        _ => unreachable!(),
+    }
+}
+
+// Section: rust2dart
+
+// Codec=Dco (DartCObject based), see doc to use other codecs
+impl flutter_rust_bridge::IntoDart for FrbWrapper<crate::bridge::AnnouncedUser> {
+    fn into_dart(self) -> flutter_rust_bridge::for_generated::DartAbi {
+        [
+            self.0.user_id.into_into_dart().into_dart(),
+            self.0.public_key.into_into_dart().into_dart(),
+            self.0.public_id.into_into_dart().into_dart(),
+        ]
+        .into_dart()
+    }
+}
+impl flutter_rust_bridge::for_generated::IntoDartExceptPrimitive
+    for FrbWrapper<crate::bridge::AnnouncedUser>
+{
+}
+impl flutter_rust_bridge::IntoIntoDart<FrbWrapper<crate::bridge::AnnouncedUser>>
+    for crate::bridge::AnnouncedUser
+{
+    fn into_into_dart(self) -> FrbWrapper<crate::bridge::AnnouncedUser> {
+        self.into()
+    }
+}
+// Codec=Dco (DartCObject based), see doc to use other codecs
+impl flutter_rust_bridge::IntoDart
+    for crate::bridge::wrapper::user_discovery::FlutterUserDiscovery
+{
+    fn into_dart(self) -> flutter_rust_bridge::for_generated::DartAbi {
+        Vec::<u8>::new().into_dart()
+    }
+}
+impl flutter_rust_bridge::for_generated::IntoDartExceptPrimitive
+    for crate::bridge::wrapper::user_discovery::FlutterUserDiscovery
+{
+}
+impl flutter_rust_bridge::IntoIntoDart<crate::bridge::wrapper::user_discovery::FlutterUserDiscovery>
+    for crate::bridge::wrapper::user_discovery::FlutterUserDiscovery
+{
+    fn into_into_dart(self) -> crate::bridge::wrapper::user_discovery::FlutterUserDiscovery {
+        self
+    }
+}
+// Codec=Dco (DartCObject based), see doc to use other codecs
+impl flutter_rust_bridge::IntoDart for FrbWrapper<crate::bridge::OtherPromotion> {
+    fn into_dart(self) -> flutter_rust_bridge::for_generated::DartAbi {
+        [
+            self.0.promotion_id.into_into_dart().into_dart(),
+            self.0.public_id.into_into_dart().into_dart(),
+            self.0.from_contact_id.into_into_dart().into_dart(),
+            self.0.threshold.into_into_dart().into_dart(),
+            self.0.announcement_share.into_into_dart().into_dart(),
+            self.0
+                .public_key_verified_timestamp
+                .into_into_dart()
+                .into_dart(),
+        ]
+        .into_dart()
+    }
+}
+impl flutter_rust_bridge::for_generated::IntoDartExceptPrimitive
+    for FrbWrapper<crate::bridge::OtherPromotion>
+{
+}
+impl flutter_rust_bridge::IntoIntoDart<FrbWrapper<crate::bridge::OtherPromotion>>
+    for crate::bridge::OtherPromotion
+{
+    fn into_into_dart(self) -> FrbWrapper<crate::bridge::OtherPromotion> {
+        self.into()
+    }
+}
+// Codec=Dco (DartCObject based), see doc to use other codecs
+impl flutter_rust_bridge::IntoDart for crate::bridge::TwonlyConfig {
+    fn into_dart(self) -> flutter_rust_bridge::for_generated::DartAbi {
+        [
+            self.database_path.into_into_dart().into_dart(),
+            self.data_directory.into_into_dart().into_dart(),
+        ]
+        .into_dart()
+    }
+}
+impl flutter_rust_bridge::for_generated::IntoDartExceptPrimitive for crate::bridge::TwonlyConfig {}
+impl flutter_rust_bridge::IntoIntoDart<crate::bridge::TwonlyConfig>
+    for crate::bridge::TwonlyConfig
+{
+    fn into_into_dart(self) -> crate::bridge::TwonlyConfig {
+        self
+    }
+}
+
+impl SseEncode for flutter_rust_bridge::for_generated::anyhow::Error {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        <String>::sse_encode(format!("{:?}", self), serializer);
+    }
+}
+
+impl SseEncode for flutter_rust_bridge::DartOpaque {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        <usize>::sse_encode(self.encode(), serializer);
+    }
+}
+
+impl SseEncode for StreamSink<String, flutter_rust_bridge::for_generated::SseCodec> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        unimplemented!("")
+    }
+}
+
+impl SseEncode for String {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        <Vec<u8>>::sse_encode(self.into_bytes(), serializer);
+    }
+}
+
+impl SseEncode for crate::bridge::AnnouncedUser {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        <i64>::sse_encode(self.user_id, serializer);
+        <Vec<u8>>::sse_encode(self.public_key, serializer);
+        <i64>::sse_encode(self.public_id, serializer);
+    }
+}
+
+impl SseEncode for bool {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        serializer.cursor.write_u8(self as _).unwrap();
+    }
+}
+
+impl SseEncode for crate::bridge::wrapper::user_discovery::FlutterUserDiscovery {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {}
+}
+
+impl SseEncode for i64 {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        serializer.cursor.write_i64::<NativeEndian>(self).unwrap();
+    }
+}
+
+impl SseEncode for isize {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        serializer
+            .cursor
+            .write_i64::<NativeEndian>(self as _)
+            .unwrap();
+    }
+}
+
+impl SseEncode for Vec<Vec<u8>> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        <i32>::sse_encode(self.len() as _, serializer);
+        for item in self {
+            <Vec<u8>>::sse_encode(item, serializer);
+        }
+    }
+}
+
+impl SseEncode for Vec<crate::bridge::OtherPromotion> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        <i32>::sse_encode(self.len() as _, serializer);
+        for item in self {
+            <crate::bridge::OtherPromotion>::sse_encode(item, serializer);
+        }
+    }
+}
+
+impl SseEncode for Vec<u8> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        <i32>::sse_encode(self.len() as _, serializer);
+        for item in self {
+            <u8>::sse_encode(item, serializer);
+        }
+    }
+}
+
+impl SseEncode for Option<crate::bridge::AnnouncedUser> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        <bool>::sse_encode(self.is_some(), serializer);
+        if let Some(value) = self {
+            <crate::bridge::AnnouncedUser>::sse_encode(value, serializer);
+        }
+    }
+}
+
+impl SseEncode for Option<i64> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        <bool>::sse_encode(self.is_some(), serializer);
+        if let Some(value) = self {
+            <i64>::sse_encode(value, serializer);
+        }
+    }
+}
+
+impl SseEncode for Option<Vec<Vec<u8>>> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        <bool>::sse_encode(self.is_some(), serializer);
+        if let Some(value) = self {
+            <Vec<Vec<u8>>>::sse_encode(value, serializer);
+        }
+    }
+}
+
+impl SseEncode for Option<Vec<crate::bridge::OtherPromotion>> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        <bool>::sse_encode(self.is_some(), serializer);
+        if let Some(value) = self {
+            <Vec<crate::bridge::OtherPromotion>>::sse_encode(value, serializer);
+        }
+    }
+}
+
+impl SseEncode for Option<Vec<u8>> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        <bool>::sse_encode(self.is_some(), serializer);
+        if let Some(value) = self {
+            <Vec<u8>>::sse_encode(value, serializer);
+        }
+    }
+}
+
+impl SseEncode for crate::bridge::OtherPromotion {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        <u32>::sse_encode(self.promotion_id, serializer);
+        <i64>::sse_encode(self.public_id, serializer);
+        <i64>::sse_encode(self.from_contact_id, serializer);
+        <u8>::sse_encode(self.threshold, serializer);
+        <Vec<u8>>::sse_encode(self.announcement_share, serializer);
+        <Option<i64>>::sse_encode(self.public_key_verified_timestamp, serializer);
+    }
+}
+
+impl SseEncode for crate::bridge::TwonlyConfig {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        <String>::sse_encode(self.database_path, serializer);
+        <String>::sse_encode(self.data_directory, serializer);
+    }
+}
+
+impl SseEncode for u32 {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        serializer.cursor.write_u32::<NativeEndian>(self).unwrap();
+    }
+}
+
+impl SseEncode for u8 {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        serializer.cursor.write_u8(self).unwrap();
+    }
+}
+
+impl SseEncode for () {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {}
+}
+
+impl SseEncode for usize {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        serializer
+            .cursor
+            .write_u64::<NativeEndian>(self as _)
+            .unwrap();
+    }
+}
+
+impl SseEncode for i32 {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        serializer.cursor.write_i32::<NativeEndian>(self).unwrap();
+    }
+}
+
+#[cfg(not(target_family = "wasm"))]
+mod io {
+    // This file is automatically generated, so please do not edit it.
+    // @generated by `flutter_rust_bridge`@ 2.12.0.
+
+    // Section: imports
+
+    use super::*;
+    use flutter_rust_bridge::for_generated::byteorder::{
+        NativeEndian, ReadBytesExt, WriteBytesExt,
+    };
+    use flutter_rust_bridge::for_generated::{transform_result_dco, Lifetimeable, Lockable};
+    use flutter_rust_bridge::{Handler, IntoIntoDart};
+
+    // Section: boilerplate
+
+    flutter_rust_bridge::frb_generated_boilerplate_io!();
+}
+#[cfg(not(target_family = "wasm"))]
+pub use io::*;
+
+/// cbindgen:ignore
+#[cfg(target_family = "wasm")]
+mod web {
+    // This file is automatically generated, so please do not edit it.
+    // @generated by `flutter_rust_bridge`@ 2.12.0.
+
+    // Section: imports
+
+    use super::*;
+    use flutter_rust_bridge::for_generated::byteorder::{
+        NativeEndian, ReadBytesExt, WriteBytesExt,
+    };
+    use flutter_rust_bridge::for_generated::wasm_bindgen;
+    use flutter_rust_bridge::for_generated::wasm_bindgen::prelude::*;
+    use flutter_rust_bridge::for_generated::{transform_result_dco, Lifetimeable, Lockable};
+    use flutter_rust_bridge::{Handler, IntoIntoDart};
+
+    // Section: boilerplate
+
+    flutter_rust_bridge::frb_generated_boilerplate_web!();
+}
+#[cfg(target_family = "wasm")]
+pub use web::*;
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
new file mode 100644
index 00000000..39c49fb0
--- /dev/null
+++ b/rust/src/lib.rs
@@ -0,0 +1,5 @@
+pub mod bridge;
+mod database;
+mod frb_generated;
+mod standalone;
+mod utils;
diff --git a/rust/src/standalone/mod.rs b/rust/src/standalone/mod.rs
new file mode 100644
index 00000000..c5ece6b4
--- /dev/null
+++ b/rust/src/standalone/mod.rs
@@ -0,0 +1,9 @@
+// use crate::{bridge::TwonlyConfig, database::Database};
+// use std::sync::Arc;
+
+// pub(crate) struct TwonlyStandalone {
+//     #[allow(dead_code)]
+//     pub(crate) config: TwonlyConfig,
+//     /// Because Rust is called from a different process it is safe to write to the twonly_db.
+//     pub(crate) twonly_db: Arc<Database>,
+// }
diff --git a/rust/src/utils.rs b/rust/src/utils.rs
new file mode 100644
index 00000000..c4bba078
--- /dev/null
+++ b/rust/src/utils.rs
@@ -0,0 +1,16 @@
+use std::sync::Arc;
+use tokio::sync::{RwLock, RwLockReadGuard};
+
+#[derive(Default, Clone)]
+pub(crate) struct Shared<T>(Arc<RwLock<T>>);
+impl<T> Shared<T> {
+    pub(crate) fn new(value: T) -> Self {
+        Self(Arc::new(RwLock::new(value)))
+    }
+    pub(crate) async fn get(&self) -> RwLockReadGuard<'_, T> {
+        self.0.read().await
+    }
+    // pub(crate) async fn set(&self, value: T) {
+    //     *self.0.write().await = value;
+    // }
+}
diff --git a/rust/tests/testing.db b/rust/tests/testing.db
new file mode 100644
index 00000000..8f6fbb2e
Binary files /dev/null and b/rust/tests/testing.db differ
diff --git a/rust_builder/.gitignore b/rust_builder/.gitignore
new file mode 100644
index 00000000..ac5aa989
--- /dev/null
+++ b/rust_builder/.gitignore
@@ -0,0 +1,29 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
+/pubspec.lock
+**/doc/api/
+.dart_tool/
+build/
diff --git a/rust_builder/README.md b/rust_builder/README.md
new file mode 100644
index 00000000..922615f9
--- /dev/null
+++ b/rust_builder/README.md
@@ -0,0 +1 @@
+Please ignore this folder, which is just glue to build Rust with Flutter.
\ No newline at end of file
diff --git a/rust_builder/android/.gitignore b/rust_builder/android/.gitignore
new file mode 100644
index 00000000..161bdcda
--- /dev/null
+++ b/rust_builder/android/.gitignore
@@ -0,0 +1,9 @@
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
+.cxx
diff --git a/rust_builder/android/build.gradle b/rust_builder/android/build.gradle
new file mode 100644
index 00000000..484fdf6c
--- /dev/null
+++ b/rust_builder/android/build.gradle
@@ -0,0 +1,56 @@
+// The Android Gradle Plugin builds the native code with the Android NDK.
+
+group 'com.flutter_rust_bridge.rust_lib_twonly'
+version '1.0'
+
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+
+    dependencies {
+        // The Android Gradle Plugin knows how to build native code with the NDK.
+        classpath 'com.android.tools.build:gradle:7.3.0'
+    }
+}
+
+rootProject.allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+apply plugin: 'com.android.library'
+
+android {
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.flutter_rust_bridge.rust_lib_twonly'
+    }
+
+    // Bumping the plugin compileSdkVersion requires all clients of this plugin
+    // to bump the version in their app.
+    compileSdkVersion 33
+
+    // Use the NDK version
+    // declared in /android/app/build.gradle file of the Flutter project.
+    // Replace it with a version number if this plugin requires a specfic NDK version.
+    // (e.g. ndkVersion "23.1.7779620")
+    ndkVersion android.ndkVersion
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    defaultConfig {
+        minSdkVersion 19
+    }
+}
+
+apply from: "../cargokit/gradle/plugin.gradle"
+cargokit {
+    manifestDir = "../../rust"
+    libname = "rust_lib_twonly"
+}
diff --git a/rust_builder/android/settings.gradle b/rust_builder/android/settings.gradle
new file mode 100644
index 00000000..4ce498d0
--- /dev/null
+++ b/rust_builder/android/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'rust_lib_twonly'
diff --git a/rust_builder/android/src/main/AndroidManifest.xml b/rust_builder/android/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..dd460d96
--- /dev/null
+++ b/rust_builder/android/src/main/AndroidManifest.xml
@@ -0,0 +1,3 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  package="com.flutter_rust_bridge.rust_lib_twonly">
+</manifest>
diff --git a/rust_builder/cargokit/.gitignore b/rust_builder/cargokit/.gitignore
new file mode 100644
index 00000000..cf7bb868
--- /dev/null
+++ b/rust_builder/cargokit/.gitignore
@@ -0,0 +1,4 @@
+target
+.dart_tool
+*.iml
+!pubspec.lock
diff --git a/rust_builder/cargokit/LICENSE b/rust_builder/cargokit/LICENSE
new file mode 100644
index 00000000..d33a5fea
--- /dev/null
+++ b/rust_builder/cargokit/LICENSE
@@ -0,0 +1,42 @@
+/// This is copied from Cargokit (which is the official way to use it currently)
+/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin
+
+Copyright 2022 Matej Knopp
+
+================================================================================
+
+MIT LICENSE
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+================================================================================
+
+APACHE LICENSE, VERSION 2.0
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
diff --git a/rust_builder/cargokit/README b/rust_builder/cargokit/README
new file mode 100644
index 00000000..398474db
--- /dev/null
+++ b/rust_builder/cargokit/README
@@ -0,0 +1,11 @@
+/// This is copied from Cargokit (which is the official way to use it currently)
+/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin
+
+Experimental repository to provide glue for seamlessly integrating cargo build
+with flutter plugins and packages.
+
+See https://matejknopp.com/post/flutter_plugin_in_rust_with_no_prebuilt_binaries/
+for a tutorial on how to use Cargokit.
+
+Example plugin available at https://github.com/irondash/hello_rust_ffi_plugin.
+
diff --git a/rust_builder/cargokit/build_pod.sh b/rust_builder/cargokit/build_pod.sh
new file mode 100755
index 00000000..ed0e0d98
--- /dev/null
+++ b/rust_builder/cargokit/build_pod.sh
@@ -0,0 +1,58 @@
+#!/bin/sh
+set -e
+
+BASEDIR=$(dirname "$0")
+
+# Workaround for https://github.com/dart-lang/pub/issues/4010
+BASEDIR=$(cd "$BASEDIR" ; pwd -P)
+
+# Remove XCode SDK from path. Otherwise this breaks tool compilation when building iOS project
+NEW_PATH=`echo $PATH | tr ":" "\n" | grep -v "Contents/Developer/" | tr "\n" ":"`
+
+export PATH=${NEW_PATH%?} # remove trailing :
+
+env
+
+# Platform name (macosx, iphoneos, iphonesimulator)
+export CARGOKIT_DARWIN_PLATFORM_NAME=$PLATFORM_NAME
+
+# Arctive architectures (arm64, armv7, x86_64), space separated.
+export CARGOKIT_DARWIN_ARCHS=$ARCHS
+
+# Current build configuration (Debug, Release)
+export CARGOKIT_CONFIGURATION=$CONFIGURATION
+
+# Path to directory containing Cargo.toml.
+export CARGOKIT_MANIFEST_DIR=$PODS_TARGET_SRCROOT/$1
+
+# Temporary directory for build artifacts.
+export CARGOKIT_TARGET_TEMP_DIR=$TARGET_TEMP_DIR
+
+# Output directory for final artifacts.
+export CARGOKIT_OUTPUT_DIR=$PODS_CONFIGURATION_BUILD_DIR/$PRODUCT_NAME
+
+# Directory to store built tool artifacts.
+export CARGOKIT_TOOL_TEMP_DIR=$TARGET_TEMP_DIR/build_tool
+
+# Directory inside root project. Not necessarily the top level directory of root project.
+export CARGOKIT_ROOT_PROJECT_DIR=$SRCROOT
+
+FLUTTER_EXPORT_BUILD_ENVIRONMENT=(
+  "$PODS_ROOT/../Flutter/ephemeral/flutter_export_environment.sh" # macOS
+  "$PODS_ROOT/../Flutter/flutter_export_environment.sh" # iOS
+)
+
+for path in "${FLUTTER_EXPORT_BUILD_ENVIRONMENT[@]}"
+do
+  if [[ -f "$path" ]]; then
+    source "$path"
+  fi
+done
+
+sh "$BASEDIR/run_build_tool.sh" build-pod "$@"
+
+# Make a symlink from built framework to phony file, which will be used as input to
+# build script. This should force rebuild (podspec currently doesn't support alwaysOutOfDate
+# attribute on custom build phase)
+ln -fs "$OBJROOT/XCBuildData/build.db" "${BUILT_PRODUCTS_DIR}/cargokit_phony"
+ln -fs "${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}" "${BUILT_PRODUCTS_DIR}/cargokit_phony_out"
diff --git a/rust_builder/cargokit/build_tool/README.md b/rust_builder/cargokit/build_tool/README.md
new file mode 100644
index 00000000..a878c279
--- /dev/null
+++ b/rust_builder/cargokit/build_tool/README.md
@@ -0,0 +1,5 @@
+/// This is copied from Cargokit (which is the official way to use it currently)
+/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin
+
+A sample command-line application with an entrypoint in `bin/`, library code
+in `lib/`, and example unit test in `test/`.
diff --git a/rust_builder/cargokit/build_tool/analysis_options.yaml b/rust_builder/cargokit/build_tool/analysis_options.yaml
new file mode 100644
index 00000000..0e16a8b0
--- /dev/null
+++ b/rust_builder/cargokit/build_tool/analysis_options.yaml
@@ -0,0 +1,34 @@
+# This is copied from Cargokit (which is the official way to use it currently)
+# Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin
+
+# This file configures the static analysis results for your project (errors,
+# warnings, and lints).
+#
+# This enables the 'recommended' set of lints from `package:lints`.
+# This set helps identify many issues that may lead to problems when running
+# or consuming Dart code, and enforces writing Dart using a single, idiomatic
+# style and format.
+#
+# If you want a smaller set of lints you can change this to specify
+# 'package:lints/core.yaml'. These are just the most critical lints
+# (the recommended set includes the core lints).
+# The core lints are also what is used by pub.dev for scoring packages.
+
+include: package:lints/recommended.yaml
+
+# Uncomment the following section to specify additional rules.
+
+linter:
+  rules:
+    - prefer_relative_imports
+    - directives_ordering
+
+# analyzer:
+#   exclude:
+#     - path/to/excluded/files/**
+
+# For more information about the core and recommended set of lints, see
+# https://dart.dev/go/core-lints
+
+# For additional information about configuring this file, see
+# https://dart.dev/guides/language/analysis-options
diff --git a/rust_builder/cargokit/build_tool/bin/build_tool.dart b/rust_builder/cargokit/build_tool/bin/build_tool.dart
new file mode 100644
index 00000000..268eb524
--- /dev/null
+++ b/rust_builder/cargokit/build_tool/bin/build_tool.dart
@@ -0,0 +1,8 @@
+/// This is copied from Cargokit (which is the official way to use it currently)
+/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin
+
+import 'package:build_tool/build_tool.dart' as build_tool;
+
+void main(List<String> arguments) {
+  build_tool.runMain(arguments);
+}
diff --git a/rust_builder/cargokit/build_tool/lib/build_tool.dart b/rust_builder/cargokit/build_tool/lib/build_tool.dart
new file mode 100644
index 00000000..7c1bb750
--- /dev/null
+++ b/rust_builder/cargokit/build_tool/lib/build_tool.dart
@@ -0,0 +1,8 @@
+/// This is copied from Cargokit (which is the official way to use it currently)
+/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin
+
+import 'src/build_tool.dart' as build_tool;
+
+Future<void> runMain(List<String> args) async {
+  return build_tool.runMain(args);
+}
diff --git a/rust_builder/cargokit/build_tool/lib/src/android_environment.dart b/rust_builder/cargokit/build_tool/lib/src/android_environment.dart
new file mode 100644
index 00000000..15fc9eed
--- /dev/null
+++ b/rust_builder/cargokit/build_tool/lib/src/android_environment.dart
@@ -0,0 +1,195 @@
+/// This is copied from Cargokit (which is the official way to use it currently)
+/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin
+
+import 'dart:io';
+import 'dart:isolate';
+import 'dart:math' as math;
+
+import 'package:collection/collection.dart';
+import 'package:path/path.dart' as path;
+import 'package:version/version.dart';
+
+import 'target.dart';
+import 'util.dart';
+
+class AndroidEnvironment {
+  AndroidEnvironment({
+    required this.sdkPath,
+    required this.ndkVersion,
+    required this.minSdkVersion,
+    required this.targetTempDir,
+    required this.target,
+  });
+
+  static void clangLinkerWrapper(List<String> args) {
+    final clang = Platform.environment['_CARGOKIT_NDK_LINK_CLANG'];
+    if (clang == null) {
+      throw Exception(
+          "cargo-ndk rustc linker: didn't find _CARGOKIT_NDK_LINK_CLANG env var");
+    }
+    final target = Platform.environment['_CARGOKIT_NDK_LINK_TARGET'];
+    if (target == null) {
+      throw Exception(
+          "cargo-ndk rustc linker: didn't find _CARGOKIT_NDK_LINK_TARGET env var");
+    }
+
+    runCommand(clang, [
+      target,
+      ...args,
+    ]);
+  }
+
+  /// Full path to Android SDK.
+  final String sdkPath;
+
+  /// Full version of Android NDK.
+  final String ndkVersion;
+
+  /// Minimum supported SDK version.
+  final int minSdkVersion;
+
+  /// Target directory for build artifacts.
+  final String targetTempDir;
+
+  /// Target being built.
+  final Target target;
+
+  bool ndkIsInstalled() {
+    final ndkPath = path.join(sdkPath, 'ndk', ndkVersion);
+    final ndkPackageXml = File(path.join(ndkPath, 'package.xml'));
+    return ndkPackageXml.existsSync();
+  }
+
+  void installNdk({
+    required String javaHome,
+  }) {
+    final sdkManagerExtension = Platform.isWindows ? '.bat' : '';
+    final sdkManager = path.join(
+      sdkPath,
+      'cmdline-tools',
+      'latest',
+      'bin',
+      'sdkmanager$sdkManagerExtension',
+    );
+
+    log.info('Installing NDK $ndkVersion');
+    runCommand(sdkManager, [
+      '--install',
+      'ndk;$ndkVersion',
+    ], environment: {
+      'JAVA_HOME': javaHome,
+    });
+  }
+
+  Future<Map<String, String>> buildEnvironment() async {
+    final hostArch = Platform.isMacOS
+        ? "darwin-x86_64"
+        : (Platform.isLinux ? "linux-x86_64" : "windows-x86_64");
+
+    final ndkPath = path.join(sdkPath, 'ndk', ndkVersion);
+    final toolchainPath = path.join(
+      ndkPath,
+      'toolchains',
+      'llvm',
+      'prebuilt',
+      hostArch,
+      'bin',
+    );
+
+    final minSdkVersion =
+        math.max(target.androidMinSdkVersion!, this.minSdkVersion);
+
+    final exe = Platform.isWindows ? '.exe' : '';
+
+    final arKey = 'AR_${target.rust}';
+    final arValue = ['${target.rust}-ar', 'llvm-ar', 'llvm-ar.exe']
+        .map((e) => path.join(toolchainPath, e))
+        .firstWhereOrNull((element) => File(element).existsSync());
+    if (arValue == null) {
+      throw Exception('Failed to find ar for $target in $toolchainPath');
+    }
+
+    final targetArg = '--target=${target.rust}$minSdkVersion';
+
+    final ccKey = 'CC_${target.rust}';
+    final ccValue = path.join(toolchainPath, 'clang$exe');
+    final cfFlagsKey = 'CFLAGS_${target.rust}';
+    final cFlagsValue = targetArg;
+
+    final cxxKey = 'CXX_${target.rust}';
+    final cxxValue = path.join(toolchainPath, 'clang++$exe');
+    final cxxFlagsKey = 'CXXFLAGS_${target.rust}';
+    final cxxFlagsValue = targetArg;
+
+    final linkerKey =
+        'cargo_target_${target.rust.replaceAll('-', '_')}_linker'.toUpperCase();
+
+    final ranlibKey = 'RANLIB_${target.rust}';
+    final ranlibValue = path.join(toolchainPath, 'llvm-ranlib$exe');
+
+    final ndkVersionParsed = Version.parse(ndkVersion);
+    final rustFlagsKey = 'CARGO_ENCODED_RUSTFLAGS';
+    final rustFlagsValue = _libGccWorkaround(targetTempDir, ndkVersionParsed);
+
+    final runRustTool =
+        Platform.isWindows ? 'run_build_tool.cmd' : 'run_build_tool.sh';
+
+    final packagePath = (await Isolate.resolvePackageUri(
+            Uri.parse('package:build_tool/buildtool.dart')))!
+        .toFilePath();
+    final selfPath = path.canonicalize(path.join(
+      packagePath,
+      '..',
+      '..',
+      '..',
+      runRustTool,
+    ));
+
+    // Make sure that run_build_tool is working properly even initially launched directly
+    // through dart run.
+    final toolTempDir =
+        Platform.environment['CARGOKIT_TOOL_TEMP_DIR'] ?? targetTempDir;
+
+    return {
+      arKey: arValue,
+      ccKey: ccValue,
+      cfFlagsKey: cFlagsValue,
+      cxxKey: cxxValue,
+      cxxFlagsKey: cxxFlagsValue,
+      ranlibKey: ranlibValue,
+      rustFlagsKey: rustFlagsValue,
+      linkerKey: selfPath,
+      // Recognized by main() so we know when we're acting as a wrapper
+      '_CARGOKIT_NDK_LINK_TARGET': targetArg,
+      '_CARGOKIT_NDK_LINK_CLANG': ccValue,
+      'CARGOKIT_TOOL_TEMP_DIR': toolTempDir,
+    };
+  }
+
+  // Workaround for libgcc missing in NDK23, inspired by cargo-ndk
+  String _libGccWorkaround(String buildDir, Version ndkVersion) {
+    final workaroundDir = path.join(
+      buildDir,
+      'cargokit',
+      'libgcc_workaround',
+      '${ndkVersion.major}',
+    );
+    Directory(workaroundDir).createSync(recursive: true);
+    if (ndkVersion.major >= 23) {
+      File(path.join(workaroundDir, 'libgcc.a'))
+          .writeAsStringSync('INPUT(-lunwind)');
+    } else {
+      // Other way around, untested, forward libgcc.a from libunwind once Rust
+      // gets updated for NDK23+.
+      File(path.join(workaroundDir, 'libunwind.a'))
+          .writeAsStringSync('INPUT(-lgcc)');
+    }
+
+    var rustFlags = Platform.environment['CARGO_ENCODED_RUSTFLAGS'] ?? '';
+    if (rustFlags.isNotEmpty) {
+      rustFlags = '$rustFlags\x1f';
+    }
+    rustFlags = '$rustFlags-L\x1f$workaroundDir';
+    return rustFlags;
+  }
+}
diff --git a/rust_builder/cargokit/build_tool/lib/src/artifacts_provider.dart b/rust_builder/cargokit/build_tool/lib/src/artifacts_provider.dart
new file mode 100644
index 00000000..e608cece
--- /dev/null
+++ b/rust_builder/cargokit/build_tool/lib/src/artifacts_provider.dart
@@ -0,0 +1,266 @@
+/// This is copied from Cargokit (which is the official way to use it currently)
+/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin
+
+import 'dart:io';
+
+import 'package:ed25519_edwards/ed25519_edwards.dart';
+import 'package:http/http.dart';
+import 'package:logging/logging.dart';
+import 'package:path/path.dart' as path;
+
+import 'builder.dart';
+import 'crate_hash.dart';
+import 'options.dart';
+import 'precompile_binaries.dart';
+import 'rustup.dart';
+import 'target.dart';
+
+class Artifact {
+  /// File system location of the artifact.
+  final String path;
+
+  /// Actual file name that the artifact should have in destination folder.
+  final String finalFileName;
+
+  AritifactType get type {
+    if (finalFileName.endsWith('.dll') ||
+        finalFileName.endsWith('.dll.lib') ||
+        finalFileName.endsWith('.pdb') ||
+        finalFileName.endsWith('.so') ||
+        finalFileName.endsWith('.dylib')) {
+      return AritifactType.dylib;
+    } else if (finalFileName.endsWith('.lib') || finalFileName.endsWith('.a')) {
+      return AritifactType.staticlib;
+    } else {
+      throw Exception('Unknown artifact type for $finalFileName');
+    }
+  }
+
+  Artifact({
+    required this.path,
+    required this.finalFileName,
+  });
+}
+
+final _log = Logger('artifacts_provider');
+
+class ArtifactProvider {
+  ArtifactProvider({
+    required this.environment,
+    required this.userOptions,
+  });
+
+  final BuildEnvironment environment;
+  final CargokitUserOptions userOptions;
+
+  Future<Map<Target, List<Artifact>>> getArtifacts(List<Target> targets) async {
+    final result = await _getPrecompiledArtifacts(targets);
+
+    final pendingTargets = List.of(targets);
+    pendingTargets.removeWhere((element) => result.containsKey(element));
+
+    if (pendingTargets.isEmpty) {
+      return result;
+    }
+
+    final rustup = Rustup();
+    for (final target in targets) {
+      final builder = RustBuilder(target: target, environment: environment);
+      builder.prepare(rustup);
+      _log.info('Building ${environment.crateInfo.packageName} for $target');
+      final targetDir = await builder.build();
+      // For local build accept both static and dynamic libraries.
+      final artifactNames = <String>{
+        ...getArtifactNames(
+          target: target,
+          libraryName: environment.crateInfo.packageName,
+          aritifactType: AritifactType.dylib,
+          remote: false,
+        ),
+        ...getArtifactNames(
+          target: target,
+          libraryName: environment.crateInfo.packageName,
+          aritifactType: AritifactType.staticlib,
+          remote: false,
+        )
+      };
+      final artifacts = artifactNames
+          .map((artifactName) => Artifact(
+                path: path.join(targetDir, artifactName),
+                finalFileName: artifactName,
+              ))
+          .where((element) => File(element.path).existsSync())
+          .toList();
+      result[target] = artifacts;
+    }
+    return result;
+  }
+
+  Future<Map<Target, List<Artifact>>> _getPrecompiledArtifacts(
+      List<Target> targets) async {
+    if (userOptions.usePrecompiledBinaries == false) {
+      _log.info('Precompiled binaries are disabled');
+      return {};
+    }
+    if (environment.crateOptions.precompiledBinaries == null) {
+      _log.fine('Precompiled binaries not enabled for this crate');
+      return {};
+    }
+
+    final start = Stopwatch()..start();
+    final crateHash = CrateHash.compute(environment.manifestDir,
+        tempStorage: environment.targetTempDir);
+    _log.fine(
+        'Computed crate hash $crateHash in ${start.elapsedMilliseconds}ms');
+
+    final downloadedArtifactsDir =
+        path.join(environment.targetTempDir, 'precompiled', crateHash);
+    Directory(downloadedArtifactsDir).createSync(recursive: true);
+
+    final res = <Target, List<Artifact>>{};
+
+    for (final target in targets) {
+      final requiredArtifacts = getArtifactNames(
+        target: target,
+        libraryName: environment.crateInfo.packageName,
+        remote: true,
+      );
+      final artifactsForTarget = <Artifact>[];
+
+      for (final artifact in requiredArtifacts) {
+        final fileName = PrecompileBinaries.fileName(target, artifact);
+        final downloadedPath = path.join(downloadedArtifactsDir, fileName);
+        if (!File(downloadedPath).existsSync()) {
+          final signatureFileName =
+              PrecompileBinaries.signatureFileName(target, artifact);
+          await _tryDownloadArtifacts(
+            crateHash: crateHash,
+            fileName: fileName,
+            signatureFileName: signatureFileName,
+            finalPath: downloadedPath,
+          );
+        }
+        if (File(downloadedPath).existsSync()) {
+          artifactsForTarget.add(Artifact(
+            path: downloadedPath,
+            finalFileName: artifact,
+          ));
+        } else {
+          break;
+        }
+      }
+
+      // Only provide complete set of artifacts.
+      if (artifactsForTarget.length == requiredArtifacts.length) {
+        _log.fine('Found precompiled artifacts for $target');
+        res[target] = artifactsForTarget;
+      }
+    }
+
+    return res;
+  }
+
+  static Future<Response> _get(Uri url, {Map<String, String>? headers}) async {
+    int attempt = 0;
+    const maxAttempts = 10;
+    while (true) {
+      try {
+        return await get(url, headers: headers);
+      } on SocketException catch (e) {
+        // Try to detect reset by peer error and retry.
+        if (attempt++ < maxAttempts &&
+            (e.osError?.errorCode == 54 || e.osError?.errorCode == 10054)) {
+          _log.severe(
+              'Failed to download $url: $e, attempt $attempt of $maxAttempts, will retry...');
+          await Future.delayed(Duration(seconds: 1));
+          continue;
+        } else {
+          rethrow;
+        }
+      }
+    }
+  }
+
+  Future<void> _tryDownloadArtifacts({
+    required String crateHash,
+    required String fileName,
+    required String signatureFileName,
+    required String finalPath,
+  }) async {
+    final precompiledBinaries = environment.crateOptions.precompiledBinaries!;
+    final prefix = precompiledBinaries.uriPrefix;
+    final url = Uri.parse('$prefix$crateHash/$fileName');
+    final signatureUrl = Uri.parse('$prefix$crateHash/$signatureFileName');
+    _log.fine('Downloading signature from $signatureUrl');
+    final signature = await _get(signatureUrl);
+    if (signature.statusCode == 404) {
+      _log.warning(
+          'Precompiled binaries not available for crate hash $crateHash ($fileName)');
+      return;
+    }
+    if (signature.statusCode != 200) {
+      _log.severe(
+          'Failed to download signature $signatureUrl: status ${signature.statusCode}');
+      return;
+    }
+    _log.fine('Downloading binary from $url');
+    final res = await _get(url);
+    if (res.statusCode != 200) {
+      _log.severe('Failed to download binary $url: status ${res.statusCode}');
+      return;
+    }
+    if (verify(
+        precompiledBinaries.publicKey, res.bodyBytes, signature.bodyBytes)) {
+      File(finalPath).writeAsBytesSync(res.bodyBytes);
+    } else {
+      _log.shout('Signature verification failed! Ignoring binary.');
+    }
+  }
+}
+
+enum AritifactType {
+  staticlib,
+  dylib,
+}
+
+AritifactType artifactTypeForTarget(Target target) {
+  if (target.darwinPlatform != null) {
+    return AritifactType.staticlib;
+  } else {
+    return AritifactType.dylib;
+  }
+}
+
+List<String> getArtifactNames({
+  required Target target,
+  required String libraryName,
+  required bool remote,
+  AritifactType? aritifactType,
+}) {
+  aritifactType ??= artifactTypeForTarget(target);
+  if (target.darwinArch != null) {
+    if (aritifactType == AritifactType.staticlib) {
+      return ['lib$libraryName.a'];
+    } else {
+      return ['lib$libraryName.dylib'];
+    }
+  } else if (target.rust.contains('-windows-')) {
+    if (aritifactType == AritifactType.staticlib) {
+      return ['$libraryName.lib'];
+    } else {
+      return [
+        '$libraryName.dll',
+        '$libraryName.dll.lib',
+        if (!remote) '$libraryName.pdb'
+      ];
+    }
+  } else if (target.rust.contains('-linux-')) {
+    if (aritifactType == AritifactType.staticlib) {
+      return ['lib$libraryName.a'];
+    } else {
+      return ['lib$libraryName.so'];
+    }
+  } else {
+    throw Exception("Unsupported target: ${target.rust}");
+  }
+}
diff --git a/rust_builder/cargokit/build_tool/lib/src/build_cmake.dart b/rust_builder/cargokit/build_tool/lib/src/build_cmake.dart
new file mode 100644
index 00000000..6f3b2a4e
--- /dev/null
+++ b/rust_builder/cargokit/build_tool/lib/src/build_cmake.dart
@@ -0,0 +1,40 @@
+/// This is copied from Cargokit (which is the official way to use it currently)
+/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin
+
+import 'dart:io';
+
+import 'package:path/path.dart' as path;
+
+import 'artifacts_provider.dart';
+import 'builder.dart';
+import 'environment.dart';
+import 'options.dart';
+import 'target.dart';
+
+class BuildCMake {
+  final CargokitUserOptions userOptions;
+
+  BuildCMake({required this.userOptions});
+
+  Future<void> build() async {
+    final targetPlatform = Environment.targetPlatform;
+    final target = Target.forFlutterName(Environment.targetPlatform);
+    if (target == null) {
+      throw Exception("Unknown target platform: $targetPlatform");
+    }
+
+    final environment = BuildEnvironment.fromEnvironment(isAndroid: false);
+    final provider =
+        ArtifactProvider(environment: environment, userOptions: userOptions);
+    final artifacts = await provider.getArtifacts([target]);
+
+    final libs = artifacts[target]!;
+
+    for (final lib in libs) {
+      if (lib.type == AritifactType.dylib) {
+        File(lib.path)
+            .copySync(path.join(Environment.outputDir, lib.finalFileName));
+      }
+    }
+  }
+}
diff --git a/rust_builder/cargokit/build_tool/lib/src/build_gradle.dart b/rust_builder/cargokit/build_tool/lib/src/build_gradle.dart
new file mode 100644
index 00000000..7e61fcbb
--- /dev/null
+++ b/rust_builder/cargokit/build_tool/lib/src/build_gradle.dart
@@ -0,0 +1,49 @@
+/// This is copied from Cargokit (which is the official way to use it currently)
+/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin
+
+import 'dart:io';
+
+import 'package:logging/logging.dart';
+import 'package:path/path.dart' as path;
+
+import 'artifacts_provider.dart';
+import 'builder.dart';
+import 'environment.dart';
+import 'options.dart';
+import 'target.dart';
+
+final log = Logger('build_gradle');
+
+class BuildGradle {
+  BuildGradle({required this.userOptions});
+
+  final CargokitUserOptions userOptions;
+
+  Future<void> build() async {
+    final targets = Environment.targetPlatforms.map((arch) {
+      final target = Target.forFlutterName(arch);
+      if (target == null) {
+        throw Exception(
+            "Unknown darwin target or platform: $arch, ${Environment.darwinPlatformName}");
+      }
+      return target;
+    }).toList();
+
+    final environment = BuildEnvironment.fromEnvironment(isAndroid: true);
+    final provider =
+        ArtifactProvider(environment: environment, userOptions: userOptions);
+    final artifacts = await provider.getArtifacts(targets);
+
+    for (final target in targets) {
+      final libs = artifacts[target]!;
+      final outputDir = path.join(Environment.outputDir, target.android!);
+      Directory(outputDir).createSync(recursive: true);
+
+      for (final lib in libs) {
+        if (lib.type == AritifactType.dylib) {
+          File(lib.path).copySync(path.join(outputDir, lib.finalFileName));
+        }
+      }
+    }
+  }
+}
diff --git a/rust_builder/cargokit/build_tool/lib/src/build_pod.dart b/rust_builder/cargokit/build_tool/lib/src/build_pod.dart
new file mode 100644
index 00000000..8a9c0db5
--- /dev/null
+++ b/rust_builder/cargokit/build_tool/lib/src/build_pod.dart
@@ -0,0 +1,89 @@
+/// This is copied from Cargokit (which is the official way to use it currently)
+/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin
+
+import 'dart:io';
+
+import 'package:path/path.dart' as path;
+
+import 'artifacts_provider.dart';
+import 'builder.dart';
+import 'environment.dart';
+import 'options.dart';
+import 'target.dart';
+import 'util.dart';
+
+class BuildPod {
+  BuildPod({required this.userOptions});
+
+  final CargokitUserOptions userOptions;
+
+  Future<void> build() async {
+    final targets = Environment.darwinArchs.map((arch) {
+      final target = Target.forDarwin(
+          platformName: Environment.darwinPlatformName, darwinAarch: arch);
+      if (target == null) {
+        throw Exception(
+            "Unknown darwin target or platform: $arch, ${Environment.darwinPlatformName}");
+      }
+      return target;
+    }).toList();
+
+    final environment = BuildEnvironment.fromEnvironment(isAndroid: false);
+    final provider =
+        ArtifactProvider(environment: environment, userOptions: userOptions);
+    final artifacts = await provider.getArtifacts(targets);
+
+    void performLipo(String targetFile, Iterable<String> sourceFiles) {
+      runCommand("lipo", [
+        '-create',
+        ...sourceFiles,
+        '-output',
+        targetFile,
+      ]);
+    }
+
+    final outputDir = Environment.outputDir;
+
+    Directory(outputDir).createSync(recursive: true);
+
+    final staticLibs = artifacts.values
+        .expand((element) => element)
+        .where((element) => element.type == AritifactType.staticlib)
+        .toList();
+    final dynamicLibs = artifacts.values
+        .expand((element) => element)
+        .where((element) => element.type == AritifactType.dylib)
+        .toList();
+
+    final libName = environment.crateInfo.packageName;
+
+    // If there is static lib, use it and link it with pod
+    if (staticLibs.isNotEmpty) {
+      final finalTargetFile = path.join(outputDir, "lib$libName.a");
+      performLipo(finalTargetFile, staticLibs.map((e) => e.path));
+    } else {
+      // Otherwise try to replace bundle dylib with our dylib
+      final bundlePaths = [
+        '$libName.framework/Versions/A/$libName',
+        '$libName.framework/$libName',
+      ];
+
+      for (final bundlePath in bundlePaths) {
+        final targetFile = path.join(outputDir, bundlePath);
+        if (File(targetFile).existsSync()) {
+          performLipo(targetFile, dynamicLibs.map((e) => e.path));
+
+          // Replace absolute id with @rpath one so that it works properly
+          // when moved to Frameworks.
+          runCommand("install_name_tool", [
+            '-id',
+            '@rpath/$bundlePath',
+            targetFile,
+          ]);
+          return;
+        }
+      }
+      throw Exception('Unable to find bundle for dynamic library');
+    }
+  }
+}
diff --git a/rust_builder/cargokit/build_tool/lib/src/build_tool.dart b/rust_builder/cargokit/build_tool/lib/src/build_tool.dart
new file mode 100644
index 00000000..70dfe0eb
--- /dev/null
+++ b/rust_builder/cargokit/build_tool/lib/src/build_tool.dart
@@ -0,0 +1,276 @@
+/// This is copied from Cargokit (which is the official way to use it currently)
+/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin
+
+import 'dart:io';
+
+import 'package:args/command_runner.dart';
+import 'package:ed25519_edwards/ed25519_edwards.dart';
+import 'package:github/github.dart';
+import 'package:hex/hex.dart';
+import 'package:logging/logging.dart';
+
+import 'android_environment.dart';
+import 'build_cmake.dart';
+import 'build_gradle.dart';
+import 'build_pod.dart';
+import 'logging.dart';
+import 'options.dart';
+import 'precompile_binaries.dart';
+import 'target.dart';
+import 'util.dart';
+import 'verify_binaries.dart';
+
+final log = Logger('build_tool');
+
+abstract class BuildCommand extends Command {
+  Future<void> runBuildCommand(CargokitUserOptions options);
+
+  @override
+  Future<void> run() async {
+    final options = CargokitUserOptions.load();
+
+    if (options.verboseLogging ||
+        Platform.environment['CARGOKIT_VERBOSE'] == '1') {
+      enableVerboseLogging();
+    }
+
+    await runBuildCommand(options);
+  }
+}
+
+class BuildPodCommand extends BuildCommand {
+  @override
+  final name = 'build-pod';
+
+  @override
+  final description = 'Build cocoa pod library';
+
+  @override
+  Future<void> runBuildCommand(CargokitUserOptions options) async {
+    final build = BuildPod(userOptions: options);
+    await build.build();
+  }
+}
+
+class BuildGradleCommand extends BuildCommand {
+  @override
+  final name = 'build-gradle';
+
+  @override
+  final description = 'Build android library';
+
+  @override
+  Future<void> runBuildCommand(CargokitUserOptions options) async {
+    final build = BuildGradle(userOptions: options);
+    await build.build();
+  }
+}
+
+class BuildCMakeCommand extends BuildCommand {
+  @override
+  final name = 'build-cmake';
+
+  @override
+  final description = 'Build CMake library';
+
+  @override
+  Future<void> runBuildCommand(CargokitUserOptions options) async {
+    final build = BuildCMake(userOptions: options);
+    await build.build();
+  }
+}
+
+class GenKeyCommand extends Command {
+  @override
+  final name = 'gen-key';
+
+  @override
+  final description = 'Generate key pair for signing precompiled binaries';
+
+  @override
+  void run() {
+    final kp = generateKey();
+    final private = HEX.encode(kp.privateKey.bytes);
+    final public = HEX.encode(kp.publicKey.bytes);
+    print("Private Key: $private");
+    print("Public Key: $public");
+  }
+}
+
+class PrecompileBinariesCommand extends Command {
+  PrecompileBinariesCommand() {
+    argParser
+      ..addOption(
+        'repository',
+        mandatory: true,
+        help: 'Github repository slug in format owner/name',
+      )
+      ..addOption(
+        'manifest-dir',
+        mandatory: true,
+        help: 'Directory containing Cargo.toml',
+      )
+      ..addMultiOption('target',
+          help: 'Rust target triple of artifact to build.\n'
+              'Can be specified multiple times or omitted in which case\n'
+              'all targets for current platform will be built.')
+      ..addOption(
+        'android-sdk-location',
+        help: 'Location of Android SDK (if available)',
+      )
+      ..addOption(
+        'android-ndk-version',
+        help: 'Android NDK version (if available)',
+      )
+      ..addOption(
+        'android-min-sdk-version',
+        help: 'Android minimum rquired version (if available)',
+      )
+      ..addOption(
+        'temp-dir',
+        help: 'Directory to store temporary build artifacts',
+      )
+      ..addOption(
+        'glibc-version',
+        help: 'GLIBC version to use for linux builds',
+      )
+      ..addFlag(
+        "verbose",
+        abbr: "v",
+        defaultsTo: false,
+        help: "Enable verbose logging",
+      );
+  }
+
+  @override
+  final name = 'precompile-binaries';
+
+  @override
+  final description = 'Prebuild and upload binaries\n'
+      'Private key must be passed through PRIVATE_KEY environment variable. '
+      'Use gen_key through generate priave key.\n'
+      'Github token must be passed as GITHUB_TOKEN environment variable.\n';
+
+  @override
+  Future<void> run() async {
+    final verbose = argResults!['verbose'] as bool;
+    if (verbose) {
+      enableVerboseLogging();
+    }
+
+    final privateKeyString = Platform.environment['PRIVATE_KEY'];
+    if (privateKeyString == null) {
+      throw ArgumentError('Missing PRIVATE_KEY environment variable');
+    }
+    final githubToken = Platform.environment['GITHUB_TOKEN'];
+    if (githubToken == null) {
+      throw ArgumentError('Missing GITHUB_TOKEN environment variable');
+    }
+    final privateKey = HEX.decode(privateKeyString);
+    if (privateKey.length != 64) {
+      throw ArgumentError('Private key must be 64 bytes long');
+    }
+    final manifestDir = argResults!['manifest-dir'] as String;
+    if (!Directory(manifestDir).existsSync()) {
+      throw ArgumentError('Manifest directory does not exist: $manifestDir');
+    }
+    String? androidMinSdkVersionString =
+        argResults!['android-min-sdk-version'] as String?;
+    int? androidMinSdkVersion;
+    if (androidMinSdkVersionString != null) {
+      androidMinSdkVersion = int.tryParse(androidMinSdkVersionString);
+      if (androidMinSdkVersion == null) {
+        throw ArgumentError(
+            'Invalid android-min-sdk-version: $androidMinSdkVersionString');
+      }
+    }
+    final targetStrigns = argResults!['target'] as List<String>;
+    final targets = targetStrigns.map((target) {
+      final res = Target.forRustTriple(target);
+      if (res == null) {
+        throw ArgumentError('Invalid target: $target');
+      }
+      return res;
+    }).toList(growable: false);
+    final precompileBinaries = PrecompileBinaries(
+      privateKey: PrivateKey(privateKey),
+      githubToken: githubToken,
+      manifestDir: manifestDir,
+      repositorySlug: RepositorySlug.full(argResults!['repository'] as String),
+      targets: targets,
+      androidSdkLocation: argResults!['android-sdk-location'] as String?,
+      androidNdkVersion: argResults!['android-ndk-version'] as String?,
+      androidMinSdkVersion: androidMinSdkVersion,
+      tempDir: argResults!['temp-dir'] as String?,
+      glibcVersion: argResults!['glibc-version'] as String?,
+    );
+
+    await precompileBinaries.run();
+  }
+}
+
+class VerifyBinariesCommand extends Command {
+  VerifyBinariesCommand() {
+    argParser.addOption(
+      'manifest-dir',
+      mandatory: true,
+      help: 'Directory containing Cargo.toml',
+    );
+  }
+
+  @override
+  final name = "verify-binaries";
+
+  @override
+  final description = 'Verifies published binaries\n'
+      'Checks whether there is a binary published for each targets\n'
+      'and checks the signature.';
+
+  @override
+  Future<void> run() async {
+    final manifestDir = argResults!['manifest-dir'] as String;
+    final verifyBinaries = VerifyBinaries(
+      manifestDir: manifestDir,
+    );
+    await verifyBinaries.run();
+  }
+}
+
+Future<void> runMain(List<String> args) async {
+  try {
+    // Init logging before options are loaded
+    initLogging();
+
+    if (Platform.environment['_CARGOKIT_NDK_LINK_TARGET'] != null) {
+      return AndroidEnvironment.clangLinkerWrapper(args);
+    }
+
+    final runner = CommandRunner('build_tool', 'Cargokit built_tool')
+      ..addCommand(BuildPodCommand())
+      ..addCommand(BuildGradleCommand())
+      ..addCommand(BuildCMakeCommand())
+      ..addCommand(GenKeyCommand())
+      ..addCommand(PrecompileBinariesCommand())
+      ..addCommand(VerifyBinariesCommand());
+
+    await runner.run(args);
+  } on ArgumentError catch (e) {
+    stderr.writeln(e.toString());
+    exit(1);
+  } catch (e, s) {
+    log.severe(kDoubleSeparator);
+    log.severe('Cargokit BuildTool failed with error:');
+    log.severe(kSeparator);
+    log.severe(e);
+    // This tells user to install Rust, there's no need to pollute the log with
+    // stack trace.
+    if (e is! RustupNotFoundException) {
+      log.severe(kSeparator);
+      log.severe(s);
+      log.severe(kSeparator);
+      log.severe('BuildTool arguments: $args');
+    }
+    log.severe(kDoubleSeparator);
+    exit(1);
+  }
+}
diff --git a/rust_builder/cargokit/build_tool/lib/src/builder.dart b/rust_builder/cargokit/build_tool/lib/src/builder.dart
new file mode 100644
index 00000000..cd5269f1
--- /dev/null
+++ b/rust_builder/cargokit/build_tool/lib/src/builder.dart
@@ -0,0 +1,209 @@
+/// This is copied from Cargokit (which is the official way to use it currently)
+/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin
+
+import 'package:collection/collection.dart';
+import 'package:logging/logging.dart';
+import 'package:path/path.dart' as path;
+
+import 'android_environment.dart';
+import 'cargo.dart';
+import 'environment.dart';
+import 'options.dart';
+import 'rustup.dart';
+import 'target.dart';
+import 'util.dart';
+
+final _log = Logger('builder');
+
+enum BuildConfiguration {
+  debug,
+  release,
+  profile,
+}
+
+extension on BuildConfiguration {
+  bool get isDebug => this == BuildConfiguration.debug;
+  String get rustName => switch (this) {
+        BuildConfiguration.debug => 'debug',
+        BuildConfiguration.release => 'release',
+        BuildConfiguration.profile => 'release',
+      };
+}
+
+class BuildException implements Exception {
+  final String message;
+
+  BuildException(this.message);
+
+  @override
+  String toString() {
+    return 'BuildException: $message';
+  }
+}
+
+class BuildEnvironment {
+  final BuildConfiguration configuration;
+  final CargokitCrateOptions crateOptions;
+  final String targetTempDir;
+  final String manifestDir;
+  final CrateInfo crateInfo;
+
+  final bool isAndroid;
+  final String? androidSdkPath;
+  final String? androidNdkVersion;
+  final int? androidMinSdkVersion;
+  final String? javaHome;
+
+  final String? glibcVersion;
+
+  BuildEnvironment({
+    required this.configuration,
+    required this.crateOptions,
+    required this.targetTempDir,
+    required this.manifestDir,
+    required this.crateInfo,
+    required this.isAndroid,
+    this.androidSdkPath,
+    this.androidNdkVersion,
+    this.androidMinSdkVersion,
+    this.javaHome,
+    this.glibcVersion,
+  });
+
+  static BuildConfiguration parseBuildConfiguration(String value) {
+    // XCode configuration adds the flavor to configuration name.
+    final firstSegment = value.split('-').first;
+    final buildConfiguration = BuildConfiguration.values.firstWhereOrNull(
+      (e) => e.name == firstSegment,
+    );
+    if (buildConfiguration == null) {
+      _log.warning('Unknown build configuraiton $value, will assume release');
+      return BuildConfiguration.release;
+    }
+    return buildConfiguration;
+  }
+
+  static BuildEnvironment fromEnvironment({
+    required bool isAndroid,
+  }) {
+    final buildConfiguration =
+        parseBuildConfiguration(Environment.configuration);
+    final manifestDir = Environment.manifestDir;
+    final crateOptions = CargokitCrateOptions.load(
+      manifestDir: manifestDir,
+    );
+    final crateInfo = CrateInfo.load(manifestDir);
+    return BuildEnvironment(
+      configuration: buildConfiguration,
+      crateOptions: crateOptions,
+      targetTempDir: Environment.targetTempDir,
+      manifestDir: manifestDir,
+      crateInfo: crateInfo,
+      isAndroid: isAndroid,
+      androidSdkPath: isAndroid ? Environment.sdkPath : null,
+      androidNdkVersion: isAndroid ? Environment.ndkVersion : null,
+      androidMinSdkVersion:
+          isAndroid ? int.parse(Environment.minSdkVersion) : null,
+      javaHome: isAndroid ? Environment.javaHome : null,
+    );
+  }
+}
+
+class RustBuilder {
+  final Target target;
+  final BuildEnvironment environment;
+
+  RustBuilder({
+    required this.target,
+    required this.environment,
+  });
+
+  void prepare(
+    Rustup rustup,
+  ) {
+    final toolchain = _toolchain;
+    if (rustup.installedTargets(toolchain) == null) {
+      rustup.installToolchain(toolchain);
+    }
+    if (toolchain == 'nightly') {
+      rustup.installRustSrcForNightly();
+    }
+    if (!rustup.installedTargets(toolchain)!.contains(target.rust)) {
+      rustup.installTarget(target.rust, toolchain: toolchain);
+    }
+    if (environment.glibcVersion != null) {
+      rustup.installZigBuild(toolchain);
+    }
+  }
+
+  CargoBuildOptions? get _buildOptions =>
+      environment.crateOptions.cargo[environment.configuration];
+
+  String get _toolchain => _buildOptions?.toolchain.name ?? 'stable';
+
+  /// Returns the path of directory containing build artifacts.
+  Future<String> build() async {
+    final extraArgs = _buildOptions?.flags ?? [];
+    final manifestPath = path.join(environment.manifestDir, 'Cargo.toml');
+    runCommand(
+      'rustup',
+      [
+        'run',
+        _toolchain,
+        'cargo',
+        (target.android == null && environment.glibcVersion != null)
+            ? 'zigbuild'
+            : 'build',
+        ...extraArgs,
+        '--manifest-path',
+        manifestPath,
+        '-p',
+        environment.crateInfo.packageName,
+        if (!environment.configuration.isDebug) '--release',
+        '--target',
+        target.rust +
+            ((target.android == null && environment.glibcVersion != null)
+                ? '.${environment.glibcVersion!}'
+                : ""),
+        '--target-dir',
+        environment.targetTempDir,
+      ],
+      environment: await _buildEnvironment(),
+    );
+    return path.join(
+      environment.targetTempDir,
+      target.rust,
+      environment.configuration.rustName,
+    );
+  }
+
+  Future<Map<String, String>> _buildEnvironment() async {
+    if (target.android == null) {
+      return {};
+    } else {
+      final sdkPath = environment.androidSdkPath;
+      final ndkVersion = environment.androidNdkVersion;
+      final minSdkVersion = environment.androidMinSdkVersion;
+      if (sdkPath == null) {
+        throw BuildException('androidSdkPath is not set');
+      }
+      if (ndkVersion == null) {
+        throw BuildException('androidNdkVersion is not set');
+      }
+      if (minSdkVersion == null) {
+        throw BuildException('androidMinSdkVersion is not set');
+      }
+      final env = AndroidEnvironment(
+        sdkPath: sdkPath,
+        ndkVersion: ndkVersion,
+        minSdkVersion: minSdkVersion,
+        targetTempDir: environment.targetTempDir,
+        target: target,
+      );
+      if (!env.ndkIsInstalled() && environment.javaHome != null) {
+        env.installNdk(javaHome: environment.javaHome!);
+      }
+      return env.buildEnvironment();
+    }
+  }
+}
diff --git a/rust_builder/cargokit/build_tool/lib/src/cargo.dart b/rust_builder/cargokit/build_tool/lib/src/cargo.dart
new file mode 100644
index 00000000..0d8958ff
--- /dev/null
+++ b/rust_builder/cargokit/build_tool/lib/src/cargo.dart
@@ -0,0 +1,48 @@
+/// This is copied from Cargokit (which is the official way to use it currently)
+/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin
+
+import 'dart:io';
+
+import 'package:path/path.dart' as path;
+import 'package:toml/toml.dart';
+
+class ManifestException {
+  ManifestException(this.message, {required this.fileName});
+
+  final String? fileName;
+  final String message;
+
+  @override
+  String toString() {
+    if (fileName != null) {
+      return 'Failed to parse package manifest at $fileName: $message';
+    } else {
+      return 'Failed to parse package manifest: $message';
+    }
+  }
+}
+
+class CrateInfo {
+  CrateInfo({required this.packageName});
+
+  final String packageName;
+
+  static CrateInfo parseManifest(String manifest, {final String? fileName}) {
+    final toml = TomlDocument.parse(manifest);
+    final package = toml.toMap()['package'];
+    if (package == null) {
+      throw ManifestException('Missing package section', fileName: fileName);
+    }
+    final name = package['name'];
+    if (name == null) {
+      throw ManifestException('Missing package name', fileName: fileName);
+    }
+    return CrateInfo(packageName: name);
+  }
+
+  static CrateInfo load(String manifestDir) {
+    final manifestFile = File(path.join(manifestDir, 'Cargo.toml'));
+    final manifest = manifestFile.readAsStringSync();
+    return parseManifest(manifest, fileName: manifestFile.path);
+  }
+}
diff --git a/rust_builder/cargokit/build_tool/lib/src/crate_hash.dart b/rust_builder/cargokit/build_tool/lib/src/crate_hash.dart
new file mode 100644
index 00000000..0c4d88d1
--- /dev/null
+++ b/rust_builder/cargokit/build_tool/lib/src/crate_hash.dart
@@ -0,0 +1,124 @@
+/// This is copied from Cargokit (which is the official way to use it currently)
+/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin
+
+import 'dart:convert';
+import 'dart:io';
+import 'dart:typed_data';
+
+import 'package:collection/collection.dart';
+import 'package:convert/convert.dart';
+import 'package:crypto/crypto.dart';
+import 'package:path/path.dart' as path;
+
+class CrateHash {
+  /// Computes a hash uniquely identifying crate content. This takes into account
+  /// content all all .rs files inside the src directory, as well as Cargo.toml,
+  /// Cargo.lock, build.rs and cargokit.yaml.
+  ///
+  /// If [tempStorage] is provided, computed hash is stored in a file in that directory
+  /// and reused on subsequent calls if the crate content hasn't changed.
+  static String compute(String manifestDir, {String? tempStorage}) {
+    return CrateHash._(
+      manifestDir: manifestDir,
+      tempStorage: tempStorage,
+    )._compute();
+  }
+
+  CrateHash._({
+    required this.manifestDir,
+    required this.tempStorage,
+  });
+
+  String _compute() {
+    final files = getFiles();
+    final tempStorage = this.tempStorage;
+    if (tempStorage != null) {
+      final quickHash = _computeQuickHash(files);
+      final quickHashFolder = Directory(path.join(tempStorage, 'crate_hash'));
+      quickHashFolder.createSync(recursive: true);
+      final quickHashFile = File(path.join(quickHashFolder.path, quickHash));
+      if (quickHashFile.existsSync()) {
+        return quickHashFile.readAsStringSync();
+      }
+      final hash = _computeHash(files);
+      quickHashFile.writeAsStringSync(hash);
+      return hash;
+    } else {
+      return _computeHash(files);
+    }
+  }
+
+  /// Computes a quick hash based on files stat (without reading contents). This
+  /// is used to cache the real hash, which is slower to compute since it involves
+  /// reading every single file.
+  String _computeQuickHash(List<File> files) {
+    final output = AccumulatorSink<Digest>();
+    final input = sha256.startChunkedConversion(output);
+
+    final data = ByteData(8);
+    for (final file in files) {
+      input.add(utf8.encode(file.path));
+      final stat = file.statSync();
+      data.setUint64(0, stat.size);
+      input.add(data.buffer.asUint8List());
+      data.setUint64(0, stat.modified.millisecondsSinceEpoch);
+      input.add(data.buffer.asUint8List());
+    }
+
+    input.close();
+    return base64Url.encode(output.events.single.bytes);
+  }
+
+  String _computeHash(List<File> files) {
+    final output = AccumulatorSink<Digest>();
+    final input = sha256.startChunkedConversion(output);
+
+    void addTextFile(File file) {
+      // text Files are hashed by lines in case we're dealing with github checkout
+      // that auto-converts line endings.
+      final splitter = LineSplitter();
+      if (file.existsSync()) {
+        final data = file.readAsStringSync();
+        final lines = splitter.convert(data);
+        for (final line in lines) {
+          input.add(utf8.encode(line));
+        }
+      }
+    }
+
+    for (final file in files) {
+      addTextFile(file);
+    }
+
+    input.close();
+    final res = output.events.single;
+
+    // Truncate to 128bits.
+    final hash = res.bytes.sublist(0, 16);
+    return hex.encode(hash);
+  }
+
+  List<File> getFiles() {
+    final src = Directory(path.join(manifestDir, 'src'));
+    final files = src
+        .listSync(recursive: true, followLinks: false)
+        .whereType<File>()
+        .toList();
+    files.sortBy((element) => element.path);
+    void addFile(String relative) {
+      final file = File(path.join(manifestDir, relative));
+      if (file.existsSync()) {
+        files.add(file);
+      }
+    }
+
+    addFile('Cargo.toml');
+    addFile('Cargo.lock');
+    addFile('build.rs');
+    addFile('cargokit.yaml');
+    return files;
+  }
+
+  final String manifestDir;
+  final String? tempStorage;
+}
diff --git a/rust_builder/cargokit/build_tool/lib/src/environment.dart b/rust_builder/cargokit/build_tool/lib/src/environment.dart
new file mode 100644
index 00000000..996483a1
--- /dev/null
+++ b/rust_builder/cargokit/build_tool/lib/src/environment.dart
@@ -0,0 +1,68 @@
+/// This is copied from Cargokit (which is the official way to use it currently)
+/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin
+
+import 'dart:io';
+
+extension on String {
+  String resolveSymlink() => File(this).resolveSymbolicLinksSync();
+}
+
+class Environment {
+  /// Current build configuration (debug or release).
+  static String get configuration =>
+      _getEnv("CARGOKIT_CONFIGURATION").toLowerCase();
+
+  static bool get isDebug => configuration == 'debug';
+  static bool get isRelease => configuration == 'release';
+
+  /// Temporary directory where Rust build artifacts are placed.
+  static String get targetTempDir => _getEnv("CARGOKIT_TARGET_TEMP_DIR");
+
+  /// Final output directory where the build artifacts are placed.
+  static String get outputDir => _getEnvPath('CARGOKIT_OUTPUT_DIR');
+
+  /// Path to the crate manifest (containing Cargo.toml).
+  static String get manifestDir => _getEnvPath('CARGOKIT_MANIFEST_DIR');
+
+  /// Directory inside root project. Not necessarily root folder. Symlinks are
+  /// not resolved on purpose.
+  static String get rootProjectDir => _getEnv('CARGOKIT_ROOT_PROJECT_DIR');
+
+  // Pod
+
+  /// Platform name (macosx, iphoneos, iphonesimulator).
+  static String get darwinPlatformName =>
+      _getEnv("CARGOKIT_DARWIN_PLATFORM_NAME");
+
+  /// List of architectures to build for (arm64, armv7, x86_64).
+  static List<String> get darwinArchs =>
+      _getEnv("CARGOKIT_DARWIN_ARCHS").split(' ');
+
+  // Gradle
+  static String get minSdkVersion => _getEnv("CARGOKIT_MIN_SDK_VERSION");
+  static String get ndkVersion => _getEnv("CARGOKIT_NDK_VERSION");
+  static String get sdkPath => _getEnvPath("CARGOKIT_SDK_DIR");
+  static String get javaHome => _getEnvPath("CARGOKIT_JAVA_HOME");
+  static List<String> get targetPlatforms =>
+      _getEnv("CARGOKIT_TARGET_PLATFORMS").split(',');
+
+  // CMAKE
+  static String get targetPlatform => _getEnv("CARGOKIT_TARGET_PLATFORM");
+
+  static String _getEnv(String key) {
+    final res = Platform.environment[key];
+    if (res == null) {
+      throw Exception("Missing environment variable $key");
+    }
+    return res;
+  }
+
+  static String _getEnvPath(String key) {
+    final res = _getEnv(key);
+    if (Directory(res).existsSync()) {
+      return res.resolveSymlink();
+    } else {
+      return res;
+    }
+  }
+}
diff --git a/rust_builder/cargokit/build_tool/lib/src/logging.dart b/rust_builder/cargokit/build_tool/lib/src/logging.dart
new file mode 100644
index 00000000..5edd4fd1
--- /dev/null
+++ b/rust_builder/cargokit/build_tool/lib/src/logging.dart
@@ -0,0 +1,52 @@
+/// This is copied from Cargokit (which is the official way to use it currently)
+/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin
+
+import 'dart:io';
+
+import 'package:logging/logging.dart';
+
+const String kSeparator = "--";
+const String kDoubleSeparator = "==";
+
+bool _lastMessageWasSeparator = false;
+
+void _log(LogRecord rec) {
+  final prefix = '${rec.level.name}: ';
+  final out = rec.level == Level.SEVERE ? stderr : stdout;
+  if (rec.message == kSeparator) {
+    if (!_lastMessageWasSeparator) {
+      out.write(prefix);
+      out.writeln('-' * 80);
+      _lastMessageWasSeparator = true;
+    }
+    return;
+  } else if (rec.message == kDoubleSeparator) {
+    out.write(prefix);
+    out.writeln('=' * 80);
+    _lastMessageWasSeparator = true;
+    return;
+  }
+  out.write(prefix);
+  out.writeln(rec.message);
+  _lastMessageWasSeparator = false;
+}
+
+void initLogging() {
+  Logger.root.level = Level.INFO;
+  Logger.root.onRecord.listen((LogRecord rec) {
+    final lines = rec.message.split('\n');
+    for (final line in lines) {
+      if (line.isNotEmpty || lines.length == 1 || line != lines.last) {
+        _log(LogRecord(
+          rec.level,
+          line,
+          rec.loggerName,
+        ));
+      }
+    }
+  });
+}
+
+void enableVerboseLogging() {
+  Logger.root.level = Level.ALL;
+}
diff --git a/rust_builder/cargokit/build_tool/lib/src/options.dart b/rust_builder/cargokit/build_tool/lib/src/options.dart
new file mode 100644
index 00000000..22aef1d3
--- /dev/null
+++ b/rust_builder/cargokit/build_tool/lib/src/options.dart
@@ -0,0 +1,309 @@
+/// This is copied from Cargokit (which is the official way to use it currently)
+/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin
+
+import 'dart:io';
+
+import 'package:collection/collection.dart';
+import 'package:ed25519_edwards/ed25519_edwards.dart';
+import 'package:hex/hex.dart';
+import 'package:logging/logging.dart';
+import 'package:path/path.dart' as path;
+import 'package:source_span/source_span.dart';
+import 'package:yaml/yaml.dart';
+
+import 'builder.dart';
+import 'environment.dart';
+import 'rustup.dart';
+
+final _log = Logger('options');
+
+/// A class for exceptions that have source span information attached.
+class SourceSpanException implements Exception {
+  // This is a getter so that subclasses can override it.
+  /// A message describing the exception.
+  String get message => _message;
+  final String _message;
+
+  // This is a getter so that subclasses can override it.
+  /// The span associated with this exception.
+  ///
+  /// This may be `null` if the source location can't be determined.
+  SourceSpan? get span => _span;
+  final SourceSpan? _span;
+
+  SourceSpanException(this._message, this._span);
+
+  /// Returns a string representation of `this`.
+  ///
+  /// [color] may either be a [String], a [bool], or `null`. If it's a string,
+  /// it indicates an ANSI terminal color escape that should be used to
+  /// highlight the span's text. If it's `true`, it indicates that the text
+  /// should be highlighted using the default color. If it's `false` or `null`,
+  /// it indicates that the text shouldn't be highlighted.
+  @override
+  String toString({Object? color}) {
+    if (span == null) return message;
+    return 'Error on ${span!.message(message, color: color)}';
+  }
+}
+
+enum Toolchain {
+  stable,
+  beta,
+  nightly,
+}
+
+class CargoBuildOptions {
+  final Toolchain toolchain;
+  final List<String> flags;
+
+  CargoBuildOptions({
+    required this.toolchain,
+    required this.flags,
+  });
+
+  static Toolchain _toolchainFromNode(YamlNode node) {
+    if (node case YamlScalar(value: String name)) {
+      final toolchain =
+          Toolchain.values.firstWhereOrNull((element) => element.name == name);
+      if (toolchain != null) {
+        return toolchain;
+      }
+    }
+    throw SourceSpanException(
+        'Unknown toolchain. Must be one of ${Toolchain.values.map((e) => e.name)}.',
+        node.span);
+  }
+
+  static CargoBuildOptions parse(YamlNode node) {
+    if (node is! YamlMap) {
+      throw SourceSpanException('Cargo options must be a map', node.span);
+    }
+    Toolchain toolchain = Toolchain.stable;
+    List<String> flags = [];
+    for (final MapEntry(:key, :value) in node.nodes.entries) {
+      if (key case YamlScalar(value: 'toolchain')) {
+        toolchain = _toolchainFromNode(value);
+      } else if (key case YamlScalar(value: 'extra_flags')) {
+        if (value case YamlList(nodes: List<YamlNode> list)) {
+          if (list.every((element) {
+            if (element case YamlScalar(value: String _)) {
+              return true;
+            }
+            return false;
+          })) {
+            flags = list.map((e) => e.value as String).toList();
+            continue;
+          }
+        }
+        throw SourceSpanException(
+            'Extra flags must be a list of strings', value.span);
+      } else {
+        throw SourceSpanException(
+            'Unknown cargo option type. Must be "toolchain" or "extra_flags".',
+            key.span);
+      }
+    }
+    return CargoBuildOptions(toolchain: toolchain, flags: flags);
+  }
+}
+
+extension on YamlMap {
+  /// Map that extracts keys so that we can do map case check on them.
+  Map<dynamic, YamlNode> get valueMap =>
+      nodes.map((key, value) => MapEntry(key.value, value));
+}
+
+class PrecompiledBinaries {
+  final String uriPrefix;
+  final PublicKey publicKey;
+
+  PrecompiledBinaries({
+    required this.uriPrefix,
+    required this.publicKey,
+  });
+
+  static PublicKey _publicKeyFromHex(String key, SourceSpan? span) {
+    final bytes = HEX.decode(key);
+    if (bytes.length != 32) {
+      throw SourceSpanException(
+          'Invalid public key. Must be 32 bytes long.', span);
+    }
+    return PublicKey(bytes);
+  }
+
+  static PrecompiledBinaries parse(YamlNode node) {
+    if (node case YamlMap(valueMap: Map<dynamic, YamlNode> map)) {
+      if (map
+          case {
+            'url_prefix': YamlNode urlPrefixNode,
+            'public_key': YamlNode publicKeyNode,
+          }) {
+        final urlPrefix = switch (urlPrefixNode) {
+          YamlScalar(value: String urlPrefix) => urlPrefix,
+          _ => throw SourceSpanException(
+              'Invalid URL prefix value.', urlPrefixNode.span),
+        };
+        final publicKey = switch (publicKeyNode) {
+          YamlScalar(value: String publicKey) =>
+            _publicKeyFromHex(publicKey, publicKeyNode.span),
+          _ => throw SourceSpanException(
+              'Invalid public key value.', publicKeyNode.span),
+        };
+        return PrecompiledBinaries(
+          uriPrefix: urlPrefix,
+          publicKey: publicKey,
+        );
+      }
+    }
+    throw SourceSpanException(
+        'Invalid precompiled binaries value. '
+        'Expected Map with "url_prefix" and "public_key".',
+        node.span);
+  }
+}
+
+/// Cargokit options specified for Rust crate.
+class CargokitCrateOptions {
+  CargokitCrateOptions({
+    this.cargo = const {},
+    this.precompiledBinaries,
+  });
+
+  final Map<BuildConfiguration, CargoBuildOptions> cargo;
+  final PrecompiledBinaries? precompiledBinaries;
+
+  static CargokitCrateOptions parse(YamlNode node) {
+    if (node is! YamlMap) {
+      throw SourceSpanException('Cargokit options must be a map', node.span);
+    }
+    final options = <BuildConfiguration, CargoBuildOptions>{};
+    PrecompiledBinaries? precompiledBinaries;
+
+    for (final entry in node.nodes.entries) {
+      if (entry
+          case MapEntry(
+            key: YamlScalar(value: 'cargo'),
+            value: YamlNode node,
+          )) {
+        if (node is! YamlMap) {
+          throw SourceSpanException('Cargo options must be a map', node.span);
+        }
+        for (final MapEntry(:YamlNode key, :value) in node.nodes.entries) {
+          if (key case YamlScalar(value: String name)) {
+            final configuration = BuildConfiguration.values
+                .firstWhereOrNull((element) => element.name == name);
+            if (configuration != null) {
+              options[configuration] = CargoBuildOptions.parse(value);
+              continue;
+            }
+          }
+          throw SourceSpanException(
+              'Unknown build configuration. Must be one of ${BuildConfiguration.values.map((e) => e.name)}.',
+              key.span);
+        }
+      } else if (entry.key case YamlScalar(value: 'precompiled_binaries')) {
+        precompiledBinaries = PrecompiledBinaries.parse(entry.value);
+      } else {
+        throw SourceSpanException(
+            'Unknown cargokit option type. Must be "cargo" or "precompiled_binaries".',
+            entry.key.span);
+      }
+    }
+    return CargokitCrateOptions(
+      cargo: options,
+      precompiledBinaries: precompiledBinaries,
+    );
+  }
+
+  static CargokitCrateOptions load({
+    required String manifestDir,
+  }) {
+    final uri = Uri.file(path.join(manifestDir, "cargokit.yaml"));
+    final file = File.fromUri(uri);
+    if (file.existsSync()) {
+      final contents = loadYamlNode(file.readAsStringSync(), sourceUrl: uri);
+      return parse(contents);
+    } else {
+      return CargokitCrateOptions();
+    }
+  }
+}
+
+class CargokitUserOptions {
+  // When Rustup is installed always build locally unless user opts into
+  // using precompiled binaries.
+  static bool defaultUsePrecompiledBinaries() {
+    return Rustup.executablePath() == null;
+  }
+
+  CargokitUserOptions({
+    required this.usePrecompiledBinaries,
+    required this.verboseLogging,
+  });
+
+  CargokitUserOptions._()
+      : usePrecompiledBinaries = defaultUsePrecompiledBinaries(),
+        verboseLogging = false;
+
+  static CargokitUserOptions parse(YamlNode node) {
+    if (node is! YamlMap) {
+      throw SourceSpanException('Cargokit options must be a map', node.span);
+    }
+    bool usePrecompiledBinaries = defaultUsePrecompiledBinaries();
+    bool verboseLogging = false;
+
+    for (final entry in node.nodes.entries) {
+      if (entry.key case YamlScalar(value: 'use_precompiled_binaries')) {
+        if (entry.value case YamlScalar(value: bool value)) {
+          usePrecompiledBinaries = value;
+          continue;
+        }
+        throw SourceSpanException(
+            'Invalid value for "use_precompiled_binaries". Must be a boolean.',
+            entry.value.span);
+      } else if (entry.key case YamlScalar(value: 'verbose_logging')) {
+        if (entry.value case YamlScalar(value: bool value)) {
+          verboseLogging = value;
+          continue;
+        }
+        throw SourceSpanException(
+            'Invalid value for "verbose_logging". Must be a boolean.',
+            entry.value.span);
+      } else {
+        throw SourceSpanException(
+            'Unknown cargokit option type. Must be "use_precompiled_binaries" or "verbose_logging".',
+            entry.key.span);
+      }
+    }
+    return CargokitUserOptions(
+      usePrecompiledBinaries: usePrecompiledBinaries,
+      verboseLogging: verboseLogging,
+    );
+  }
+
+  static CargokitUserOptions load() {
+    String fileName = "cargokit_options.yaml";
+    var userProjectDir = Directory(Environment.rootProjectDir);
+
+    while (userProjectDir.parent.path != userProjectDir.path) {
+      final configFile = File(path.join(userProjectDir.path, fileName));
+      if (configFile.existsSync()) {
+        final contents = loadYamlNode(
+          configFile.readAsStringSync(),
+          sourceUrl: configFile.uri,
+        );
+        final res = parse(contents);
+        if (res.verboseLogging) {
+          _log.info('Found user options file at ${configFile.path}');
+        }
+        return res;
+      }
+      userProjectDir = userProjectDir.parent;
+    }
+    return CargokitUserOptions._();
+  }
+
+  final bool usePrecompiledBinaries;
+  final bool verboseLogging;
+}
diff --git a/rust_builder/cargokit/build_tool/lib/src/precompile_binaries.dart b/rust_builder/cargokit/build_tool/lib/src/precompile_binaries.dart
new file mode 100644
index 00000000..019859c3
--- /dev/null
+++ b/rust_builder/cargokit/build_tool/lib/src/precompile_binaries.dart
@@ -0,0 +1,205 @@
+/// This is copied from Cargokit (which is the official way to use it currently)
+/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin
+
+import 'dart:io';
+
+import 'package:ed25519_edwards/ed25519_edwards.dart';
+import 'package:github/github.dart';
+import 'package:logging/logging.dart';
+import 'package:path/path.dart' as path;
+
+import 'artifacts_provider.dart';
+import 'builder.dart';
+import 'cargo.dart';
+import 'crate_hash.dart';
+import 'options.dart';
+import 'rustup.dart';
+import 'target.dart';
+
+final _log = Logger('precompile_binaries');
+
+class PrecompileBinaries {
+  PrecompileBinaries({
+    required this.privateKey,
+    required this.githubToken,
+    required this.repositorySlug,
+    required this.manifestDir,
+    required this.targets,
+    this.androidSdkLocation,
+    this.androidNdkVersion,
+    this.androidMinSdkVersion,
+    this.tempDir,
+    this.glibcVersion,
+  });
+
+  final PrivateKey privateKey;
+  final String githubToken;
+  final RepositorySlug repositorySlug;
+  final String manifestDir;
+  final List<Target> targets;
+  final String? androidSdkLocation;
+  final String? androidNdkVersion;
+  final int? androidMinSdkVersion;
+  final String? tempDir;
+  final String? glibcVersion;
+
+  static String fileName(Target target, String name) {
+    return '${target.rust}_$name';
+  }
+
+  static String signatureFileName(Target target, String name) {
+    return '${target.rust}_$name.sig';
+  }
+
+  Future<void> run() async {
+    final crateInfo = CrateInfo.load(manifestDir);
+
+    final targets = List.of(this.targets);
+    if (targets.isEmpty) {
+      targets.addAll([
+        ...Target.buildableTargets(),
+        if (androidSdkLocation != null) ...Target.androidTargets(),
+      ]);
+    }
+
+    _log.info('Precompiling binaries for $targets');
+
+    final hash = CrateHash.compute(manifestDir);
+    _log.info('Computed crate hash: $hash');
+
+    final String tagName = 'precompiled_$hash';
+
+    final github = GitHub(auth: Authentication.withToken(githubToken));
+    final repo = github.repositories;
+    final release = await _getOrCreateRelease(
+      repo: repo,
+      tagName: tagName,
+      packageName: crateInfo.packageName,
+      hash: hash,
+    );
+
+    final tempDir = this.tempDir != null
+        ? Directory(this.tempDir!)
+        : Directory.systemTemp.createTempSync('precompiled_');
+
+    tempDir.createSync(recursive: true);
+
+    final crateOptions = CargokitCrateOptions.load(
+      manifestDir: manifestDir,
+    );
+
+    final buildEnvironment = BuildEnvironment(
+      configuration: BuildConfiguration.release,
+      crateOptions: crateOptions,
+      targetTempDir: tempDir.path,
+      manifestDir: manifestDir,
+      crateInfo: crateInfo,
+      isAndroid: androidSdkLocation != null,
+      androidSdkPath: androidSdkLocation,
+      androidNdkVersion: androidNdkVersion,
+      androidMinSdkVersion: androidMinSdkVersion,
+      glibcVersion: glibcVersion,
+    );
+
+    final rustup = Rustup();
+
+    for (final target in targets) {
+      final artifactNames = getArtifactNames(
+        target: target,
+        libraryName: crateInfo.packageName,
+        remote: true,
+      );
+
+      if (artifactNames.every((name) {
+        final fileName = PrecompileBinaries.fileName(target, name);
+        return (release.assets ?? []).any((e) => e.name == fileName);
+      })) {
+        _log.info("All artifacts for $target already exist - skipping");
+        continue;
+      }
+
+      _log.info('Building for $target');
+
+      final builder =
+          RustBuilder(target: target, environment: buildEnvironment);
+      builder.prepare(rustup);
+      final res = await builder.build();
+
+      final assets = <CreateReleaseAsset>[];
+      for (final name in artifactNames) {
+        final file = File(path.join(res, name));
+        if (!file.existsSync()) {
+          throw Exception('Missing artifact: ${file.path}');
+        }
+
+        final data = file.readAsBytesSync();
+        final create = CreateReleaseAsset(
+          name: PrecompileBinaries.fileName(target, name),
+          contentType: "application/octet-stream",
+          assetData: data,
+        );
+        final signature = sign(privateKey, data);
+        final signatureCreate = CreateReleaseAsset(
+          name: signatureFileName(target, name),
+          contentType: "application/octet-stream",
+          assetData: signature,
+        );
+        bool verified = verify(public(privateKey), data, signature);
+        if (!verified) {
+          throw Exception('Signature verification failed');
+        }
+        assets.add(create);
+        assets.add(signatureCreate);
+      }
+      _log.info('Uploading assets: ${assets.map((e) => e.name)}');
+      for (final asset in assets) {
+        // This seems to be failing on CI so do it one by one
+        int retryCount = 0;
+        while (true) {
+          try {
+            await repo.uploadReleaseAssets(release, [asset]);
+            break;
+          } on Exception catch (e) {
+            if (retryCount == 10) {
+              rethrow;
+            }
+            ++retryCount;
+            _log.shout(
+                'Upload failed (attempt $retryCount, will retry): ${e.toString()}');
+            await Future.delayed(Duration(seconds: 2));
+          }
+        }
+      }
+    }
+
+    _log.info('Cleaning up');
+    tempDir.deleteSync(recursive: true);
+  }
+
+  Future<Release> _getOrCreateRelease({
+    required RepositoriesService repo,
+    required String tagName,
+    required String packageName,
+    required String hash,
+  }) async {
+    Release release;
+    try {
+      _log.info('Fetching release $tagName');
+      release = await repo.getReleaseByTagName(repositorySlug, tagName);
+    } on ReleaseNotFound {
+      _log.info('Release not found - creating release $tagName');
+      release = await repo.createRelease(
+          repositorySlug,
+          CreateRelease.from(
+            tagName: tagName,
+            name: 'Precompiled binaries ${hash.substring(0, 8)}',
+            targetCommitish: null,
+            isDraft: false,
+            isPrerelease: false,
+            body: 'Precompiled binaries for crate $packageName, '
+                'crate hash $hash.',
+          ));
+    }
+    return release;
+  }
+}
diff --git a/rust_builder/cargokit/build_tool/lib/src/rustup.dart b/rust_builder/cargokit/build_tool/lib/src/rustup.dart
new file mode 100644
index 00000000..e46722be
--- /dev/null
+++ b/rust_builder/cargokit/build_tool/lib/src/rustup.dart
@@ -0,0 +1,149 @@
+/// This is copied from Cargokit (which is the official way to use it currently)
+/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin
+
+import 'dart:io';
+
+import 'package:collection/collection.dart';
+import 'package:path/path.dart' as path;
+
+import 'util.dart';
+
+class _Toolchain {
+  _Toolchain(
+    this.name,
+    this.targets,
+  );
+
+  final String name;
+  final List<String> targets;
+}
+
+class Rustup {
+  List<String>? installedTargets(String toolchain) {
+    final targets = _installedTargets(toolchain);
+    return targets != null ? List.unmodifiable(targets) : null;
+  }
+
+  void installToolchain(String toolchain) {
+    log.info("Installing Rust toolchain: $toolchain");
+    runCommand("rustup", ['toolchain', 'install', toolchain]);
+    _installedToolchains
+        .add(_Toolchain(toolchain, _getInstalledTargets(toolchain)));
+  }
+
+  void installTarget(
+    String target, {
+    required String toolchain,
+  }) {
+    log.info("Installing Rust target: $target");
+    runCommand("rustup", ['target', 'add', '--toolchain', toolchain, target]);
+    _installedTargets(toolchain)?.add(target);
+  }
+
+  bool _didInstallZigBuild = false;
+
+  void installZigBuild(String toolchain) {
+    if (_didInstallZigBuild) {
+      return;
+    }
+
+    log.info("Installing Zig build");
+    runCommand("rustup", [
+      'run',
+      toolchain,
+      'cargo',
+      'install',
+      '--locked',
+      'cargo-zigbuild',
+    ]);
+    _didInstallZigBuild = true;
+  }
+
+  final List<_Toolchain> _installedToolchains;
+
+  Rustup() : _installedToolchains = _getInstalledToolchains();
+
+  List<String>? _installedTargets(String toolchain) => _installedToolchains
+      .firstWhereOrNull(
+          (e) => e.name == toolchain || e.name.startsWith('$toolchain-'))
+      ?.targets;
+
+  static List<_Toolchain> _getInstalledToolchains() {
+    String extractToolchainName(String line) {
+      // ignore (default) after toolchain name
+      final parts = line.split(' ');
+      return parts[0];
+    }
+
+    final res = runCommand("rustup", ['toolchain', 'list']);
+
+    // To list all non-custom toolchains, we need to filter out lines that
+    // don't start with "stable", "beta", or "nightly".
+    Pattern nonCustom = RegExp(r"^(stable|beta|nightly)");
+    final lines = res.stdout
+        .toString()
+        .split('\n')
+        .where((e) => e.isNotEmpty && e.startsWith(nonCustom))
+        .map(extractToolchainName)
+        .toList(growable: true);
+
+    return lines
+        .map(
+          (name) => _Toolchain(
+            name,
+            _getInstalledTargets(name),
+          ),
+        )
+        .toList(growable: true);
+  }
+
+  static List<String> _getInstalledTargets(String toolchain) {
+    final res = runCommand("rustup", [
+      'target',
+      'list',
+      '--toolchain',
+      toolchain,
+      '--installed',
+    ]);
+    final lines = res.stdout
+        .toString()
+        .split('\n')
+        .where((e) => e.isNotEmpty)
+        .toList(growable: true);
+    return lines;
+  }
+
+  bool _didInstallRustSrcForNightly = false;
+
+  void installRustSrcForNightly() {
+    if (_didInstallRustSrcForNightly) {
+      return;
+    }
+    // Useful for -Z build-std
+    runCommand(
+      "rustup",
+      ['component', 'add', 'rust-src', '--toolchain', 'nightly'],
+    );
+    _didInstallRustSrcForNightly = true;
+  }
+
+  static String? executablePath() {
+    final envPath = Platform.environment['PATH'];
+    final envPathSeparator = Platform.isWindows ? ';' : ':';
+    final home = Platform.isWindows
+        ? Platform.environment['USERPROFILE']
+        : Platform.environment['HOME'];
+    final paths = [
+      if (home != null) path.join(home, '.cargo', 'bin'),
+      if (envPath != null) ...envPath.split(envPathSeparator),
+    ];
+    for (final p in paths) {
+      final rustup = Platform.isWindows ? 'rustup.exe' : 'rustup';
+      final rustupPath = path.join(p, rustup);
+      if (File(rustupPath).existsSync()) {
+        return rustupPath;
+      }
+    }
+    return null;
+  }
+}
diff --git a/rust_builder/cargokit/build_tool/lib/src/target.dart b/rust_builder/cargokit/build_tool/lib/src/target.dart
new file mode 100644
index 00000000..624504ed
--- /dev/null
+++ b/rust_builder/cargokit/build_tool/lib/src/target.dart
@@ -0,0 +1,147 @@
+/// This is copied from Cargokit (which is the official way to use it currently)
+/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin
+
+import 'dart:io';
+
+import 'package:collection/collection.dart';
+
+import 'util.dart';
+
+class Target {
+  Target({
+    required this.rust,
+    this.flutter,
+    this.android,
+    this.androidMinSdkVersion,
+    this.darwinPlatform,
+    this.darwinArch,
+  });
+
+  static final all = [
+    Target(
+      rust: 'armv7-linux-androideabi',
+      flutter: 'android-arm',
+      android: 'armeabi-v7a',
+      androidMinSdkVersion: 16,
+    ),
+    Target(
+      rust: 'aarch64-linux-android',
+      flutter: 'android-arm64',
+      android: 'arm64-v8a',
+      androidMinSdkVersion: 21,
+    ),
+    Target(
+      rust: 'i686-linux-android',
+      flutter: 'android-x86',
+      android: 'x86',
+      androidMinSdkVersion: 16,
+    ),
+    Target(
+      rust: 'x86_64-linux-android',
+      flutter: 'android-x64',
+      android: 'x86_64',
+      androidMinSdkVersion: 21,
+    ),
+    Target(
+      rust: 'x86_64-pc-windows-msvc',
+      flutter: 'windows-x64',
+    ),
+    Target(
+      rust: 'aarch64-pc-windows-msvc',
+      flutter: 'windows-arm64',
+    ),
+    Target(
+      rust: 'x86_64-unknown-linux-gnu',
+      flutter: 'linux-x64',
+    ),
+    Target(
+      rust: 'aarch64-unknown-linux-gnu',
+      flutter: 'linux-arm64',
+    ),
+    Target(rust: 'riscv64gc-unknown-linux-gnu', flutter: 'linux-riscv64'),
+    Target(
+      rust: 'x86_64-apple-darwin',
+      darwinPlatform: 'macosx',
+      darwinArch: 'x86_64',
+    ),
+    Target(
+      rust: 'aarch64-apple-darwin',
+      darwinPlatform: 'macosx',
+      darwinArch: 'arm64',
+    ),
+    Target(
+      rust: 'aarch64-apple-ios',
+      darwinPlatform: 'iphoneos',
+      darwinArch: 'arm64',
+    ),
+    Target(
+      rust: 'aarch64-apple-ios-sim',
+      darwinPlatform: 'iphonesimulator',
+      darwinArch: 'arm64',
+    ),
+    Target(
+      rust: 'x86_64-apple-ios',
+      darwinPlatform: 'iphonesimulator',
+      darwinArch: 'x86_64',
+    ),
+  ];
+
+  static Target? forFlutterName(String flutterName) {
+    return all.firstWhereOrNull((element) => element.flutter == flutterName);
+  }
+
+  static Target? forDarwin({
+    required String platformName,
+    required String darwinAarch,
+  }) {
+    return all.firstWhereOrNull((element) => //
+        element.darwinPlatform == platformName &&
+        element.darwinArch == darwinAarch);
+  }
+
+  static Target? forRustTriple(String triple) {
+    return all.firstWhereOrNull((element) => element.rust == triple);
+  }
+
+  static List<Target> androidTargets() {
+    return all
+        .where((element) => element.android != null)
+        .toList(growable: false);
+  }
+
+  /// Returns buildable targets on current host platform ignoring Android targets.
+  static List<Target> buildableTargets() {
+    if (Platform.isLinux) {
+      // Right now we don't support cross-compiling on Linux. So we just return
+      // the host target.
+      final arch = (runCommand('arch', []).stdout as String).trim();
+      if (arch == 'aarch64') {
+        return [Target.forRustTriple('aarch64-unknown-linux-gnu')!];
+      } else if (arch == 'riscv64') {
+        return [Target.forRustTriple('riscv64gc-unknown-linux-gnu')!];
+      } else {
+        return [Target.forRustTriple('x86_64-unknown-linux-gnu')!];
+      }
+    }
+    return all.where((target) {
+      if (Platform.isWindows) {
+        return target.rust.contains('-windows-');
+      } else if (Platform.isMacOS) {
+        return target.darwinPlatform != null;
+      }
+      return false;
+    }).toList(growable: false);
+  }
+
+  @override
+  String toString() {
+    return rust;
+  }
+
+  final String? flutter;
+  final String rust;
+  final String? android;
+  final int? androidMinSdkVersion;
+  final String? darwinPlatform;
+  final String? darwinArch;
+}
diff --git a/rust_builder/cargokit/build_tool/lib/src/util.dart b/rust_builder/cargokit/build_tool/lib/src/util.dart
new file mode 100644
index 00000000..8bb6a872
--- /dev/null
+++ b/rust_builder/cargokit/build_tool/lib/src/util.dart
@@ -0,0 +1,172 @@
+/// This is copied from Cargokit (which is the official way to use it currently)
+/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin
+
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:logging/logging.dart';
+import 'package:path/path.dart' as path;
+
+import 'logging.dart';
+import 'rustup.dart';
+
+final log = Logger("process");
+
+class CommandFailedException implements Exception {
+  final String executable;
+  final List<String> arguments;
+  final ProcessResult result;
+
+  CommandFailedException({
+    required this.executable,
+    required this.arguments,
+    required this.result,
+  });
+
+  @override
+  String toString() {
+    final stdout = result.stdout.toString().trim();
+    final stderr = result.stderr.toString().trim();
+    return [
+      "External Command: $executable ${arguments.map((e) => '"$e"').join(' ')}",
+      "Returned Exit Code: ${result.exitCode}",
+      kSeparator,
+      "STDOUT:",
+      if (stdout.isNotEmpty) stdout,
+      kSeparator,
+      "STDERR:",
+      if (stderr.isNotEmpty) stderr,
+    ].join('\n');
+  }
+}
+
+class TestRunCommandArgs {
+  final String executable;
+  final List<String> arguments;
+  final String? workingDirectory;
+  final Map<String, String>? environment;
+  final bool includeParentEnvironment;
+  final bool runInShell;
+  final Encoding? stdoutEncoding;
+  final Encoding? stderrEncoding;
+
+  TestRunCommandArgs({
+    required this.executable,
+    required this.arguments,
+    this.workingDirectory,
+    this.environment,
+    this.includeParentEnvironment = true,
+    this.runInShell = false,
+    this.stdoutEncoding,
+    this.stderrEncoding,
+  });
+}
+
+class TestRunCommandResult {
+  TestRunCommandResult({
+    this.pid = 1,
+    this.exitCode = 0,
+    this.stdout = '',
+    this.stderr = '',
+  });
+
+  final int pid;
+  final int exitCode;
+  final String stdout;
+  final String stderr;
+}
+
+TestRunCommandResult Function(TestRunCommandArgs args)? testRunCommandOverride;
+
+ProcessResult runCommand(
+  String executable,
+  List<String> arguments, {
+  String? workingDirectory,
+  Map<String, String>? environment,
+  bool includeParentEnvironment = true,
+  bool runInShell = false,
+  Encoding? stdoutEncoding = systemEncoding,
+  Encoding? stderrEncoding = systemEncoding,
+}) {
+  if (testRunCommandOverride != null) {
+    final result = testRunCommandOverride!(TestRunCommandArgs(
+      executable: executable,
+      arguments: arguments,
+      workingDirectory: workingDirectory,
+      environment: environment,
+      includeParentEnvironment: includeParentEnvironment,
+      runInShell: runInShell,
+      stdoutEncoding: stdoutEncoding,
+      stderrEncoding: stderrEncoding,
+    ));
+    return ProcessResult(
+      result.pid,
+      result.exitCode,
+      result.stdout,
+      result.stderr,
+    );
+  }
+  log.finer('Running command $executable ${arguments.join(' ')}');
+  final res = Process.runSync(
+    _resolveExecutable(executable),
+    arguments,
+    workingDirectory: workingDirectory,
+    environment: environment,
+    includeParentEnvironment: includeParentEnvironment,
+    runInShell: runInShell,
+    stderrEncoding: stderrEncoding,
+    stdoutEncoding: stdoutEncoding,
+  );
+  if (res.exitCode != 0) {
+    throw CommandFailedException(
+      executable: executable,
+      arguments: arguments,
+      result: res,
+    );
+  } else {
+    return res;
+  }
+}
+
+class RustupNotFoundException implements Exception {
+  @override
+  String toString() {
+    return [
+      ' ',
+      'rustup not found in PATH.',
+      ' ',
+      'Maybe you need to install Rust? It only takes a minute:',
+      ' ',
+      if (Platform.isWindows) 'https://www.rust-lang.org/tools/install',
+      if (hasHomebrewRustInPath()) ...[
+        '\$ brew unlink rust # Unlink homebrew Rust from PATH',
+      ],
+      if (!Platform.isWindows)
+        "\$ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh",
+      ' ',
+    ].join('\n');
+  }
+
+  static bool hasHomebrewRustInPath() {
+    if (!Platform.isMacOS) {
+      return false;
+    }
+    final envPath = Platform.environment['PATH'] ?? '';
+    final paths = envPath.split(':');
+    return paths.any((p) {
+      return p.contains('homebrew') && File(path.join(p, 'rustc')).existsSync();
+    });
+  }
+}
+
+String _resolveExecutable(String executable) {
+  if (executable == 'rustup') {
+    final resolved = Rustup.executablePath();
+    if (resolved != null) {
+      return resolved;
+    }
+    throw RustupNotFoundException();
+  } else {
+    return executable;
+  }
+}
diff --git a/rust_builder/cargokit/build_tool/lib/src/verify_binaries.dart b/rust_builder/cargokit/build_tool/lib/src/verify_binaries.dart
new file mode 100644
index 00000000..2366b57b
--- /dev/null
+++ b/rust_builder/cargokit/build_tool/lib/src/verify_binaries.dart
@@ -0,0 +1,84 @@
+/// This is copied from Cargokit (which is the official way to use it currently)
+/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin
+
+import 'dart:io';
+
+import 'package:ed25519_edwards/ed25519_edwards.dart';
+import 'package:http/http.dart';
+
+import 'artifacts_provider.dart';
+import 'cargo.dart';
+import 'crate_hash.dart';
+import 'options.dart';
+import 'precompile_binaries.dart';
+import 'target.dart';
+
+class VerifyBinaries {
+  VerifyBinaries({
+    required this.manifestDir,
+  });
+
+  final String manifestDir;
+
+  Future<void> run() async {
+    final crateInfo = CrateInfo.load(manifestDir);
+
+    final config = CargokitCrateOptions.load(manifestDir: manifestDir);
+    final precompiledBinaries = config.precompiledBinaries;
+    if (precompiledBinaries == null) {
+      stdout.writeln('Crate does not support precompiled binaries.');
+    } else {
+      final crateHash = CrateHash.compute(manifestDir);
+      stdout.writeln('Crate hash: $crateHash');
+
+      for (final target in Target.all) {
+        final message = 'Checking ${target.rust}...';
+        stdout.write(message.padRight(40));
+        stdout.flush();
+
+        final artifacts = getArtifactNames(
+          target: target,
+          libraryName: crateInfo.packageName,
+          remote: true,
+        );
+
+        final prefix = precompiledBinaries.uriPrefix;
+
+        bool ok = true;
+
+        for (final artifact in artifacts) {
+          final fileName = PrecompileBinaries.fileName(target, artifact);
+          final signatureFileName =
+              PrecompileBinaries.signatureFileName(target, artifact);
+
+          final url = Uri.parse('$prefix$crateHash/$fileName');
+          final signatureUrl =
+              Uri.parse('$prefix$crateHash/$signatureFileName');
+
+          final signature = await get(signatureUrl);
+          if (signature.statusCode != 200) {
+            stdout.writeln('MISSING');
+            ok = false;
+            break;
+          }
+          final asset = await get(url);
+          if (asset.statusCode != 200) {
+            stdout.writeln('MISSING');
+            ok = false;
+            break;
+          }
+
+          if (!verify(precompiledBinaries.publicKey, asset.bodyBytes,
+              signature.bodyBytes)) {
+            stdout.writeln('INVALID SIGNATURE');
+            ok = false;
+          }
+        }
+
+        if (ok) {
+          stdout.writeln('OK');
+        }
+      }
+    }
+  }
+}
diff --git a/rust_builder/cargokit/build_tool/pubspec.lock b/rust_builder/cargokit/build_tool/pubspec.lock
new file mode 100644
index 00000000..343bdd36
--- /dev/null
+++ b/rust_builder/cargokit/build_tool/pubspec.lock
@@ -0,0 +1,453 @@
+# Generated by pub
+# See https://dart.dev/tools/pub/glossary#lockfile
+packages:
+  _fe_analyzer_shared:
+    dependency: transitive
+    description:
+      name: _fe_analyzer_shared
+      sha256: eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051
+      url: "https://pub.dev"
+    source: hosted
+    version: "64.0.0"
+  adaptive_number:
+    dependency: transitive
+    description:
+      name: adaptive_number
+      sha256: "3a567544e9b5c9c803006f51140ad544aedc79604fd4f3f2c1380003f97c1d77"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
+  analyzer:
+    dependency: transitive
+    description:
+      name: analyzer
+      sha256: "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.2.0"
+  args:
+    dependency: "direct main"
+    description:
+      name: args
+      sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.2"
+  async:
+    dependency: transitive
+    description:
+      name: async
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.11.0"
+  boolean_selector:
+    dependency: transitive
+    description:
+      name: boolean_selector
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
+  collection:
+    dependency: "direct main"
+    description:
+      name: collection
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.18.0"
+  convert:
+    dependency: "direct main"
+    description:
+      name: convert
+      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.1"
+  coverage:
+    dependency: transitive
+    description:
+      name: coverage
+      sha256: "2fb815080e44a09b85e0f2ca8a820b15053982b2e714b59267719e8a9ff17097"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.6.3"
+  crypto:
+    dependency: "direct main"
+    description:
+      name: crypto
+      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.3"
+  ed25519_edwards:
+    dependency: "direct main"
+    description:
+      name: ed25519_edwards
+      sha256: "6ce0112d131327ec6d42beede1e5dfd526069b18ad45dcf654f15074ad9276cd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.1"
+  file:
+    dependency: transitive
+    description:
+      name: file
+      sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.1.4"
+  fixnum:
+    dependency: transitive
+    description:
+      name: fixnum
+      sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  frontend_server_client:
+    dependency: transitive
+    description:
+      name: frontend_server_client
+      sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.2.0"
+  github:
+    dependency: "direct main"
+    description:
+      name: github
+      sha256: "9966bc13bf612342e916b0a343e95e5f046c88f602a14476440e9b75d2295411"
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.17.0"
+  glob:
+    dependency: transitive
+    description:
+      name: glob
+      sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  hex:
+    dependency: "direct main"
+    description:
+      name: hex
+      sha256: "4e7cd54e4b59ba026432a6be2dd9d96e4c5205725194997193bf871703b82c4a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
+  http:
+    dependency: "direct main"
+    description:
+      name: http
+      sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  http_multi_server:
+    dependency: transitive
+    description:
+      name: http_multi_server
+      sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.2.1"
+  http_parser:
+    dependency: transitive
+    description:
+      name: http_parser
+      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.2"
+  io:
+    dependency: transitive
+    description:
+      name: io
+      sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.7"
+  json_annotation:
+    dependency: transitive
+    description:
+      name: json_annotation
+      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.8.1"
+  lints:
+    dependency: "direct dev"
+    description:
+      name: lints
+      sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
+  logging:
+    dependency: "direct main"
+    description:
+      name: logging
+      sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.0"
+  matcher:
+    dependency: transitive
+    description:
+      name: matcher
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.12.16"
+  meta:
+    dependency: transitive
+    description:
+      name: meta
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.9.1"
+  mime:
+    dependency: transitive
+    description:
+      name: mime
+      sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
+  node_preamble:
+    dependency: transitive
+    description:
+      name: node_preamble
+      sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
+  package_config:
+    dependency: transitive
+    description:
+      name: package_config
+      sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
+  path:
+    dependency: "direct main"
+    description:
+      name: path
+      sha256: "2ad4cddff7f5cc0e2d13069f2a3f7a73ca18f66abd6f5ecf215219cdb3638edb"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.8.0"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.4.0"
+  pool:
+    dependency: transitive
+    description:
+      name: pool
+      sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.5.1"
+  pub_semver:
+    dependency: transitive
+    description:
+      name: pub_semver
+      sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.4"
+  shelf:
+    dependency: transitive
+    description:
+      name: shelf
+      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.1"
+  shelf_packages_handler:
+    dependency: transitive
+    description:
+      name: shelf_packages_handler
+      sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.2"
+  shelf_static:
+    dependency: transitive
+    description:
+      name: shelf_static
+      sha256: a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.2"
+  shelf_web_socket:
+    dependency: transitive
+    description:
+      name: shelf_web_socket
+      sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
+  source_map_stack_trace:
+    dependency: transitive
+    description:
+      name: source_map_stack_trace
+      sha256: "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
+  source_maps:
+    dependency: transitive
+    description:
+      name: source_maps
+      sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.10.12"
+  source_span:
+    dependency: "direct main"
+    description:
+      name: source_span
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.10.0"
+  stack_trace:
+    dependency: transitive
+    description:
+      name: stack_trace
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.11.1"
+  stream_channel:
+    dependency: transitive
+    description:
+      name: stream_channel
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  string_scanner:
+    dependency: transitive
+    description:
+      name: string_scanner
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.0"
+  term_glyph:
+    dependency: transitive
+    description:
+      name: term_glyph
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.1"
+  test:
+    dependency: "direct dev"
+    description:
+      name: test
+      sha256: "9b0dd8e36af4a5b1569029949d50a52cb2a2a2fdaa20cebb96e6603b9ae241f9"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.24.6"
+  test_api:
+    dependency: transitive
+    description:
+      name: test_api
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.1"
+  test_core:
+    dependency: transitive
+    description:
+      name: test_core
+      sha256: "4bef837e56375537055fdbbbf6dd458b1859881f4c7e6da936158f77d61ab265"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.6"
+  toml:
+    dependency: "direct main"
+    description:
+      name: toml
+      sha256: "157c5dca5160fced243f3ce984117f729c788bb5e475504f3dbcda881accee44"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.14.0"
+  typed_data:
+    dependency: transitive
+    description:
+      name: typed_data
+      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.2"
+  version:
+    dependency: "direct main"
+    description:
+      name: version
+      sha256: "2307e23a45b43f96469eeab946208ed63293e8afca9c28cd8b5241ff31c55f55"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      sha256: "0fae432c85c4ea880b33b497d32824b97795b04cdaa74d270219572a1f50268d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "11.9.0"
+  watcher:
+    dependency: transitive
+    description:
+      name: watcher
+      sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  web_socket_channel:
+    dependency: transitive
+    description:
+      name: web_socket_channel
+      sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.0"
+  webkit_inspection_protocol:
+    dependency: transitive
+    description:
+      name: webkit_inspection_protocol
+      sha256: "67d3a8b6c79e1987d19d848b0892e582dbb0c66c57cc1fef58a177dd2aa2823d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.0"
+  yaml:
+    dependency: "direct main"
+    description:
+      name: yaml
+      sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.2"
+sdks:
+  dart: ">=3.0.0 <4.0.0"
diff --git a/rust_builder/cargokit/build_tool/pubspec.yaml b/rust_builder/cargokit/build_tool/pubspec.yaml
new file mode 100644
index 00000000..18c61e33
--- /dev/null
+++ b/rust_builder/cargokit/build_tool/pubspec.yaml
@@ -0,0 +1,33 @@
+# This is copied from Cargokit (which is the official way to use it currently)
+# Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin
+
+name: build_tool
+description: Cargokit build_tool. Facilitates the build of Rust crate during Flutter application build.
+publish_to: none
+version: 1.0.0
+
+environment:
+  sdk: ">=3.0.0 <4.0.0"
+
+# Add regular dependencies here.
+dependencies:
+  # these are pinned on purpose because the bundle_tool_runner doesn't have
+  # pubspec.lock. See run_build_tool.sh
+  logging: 1.2.0
+  path: 1.8.0
+  version: 3.0.0
+  collection: 1.18.0
+  ed25519_edwards: 0.3.1
+  hex: 0.2.0
+  yaml: 3.1.2
+  source_span: 1.10.0
+  github: 9.17.0
+  args: 2.4.2
+  crypto: 3.0.3
+  convert: 3.1.1
+  http: 1.1.0
+  toml: 0.14.0
+
+dev_dependencies:
+  lints: ^2.1.0
+  test: ^1.24.0
diff --git a/rust_builder/cargokit/cmake/cargokit.cmake b/rust_builder/cargokit/cmake/cargokit.cmake
new file mode 100644
index 00000000..ddd05df9
--- /dev/null
+++ b/rust_builder/cargokit/cmake/cargokit.cmake
@@ -0,0 +1,99 @@
+SET(cargokit_cmake_root "${CMAKE_CURRENT_LIST_DIR}/..")
+
+# Workaround for https://github.com/dart-lang/pub/issues/4010
+get_filename_component(cargokit_cmake_root "${cargokit_cmake_root}" REALPATH)
+
+if(WIN32)
+    # REALPATH does not properly resolve symlinks on windows :-/
+    execute_process(COMMAND powershell -ExecutionPolicy Bypass -File "${CMAKE_CURRENT_LIST_DIR}/resolve_symlinks.ps1" "${cargokit_cmake_root}" OUTPUT_VARIABLE cargokit_cmake_root OUTPUT_STRIP_TRAILING_WHITESPACE)
+endif()
+
+# Arguments
+# - target: CMAKE target to which rust library is linked
+# - manifest_dir: relative path from current folder to directory containing cargo manifest
+# - lib_name: cargo package name
+# - any_symbol_name: name of any exported symbol from the library.
+#                    used on windows to force linking with library.
+function(apply_cargokit target manifest_dir lib_name any_symbol_name)
+
+    set(CARGOKIT_LIB_NAME "${lib_name}")
+    set(CARGOKIT_LIB_FULL_NAME "${CMAKE_SHARED_MODULE_PREFIX}${CARGOKIT_LIB_NAME}${CMAKE_SHARED_MODULE_SUFFIX}")
+    if (CMAKE_CONFIGURATION_TYPES)
+        set(CARGOKIT_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>")
+        set(OUTPUT_LIB "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/${CARGOKIT_LIB_FULL_NAME}")
+    else()
+        set(CARGOKIT_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}")
+        set(OUTPUT_LIB "${CMAKE_CURRENT_BINARY_DIR}/${CARGOKIT_LIB_FULL_NAME}")
+    endif()
+    set(CARGOKIT_TEMP_DIR "${CMAKE_CURRENT_BINARY_DIR}/cargokit_build")
+
+    if (FLUTTER_TARGET_PLATFORM)
+        set(CARGOKIT_TARGET_PLATFORM "${FLUTTER_TARGET_PLATFORM}")
+    else()
+        set(CARGOKIT_TARGET_PLATFORM "windows-x64")
+    endif()
+
+    set(CARGOKIT_ENV
+        "CARGOKIT_CMAKE=${CMAKE_COMMAND}"
+        "CARGOKIT_CONFIGURATION=$<CONFIG>"
+        "CARGOKIT_MANIFEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${manifest_dir}"
+        "CARGOKIT_TARGET_TEMP_DIR=${CARGOKIT_TEMP_DIR}"
+        "CARGOKIT_OUTPUT_DIR=${CARGOKIT_OUTPUT_DIR}"
+        "CARGOKIT_TARGET_PLATFORM=${CARGOKIT_TARGET_PLATFORM}"
+        "CARGOKIT_TOOL_TEMP_DIR=${CARGOKIT_TEMP_DIR}/tool"
+        "CARGOKIT_ROOT_PROJECT_DIR=${CMAKE_SOURCE_DIR}"
+    )
+
+    if (WIN32)
+        set(SCRIPT_EXTENSION ".cmd")
+        set(IMPORT_LIB_EXTENSION ".lib")
+    else()
+        set(SCRIPT_EXTENSION ".sh")
+        set(IMPORT_LIB_EXTENSION "")
+        execute_process(COMMAND chmod +x "${cargokit_cmake_root}/run_build_tool${SCRIPT_EXTENSION}")
+    endif()
+
+    # Using generators in custom command is only supported in CMake 3.20+
+    if (CMAKE_CONFIGURATION_TYPES AND ${CMAKE_VERSION} VERSION_LESS "3.20.0")
+        foreach(CONFIG IN LISTS CMAKE_CONFIGURATION_TYPES)
+            add_custom_command(
+                OUTPUT
+                "${CMAKE_CURRENT_BINARY_DIR}/${CONFIG}/${CARGOKIT_LIB_FULL_NAME}"
+                "${CMAKE_CURRENT_BINARY_DIR}/_phony_"
+                COMMAND ${CMAKE_COMMAND} -E env ${CARGOKIT_ENV}
+                "${cargokit_cmake_root}/run_build_tool${SCRIPT_EXTENSION}" build-cmake
+                VERBATIM
+            )
+        endforeach()
+    else()
+        add_custom_command(
+            OUTPUT
+            ${OUTPUT_LIB}
+            "${CMAKE_CURRENT_BINARY_DIR}/_phony_"
+            COMMAND ${CMAKE_COMMAND} -E env ${CARGOKIT_ENV}
+            "${cargokit_cmake_root}/run_build_tool${SCRIPT_EXTENSION}" build-cmake
+            VERBATIM
+        )
+    endif()
+
+
+    set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/_phony_" PROPERTIES SYMBOLIC TRUE)
+
+    if (TARGET ${target})
+        # If we have actual cmake target provided create target and make existing
+        # target depend on it
+        add_custom_target("${target}_cargokit" DEPENDS ${OUTPUT_LIB})
+        add_dependencies("${target}" "${target}_cargokit")
+        target_link_libraries("${target}" PRIVATE "${OUTPUT_LIB}${IMPORT_LIB_EXTENSION}")
+        if(WIN32)
+            target_link_options(${target} PRIVATE "/INCLUDE:${any_symbol_name}")
+        endif()
+    else()
+        # Otherwise (FFI) just use ALL to force building always
+        add_custom_target("${target}_cargokit" ALL DEPENDS ${OUTPUT_LIB})
+    endif()
+
+    # Allow adding the output library to plugin bundled libraries
+    set("${target}_cargokit_lib" ${OUTPUT_LIB} PARENT_SCOPE)
+
+endfunction()
diff --git a/rust_builder/cargokit/cmake/resolve_symlinks.ps1 b/rust_builder/cargokit/cmake/resolve_symlinks.ps1
new file mode 100644
index 00000000..2ac593a1
--- /dev/null
+++ b/rust_builder/cargokit/cmake/resolve_symlinks.ps1
@@ -0,0 +1,34 @@
+function Resolve-Symlinks {
+    [CmdletBinding()]
+    [OutputType([string])]
+    param(
+        [Parameter(Position = 0, Mandatory, ValueFromPipeline, ValueFromPipelineByPropertyName)]
+        [string] $Path
+    )
+
+    [string] $separator = '/'
+    [string[]] $parts = $Path.Split($separator)
+
+    [string] $realPath = ''
+    foreach ($part in $parts) {
+        if ($realPath -and !$realPath.EndsWith($separator)) {
+            $realPath += $separator
+        }
+
+        $realPath += $part.Replace('\', '/')
+
+        # The slash is important when using Get-Item on Drive letters in pwsh.
+        if (-not($realPath.Contains($separator)) -and $realPath.EndsWith(':')) {
+            $realPath += '/'
+        }
+
+        $item = Get-Item $realPath
+        if ($item.LinkTarget) {
+            $realPath = $item.LinkTarget.Replace('\', '/')
+        }
+    }
+    $realPath
+}
+
+$path = Resolve-Symlinks -Path $args[0]
+Write-Host $path
diff --git a/rust_builder/cargokit/gradle/plugin.gradle b/rust_builder/cargokit/gradle/plugin.gradle
new file mode 100644
index 00000000..68ff6499
--- /dev/null
+++ b/rust_builder/cargokit/gradle/plugin.gradle
@@ -0,0 +1,184 @@
+/// This is copied from Cargokit (which is the official way to use it currently)
+/// Details: https://fzyzcjy.github.io/flutter_rust_bridge/manual/integrate/builtin
+
+import java.nio.file.Paths
+import org.apache.tools.ant.taskdefs.condition.Os
+
+CargoKitPlugin.file = buildscript.sourceFile
+
+apply plugin: CargoKitPlugin
+
+class CargoKitExtension {
+    String manifestDir; // Relative path to folder containing Cargo.toml
+    String libname; // Library name within Cargo.toml. Must be a cdylib
+}
+
+abstract class CargoKitBuildTask extends DefaultTask {
+
+    @Input
+    String buildMode
+
+    @Input
+    String buildDir
+
+    @Input
+    String outputDir
+
+    @Input
+    String ndkVersion
+
+    @Input
+    String sdkDirectory
+
+    @Input
+    int compileSdkVersion;
+
+    @Input
+    int minSdkVersion;
+
+    @Input
+    String pluginFile
+
+    @Input
+    List<String> targetPlatforms
+
+    @TaskAction
+    def build() {
+        if (project.cargokit.manifestDir == null) {
+            throw new GradleException("Property 'manifestDir' must be set on cargokit extension");
+        }
+
+        if (project.cargokit.libname == null) {
+            throw new GradleException("Property 'libname' must be set on cargokit extension");
+        }
+
+        def executableName = Os.isFamily(Os.FAMILY_WINDOWS) ? "run_build_tool.cmd" : "run_build_tool.sh"
+        def path = Paths.get(new File(pluginFile).parent, "..", executableName);
+
+        def manifestDir = Paths.get(project.buildscript.sourceFile.parent, project.cargokit.manifestDir)
+
+        def rootProjectDir = project.rootProject.projectDir
+
+        if (!Os.isFamily(Os.FAMILY_WINDOWS)) {
+            project.exec {
+                commandLine 'chmod', '+x', path
+            }
+        }
+
+        project.exec {
+            executable path
+            args "build-gradle"
+            environment "CARGOKIT_ROOT_PROJECT_DIR", rootProjectDir
+            environment "CARGOKIT_TOOL_TEMP_DIR", "${buildDir}/build_tool"
+            environment "CARGOKIT_MANIFEST_DIR", manifestDir
+            environment "CARGOKIT_CONFIGURATION", buildMode
+            environment "CARGOKIT_TARGET_TEMP_DIR", buildDir
+            environment "CARGOKIT_OUTPUT_DIR", outputDir
+            environment "CARGOKIT_NDK_VERSION", ndkVersion
+            environment "CARGOKIT_SDK_DIR", sdkDirectory
+            environment "CARGOKIT_COMPILE_SDK_VERSION", compileSdkVersion
+            environment "CARGOKIT_MIN_SDK_VERSION", minSdkVersion
+            environment "CARGOKIT_TARGET_PLATFORMS", targetPlatforms.join(",")
+            environment "CARGOKIT_JAVA_HOME", System.properties['java.home']
+        }
+    }
+}
+
+class CargoKitPlugin implements Plugin<Project> {
+
+    static String file;
+
+    private Plugin findFlutterPlugin(Project rootProject) {
+        _findFlutterPlugin(rootProject.childProjects)
+    }
+
+   private Plugin _findFlutterPlugin(Map projects) {
+        for (project in projects) {
+            for (plugin in project.value.getPlugins()) {
+                if (plugin.class.name == "com.flutter.gradle.FlutterPlugin" || plugin.class.name == "FlutterPlugin") {
+                    return plugin;
+                }
+            }
+            def plugin = _findFlutterPlugin(project.value.childProjects);
+            if (plugin != null) {
+                return plugin;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    void apply(Project project) {
+        def plugin = findFlutterPlugin(project.rootProject);
+
+        project.extensions.create("cargokit", CargoKitExtension)
+
+        if (plugin == null) {
+            print("Flutter plugin not found, CargoKit plugin will not be applied.")
+            return;
+        }
+
+        def cargoBuildDir = "${project.buildDir}/build"
+
+        // Determine if the project is an application or library
+        def isApplication = plugin.project.plugins.hasPlugin('com.android.application')
+        def variants = isApplication ? plugin.project.android.applicationVariants : plugin.project.android.libraryVariants
+
+        variants.all { variant ->
+
+            final buildType = variant.buildType.name
+
+            def cargoOutputDir = "${project.buildDir}/jniLibs/${buildType}";
+            def jniLibs = project.android.sourceSets.maybeCreate(buildType).jniLibs;
+            jniLibs.srcDir(new File(cargoOutputDir))
+
+            def List<String> platforms
+            try {
+                platforms = com.flutter.gradle.FlutterPluginUtils.getTargetPlatforms(project).collect()
+            } catch (Exception ignored) {
+                platforms = plugin.getTargetPlatforms().collect()
+            }
+
+            // Same thing addFlutterDependencies does in flutter.gradle
+            if (buildType == "debug") {
+                platforms.add("android-x86")
+                platforms.add("android-x64")
+            }
+
+            // The task name depends on plugin properties, which are not available
+            // at this point
+            project.getGradle().afterProject {
+                def taskName = "cargokitCargoBuild${project.cargokit.libname.capitalize()}${buildType.capitalize()}";
+
+                if (project.tasks.findByName(taskName)) {
+                    return
+                }
+
+                if (plugin.project.android.ndkVersion == null) {
+                    throw new GradleException("Please set 'android.ndkVersion' in 'app/build.gradle'.")
+                }
+
+                def task = project.tasks.create(taskName, CargoKitBuildTask.class) {
+                    buildMode = variant.buildType.name
+                    buildDir = cargoBuildDir
+                    outputDir = cargoOutputDir
+                    ndkVersion = plugin.project.android.ndkVersion
+                    sdkDirectory = plugin.project.android.sdkDirectory
+                    minSdkVersion = plugin.project.android.defaultConfig.minSdkVersion.apiLevel as int
+                    compileSdkVersion = plugin.project.android.compileSdkVersion.substring(8) as int
+                    targetPlatforms = platforms
+                    pluginFile = CargoKitPlugin.file
+                }
+                def onTask = { newTask ->
+                    if (newTask.name == "merge${buildType.capitalize()}NativeLibs") {
+                        newTask.dependsOn task
+                        // Fix gradle 7.4.2 not picking up JNI library changes
+                        newTask.outputs.upToDateWhen { false }
+                    }
+                }
+                project.tasks.each onTask
+                project.tasks.whenTaskAdded onTask
+            }
+        }
+    }
+}
diff --git a/rust_builder/cargokit/run_build_tool.cmd b/rust_builder/cargokit/run_build_tool.cmd
new file mode 100755
index 00000000..c45d0aa8
--- /dev/null
+++ b/rust_builder/cargokit/run_build_tool.cmd
@@ -0,0 +1,91 @@
+@echo off
+setlocal
+
+setlocal ENABLEDELAYEDEXPANSION
+
+SET BASEDIR=%~dp0
+
+if not exist "%CARGOKIT_TOOL_TEMP_DIR%" (
+    mkdir "%CARGOKIT_TOOL_TEMP_DIR%"
+)
+cd /D "%CARGOKIT_TOOL_TEMP_DIR%"
+
+SET BUILD_TOOL_PKG_DIR=%BASEDIR%build_tool
+SET DART=%FLUTTER_ROOT%\bin\cache\dart-sdk\bin\dart
+
+set BUILD_TOOL_PKG_DIR_POSIX=%BUILD_TOOL_PKG_DIR:\=/%
+
+(
+    echo name: build_tool_runner
+    echo version: 1.0.0
+    echo publish_to: none
+    echo.
+    echo environment:
+    echo   sdk: '^>=3.0.0 ^<4.0.0'
+    echo.
+    echo dependencies:
+    echo   build_tool:
+    echo     path: %BUILD_TOOL_PKG_DIR_POSIX%
+) >pubspec.yaml
+
+if not exist bin (
+    mkdir bin
+)
+
+(
+    echo import 'package:build_tool/build_tool.dart' as build_tool;
+    echo void main^(List^<String^> args^) ^{
+    echo    build_tool.runMain^(args^);
+    echo ^}
+) >bin\build_tool_runner.dart
+
+SET PRECOMPILED=bin\build_tool_runner.dill
+
+REM To detect changes in package we compare output of DIR /s (recursive)
+set PREV_PACKAGE_INFO=.dart_tool\package_info.prev
+set CUR_PACKAGE_INFO=.dart_tool\package_info.cur
+
+DIR "%BUILD_TOOL_PKG_DIR%" /s > "%CUR_PACKAGE_INFO%_orig"
+
+REM Last line in dir output is free space on harddrive. That is bound to
+REM change between invocation so we need to remove it
+(
+    Set "Line="
+    For /F "UseBackQ Delims=" %%A In ("%CUR_PACKAGE_INFO%_orig") Do (
+        SetLocal EnableDelayedExpansion
+        If Defined Line Echo !Line!
+        EndLocal
+        Set "Line=%%A")
+) >"%CUR_PACKAGE_INFO%"
+DEL "%CUR_PACKAGE_INFO%_orig"
+
+REM Compare current directory listing with previous
+FC /B "%CUR_PACKAGE_INFO%" "%PREV_PACKAGE_INFO%" > nul 2>&1
+
+If %ERRORLEVEL% neq 0 (
+    REM Changed - copy current to previous and remove precompiled kernel
+    if exist "%PREV_PACKAGE_INFO%" (
+        DEL "%PREV_PACKAGE_INFO%"
+    )
+    MOVE /Y "%CUR_PACKAGE_INFO%" "%PREV_PACKAGE_INFO%"
+    if exist "%PRECOMPILED%" (
+        DEL "%PRECOMPILED%"
+    )
+)
+
+REM There is no CUR_PACKAGE_INFO it was renamed in previous step to %PREV_PACKAGE_INFO%
+REM which means  we need to do pub get and precompile
+if not exist "%PRECOMPILED%" (
+    echo Running pub get in "%cd%"
+    "%DART%" pub get --no-precompile
+    "%DART%" compile kernel bin/build_tool_runner.dart
+)
+
+"%DART%" "%PRECOMPILED%" %*
+
+REM 253 means invalid snapshot version.
+If %ERRORLEVEL% equ 253 (
+    "%DART%" pub get --no-precompile
+    "%DART%" compile kernel bin/build_tool_runner.dart
+    "%DART%" "%PRECOMPILED%" %*
+)
diff --git a/rust_builder/cargokit/run_build_tool.sh b/rust_builder/cargokit/run_build_tool.sh
new file mode 100755
index 00000000..24b0ed89
--- /dev/null
+++ b/rust_builder/cargokit/run_build_tool.sh
@@ -0,0 +1,99 @@
+#!/usr/bin/env bash
+
+set -e
+
+BASEDIR=$(dirname "$0")
+
+mkdir -p "$CARGOKIT_TOOL_TEMP_DIR"
+
+cd "$CARGOKIT_TOOL_TEMP_DIR"
+
+# Write a very simple bin package in temp folder that depends on build_tool package
+# from Cargokit. This is done to ensure that we don't pollute Cargokit folder
+# with .dart_tool contents.
+
+BUILD_TOOL_PKG_DIR="$BASEDIR/build_tool"
+
+if [[ -z $FLUTTER_ROOT ]]; then # not defined
+  DART=dart
+else
+  DART="$FLUTTER_ROOT/bin/cache/dart-sdk/bin/dart"
+fi
+
+cat << EOF > "pubspec.yaml"
+name: build_tool_runner
+version: 1.0.0
+publish_to: none
+
+environment:
+  sdk: '>=3.0.0 <4.0.0'
+
+dependencies:
+  build_tool:
+    path: "$BUILD_TOOL_PKG_DIR"
+EOF
+
+mkdir -p "bin"
+
+cat << EOF > "bin/build_tool_runner.dart"
+import 'package:build_tool/build_tool.dart' as build_tool;
+void main(List<String> args) {
+  build_tool.runMain(args);
+}
+EOF
+
+# Create alias for `shasum` if it does not exist and `sha1sum` exists
+if ! [ -x "$(command -v shasum)" ] && [ -x "$(command -v sha1sum)" ]; then
+  shopt -s expand_aliases
+  alias shasum="sha1sum"
+fi
+
+# Dart run will not cache any package that has a path dependency, which
+# is the case for our build_tool_runner. So instead we precompile the package
+# ourselves.
+# To invalidate the cached kernel we use the hash of ls -LR of the build_tool
+# package directory. This should be good enough, as the build_tool package
+# itself is not meant to have any path dependencies.
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  PACKAGE_HASH=$(ls -lTR "$BUILD_TOOL_PKG_DIR" | shasum)
+else
+  PACKAGE_HASH=$(ls -lR --full-time "$BUILD_TOOL_PKG_DIR" | shasum)
+fi
+
+PACKAGE_HASH_FILE=".package_hash"
+
+if [ -f "$PACKAGE_HASH_FILE" ]; then
+    EXISTING_HASH=$(cat "$PACKAGE_HASH_FILE")
+    if [ "$PACKAGE_HASH" != "$EXISTING_HASH" ]; then
+        rm "$PACKAGE_HASH_FILE"
+    fi
+fi
+
+# Run pub get if needed.
+if [ ! -f "$PACKAGE_HASH_FILE" ]; then
+    "$DART" pub get --no-precompile
+    "$DART" compile kernel bin/build_tool_runner.dart
+    echo "$PACKAGE_HASH" > "$PACKAGE_HASH_FILE"
+fi
+
+# Rebuild the tool if it was deleted by Android Studio
+if [ ! -f "bin/build_tool_runner.dill" ]; then
+  "$DART" compile kernel bin/build_tool_runner.dart
+fi
+
+set +e
+
+"$DART" bin/build_tool_runner.dill "$@"
+
+exit_code=$?
+
+# 253 means invalid snapshot version.
+if [ $exit_code == 253 ]; then
+  "$DART" pub get --no-precompile
+  "$DART" compile kernel bin/build_tool_runner.dart
+  "$DART" bin/build_tool_runner.dill "$@"
+  exit_code=$?
+fi
+
+exit $exit_code
diff --git a/rust_builder/ios/Classes/dummy_file.c b/rust_builder/ios/Classes/dummy_file.c
new file mode 100644
index 00000000..e06dab99
--- /dev/null
+++ b/rust_builder/ios/Classes/dummy_file.c
@@ -0,0 +1 @@
+// This is an empty file to force CocoaPods to create a framework.
diff --git a/rust_builder/ios/rust_lib_twonly.podspec b/rust_builder/ios/rust_lib_twonly.podspec
new file mode 100644
index 00000000..50e8f7ce
--- /dev/null
+++ b/rust_builder/ios/rust_lib_twonly.podspec
@@ -0,0 +1,45 @@
+#
+# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html.
+# Run `pod lib lint rust_lib_twonly.podspec` to validate before publishing.
+#
+Pod::Spec.new do |s|
+  s.name             = 'rust_lib_twonly'
+  s.version          = '0.0.1'
+  s.summary          = 'A new Flutter FFI plugin project.'
+  s.description      = <<-DESC
+A new Flutter FFI plugin project.
+                       DESC
+  s.homepage         = 'http://example.com'
+  s.license          = { :file => '../LICENSE' }
+  s.author           = { 'Your Company' => 'email@example.com' }
+
+  # This will ensure the source files in Classes/ are included in the native
+  # builds of apps using this FFI plugin. Podspec does not support relative
+  # paths, so Classes contains a forwarder C file that relatively imports
+  # `../src/*` so that the C sources can be shared among all target platforms.
+  s.source           = { :path => '.' }
+  s.source_files = 'Classes/**/*'
+  s.dependency 'Flutter'
+  s.platform = :ios, '11.0'
+
+  # Flutter.framework does not contain a i386 slice.
+  s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
+  s.swift_version = '5.0'
+
+  s.script_phase = {
+    :name => 'Build Rust library',
+    # First argument is relative path to the `rust` folder, second is name of rust library
+    :script => 'sh "$PODS_TARGET_SRCROOT/../cargokit/build_pod.sh" ../../rust rust_lib_twonly',
+    :execution_position => :before_compile,
+    :input_files => ['${BUILT_PRODUCTS_DIR}/cargokit_phony'],
+    # Let XCode know that the static library referenced in -force_load below is
+    # created by this build step.
+    :output_files => ["${BUILT_PRODUCTS_DIR}/librust_lib_twonly.a"],
+  }
+  s.pod_target_xcconfig = {
+    'DEFINES_MODULE' => 'YES',
+    # Flutter.framework does not contain a i386 slice.
+    'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386',
+    'OTHER_LDFLAGS' => '-force_load ${BUILT_PRODUCTS_DIR}/librust_lib_twonly.a',
+  }
+end
\ No newline at end of file
diff --git a/rust_builder/linux/CMakeLists.txt b/rust_builder/linux/CMakeLists.txt
new file mode 100644
index 00000000..4fd90d2a
--- /dev/null
+++ b/rust_builder/linux/CMakeLists.txt
@@ -0,0 +1,19 @@
+# The Flutter tooling requires that developers have CMake 3.10 or later
+# installed. You should not increase this version, as doing so will cause
+# the plugin to fail to compile for some customers of the plugin.
+cmake_minimum_required(VERSION 3.10)
+
+# Project-level configuration.
+set(PROJECT_NAME "rust_lib_twonly")
+project(${PROJECT_NAME} LANGUAGES CXX)
+
+include("../cargokit/cmake/cargokit.cmake")
+apply_cargokit(${PROJECT_NAME} ../../rust rust_lib_twonly "")
+
+# List of absolute paths to libraries that should be bundled with the plugin.
+# This list could contain prebuilt libraries, or libraries created by an
+# external build triggered from this build file.
+set(rust_lib_twonly_bundled_libraries
+  "${${PROJECT_NAME}_cargokit_lib}"
+  PARENT_SCOPE
+)
diff --git a/rust_builder/macos/Classes/dummy_file.c b/rust_builder/macos/Classes/dummy_file.c
new file mode 100644
index 00000000..e06dab99
--- /dev/null
+++ b/rust_builder/macos/Classes/dummy_file.c
@@ -0,0 +1 @@
+// This is an empty file to force CocoaPods to create a framework.
diff --git a/rust_builder/macos/rust_lib_twonly.podspec b/rust_builder/macos/rust_lib_twonly.podspec
new file mode 100644
index 00000000..d2e23871
--- /dev/null
+++ b/rust_builder/macos/rust_lib_twonly.podspec
@@ -0,0 +1,44 @@
+#
+# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html.
+# Run `pod lib lint rust_lib_twonly.podspec` to validate before publishing.
+#
+Pod::Spec.new do |s|
+  s.name             = 'rust_lib_twonly'
+  s.version          = '0.0.1'
+  s.summary          = 'A new Flutter FFI plugin project.'
+  s.description      = <<-DESC
+A new Flutter FFI plugin project.
+                       DESC
+  s.homepage         = 'http://example.com'
+  s.license          = { :file => '../LICENSE' }
+  s.author           = { 'Your Company' => 'email@example.com' }
+
+  # This will ensure the source files in Classes/ are included in the native
+  # builds of apps using this FFI plugin. Podspec does not support relative
+  # paths, so Classes contains a forwarder C file that relatively imports
+  # `../src/*` so that the C sources can be shared among all target platforms.
+  s.source           = { :path => '.' }
+  s.source_files     = 'Classes/**/*'
+  s.dependency 'FlutterMacOS'
+
+  s.platform = :osx, '10.11'
+  s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
+  s.swift_version = '5.0'
+
+  s.script_phase = {
+    :name => 'Build Rust library',
+    # First argument is relative path to the `rust` folder, second is name of rust library
+    :script => 'sh "$PODS_TARGET_SRCROOT/../cargokit/build_pod.sh" ../../rust rust_lib_twonly',
+    :execution_position => :before_compile,
+    :input_files => ['${BUILT_PRODUCTS_DIR}/cargokit_phony'],
+    # Let XCode know that the static library referenced in -force_load below is
+    # created by this build step.
+    :output_files => ["${BUILT_PRODUCTS_DIR}/librust_lib_twonly.a"],
+  }
+  s.pod_target_xcconfig = {
+    'DEFINES_MODULE' => 'YES',
+    # Flutter.framework does not contain a i386 slice.
+    'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386',
+    'OTHER_LDFLAGS' => '-force_load ${BUILT_PRODUCTS_DIR}/librust_lib_twonly.a',
+  }
+end
\ No newline at end of file
diff --git a/rust_builder/pubspec.yaml b/rust_builder/pubspec.yaml
new file mode 100644
index 00000000..ecdd1117
--- /dev/null
+++ b/rust_builder/pubspec.yaml
@@ -0,0 +1,34 @@
+name: rust_lib_twonly
+description: "Utility to build Rust code"
+version: 0.0.1
+publish_to: none
+
+environment:
+  sdk: '>=3.3.0 <4.0.0'
+  flutter: '>=3.3.0'
+
+dependencies:
+  flutter:
+    sdk: flutter
+  plugin_platform_interface: ^2.0.2
+
+dev_dependencies:
+  ffi: ^2.0.2
+  ffigen: ^11.0.0
+  flutter_lints: ^2.0.0
+  flutter_test:
+    sdk: flutter
+
+flutter:
+  plugin:
+    platforms:
+      android:
+        ffiPlugin: true
+      ios:
+        ffiPlugin: true
+      linux:
+        ffiPlugin: true
+      macos:
+        ffiPlugin: true
+      windows:
+        ffiPlugin: true
diff --git a/rust_builder/windows/.gitignore b/rust_builder/windows/.gitignore
new file mode 100644
index 00000000..b3eb2be1
--- /dev/null
+++ b/rust_builder/windows/.gitignore
@@ -0,0 +1,17 @@
+flutter/
+
+# Visual Studio user-specific files.
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# Visual Studio build-related files.
+x64/
+x86/
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
diff --git a/rust_builder/windows/CMakeLists.txt b/rust_builder/windows/CMakeLists.txt
new file mode 100644
index 00000000..17c8f52d
--- /dev/null
+++ b/rust_builder/windows/CMakeLists.txt
@@ -0,0 +1,20 @@
+# The Flutter tooling requires that developers have a version of Visual Studio
+# installed that includes CMake 3.14 or later. You should not increase this
+# version, as doing so will cause the plugin to fail to compile for some
+# customers of the plugin.
+cmake_minimum_required(VERSION 3.14)
+
+# Project-level configuration.
+set(PROJECT_NAME "rust_lib_twonly")
+project(${PROJECT_NAME} LANGUAGES CXX)
+
+include("../cargokit/cmake/cargokit.cmake")
+apply_cargokit(${PROJECT_NAME} ../../../../../../rust rust_lib_twonly "")
+
+# List of absolute paths to libraries that should be bundled with the plugin.
+# This list could contain prebuilt libraries, or libraries created by an
+# external build triggered from this build file.
+set(rust_lib_twonly_bundled_libraries
+  "${${PROJECT_NAME}_cargokit_lib}"
+  PARENT_SCOPE
+)
diff --git a/rust_dependencies/.gitignore b/rust_dependencies/.gitignore
new file mode 100644
index 00000000..e69de29b
diff --git a/rust_dependencies/Cargo.lock b/rust_dependencies/Cargo.lock
new file mode 100644
index 00000000..2a1c057b
--- /dev/null
+++ b/rust_dependencies/Cargo.lock
@@ -0,0 +1,1639 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "allocator-api2"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+
+[[package]]
+name = "anyhow"
+version = "1.0.102"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "bitflags"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
+
+[[package]]
+name = "blahaj"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5106bf2680d585dc5f29711b8aa5dde353180b8e14af89b7f0424f760c84e7ce"
+dependencies = [
+ "hashbrown 0.15.5",
+ "rand 0.8.6",
+ "zeroize",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdd35008169921d80bc60d3d0ab416eecb028c4cd653352907921d95084790be"
+dependencies = [
+ "hybrid-array",
+]
+
+[[package]]
+name = "bytes"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "chacha20"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.3.0",
+ "rand_core 0.10.1",
+]
+
+[[package]]
+name = "cmov"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f88a43d011fc4a6876cb7344703e297c71dda42494fee094d5f7c76bf13f746"
+
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "const-oid"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d"
+dependencies = [
+ "crc-catalog",
+]
+
+[[package]]
+name = "crc-catalog"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77727bb15fa921304124b128af125e7e3b968275d1b108b379190264f4423710"
+dependencies = [
+ "hybrid-array",
+]
+
+[[package]]
+name = "ctutils"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e"
+dependencies = [
+ "cmov",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer 0.10.4",
+ "crypto-common 0.1.7",
+]
+
+[[package]]
+name = "digest"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4850db49bf08e663084f7fb5c87d202ef91a3907271aff24a94eb97ff039153c"
+dependencies = [
+ "block-buffer 0.12.0",
+ "const-oid",
+ "crypto-common 0.2.1",
+ "ctutils",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "dotenvy"
+version = "0.15.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
+
+[[package]]
+name = "either"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
+dependencies = [
+ "humantime",
+ "is-terminal",
+ "log",
+ "regex",
+ "termcolor",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "errno"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "event-listener"
+version = "5.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
+
+[[package]]
+name = "fixedbitset"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
+
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
+[[package]]
+name = "foldhash"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
+
+[[package]]
+name = "futures-intrusive"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f"
+dependencies = [
+ "futures-core",
+ "lock_api",
+ "parking_lot",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
+
+[[package]]
+name = "futures-sink"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
+
+[[package]]
+name = "futures-task"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
+
+[[package]]
+name = "futures-util"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
+dependencies = [
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "rand_core 0.10.1",
+ "wasip2",
+ "wasip3",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash 0.1.5",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash 0.2.0",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"
+
+[[package]]
+name = "hashlink"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
+dependencies = [
+ "hashbrown 0.15.5",
+]
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hmac"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6303bc9732ae41b04cb554b844a762b4115a61bfaa81e3e83050991eeb56863f"
+dependencies = [
+ "digest 0.11.2",
+]
+
+[[package]]
+name = "humantime"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424"
+
+[[package]]
+name = "hybrid-array"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3944cf8cf766b40e2a1a333ee5e9b563f854d5fa49d6a8ca2764e97c6eddb214"
+dependencies = [
+ "typenum",
+]
+
+[[package]]
+name = "icu_collections"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c"
+dependencies = [
+ "displaydoc",
+ "potential_utf",
+ "utf8_iter",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locale_core"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4"
+dependencies = [
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38"
+
+[[package]]
+name = "icu_properties"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de"
+dependencies = [
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14"
+
+[[package]]
+name = "icu_provider"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421"
+dependencies = [
+ "displaydoc",
+ "icu_locale_core",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "id-arena"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
+
+[[package]]
+name = "idna"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.17.0",
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "is-terminal"
+version = "0.4.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
+
+[[package]]
+name = "leb128fmt"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
+
+[[package]]
+name = "libc"
+version = "0.2.185"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
+
+[[package]]
+name = "litemap"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"
+
+[[package]]
+name = "lock_api"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+dependencies = [
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
+
+[[package]]
+name = "memchr"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
+
+[[package]]
+name = "mio"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys",
+]
+
+[[package]]
+name = "multimap"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
+
+[[package]]
+name = "once_cell"
+version = "1.21.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
+
+[[package]]
+name = "parking"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-link",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+
+[[package]]
+name = "petgraph"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455"
+dependencies = [
+ "fixedbitset",
+ "hashbrown 0.15.5",
+ "indexmap",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
+
+[[package]]
+name = "potential_utf"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564"
+dependencies = [
+ "zerovec",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "pretty_env_logger"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c"
+dependencies = [
+ "env_logger",
+ "log",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "prost"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2ea70524a2f82d518bce41317d0fae74151505651af45faf1ffbd6fd33f0568"
+dependencies = [
+ "bytes",
+ "prost-derive",
+]
+
+[[package]]
+name = "prost-build"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "343d3bd7056eda839b03204e68deff7d1b13aba7af2b2fd16890697274262ee7"
+dependencies = [
+ "heck",
+ "itertools",
+ "log",
+ "multimap",
+ "petgraph",
+ "prettyplease",
+ "prost",
+ "prost-types",
+ "regex",
+ "syn",
+ "tempfile",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b"
+dependencies = [
+ "anyhow",
+ "itertools",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8991c4cbdb8bc5b11f0b074ffe286c30e523de90fee5ba8132f1399f23cb3dd7"
+dependencies = [
+ "prost",
+]
+
+[[package]]
+name = "protocols"
+version = "0.1.0"
+dependencies = [
+ "base64",
+ "blahaj",
+ "hmac",
+ "pretty_env_logger",
+ "prost",
+ "prost-build",
+ "rand 0.10.1",
+ "serde",
+ "serde_json",
+ "sha2 0.11.0",
+ "sqlx",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-efi"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
+
+[[package]]
+name = "rand"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
+dependencies = [
+ "chacha20",
+ "getrandom 0.4.2",
+ "rand_core 0.10.1",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.17",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "regex"
+version = "1.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
+
+[[package]]
+name = "rustix"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "semver"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
+
+[[package]]
+name = "serde"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.149"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
+dependencies = [
+ "itoa",
+ "memchr",
+ "serde",
+ "serde_core",
+ "zmij",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.2.17",
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "sha2"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.3.0",
+ "digest 0.11.2",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b"
+dependencies = [
+ "errno",
+ "libc",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+
+[[package]]
+name = "socket2"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "sqlx"
+version = "0.9.0-alpha.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "decccfa5f2f3eac95eb68085cfe69a0172fa9711666c3a634cfc806d4fb74a47"
+dependencies = [
+ "sqlx-core",
+ "sqlx-macros",
+]
+
+[[package]]
+name = "sqlx-core"
+version = "0.9.0-alpha.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86854e8c6aba0dafcf1c04b4836b0b7fa3a20c560e3554567afefe1258fa4e60"
+dependencies = [
+ "base64",
+ "bytes",
+ "cfg-if",
+ "crc",
+ "crossbeam-queue",
+ "either",
+ "event-listener",
+ "futures-core",
+ "futures-intrusive",
+ "futures-io",
+ "futures-util",
+ "hashbrown 0.16.1",
+ "hashlink",
+ "indexmap",
+ "log",
+ "memchr",
+ "percent-encoding",
+ "serde",
+ "sha2 0.10.9",
+ "smallvec",
+ "thiserror",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "sqlx-macros"
+version = "0.9.0-alpha.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7aab9442ed1568e3aed6c368737226ee4e0e8d1deb0e0887fa6bf15282ace44"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "sqlx-core",
+ "sqlx-macros-core",
+ "syn",
+]
+
+[[package]]
+name = "sqlx-macros-core"
+version = "0.9.0-alpha.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34eb4976b8f02ac57ee98d4ce40cd1aad7ab31d9792977bc3171f787ba6ba2fb"
+dependencies = [
+ "cfg-if",
+ "dotenvy",
+ "either",
+ "heck",
+ "hex",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_json",
+ "sha2 0.10.9",
+ "sqlx-core",
+ "syn",
+ "url",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
+
+[[package]]
+name = "syn"
+version = "2.0.117"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
+dependencies = [
+ "fastrand",
+ "getrandom 0.4.2",
+ "once_cell",
+ "rustix",
+ "windows-sys",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tokio"
+version = "1.52.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b67dee974fe86fd92cc45b7a95fdd2f99a36a6d7b0d431a231178d3d670bbcc6"
+dependencies = [
+ "bytes",
+ "libc",
+ "mio",
+ "parking_lot",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
+dependencies = [
+ "log",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "typenum"
+version = "1.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
+[[package]]
+name = "url"
+version = "2.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+ "serde",
+]
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
+[[package]]
+name = "wasip2"
+version = "1.0.3+wasi-0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
+dependencies = [
+ "wit-bindgen 0.57.1",
+]
+
+[[package]]
+name = "wasip3"
+version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
+dependencies = [
+ "wit-bindgen 0.51.0",
+]
+
+[[package]]
+name = "wasm-encoder"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
+dependencies = [
+ "leb128fmt",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasm-metadata"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
+dependencies = [
+ "anyhow",
+ "indexmap",
+ "wasm-encoder",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasmparser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
+dependencies = [
+ "bitflags",
+ "hashbrown 0.15.5",
+ "indexmap",
+ "semver",
+]
+
+[[package]]
+name = "winapi-util"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
+dependencies = [
+ "wit-bindgen-rust-macro",
+]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.57.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
+
+[[package]]
+name = "wit-bindgen-core"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
+dependencies = [
+ "anyhow",
+ "heck",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-bindgen-rust"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
+dependencies = [
+ "anyhow",
+ "heck",
+ "indexmap",
+ "prettyplease",
+ "syn",
+ "wasm-metadata",
+ "wit-bindgen-core",
+ "wit-component",
+]
+
+[[package]]
+name = "wit-bindgen-rust-macro"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
+dependencies = [
+ "anyhow",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wit-bindgen-core",
+ "wit-bindgen-rust",
+]
+
+[[package]]
+name = "wit-component"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
+dependencies = [
+ "anyhow",
+ "bitflags",
+ "indexmap",
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "wasm-encoder",
+ "wasm-metadata",
+ "wasmparser",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-parser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
+dependencies = [
+ "anyhow",
+ "id-arena",
+ "indexmap",
+ "log",
+ "semver",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "unicode-xid",
+ "wasmparser",
+]
+
+[[package]]
+name = "writeable"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
+
+[[package]]
+name = "yoke"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
+dependencies = [
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zerotrie"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zmij"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
diff --git a/rust_dependencies/Cargo.toml b/rust_dependencies/Cargo.toml
new file mode 100644
index 00000000..1f2f14b9
--- /dev/null
+++ b/rust_dependencies/Cargo.toml
@@ -0,0 +1,3 @@
+[workspace]
+members = ["protocols"]
+resolver = "3"
diff --git a/rust_dependencies/protocols/Cargo.toml b/rust_dependencies/protocols/Cargo.toml
new file mode 100644
index 00000000..7196dd26
--- /dev/null
+++ b/rust_dependencies/protocols/Cargo.toml
@@ -0,0 +1,29 @@
+[package]
+name = "protocols"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+crate-type = ["rlib", "cdylib", "staticlib"]
+
+[dependencies]
+thiserror = "2.0.18"
+tracing = "0.1.44"
+serde = "1.0.228"
+prost = "0.14.1"
+rand = "0.10.1"
+blahaj = "0.6.0"
+serde_json = "1.0"
+base64 = "0.22.1"
+hmac = "0.13.0"
+sha2 = "0.11.0"
+tokio = { version = "1.44", features = ["full"] }
+sqlx = { version = "0.9.0-alpha.1", default-features = false, features = [
+    "derive",
+] }
+
+[dev-dependencies]
+pretty_env_logger = "0.5.0"
+
+[build-dependencies]
+prost-build = "0.14.1"
diff --git a/rust_dependencies/protocols/build.rs b/rust_dependencies/protocols/build.rs
new file mode 100644
index 00000000..12e4744b
--- /dev/null
+++ b/rust_dependencies/protocols/build.rs
@@ -0,0 +1,11 @@
+use std::io::Result;
+fn main() -> Result<()> {
+    prost_build::compile_protos(
+        &[
+            "src/user_discovery/types.proto",
+            "src/key_verification/types.proto",
+        ],
+        &["src/"],
+    )?;
+    Ok(())
+}
diff --git a/rust_dependencies/protocols/src/key_verification/error.rs b/rust_dependencies/protocols/src/key_verification/error.rs
new file mode 100644
index 00000000..a23b1d1c
--- /dev/null
+++ b/rust_dependencies/protocols/src/key_verification/error.rs
@@ -0,0 +1,30 @@
+use prost::DecodeError;
+use thiserror::Error;
+
+pub type Result<T> = core::result::Result<T, KeyVerificationError>;
+
+#[derive(Error, Debug)]
+pub enum KeyVerificationError {
+    #[error("The prefix deeplink url must start with https:// and end with a #")]
+    InvalidDeeplinkPrefix,
+
+    #[error("Invalid qr text")]
+    InvalidQrText,
+
+    #[error(
+        "Contact user_id is known and the stored public_key does not match the received user id"
+    )]
+    InvalidPublicKeyAndUserIdCombination,
+
+    #[error("Store error: `{0}`")]
+    Store(String),
+
+    #[error("`{0}`")]
+    Base64(#[from] base64::DecodeError),
+
+    #[error("`{0}`")]
+    Prost(#[from] DecodeError),
+
+    #[error("`{0}`")]
+    Hmac(#[from] hmac::digest::InvalidLength),
+}
diff --git a/rust_dependencies/protocols/src/key_verification/mod.rs b/rust_dependencies/protocols/src/key_verification/mod.rs
new file mode 100644
index 00000000..f3493473
--- /dev/null
+++ b/rust_dependencies/protocols/src/key_verification/mod.rs
@@ -0,0 +1,194 @@
+use crate::key_verification::{error::KeyVerificationError, traits::KeyVerificationStore};
+use crate::user_discovery::UserID;
+use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine as _};
+use error::Result;
+use hmac::{Hmac, KeyInit, Mac};
+use prost::Message;
+use sha2::Sha256;
+
+pub(crate) mod error;
+pub mod stores;
+pub mod traits;
+
+include!(concat!(env!("OUT_DIR"), "/key_verification.rs"));
+
+pub struct KeyVerificationConfig {
+    /// The link prefix for the qr code which should be registered as a deeplink on Android and a universal link on iOS
+    /// The link MUST start with a https:// and end with a #
+    /// The link should contain the username of the user so the application can show the scanned user without internet
+    /// Example: https://me.twonly.eu/tobi#
+    deeplink_prefix: String,
+    /// The user ID used to calculate the verification proof
+    user_id: UserID,
+    /// The public_key of the user to calculate the verification proof
+    public_key: Vec<u8>,
+}
+
+pub struct ScannedUser {
+    pub user_id: UserID,
+    pub public_key: Vec<u8>,
+    pub verification_proof: Vec<u8>,
+}
+
+pub struct KeyVerification<Store: KeyVerificationStore> {
+    store: Store,
+    config: KeyVerificationConfig,
+}
+
+impl<Store: KeyVerificationStore> KeyVerification<Store> {
+    pub fn new(store: Store, config: KeyVerificationConfig) -> Result<KeyVerification<Store>> {
+        if !config.deeplink_prefix.starts_with("https://") || !config.deeplink_prefix.ends_with("#")
+        {
+            return Err(KeyVerificationError::InvalidDeeplinkPrefix);
+        }
+        Ok(Self { store, config })
+    }
+
+    /// Generates the a string which should be displayed in the UI so others can scan it.
+    pub fn generate_qr_text(&self) -> Result<String> {
+        // 10 Bytes should be enough. Tokens are only valid for one day and then deleted.
+        let secret_verification_token: Vec<u8> = rand::random_iter().take(16).collect();
+
+        self.store
+            .push_new_secret_verification_token(&secret_verification_token)?;
+
+        let verification_data = VerificationData {
+            user_id: self.config.user_id,
+            public_key: self.config.public_key.clone(),
+            secret_verification_token,
+        };
+
+        let verification_data_bytes = verification_data.encode_to_vec();
+        let encoded = URL_SAFE_NO_PAD.encode(verification_data_bytes);
+
+        Ok(format!("{}{}", self.config.deeplink_prefix, encoded))
+    }
+
+    /// Handles the scanned qr code text and creates a response message
+    /// which can be send to the other person
+    pub fn get_user_from_scanned_qr_text(&self, received_text: &str) -> Result<ScannedUser> {
+        let splitted: Vec<_> = received_text.split('#').collect();
+        if splitted.len() != 2 {
+            tracing::info!("Scanned qr text does not contain a #");
+            return Err(KeyVerificationError::InvalidQrText);
+        }
+        let verification_data_bytes = URL_SAFE_NO_PAD.decode(splitted[1])?;
+        let verification_data = VerificationData::decode(verification_data_bytes.as_slice())?;
+
+        let mut mac = Hmac::<Sha256>::new_from_slice(&verification_data.secret_verification_token)?;
+        mac.update(&self.config.user_id.to_le_bytes());
+        mac.update(&self.config.public_key);
+        mac.update(&verification_data.user_id.to_le_bytes());
+        mac.update(&verification_data.public_key);
+
+        let verification_proof = mac.finalize().into_bytes().to_vec();
+
+        Ok(ScannedUser {
+            user_id: verification_data.user_id,
+            public_key: verification_data.public_key,
+            verification_proof,
+        })
+    }
+
+    /// Checks whether the received verification proof is valid
+    pub fn is_received_verification_proof_valid(
+        &self,
+        from_user_id: UserID,
+        public_key: Vec<u8>,
+        verification_proof: Vec<u8>,
+    ) -> Result<bool> {
+        let verification_tokens = self.store.get_all_valid_verification_tokens()?;
+
+        for verification_token in &verification_tokens {
+            let calculated_verification_proof = {
+                let mut mac = Hmac::<Sha256>::new_from_slice(verification_token)?;
+                mac.update(&from_user_id.to_le_bytes());
+                mac.update(&public_key);
+                mac.update(&self.config.user_id.to_le_bytes());
+                mac.update(&self.config.public_key);
+                mac.finalize().into_bytes().to_vec()
+            };
+
+            if calculated_verification_proof == verification_proof {
+                return Ok(true);
+            }
+        }
+
+        Ok(false)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::key_verification::{stores::InMemoryStore, KeyVerification, KeyVerificationConfig};
+
+    #[test]
+    fn test_key_verification() {
+        let _ = pretty_env_logger::try_init();
+
+        const ALICE_ID: i64 = 10;
+        const BOB_ID: i64 = 11;
+
+        let alice_kv = KeyVerification::new(
+            InMemoryStore::default(),
+            KeyVerificationConfig {
+                user_id: ALICE_ID,
+                public_key: vec![ALICE_ID as u8; 32],
+                deeplink_prefix: "https://me.twonly.eu/alice#".into(),
+            },
+        )
+        .unwrap();
+
+        let bob_kv = KeyVerification::new(
+            InMemoryStore::default(),
+            KeyVerificationConfig {
+                user_id: BOB_ID,
+                public_key: vec![BOB_ID as u8; 32],
+                deeplink_prefix: "https://me.twonly.eu/bob#".into(),
+            },
+        )
+        .unwrap();
+
+        let qr_code_text = alice_kv.generate_qr_text().unwrap();
+        assert_eq!(qr_code_text.len(), 99);
+
+        tracing::debug!("Generated QR-Code-Link: {qr_code_text}");
+
+        let scanned_user = bob_kv.get_user_from_scanned_qr_text(&qr_code_text).unwrap();
+
+        // THIS must be done by the application
+        assert_eq!(scanned_user.user_id, ALICE_ID);
+        assert_eq!(scanned_user.public_key, vec![ALICE_ID as u8; 32]);
+
+        // SEND scanned_user.verification_proof over the establish e2ee protected session if public_key verification was valid.
+
+        let valid_verification_proof = alice_kv
+            .is_received_verification_proof_valid(
+                BOB_ID,
+                vec![BOB_ID as u8; 32],
+                scanned_user.verification_proof.clone(),
+            )
+            .unwrap();
+
+        assert_eq!(valid_verification_proof, true);
+
+        let valid_verification_proof = alice_kv
+            .is_received_verification_proof_valid(
+                BOB_ID,
+                vec![(BOB_ID + 1) as u8; 32],
+                scanned_user.verification_proof.clone(),
+            )
+            .unwrap();
+
+        assert_eq!(valid_verification_proof, false);
+
+        let mut modified_proof = scanned_user.verification_proof;
+        modified_proof[0] = modified_proof[0] + 1;
+
+        let valid_verification_proof = alice_kv
+            .is_received_verification_proof_valid(BOB_ID, vec![BOB_ID as u8; 32], modified_proof)
+            .unwrap();
+
+        assert_eq!(valid_verification_proof, false);
+    }
+}
diff --git a/rust_dependencies/protocols/src/key_verification/stores/in_memory_store.rs b/rust_dependencies/protocols/src/key_verification/stores/in_memory_store.rs
new file mode 100644
index 00000000..160fbfb8
--- /dev/null
+++ b/rust_dependencies/protocols/src/key_verification/stores/in_memory_store.rs
@@ -0,0 +1,22 @@
+use std::sync::{Arc, Mutex};
+
+use crate::key_verification::{error::Result, traits::KeyVerificationStore};
+
+#[derive(Default)]
+pub struct InMemoryStore {
+    verification_tokens: Arc<Mutex<Vec<Vec<u8>>>>,
+}
+
+impl KeyVerificationStore for InMemoryStore {
+    fn push_new_secret_verification_token(&self, token: &[u8]) -> Result<()> {
+        self.verification_tokens
+            .lock()
+            .unwrap()
+            .push(token.to_vec());
+        Ok(())
+    }
+
+    fn get_all_valid_verification_tokens(&self) -> Result<Vec<Vec<u8>>> {
+        Ok(self.verification_tokens.lock().unwrap().clone())
+    }
+}
diff --git a/rust_dependencies/protocols/src/key_verification/stores/mod.rs b/rust_dependencies/protocols/src/key_verification/stores/mod.rs
new file mode 100644
index 00000000..30b1f14d
--- /dev/null
+++ b/rust_dependencies/protocols/src/key_verification/stores/mod.rs
@@ -0,0 +1,3 @@
+mod in_memory_store;
+
+pub use in_memory_store::InMemoryStore;
diff --git a/rust_dependencies/protocols/src/key_verification/traits.rs b/rust_dependencies/protocols/src/key_verification/traits.rs
new file mode 100644
index 00000000..1689e3a8
--- /dev/null
+++ b/rust_dependencies/protocols/src/key_verification/traits.rs
@@ -0,0 +1,7 @@
+use super::error::Result;
+pub trait KeyVerificationStore {
+    fn push_new_secret_verification_token(&self, token: &[u8]) -> Result<()>;
+    /// This function should return all tokens from the last 24h
+    /// All other tokens can be removed from the database
+    fn get_all_valid_verification_tokens(&self) -> Result<Vec<Vec<u8>>>;
+}
diff --git a/rust_dependencies/protocols/src/key_verification/types.proto b/rust_dependencies/protocols/src/key_verification/types.proto
new file mode 100644
index 00000000..bd515eb0
--- /dev/null
+++ b/rust_dependencies/protocols/src/key_verification/types.proto
@@ -0,0 +1,12 @@
+syntax = "proto3";
+package key_verification;
+
+message VerificationData {
+  int64 user_id                   = 1;
+  bytes public_key                = 2;
+  bytes secret_verification_token = 3;
+}
+
+message VerificationMessage {
+  bytes calculated_mac = 1;
+}
\ No newline at end of file
diff --git a/rust_dependencies/protocols/src/lib.rs b/rust_dependencies/protocols/src/lib.rs
new file mode 100644
index 00000000..85641306
--- /dev/null
+++ b/rust_dependencies/protocols/src/lib.rs
@@ -0,0 +1,3 @@
+pub mod key_verification;
+pub mod passwordless_recovery;
+pub mod user_discovery;
diff --git a/rust_dependencies/protocols/src/passwordless_recovery/mod.rs b/rust_dependencies/protocols/src/passwordless_recovery/mod.rs
new file mode 100644
index 00000000..3ecd1210
--- /dev/null
+++ b/rust_dependencies/protocols/src/passwordless_recovery/mod.rs
@@ -0,0 +1 @@
+mod traits;
diff --git a/rust_dependencies/protocols/src/passwordless_recovery/traits.rs b/rust_dependencies/protocols/src/passwordless_recovery/traits.rs
new file mode 100644
index 00000000..e69de29b
diff --git a/rust_dependencies/protocols/src/passwordless_recovery/types.proto b/rust_dependencies/protocols/src/passwordless_recovery/types.proto
new file mode 100644
index 00000000..7490553e
--- /dev/null
+++ b/rust_dependencies/protocols/src/passwordless_recovery/types.proto
@@ -0,0 +1,86 @@
+syntax = "proto3";
+package passwordless_recovery;
+
+// Recovery Process
+// - Generating: TempID and a new assymetric key pair
+// - Uploading to the server TempID + Push Tokens so the server can notify the user that someone helped him 
+
+
+// Send from the person who tries to recover their account.
+// This can be done via a link, which will then be opend in the app of the contact.
+// The contact than has to manualy select from which user he got the request.
+// -> Using this phishing is harder, as the user has to manualy select the user to recovery
+// -> The user who wants to recover his account does not need to remember her old username
+message RecoveryRequest {
+  int64 temp_id = 1;
+  bytes public_key = 2;
+}
+
+// Used as envelope for TrustedFriendShare and RecoveryData
+message EncryptedEnvelope {
+  bytes encrypted_data = 1;
+  bytes iv = 2;
+  bytes mac = 3;
+}
+
+// Send from the trusted friend to 
+// This is encrypted with the received public key.
+message TrustedFriendShare {
+
+  // This allows to display the user which user has send him his recovery data.
+  User trusted_friend = 1;
+
+  // This allows to display the userdata, showing that he is recovering the correct person.
+  User share_user = 2;
+
+  // The minimum threshold required to decrypte the shares.
+  int32 threshold = 3;
+
+  // The actual share which will become: SecretSharedDate
+  bytes share = 4;
+
+  message User {
+    int64 user_id = 1;
+    string display_name = 2;
+    bytes avatar = 3;
+  }
+}
+
+// After received all shares this is decrypted by the user restoring its own 
+message SecretSharedDate {
+
+  // No second factor was selected
+  optional RecoveryData recovery_data = 1;
+
+
+  // Server has  
+  optional SecondFactorMail second_factor_mail = 2;
+  optional SecondFactorPin second_factor_pin = 3;
+
+  // The recovery data in case a second factor was used
+  // The decryption key is loaded from the server either using the PIN or the MAIL
+  optional bytes recovery_data_encrypted = 4;
+
+
+  message SecondFactorPin {
+    // Required to try the PIN to get the share from the server.
+    // This prevents that someone else can lock the pin, as the server only 
+    // allows 3 tries then after 1 day again 3 tries until the key is deleted.
+    bytes unlock_token = 1;
+    // This never is send to the server but used to hash the pin before sending it to the server.
+    // This prevents that the server every knows the shot 4-diget PIN.
+    bytes pin_seed = 2;
+  }
+
+  message SecondFactorMail {}
+
+}
+
+// The data which is recovered at the end.
+// The backup_master_key allows to recover the actual backup uploaded in the background to the server.
+// In case the backup is not available any more the user can use its user_id and his private_key to requister as a new user.
+message RecoveryData {
+  int64 user_id = 1;
+  bytes private_key = 2;
+  bytes backup_master_key = 3;
+}
diff --git a/rust_dependencies/protocols/src/user_discovery.rs b/rust_dependencies/protocols/src/user_discovery.rs
new file mode 100644
index 00000000..a7df228c
--- /dev/null
+++ b/rust_dependencies/protocols/src/user_discovery.rs
@@ -0,0 +1,754 @@
+pub mod error;
+pub mod stores;
+#[cfg(test)]
+pub mod tests;
+pub mod traits;
+
+use std::collections::{HashMap, HashSet};
+use std::sync::Arc;
+use std::u8;
+use blahaj::{Share, Sharks};
+use prost::Message;
+use serde::{Deserialize, Serialize};
+use tokio::sync::{Mutex, MutexGuard};
+use crate::user_discovery::error::{Result, UserDiscoveryError};
+use crate::user_discovery::traits::{AnnouncedUser, OtherPromotion, UserDiscoveryUtils};
+use crate::user_discovery::user_discovery_message::{UserDiscoveryAnnouncement, UserDiscoveryPromotion};
+use crate::user_discovery::user_discovery_message::user_discovery_promotion::AnnouncementShareDecrypted;
+use crate::user_discovery::user_discovery_message::user_discovery_promotion::announcement_share_decrypted::SignedData;
+pub use traits::UserDiscoveryStore;
+
+/// Type of the user id, this must be consistent with the user id defined in
+/// the types.proto
+pub type UserID = i64;
+
+include!(concat!(env!("OUT_DIR"), "/user_discovery.rs"));
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+struct UserDiscoveryConfig {
+    /// The number of required shares to get the secret
+    threshold: u8,
+    /// Currently limited to <= 255 as GF 256 is used
+    total_number_of_shares: u8,
+    /// Version of announcements
+    announcement_version: u32,
+    /// Version of promotions
+    promotion_version: u32,
+    /// This is a random public_id associated with a single announcement.
+    public_id: i64,
+    /// Verification shares
+    verification_shares: Vec<Vec<u8>>,
+    // The users' id:
+    user_id: UserID,
+    // If others user should promote the promotion to other users
+    share_promotion: bool,
+}
+
+///
+/// The main struct to access the user discovery functionality.
+///
+/// As generic values it requires a UserDiscoveryStore and a UserDiscoveryUtils.
+///
+pub struct UserDiscovery<Store, Utils>
+where
+    Store: UserDiscoveryStore,
+    Utils: UserDiscoveryUtils,
+{
+    store: Store,
+    utils: Utils,
+    config_lock: Arc<Mutex<bool>>,
+}
+
+impl<Store: UserDiscoveryStore, Utils: UserDiscoveryUtils> UserDiscovery<Store, Utils> {
+    /// Creates a new instance of the user discovery.
+    pub fn new(store: Store, utils: Utils) -> Result<Self> {
+        Ok(Self {
+            store,
+            utils,
+            config_lock: Arc::default(),
+        })
+    }
+
+    /// Initializes or updates the user discovery.
+    ///
+    /// This function will generate new verification shares and update the config.
+    ///
+    /// # Arguments
+    ///
+    /// * `threshold` - The number of required shares to get the secret
+    /// * `user_id` - The owner's user id
+    /// * `public_key` - The owner's public key
+    ///
+    /// # Returns
+    ///
+    /// * `Ok(())` - If the user discovery was initialized or updated successfully
+    /// * `Err(UserDiscoveryError)` - If the user discovery was not initialized or updated successfully
+    ///
+    pub async fn initialize_or_update(
+        &self,
+        threshold: u8,
+        user_id: UserID,
+        public_key: Vec<u8>,
+        share_promotion: bool,
+    ) -> Result<()> {
+        let config_lock = self.config_lock.lock().await;
+        let mut config = match self.store.get_config().await {
+            Ok(config) => {
+                let mut config: UserDiscoveryConfig = serde_json::from_str(&config)?;
+                config.threshold = threshold;
+                config
+            }
+            Err(_) => UserDiscoveryConfig {
+                threshold,
+                user_id,
+                ..Default::default()
+            },
+        };
+
+        let public_id = rand::random();
+
+        let signed_data = SignedData {
+            public_id,
+            user_id,
+            public_key,
+        };
+
+        let signature = self.utils.sign_data(&signed_data.encode_to_vec()).await?;
+
+        debug_assert_eq!(threshold, config.threshold);
+
+        let verification_shares = self
+            .setup_announcements(&config, signed_data, signature)
+            .await?;
+
+        debug_assert_eq!(verification_shares.len(), threshold as usize - 1);
+
+        config.public_id = public_id;
+        config.announcement_version += 1;
+        config.verification_shares = verification_shares;
+        config.share_promotion = share_promotion;
+
+        self.update_config(config, config_lock).await?;
+
+        Ok(())
+    }
+
+    ///
+    /// Returns the current version of the owner's user discovery state.
+    ///
+    /// The version is incremented every time the user discovery is initialized or updated.
+    /// It should be send contacts which participate in the user discovery, so they can
+    /// check if there is new data available for them using the `get_new_messages` function
+    /// on there side.  
+    ///
+    ///
+    /// # Returns
+    ///
+    /// * `Ok(Vec<u8>)` - The current version of the user discovery
+    /// * `Err(UserDiscoveryError)` - If there where errors in the store.
+    ///
+    pub async fn get_current_version(&self) -> Result<Vec<u8>> {
+        let (config, _) = self.get_config().await?;
+        Ok(UserDiscoveryVersion {
+            announcement: config.announcement_version,
+            promotion: config.promotion_version,
+        }
+        .encode_to_vec())
+    }
+
+    ///
+    /// Returns all users discovery though the user discovery and there relations
+    ///
+    /// # Returns
+    ///
+    /// * `Ok(HashMap<AnnouncedUser, Vec<(UserID, Option<i64>)>>)` - All connections the user has discovered
+    /// * `Err(UserDiscoveryError)` - If there where erros in the store.
+    ///
+    pub async fn get_all_announced_users(
+        &self,
+    ) -> Result<HashMap<AnnouncedUser, Vec<(UserID, Option<i64>)>>> {
+        self.store.get_all_announced_users().await
+    }
+
+    ///
+    /// Returns all new user discovery messages for the provided contact and his current version.
+    ///
+    /// # Arguments
+    ///
+    /// * `contact_id` - The contact id of the user
+    /// * `received_version` - The version of the user discovery the contact has received so far
+    ///
+    /// # Returns
+    ///
+    /// * `Ok(Vec<Vec<u8>>)` - The new user discovery messages
+    /// * `Err(UserDiscoveryError)` - If there where errors in the store or if the received version is invalid.
+    ///
+    pub async fn get_new_messages(
+        &self,
+        contact_id: UserID,
+        received_version: &[u8],
+    ) -> Result<Vec<Vec<u8>>> {
+        let mut messages = vec![];
+        let received_version = UserDiscoveryVersion::decode(received_version)?;
+
+        let (config, _) = self.get_config().await?;
+        let version = Some(UserDiscoveryVersion {
+            announcement: config.announcement_version,
+            promotion: config.promotion_version,
+        });
+
+        if received_version.announcement < config.announcement_version {
+            tracing::info!("New announcement message available for {}", contact_id);
+
+            let announcement_share = self.store.get_share_for_contact(contact_id).await?;
+
+            let user_discovery_announcement = Some(UserDiscoveryAnnouncement {
+                public_id: config.public_id,
+                threshold: config.threshold as u32,
+                announcement_share,
+                verification_shares: config.verification_shares,
+                share_promotion: config.share_promotion,
+            });
+
+            messages.push(
+                UserDiscoveryMessage {
+                    user_discovery_announcement,
+                    version,
+                    ..Default::default()
+                }
+                .encode_to_vec(),
+            );
+        }
+        if received_version.promotion < config.promotion_version {
+            tracing::info!("New promotion message available for user {}", contact_id);
+            let promoting_messages = self
+                .store
+                .get_own_promotions_after_version(received_version.promotion)
+                .await?;
+
+            let size = promoting_messages.len();
+            let mut filtered: Vec<Vec<u8>> = promoting_messages
+                .into_iter()
+                .filter(|x| !x.is_empty()) // filter ignored versions
+                .collect();
+
+            if filtered.len() != size {
+                // ensure the receiver will get the later version in case the last message was filtered out
+                filtered.push(
+                    UserDiscoveryMessage {
+                        version: Some(UserDiscoveryVersion {
+                            announcement: config.announcement_version,
+                            promotion: config.promotion_version,
+                        }),
+                        ..Default::default()
+                    }
+                    .encode_to_vec(),
+                );
+            }
+            messages.extend_from_slice(&filtered);
+        }
+        Ok(messages)
+    }
+
+    ///
+    /// Checks if the provided user has new announcements and a request of update should be send.
+    ///
+    /// # Arguments
+    ///
+    /// * `contact_id` - The contact id of the user
+    /// * `version` - The current version of the user discovery from the contact
+    ///
+    /// # Returns
+    ///
+    /// * `Ok(bool)` - True if the user has new announcements
+    /// * `Err(UserDiscoveryError)` - If there where errors in the store or if the received version is invalid.
+    ///
+    pub async fn should_request_new_messages(
+        &self,
+        contact_id: UserID,
+        version: &[u8],
+    ) -> Result<Option<Vec<u8>>> {
+        let received_version = UserDiscoveryVersion::decode(version)?;
+        let stored_version = match self.store.get_contact_version(contact_id).await? {
+            Some(buf) => UserDiscoveryVersion::decode(buf.as_slice())?,
+            None => UserDiscoveryVersion {
+                announcement: 0,
+                promotion: 0,
+            },
+        };
+        tracing::debug!(
+            received.announcement = %received_version.announcement,
+            received.promotion = %received_version.promotion,
+            stored.announcement = %stored_version.announcement,
+            stored.promotion = %stored_version.promotion,
+            "Comparing version numbers"
+        );
+        if received_version.announcement > stored_version.announcement
+            || received_version.promotion > stored_version.promotion
+        {
+            Ok(Some(stored_version.encode_to_vec()))
+        } else {
+            Ok(None)
+        }
+    }
+
+    #[cfg(test)]
+    pub(crate) async fn get_contact_version(&self, contact_id: UserID) -> Result<Option<Vec<u8>>> {
+        self.store.get_contact_version(contact_id).await
+    }
+
+    /// Returns the latest version for this discovery.
+    /// Before calling this function the application must sure that contact_id is qualified to be announced.
+    pub async fn handle_new_messages(
+        &self,
+        contact_id: UserID,
+        public_key_verified_timestamp: Option<i64>,
+        messages: Vec<Vec<u8>>,
+    ) -> Result<()> {
+        for message in messages {
+            let Ok(message) = UserDiscoveryMessage::decode(message.as_slice()) else {
+                tracing::error!("Could not parse the message. Continue to the next message...");
+                continue;
+            };
+            let Some(version) = message.version else {
+                continue;
+            };
+
+            if let Some(uda) = message.user_discovery_announcement {
+                if let Err(err) = self
+                    .handle_user_discovery_announcement(
+                        contact_id,
+                        public_key_verified_timestamp,
+                        uda,
+                    )
+                    .await
+                {
+                    tracing::warn!("Ignoring: {err}");
+                }
+            } else if let Some(udp) = message.user_discovery_promotion {
+                if let Err(err) = self.handle_user_discovery_promotion(contact_id, udp).await {
+                    tracing::warn!("Ignoring: {err}");
+                }
+            }
+
+            // Always update the version...
+            self.store
+                .set_contact_version(contact_id, version.encode_to_vec())
+                .await?;
+        }
+
+        Ok(())
+    }
+
+    pub async fn update_verification_state_for_user(
+        &self,
+        contact_id: UserID,
+        public_key_verified_timestamp: Option<i64>,
+    ) -> Result<()> {
+        let (mut config, config_lock) = self.get_config().await?;
+        config.promotion_version += 1;
+
+        let Some(current_promotion) = self.store.get_contact_promotion(contact_id).await? else {
+            // User does not participate...
+            return Ok(());
+        };
+
+        let old_message = UserDiscoveryMessage::decode(current_promotion.as_slice())?;
+
+        let Some(old_promotion) = old_message.user_discovery_promotion else {
+            tracing::error!("A contact should only have a promotion message...");
+            return Ok(());
+        };
+
+        let message = UserDiscoveryMessage {
+            version: Some(UserDiscoveryVersion {
+                announcement: config.announcement_version,
+                promotion: config.promotion_version,
+            }),
+            user_discovery_promotion: Some(UserDiscoveryPromotion {
+                promotion_id: rand::random(),
+                public_id: old_promotion.public_id,
+                threshold: old_promotion.threshold,
+                announcement_share: old_promotion.announcement_share,
+                public_key_verified_timestamp,
+            }),
+            ..Default::default()
+        };
+
+        self.store
+            .push_own_promotion_and_clear_old_version(
+                contact_id,
+                config.promotion_version,
+                message.encode_to_vec(),
+            )
+            .await?;
+
+        self.update_config(config, config_lock).await?;
+
+        Ok(())
+    }
+
+    async fn setup_announcements(
+        &self,
+        config: &UserDiscoveryConfig,
+        signed_data: SignedData,
+        signature: Vec<u8>,
+    ) -> Result<Vec<Vec<u8>>> {
+        tracing::debug!(
+            "Initializing user discovery with {} total shares and with a threshold of {}",
+            config.total_number_of_shares,
+            config.threshold
+        );
+
+        let encrypted_announcement = AnnouncementShareDecrypted {
+            signed_data: Some(signed_data),
+            signature,
+        }
+        .encode_to_vec();
+
+        let sharks = Sharks(config.threshold as u8);
+        let dealer = sharks.dealer(&encrypted_announcement);
+
+        let mut shares: Vec<Vec<u8>> = dealer
+            .take(config.total_number_of_shares as usize)
+            .map(|x| Vec::from(&x))
+            .collect();
+
+        if shares.len() != config.total_number_of_shares as usize
+            || shares.is_empty()
+            || shares.len() <= (config.threshold as usize * 2)
+        {
+            return Err(UserDiscoveryError::ShamirsSecret(
+                "Invalid length of shares where generated".to_string(),
+            ));
+        }
+
+        tracing::debug!(
+            "Generated {} shares each with a size of: {}",
+            shares.len(),
+            shares[0].len()
+        );
+
+        let mut verification_shares = vec![];
+
+        let split_index = shares.len() - (config.threshold - 1) as usize;
+        verification_shares.extend(shares.drain(split_index..));
+
+        self.store.set_shares(shares).await?;
+
+        Ok(verification_shares)
+    }
+
+    async fn get_config(&self) -> Result<(UserDiscoveryConfig, MutexGuard<'_, bool>)> {
+        let mut lock = self.config_lock.lock().await;
+        *lock = true;
+        Ok((serde_json::from_str(&self.store.get_config().await?)?, lock))
+    }
+
+    async fn update_config(
+        &self,
+        config: UserDiscoveryConfig,
+        mut config_lock: MutexGuard<'_, bool>,
+    ) -> Result<()> {
+        self.store
+            .update_config(serde_json::to_string_pretty(&config)?)
+            .await?;
+        *config_lock = false;
+        Ok(())
+    }
+
+    async fn handle_user_discovery_announcement(
+        &self,
+        contact_id: UserID,
+        public_key_verified_timestamp: Option<i64>,
+        uda: UserDiscoveryAnnouncement,
+    ) -> Result<()> {
+        tracing::info!("Got a user discovery announcement from {contact_id}.");
+
+        if uda.threshold as usize != uda.verification_shares.len() + 1 {
+            tracing::error!(
+                "UDA contains to few shares to verify: {} != {} + 1.",
+                uda.threshold,
+                uda.verification_shares.len(),
+            );
+            return Ok(());
+        }
+
+        let sharks = Sharks(uda.threshold as u8);
+
+        let mut all_shares = uda.verification_shares.clone();
+        all_shares.push(uda.announcement_share.clone());
+        let shares: Vec<_> = all_shares
+            .iter()
+            .filter_map(|x| Share::try_from(x.as_slice()).ok())
+            .collect();
+
+        match sharks.recover(&shares) {
+            Ok(secret) => {
+                let asd = AnnouncementShareDecrypted::decode(secret.as_slice())?;
+
+                let Some(signed_data) = asd.signed_data else {
+                    return Err(UserDiscoveryError::MaliciousAnnouncementData(
+                        "missing signed data".into(),
+                    ));
+                };
+
+                if contact_id != signed_data.user_id {
+                    return Err(UserDiscoveryError::MaliciousAnnouncementData(format!(
+                        "contact_id ({contact_id}) != signed_data.user_id ({})",
+                        signed_data.user_id
+                    )));
+                }
+
+                if !self
+                    .utils
+                    .verify_stored_pubkey(contact_id, &signed_data.public_key)
+                    .await?
+                {
+                    return Err(UserDiscoveryError::MaliciousAnnouncementData(format!(
+                        "public key does not match with stored one",
+                    )));
+                }
+
+                if !self
+                    .utils
+                    .verify_signature(
+                        &signed_data.encode_to_vec(),
+                        &signed_data.public_key,
+                        &asd.signature,
+                    )
+                    .await?
+                {
+                    return Err(UserDiscoveryError::MaliciousAnnouncementData(format!(
+                        "signature invalid",
+                    )));
+                }
+
+                // Only add this user to the promotions if the users enabled this feature
+                if uda.share_promotion {
+                    let (mut config, config_lock) = self.get_config().await?;
+                    config.promotion_version += 1;
+
+                    let message = UserDiscoveryMessage {
+                        version: Some(UserDiscoveryVersion {
+                            announcement: config.announcement_version,
+                            promotion: config.promotion_version,
+                        }),
+                        user_discovery_promotion: Some(UserDiscoveryPromotion {
+                            promotion_id: rand::random(),
+                            public_id: signed_data.public_id,
+                            threshold: uda.threshold,
+                            announcement_share: uda.announcement_share,
+                            public_key_verified_timestamp,
+                        }),
+                        ..Default::default()
+                    };
+
+                    self.store
+                        .push_own_promotion_and_clear_old_version(
+                            contact_id,
+                            config.promotion_version,
+                            message.encode_to_vec(),
+                        )
+                        .await?;
+
+                    self.update_config(config, config_lock).await?;
+                }
+
+                let announced_user = AnnouncedUser {
+                    user_id: signed_data.user_id,
+                    public_key: signed_data.public_key,
+                    public_id: uda.public_id,
+                };
+
+                tracing::debug!(
+                    "NEW PROMOTION 3: {} knows {}",
+                    contact_id,
+                    announced_user.user_id
+                );
+
+                // User is known, so add him to thr users relations
+                self.store
+                    .push_new_user_relation(
+                        contact_id,
+                        announced_user.clone(),
+                        public_key_verified_timestamp,
+                    )
+                    .await?;
+
+                // As we no now the public_id from the user, all promotions up to this point are also known, so add these to the relations database as well
+                let promotions = self
+                    .store
+                    .get_other_promotions_by_public_id(uda.public_id)
+                    .await?;
+
+                for promotion in promotions {
+                    self.store
+                        .push_new_user_relation(
+                            promotion.from_contact_id,
+                            announced_user,
+                            promotion.public_key_verified_timestamp,
+                        )
+                        .await?;
+                    return Ok(());
+                }
+
+                Ok(())
+            }
+            Err(err) => Err(UserDiscoveryError::ShamirsSecret(err.to_string())),
+        }
+    }
+
+    async fn handle_user_discovery_promotion(
+        &self,
+        from_contact_id: UserID,
+        udp: UserDiscoveryPromotion,
+    ) -> Result<()> {
+        tracing::debug!("Received a new UDP with public_id = {}.", &udp.public_id);
+
+        if udp.announcement_share.is_empty() {
+            tracing::info!("Got empty announcement share. Ignoring it..");
+            return Ok(());
+        }
+
+        self.store
+            .store_other_promotion(OtherPromotion {
+                from_contact_id,
+                promotion_id: udp.promotion_id,
+                threshold: udp.threshold as u8,
+                public_id: udp.public_id,
+                announcement_share: udp.announcement_share,
+                public_key_verified_timestamp: udp.public_key_verified_timestamp,
+            })
+            .await?;
+
+        if let Some(contact) = self
+            .store
+            .get_announced_user_by_public_id(udp.public_id)
+            .await?
+        {
+            tracing::debug!(
+                "NEW PROMOTION 2: {} knows {}",
+                from_contact_id,
+                contact.user_id
+            );
+            // The user is already known, just propagate the relation ship
+            self.store
+                .push_new_user_relation(from_contact_id, contact, udp.public_key_verified_timestamp)
+                .await?;
+            return Ok(());
+        }
+
+        let promotions = self
+            .store
+            .get_other_promotions_by_public_id(udp.public_id)
+            .await?;
+
+        // Deduplicate shares by their raw bytes to prevent invalid Shamir's Secret Sharing recoveries.
+        // Multiple identical shares (e.g. due to contact resending promotions, or DB duplicate writes)
+        // will cause `recover` to interpolate incorrectly and return garbage bytes.
+        let mut unique_shares_set = HashSet::new();
+        let mut unique_promotions = Vec::new();
+        for p in promotions {
+            if unique_shares_set.insert(p.announcement_share.clone()) {
+                unique_promotions.push(p);
+            }
+        }
+
+        if unique_promotions.len() < udp.threshold as usize {
+            tracing::debug!(
+                "Not enough unique shares ({} < {}) to decrypt announcement. Waiting for next share.",
+                unique_promotions.len(),
+                udp.threshold
+            );
+            return Ok(());
+        }
+
+        tracing::debug!("Enough shares decrypting announcement.");
+
+        let shares: Vec<_> = unique_promotions
+            .iter()
+            .map(|x| x.announcement_share.to_owned())
+            .filter_map(|x| Share::try_from(x.as_slice()).ok())
+            .collect();
+
+        match Sharks(udp.threshold as u8).recover(&shares) {
+            Ok(secret) => {
+                tracing::debug!("Could decrypt announcement.");
+                let asd = AnnouncementShareDecrypted::decode(secret.as_slice())?;
+                if let Some(signed_data) = asd.signed_data {
+                    if udp.public_id != signed_data.public_id {
+                        tracing::error!(
+                            "Mismatch of the announced public id and the signed public id "
+                        );
+                        return Ok(());
+                    }
+
+                    if !self
+                        .utils
+                        .verify_signature(
+                            &signed_data.encode_to_vec(),
+                            &signed_data.public_key,
+                            &asd.signature,
+                        )
+                        .await?
+                    {
+                        return Err(UserDiscoveryError::MaliciousAnnouncementData(format!(
+                            "signature is invalid",
+                        )));
+                    }
+
+                    tracing::debug!("Announcement valid.");
+
+                    let announced_user = AnnouncedUser {
+                        user_id: signed_data.user_id,
+                        public_key: signed_data.public_key,
+                        public_id: udp.public_id,
+                    };
+
+                    let (config, _) = self.get_config().await?;
+
+                    let user_id = config.user_id;
+                    for promotion in unique_promotions {
+                        // Do not store the announcement of the users itself.
+                        // Or in case the promotion promotes myself
+                        if promotion.from_contact_id == announced_user.user_id
+                            || announced_user.user_id == user_id
+                        {
+                            continue;
+                        }
+                        tracing::debug!(
+                            "NEW PROMOTION: {:x} knows {:x}",
+                            promotion.from_contact_id,
+                            announced_user.user_id
+                        );
+                        self.store
+                            .push_new_user_relation(
+                                promotion.from_contact_id,
+                                announced_user.clone(),
+                                promotion.public_key_verified_timestamp,
+                            )
+                            .await?;
+                    }
+                }
+                Ok(())
+            }
+            Err(err) => Err(UserDiscoveryError::ShamirsSecret(err.to_string())),
+        }
+    }
+}
+
+impl Default for UserDiscoveryConfig {
+    fn default() -> Self {
+        Self {
+            threshold: 2,
+            total_number_of_shares: u8::MAX,
+            announcement_version: 0,
+            promotion_version: 0,
+            verification_shares: vec![],
+            public_id: 0,
+            share_promotion: true,
+            user_id: 0,
+        }
+    }
+}
diff --git a/rust_dependencies/protocols/src/user_discovery/README.md b/rust_dependencies/protocols/src/user_discovery/README.md
new file mode 100644
index 00000000..af442b96
--- /dev/null
+++ b/rust_dependencies/protocols/src/user_discovery/README.md
@@ -0,0 +1,74 @@
+
+# User Discovery
+
+User Discovery is a feature that allows users to discover other users in a decentralized system without any central authority. It uses Shamir's Secret Sharing to securely share and discover user information.
+
+## Getting started
+
+The User Discovery module is composed of the following components:
+
+- **UserDiscovery** - The main struct which initializes the user discovery and provides access to the user discovery functionality.
+
+- **UserDiscoveryStore** - A trait which has to be implemented. It is used to store and retrieve the user discovery data.
+- **UserDiscoveryUtils** - A trait which has to be implemented. It is used to perform signature verification and signing.
+
+```rust
+use crate::user_discovery::{UserDiscovery, UserID};
+use crate::user_discovery::stores::InMemoryStore; // Replace with your persistent store
+use crate::user_discovery::traits::tests::TestingUtils; // Replace with your utils
+
+const THRESHOLD: u8 = 2;
+
+// Initialize user discovery for Alice
+const ALICE_ID: UserID = 1;
+let alice_ud = UserDiscovery::new(InMemoryStore::default(), TestingUtils::default()).unwrap();
+
+// Set threshold, user ID, and the user's public key
+alice_ud.initialize_or_update(THRESHOLD, ALICE_ID, vec![0; 32]).unwrap();
+
+// Initialize user discovery for Bob
+const BOB_ID: UserID = 2;
+let bob_ud = UserDiscovery::new(InMemoryStore::default(), TestingUtils::default()).unwrap();
+bob_ud.initialize_or_update(THRESHOLD, BOB_ID, vec![0; 32]).unwrap();
+
+
+
+// Simulate network communication: Alice sends her current version to Bob
+let bob_received_version_from_alice = alice_ud.get_current_version().unwrap();
+
+// SEND FROM ALICE TO BOB: bob_received_version_from_alice
+
+// Bob checks if he should request new messages
+if bob_ud.should_request_new_messages(ALICE_ID, &bob_received_version_from_alice).unwrap() {
+
+    // Bob has a old version and must now request to get the new messages
+
+    // Bob fetches his current known version and sends it via the network to Alice
+    let bob_stored_alice_version = bob_ud.get_contact_version(ALICE_ID)
+        .unwrap()
+        .unwrap_or_else(|| vec![0, 0]); // Note: In practice use actual default encoded version
+
+    // SEND FROM BOB TO ALICE: bob_stored_alice_version
+    
+    // Alice loads the new messages for Bob. These only conclude changes since the provided version.
+    let new_messages = alice_ud.get_new_messages(BOB_ID, &bob_stored_alice_version).unwrap();
+
+    // SEND FROM ALICE TO BOB: new_messages
+    
+    // Bob processes the received user discovery messages
+    bob_ud.handle_user_discovery_messages(ALICE_ID, new_messages).unwrap();
+
+    // BOB is now able to promote ALICE to his other contacts
+}
+
+// <Involve more users>
+
+// 4. Retrieve all newly discovered users and relationships
+// In this example now new users where discovered, to see a more comprehensive example 
+// see the test in the `mod.rs` fil.
+let discovered_users = bob_ud.get_all_announced_users().unwrap();
+for (user, connections) in discovered_users {
+    println!("Discovered User: {} (Public ID: {})", user.user_id, user.public_id);
+}
+```
+
diff --git a/rust_dependencies/protocols/src/user_discovery/error.rs b/rust_dependencies/protocols/src/user_discovery/error.rs
new file mode 100644
index 00000000..9cc234a0
--- /dev/null
+++ b/rust_dependencies/protocols/src/user_discovery/error.rs
@@ -0,0 +1,34 @@
+use prost::DecodeError;
+use thiserror::Error;
+
+pub type Result<T> = core::result::Result<T, UserDiscoveryError>;
+
+#[derive(Error, Debug)]
+pub enum UserDiscoveryError {
+    #[error("Store error: `{0}`")]
+    Store(String),
+
+    #[error("The encrypted announcement data contains malicious data: `{0}`")]
+    MaliciousAnnouncementData(String),
+
+    #[error("no shares left.")]
+    NoSharesLeft,
+
+    #[error("User discovery contains no configuration.")]
+    NotInitialized,
+
+    #[error("`{0}`")]
+    JsonError(#[from] serde_json::Error),
+
+    #[error("`{0}`")]
+    IoError(#[from] std::io::Error),
+
+    #[error("error while calculating shamirs secret shares: `{0}`")]
+    ShamirsSecret(String),
+
+    #[error("tried to push a invalid version")]
+    PushedInvalidVersion,
+
+    #[error("`{0}`")]
+    Prost(#[from] DecodeError),
+}
diff --git a/rust_dependencies/protocols/src/user_discovery/stores/in_memory_store.rs b/rust_dependencies/protocols/src/user_discovery/stores/in_memory_store.rs
new file mode 100644
index 00000000..ac5f9c8d
--- /dev/null
+++ b/rust_dependencies/protocols/src/user_discovery/stores/in_memory_store.rs
@@ -0,0 +1,171 @@
+use crate::user_discovery::error::{Result, UserDiscoveryError};
+use crate::user_discovery::traits::{AnnouncedUser, OtherPromotion, UserDiscoveryStore};
+use crate::user_discovery::UserID;
+use std::collections::HashMap;
+use std::sync::{Arc, Mutex};
+
+#[derive(Default)]
+pub(crate) struct Storage {
+    config: Option<String>,
+    unused_shares: Vec<Vec<u8>>,
+    used_shares: HashMap<UserID, Vec<u8>>,
+    contact_versions: HashMap<UserID, Vec<u8>>,
+    other_promotions: HashMap<(UserID, i64), OtherPromotion>,
+    announced_users: HashMap<AnnouncedUser, Vec<(UserID, Option<i64>)>>,
+    own_promotions: Vec<(UserID, Vec<u8>)>,
+}
+
+#[derive(Default, Clone)]
+pub struct InMemoryStore {
+    pub(crate) storage: Arc<Mutex<Storage>>,
+}
+
+impl InMemoryStore {
+    fn storage(&self) -> std::sync::MutexGuard<'_, Storage> {
+        self.storage.lock().unwrap()
+    }
+}
+
+impl UserDiscoveryStore for InMemoryStore {
+    async fn get_config(&self) -> Result<String> {
+        if let Some(storage) = self.storage().config.clone() {
+            return Ok(storage);
+        }
+        Err(UserDiscoveryError::NotInitialized)
+    }
+
+    async fn update_config(&self, update: String) -> Result<()> {
+        self.storage().config = Some(update);
+        Ok(())
+    }
+
+    async fn set_shares(&self, shares: Vec<Vec<u8>>) -> Result<()> {
+        self.storage().used_shares.clear();
+        self.storage().unused_shares = shares;
+        Ok(())
+    }
+
+    async fn get_share_for_contact(&self, contact_id: UserID) -> Result<Vec<u8>> {
+        let mut storage = self.storage();
+        if let Some(share) = storage.used_shares.get(&contact_id) {
+            return Ok(share.to_vec());
+        }
+        if let Some(new_share) = storage.unused_shares.pop() {
+            storage.used_shares.insert(contact_id, new_share.clone());
+            return Ok(new_share);
+        }
+        Err(UserDiscoveryError::NoSharesLeft)
+    }
+
+    async fn get_contact_version(&self, contact_id: UserID) -> Result<Option<Vec<u8>>> {
+        Ok(self.storage().contact_versions.get(&contact_id).cloned())
+    }
+
+    async fn set_contact_version(&self, contact_id: UserID, update: Vec<u8>) -> Result<()> {
+        self.storage().contact_versions.insert(contact_id, update);
+        Ok(())
+    }
+
+    async fn push_own_promotion_and_clear_old_version(
+        &self,
+        contact_id: UserID,
+        version: u32,
+        promotion: Vec<u8>,
+    ) -> Result<()> {
+        let mut storage = self.storage();
+
+        if version as usize != storage.own_promotions.len() + 1 {
+            return Err(UserDiscoveryError::PushedInvalidVersion);
+        }
+
+        for (old_contact_id, promotion) in storage.own_promotions.iter_mut() {
+            if *old_contact_id == contact_id {
+                promotion.clear();
+            }
+        }
+
+        storage.own_promotions.push((contact_id, promotion));
+        Ok(())
+    }
+
+    async fn get_own_promotions_after_version(&self, version: u32) -> Result<Vec<Vec<u8>>> {
+        let storage = self.storage();
+        let elements = storage.own_promotions[(version as usize)..]
+            .into_iter()
+            .map(|(_, promotion)| promotion.to_owned())
+            .collect();
+        Ok(elements)
+    }
+
+    async fn get_contact_promotion(&self, contact_id: UserID) -> Result<Option<Vec<u8>>> {
+        let storage = self.storage();
+        let element = storage
+            .own_promotions
+            .iter()
+            .rev()
+            .find(|(c_id, _)| *c_id == contact_id);
+        if let Some(element) = element {
+            return Ok(Some(element.1.to_owned()));
+        }
+        return Ok(None);
+    }
+
+    async fn store_other_promotion(&self, promotion: OtherPromotion) -> Result<()> {
+        self.storage()
+            .other_promotions
+            .insert((promotion.from_contact_id, promotion.public_id), promotion);
+        Ok(())
+    }
+
+    async fn get_other_promotions_by_public_id(
+        &self,
+        public_id: i64,
+    ) -> Result<Vec<OtherPromotion>> {
+        Ok(self
+            .storage()
+            .other_promotions
+            .clone()
+            .into_values()
+            .filter(|other| other.public_id == public_id)
+            .collect())
+    }
+
+    async fn get_announced_user_by_public_id(
+        &self,
+        public_id: i64,
+    ) -> Result<Option<AnnouncedUser>> {
+        Ok(self
+            .storage()
+            .announced_users
+            .iter()
+            .find(|(u, _)| u.public_id == public_id)
+            .map(|u| u.0.to_owned()))
+    }
+
+    async fn get_all_announced_users(
+        &self,
+    ) -> Result<HashMap<AnnouncedUser, Vec<(UserID, Option<i64>)>>> {
+        Ok(self.storage().announced_users.clone())
+    }
+
+    async fn push_new_user_relation(
+        &self,
+        from_contact_id: UserID,
+        announced_user: AnnouncedUser,
+        public_key_verified_timestamp: Option<i64>,
+    ) -> Result<()> {
+        let mut storage = self.storage();
+        let entry = storage
+            .announced_users
+            .entry(announced_user.clone())
+            .or_insert(vec![]);
+        if announced_user.user_id != from_contact_id {
+            if let Some(found) = entry.iter_mut().find(|x| x.0 == from_contact_id) {
+                found.1 = public_key_verified_timestamp;
+            } else {
+                entry.push((from_contact_id, public_key_verified_timestamp));
+            }
+        }
+        Ok(())
+    }
+}
diff --git a/rust_dependencies/protocols/src/user_discovery/stores/mod.rs b/rust_dependencies/protocols/src/user_discovery/stores/mod.rs
new file mode 100644
index 00000000..c22f0a9e
--- /dev/null
+++ b/rust_dependencies/protocols/src/user_discovery/stores/mod.rs
@@ -0,0 +1,2 @@
+mod in_memory_store;
+pub use in_memory_store::InMemoryStore;
diff --git a/rust_dependencies/protocols/src/user_discovery/tests.rs b/rust_dependencies/protocols/src/user_discovery/tests.rs
new file mode 100644
index 00000000..dc740c6c
--- /dev/null
+++ b/rust_dependencies/protocols/src/user_discovery/tests.rs
@@ -0,0 +1,528 @@
+use crate::user_discovery::stores::InMemoryStore;
+use crate::user_discovery::traits::tests::TestingUtils;
+use crate::user_discovery::{UserDiscovery, UserDiscoveryStore, UserDiscoveryVersion, UserID};
+use prost::Message;
+use rand::seq::SliceRandom;
+use std::collections::{HashMap, HashSet};
+use std::vec;
+
+struct TestNetwork<S: UserDiscoveryStore> {
+    ids_by_name: HashMap<&'static str, usize>,
+    names: Vec<&'static str>,
+    friends: Vec<Vec<usize>>,
+    message_flows: Vec<(usize, usize)>,
+    announced_users_expected: Vec<Vec<(usize, Vec<usize>)>>,
+    uds: Vec<UserDiscovery<S, TestingUtils>>,
+}
+
+impl<S: UserDiscoveryStore + Clone + Default> TestNetwork<S> {
+    fn new() -> Self {
+        Self {
+            ids_by_name: HashMap::new(),
+            names: vec![],
+            friends: vec![],
+            message_flows: vec![],
+            announced_users_expected: vec![],
+            uds: vec![],
+        }
+    }
+
+    async fn add_user(&mut self, name: &'static str, threshold: u8) {
+        let id = self.names.len();
+        self.ids_by_name.insert(name, id);
+        self.names.push(name);
+        self.friends.push(vec![]);
+        self.announced_users_expected.push(vec![]);
+
+        let store = S::default();
+        self.uds.push(get_ud(id, threshold, store).await);
+    }
+
+    fn set_friends(&mut self, user: &str, friends: &[&str]) {
+        let id = self.ids_by_name[user];
+        let f_ids: Vec<usize> = friends.iter().map(|f| self.ids_by_name[*f]).collect();
+        self.friends[id] = f_ids;
+    }
+
+    fn add_message_flow(&mut self, user: &str, count: usize) {
+        let id = self.ids_by_name[user];
+        self.message_flows.push((id, count));
+    }
+
+    fn expect_announced_user(&mut self, user: &str, contact: &str, friends_of_contact: &[&str]) {
+        let user_id = self.ids_by_name[user];
+        let contact_id = self.ids_by_name[contact];
+        let f_ids: Vec<usize> = friends_of_contact
+            .iter()
+            .map(|f| self.ids_by_name[*f])
+            .collect();
+        self.announced_users_expected[user_id].push((contact_id, f_ids));
+    }
+}
+
+async fn get_with_five_users<S: UserDiscoveryStore + Default + Clone>() -> TestNetwork<S> {
+    let mut network = TestNetwork::new();
+
+    network.add_user("ALICE", 2).await;
+    network.add_user("BOB", 2).await;
+    network.add_user("CHARLIE", 2).await;
+    network.add_user("DAVID", 2).await;
+    network.add_user("FRANK", 2).await;
+
+    network.set_friends("ALICE", &["BOB", "CHARLIE"]);
+    network.set_friends("BOB", &["ALICE", "CHARLIE", "DAVID"]);
+    network.set_friends("CHARLIE", &["ALICE", "BOB", "DAVID", "FRANK"]);
+    network.set_friends("DAVID", &["BOB", "CHARLIE"]);
+    network.set_friends("FRANK", &["CHARLIE"]);
+
+    network.add_message_flow("ALICE", 1); // ALICE: own announcement sending to BOB and CHARLIE
+    network.add_message_flow("BOB", 2); // BOB: own announcement + promotion for ALICE
+    network.add_message_flow("BOB", 0); // BOBs version should not have any new messages for his friends
+    network.add_message_flow("ALICE", 1); // ALICE: promotion for BOB
+    network.add_message_flow("CHARLIE", 3); // CHARLIE: own announcement + promotion for ALICE, BOB
+    network.add_message_flow("DAVID", 3); // DAVID: own announcement + promotion for BOB, CHARLIE
+    network.add_message_flow("BOB", 2); // BOB: promotion for CHARLIE, DAVID
+    network.add_message_flow("CHARLIE", 1); // CHARLIE: promotion for DAVID
+    network.add_message_flow("FRANK", 2); // FRANK: own announcement +  promotion for CHARLIE
+    network.add_message_flow("CHARLIE", 1); // CHARLIE: promotion for FRANK
+    network.add_message_flow("ALICE", 1); // ALICE: promotion for CHARLIE
+
+    // ALICE should now know that BOB and CHARLIE, BOB and DAVID and CHARLIE and DAVID are friends.
+    // Alice should also have one protected share from Frank.
+    network.expect_announced_user("ALICE", "BOB", &["CHARLIE"]); // ALICE knows Bob and that CHARLIE is connected with BOB
+    network.expect_announced_user("ALICE", "CHARLIE", &["BOB"]); // ALICE knows CHARLIE and that BOB is connected with CHARLIE
+    network.expect_announced_user("ALICE", "DAVID", &["BOB", "CHARLIE"]); // ALICE knows DAVID and that BOB and CHARLIE are connected with DAVID
+
+    network.expect_announced_user("BOB", "ALICE", &["CHARLIE"]);
+    network.expect_announced_user("BOB", "CHARLIE", &["ALICE", "DAVID"]);
+    network.expect_announced_user("BOB", "DAVID", &["CHARLIE"]);
+
+    network.expect_announced_user("CHARLIE", "ALICE", &["BOB"]);
+    network.expect_announced_user("CHARLIE", "BOB", &["ALICE", "DAVID"]);
+    network.expect_announced_user("CHARLIE", "DAVID", &["BOB"]);
+    network.expect_announced_user("CHARLIE", "FRANK", &[]);
+
+    network.expect_announced_user("DAVID", "ALICE", &["BOB", "CHARLIE"]);
+    network.expect_announced_user("DAVID", "BOB", &["CHARLIE"]);
+    network.expect_announced_user("DAVID", "CHARLIE", &["BOB"]);
+
+    network.expect_announced_user("FRANK", "CHARLIE", &[]);
+
+    network
+}
+
+#[tokio::test]
+async fn test_user_discovery_decreased_threshold_in_memory_store() {
+    let _ = pretty_env_logger::try_init();
+
+    let mut network = TestNetwork::<InMemoryStore>::new();
+
+    // Start ALICE with a more strict threshold of 3.
+    // David only has 2 paths to Alice (via Bob and Charlie). Since 2 < 3, David cannot discover Alice.
+    network.add_user("ALICE", 3).await;
+    network.add_user("BOB", 2).await;
+    network.add_user("CHARLIE", 2).await;
+    network.add_user("DAVID", 2).await;
+    network.add_user("FRANK", 2).await;
+
+    // Same topology as the initial 5 users
+    network.set_friends("ALICE", &["BOB", "CHARLIE"]);
+    network.set_friends("BOB", &["ALICE", "CHARLIE", "DAVID"]);
+    network.set_friends("CHARLIE", &["ALICE", "BOB", "DAVID", "FRANK"]);
+    network.set_friends("DAVID", &["BOB", "CHARLIE"]);
+    network.set_friends("FRANK", &["CHARLIE"]);
+
+    let david_idx = network.ids_by_name["DAVID"];
+    let alice_idx = network.ids_by_name["ALICE"];
+    let charlie_idx = network.ids_by_name["CHARLIE"];
+
+    // Phase 1: Exchange with ALICE threshold = 3
+    step0_exchange_random::<InMemoryStore>(&network).await;
+    step1_verify_no_new_messages::<InMemoryStore>(&network).await;
+
+    let version = network.uds[david_idx]
+        .get_contact_version(charlie_idx as UserID)
+        .await
+        .unwrap()
+        .unwrap();
+    assert_eq!(version, get_version_bytes(1, 4));
+
+    // DAVID should NOT know ALICE yet because ALICE's threshold is 3, but David only has 2 shares.
+    let david_knows = network.uds[david_idx]
+        .get_all_announced_users()
+        .await
+        .unwrap();
+
+    let knows_alice = david_knows
+        .iter()
+        .any(|(u, _)| u.user_id == alice_idx as UserID);
+
+    assert!(!knows_alice, "David should not know Alice yet because Alice's threshold is 3 and David only receives 2 shares");
+
+    // Phase 2: Update ALICE's threshold to 2
+    network.uds[alice_idx]
+        .initialize_or_update(2, alice_idx as UserID, vec![alice_idx as u8; 32], true)
+        .await
+        .unwrap();
+
+    let version = network.uds[alice_idx].get_current_version().await.unwrap();
+    assert_eq!(version, get_version_bytes(2, 2));
+
+    // ALICE's new announcement with threshold 2 should propagate further.
+    step0_exchange_random::<InMemoryStore>(&network).await;
+    step1_verify_no_new_messages::<InMemoryStore>(&network).await;
+
+    let version = network.uds[david_idx]
+        .get_contact_version(charlie_idx as UserID)
+        .await
+        .unwrap()
+        .unwrap();
+    assert_eq!(version, get_version_bytes(1, 5));
+
+    let version = network.uds[alice_idx].get_current_version().await.unwrap();
+    assert_eq!(version, get_version_bytes(2, 2));
+
+    // Now DAVID SHOULD know ALICE
+    let david_knows = network.uds[david_idx]
+        .get_all_announced_users()
+        .await
+        .unwrap();
+    let knows_alice_now = david_knows
+        .iter()
+        .any(|(u, _)| u.user_id == alice_idx as UserID);
+    assert!(
+        knows_alice_now,
+        "David should know Alice now because her threshold was updated to 2"
+    );
+}
+
+#[tokio::test]
+async fn test_user_discovery_increased_threshold_in_memory_store() {
+    let _ = pretty_env_logger::try_init();
+
+    let mut network = TestNetwork::<InMemoryStore>::new();
+
+    // Start ALICE with a more strict threshold of 3.
+    // David only has 2 paths to Alice (via Bob and Charlie). Since 2 < 3, David cannot discover Alice.
+    network.add_user("ALICE", 2).await;
+    network.add_user("BOB", 2).await;
+    network.add_user("CHARLIE", 2).await;
+    network.add_user("DAVID", 2).await;
+    network.add_user("FRANK", 2).await;
+
+    // Same topology as the initial 5 users
+    network.set_friends("ALICE", &["BOB", "CHARLIE"]);
+    network.set_friends("BOB", &["ALICE", "CHARLIE", "DAVID"]);
+    // CHARLIE IS NOT YET A FRIEND OF DAVID -> DAVID SHOULD NOT BE ABLE TO BE DECODE ALICE
+    network.set_friends("CHARLIE", &["ALICE", "BOB", "FRANK"]);
+    network.set_friends("DAVID", &["BOB", "CHARLIE"]);
+    network.set_friends("FRANK", &["CHARLIE"]);
+
+    let david_idx = network.ids_by_name["DAVID"];
+    let alice_idx = network.ids_by_name["ALICE"];
+
+    // Phase 1: Exchange with ALICE threshold = 2
+    step0_exchange_random::<InMemoryStore>(&network).await;
+    step1_verify_no_new_messages::<InMemoryStore>(&network).await;
+
+    // DAVID should NOT know ALICE yet because ALICE's threshold is 2, and David has only 1 shares.
+    {
+        let david_knows = network.uds[david_idx]
+            .get_all_announced_users()
+            .await
+            .unwrap();
+
+        let knows_alice = david_knows
+            .iter()
+            .any(|(u, _)| u.user_id == alice_idx as UserID);
+
+        assert!(!knows_alice, "David should not know Alice yet because Alice's threshold is 3 and David only receives 2 shares");
+    }
+
+    // Phase 2: Update ALICE's threshold to 3
+    network.uds[alice_idx]
+        .initialize_or_update(3, alice_idx as UserID, vec![alice_idx as u8; 32], true)
+        .await
+        .unwrap();
+
+    // ALICE's new announcement with threshold 3 should propagate further.
+    // This SHOULD REPLACE THE OLD VERSION...
+    step0_exchange_random::<InMemoryStore>(&network).await;
+    step1_verify_no_new_messages::<InMemoryStore>(&network).await;
+
+    // Now Charlie is a friend of David, so he should exchange ALICE with him
+
+    network.set_friends("CHARLIE", &["ALICE", "BOB", "DAVID", "FRANK"]);
+
+    // ALICE's new announcement with threshold 3 should propagate further.
+    // This SHOULD REPLACE THE OLD VERSION...
+    step0_exchange_random::<InMemoryStore>(&network).await;
+    step1_verify_no_new_messages::<InMemoryStore>(&network).await;
+
+    // DAVID should still NOT know ALICE yet because ALICE's new threshold is 3, and David has only 2 shares.
+    {
+        let david_knows = network.uds[david_idx]
+            .get_all_announced_users()
+            .await
+            .unwrap();
+
+        let knows_alice = david_knows
+            .iter()
+            .any(|(u, _)| u.user_id == alice_idx as UserID);
+
+        assert!(!knows_alice, "David should not know Alice yet because Alice's threshold is 3 and David only receives 2 shares");
+    }
+}
+
+#[tokio::test]
+async fn test_user_discovery_in_memory_store() {
+    let _ = pretty_env_logger::try_init();
+
+    let users = get_with_five_users().await;
+    step0_exchange_in_order::<InMemoryStore>(&users).await;
+    step1_verify_no_new_messages::<InMemoryStore>(&users).await;
+    step2_verify_announced_users_expected::<InMemoryStore>(&users).await;
+
+    let alice_idx = users.ids_by_name["ALICE"];
+    let bob_idx = users.ids_by_name["BOB"];
+    let david_idx = users.ids_by_name["DAVID"];
+
+    users.uds[bob_idx]
+        .update_verification_state_for_user(alice_idx as UserID, Some(10))
+        .await
+        .unwrap();
+
+    step0_exchange_random::<InMemoryStore>(&users).await;
+    step1_verify_no_new_messages::<InMemoryStore>(&users).await;
+
+    {
+        let david_knows = users.uds[david_idx]
+            .get_all_announced_users()
+            .await
+            .unwrap();
+
+        let knows_alice = david_knows
+            .iter()
+            .find(|(u, _)| u.user_id == alice_idx as UserID);
+
+        assert!(knows_alice.is_some(), "David should know Alice");
+
+        let bob_has_verified = knows_alice
+            .unwrap()
+            .1
+            .iter()
+            .find(|(user_id, _)| *user_id == bob_idx as UserID)
+            .unwrap();
+
+        assert_eq!(bob_has_verified.1, Some(10));
+    }
+}
+
+#[tokio::test]
+async fn test_user_discovery_random_order_in_memory_store() {
+    let _ = pretty_env_logger::try_init();
+
+    let users = get_with_five_users().await;
+    step0_exchange_random::<InMemoryStore>(&users).await;
+    step1_verify_no_new_messages::<InMemoryStore>(&users).await;
+    step2_verify_announced_users_expected::<InMemoryStore>(&users).await;
+}
+
+async fn step0_exchange_in_order<S: UserDiscoveryStore + Clone + Default>(users: &TestNetwork<S>) {
+    for (i, (from, count)) in users.message_flows.iter().enumerate() {
+        tracing::debug!("MESSAGE FLOW: {i}");
+        to_all_friends(*from, *count, &users).await;
+    }
+}
+
+async fn step0_exchange_random<S: UserDiscoveryStore + Clone + Default>(users: &TestNetwork<S>) {
+    let mut user_ids: Vec<usize> = (0..users.names.len()).collect();
+
+    for _ in 0..100 {
+        user_ids.shuffle(&mut rand::rng());
+
+        for from in user_ids.clone() {
+            for friend in &users.friends[from] {
+                request_and_handle_messages(
+                    (from, &users.uds[from]),
+                    (*friend, &users.uds[*friend]),
+                    None,
+                )
+                .await;
+            }
+        }
+    }
+}
+
+async fn step1_verify_no_new_messages<S: UserDiscoveryStore + Clone + Default>(
+    users: &TestNetwork<S>,
+) {
+    tracing::debug!("Now all users should have the newest version.");
+
+    for from in 0..users.names.len() {
+        for to in &users.friends[from] {
+            tracing::debug!(
+                "Does {} has open messages for {}?",
+                &users.names[from],
+                &users.names[*to]
+            );
+            assert_new_messages((from, &users.uds[from]), (*to, &users.uds[*to]), false).await;
+        }
+    }
+}
+
+async fn step2_verify_announced_users_expected<S: UserDiscoveryStore + Clone + Default>(
+    users: &TestNetwork<S>,
+) {
+    tracing::debug!("Test if all exchanges where successful.");
+
+    for (user, announcements) in users.announced_users_expected.iter().enumerate() {
+        let announced_users2 = users.uds[user].get_all_announced_users().await.unwrap();
+        let mut announced_users = HashMap::new();
+        for a in announced_users2 {
+            announced_users.insert(a.0.user_id, a.1.iter().map(|x| x.0).collect::<Vec<_>>());
+        }
+        tracing::debug!("{} knows now: {}", users.names[user], announced_users.len());
+        assert_eq!(announced_users.len(), announcements.len());
+        for (contact_id, announced_users_expected) in announcements {
+            let announced_users = announced_users.get(&(*contact_id as i64)).unwrap();
+            tracing::debug!(
+                "{} knows now that {} has the following friends: {}",
+                users.names[user],
+                users.names[*contact_id],
+                announced_users
+                    .iter()
+                    .map(|x| users.names[*x as usize])
+                    .collect::<Vec<_>>()
+                    .join(", ")
+            );
+            let announced_users: HashSet<i64> = announced_users.iter().cloned().collect();
+            let announced_users_expected: HashSet<i64> = announced_users_expected
+                .iter()
+                .cloned()
+                .map(|x| x as i64)
+                .collect();
+            assert_eq!(announced_users, announced_users_expected);
+        }
+    }
+}
+
+async fn get_ud<S: UserDiscoveryStore + Clone + Default>(
+    user_id: usize,
+    threshold: u8,
+    store: S,
+) -> UserDiscovery<S, TestingUtils> {
+    let ud = UserDiscovery::new(store.to_owned(), TestingUtils::default()).unwrap();
+
+    ud.initialize_or_update(threshold, user_id as UserID, vec![user_id as u8; 32], true)
+        .await
+        .unwrap();
+
+    let version = ud.get_current_version().await.unwrap();
+
+    assert_eq!(version, get_version_bytes(1, 0));
+    ud
+}
+
+async fn assert_new_messages<S: UserDiscoveryStore>(
+    from: (usize, &UserDiscovery<S, TestingUtils>),
+    to: (usize, &UserDiscovery<S, TestingUtils>),
+    has_new_messages: bool,
+) {
+    // From sends a message with his current version to To
+    let to_received_version = &from.1.get_current_version().await.unwrap();
+    assert_eq!(
+        to.1.should_request_new_messages(from.0 as UserID, to_received_version)
+            .await
+            .unwrap()
+            .is_some(),
+        has_new_messages
+    );
+}
+
+async fn request_and_handle_messages<S: UserDiscoveryStore>(
+    from: (usize, &UserDiscovery<S, TestingUtils>),
+    to: (usize, &UserDiscovery<S, TestingUtils>),
+    messages_count: Option<usize>,
+) {
+    // From sends a message with his current version to To
+
+    if messages_count.is_some() {
+        let to_received_version = &from.1.get_current_version().await.unwrap();
+        assert_eq!(
+            to.1.should_request_new_messages(from.0 as UserID, to_received_version)
+                .await
+                .unwrap()
+                .is_some(),
+            true
+        );
+    }
+
+    // As To has a older version stored he sends a request to From: Give me all messages since version.
+    let from_request_version_from_to =
+        to.1.get_contact_version(from.0 as UserID)
+            .await
+            .unwrap()
+            .unwrap_or(get_version_bytes(0, 0));
+
+    let new_messages = from
+        .1
+        .get_new_messages(to.0 as UserID, &from_request_version_from_to)
+        .await
+        .unwrap();
+
+    if let Some(messages_count) = messages_count {
+        assert!(new_messages.len() <= messages_count);
+    }
+
+    to.1.handle_new_messages(from.0 as UserID, None, new_messages)
+        .await
+        .unwrap();
+
+    if messages_count.is_some() {
+        assert_eq!(
+            to.1.should_request_new_messages(
+                from.0 as UserID,
+                &from.1.get_current_version().await.unwrap()
+            )
+            .await
+            .unwrap()
+            .is_some(),
+            false
+        );
+    }
+}
+
+async fn to_all_friends<S: UserDiscoveryStore + Clone>(
+    from: usize,
+    message_count: usize,
+    users: &TestNetwork<S>,
+) {
+    for friend in &users.friends[from] {
+        tracing::debug!("From {} to {}", users.names[from], users.names[*friend]);
+
+        if message_count == 0 {
+            assert_new_messages(
+                (from, &users.uds[from]),
+                (*friend, &users.uds[*friend]),
+                false,
+            )
+            .await;
+        } else {
+            request_and_handle_messages(
+                (from, &users.uds[from]),
+                (*friend, &users.uds[*friend]),
+                Some(message_count),
+            )
+            .await;
+        }
+    }
+}
+
+fn get_version_bytes(announcement: u32, promotion: u32) -> Vec<u8> {
+    UserDiscoveryVersion {
+        announcement,
+        promotion,
+    }
+    .encode_to_vec()
+}
diff --git a/rust_dependencies/protocols/src/user_discovery/traits.rs b/rust_dependencies/protocols/src/user_discovery/traits.rs
new file mode 100644
index 00000000..c9dcb507
--- /dev/null
+++ b/rust_dependencies/protocols/src/user_discovery/traits.rs
@@ -0,0 +1,138 @@
+use std::collections::HashMap;
+
+use crate::user_discovery::error::Result;
+use crate::user_discovery::UserID;
+use std::future::Future;
+
+#[derive(Clone, sqlx::FromRow)]
+pub struct OtherPromotion {
+    pub promotion_id: u32,
+    pub public_id: i64,
+    pub from_contact_id: UserID,
+    pub threshold: u8,
+    pub announcement_share: Vec<u8>,
+    pub public_key_verified_timestamp: Option<i64>,
+}
+
+#[derive(Clone, Hash, PartialEq, Eq, Debug)]
+pub struct AnnouncedUser {
+    pub user_id: UserID,
+    pub public_key: Vec<u8>,
+    pub public_id: i64,
+}
+
+pub trait UserDiscoveryStore {
+    fn get_config(&self) -> impl Future<Output = Result<String>> + Send;
+    fn update_config(&self, update: String) -> impl Future<Output = Result<()>> + Send;
+    fn set_shares(&self, shares: Vec<Vec<u8>>) -> impl Future<Output = Result<()>> + Send;
+
+    fn get_share_for_contact(
+        &self,
+        contact_id: UserID,
+    ) -> impl Future<Output = Result<Vec<u8>>> + Send;
+
+    fn push_own_promotion_and_clear_old_version(
+        &self,
+        contact_id: UserID,
+        version: u32,
+        promotion: Vec<u8>,
+    ) -> impl Future<Output = Result<()>> + Send;
+
+    fn get_own_promotions_after_version(
+        &self,
+        version: u32,
+    ) -> impl Future<Output = Result<Vec<Vec<u8>>>> + Send;
+
+    fn store_other_promotion(
+        &self,
+        promotion: OtherPromotion,
+    ) -> impl Future<Output = Result<()>> + Send;
+
+    fn get_other_promotions_by_public_id(
+        &self,
+        public_id: i64,
+    ) -> impl Future<Output = Result<Vec<OtherPromotion>>> + Send;
+
+    fn get_announced_user_by_public_id(
+        &self,
+        public_id: i64,
+    ) -> impl Future<Output = Result<Option<AnnouncedUser>>> + Send;
+
+    fn push_new_user_relation(
+        &self,
+        from_contact_id: UserID,
+        announced_user: AnnouncedUser,
+        public_key_verified_timestamp: Option<i64>,
+    ) -> impl Future<Output = Result<()>> + Send;
+
+    fn get_all_announced_users(
+        &self,
+    ) -> impl Future<Output = Result<HashMap<AnnouncedUser, Vec<(UserID, Option<i64>)>>>> + Send;
+
+    fn get_contact_promotion(
+        &self,
+        contact_id: UserID,
+    ) -> impl Future<Output = Result<Option<Vec<u8>>>> + Send;
+
+    fn get_contact_version(
+        &self,
+        contact_id: UserID,
+    ) -> impl Future<Output = Result<Option<Vec<u8>>>> + Send;
+
+    fn set_contact_version(
+        &self,
+        contact_id: UserID,
+        update: Vec<u8>,
+    ) -> impl Future<Output = Result<()>> + Send;
+}
+
+pub trait UserDiscoveryUtils {
+    fn sign_data(&self, input_data: &[u8]) -> impl Future<Output = Result<Vec<u8>>> + Send;
+    fn verify_signature(
+        &self,
+        input_data: &[u8],
+        pubkey: &[u8],
+        signature: &[u8],
+    ) -> impl Future<Output = Result<bool>> + Send;
+    /// In case the the user does not exists yet return false.
+    /// If this happens this should trigger an error, as this functions is only when a message was received from this user...
+    /// This is used to verify that the share of the promotions contains the same public key and the user is not secretly announcing a different one
+    fn verify_stored_pubkey(
+        &self,
+        from_contact_id: UserID,
+        pubkey: &[u8],
+    ) -> impl Future<Output = Result<bool>> + Send;
+}
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use crate::user_discovery::traits::UserDiscoveryUtils;
+
+    #[derive(Default)]
+    pub(crate) struct TestingUtils {}
+    impl UserDiscoveryUtils for TestingUtils {
+        async fn sign_data(
+            &self,
+            _input_data: &[u8],
+        ) -> crate::user_discovery::error::Result<Vec<u8>> {
+            Ok(vec![0; 64])
+        }
+
+        async fn verify_signature(
+            &self,
+            _data: &[u8],
+            _pubkey: &[u8],
+            _signature: &[u8],
+        ) -> crate::user_discovery::error::Result<bool> {
+            Ok(true)
+        }
+
+        async fn verify_stored_pubkey(
+            &self,
+            _from_contact_id: crate::user_discovery::UserID,
+            _pubkey: &[u8],
+        ) -> crate::user_discovery::error::Result<bool> {
+            Ok(true)
+        }
+    }
+}
diff --git a/rust_dependencies/protocols/src/user_discovery/types.proto b/rust_dependencies/protocols/src/user_discovery/types.proto
new file mode 100644
index 00000000..5a81514b
--- /dev/null
+++ b/rust_dependencies/protocols/src/user_discovery/types.proto
@@ -0,0 +1,49 @@
+syntax = "proto3";
+package user_discovery;
+
+message UserDiscoveryVersion {
+  uint32 announcement = 1;
+  uint32 promotion    = 2;
+}
+
+message UserDiscoveryMessage {
+
+  UserDiscoveryVersion version = 1;
+
+  optional UserDiscoveryAnnouncement user_discovery_announcement = 2;
+  optional UserDiscoveryPromotion    user_discovery_promotion    = 3;
+  optional UserDiscoveryRecall       user_discovery_recall       = 4;
+
+  message UserDiscoveryAnnouncement {
+    int64          public_id           = 1;
+    uint32         threshold           = 2;
+    bytes          announcement_share  = 3;
+    bool           share_promotion     = 4;
+    repeated bytes verification_shares = 5;
+  }
+
+  message UserDiscoveryPromotion {
+    uint32 promotion_id       = 1;
+    int64  public_id          = 2;
+    uint32 threshold          = 3;
+    bytes  announcement_share = 5;
+
+    optional int64 public_key_verified_timestamp = 6;
+
+    message AnnouncementShareDecrypted {
+      message SignedData {
+        int64 public_id  = 1;
+        int64 user_id    = 2;
+        bytes public_key = 3;
+      }
+      SignedData signed_data = 1;
+      bytes      signature   = 2;
+    }
+
+  }
+
+  message UserDiscoveryRecall {
+    int64 promotion_id = 1;
+  }
+
+}
diff --git a/scripts/check_arb.py b/scripts/check_arb.py
new file mode 100644
index 00000000..a9ecc289
--- /dev/null
+++ b/scripts/check_arb.py
@@ -0,0 +1,121 @@
+import os
+import json
+import re
+import sys
+
+ARB_DIR = 'lib/src/localization/translations'
+LIB_DIR = 'lib'
+
+def get_arb_data(filepath):
+    try:
+        with open(filepath, 'r', encoding='utf-8') as f:
+            return json.load(f)
+    except Exception as e:
+        print(f"Error reading {filepath}: {e}")
+        return {}
+
+def save_arb_data(filepath, data):
+    with open(filepath, 'w', encoding='utf-8') as f:
+        json.dump(data, f, indent=2, ensure_ascii=False)
+        f.write('\n')
+
+def get_keys(data):
+    return {k for k in data.keys() if k and not k.startswith('@')}
+
+def main():
+    fix_mode = '--fix' in sys.argv
+
+    en_file = os.path.join(ARB_DIR, 'en.arb')
+    if not os.path.exists(en_file):
+        print(f"Error: {en_file} not found. Please run this script from the project root.")
+        return
+
+    en_data = get_arb_data(en_file)
+    en_keys = get_keys(en_data)
+    print(f"Found {len(en_keys)} keys in en.arb")
+
+    # 1. Check for unused keys in Dart files
+    print("\n--- Checking for unused keys in Dart files ---")
+    all_dart_text = ""
+    for root, _, files in os.walk(LIB_DIR):
+        for file in files:
+            if file.endswith('.dart'):
+                filepath = os.path.join(root, file)
+                if "generated" in str(filepath):
+                    continue
+                try:
+                    with open(filepath, 'r', encoding='utf-8') as f:
+                        all_dart_text += f.read() + "\n"
+                except Exception as e:
+                    print(f"Could not read {filepath}: {e}")
+
+    unused_keys = set()
+    for key in sorted(en_keys):
+        # Using word boundary to avoid partial matches
+        pattern = r'\b' + re.escape(key) + r'\b'
+        if not re.search(pattern, all_dart_text):
+            unused_keys.add(key)
+            
+    if unused_keys:
+        print(f"Found {len(unused_keys)} keys in en.arb that do not appear to be used in the Dart code:")
+        for k in sorted(unused_keys):
+            print(f"  - {k}")
+            
+        if fix_mode:
+            print("\n--fix is enabled. Deleting unused keys from all .arb files...")
+            arb_files = [f for f in os.listdir(ARB_DIR) if f.endswith('.arb')]
+            for arb_file in arb_files:
+                filepath = os.path.join(ARB_DIR, arb_file)
+                data = get_arb_data(filepath)
+                deleted_count = 0
+                for k in unused_keys:
+                    if k in data:
+                        del data[k]
+                        # Also delete associated metadata if it exists
+                        meta_k = f"@{k}"
+                        if meta_k in data:
+                            del data[meta_k]
+                        deleted_count += 1
+                
+                if deleted_count > 0:
+                    save_arb_data(filepath, data)
+                    print(f"Deleted {deleted_count} unused keys from {arb_file}")
+            
+            # Remove deleted keys from our set so the comparison below is accurate
+            en_keys = en_keys - unused_keys
+        else:
+            print("\nRun with --fix to automatically delete these unused keys.")
+    else:
+        print("All keys in en.arb seem to be used in the Dart files.")
+
+    # 2. Compare other .arb files with en.arb
+    print("\n--- Comparing other .arb files with en.arb ---")
+    arb_files = [f for f in os.listdir(ARB_DIR) if f.endswith('.arb')]
+    for arb_file in arb_files:
+        if arb_file == 'en.arb':
+            continue
+            
+        filepath = os.path.join(ARB_DIR, arb_file)
+        data = get_arb_data(filepath)
+        other_keys = get_keys(data)
+        
+        extra_keys = other_keys - en_keys
+        missing_keys = en_keys - other_keys
+        
+        print(f"\n[{arb_file} vs en.arb]")
+        if extra_keys:
+            print(f"Keys in {arb_file} but NOT in en.arb ({len(extra_keys)}):")
+            for k in sorted(extra_keys):
+                print(f"  + {k}")
+        else:
+            print(f"No extra keys found in {arb_file} (all keys are in en.arb).")
+            
+        if missing_keys:
+            print(f"Keys in en.arb but NOT in {arb_file} ({len(missing_keys)}):")
+            for k in sorted(missing_keys):
+                print(f"  - {k}")
+        else:
+            print(f"No missing keys in {arb_file} (it has all en.arb keys).")
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/generate_proto.sh b/scripts/generate_proto.sh
index 40880f92..e6c8ca1a 100755
--- a/scripts/generate_proto.sh
+++ b/scripts/generate_proto.sh
@@ -17,6 +17,9 @@ protoc --proto_path="$CLIENT_DIR" --dart_out="$GENERATED_DIR" "groups.proto"
 protoc --proto_path="$CLIENT_DIR" --dart_out="$GENERATED_DIR" "qr.proto"
 protoc --proto_path="$CLIENT_DIR" --dart_out="$GENERATED_DIR" "data.proto"
 
+mkdir "$GENERATED_DIR/user_discovery/" &>/dev/null
+protoc --proto_path="./rust_dependencies/protocols/src/user_discovery/" --dart_out="$GENERATED_DIR/user_discovery/" "types.proto"
+
 protoc --proto_path="$CLIENT_DIR" --dart_out="$GENERATED_DIR" "push_notification.proto"
 protoc --proto_path="$CLIENT_DIR" --swift_out="./ios/NotificationService/" "push_notification.proto"
 
diff --git a/test/drift/twonly_db/generated/schema.dart b/test/drift/twonly_db/generated/schema.dart
index 60e4f107..49f49d7b 100644
--- a/test/drift/twonly_db/generated/schema.dart
+++ b/test/drift/twonly_db/generated/schema.dart
@@ -15,6 +15,7 @@ import 'schema_v8.dart' as v8;
 import 'schema_v9.dart' as v9;
 import 'schema_v10.dart' as v10;
 import 'schema_v11.dart' as v11;
+import 'schema_v12.dart' as v12;
 
 class GeneratedHelper implements SchemaInstantiationHelper {
   @override
@@ -42,10 +43,12 @@ class GeneratedHelper implements SchemaInstantiationHelper {
         return v10.DatabaseAtV10(db);
       case 11:
         return v11.DatabaseAtV11(db);
+      case 12:
+        return v12.DatabaseAtV12(db);
       default:
         throw MissingSchemaException(version, versions);
     }
   }
 
-  static const versions = const [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11];
+  static const versions = const [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
 }
diff --git a/test/drift/twonly_db/generated/schema_v12.dart b/test/drift/twonly_db/generated/schema_v12.dart
new file mode 100644
index 00000000..d314edab
--- /dev/null
+++ b/test/drift/twonly_db/generated/schema_v12.dart
@@ -0,0 +1,9702 @@
+// dart format width=80
+import 'dart:typed_data' as i2;
+// GENERATED BY drift_dev, DO NOT MODIFY.
+// ignore_for_file: type=lint,unused_import
+//
+import 'package:drift/drift.dart';
+
+class Contacts extends Table with TableInfo<Contacts, ContactsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  Contacts(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> userId = GeneratedColumn<int>(
+    'user_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> username = GeneratedColumn<String>(
+    'username',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> displayName = GeneratedColumn<String>(
+    'display_name',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<String> nickName = GeneratedColumn<String>(
+    'nick_name',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> avatarSvgCompressed =
+      GeneratedColumn<i2.Uint8List>(
+        'avatar_svg_compressed',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> senderProfileCounter = GeneratedColumn<int>(
+    'sender_profile_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> accepted = GeneratedColumn<int>(
+    'accepted',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (accepted IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> deletedByUser = GeneratedColumn<int>(
+    'deleted_by_user',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (deleted_by_user IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> requested = GeneratedColumn<int>(
+    'requested',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (requested IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> blocked = GeneratedColumn<int>(
+    'blocked',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (blocked IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> verified = GeneratedColumn<int>(
+    'verified',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (verified IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> accountDeleted = GeneratedColumn<int>(
+    'account_deleted',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (account_deleted IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  late final GeneratedColumn<i2.Uint8List> userDiscoveryVersion =
+      GeneratedColumn<i2.Uint8List>(
+        'user_discovery_version',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> userDiscoveryExcluded = GeneratedColumn<int>(
+    'user_discovery_excluded',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT 0 CHECK (user_discovery_excluded IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> userDiscoveryManualApproved =
+      GeneratedColumn<int>(
+        'user_discovery_manual_approved',
+        aliasedName,
+        true,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints:
+            'NULL DEFAULT 0 CHECK (user_discovery_manual_approved IN (0, 1))',
+        defaultValue: const CustomExpression('0'),
+      );
+  late final GeneratedColumn<int> mediaSendCounter = GeneratedColumn<int>(
+    'media_send_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> mediaReceivedCounter = GeneratedColumn<int>(
+    'media_received_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    userId,
+    username,
+    displayName,
+    nickName,
+    avatarSvgCompressed,
+    senderProfileCounter,
+    accepted,
+    deletedByUser,
+    requested,
+    blocked,
+    verified,
+    accountDeleted,
+    createdAt,
+    userDiscoveryVersion,
+    userDiscoveryExcluded,
+    userDiscoveryManualApproved,
+    mediaSendCounter,
+    mediaReceivedCounter,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'contacts';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {userId};
+  @override
+  ContactsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return ContactsData(
+      userId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}user_id'],
+      )!,
+      username: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}username'],
+      )!,
+      displayName: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}display_name'],
+      ),
+      nickName: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}nick_name'],
+      ),
+      avatarSvgCompressed: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}avatar_svg_compressed'],
+      ),
+      senderProfileCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}sender_profile_counter'],
+      )!,
+      accepted: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}accepted'],
+      )!,
+      deletedByUser: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}deleted_by_user'],
+      )!,
+      requested: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}requested'],
+      )!,
+      blocked: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}blocked'],
+      )!,
+      verified: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}verified'],
+      )!,
+      accountDeleted: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}account_deleted'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+      userDiscoveryVersion: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}user_discovery_version'],
+      ),
+      userDiscoveryExcluded: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}user_discovery_excluded'],
+      )!,
+      userDiscoveryManualApproved: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}user_discovery_manual_approved'],
+      ),
+      mediaSendCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}media_send_counter'],
+      )!,
+      mediaReceivedCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}media_received_counter'],
+      )!,
+    );
+  }
+
+  @override
+  Contacts createAlias(String alias) {
+    return Contacts(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(user_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class ContactsData extends DataClass implements Insertable<ContactsData> {
+  final int userId;
+  final String username;
+  final String? displayName;
+  final String? nickName;
+  final i2.Uint8List? avatarSvgCompressed;
+  final int senderProfileCounter;
+  final int accepted;
+  final int deletedByUser;
+  final int requested;
+  final int blocked;
+  final int verified;
+  final int accountDeleted;
+  final int createdAt;
+  final i2.Uint8List? userDiscoveryVersion;
+  final int userDiscoveryExcluded;
+  final int? userDiscoveryManualApproved;
+  final int mediaSendCounter;
+  final int mediaReceivedCounter;
+  const ContactsData({
+    required this.userId,
+    required this.username,
+    this.displayName,
+    this.nickName,
+    this.avatarSvgCompressed,
+    required this.senderProfileCounter,
+    required this.accepted,
+    required this.deletedByUser,
+    required this.requested,
+    required this.blocked,
+    required this.verified,
+    required this.accountDeleted,
+    required this.createdAt,
+    this.userDiscoveryVersion,
+    required this.userDiscoveryExcluded,
+    this.userDiscoveryManualApproved,
+    required this.mediaSendCounter,
+    required this.mediaReceivedCounter,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['user_id'] = Variable<int>(userId);
+    map['username'] = Variable<String>(username);
+    if (!nullToAbsent || displayName != null) {
+      map['display_name'] = Variable<String>(displayName);
+    }
+    if (!nullToAbsent || nickName != null) {
+      map['nick_name'] = Variable<String>(nickName);
+    }
+    if (!nullToAbsent || avatarSvgCompressed != null) {
+      map['avatar_svg_compressed'] = Variable<i2.Uint8List>(
+        avatarSvgCompressed,
+      );
+    }
+    map['sender_profile_counter'] = Variable<int>(senderProfileCounter);
+    map['accepted'] = Variable<int>(accepted);
+    map['deleted_by_user'] = Variable<int>(deletedByUser);
+    map['requested'] = Variable<int>(requested);
+    map['blocked'] = Variable<int>(blocked);
+    map['verified'] = Variable<int>(verified);
+    map['account_deleted'] = Variable<int>(accountDeleted);
+    map['created_at'] = Variable<int>(createdAt);
+    if (!nullToAbsent || userDiscoveryVersion != null) {
+      map['user_discovery_version'] = Variable<i2.Uint8List>(
+        userDiscoveryVersion,
+      );
+    }
+    map['user_discovery_excluded'] = Variable<int>(userDiscoveryExcluded);
+    if (!nullToAbsent || userDiscoveryManualApproved != null) {
+      map['user_discovery_manual_approved'] = Variable<int>(
+        userDiscoveryManualApproved,
+      );
+    }
+    map['media_send_counter'] = Variable<int>(mediaSendCounter);
+    map['media_received_counter'] = Variable<int>(mediaReceivedCounter);
+    return map;
+  }
+
+  ContactsCompanion toCompanion(bool nullToAbsent) {
+    return ContactsCompanion(
+      userId: Value(userId),
+      username: Value(username),
+      displayName: displayName == null && nullToAbsent
+          ? const Value.absent()
+          : Value(displayName),
+      nickName: nickName == null && nullToAbsent
+          ? const Value.absent()
+          : Value(nickName),
+      avatarSvgCompressed: avatarSvgCompressed == null && nullToAbsent
+          ? const Value.absent()
+          : Value(avatarSvgCompressed),
+      senderProfileCounter: Value(senderProfileCounter),
+      accepted: Value(accepted),
+      deletedByUser: Value(deletedByUser),
+      requested: Value(requested),
+      blocked: Value(blocked),
+      verified: Value(verified),
+      accountDeleted: Value(accountDeleted),
+      createdAt: Value(createdAt),
+      userDiscoveryVersion: userDiscoveryVersion == null && nullToAbsent
+          ? const Value.absent()
+          : Value(userDiscoveryVersion),
+      userDiscoveryExcluded: Value(userDiscoveryExcluded),
+      userDiscoveryManualApproved:
+          userDiscoveryManualApproved == null && nullToAbsent
+          ? const Value.absent()
+          : Value(userDiscoveryManualApproved),
+      mediaSendCounter: Value(mediaSendCounter),
+      mediaReceivedCounter: Value(mediaReceivedCounter),
+    );
+  }
+
+  factory ContactsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return ContactsData(
+      userId: serializer.fromJson<int>(json['userId']),
+      username: serializer.fromJson<String>(json['username']),
+      displayName: serializer.fromJson<String?>(json['displayName']),
+      nickName: serializer.fromJson<String?>(json['nickName']),
+      avatarSvgCompressed: serializer.fromJson<i2.Uint8List?>(
+        json['avatarSvgCompressed'],
+      ),
+      senderProfileCounter: serializer.fromJson<int>(
+        json['senderProfileCounter'],
+      ),
+      accepted: serializer.fromJson<int>(json['accepted']),
+      deletedByUser: serializer.fromJson<int>(json['deletedByUser']),
+      requested: serializer.fromJson<int>(json['requested']),
+      blocked: serializer.fromJson<int>(json['blocked']),
+      verified: serializer.fromJson<int>(json['verified']),
+      accountDeleted: serializer.fromJson<int>(json['accountDeleted']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+      userDiscoveryVersion: serializer.fromJson<i2.Uint8List?>(
+        json['userDiscoveryVersion'],
+      ),
+      userDiscoveryExcluded: serializer.fromJson<int>(
+        json['userDiscoveryExcluded'],
+      ),
+      userDiscoveryManualApproved: serializer.fromJson<int?>(
+        json['userDiscoveryManualApproved'],
+      ),
+      mediaSendCounter: serializer.fromJson<int>(json['mediaSendCounter']),
+      mediaReceivedCounter: serializer.fromJson<int>(
+        json['mediaReceivedCounter'],
+      ),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'userId': serializer.toJson<int>(userId),
+      'username': serializer.toJson<String>(username),
+      'displayName': serializer.toJson<String?>(displayName),
+      'nickName': serializer.toJson<String?>(nickName),
+      'avatarSvgCompressed': serializer.toJson<i2.Uint8List?>(
+        avatarSvgCompressed,
+      ),
+      'senderProfileCounter': serializer.toJson<int>(senderProfileCounter),
+      'accepted': serializer.toJson<int>(accepted),
+      'deletedByUser': serializer.toJson<int>(deletedByUser),
+      'requested': serializer.toJson<int>(requested),
+      'blocked': serializer.toJson<int>(blocked),
+      'verified': serializer.toJson<int>(verified),
+      'accountDeleted': serializer.toJson<int>(accountDeleted),
+      'createdAt': serializer.toJson<int>(createdAt),
+      'userDiscoveryVersion': serializer.toJson<i2.Uint8List?>(
+        userDiscoveryVersion,
+      ),
+      'userDiscoveryExcluded': serializer.toJson<int>(userDiscoveryExcluded),
+      'userDiscoveryManualApproved': serializer.toJson<int?>(
+        userDiscoveryManualApproved,
+      ),
+      'mediaSendCounter': serializer.toJson<int>(mediaSendCounter),
+      'mediaReceivedCounter': serializer.toJson<int>(mediaReceivedCounter),
+    };
+  }
+
+  ContactsData copyWith({
+    int? userId,
+    String? username,
+    Value<String?> displayName = const Value.absent(),
+    Value<String?> nickName = const Value.absent(),
+    Value<i2.Uint8List?> avatarSvgCompressed = const Value.absent(),
+    int? senderProfileCounter,
+    int? accepted,
+    int? deletedByUser,
+    int? requested,
+    int? blocked,
+    int? verified,
+    int? accountDeleted,
+    int? createdAt,
+    Value<i2.Uint8List?> userDiscoveryVersion = const Value.absent(),
+    int? userDiscoveryExcluded,
+    Value<int?> userDiscoveryManualApproved = const Value.absent(),
+    int? mediaSendCounter,
+    int? mediaReceivedCounter,
+  }) => ContactsData(
+    userId: userId ?? this.userId,
+    username: username ?? this.username,
+    displayName: displayName.present ? displayName.value : this.displayName,
+    nickName: nickName.present ? nickName.value : this.nickName,
+    avatarSvgCompressed: avatarSvgCompressed.present
+        ? avatarSvgCompressed.value
+        : this.avatarSvgCompressed,
+    senderProfileCounter: senderProfileCounter ?? this.senderProfileCounter,
+    accepted: accepted ?? this.accepted,
+    deletedByUser: deletedByUser ?? this.deletedByUser,
+    requested: requested ?? this.requested,
+    blocked: blocked ?? this.blocked,
+    verified: verified ?? this.verified,
+    accountDeleted: accountDeleted ?? this.accountDeleted,
+    createdAt: createdAt ?? this.createdAt,
+    userDiscoveryVersion: userDiscoveryVersion.present
+        ? userDiscoveryVersion.value
+        : this.userDiscoveryVersion,
+    userDiscoveryExcluded: userDiscoveryExcluded ?? this.userDiscoveryExcluded,
+    userDiscoveryManualApproved: userDiscoveryManualApproved.present
+        ? userDiscoveryManualApproved.value
+        : this.userDiscoveryManualApproved,
+    mediaSendCounter: mediaSendCounter ?? this.mediaSendCounter,
+    mediaReceivedCounter: mediaReceivedCounter ?? this.mediaReceivedCounter,
+  );
+  ContactsData copyWithCompanion(ContactsCompanion data) {
+    return ContactsData(
+      userId: data.userId.present ? data.userId.value : this.userId,
+      username: data.username.present ? data.username.value : this.username,
+      displayName: data.displayName.present
+          ? data.displayName.value
+          : this.displayName,
+      nickName: data.nickName.present ? data.nickName.value : this.nickName,
+      avatarSvgCompressed: data.avatarSvgCompressed.present
+          ? data.avatarSvgCompressed.value
+          : this.avatarSvgCompressed,
+      senderProfileCounter: data.senderProfileCounter.present
+          ? data.senderProfileCounter.value
+          : this.senderProfileCounter,
+      accepted: data.accepted.present ? data.accepted.value : this.accepted,
+      deletedByUser: data.deletedByUser.present
+          ? data.deletedByUser.value
+          : this.deletedByUser,
+      requested: data.requested.present ? data.requested.value : this.requested,
+      blocked: data.blocked.present ? data.blocked.value : this.blocked,
+      verified: data.verified.present ? data.verified.value : this.verified,
+      accountDeleted: data.accountDeleted.present
+          ? data.accountDeleted.value
+          : this.accountDeleted,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      userDiscoveryVersion: data.userDiscoveryVersion.present
+          ? data.userDiscoveryVersion.value
+          : this.userDiscoveryVersion,
+      userDiscoveryExcluded: data.userDiscoveryExcluded.present
+          ? data.userDiscoveryExcluded.value
+          : this.userDiscoveryExcluded,
+      userDiscoveryManualApproved: data.userDiscoveryManualApproved.present
+          ? data.userDiscoveryManualApproved.value
+          : this.userDiscoveryManualApproved,
+      mediaSendCounter: data.mediaSendCounter.present
+          ? data.mediaSendCounter.value
+          : this.mediaSendCounter,
+      mediaReceivedCounter: data.mediaReceivedCounter.present
+          ? data.mediaReceivedCounter.value
+          : this.mediaReceivedCounter,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ContactsData(')
+          ..write('userId: $userId, ')
+          ..write('username: $username, ')
+          ..write('displayName: $displayName, ')
+          ..write('nickName: $nickName, ')
+          ..write('avatarSvgCompressed: $avatarSvgCompressed, ')
+          ..write('senderProfileCounter: $senderProfileCounter, ')
+          ..write('accepted: $accepted, ')
+          ..write('deletedByUser: $deletedByUser, ')
+          ..write('requested: $requested, ')
+          ..write('blocked: $blocked, ')
+          ..write('verified: $verified, ')
+          ..write('accountDeleted: $accountDeleted, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('userDiscoveryVersion: $userDiscoveryVersion, ')
+          ..write('userDiscoveryExcluded: $userDiscoveryExcluded, ')
+          ..write('userDiscoveryManualApproved: $userDiscoveryManualApproved, ')
+          ..write('mediaSendCounter: $mediaSendCounter, ')
+          ..write('mediaReceivedCounter: $mediaReceivedCounter')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    userId,
+    username,
+    displayName,
+    nickName,
+    $driftBlobEquality.hash(avatarSvgCompressed),
+    senderProfileCounter,
+    accepted,
+    deletedByUser,
+    requested,
+    blocked,
+    verified,
+    accountDeleted,
+    createdAt,
+    $driftBlobEquality.hash(userDiscoveryVersion),
+    userDiscoveryExcluded,
+    userDiscoveryManualApproved,
+    mediaSendCounter,
+    mediaReceivedCounter,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is ContactsData &&
+          other.userId == this.userId &&
+          other.username == this.username &&
+          other.displayName == this.displayName &&
+          other.nickName == this.nickName &&
+          $driftBlobEquality.equals(
+            other.avatarSvgCompressed,
+            this.avatarSvgCompressed,
+          ) &&
+          other.senderProfileCounter == this.senderProfileCounter &&
+          other.accepted == this.accepted &&
+          other.deletedByUser == this.deletedByUser &&
+          other.requested == this.requested &&
+          other.blocked == this.blocked &&
+          other.verified == this.verified &&
+          other.accountDeleted == this.accountDeleted &&
+          other.createdAt == this.createdAt &&
+          $driftBlobEquality.equals(
+            other.userDiscoveryVersion,
+            this.userDiscoveryVersion,
+          ) &&
+          other.userDiscoveryExcluded == this.userDiscoveryExcluded &&
+          other.userDiscoveryManualApproved ==
+              this.userDiscoveryManualApproved &&
+          other.mediaSendCounter == this.mediaSendCounter &&
+          other.mediaReceivedCounter == this.mediaReceivedCounter);
+}
+
+class ContactsCompanion extends UpdateCompanion<ContactsData> {
+  final Value<int> userId;
+  final Value<String> username;
+  final Value<String?> displayName;
+  final Value<String?> nickName;
+  final Value<i2.Uint8List?> avatarSvgCompressed;
+  final Value<int> senderProfileCounter;
+  final Value<int> accepted;
+  final Value<int> deletedByUser;
+  final Value<int> requested;
+  final Value<int> blocked;
+  final Value<int> verified;
+  final Value<int> accountDeleted;
+  final Value<int> createdAt;
+  final Value<i2.Uint8List?> userDiscoveryVersion;
+  final Value<int> userDiscoveryExcluded;
+  final Value<int?> userDiscoveryManualApproved;
+  final Value<int> mediaSendCounter;
+  final Value<int> mediaReceivedCounter;
+  const ContactsCompanion({
+    this.userId = const Value.absent(),
+    this.username = const Value.absent(),
+    this.displayName = const Value.absent(),
+    this.nickName = const Value.absent(),
+    this.avatarSvgCompressed = const Value.absent(),
+    this.senderProfileCounter = const Value.absent(),
+    this.accepted = const Value.absent(),
+    this.deletedByUser = const Value.absent(),
+    this.requested = const Value.absent(),
+    this.blocked = const Value.absent(),
+    this.verified = const Value.absent(),
+    this.accountDeleted = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.userDiscoveryVersion = const Value.absent(),
+    this.userDiscoveryExcluded = const Value.absent(),
+    this.userDiscoveryManualApproved = const Value.absent(),
+    this.mediaSendCounter = const Value.absent(),
+    this.mediaReceivedCounter = const Value.absent(),
+  });
+  ContactsCompanion.insert({
+    this.userId = const Value.absent(),
+    required String username,
+    this.displayName = const Value.absent(),
+    this.nickName = const Value.absent(),
+    this.avatarSvgCompressed = const Value.absent(),
+    this.senderProfileCounter = const Value.absent(),
+    this.accepted = const Value.absent(),
+    this.deletedByUser = const Value.absent(),
+    this.requested = const Value.absent(),
+    this.blocked = const Value.absent(),
+    this.verified = const Value.absent(),
+    this.accountDeleted = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.userDiscoveryVersion = const Value.absent(),
+    this.userDiscoveryExcluded = const Value.absent(),
+    this.userDiscoveryManualApproved = const Value.absent(),
+    this.mediaSendCounter = const Value.absent(),
+    this.mediaReceivedCounter = const Value.absent(),
+  }) : username = Value(username);
+  static Insertable<ContactsData> custom({
+    Expression<int>? userId,
+    Expression<String>? username,
+    Expression<String>? displayName,
+    Expression<String>? nickName,
+    Expression<i2.Uint8List>? avatarSvgCompressed,
+    Expression<int>? senderProfileCounter,
+    Expression<int>? accepted,
+    Expression<int>? deletedByUser,
+    Expression<int>? requested,
+    Expression<int>? blocked,
+    Expression<int>? verified,
+    Expression<int>? accountDeleted,
+    Expression<int>? createdAt,
+    Expression<i2.Uint8List>? userDiscoveryVersion,
+    Expression<int>? userDiscoveryExcluded,
+    Expression<int>? userDiscoveryManualApproved,
+    Expression<int>? mediaSendCounter,
+    Expression<int>? mediaReceivedCounter,
+  }) {
+    return RawValuesInsertable({
+      if (userId != null) 'user_id': userId,
+      if (username != null) 'username': username,
+      if (displayName != null) 'display_name': displayName,
+      if (nickName != null) 'nick_name': nickName,
+      if (avatarSvgCompressed != null)
+        'avatar_svg_compressed': avatarSvgCompressed,
+      if (senderProfileCounter != null)
+        'sender_profile_counter': senderProfileCounter,
+      if (accepted != null) 'accepted': accepted,
+      if (deletedByUser != null) 'deleted_by_user': deletedByUser,
+      if (requested != null) 'requested': requested,
+      if (blocked != null) 'blocked': blocked,
+      if (verified != null) 'verified': verified,
+      if (accountDeleted != null) 'account_deleted': accountDeleted,
+      if (createdAt != null) 'created_at': createdAt,
+      if (userDiscoveryVersion != null)
+        'user_discovery_version': userDiscoveryVersion,
+      if (userDiscoveryExcluded != null)
+        'user_discovery_excluded': userDiscoveryExcluded,
+      if (userDiscoveryManualApproved != null)
+        'user_discovery_manual_approved': userDiscoveryManualApproved,
+      if (mediaSendCounter != null) 'media_send_counter': mediaSendCounter,
+      if (mediaReceivedCounter != null)
+        'media_received_counter': mediaReceivedCounter,
+    });
+  }
+
+  ContactsCompanion copyWith({
+    Value<int>? userId,
+    Value<String>? username,
+    Value<String?>? displayName,
+    Value<String?>? nickName,
+    Value<i2.Uint8List?>? avatarSvgCompressed,
+    Value<int>? senderProfileCounter,
+    Value<int>? accepted,
+    Value<int>? deletedByUser,
+    Value<int>? requested,
+    Value<int>? blocked,
+    Value<int>? verified,
+    Value<int>? accountDeleted,
+    Value<int>? createdAt,
+    Value<i2.Uint8List?>? userDiscoveryVersion,
+    Value<int>? userDiscoveryExcluded,
+    Value<int?>? userDiscoveryManualApproved,
+    Value<int>? mediaSendCounter,
+    Value<int>? mediaReceivedCounter,
+  }) {
+    return ContactsCompanion(
+      userId: userId ?? this.userId,
+      username: username ?? this.username,
+      displayName: displayName ?? this.displayName,
+      nickName: nickName ?? this.nickName,
+      avatarSvgCompressed: avatarSvgCompressed ?? this.avatarSvgCompressed,
+      senderProfileCounter: senderProfileCounter ?? this.senderProfileCounter,
+      accepted: accepted ?? this.accepted,
+      deletedByUser: deletedByUser ?? this.deletedByUser,
+      requested: requested ?? this.requested,
+      blocked: blocked ?? this.blocked,
+      verified: verified ?? this.verified,
+      accountDeleted: accountDeleted ?? this.accountDeleted,
+      createdAt: createdAt ?? this.createdAt,
+      userDiscoveryVersion: userDiscoveryVersion ?? this.userDiscoveryVersion,
+      userDiscoveryExcluded:
+          userDiscoveryExcluded ?? this.userDiscoveryExcluded,
+      userDiscoveryManualApproved:
+          userDiscoveryManualApproved ?? this.userDiscoveryManualApproved,
+      mediaSendCounter: mediaSendCounter ?? this.mediaSendCounter,
+      mediaReceivedCounter: mediaReceivedCounter ?? this.mediaReceivedCounter,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (userId.present) {
+      map['user_id'] = Variable<int>(userId.value);
+    }
+    if (username.present) {
+      map['username'] = Variable<String>(username.value);
+    }
+    if (displayName.present) {
+      map['display_name'] = Variable<String>(displayName.value);
+    }
+    if (nickName.present) {
+      map['nick_name'] = Variable<String>(nickName.value);
+    }
+    if (avatarSvgCompressed.present) {
+      map['avatar_svg_compressed'] = Variable<i2.Uint8List>(
+        avatarSvgCompressed.value,
+      );
+    }
+    if (senderProfileCounter.present) {
+      map['sender_profile_counter'] = Variable<int>(senderProfileCounter.value);
+    }
+    if (accepted.present) {
+      map['accepted'] = Variable<int>(accepted.value);
+    }
+    if (deletedByUser.present) {
+      map['deleted_by_user'] = Variable<int>(deletedByUser.value);
+    }
+    if (requested.present) {
+      map['requested'] = Variable<int>(requested.value);
+    }
+    if (blocked.present) {
+      map['blocked'] = Variable<int>(blocked.value);
+    }
+    if (verified.present) {
+      map['verified'] = Variable<int>(verified.value);
+    }
+    if (accountDeleted.present) {
+      map['account_deleted'] = Variable<int>(accountDeleted.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (userDiscoveryVersion.present) {
+      map['user_discovery_version'] = Variable<i2.Uint8List>(
+        userDiscoveryVersion.value,
+      );
+    }
+    if (userDiscoveryExcluded.present) {
+      map['user_discovery_excluded'] = Variable<int>(
+        userDiscoveryExcluded.value,
+      );
+    }
+    if (userDiscoveryManualApproved.present) {
+      map['user_discovery_manual_approved'] = Variable<int>(
+        userDiscoveryManualApproved.value,
+      );
+    }
+    if (mediaSendCounter.present) {
+      map['media_send_counter'] = Variable<int>(mediaSendCounter.value);
+    }
+    if (mediaReceivedCounter.present) {
+      map['media_received_counter'] = Variable<int>(mediaReceivedCounter.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ContactsCompanion(')
+          ..write('userId: $userId, ')
+          ..write('username: $username, ')
+          ..write('displayName: $displayName, ')
+          ..write('nickName: $nickName, ')
+          ..write('avatarSvgCompressed: $avatarSvgCompressed, ')
+          ..write('senderProfileCounter: $senderProfileCounter, ')
+          ..write('accepted: $accepted, ')
+          ..write('deletedByUser: $deletedByUser, ')
+          ..write('requested: $requested, ')
+          ..write('blocked: $blocked, ')
+          ..write('verified: $verified, ')
+          ..write('accountDeleted: $accountDeleted, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('userDiscoveryVersion: $userDiscoveryVersion, ')
+          ..write('userDiscoveryExcluded: $userDiscoveryExcluded, ')
+          ..write('userDiscoveryManualApproved: $userDiscoveryManualApproved, ')
+          ..write('mediaSendCounter: $mediaSendCounter, ')
+          ..write('mediaReceivedCounter: $mediaReceivedCounter')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class Groups extends Table with TableInfo<Groups, GroupsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  Groups(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> groupId = GeneratedColumn<String>(
+    'group_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> isGroupAdmin = GeneratedColumn<int>(
+    'is_group_admin',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (is_group_admin IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> isDirectChat = GeneratedColumn<int>(
+    'is_direct_chat',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (is_direct_chat IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> pinned = GeneratedColumn<int>(
+    'pinned',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (pinned IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> archived = GeneratedColumn<int>(
+    'archived',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (archived IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> joinedGroup = GeneratedColumn<int>(
+    'joined_group',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (joined_group IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> leftGroup = GeneratedColumn<int>(
+    'left_group',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (left_group IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> deletedContent = GeneratedColumn<int>(
+    'deleted_content',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (deleted_content IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> stateVersionId = GeneratedColumn<int>(
+    'state_version_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<i2.Uint8List> stateEncryptionKey =
+      GeneratedColumn<i2.Uint8List>(
+        'state_encryption_key',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<i2.Uint8List> myGroupPrivateKey =
+      GeneratedColumn<i2.Uint8List>(
+        'my_group_private_key',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<String> groupName = GeneratedColumn<String>(
+    'group_name',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> draftMessage = GeneratedColumn<String>(
+    'draft_message',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> totalMediaCounter = GeneratedColumn<int>(
+    'total_media_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> alsoBestFriend = GeneratedColumn<int>(
+    'also_best_friend',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (also_best_friend IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> deleteMessagesAfterMilliseconds =
+      GeneratedColumn<int>(
+        'delete_messages_after_milliseconds',
+        aliasedName,
+        false,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints: 'NOT NULL DEFAULT 86400000',
+        defaultValue: const CustomExpression('86400000'),
+      );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  late final GeneratedColumn<int> lastMessageSend = GeneratedColumn<int>(
+    'last_message_send',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> lastMessageReceived = GeneratedColumn<int>(
+    'last_message_received',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> lastFlameCounterChange = GeneratedColumn<int>(
+    'last_flame_counter_change',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> lastFlameSync = GeneratedColumn<int>(
+    'last_flame_sync',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> flameCounter = GeneratedColumn<int>(
+    'flame_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> maxFlameCounter = GeneratedColumn<int>(
+    'max_flame_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> maxFlameCounterFrom = GeneratedColumn<int>(
+    'max_flame_counter_from',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> lastMessageExchange = GeneratedColumn<int>(
+    'last_message_exchange',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    groupId,
+    isGroupAdmin,
+    isDirectChat,
+    pinned,
+    archived,
+    joinedGroup,
+    leftGroup,
+    deletedContent,
+    stateVersionId,
+    stateEncryptionKey,
+    myGroupPrivateKey,
+    groupName,
+    draftMessage,
+    totalMediaCounter,
+    alsoBestFriend,
+    deleteMessagesAfterMilliseconds,
+    createdAt,
+    lastMessageSend,
+    lastMessageReceived,
+    lastFlameCounterChange,
+    lastFlameSync,
+    flameCounter,
+    maxFlameCounter,
+    maxFlameCounterFrom,
+    lastMessageExchange,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'groups';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {groupId};
+  @override
+  GroupsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return GroupsData(
+      groupId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}group_id'],
+      )!,
+      isGroupAdmin: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}is_group_admin'],
+      )!,
+      isDirectChat: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}is_direct_chat'],
+      )!,
+      pinned: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}pinned'],
+      )!,
+      archived: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}archived'],
+      )!,
+      joinedGroup: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}joined_group'],
+      )!,
+      leftGroup: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}left_group'],
+      )!,
+      deletedContent: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}deleted_content'],
+      )!,
+      stateVersionId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}state_version_id'],
+      )!,
+      stateEncryptionKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}state_encryption_key'],
+      ),
+      myGroupPrivateKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}my_group_private_key'],
+      ),
+      groupName: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}group_name'],
+      )!,
+      draftMessage: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}draft_message'],
+      ),
+      totalMediaCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}total_media_counter'],
+      )!,
+      alsoBestFriend: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}also_best_friend'],
+      )!,
+      deleteMessagesAfterMilliseconds: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}delete_messages_after_milliseconds'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+      lastMessageSend: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_message_send'],
+      ),
+      lastMessageReceived: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_message_received'],
+      ),
+      lastFlameCounterChange: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_flame_counter_change'],
+      ),
+      lastFlameSync: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_flame_sync'],
+      ),
+      flameCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}flame_counter'],
+      )!,
+      maxFlameCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}max_flame_counter'],
+      )!,
+      maxFlameCounterFrom: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}max_flame_counter_from'],
+      ),
+      lastMessageExchange: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_message_exchange'],
+      )!,
+    );
+  }
+
+  @override
+  Groups createAlias(String alias) {
+    return Groups(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(group_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class GroupsData extends DataClass implements Insertable<GroupsData> {
+  final String groupId;
+  final int isGroupAdmin;
+  final int isDirectChat;
+  final int pinned;
+  final int archived;
+  final int joinedGroup;
+  final int leftGroup;
+  final int deletedContent;
+  final int stateVersionId;
+  final i2.Uint8List? stateEncryptionKey;
+  final i2.Uint8List? myGroupPrivateKey;
+  final String groupName;
+  final String? draftMessage;
+  final int totalMediaCounter;
+  final int alsoBestFriend;
+  final int deleteMessagesAfterMilliseconds;
+  final int createdAt;
+  final int? lastMessageSend;
+  final int? lastMessageReceived;
+  final int? lastFlameCounterChange;
+  final int? lastFlameSync;
+  final int flameCounter;
+  final int maxFlameCounter;
+  final int? maxFlameCounterFrom;
+  final int lastMessageExchange;
+  const GroupsData({
+    required this.groupId,
+    required this.isGroupAdmin,
+    required this.isDirectChat,
+    required this.pinned,
+    required this.archived,
+    required this.joinedGroup,
+    required this.leftGroup,
+    required this.deletedContent,
+    required this.stateVersionId,
+    this.stateEncryptionKey,
+    this.myGroupPrivateKey,
+    required this.groupName,
+    this.draftMessage,
+    required this.totalMediaCounter,
+    required this.alsoBestFriend,
+    required this.deleteMessagesAfterMilliseconds,
+    required this.createdAt,
+    this.lastMessageSend,
+    this.lastMessageReceived,
+    this.lastFlameCounterChange,
+    this.lastFlameSync,
+    required this.flameCounter,
+    required this.maxFlameCounter,
+    this.maxFlameCounterFrom,
+    required this.lastMessageExchange,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['group_id'] = Variable<String>(groupId);
+    map['is_group_admin'] = Variable<int>(isGroupAdmin);
+    map['is_direct_chat'] = Variable<int>(isDirectChat);
+    map['pinned'] = Variable<int>(pinned);
+    map['archived'] = Variable<int>(archived);
+    map['joined_group'] = Variable<int>(joinedGroup);
+    map['left_group'] = Variable<int>(leftGroup);
+    map['deleted_content'] = Variable<int>(deletedContent);
+    map['state_version_id'] = Variable<int>(stateVersionId);
+    if (!nullToAbsent || stateEncryptionKey != null) {
+      map['state_encryption_key'] = Variable<i2.Uint8List>(stateEncryptionKey);
+    }
+    if (!nullToAbsent || myGroupPrivateKey != null) {
+      map['my_group_private_key'] = Variable<i2.Uint8List>(myGroupPrivateKey);
+    }
+    map['group_name'] = Variable<String>(groupName);
+    if (!nullToAbsent || draftMessage != null) {
+      map['draft_message'] = Variable<String>(draftMessage);
+    }
+    map['total_media_counter'] = Variable<int>(totalMediaCounter);
+    map['also_best_friend'] = Variable<int>(alsoBestFriend);
+    map['delete_messages_after_milliseconds'] = Variable<int>(
+      deleteMessagesAfterMilliseconds,
+    );
+    map['created_at'] = Variable<int>(createdAt);
+    if (!nullToAbsent || lastMessageSend != null) {
+      map['last_message_send'] = Variable<int>(lastMessageSend);
+    }
+    if (!nullToAbsent || lastMessageReceived != null) {
+      map['last_message_received'] = Variable<int>(lastMessageReceived);
+    }
+    if (!nullToAbsent || lastFlameCounterChange != null) {
+      map['last_flame_counter_change'] = Variable<int>(lastFlameCounterChange);
+    }
+    if (!nullToAbsent || lastFlameSync != null) {
+      map['last_flame_sync'] = Variable<int>(lastFlameSync);
+    }
+    map['flame_counter'] = Variable<int>(flameCounter);
+    map['max_flame_counter'] = Variable<int>(maxFlameCounter);
+    if (!nullToAbsent || maxFlameCounterFrom != null) {
+      map['max_flame_counter_from'] = Variable<int>(maxFlameCounterFrom);
+    }
+    map['last_message_exchange'] = Variable<int>(lastMessageExchange);
+    return map;
+  }
+
+  GroupsCompanion toCompanion(bool nullToAbsent) {
+    return GroupsCompanion(
+      groupId: Value(groupId),
+      isGroupAdmin: Value(isGroupAdmin),
+      isDirectChat: Value(isDirectChat),
+      pinned: Value(pinned),
+      archived: Value(archived),
+      joinedGroup: Value(joinedGroup),
+      leftGroup: Value(leftGroup),
+      deletedContent: Value(deletedContent),
+      stateVersionId: Value(stateVersionId),
+      stateEncryptionKey: stateEncryptionKey == null && nullToAbsent
+          ? const Value.absent()
+          : Value(stateEncryptionKey),
+      myGroupPrivateKey: myGroupPrivateKey == null && nullToAbsent
+          ? const Value.absent()
+          : Value(myGroupPrivateKey),
+      groupName: Value(groupName),
+      draftMessage: draftMessage == null && nullToAbsent
+          ? const Value.absent()
+          : Value(draftMessage),
+      totalMediaCounter: Value(totalMediaCounter),
+      alsoBestFriend: Value(alsoBestFriend),
+      deleteMessagesAfterMilliseconds: Value(deleteMessagesAfterMilliseconds),
+      createdAt: Value(createdAt),
+      lastMessageSend: lastMessageSend == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastMessageSend),
+      lastMessageReceived: lastMessageReceived == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastMessageReceived),
+      lastFlameCounterChange: lastFlameCounterChange == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastFlameCounterChange),
+      lastFlameSync: lastFlameSync == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastFlameSync),
+      flameCounter: Value(flameCounter),
+      maxFlameCounter: Value(maxFlameCounter),
+      maxFlameCounterFrom: maxFlameCounterFrom == null && nullToAbsent
+          ? const Value.absent()
+          : Value(maxFlameCounterFrom),
+      lastMessageExchange: Value(lastMessageExchange),
+    );
+  }
+
+  factory GroupsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return GroupsData(
+      groupId: serializer.fromJson<String>(json['groupId']),
+      isGroupAdmin: serializer.fromJson<int>(json['isGroupAdmin']),
+      isDirectChat: serializer.fromJson<int>(json['isDirectChat']),
+      pinned: serializer.fromJson<int>(json['pinned']),
+      archived: serializer.fromJson<int>(json['archived']),
+      joinedGroup: serializer.fromJson<int>(json['joinedGroup']),
+      leftGroup: serializer.fromJson<int>(json['leftGroup']),
+      deletedContent: serializer.fromJson<int>(json['deletedContent']),
+      stateVersionId: serializer.fromJson<int>(json['stateVersionId']),
+      stateEncryptionKey: serializer.fromJson<i2.Uint8List?>(
+        json['stateEncryptionKey'],
+      ),
+      myGroupPrivateKey: serializer.fromJson<i2.Uint8List?>(
+        json['myGroupPrivateKey'],
+      ),
+      groupName: serializer.fromJson<String>(json['groupName']),
+      draftMessage: serializer.fromJson<String?>(json['draftMessage']),
+      totalMediaCounter: serializer.fromJson<int>(json['totalMediaCounter']),
+      alsoBestFriend: serializer.fromJson<int>(json['alsoBestFriend']),
+      deleteMessagesAfterMilliseconds: serializer.fromJson<int>(
+        json['deleteMessagesAfterMilliseconds'],
+      ),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+      lastMessageSend: serializer.fromJson<int?>(json['lastMessageSend']),
+      lastMessageReceived: serializer.fromJson<int?>(
+        json['lastMessageReceived'],
+      ),
+      lastFlameCounterChange: serializer.fromJson<int?>(
+        json['lastFlameCounterChange'],
+      ),
+      lastFlameSync: serializer.fromJson<int?>(json['lastFlameSync']),
+      flameCounter: serializer.fromJson<int>(json['flameCounter']),
+      maxFlameCounter: serializer.fromJson<int>(json['maxFlameCounter']),
+      maxFlameCounterFrom: serializer.fromJson<int?>(
+        json['maxFlameCounterFrom'],
+      ),
+      lastMessageExchange: serializer.fromJson<int>(
+        json['lastMessageExchange'],
+      ),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'groupId': serializer.toJson<String>(groupId),
+      'isGroupAdmin': serializer.toJson<int>(isGroupAdmin),
+      'isDirectChat': serializer.toJson<int>(isDirectChat),
+      'pinned': serializer.toJson<int>(pinned),
+      'archived': serializer.toJson<int>(archived),
+      'joinedGroup': serializer.toJson<int>(joinedGroup),
+      'leftGroup': serializer.toJson<int>(leftGroup),
+      'deletedContent': serializer.toJson<int>(deletedContent),
+      'stateVersionId': serializer.toJson<int>(stateVersionId),
+      'stateEncryptionKey': serializer.toJson<i2.Uint8List?>(
+        stateEncryptionKey,
+      ),
+      'myGroupPrivateKey': serializer.toJson<i2.Uint8List?>(myGroupPrivateKey),
+      'groupName': serializer.toJson<String>(groupName),
+      'draftMessage': serializer.toJson<String?>(draftMessage),
+      'totalMediaCounter': serializer.toJson<int>(totalMediaCounter),
+      'alsoBestFriend': serializer.toJson<int>(alsoBestFriend),
+      'deleteMessagesAfterMilliseconds': serializer.toJson<int>(
+        deleteMessagesAfterMilliseconds,
+      ),
+      'createdAt': serializer.toJson<int>(createdAt),
+      'lastMessageSend': serializer.toJson<int?>(lastMessageSend),
+      'lastMessageReceived': serializer.toJson<int?>(lastMessageReceived),
+      'lastFlameCounterChange': serializer.toJson<int?>(lastFlameCounterChange),
+      'lastFlameSync': serializer.toJson<int?>(lastFlameSync),
+      'flameCounter': serializer.toJson<int>(flameCounter),
+      'maxFlameCounter': serializer.toJson<int>(maxFlameCounter),
+      'maxFlameCounterFrom': serializer.toJson<int?>(maxFlameCounterFrom),
+      'lastMessageExchange': serializer.toJson<int>(lastMessageExchange),
+    };
+  }
+
+  GroupsData copyWith({
+    String? groupId,
+    int? isGroupAdmin,
+    int? isDirectChat,
+    int? pinned,
+    int? archived,
+    int? joinedGroup,
+    int? leftGroup,
+    int? deletedContent,
+    int? stateVersionId,
+    Value<i2.Uint8List?> stateEncryptionKey = const Value.absent(),
+    Value<i2.Uint8List?> myGroupPrivateKey = const Value.absent(),
+    String? groupName,
+    Value<String?> draftMessage = const Value.absent(),
+    int? totalMediaCounter,
+    int? alsoBestFriend,
+    int? deleteMessagesAfterMilliseconds,
+    int? createdAt,
+    Value<int?> lastMessageSend = const Value.absent(),
+    Value<int?> lastMessageReceived = const Value.absent(),
+    Value<int?> lastFlameCounterChange = const Value.absent(),
+    Value<int?> lastFlameSync = const Value.absent(),
+    int? flameCounter,
+    int? maxFlameCounter,
+    Value<int?> maxFlameCounterFrom = const Value.absent(),
+    int? lastMessageExchange,
+  }) => GroupsData(
+    groupId: groupId ?? this.groupId,
+    isGroupAdmin: isGroupAdmin ?? this.isGroupAdmin,
+    isDirectChat: isDirectChat ?? this.isDirectChat,
+    pinned: pinned ?? this.pinned,
+    archived: archived ?? this.archived,
+    joinedGroup: joinedGroup ?? this.joinedGroup,
+    leftGroup: leftGroup ?? this.leftGroup,
+    deletedContent: deletedContent ?? this.deletedContent,
+    stateVersionId: stateVersionId ?? this.stateVersionId,
+    stateEncryptionKey: stateEncryptionKey.present
+        ? stateEncryptionKey.value
+        : this.stateEncryptionKey,
+    myGroupPrivateKey: myGroupPrivateKey.present
+        ? myGroupPrivateKey.value
+        : this.myGroupPrivateKey,
+    groupName: groupName ?? this.groupName,
+    draftMessage: draftMessage.present ? draftMessage.value : this.draftMessage,
+    totalMediaCounter: totalMediaCounter ?? this.totalMediaCounter,
+    alsoBestFriend: alsoBestFriend ?? this.alsoBestFriend,
+    deleteMessagesAfterMilliseconds:
+        deleteMessagesAfterMilliseconds ?? this.deleteMessagesAfterMilliseconds,
+    createdAt: createdAt ?? this.createdAt,
+    lastMessageSend: lastMessageSend.present
+        ? lastMessageSend.value
+        : this.lastMessageSend,
+    lastMessageReceived: lastMessageReceived.present
+        ? lastMessageReceived.value
+        : this.lastMessageReceived,
+    lastFlameCounterChange: lastFlameCounterChange.present
+        ? lastFlameCounterChange.value
+        : this.lastFlameCounterChange,
+    lastFlameSync: lastFlameSync.present
+        ? lastFlameSync.value
+        : this.lastFlameSync,
+    flameCounter: flameCounter ?? this.flameCounter,
+    maxFlameCounter: maxFlameCounter ?? this.maxFlameCounter,
+    maxFlameCounterFrom: maxFlameCounterFrom.present
+        ? maxFlameCounterFrom.value
+        : this.maxFlameCounterFrom,
+    lastMessageExchange: lastMessageExchange ?? this.lastMessageExchange,
+  );
+  GroupsData copyWithCompanion(GroupsCompanion data) {
+    return GroupsData(
+      groupId: data.groupId.present ? data.groupId.value : this.groupId,
+      isGroupAdmin: data.isGroupAdmin.present
+          ? data.isGroupAdmin.value
+          : this.isGroupAdmin,
+      isDirectChat: data.isDirectChat.present
+          ? data.isDirectChat.value
+          : this.isDirectChat,
+      pinned: data.pinned.present ? data.pinned.value : this.pinned,
+      archived: data.archived.present ? data.archived.value : this.archived,
+      joinedGroup: data.joinedGroup.present
+          ? data.joinedGroup.value
+          : this.joinedGroup,
+      leftGroup: data.leftGroup.present ? data.leftGroup.value : this.leftGroup,
+      deletedContent: data.deletedContent.present
+          ? data.deletedContent.value
+          : this.deletedContent,
+      stateVersionId: data.stateVersionId.present
+          ? data.stateVersionId.value
+          : this.stateVersionId,
+      stateEncryptionKey: data.stateEncryptionKey.present
+          ? data.stateEncryptionKey.value
+          : this.stateEncryptionKey,
+      myGroupPrivateKey: data.myGroupPrivateKey.present
+          ? data.myGroupPrivateKey.value
+          : this.myGroupPrivateKey,
+      groupName: data.groupName.present ? data.groupName.value : this.groupName,
+      draftMessage: data.draftMessage.present
+          ? data.draftMessage.value
+          : this.draftMessage,
+      totalMediaCounter: data.totalMediaCounter.present
+          ? data.totalMediaCounter.value
+          : this.totalMediaCounter,
+      alsoBestFriend: data.alsoBestFriend.present
+          ? data.alsoBestFriend.value
+          : this.alsoBestFriend,
+      deleteMessagesAfterMilliseconds:
+          data.deleteMessagesAfterMilliseconds.present
+          ? data.deleteMessagesAfterMilliseconds.value
+          : this.deleteMessagesAfterMilliseconds,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      lastMessageSend: data.lastMessageSend.present
+          ? data.lastMessageSend.value
+          : this.lastMessageSend,
+      lastMessageReceived: data.lastMessageReceived.present
+          ? data.lastMessageReceived.value
+          : this.lastMessageReceived,
+      lastFlameCounterChange: data.lastFlameCounterChange.present
+          ? data.lastFlameCounterChange.value
+          : this.lastFlameCounterChange,
+      lastFlameSync: data.lastFlameSync.present
+          ? data.lastFlameSync.value
+          : this.lastFlameSync,
+      flameCounter: data.flameCounter.present
+          ? data.flameCounter.value
+          : this.flameCounter,
+      maxFlameCounter: data.maxFlameCounter.present
+          ? data.maxFlameCounter.value
+          : this.maxFlameCounter,
+      maxFlameCounterFrom: data.maxFlameCounterFrom.present
+          ? data.maxFlameCounterFrom.value
+          : this.maxFlameCounterFrom,
+      lastMessageExchange: data.lastMessageExchange.present
+          ? data.lastMessageExchange.value
+          : this.lastMessageExchange,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('GroupsData(')
+          ..write('groupId: $groupId, ')
+          ..write('isGroupAdmin: $isGroupAdmin, ')
+          ..write('isDirectChat: $isDirectChat, ')
+          ..write('pinned: $pinned, ')
+          ..write('archived: $archived, ')
+          ..write('joinedGroup: $joinedGroup, ')
+          ..write('leftGroup: $leftGroup, ')
+          ..write('deletedContent: $deletedContent, ')
+          ..write('stateVersionId: $stateVersionId, ')
+          ..write('stateEncryptionKey: $stateEncryptionKey, ')
+          ..write('myGroupPrivateKey: $myGroupPrivateKey, ')
+          ..write('groupName: $groupName, ')
+          ..write('draftMessage: $draftMessage, ')
+          ..write('totalMediaCounter: $totalMediaCounter, ')
+          ..write('alsoBestFriend: $alsoBestFriend, ')
+          ..write(
+            'deleteMessagesAfterMilliseconds: $deleteMessagesAfterMilliseconds, ',
+          )
+          ..write('createdAt: $createdAt, ')
+          ..write('lastMessageSend: $lastMessageSend, ')
+          ..write('lastMessageReceived: $lastMessageReceived, ')
+          ..write('lastFlameCounterChange: $lastFlameCounterChange, ')
+          ..write('lastFlameSync: $lastFlameSync, ')
+          ..write('flameCounter: $flameCounter, ')
+          ..write('maxFlameCounter: $maxFlameCounter, ')
+          ..write('maxFlameCounterFrom: $maxFlameCounterFrom, ')
+          ..write('lastMessageExchange: $lastMessageExchange')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hashAll([
+    groupId,
+    isGroupAdmin,
+    isDirectChat,
+    pinned,
+    archived,
+    joinedGroup,
+    leftGroup,
+    deletedContent,
+    stateVersionId,
+    $driftBlobEquality.hash(stateEncryptionKey),
+    $driftBlobEquality.hash(myGroupPrivateKey),
+    groupName,
+    draftMessage,
+    totalMediaCounter,
+    alsoBestFriend,
+    deleteMessagesAfterMilliseconds,
+    createdAt,
+    lastMessageSend,
+    lastMessageReceived,
+    lastFlameCounterChange,
+    lastFlameSync,
+    flameCounter,
+    maxFlameCounter,
+    maxFlameCounterFrom,
+    lastMessageExchange,
+  ]);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is GroupsData &&
+          other.groupId == this.groupId &&
+          other.isGroupAdmin == this.isGroupAdmin &&
+          other.isDirectChat == this.isDirectChat &&
+          other.pinned == this.pinned &&
+          other.archived == this.archived &&
+          other.joinedGroup == this.joinedGroup &&
+          other.leftGroup == this.leftGroup &&
+          other.deletedContent == this.deletedContent &&
+          other.stateVersionId == this.stateVersionId &&
+          $driftBlobEquality.equals(
+            other.stateEncryptionKey,
+            this.stateEncryptionKey,
+          ) &&
+          $driftBlobEquality.equals(
+            other.myGroupPrivateKey,
+            this.myGroupPrivateKey,
+          ) &&
+          other.groupName == this.groupName &&
+          other.draftMessage == this.draftMessage &&
+          other.totalMediaCounter == this.totalMediaCounter &&
+          other.alsoBestFriend == this.alsoBestFriend &&
+          other.deleteMessagesAfterMilliseconds ==
+              this.deleteMessagesAfterMilliseconds &&
+          other.createdAt == this.createdAt &&
+          other.lastMessageSend == this.lastMessageSend &&
+          other.lastMessageReceived == this.lastMessageReceived &&
+          other.lastFlameCounterChange == this.lastFlameCounterChange &&
+          other.lastFlameSync == this.lastFlameSync &&
+          other.flameCounter == this.flameCounter &&
+          other.maxFlameCounter == this.maxFlameCounter &&
+          other.maxFlameCounterFrom == this.maxFlameCounterFrom &&
+          other.lastMessageExchange == this.lastMessageExchange);
+}
+
+class GroupsCompanion extends UpdateCompanion<GroupsData> {
+  final Value<String> groupId;
+  final Value<int> isGroupAdmin;
+  final Value<int> isDirectChat;
+  final Value<int> pinned;
+  final Value<int> archived;
+  final Value<int> joinedGroup;
+  final Value<int> leftGroup;
+  final Value<int> deletedContent;
+  final Value<int> stateVersionId;
+  final Value<i2.Uint8List?> stateEncryptionKey;
+  final Value<i2.Uint8List?> myGroupPrivateKey;
+  final Value<String> groupName;
+  final Value<String?> draftMessage;
+  final Value<int> totalMediaCounter;
+  final Value<int> alsoBestFriend;
+  final Value<int> deleteMessagesAfterMilliseconds;
+  final Value<int> createdAt;
+  final Value<int?> lastMessageSend;
+  final Value<int?> lastMessageReceived;
+  final Value<int?> lastFlameCounterChange;
+  final Value<int?> lastFlameSync;
+  final Value<int> flameCounter;
+  final Value<int> maxFlameCounter;
+  final Value<int?> maxFlameCounterFrom;
+  final Value<int> lastMessageExchange;
+  final Value<int> rowid;
+  const GroupsCompanion({
+    this.groupId = const Value.absent(),
+    this.isGroupAdmin = const Value.absent(),
+    this.isDirectChat = const Value.absent(),
+    this.pinned = const Value.absent(),
+    this.archived = const Value.absent(),
+    this.joinedGroup = const Value.absent(),
+    this.leftGroup = const Value.absent(),
+    this.deletedContent = const Value.absent(),
+    this.stateVersionId = const Value.absent(),
+    this.stateEncryptionKey = const Value.absent(),
+    this.myGroupPrivateKey = const Value.absent(),
+    this.groupName = const Value.absent(),
+    this.draftMessage = const Value.absent(),
+    this.totalMediaCounter = const Value.absent(),
+    this.alsoBestFriend = const Value.absent(),
+    this.deleteMessagesAfterMilliseconds = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.lastMessageSend = const Value.absent(),
+    this.lastMessageReceived = const Value.absent(),
+    this.lastFlameCounterChange = const Value.absent(),
+    this.lastFlameSync = const Value.absent(),
+    this.flameCounter = const Value.absent(),
+    this.maxFlameCounter = const Value.absent(),
+    this.maxFlameCounterFrom = const Value.absent(),
+    this.lastMessageExchange = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  GroupsCompanion.insert({
+    required String groupId,
+    this.isGroupAdmin = const Value.absent(),
+    this.isDirectChat = const Value.absent(),
+    this.pinned = const Value.absent(),
+    this.archived = const Value.absent(),
+    this.joinedGroup = const Value.absent(),
+    this.leftGroup = const Value.absent(),
+    this.deletedContent = const Value.absent(),
+    this.stateVersionId = const Value.absent(),
+    this.stateEncryptionKey = const Value.absent(),
+    this.myGroupPrivateKey = const Value.absent(),
+    required String groupName,
+    this.draftMessage = const Value.absent(),
+    this.totalMediaCounter = const Value.absent(),
+    this.alsoBestFriend = const Value.absent(),
+    this.deleteMessagesAfterMilliseconds = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.lastMessageSend = const Value.absent(),
+    this.lastMessageReceived = const Value.absent(),
+    this.lastFlameCounterChange = const Value.absent(),
+    this.lastFlameSync = const Value.absent(),
+    this.flameCounter = const Value.absent(),
+    this.maxFlameCounter = const Value.absent(),
+    this.maxFlameCounterFrom = const Value.absent(),
+    this.lastMessageExchange = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : groupId = Value(groupId),
+       groupName = Value(groupName);
+  static Insertable<GroupsData> custom({
+    Expression<String>? groupId,
+    Expression<int>? isGroupAdmin,
+    Expression<int>? isDirectChat,
+    Expression<int>? pinned,
+    Expression<int>? archived,
+    Expression<int>? joinedGroup,
+    Expression<int>? leftGroup,
+    Expression<int>? deletedContent,
+    Expression<int>? stateVersionId,
+    Expression<i2.Uint8List>? stateEncryptionKey,
+    Expression<i2.Uint8List>? myGroupPrivateKey,
+    Expression<String>? groupName,
+    Expression<String>? draftMessage,
+    Expression<int>? totalMediaCounter,
+    Expression<int>? alsoBestFriend,
+    Expression<int>? deleteMessagesAfterMilliseconds,
+    Expression<int>? createdAt,
+    Expression<int>? lastMessageSend,
+    Expression<int>? lastMessageReceived,
+    Expression<int>? lastFlameCounterChange,
+    Expression<int>? lastFlameSync,
+    Expression<int>? flameCounter,
+    Expression<int>? maxFlameCounter,
+    Expression<int>? maxFlameCounterFrom,
+    Expression<int>? lastMessageExchange,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (groupId != null) 'group_id': groupId,
+      if (isGroupAdmin != null) 'is_group_admin': isGroupAdmin,
+      if (isDirectChat != null) 'is_direct_chat': isDirectChat,
+      if (pinned != null) 'pinned': pinned,
+      if (archived != null) 'archived': archived,
+      if (joinedGroup != null) 'joined_group': joinedGroup,
+      if (leftGroup != null) 'left_group': leftGroup,
+      if (deletedContent != null) 'deleted_content': deletedContent,
+      if (stateVersionId != null) 'state_version_id': stateVersionId,
+      if (stateEncryptionKey != null)
+        'state_encryption_key': stateEncryptionKey,
+      if (myGroupPrivateKey != null) 'my_group_private_key': myGroupPrivateKey,
+      if (groupName != null) 'group_name': groupName,
+      if (draftMessage != null) 'draft_message': draftMessage,
+      if (totalMediaCounter != null) 'total_media_counter': totalMediaCounter,
+      if (alsoBestFriend != null) 'also_best_friend': alsoBestFriend,
+      if (deleteMessagesAfterMilliseconds != null)
+        'delete_messages_after_milliseconds': deleteMessagesAfterMilliseconds,
+      if (createdAt != null) 'created_at': createdAt,
+      if (lastMessageSend != null) 'last_message_send': lastMessageSend,
+      if (lastMessageReceived != null)
+        'last_message_received': lastMessageReceived,
+      if (lastFlameCounterChange != null)
+        'last_flame_counter_change': lastFlameCounterChange,
+      if (lastFlameSync != null) 'last_flame_sync': lastFlameSync,
+      if (flameCounter != null) 'flame_counter': flameCounter,
+      if (maxFlameCounter != null) 'max_flame_counter': maxFlameCounter,
+      if (maxFlameCounterFrom != null)
+        'max_flame_counter_from': maxFlameCounterFrom,
+      if (lastMessageExchange != null)
+        'last_message_exchange': lastMessageExchange,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  GroupsCompanion copyWith({
+    Value<String>? groupId,
+    Value<int>? isGroupAdmin,
+    Value<int>? isDirectChat,
+    Value<int>? pinned,
+    Value<int>? archived,
+    Value<int>? joinedGroup,
+    Value<int>? leftGroup,
+    Value<int>? deletedContent,
+    Value<int>? stateVersionId,
+    Value<i2.Uint8List?>? stateEncryptionKey,
+    Value<i2.Uint8List?>? myGroupPrivateKey,
+    Value<String>? groupName,
+    Value<String?>? draftMessage,
+    Value<int>? totalMediaCounter,
+    Value<int>? alsoBestFriend,
+    Value<int>? deleteMessagesAfterMilliseconds,
+    Value<int>? createdAt,
+    Value<int?>? lastMessageSend,
+    Value<int?>? lastMessageReceived,
+    Value<int?>? lastFlameCounterChange,
+    Value<int?>? lastFlameSync,
+    Value<int>? flameCounter,
+    Value<int>? maxFlameCounter,
+    Value<int?>? maxFlameCounterFrom,
+    Value<int>? lastMessageExchange,
+    Value<int>? rowid,
+  }) {
+    return GroupsCompanion(
+      groupId: groupId ?? this.groupId,
+      isGroupAdmin: isGroupAdmin ?? this.isGroupAdmin,
+      isDirectChat: isDirectChat ?? this.isDirectChat,
+      pinned: pinned ?? this.pinned,
+      archived: archived ?? this.archived,
+      joinedGroup: joinedGroup ?? this.joinedGroup,
+      leftGroup: leftGroup ?? this.leftGroup,
+      deletedContent: deletedContent ?? this.deletedContent,
+      stateVersionId: stateVersionId ?? this.stateVersionId,
+      stateEncryptionKey: stateEncryptionKey ?? this.stateEncryptionKey,
+      myGroupPrivateKey: myGroupPrivateKey ?? this.myGroupPrivateKey,
+      groupName: groupName ?? this.groupName,
+      draftMessage: draftMessage ?? this.draftMessage,
+      totalMediaCounter: totalMediaCounter ?? this.totalMediaCounter,
+      alsoBestFriend: alsoBestFriend ?? this.alsoBestFriend,
+      deleteMessagesAfterMilliseconds:
+          deleteMessagesAfterMilliseconds ??
+          this.deleteMessagesAfterMilliseconds,
+      createdAt: createdAt ?? this.createdAt,
+      lastMessageSend: lastMessageSend ?? this.lastMessageSend,
+      lastMessageReceived: lastMessageReceived ?? this.lastMessageReceived,
+      lastFlameCounterChange:
+          lastFlameCounterChange ?? this.lastFlameCounterChange,
+      lastFlameSync: lastFlameSync ?? this.lastFlameSync,
+      flameCounter: flameCounter ?? this.flameCounter,
+      maxFlameCounter: maxFlameCounter ?? this.maxFlameCounter,
+      maxFlameCounterFrom: maxFlameCounterFrom ?? this.maxFlameCounterFrom,
+      lastMessageExchange: lastMessageExchange ?? this.lastMessageExchange,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (groupId.present) {
+      map['group_id'] = Variable<String>(groupId.value);
+    }
+    if (isGroupAdmin.present) {
+      map['is_group_admin'] = Variable<int>(isGroupAdmin.value);
+    }
+    if (isDirectChat.present) {
+      map['is_direct_chat'] = Variable<int>(isDirectChat.value);
+    }
+    if (pinned.present) {
+      map['pinned'] = Variable<int>(pinned.value);
+    }
+    if (archived.present) {
+      map['archived'] = Variable<int>(archived.value);
+    }
+    if (joinedGroup.present) {
+      map['joined_group'] = Variable<int>(joinedGroup.value);
+    }
+    if (leftGroup.present) {
+      map['left_group'] = Variable<int>(leftGroup.value);
+    }
+    if (deletedContent.present) {
+      map['deleted_content'] = Variable<int>(deletedContent.value);
+    }
+    if (stateVersionId.present) {
+      map['state_version_id'] = Variable<int>(stateVersionId.value);
+    }
+    if (stateEncryptionKey.present) {
+      map['state_encryption_key'] = Variable<i2.Uint8List>(
+        stateEncryptionKey.value,
+      );
+    }
+    if (myGroupPrivateKey.present) {
+      map['my_group_private_key'] = Variable<i2.Uint8List>(
+        myGroupPrivateKey.value,
+      );
+    }
+    if (groupName.present) {
+      map['group_name'] = Variable<String>(groupName.value);
+    }
+    if (draftMessage.present) {
+      map['draft_message'] = Variable<String>(draftMessage.value);
+    }
+    if (totalMediaCounter.present) {
+      map['total_media_counter'] = Variable<int>(totalMediaCounter.value);
+    }
+    if (alsoBestFriend.present) {
+      map['also_best_friend'] = Variable<int>(alsoBestFriend.value);
+    }
+    if (deleteMessagesAfterMilliseconds.present) {
+      map['delete_messages_after_milliseconds'] = Variable<int>(
+        deleteMessagesAfterMilliseconds.value,
+      );
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (lastMessageSend.present) {
+      map['last_message_send'] = Variable<int>(lastMessageSend.value);
+    }
+    if (lastMessageReceived.present) {
+      map['last_message_received'] = Variable<int>(lastMessageReceived.value);
+    }
+    if (lastFlameCounterChange.present) {
+      map['last_flame_counter_change'] = Variable<int>(
+        lastFlameCounterChange.value,
+      );
+    }
+    if (lastFlameSync.present) {
+      map['last_flame_sync'] = Variable<int>(lastFlameSync.value);
+    }
+    if (flameCounter.present) {
+      map['flame_counter'] = Variable<int>(flameCounter.value);
+    }
+    if (maxFlameCounter.present) {
+      map['max_flame_counter'] = Variable<int>(maxFlameCounter.value);
+    }
+    if (maxFlameCounterFrom.present) {
+      map['max_flame_counter_from'] = Variable<int>(maxFlameCounterFrom.value);
+    }
+    if (lastMessageExchange.present) {
+      map['last_message_exchange'] = Variable<int>(lastMessageExchange.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('GroupsCompanion(')
+          ..write('groupId: $groupId, ')
+          ..write('isGroupAdmin: $isGroupAdmin, ')
+          ..write('isDirectChat: $isDirectChat, ')
+          ..write('pinned: $pinned, ')
+          ..write('archived: $archived, ')
+          ..write('joinedGroup: $joinedGroup, ')
+          ..write('leftGroup: $leftGroup, ')
+          ..write('deletedContent: $deletedContent, ')
+          ..write('stateVersionId: $stateVersionId, ')
+          ..write('stateEncryptionKey: $stateEncryptionKey, ')
+          ..write('myGroupPrivateKey: $myGroupPrivateKey, ')
+          ..write('groupName: $groupName, ')
+          ..write('draftMessage: $draftMessage, ')
+          ..write('totalMediaCounter: $totalMediaCounter, ')
+          ..write('alsoBestFriend: $alsoBestFriend, ')
+          ..write(
+            'deleteMessagesAfterMilliseconds: $deleteMessagesAfterMilliseconds, ',
+          )
+          ..write('createdAt: $createdAt, ')
+          ..write('lastMessageSend: $lastMessageSend, ')
+          ..write('lastMessageReceived: $lastMessageReceived, ')
+          ..write('lastFlameCounterChange: $lastFlameCounterChange, ')
+          ..write('lastFlameSync: $lastFlameSync, ')
+          ..write('flameCounter: $flameCounter, ')
+          ..write('maxFlameCounter: $maxFlameCounter, ')
+          ..write('maxFlameCounterFrom: $maxFlameCounterFrom, ')
+          ..write('lastMessageExchange: $lastMessageExchange, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class MediaFiles extends Table with TableInfo<MediaFiles, MediaFilesData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  MediaFiles(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> mediaId = GeneratedColumn<String>(
+    'media_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> type = GeneratedColumn<String>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> uploadState = GeneratedColumn<String>(
+    'upload_state',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<String> downloadState = GeneratedColumn<String>(
+    'download_state',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> requiresAuthentication = GeneratedColumn<int>(
+    'requires_authentication',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT 0 CHECK (requires_authentication IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> stored = GeneratedColumn<int>(
+    'stored',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK ("stored" IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> isDraftMedia = GeneratedColumn<int>(
+    'is_draft_media',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (is_draft_media IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> preProgressingProcess = GeneratedColumn<int>(
+    'pre_progressing_process',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<String> reuploadRequestedBy =
+      GeneratedColumn<String>(
+        'reupload_requested_by',
+        aliasedName,
+        true,
+        type: DriftSqlType.string,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> displayLimitInMilliseconds =
+      GeneratedColumn<int>(
+        'display_limit_in_milliseconds',
+        aliasedName,
+        true,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> removeAudio = GeneratedColumn<int>(
+    'remove_audio',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL CHECK (remove_audio IN (0, 1))',
+  );
+  late final GeneratedColumn<i2.Uint8List> downloadToken =
+      GeneratedColumn<i2.Uint8List>(
+        'download_token',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<i2.Uint8List> encryptionKey =
+      GeneratedColumn<i2.Uint8List>(
+        'encryption_key',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<i2.Uint8List> encryptionMac =
+      GeneratedColumn<i2.Uint8List>(
+        'encryption_mac',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<i2.Uint8List> encryptionNonce =
+      GeneratedColumn<i2.Uint8List>(
+        'encryption_nonce',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<i2.Uint8List> storedFileHash =
+      GeneratedColumn<i2.Uint8List>(
+        'stored_file_hash',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    mediaId,
+    type,
+    uploadState,
+    downloadState,
+    requiresAuthentication,
+    stored,
+    isDraftMedia,
+    preProgressingProcess,
+    reuploadRequestedBy,
+    displayLimitInMilliseconds,
+    removeAudio,
+    downloadToken,
+    encryptionKey,
+    encryptionMac,
+    encryptionNonce,
+    storedFileHash,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'media_files';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {mediaId};
+  @override
+  MediaFilesData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return MediaFilesData(
+      mediaId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}media_id'],
+      )!,
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}type'],
+      )!,
+      uploadState: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}upload_state'],
+      ),
+      downloadState: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}download_state'],
+      ),
+      requiresAuthentication: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}requires_authentication'],
+      )!,
+      stored: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}stored'],
+      )!,
+      isDraftMedia: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}is_draft_media'],
+      )!,
+      preProgressingProcess: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}pre_progressing_process'],
+      ),
+      reuploadRequestedBy: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}reupload_requested_by'],
+      ),
+      displayLimitInMilliseconds: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}display_limit_in_milliseconds'],
+      ),
+      removeAudio: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}remove_audio'],
+      ),
+      downloadToken: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}download_token'],
+      ),
+      encryptionKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}encryption_key'],
+      ),
+      encryptionMac: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}encryption_mac'],
+      ),
+      encryptionNonce: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}encryption_nonce'],
+      ),
+      storedFileHash: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}stored_file_hash'],
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  MediaFiles createAlias(String alias) {
+    return MediaFiles(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(media_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class MediaFilesData extends DataClass implements Insertable<MediaFilesData> {
+  final String mediaId;
+  final String type;
+  final String? uploadState;
+  final String? downloadState;
+  final int requiresAuthentication;
+  final int stored;
+  final int isDraftMedia;
+  final int? preProgressingProcess;
+  final String? reuploadRequestedBy;
+  final int? displayLimitInMilliseconds;
+  final int? removeAudio;
+  final i2.Uint8List? downloadToken;
+  final i2.Uint8List? encryptionKey;
+  final i2.Uint8List? encryptionMac;
+  final i2.Uint8List? encryptionNonce;
+  final i2.Uint8List? storedFileHash;
+  final int createdAt;
+  const MediaFilesData({
+    required this.mediaId,
+    required this.type,
+    this.uploadState,
+    this.downloadState,
+    required this.requiresAuthentication,
+    required this.stored,
+    required this.isDraftMedia,
+    this.preProgressingProcess,
+    this.reuploadRequestedBy,
+    this.displayLimitInMilliseconds,
+    this.removeAudio,
+    this.downloadToken,
+    this.encryptionKey,
+    this.encryptionMac,
+    this.encryptionNonce,
+    this.storedFileHash,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['media_id'] = Variable<String>(mediaId);
+    map['type'] = Variable<String>(type);
+    if (!nullToAbsent || uploadState != null) {
+      map['upload_state'] = Variable<String>(uploadState);
+    }
+    if (!nullToAbsent || downloadState != null) {
+      map['download_state'] = Variable<String>(downloadState);
+    }
+    map['requires_authentication'] = Variable<int>(requiresAuthentication);
+    map['stored'] = Variable<int>(stored);
+    map['is_draft_media'] = Variable<int>(isDraftMedia);
+    if (!nullToAbsent || preProgressingProcess != null) {
+      map['pre_progressing_process'] = Variable<int>(preProgressingProcess);
+    }
+    if (!nullToAbsent || reuploadRequestedBy != null) {
+      map['reupload_requested_by'] = Variable<String>(reuploadRequestedBy);
+    }
+    if (!nullToAbsent || displayLimitInMilliseconds != null) {
+      map['display_limit_in_milliseconds'] = Variable<int>(
+        displayLimitInMilliseconds,
+      );
+    }
+    if (!nullToAbsent || removeAudio != null) {
+      map['remove_audio'] = Variable<int>(removeAudio);
+    }
+    if (!nullToAbsent || downloadToken != null) {
+      map['download_token'] = Variable<i2.Uint8List>(downloadToken);
+    }
+    if (!nullToAbsent || encryptionKey != null) {
+      map['encryption_key'] = Variable<i2.Uint8List>(encryptionKey);
+    }
+    if (!nullToAbsent || encryptionMac != null) {
+      map['encryption_mac'] = Variable<i2.Uint8List>(encryptionMac);
+    }
+    if (!nullToAbsent || encryptionNonce != null) {
+      map['encryption_nonce'] = Variable<i2.Uint8List>(encryptionNonce);
+    }
+    if (!nullToAbsent || storedFileHash != null) {
+      map['stored_file_hash'] = Variable<i2.Uint8List>(storedFileHash);
+    }
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  MediaFilesCompanion toCompanion(bool nullToAbsent) {
+    return MediaFilesCompanion(
+      mediaId: Value(mediaId),
+      type: Value(type),
+      uploadState: uploadState == null && nullToAbsent
+          ? const Value.absent()
+          : Value(uploadState),
+      downloadState: downloadState == null && nullToAbsent
+          ? const Value.absent()
+          : Value(downloadState),
+      requiresAuthentication: Value(requiresAuthentication),
+      stored: Value(stored),
+      isDraftMedia: Value(isDraftMedia),
+      preProgressingProcess: preProgressingProcess == null && nullToAbsent
+          ? const Value.absent()
+          : Value(preProgressingProcess),
+      reuploadRequestedBy: reuploadRequestedBy == null && nullToAbsent
+          ? const Value.absent()
+          : Value(reuploadRequestedBy),
+      displayLimitInMilliseconds:
+          displayLimitInMilliseconds == null && nullToAbsent
+          ? const Value.absent()
+          : Value(displayLimitInMilliseconds),
+      removeAudio: removeAudio == null && nullToAbsent
+          ? const Value.absent()
+          : Value(removeAudio),
+      downloadToken: downloadToken == null && nullToAbsent
+          ? const Value.absent()
+          : Value(downloadToken),
+      encryptionKey: encryptionKey == null && nullToAbsent
+          ? const Value.absent()
+          : Value(encryptionKey),
+      encryptionMac: encryptionMac == null && nullToAbsent
+          ? const Value.absent()
+          : Value(encryptionMac),
+      encryptionNonce: encryptionNonce == null && nullToAbsent
+          ? const Value.absent()
+          : Value(encryptionNonce),
+      storedFileHash: storedFileHash == null && nullToAbsent
+          ? const Value.absent()
+          : Value(storedFileHash),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory MediaFilesData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return MediaFilesData(
+      mediaId: serializer.fromJson<String>(json['mediaId']),
+      type: serializer.fromJson<String>(json['type']),
+      uploadState: serializer.fromJson<String?>(json['uploadState']),
+      downloadState: serializer.fromJson<String?>(json['downloadState']),
+      requiresAuthentication: serializer.fromJson<int>(
+        json['requiresAuthentication'],
+      ),
+      stored: serializer.fromJson<int>(json['stored']),
+      isDraftMedia: serializer.fromJson<int>(json['isDraftMedia']),
+      preProgressingProcess: serializer.fromJson<int?>(
+        json['preProgressingProcess'],
+      ),
+      reuploadRequestedBy: serializer.fromJson<String?>(
+        json['reuploadRequestedBy'],
+      ),
+      displayLimitInMilliseconds: serializer.fromJson<int?>(
+        json['displayLimitInMilliseconds'],
+      ),
+      removeAudio: serializer.fromJson<int?>(json['removeAudio']),
+      downloadToken: serializer.fromJson<i2.Uint8List?>(json['downloadToken']),
+      encryptionKey: serializer.fromJson<i2.Uint8List?>(json['encryptionKey']),
+      encryptionMac: serializer.fromJson<i2.Uint8List?>(json['encryptionMac']),
+      encryptionNonce: serializer.fromJson<i2.Uint8List?>(
+        json['encryptionNonce'],
+      ),
+      storedFileHash: serializer.fromJson<i2.Uint8List?>(
+        json['storedFileHash'],
+      ),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'mediaId': serializer.toJson<String>(mediaId),
+      'type': serializer.toJson<String>(type),
+      'uploadState': serializer.toJson<String?>(uploadState),
+      'downloadState': serializer.toJson<String?>(downloadState),
+      'requiresAuthentication': serializer.toJson<int>(requiresAuthentication),
+      'stored': serializer.toJson<int>(stored),
+      'isDraftMedia': serializer.toJson<int>(isDraftMedia),
+      'preProgressingProcess': serializer.toJson<int?>(preProgressingProcess),
+      'reuploadRequestedBy': serializer.toJson<String?>(reuploadRequestedBy),
+      'displayLimitInMilliseconds': serializer.toJson<int?>(
+        displayLimitInMilliseconds,
+      ),
+      'removeAudio': serializer.toJson<int?>(removeAudio),
+      'downloadToken': serializer.toJson<i2.Uint8List?>(downloadToken),
+      'encryptionKey': serializer.toJson<i2.Uint8List?>(encryptionKey),
+      'encryptionMac': serializer.toJson<i2.Uint8List?>(encryptionMac),
+      'encryptionNonce': serializer.toJson<i2.Uint8List?>(encryptionNonce),
+      'storedFileHash': serializer.toJson<i2.Uint8List?>(storedFileHash),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  MediaFilesData copyWith({
+    String? mediaId,
+    String? type,
+    Value<String?> uploadState = const Value.absent(),
+    Value<String?> downloadState = const Value.absent(),
+    int? requiresAuthentication,
+    int? stored,
+    int? isDraftMedia,
+    Value<int?> preProgressingProcess = const Value.absent(),
+    Value<String?> reuploadRequestedBy = const Value.absent(),
+    Value<int?> displayLimitInMilliseconds = const Value.absent(),
+    Value<int?> removeAudio = const Value.absent(),
+    Value<i2.Uint8List?> downloadToken = const Value.absent(),
+    Value<i2.Uint8List?> encryptionKey = const Value.absent(),
+    Value<i2.Uint8List?> encryptionMac = const Value.absent(),
+    Value<i2.Uint8List?> encryptionNonce = const Value.absent(),
+    Value<i2.Uint8List?> storedFileHash = const Value.absent(),
+    int? createdAt,
+  }) => MediaFilesData(
+    mediaId: mediaId ?? this.mediaId,
+    type: type ?? this.type,
+    uploadState: uploadState.present ? uploadState.value : this.uploadState,
+    downloadState: downloadState.present
+        ? downloadState.value
+        : this.downloadState,
+    requiresAuthentication:
+        requiresAuthentication ?? this.requiresAuthentication,
+    stored: stored ?? this.stored,
+    isDraftMedia: isDraftMedia ?? this.isDraftMedia,
+    preProgressingProcess: preProgressingProcess.present
+        ? preProgressingProcess.value
+        : this.preProgressingProcess,
+    reuploadRequestedBy: reuploadRequestedBy.present
+        ? reuploadRequestedBy.value
+        : this.reuploadRequestedBy,
+    displayLimitInMilliseconds: displayLimitInMilliseconds.present
+        ? displayLimitInMilliseconds.value
+        : this.displayLimitInMilliseconds,
+    removeAudio: removeAudio.present ? removeAudio.value : this.removeAudio,
+    downloadToken: downloadToken.present
+        ? downloadToken.value
+        : this.downloadToken,
+    encryptionKey: encryptionKey.present
+        ? encryptionKey.value
+        : this.encryptionKey,
+    encryptionMac: encryptionMac.present
+        ? encryptionMac.value
+        : this.encryptionMac,
+    encryptionNonce: encryptionNonce.present
+        ? encryptionNonce.value
+        : this.encryptionNonce,
+    storedFileHash: storedFileHash.present
+        ? storedFileHash.value
+        : this.storedFileHash,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  MediaFilesData copyWithCompanion(MediaFilesCompanion data) {
+    return MediaFilesData(
+      mediaId: data.mediaId.present ? data.mediaId.value : this.mediaId,
+      type: data.type.present ? data.type.value : this.type,
+      uploadState: data.uploadState.present
+          ? data.uploadState.value
+          : this.uploadState,
+      downloadState: data.downloadState.present
+          ? data.downloadState.value
+          : this.downloadState,
+      requiresAuthentication: data.requiresAuthentication.present
+          ? data.requiresAuthentication.value
+          : this.requiresAuthentication,
+      stored: data.stored.present ? data.stored.value : this.stored,
+      isDraftMedia: data.isDraftMedia.present
+          ? data.isDraftMedia.value
+          : this.isDraftMedia,
+      preProgressingProcess: data.preProgressingProcess.present
+          ? data.preProgressingProcess.value
+          : this.preProgressingProcess,
+      reuploadRequestedBy: data.reuploadRequestedBy.present
+          ? data.reuploadRequestedBy.value
+          : this.reuploadRequestedBy,
+      displayLimitInMilliseconds: data.displayLimitInMilliseconds.present
+          ? data.displayLimitInMilliseconds.value
+          : this.displayLimitInMilliseconds,
+      removeAudio: data.removeAudio.present
+          ? data.removeAudio.value
+          : this.removeAudio,
+      downloadToken: data.downloadToken.present
+          ? data.downloadToken.value
+          : this.downloadToken,
+      encryptionKey: data.encryptionKey.present
+          ? data.encryptionKey.value
+          : this.encryptionKey,
+      encryptionMac: data.encryptionMac.present
+          ? data.encryptionMac.value
+          : this.encryptionMac,
+      encryptionNonce: data.encryptionNonce.present
+          ? data.encryptionNonce.value
+          : this.encryptionNonce,
+      storedFileHash: data.storedFileHash.present
+          ? data.storedFileHash.value
+          : this.storedFileHash,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MediaFilesData(')
+          ..write('mediaId: $mediaId, ')
+          ..write('type: $type, ')
+          ..write('uploadState: $uploadState, ')
+          ..write('downloadState: $downloadState, ')
+          ..write('requiresAuthentication: $requiresAuthentication, ')
+          ..write('stored: $stored, ')
+          ..write('isDraftMedia: $isDraftMedia, ')
+          ..write('preProgressingProcess: $preProgressingProcess, ')
+          ..write('reuploadRequestedBy: $reuploadRequestedBy, ')
+          ..write('displayLimitInMilliseconds: $displayLimitInMilliseconds, ')
+          ..write('removeAudio: $removeAudio, ')
+          ..write('downloadToken: $downloadToken, ')
+          ..write('encryptionKey: $encryptionKey, ')
+          ..write('encryptionMac: $encryptionMac, ')
+          ..write('encryptionNonce: $encryptionNonce, ')
+          ..write('storedFileHash: $storedFileHash, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    mediaId,
+    type,
+    uploadState,
+    downloadState,
+    requiresAuthentication,
+    stored,
+    isDraftMedia,
+    preProgressingProcess,
+    reuploadRequestedBy,
+    displayLimitInMilliseconds,
+    removeAudio,
+    $driftBlobEquality.hash(downloadToken),
+    $driftBlobEquality.hash(encryptionKey),
+    $driftBlobEquality.hash(encryptionMac),
+    $driftBlobEquality.hash(encryptionNonce),
+    $driftBlobEquality.hash(storedFileHash),
+    createdAt,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is MediaFilesData &&
+          other.mediaId == this.mediaId &&
+          other.type == this.type &&
+          other.uploadState == this.uploadState &&
+          other.downloadState == this.downloadState &&
+          other.requiresAuthentication == this.requiresAuthentication &&
+          other.stored == this.stored &&
+          other.isDraftMedia == this.isDraftMedia &&
+          other.preProgressingProcess == this.preProgressingProcess &&
+          other.reuploadRequestedBy == this.reuploadRequestedBy &&
+          other.displayLimitInMilliseconds == this.displayLimitInMilliseconds &&
+          other.removeAudio == this.removeAudio &&
+          $driftBlobEquality.equals(other.downloadToken, this.downloadToken) &&
+          $driftBlobEquality.equals(other.encryptionKey, this.encryptionKey) &&
+          $driftBlobEquality.equals(other.encryptionMac, this.encryptionMac) &&
+          $driftBlobEquality.equals(
+            other.encryptionNonce,
+            this.encryptionNonce,
+          ) &&
+          $driftBlobEquality.equals(
+            other.storedFileHash,
+            this.storedFileHash,
+          ) &&
+          other.createdAt == this.createdAt);
+}
+
+class MediaFilesCompanion extends UpdateCompanion<MediaFilesData> {
+  final Value<String> mediaId;
+  final Value<String> type;
+  final Value<String?> uploadState;
+  final Value<String?> downloadState;
+  final Value<int> requiresAuthentication;
+  final Value<int> stored;
+  final Value<int> isDraftMedia;
+  final Value<int?> preProgressingProcess;
+  final Value<String?> reuploadRequestedBy;
+  final Value<int?> displayLimitInMilliseconds;
+  final Value<int?> removeAudio;
+  final Value<i2.Uint8List?> downloadToken;
+  final Value<i2.Uint8List?> encryptionKey;
+  final Value<i2.Uint8List?> encryptionMac;
+  final Value<i2.Uint8List?> encryptionNonce;
+  final Value<i2.Uint8List?> storedFileHash;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const MediaFilesCompanion({
+    this.mediaId = const Value.absent(),
+    this.type = const Value.absent(),
+    this.uploadState = const Value.absent(),
+    this.downloadState = const Value.absent(),
+    this.requiresAuthentication = const Value.absent(),
+    this.stored = const Value.absent(),
+    this.isDraftMedia = const Value.absent(),
+    this.preProgressingProcess = const Value.absent(),
+    this.reuploadRequestedBy = const Value.absent(),
+    this.displayLimitInMilliseconds = const Value.absent(),
+    this.removeAudio = const Value.absent(),
+    this.downloadToken = const Value.absent(),
+    this.encryptionKey = const Value.absent(),
+    this.encryptionMac = const Value.absent(),
+    this.encryptionNonce = const Value.absent(),
+    this.storedFileHash = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  MediaFilesCompanion.insert({
+    required String mediaId,
+    required String type,
+    this.uploadState = const Value.absent(),
+    this.downloadState = const Value.absent(),
+    this.requiresAuthentication = const Value.absent(),
+    this.stored = const Value.absent(),
+    this.isDraftMedia = const Value.absent(),
+    this.preProgressingProcess = const Value.absent(),
+    this.reuploadRequestedBy = const Value.absent(),
+    this.displayLimitInMilliseconds = const Value.absent(),
+    this.removeAudio = const Value.absent(),
+    this.downloadToken = const Value.absent(),
+    this.encryptionKey = const Value.absent(),
+    this.encryptionMac = const Value.absent(),
+    this.encryptionNonce = const Value.absent(),
+    this.storedFileHash = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : mediaId = Value(mediaId),
+       type = Value(type);
+  static Insertable<MediaFilesData> custom({
+    Expression<String>? mediaId,
+    Expression<String>? type,
+    Expression<String>? uploadState,
+    Expression<String>? downloadState,
+    Expression<int>? requiresAuthentication,
+    Expression<int>? stored,
+    Expression<int>? isDraftMedia,
+    Expression<int>? preProgressingProcess,
+    Expression<String>? reuploadRequestedBy,
+    Expression<int>? displayLimitInMilliseconds,
+    Expression<int>? removeAudio,
+    Expression<i2.Uint8List>? downloadToken,
+    Expression<i2.Uint8List>? encryptionKey,
+    Expression<i2.Uint8List>? encryptionMac,
+    Expression<i2.Uint8List>? encryptionNonce,
+    Expression<i2.Uint8List>? storedFileHash,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (mediaId != null) 'media_id': mediaId,
+      if (type != null) 'type': type,
+      if (uploadState != null) 'upload_state': uploadState,
+      if (downloadState != null) 'download_state': downloadState,
+      if (requiresAuthentication != null)
+        'requires_authentication': requiresAuthentication,
+      if (stored != null) 'stored': stored,
+      if (isDraftMedia != null) 'is_draft_media': isDraftMedia,
+      if (preProgressingProcess != null)
+        'pre_progressing_process': preProgressingProcess,
+      if (reuploadRequestedBy != null)
+        'reupload_requested_by': reuploadRequestedBy,
+      if (displayLimitInMilliseconds != null)
+        'display_limit_in_milliseconds': displayLimitInMilliseconds,
+      if (removeAudio != null) 'remove_audio': removeAudio,
+      if (downloadToken != null) 'download_token': downloadToken,
+      if (encryptionKey != null) 'encryption_key': encryptionKey,
+      if (encryptionMac != null) 'encryption_mac': encryptionMac,
+      if (encryptionNonce != null) 'encryption_nonce': encryptionNonce,
+      if (storedFileHash != null) 'stored_file_hash': storedFileHash,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  MediaFilesCompanion copyWith({
+    Value<String>? mediaId,
+    Value<String>? type,
+    Value<String?>? uploadState,
+    Value<String?>? downloadState,
+    Value<int>? requiresAuthentication,
+    Value<int>? stored,
+    Value<int>? isDraftMedia,
+    Value<int?>? preProgressingProcess,
+    Value<String?>? reuploadRequestedBy,
+    Value<int?>? displayLimitInMilliseconds,
+    Value<int?>? removeAudio,
+    Value<i2.Uint8List?>? downloadToken,
+    Value<i2.Uint8List?>? encryptionKey,
+    Value<i2.Uint8List?>? encryptionMac,
+    Value<i2.Uint8List?>? encryptionNonce,
+    Value<i2.Uint8List?>? storedFileHash,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return MediaFilesCompanion(
+      mediaId: mediaId ?? this.mediaId,
+      type: type ?? this.type,
+      uploadState: uploadState ?? this.uploadState,
+      downloadState: downloadState ?? this.downloadState,
+      requiresAuthentication:
+          requiresAuthentication ?? this.requiresAuthentication,
+      stored: stored ?? this.stored,
+      isDraftMedia: isDraftMedia ?? this.isDraftMedia,
+      preProgressingProcess:
+          preProgressingProcess ?? this.preProgressingProcess,
+      reuploadRequestedBy: reuploadRequestedBy ?? this.reuploadRequestedBy,
+      displayLimitInMilliseconds:
+          displayLimitInMilliseconds ?? this.displayLimitInMilliseconds,
+      removeAudio: removeAudio ?? this.removeAudio,
+      downloadToken: downloadToken ?? this.downloadToken,
+      encryptionKey: encryptionKey ?? this.encryptionKey,
+      encryptionMac: encryptionMac ?? this.encryptionMac,
+      encryptionNonce: encryptionNonce ?? this.encryptionNonce,
+      storedFileHash: storedFileHash ?? this.storedFileHash,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (mediaId.present) {
+      map['media_id'] = Variable<String>(mediaId.value);
+    }
+    if (type.present) {
+      map['type'] = Variable<String>(type.value);
+    }
+    if (uploadState.present) {
+      map['upload_state'] = Variable<String>(uploadState.value);
+    }
+    if (downloadState.present) {
+      map['download_state'] = Variable<String>(downloadState.value);
+    }
+    if (requiresAuthentication.present) {
+      map['requires_authentication'] = Variable<int>(
+        requiresAuthentication.value,
+      );
+    }
+    if (stored.present) {
+      map['stored'] = Variable<int>(stored.value);
+    }
+    if (isDraftMedia.present) {
+      map['is_draft_media'] = Variable<int>(isDraftMedia.value);
+    }
+    if (preProgressingProcess.present) {
+      map['pre_progressing_process'] = Variable<int>(
+        preProgressingProcess.value,
+      );
+    }
+    if (reuploadRequestedBy.present) {
+      map['reupload_requested_by'] = Variable<String>(
+        reuploadRequestedBy.value,
+      );
+    }
+    if (displayLimitInMilliseconds.present) {
+      map['display_limit_in_milliseconds'] = Variable<int>(
+        displayLimitInMilliseconds.value,
+      );
+    }
+    if (removeAudio.present) {
+      map['remove_audio'] = Variable<int>(removeAudio.value);
+    }
+    if (downloadToken.present) {
+      map['download_token'] = Variable<i2.Uint8List>(downloadToken.value);
+    }
+    if (encryptionKey.present) {
+      map['encryption_key'] = Variable<i2.Uint8List>(encryptionKey.value);
+    }
+    if (encryptionMac.present) {
+      map['encryption_mac'] = Variable<i2.Uint8List>(encryptionMac.value);
+    }
+    if (encryptionNonce.present) {
+      map['encryption_nonce'] = Variable<i2.Uint8List>(encryptionNonce.value);
+    }
+    if (storedFileHash.present) {
+      map['stored_file_hash'] = Variable<i2.Uint8List>(storedFileHash.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MediaFilesCompanion(')
+          ..write('mediaId: $mediaId, ')
+          ..write('type: $type, ')
+          ..write('uploadState: $uploadState, ')
+          ..write('downloadState: $downloadState, ')
+          ..write('requiresAuthentication: $requiresAuthentication, ')
+          ..write('stored: $stored, ')
+          ..write('isDraftMedia: $isDraftMedia, ')
+          ..write('preProgressingProcess: $preProgressingProcess, ')
+          ..write('reuploadRequestedBy: $reuploadRequestedBy, ')
+          ..write('displayLimitInMilliseconds: $displayLimitInMilliseconds, ')
+          ..write('removeAudio: $removeAudio, ')
+          ..write('downloadToken: $downloadToken, ')
+          ..write('encryptionKey: $encryptionKey, ')
+          ..write('encryptionMac: $encryptionMac, ')
+          ..write('encryptionNonce: $encryptionNonce, ')
+          ..write('storedFileHash: $storedFileHash, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class Messages extends Table with TableInfo<Messages, MessagesData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  Messages(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> groupId = GeneratedColumn<String>(
+    'group_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES "groups"(group_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<String> messageId = GeneratedColumn<String>(
+    'message_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> senderId = GeneratedColumn<int>(
+    'sender_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL REFERENCES contacts(user_id)',
+  );
+  late final GeneratedColumn<String> type = GeneratedColumn<String>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> content = GeneratedColumn<String>(
+    'content',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<String> mediaId = GeneratedColumn<String>(
+    'media_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NULL REFERENCES media_files(media_id)ON DELETE SET NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> additionalMessageData =
+      GeneratedColumn<i2.Uint8List>(
+        'additional_message_data',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> mediaStored = GeneratedColumn<int>(
+    'media_stored',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (media_stored IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> mediaReopened = GeneratedColumn<int>(
+    'media_reopened',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (media_reopened IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<i2.Uint8List> downloadToken =
+      GeneratedColumn<i2.Uint8List>(
+        'download_token',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<String> quotesMessageId = GeneratedColumn<String>(
+    'quotes_message_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> isDeletedFromSender = GeneratedColumn<int>(
+    'is_deleted_from_sender',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT 0 CHECK (is_deleted_from_sender IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> openedAt = GeneratedColumn<int>(
+    'opened_at',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> openedByAll = GeneratedColumn<int>(
+    'opened_by_all',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  late final GeneratedColumn<int> modifiedAt = GeneratedColumn<int>(
+    'modified_at',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> ackByUser = GeneratedColumn<int>(
+    'ack_by_user',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> ackByServer = GeneratedColumn<int>(
+    'ack_by_server',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    groupId,
+    messageId,
+    senderId,
+    type,
+    content,
+    mediaId,
+    additionalMessageData,
+    mediaStored,
+    mediaReopened,
+    downloadToken,
+    quotesMessageId,
+    isDeletedFromSender,
+    openedAt,
+    openedByAll,
+    createdAt,
+    modifiedAt,
+    ackByUser,
+    ackByServer,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'messages';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {messageId};
+  @override
+  MessagesData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return MessagesData(
+      groupId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}group_id'],
+      )!,
+      messageId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}message_id'],
+      )!,
+      senderId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}sender_id'],
+      ),
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}type'],
+      )!,
+      content: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}content'],
+      ),
+      mediaId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}media_id'],
+      ),
+      additionalMessageData: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}additional_message_data'],
+      ),
+      mediaStored: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}media_stored'],
+      )!,
+      mediaReopened: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}media_reopened'],
+      )!,
+      downloadToken: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}download_token'],
+      ),
+      quotesMessageId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}quotes_message_id'],
+      ),
+      isDeletedFromSender: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}is_deleted_from_sender'],
+      )!,
+      openedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}opened_at'],
+      ),
+      openedByAll: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}opened_by_all'],
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+      modifiedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}modified_at'],
+      ),
+      ackByUser: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}ack_by_user'],
+      ),
+      ackByServer: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}ack_by_server'],
+      ),
+    );
+  }
+
+  @override
+  Messages createAlias(String alias) {
+    return Messages(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(message_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class MessagesData extends DataClass implements Insertable<MessagesData> {
+  final String groupId;
+  final String messageId;
+  final int? senderId;
+  final String type;
+  final String? content;
+  final String? mediaId;
+  final i2.Uint8List? additionalMessageData;
+  final int mediaStored;
+  final int mediaReopened;
+  final i2.Uint8List? downloadToken;
+  final String? quotesMessageId;
+  final int isDeletedFromSender;
+  final int? openedAt;
+  final int? openedByAll;
+  final int createdAt;
+  final int? modifiedAt;
+  final int? ackByUser;
+  final int? ackByServer;
+  const MessagesData({
+    required this.groupId,
+    required this.messageId,
+    this.senderId,
+    required this.type,
+    this.content,
+    this.mediaId,
+    this.additionalMessageData,
+    required this.mediaStored,
+    required this.mediaReopened,
+    this.downloadToken,
+    this.quotesMessageId,
+    required this.isDeletedFromSender,
+    this.openedAt,
+    this.openedByAll,
+    required this.createdAt,
+    this.modifiedAt,
+    this.ackByUser,
+    this.ackByServer,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['group_id'] = Variable<String>(groupId);
+    map['message_id'] = Variable<String>(messageId);
+    if (!nullToAbsent || senderId != null) {
+      map['sender_id'] = Variable<int>(senderId);
+    }
+    map['type'] = Variable<String>(type);
+    if (!nullToAbsent || content != null) {
+      map['content'] = Variable<String>(content);
+    }
+    if (!nullToAbsent || mediaId != null) {
+      map['media_id'] = Variable<String>(mediaId);
+    }
+    if (!nullToAbsent || additionalMessageData != null) {
+      map['additional_message_data'] = Variable<i2.Uint8List>(
+        additionalMessageData,
+      );
+    }
+    map['media_stored'] = Variable<int>(mediaStored);
+    map['media_reopened'] = Variable<int>(mediaReopened);
+    if (!nullToAbsent || downloadToken != null) {
+      map['download_token'] = Variable<i2.Uint8List>(downloadToken);
+    }
+    if (!nullToAbsent || quotesMessageId != null) {
+      map['quotes_message_id'] = Variable<String>(quotesMessageId);
+    }
+    map['is_deleted_from_sender'] = Variable<int>(isDeletedFromSender);
+    if (!nullToAbsent || openedAt != null) {
+      map['opened_at'] = Variable<int>(openedAt);
+    }
+    if (!nullToAbsent || openedByAll != null) {
+      map['opened_by_all'] = Variable<int>(openedByAll);
+    }
+    map['created_at'] = Variable<int>(createdAt);
+    if (!nullToAbsent || modifiedAt != null) {
+      map['modified_at'] = Variable<int>(modifiedAt);
+    }
+    if (!nullToAbsent || ackByUser != null) {
+      map['ack_by_user'] = Variable<int>(ackByUser);
+    }
+    if (!nullToAbsent || ackByServer != null) {
+      map['ack_by_server'] = Variable<int>(ackByServer);
+    }
+    return map;
+  }
+
+  MessagesCompanion toCompanion(bool nullToAbsent) {
+    return MessagesCompanion(
+      groupId: Value(groupId),
+      messageId: Value(messageId),
+      senderId: senderId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(senderId),
+      type: Value(type),
+      content: content == null && nullToAbsent
+          ? const Value.absent()
+          : Value(content),
+      mediaId: mediaId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(mediaId),
+      additionalMessageData: additionalMessageData == null && nullToAbsent
+          ? const Value.absent()
+          : Value(additionalMessageData),
+      mediaStored: Value(mediaStored),
+      mediaReopened: Value(mediaReopened),
+      downloadToken: downloadToken == null && nullToAbsent
+          ? const Value.absent()
+          : Value(downloadToken),
+      quotesMessageId: quotesMessageId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(quotesMessageId),
+      isDeletedFromSender: Value(isDeletedFromSender),
+      openedAt: openedAt == null && nullToAbsent
+          ? const Value.absent()
+          : Value(openedAt),
+      openedByAll: openedByAll == null && nullToAbsent
+          ? const Value.absent()
+          : Value(openedByAll),
+      createdAt: Value(createdAt),
+      modifiedAt: modifiedAt == null && nullToAbsent
+          ? const Value.absent()
+          : Value(modifiedAt),
+      ackByUser: ackByUser == null && nullToAbsent
+          ? const Value.absent()
+          : Value(ackByUser),
+      ackByServer: ackByServer == null && nullToAbsent
+          ? const Value.absent()
+          : Value(ackByServer),
+    );
+  }
+
+  factory MessagesData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return MessagesData(
+      groupId: serializer.fromJson<String>(json['groupId']),
+      messageId: serializer.fromJson<String>(json['messageId']),
+      senderId: serializer.fromJson<int?>(json['senderId']),
+      type: serializer.fromJson<String>(json['type']),
+      content: serializer.fromJson<String?>(json['content']),
+      mediaId: serializer.fromJson<String?>(json['mediaId']),
+      additionalMessageData: serializer.fromJson<i2.Uint8List?>(
+        json['additionalMessageData'],
+      ),
+      mediaStored: serializer.fromJson<int>(json['mediaStored']),
+      mediaReopened: serializer.fromJson<int>(json['mediaReopened']),
+      downloadToken: serializer.fromJson<i2.Uint8List?>(json['downloadToken']),
+      quotesMessageId: serializer.fromJson<String?>(json['quotesMessageId']),
+      isDeletedFromSender: serializer.fromJson<int>(
+        json['isDeletedFromSender'],
+      ),
+      openedAt: serializer.fromJson<int?>(json['openedAt']),
+      openedByAll: serializer.fromJson<int?>(json['openedByAll']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+      modifiedAt: serializer.fromJson<int?>(json['modifiedAt']),
+      ackByUser: serializer.fromJson<int?>(json['ackByUser']),
+      ackByServer: serializer.fromJson<int?>(json['ackByServer']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'groupId': serializer.toJson<String>(groupId),
+      'messageId': serializer.toJson<String>(messageId),
+      'senderId': serializer.toJson<int?>(senderId),
+      'type': serializer.toJson<String>(type),
+      'content': serializer.toJson<String?>(content),
+      'mediaId': serializer.toJson<String?>(mediaId),
+      'additionalMessageData': serializer.toJson<i2.Uint8List?>(
+        additionalMessageData,
+      ),
+      'mediaStored': serializer.toJson<int>(mediaStored),
+      'mediaReopened': serializer.toJson<int>(mediaReopened),
+      'downloadToken': serializer.toJson<i2.Uint8List?>(downloadToken),
+      'quotesMessageId': serializer.toJson<String?>(quotesMessageId),
+      'isDeletedFromSender': serializer.toJson<int>(isDeletedFromSender),
+      'openedAt': serializer.toJson<int?>(openedAt),
+      'openedByAll': serializer.toJson<int?>(openedByAll),
+      'createdAt': serializer.toJson<int>(createdAt),
+      'modifiedAt': serializer.toJson<int?>(modifiedAt),
+      'ackByUser': serializer.toJson<int?>(ackByUser),
+      'ackByServer': serializer.toJson<int?>(ackByServer),
+    };
+  }
+
+  MessagesData copyWith({
+    String? groupId,
+    String? messageId,
+    Value<int?> senderId = const Value.absent(),
+    String? type,
+    Value<String?> content = const Value.absent(),
+    Value<String?> mediaId = const Value.absent(),
+    Value<i2.Uint8List?> additionalMessageData = const Value.absent(),
+    int? mediaStored,
+    int? mediaReopened,
+    Value<i2.Uint8List?> downloadToken = const Value.absent(),
+    Value<String?> quotesMessageId = const Value.absent(),
+    int? isDeletedFromSender,
+    Value<int?> openedAt = const Value.absent(),
+    Value<int?> openedByAll = const Value.absent(),
+    int? createdAt,
+    Value<int?> modifiedAt = const Value.absent(),
+    Value<int?> ackByUser = const Value.absent(),
+    Value<int?> ackByServer = const Value.absent(),
+  }) => MessagesData(
+    groupId: groupId ?? this.groupId,
+    messageId: messageId ?? this.messageId,
+    senderId: senderId.present ? senderId.value : this.senderId,
+    type: type ?? this.type,
+    content: content.present ? content.value : this.content,
+    mediaId: mediaId.present ? mediaId.value : this.mediaId,
+    additionalMessageData: additionalMessageData.present
+        ? additionalMessageData.value
+        : this.additionalMessageData,
+    mediaStored: mediaStored ?? this.mediaStored,
+    mediaReopened: mediaReopened ?? this.mediaReopened,
+    downloadToken: downloadToken.present
+        ? downloadToken.value
+        : this.downloadToken,
+    quotesMessageId: quotesMessageId.present
+        ? quotesMessageId.value
+        : this.quotesMessageId,
+    isDeletedFromSender: isDeletedFromSender ?? this.isDeletedFromSender,
+    openedAt: openedAt.present ? openedAt.value : this.openedAt,
+    openedByAll: openedByAll.present ? openedByAll.value : this.openedByAll,
+    createdAt: createdAt ?? this.createdAt,
+    modifiedAt: modifiedAt.present ? modifiedAt.value : this.modifiedAt,
+    ackByUser: ackByUser.present ? ackByUser.value : this.ackByUser,
+    ackByServer: ackByServer.present ? ackByServer.value : this.ackByServer,
+  );
+  MessagesData copyWithCompanion(MessagesCompanion data) {
+    return MessagesData(
+      groupId: data.groupId.present ? data.groupId.value : this.groupId,
+      messageId: data.messageId.present ? data.messageId.value : this.messageId,
+      senderId: data.senderId.present ? data.senderId.value : this.senderId,
+      type: data.type.present ? data.type.value : this.type,
+      content: data.content.present ? data.content.value : this.content,
+      mediaId: data.mediaId.present ? data.mediaId.value : this.mediaId,
+      additionalMessageData: data.additionalMessageData.present
+          ? data.additionalMessageData.value
+          : this.additionalMessageData,
+      mediaStored: data.mediaStored.present
+          ? data.mediaStored.value
+          : this.mediaStored,
+      mediaReopened: data.mediaReopened.present
+          ? data.mediaReopened.value
+          : this.mediaReopened,
+      downloadToken: data.downloadToken.present
+          ? data.downloadToken.value
+          : this.downloadToken,
+      quotesMessageId: data.quotesMessageId.present
+          ? data.quotesMessageId.value
+          : this.quotesMessageId,
+      isDeletedFromSender: data.isDeletedFromSender.present
+          ? data.isDeletedFromSender.value
+          : this.isDeletedFromSender,
+      openedAt: data.openedAt.present ? data.openedAt.value : this.openedAt,
+      openedByAll: data.openedByAll.present
+          ? data.openedByAll.value
+          : this.openedByAll,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      modifiedAt: data.modifiedAt.present
+          ? data.modifiedAt.value
+          : this.modifiedAt,
+      ackByUser: data.ackByUser.present ? data.ackByUser.value : this.ackByUser,
+      ackByServer: data.ackByServer.present
+          ? data.ackByServer.value
+          : this.ackByServer,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MessagesData(')
+          ..write('groupId: $groupId, ')
+          ..write('messageId: $messageId, ')
+          ..write('senderId: $senderId, ')
+          ..write('type: $type, ')
+          ..write('content: $content, ')
+          ..write('mediaId: $mediaId, ')
+          ..write('additionalMessageData: $additionalMessageData, ')
+          ..write('mediaStored: $mediaStored, ')
+          ..write('mediaReopened: $mediaReopened, ')
+          ..write('downloadToken: $downloadToken, ')
+          ..write('quotesMessageId: $quotesMessageId, ')
+          ..write('isDeletedFromSender: $isDeletedFromSender, ')
+          ..write('openedAt: $openedAt, ')
+          ..write('openedByAll: $openedByAll, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('modifiedAt: $modifiedAt, ')
+          ..write('ackByUser: $ackByUser, ')
+          ..write('ackByServer: $ackByServer')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    groupId,
+    messageId,
+    senderId,
+    type,
+    content,
+    mediaId,
+    $driftBlobEquality.hash(additionalMessageData),
+    mediaStored,
+    mediaReopened,
+    $driftBlobEquality.hash(downloadToken),
+    quotesMessageId,
+    isDeletedFromSender,
+    openedAt,
+    openedByAll,
+    createdAt,
+    modifiedAt,
+    ackByUser,
+    ackByServer,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is MessagesData &&
+          other.groupId == this.groupId &&
+          other.messageId == this.messageId &&
+          other.senderId == this.senderId &&
+          other.type == this.type &&
+          other.content == this.content &&
+          other.mediaId == this.mediaId &&
+          $driftBlobEquality.equals(
+            other.additionalMessageData,
+            this.additionalMessageData,
+          ) &&
+          other.mediaStored == this.mediaStored &&
+          other.mediaReopened == this.mediaReopened &&
+          $driftBlobEquality.equals(other.downloadToken, this.downloadToken) &&
+          other.quotesMessageId == this.quotesMessageId &&
+          other.isDeletedFromSender == this.isDeletedFromSender &&
+          other.openedAt == this.openedAt &&
+          other.openedByAll == this.openedByAll &&
+          other.createdAt == this.createdAt &&
+          other.modifiedAt == this.modifiedAt &&
+          other.ackByUser == this.ackByUser &&
+          other.ackByServer == this.ackByServer);
+}
+
+class MessagesCompanion extends UpdateCompanion<MessagesData> {
+  final Value<String> groupId;
+  final Value<String> messageId;
+  final Value<int?> senderId;
+  final Value<String> type;
+  final Value<String?> content;
+  final Value<String?> mediaId;
+  final Value<i2.Uint8List?> additionalMessageData;
+  final Value<int> mediaStored;
+  final Value<int> mediaReopened;
+  final Value<i2.Uint8List?> downloadToken;
+  final Value<String?> quotesMessageId;
+  final Value<int> isDeletedFromSender;
+  final Value<int?> openedAt;
+  final Value<int?> openedByAll;
+  final Value<int> createdAt;
+  final Value<int?> modifiedAt;
+  final Value<int?> ackByUser;
+  final Value<int?> ackByServer;
+  final Value<int> rowid;
+  const MessagesCompanion({
+    this.groupId = const Value.absent(),
+    this.messageId = const Value.absent(),
+    this.senderId = const Value.absent(),
+    this.type = const Value.absent(),
+    this.content = const Value.absent(),
+    this.mediaId = const Value.absent(),
+    this.additionalMessageData = const Value.absent(),
+    this.mediaStored = const Value.absent(),
+    this.mediaReopened = const Value.absent(),
+    this.downloadToken = const Value.absent(),
+    this.quotesMessageId = const Value.absent(),
+    this.isDeletedFromSender = const Value.absent(),
+    this.openedAt = const Value.absent(),
+    this.openedByAll = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.modifiedAt = const Value.absent(),
+    this.ackByUser = const Value.absent(),
+    this.ackByServer = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  MessagesCompanion.insert({
+    required String groupId,
+    required String messageId,
+    this.senderId = const Value.absent(),
+    required String type,
+    this.content = const Value.absent(),
+    this.mediaId = const Value.absent(),
+    this.additionalMessageData = const Value.absent(),
+    this.mediaStored = const Value.absent(),
+    this.mediaReopened = const Value.absent(),
+    this.downloadToken = const Value.absent(),
+    this.quotesMessageId = const Value.absent(),
+    this.isDeletedFromSender = const Value.absent(),
+    this.openedAt = const Value.absent(),
+    this.openedByAll = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.modifiedAt = const Value.absent(),
+    this.ackByUser = const Value.absent(),
+    this.ackByServer = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : groupId = Value(groupId),
+       messageId = Value(messageId),
+       type = Value(type);
+  static Insertable<MessagesData> custom({
+    Expression<String>? groupId,
+    Expression<String>? messageId,
+    Expression<int>? senderId,
+    Expression<String>? type,
+    Expression<String>? content,
+    Expression<String>? mediaId,
+    Expression<i2.Uint8List>? additionalMessageData,
+    Expression<int>? mediaStored,
+    Expression<int>? mediaReopened,
+    Expression<i2.Uint8List>? downloadToken,
+    Expression<String>? quotesMessageId,
+    Expression<int>? isDeletedFromSender,
+    Expression<int>? openedAt,
+    Expression<int>? openedByAll,
+    Expression<int>? createdAt,
+    Expression<int>? modifiedAt,
+    Expression<int>? ackByUser,
+    Expression<int>? ackByServer,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (groupId != null) 'group_id': groupId,
+      if (messageId != null) 'message_id': messageId,
+      if (senderId != null) 'sender_id': senderId,
+      if (type != null) 'type': type,
+      if (content != null) 'content': content,
+      if (mediaId != null) 'media_id': mediaId,
+      if (additionalMessageData != null)
+        'additional_message_data': additionalMessageData,
+      if (mediaStored != null) 'media_stored': mediaStored,
+      if (mediaReopened != null) 'media_reopened': mediaReopened,
+      if (downloadToken != null) 'download_token': downloadToken,
+      if (quotesMessageId != null) 'quotes_message_id': quotesMessageId,
+      if (isDeletedFromSender != null)
+        'is_deleted_from_sender': isDeletedFromSender,
+      if (openedAt != null) 'opened_at': openedAt,
+      if (openedByAll != null) 'opened_by_all': openedByAll,
+      if (createdAt != null) 'created_at': createdAt,
+      if (modifiedAt != null) 'modified_at': modifiedAt,
+      if (ackByUser != null) 'ack_by_user': ackByUser,
+      if (ackByServer != null) 'ack_by_server': ackByServer,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  MessagesCompanion copyWith({
+    Value<String>? groupId,
+    Value<String>? messageId,
+    Value<int?>? senderId,
+    Value<String>? type,
+    Value<String?>? content,
+    Value<String?>? mediaId,
+    Value<i2.Uint8List?>? additionalMessageData,
+    Value<int>? mediaStored,
+    Value<int>? mediaReopened,
+    Value<i2.Uint8List?>? downloadToken,
+    Value<String?>? quotesMessageId,
+    Value<int>? isDeletedFromSender,
+    Value<int?>? openedAt,
+    Value<int?>? openedByAll,
+    Value<int>? createdAt,
+    Value<int?>? modifiedAt,
+    Value<int?>? ackByUser,
+    Value<int?>? ackByServer,
+    Value<int>? rowid,
+  }) {
+    return MessagesCompanion(
+      groupId: groupId ?? this.groupId,
+      messageId: messageId ?? this.messageId,
+      senderId: senderId ?? this.senderId,
+      type: type ?? this.type,
+      content: content ?? this.content,
+      mediaId: mediaId ?? this.mediaId,
+      additionalMessageData:
+          additionalMessageData ?? this.additionalMessageData,
+      mediaStored: mediaStored ?? this.mediaStored,
+      mediaReopened: mediaReopened ?? this.mediaReopened,
+      downloadToken: downloadToken ?? this.downloadToken,
+      quotesMessageId: quotesMessageId ?? this.quotesMessageId,
+      isDeletedFromSender: isDeletedFromSender ?? this.isDeletedFromSender,
+      openedAt: openedAt ?? this.openedAt,
+      openedByAll: openedByAll ?? this.openedByAll,
+      createdAt: createdAt ?? this.createdAt,
+      modifiedAt: modifiedAt ?? this.modifiedAt,
+      ackByUser: ackByUser ?? this.ackByUser,
+      ackByServer: ackByServer ?? this.ackByServer,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (groupId.present) {
+      map['group_id'] = Variable<String>(groupId.value);
+    }
+    if (messageId.present) {
+      map['message_id'] = Variable<String>(messageId.value);
+    }
+    if (senderId.present) {
+      map['sender_id'] = Variable<int>(senderId.value);
+    }
+    if (type.present) {
+      map['type'] = Variable<String>(type.value);
+    }
+    if (content.present) {
+      map['content'] = Variable<String>(content.value);
+    }
+    if (mediaId.present) {
+      map['media_id'] = Variable<String>(mediaId.value);
+    }
+    if (additionalMessageData.present) {
+      map['additional_message_data'] = Variable<i2.Uint8List>(
+        additionalMessageData.value,
+      );
+    }
+    if (mediaStored.present) {
+      map['media_stored'] = Variable<int>(mediaStored.value);
+    }
+    if (mediaReopened.present) {
+      map['media_reopened'] = Variable<int>(mediaReopened.value);
+    }
+    if (downloadToken.present) {
+      map['download_token'] = Variable<i2.Uint8List>(downloadToken.value);
+    }
+    if (quotesMessageId.present) {
+      map['quotes_message_id'] = Variable<String>(quotesMessageId.value);
+    }
+    if (isDeletedFromSender.present) {
+      map['is_deleted_from_sender'] = Variable<int>(isDeletedFromSender.value);
+    }
+    if (openedAt.present) {
+      map['opened_at'] = Variable<int>(openedAt.value);
+    }
+    if (openedByAll.present) {
+      map['opened_by_all'] = Variable<int>(openedByAll.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (modifiedAt.present) {
+      map['modified_at'] = Variable<int>(modifiedAt.value);
+    }
+    if (ackByUser.present) {
+      map['ack_by_user'] = Variable<int>(ackByUser.value);
+    }
+    if (ackByServer.present) {
+      map['ack_by_server'] = Variable<int>(ackByServer.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MessagesCompanion(')
+          ..write('groupId: $groupId, ')
+          ..write('messageId: $messageId, ')
+          ..write('senderId: $senderId, ')
+          ..write('type: $type, ')
+          ..write('content: $content, ')
+          ..write('mediaId: $mediaId, ')
+          ..write('additionalMessageData: $additionalMessageData, ')
+          ..write('mediaStored: $mediaStored, ')
+          ..write('mediaReopened: $mediaReopened, ')
+          ..write('downloadToken: $downloadToken, ')
+          ..write('quotesMessageId: $quotesMessageId, ')
+          ..write('isDeletedFromSender: $isDeletedFromSender, ')
+          ..write('openedAt: $openedAt, ')
+          ..write('openedByAll: $openedByAll, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('modifiedAt: $modifiedAt, ')
+          ..write('ackByUser: $ackByUser, ')
+          ..write('ackByServer: $ackByServer, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class MessageHistories extends Table
+    with TableInfo<MessageHistories, MessageHistoriesData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  MessageHistories(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> id = GeneratedColumn<int>(
+    'id',
+    aliasedName,
+    false,
+    hasAutoIncrement: true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL PRIMARY KEY AUTOINCREMENT',
+  );
+  late final GeneratedColumn<String> messageId = GeneratedColumn<String>(
+    'message_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES messages(message_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<String> content = GeneratedColumn<String>(
+    'content',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    id,
+    messageId,
+    contactId,
+    content,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'message_histories';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {id};
+  @override
+  MessageHistoriesData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return MessageHistoriesData(
+      id: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}id'],
+      )!,
+      messageId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}message_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      ),
+      content: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}content'],
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  MessageHistories createAlias(String alias) {
+    return MessageHistories(attachedDatabase, alias);
+  }
+
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class MessageHistoriesData extends DataClass
+    implements Insertable<MessageHistoriesData> {
+  final int id;
+  final String messageId;
+  final int? contactId;
+  final String? content;
+  final int createdAt;
+  const MessageHistoriesData({
+    required this.id,
+    required this.messageId,
+    this.contactId,
+    this.content,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['id'] = Variable<int>(id);
+    map['message_id'] = Variable<String>(messageId);
+    if (!nullToAbsent || contactId != null) {
+      map['contact_id'] = Variable<int>(contactId);
+    }
+    if (!nullToAbsent || content != null) {
+      map['content'] = Variable<String>(content);
+    }
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  MessageHistoriesCompanion toCompanion(bool nullToAbsent) {
+    return MessageHistoriesCompanion(
+      id: Value(id),
+      messageId: Value(messageId),
+      contactId: contactId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(contactId),
+      content: content == null && nullToAbsent
+          ? const Value.absent()
+          : Value(content),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory MessageHistoriesData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return MessageHistoriesData(
+      id: serializer.fromJson<int>(json['id']),
+      messageId: serializer.fromJson<String>(json['messageId']),
+      contactId: serializer.fromJson<int?>(json['contactId']),
+      content: serializer.fromJson<String?>(json['content']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<int>(id),
+      'messageId': serializer.toJson<String>(messageId),
+      'contactId': serializer.toJson<int?>(contactId),
+      'content': serializer.toJson<String?>(content),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  MessageHistoriesData copyWith({
+    int? id,
+    String? messageId,
+    Value<int?> contactId = const Value.absent(),
+    Value<String?> content = const Value.absent(),
+    int? createdAt,
+  }) => MessageHistoriesData(
+    id: id ?? this.id,
+    messageId: messageId ?? this.messageId,
+    contactId: contactId.present ? contactId.value : this.contactId,
+    content: content.present ? content.value : this.content,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  MessageHistoriesData copyWithCompanion(MessageHistoriesCompanion data) {
+    return MessageHistoriesData(
+      id: data.id.present ? data.id.value : this.id,
+      messageId: data.messageId.present ? data.messageId.value : this.messageId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      content: data.content.present ? data.content.value : this.content,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MessageHistoriesData(')
+          ..write('id: $id, ')
+          ..write('messageId: $messageId, ')
+          ..write('contactId: $contactId, ')
+          ..write('content: $content, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(id, messageId, contactId, content, createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is MessageHistoriesData &&
+          other.id == this.id &&
+          other.messageId == this.messageId &&
+          other.contactId == this.contactId &&
+          other.content == this.content &&
+          other.createdAt == this.createdAt);
+}
+
+class MessageHistoriesCompanion extends UpdateCompanion<MessageHistoriesData> {
+  final Value<int> id;
+  final Value<String> messageId;
+  final Value<int?> contactId;
+  final Value<String?> content;
+  final Value<int> createdAt;
+  const MessageHistoriesCompanion({
+    this.id = const Value.absent(),
+    this.messageId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.content = const Value.absent(),
+    this.createdAt = const Value.absent(),
+  });
+  MessageHistoriesCompanion.insert({
+    this.id = const Value.absent(),
+    required String messageId,
+    this.contactId = const Value.absent(),
+    this.content = const Value.absent(),
+    this.createdAt = const Value.absent(),
+  }) : messageId = Value(messageId);
+  static Insertable<MessageHistoriesData> custom({
+    Expression<int>? id,
+    Expression<String>? messageId,
+    Expression<int>? contactId,
+    Expression<String>? content,
+    Expression<int>? createdAt,
+  }) {
+    return RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (messageId != null) 'message_id': messageId,
+      if (contactId != null) 'contact_id': contactId,
+      if (content != null) 'content': content,
+      if (createdAt != null) 'created_at': createdAt,
+    });
+  }
+
+  MessageHistoriesCompanion copyWith({
+    Value<int>? id,
+    Value<String>? messageId,
+    Value<int?>? contactId,
+    Value<String?>? content,
+    Value<int>? createdAt,
+  }) {
+    return MessageHistoriesCompanion(
+      id: id ?? this.id,
+      messageId: messageId ?? this.messageId,
+      contactId: contactId ?? this.contactId,
+      content: content ?? this.content,
+      createdAt: createdAt ?? this.createdAt,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<int>(id.value);
+    }
+    if (messageId.present) {
+      map['message_id'] = Variable<String>(messageId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (content.present) {
+      map['content'] = Variable<String>(content.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MessageHistoriesCompanion(')
+          ..write('id: $id, ')
+          ..write('messageId: $messageId, ')
+          ..write('contactId: $contactId, ')
+          ..write('content: $content, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class Reactions extends Table with TableInfo<Reactions, ReactionsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  Reactions(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> messageId = GeneratedColumn<String>(
+    'message_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES messages(message_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<String> emoji = GeneratedColumn<String>(
+    'emoji',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> senderId = GeneratedColumn<int>(
+    'sender_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [messageId, emoji, senderId, createdAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'reactions';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {messageId, senderId, emoji};
+  @override
+  ReactionsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return ReactionsData(
+      messageId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}message_id'],
+      )!,
+      emoji: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}emoji'],
+      )!,
+      senderId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}sender_id'],
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  Reactions createAlias(String alias) {
+    return Reactions(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const [
+    'PRIMARY KEY(message_id, sender_id, emoji)',
+  ];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class ReactionsData extends DataClass implements Insertable<ReactionsData> {
+  final String messageId;
+  final String emoji;
+  final int? senderId;
+  final int createdAt;
+  const ReactionsData({
+    required this.messageId,
+    required this.emoji,
+    this.senderId,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['message_id'] = Variable<String>(messageId);
+    map['emoji'] = Variable<String>(emoji);
+    if (!nullToAbsent || senderId != null) {
+      map['sender_id'] = Variable<int>(senderId);
+    }
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  ReactionsCompanion toCompanion(bool nullToAbsent) {
+    return ReactionsCompanion(
+      messageId: Value(messageId),
+      emoji: Value(emoji),
+      senderId: senderId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(senderId),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory ReactionsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return ReactionsData(
+      messageId: serializer.fromJson<String>(json['messageId']),
+      emoji: serializer.fromJson<String>(json['emoji']),
+      senderId: serializer.fromJson<int?>(json['senderId']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'messageId': serializer.toJson<String>(messageId),
+      'emoji': serializer.toJson<String>(emoji),
+      'senderId': serializer.toJson<int?>(senderId),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  ReactionsData copyWith({
+    String? messageId,
+    String? emoji,
+    Value<int?> senderId = const Value.absent(),
+    int? createdAt,
+  }) => ReactionsData(
+    messageId: messageId ?? this.messageId,
+    emoji: emoji ?? this.emoji,
+    senderId: senderId.present ? senderId.value : this.senderId,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  ReactionsData copyWithCompanion(ReactionsCompanion data) {
+    return ReactionsData(
+      messageId: data.messageId.present ? data.messageId.value : this.messageId,
+      emoji: data.emoji.present ? data.emoji.value : this.emoji,
+      senderId: data.senderId.present ? data.senderId.value : this.senderId,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ReactionsData(')
+          ..write('messageId: $messageId, ')
+          ..write('emoji: $emoji, ')
+          ..write('senderId: $senderId, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(messageId, emoji, senderId, createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is ReactionsData &&
+          other.messageId == this.messageId &&
+          other.emoji == this.emoji &&
+          other.senderId == this.senderId &&
+          other.createdAt == this.createdAt);
+}
+
+class ReactionsCompanion extends UpdateCompanion<ReactionsData> {
+  final Value<String> messageId;
+  final Value<String> emoji;
+  final Value<int?> senderId;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const ReactionsCompanion({
+    this.messageId = const Value.absent(),
+    this.emoji = const Value.absent(),
+    this.senderId = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  ReactionsCompanion.insert({
+    required String messageId,
+    required String emoji,
+    this.senderId = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : messageId = Value(messageId),
+       emoji = Value(emoji);
+  static Insertable<ReactionsData> custom({
+    Expression<String>? messageId,
+    Expression<String>? emoji,
+    Expression<int>? senderId,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (messageId != null) 'message_id': messageId,
+      if (emoji != null) 'emoji': emoji,
+      if (senderId != null) 'sender_id': senderId,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  ReactionsCompanion copyWith({
+    Value<String>? messageId,
+    Value<String>? emoji,
+    Value<int?>? senderId,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return ReactionsCompanion(
+      messageId: messageId ?? this.messageId,
+      emoji: emoji ?? this.emoji,
+      senderId: senderId ?? this.senderId,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (messageId.present) {
+      map['message_id'] = Variable<String>(messageId.value);
+    }
+    if (emoji.present) {
+      map['emoji'] = Variable<String>(emoji.value);
+    }
+    if (senderId.present) {
+      map['sender_id'] = Variable<int>(senderId.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ReactionsCompanion(')
+          ..write('messageId: $messageId, ')
+          ..write('emoji: $emoji, ')
+          ..write('senderId: $senderId, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class GroupMembers extends Table
+    with TableInfo<GroupMembers, GroupMembersData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  GroupMembers(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> groupId = GeneratedColumn<String>(
+    'group_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES "groups"(group_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL REFERENCES contacts(user_id)',
+  );
+  late final GeneratedColumn<String> memberState = GeneratedColumn<String>(
+    'member_state',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> groupPublicKey =
+      GeneratedColumn<i2.Uint8List>(
+        'group_public_key',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> lastChatOpened = GeneratedColumn<int>(
+    'last_chat_opened',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> lastTypeIndicator = GeneratedColumn<int>(
+    'last_type_indicator',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> lastMessage = GeneratedColumn<int>(
+    'last_message',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    groupId,
+    contactId,
+    memberState,
+    groupPublicKey,
+    lastChatOpened,
+    lastTypeIndicator,
+    lastMessage,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'group_members';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {groupId, contactId};
+  @override
+  GroupMembersData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return GroupMembersData(
+      groupId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}group_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      )!,
+      memberState: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}member_state'],
+      ),
+      groupPublicKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}group_public_key'],
+      ),
+      lastChatOpened: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_chat_opened'],
+      ),
+      lastTypeIndicator: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_type_indicator'],
+      ),
+      lastMessage: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_message'],
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  GroupMembers createAlias(String alias) {
+    return GroupMembers(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const [
+    'PRIMARY KEY(group_id, contact_id)',
+  ];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class GroupMembersData extends DataClass
+    implements Insertable<GroupMembersData> {
+  final String groupId;
+  final int contactId;
+  final String? memberState;
+  final i2.Uint8List? groupPublicKey;
+  final int? lastChatOpened;
+  final int? lastTypeIndicator;
+  final int? lastMessage;
+  final int createdAt;
+  const GroupMembersData({
+    required this.groupId,
+    required this.contactId,
+    this.memberState,
+    this.groupPublicKey,
+    this.lastChatOpened,
+    this.lastTypeIndicator,
+    this.lastMessage,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['group_id'] = Variable<String>(groupId);
+    map['contact_id'] = Variable<int>(contactId);
+    if (!nullToAbsent || memberState != null) {
+      map['member_state'] = Variable<String>(memberState);
+    }
+    if (!nullToAbsent || groupPublicKey != null) {
+      map['group_public_key'] = Variable<i2.Uint8List>(groupPublicKey);
+    }
+    if (!nullToAbsent || lastChatOpened != null) {
+      map['last_chat_opened'] = Variable<int>(lastChatOpened);
+    }
+    if (!nullToAbsent || lastTypeIndicator != null) {
+      map['last_type_indicator'] = Variable<int>(lastTypeIndicator);
+    }
+    if (!nullToAbsent || lastMessage != null) {
+      map['last_message'] = Variable<int>(lastMessage);
+    }
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  GroupMembersCompanion toCompanion(bool nullToAbsent) {
+    return GroupMembersCompanion(
+      groupId: Value(groupId),
+      contactId: Value(contactId),
+      memberState: memberState == null && nullToAbsent
+          ? const Value.absent()
+          : Value(memberState),
+      groupPublicKey: groupPublicKey == null && nullToAbsent
+          ? const Value.absent()
+          : Value(groupPublicKey),
+      lastChatOpened: lastChatOpened == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastChatOpened),
+      lastTypeIndicator: lastTypeIndicator == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastTypeIndicator),
+      lastMessage: lastMessage == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastMessage),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory GroupMembersData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return GroupMembersData(
+      groupId: serializer.fromJson<String>(json['groupId']),
+      contactId: serializer.fromJson<int>(json['contactId']),
+      memberState: serializer.fromJson<String?>(json['memberState']),
+      groupPublicKey: serializer.fromJson<i2.Uint8List?>(
+        json['groupPublicKey'],
+      ),
+      lastChatOpened: serializer.fromJson<int?>(json['lastChatOpened']),
+      lastTypeIndicator: serializer.fromJson<int?>(json['lastTypeIndicator']),
+      lastMessage: serializer.fromJson<int?>(json['lastMessage']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'groupId': serializer.toJson<String>(groupId),
+      'contactId': serializer.toJson<int>(contactId),
+      'memberState': serializer.toJson<String?>(memberState),
+      'groupPublicKey': serializer.toJson<i2.Uint8List?>(groupPublicKey),
+      'lastChatOpened': serializer.toJson<int?>(lastChatOpened),
+      'lastTypeIndicator': serializer.toJson<int?>(lastTypeIndicator),
+      'lastMessage': serializer.toJson<int?>(lastMessage),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  GroupMembersData copyWith({
+    String? groupId,
+    int? contactId,
+    Value<String?> memberState = const Value.absent(),
+    Value<i2.Uint8List?> groupPublicKey = const Value.absent(),
+    Value<int?> lastChatOpened = const Value.absent(),
+    Value<int?> lastTypeIndicator = const Value.absent(),
+    Value<int?> lastMessage = const Value.absent(),
+    int? createdAt,
+  }) => GroupMembersData(
+    groupId: groupId ?? this.groupId,
+    contactId: contactId ?? this.contactId,
+    memberState: memberState.present ? memberState.value : this.memberState,
+    groupPublicKey: groupPublicKey.present
+        ? groupPublicKey.value
+        : this.groupPublicKey,
+    lastChatOpened: lastChatOpened.present
+        ? lastChatOpened.value
+        : this.lastChatOpened,
+    lastTypeIndicator: lastTypeIndicator.present
+        ? lastTypeIndicator.value
+        : this.lastTypeIndicator,
+    lastMessage: lastMessage.present ? lastMessage.value : this.lastMessage,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  GroupMembersData copyWithCompanion(GroupMembersCompanion data) {
+    return GroupMembersData(
+      groupId: data.groupId.present ? data.groupId.value : this.groupId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      memberState: data.memberState.present
+          ? data.memberState.value
+          : this.memberState,
+      groupPublicKey: data.groupPublicKey.present
+          ? data.groupPublicKey.value
+          : this.groupPublicKey,
+      lastChatOpened: data.lastChatOpened.present
+          ? data.lastChatOpened.value
+          : this.lastChatOpened,
+      lastTypeIndicator: data.lastTypeIndicator.present
+          ? data.lastTypeIndicator.value
+          : this.lastTypeIndicator,
+      lastMessage: data.lastMessage.present
+          ? data.lastMessage.value
+          : this.lastMessage,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('GroupMembersData(')
+          ..write('groupId: $groupId, ')
+          ..write('contactId: $contactId, ')
+          ..write('memberState: $memberState, ')
+          ..write('groupPublicKey: $groupPublicKey, ')
+          ..write('lastChatOpened: $lastChatOpened, ')
+          ..write('lastTypeIndicator: $lastTypeIndicator, ')
+          ..write('lastMessage: $lastMessage, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    groupId,
+    contactId,
+    memberState,
+    $driftBlobEquality.hash(groupPublicKey),
+    lastChatOpened,
+    lastTypeIndicator,
+    lastMessage,
+    createdAt,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is GroupMembersData &&
+          other.groupId == this.groupId &&
+          other.contactId == this.contactId &&
+          other.memberState == this.memberState &&
+          $driftBlobEquality.equals(
+            other.groupPublicKey,
+            this.groupPublicKey,
+          ) &&
+          other.lastChatOpened == this.lastChatOpened &&
+          other.lastTypeIndicator == this.lastTypeIndicator &&
+          other.lastMessage == this.lastMessage &&
+          other.createdAt == this.createdAt);
+}
+
+class GroupMembersCompanion extends UpdateCompanion<GroupMembersData> {
+  final Value<String> groupId;
+  final Value<int> contactId;
+  final Value<String?> memberState;
+  final Value<i2.Uint8List?> groupPublicKey;
+  final Value<int?> lastChatOpened;
+  final Value<int?> lastTypeIndicator;
+  final Value<int?> lastMessage;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const GroupMembersCompanion({
+    this.groupId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.memberState = const Value.absent(),
+    this.groupPublicKey = const Value.absent(),
+    this.lastChatOpened = const Value.absent(),
+    this.lastTypeIndicator = const Value.absent(),
+    this.lastMessage = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  GroupMembersCompanion.insert({
+    required String groupId,
+    required int contactId,
+    this.memberState = const Value.absent(),
+    this.groupPublicKey = const Value.absent(),
+    this.lastChatOpened = const Value.absent(),
+    this.lastTypeIndicator = const Value.absent(),
+    this.lastMessage = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : groupId = Value(groupId),
+       contactId = Value(contactId);
+  static Insertable<GroupMembersData> custom({
+    Expression<String>? groupId,
+    Expression<int>? contactId,
+    Expression<String>? memberState,
+    Expression<i2.Uint8List>? groupPublicKey,
+    Expression<int>? lastChatOpened,
+    Expression<int>? lastTypeIndicator,
+    Expression<int>? lastMessage,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (groupId != null) 'group_id': groupId,
+      if (contactId != null) 'contact_id': contactId,
+      if (memberState != null) 'member_state': memberState,
+      if (groupPublicKey != null) 'group_public_key': groupPublicKey,
+      if (lastChatOpened != null) 'last_chat_opened': lastChatOpened,
+      if (lastTypeIndicator != null) 'last_type_indicator': lastTypeIndicator,
+      if (lastMessage != null) 'last_message': lastMessage,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  GroupMembersCompanion copyWith({
+    Value<String>? groupId,
+    Value<int>? contactId,
+    Value<String?>? memberState,
+    Value<i2.Uint8List?>? groupPublicKey,
+    Value<int?>? lastChatOpened,
+    Value<int?>? lastTypeIndicator,
+    Value<int?>? lastMessage,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return GroupMembersCompanion(
+      groupId: groupId ?? this.groupId,
+      contactId: contactId ?? this.contactId,
+      memberState: memberState ?? this.memberState,
+      groupPublicKey: groupPublicKey ?? this.groupPublicKey,
+      lastChatOpened: lastChatOpened ?? this.lastChatOpened,
+      lastTypeIndicator: lastTypeIndicator ?? this.lastTypeIndicator,
+      lastMessage: lastMessage ?? this.lastMessage,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (groupId.present) {
+      map['group_id'] = Variable<String>(groupId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (memberState.present) {
+      map['member_state'] = Variable<String>(memberState.value);
+    }
+    if (groupPublicKey.present) {
+      map['group_public_key'] = Variable<i2.Uint8List>(groupPublicKey.value);
+    }
+    if (lastChatOpened.present) {
+      map['last_chat_opened'] = Variable<int>(lastChatOpened.value);
+    }
+    if (lastTypeIndicator.present) {
+      map['last_type_indicator'] = Variable<int>(lastTypeIndicator.value);
+    }
+    if (lastMessage.present) {
+      map['last_message'] = Variable<int>(lastMessage.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('GroupMembersCompanion(')
+          ..write('groupId: $groupId, ')
+          ..write('contactId: $contactId, ')
+          ..write('memberState: $memberState, ')
+          ..write('groupPublicKey: $groupPublicKey, ')
+          ..write('lastChatOpened: $lastChatOpened, ')
+          ..write('lastTypeIndicator: $lastTypeIndicator, ')
+          ..write('lastMessage: $lastMessage, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class Receipts extends Table with TableInfo<Receipts, ReceiptsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  Receipts(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> receiptId = GeneratedColumn<String>(
+    'receipt_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<String> messageId = GeneratedColumn<String>(
+    'message_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL REFERENCES messages(message_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<i2.Uint8List> message =
+      GeneratedColumn<i2.Uint8List>(
+        'message',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> contactWillSendsReceipt =
+      GeneratedColumn<int>(
+        'contact_will_sends_receipt',
+        aliasedName,
+        false,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints:
+            'NOT NULL DEFAULT 1 CHECK (contact_will_sends_receipt IN (0, 1))',
+        defaultValue: const CustomExpression('1'),
+      );
+  late final GeneratedColumn<int>
+  willBeRetriedByMediaUpload = GeneratedColumn<int>(
+    'will_be_retried_by_media_upload',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT 0 CHECK (will_be_retried_by_media_upload IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> markForRetry = GeneratedColumn<int>(
+    'mark_for_retry',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> markForRetryAfterAccepted =
+      GeneratedColumn<int>(
+        'mark_for_retry_after_accepted',
+        aliasedName,
+        true,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> ackByServerAt = GeneratedColumn<int>(
+    'ack_by_server_at',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> retryCount = GeneratedColumn<int>(
+    'retry_count',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> lastRetry = GeneratedColumn<int>(
+    'last_retry',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    receiptId,
+    contactId,
+    messageId,
+    message,
+    contactWillSendsReceipt,
+    willBeRetriedByMediaUpload,
+    markForRetry,
+    markForRetryAfterAccepted,
+    ackByServerAt,
+    retryCount,
+    lastRetry,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'receipts';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {receiptId};
+  @override
+  ReceiptsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return ReceiptsData(
+      receiptId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}receipt_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      )!,
+      messageId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}message_id'],
+      ),
+      message: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}message'],
+      )!,
+      contactWillSendsReceipt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_will_sends_receipt'],
+      )!,
+      willBeRetriedByMediaUpload: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}will_be_retried_by_media_upload'],
+      )!,
+      markForRetry: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}mark_for_retry'],
+      ),
+      markForRetryAfterAccepted: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}mark_for_retry_after_accepted'],
+      ),
+      ackByServerAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}ack_by_server_at'],
+      ),
+      retryCount: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}retry_count'],
+      )!,
+      lastRetry: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_retry'],
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  Receipts createAlias(String alias) {
+    return Receipts(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(receipt_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class ReceiptsData extends DataClass implements Insertable<ReceiptsData> {
+  final String receiptId;
+  final int contactId;
+  final String? messageId;
+  final i2.Uint8List message;
+  final int contactWillSendsReceipt;
+  final int willBeRetriedByMediaUpload;
+  final int? markForRetry;
+  final int? markForRetryAfterAccepted;
+  final int? ackByServerAt;
+  final int retryCount;
+  final int? lastRetry;
+  final int createdAt;
+  const ReceiptsData({
+    required this.receiptId,
+    required this.contactId,
+    this.messageId,
+    required this.message,
+    required this.contactWillSendsReceipt,
+    required this.willBeRetriedByMediaUpload,
+    this.markForRetry,
+    this.markForRetryAfterAccepted,
+    this.ackByServerAt,
+    required this.retryCount,
+    this.lastRetry,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['receipt_id'] = Variable<String>(receiptId);
+    map['contact_id'] = Variable<int>(contactId);
+    if (!nullToAbsent || messageId != null) {
+      map['message_id'] = Variable<String>(messageId);
+    }
+    map['message'] = Variable<i2.Uint8List>(message);
+    map['contact_will_sends_receipt'] = Variable<int>(contactWillSendsReceipt);
+    map['will_be_retried_by_media_upload'] = Variable<int>(
+      willBeRetriedByMediaUpload,
+    );
+    if (!nullToAbsent || markForRetry != null) {
+      map['mark_for_retry'] = Variable<int>(markForRetry);
+    }
+    if (!nullToAbsent || markForRetryAfterAccepted != null) {
+      map['mark_for_retry_after_accepted'] = Variable<int>(
+        markForRetryAfterAccepted,
+      );
+    }
+    if (!nullToAbsent || ackByServerAt != null) {
+      map['ack_by_server_at'] = Variable<int>(ackByServerAt);
+    }
+    map['retry_count'] = Variable<int>(retryCount);
+    if (!nullToAbsent || lastRetry != null) {
+      map['last_retry'] = Variable<int>(lastRetry);
+    }
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  ReceiptsCompanion toCompanion(bool nullToAbsent) {
+    return ReceiptsCompanion(
+      receiptId: Value(receiptId),
+      contactId: Value(contactId),
+      messageId: messageId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(messageId),
+      message: Value(message),
+      contactWillSendsReceipt: Value(contactWillSendsReceipt),
+      willBeRetriedByMediaUpload: Value(willBeRetriedByMediaUpload),
+      markForRetry: markForRetry == null && nullToAbsent
+          ? const Value.absent()
+          : Value(markForRetry),
+      markForRetryAfterAccepted:
+          markForRetryAfterAccepted == null && nullToAbsent
+          ? const Value.absent()
+          : Value(markForRetryAfterAccepted),
+      ackByServerAt: ackByServerAt == null && nullToAbsent
+          ? const Value.absent()
+          : Value(ackByServerAt),
+      retryCount: Value(retryCount),
+      lastRetry: lastRetry == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastRetry),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory ReceiptsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return ReceiptsData(
+      receiptId: serializer.fromJson<String>(json['receiptId']),
+      contactId: serializer.fromJson<int>(json['contactId']),
+      messageId: serializer.fromJson<String?>(json['messageId']),
+      message: serializer.fromJson<i2.Uint8List>(json['message']),
+      contactWillSendsReceipt: serializer.fromJson<int>(
+        json['contactWillSendsReceipt'],
+      ),
+      willBeRetriedByMediaUpload: serializer.fromJson<int>(
+        json['willBeRetriedByMediaUpload'],
+      ),
+      markForRetry: serializer.fromJson<int?>(json['markForRetry']),
+      markForRetryAfterAccepted: serializer.fromJson<int?>(
+        json['markForRetryAfterAccepted'],
+      ),
+      ackByServerAt: serializer.fromJson<int?>(json['ackByServerAt']),
+      retryCount: serializer.fromJson<int>(json['retryCount']),
+      lastRetry: serializer.fromJson<int?>(json['lastRetry']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'receiptId': serializer.toJson<String>(receiptId),
+      'contactId': serializer.toJson<int>(contactId),
+      'messageId': serializer.toJson<String?>(messageId),
+      'message': serializer.toJson<i2.Uint8List>(message),
+      'contactWillSendsReceipt': serializer.toJson<int>(
+        contactWillSendsReceipt,
+      ),
+      'willBeRetriedByMediaUpload': serializer.toJson<int>(
+        willBeRetriedByMediaUpload,
+      ),
+      'markForRetry': serializer.toJson<int?>(markForRetry),
+      'markForRetryAfterAccepted': serializer.toJson<int?>(
+        markForRetryAfterAccepted,
+      ),
+      'ackByServerAt': serializer.toJson<int?>(ackByServerAt),
+      'retryCount': serializer.toJson<int>(retryCount),
+      'lastRetry': serializer.toJson<int?>(lastRetry),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  ReceiptsData copyWith({
+    String? receiptId,
+    int? contactId,
+    Value<String?> messageId = const Value.absent(),
+    i2.Uint8List? message,
+    int? contactWillSendsReceipt,
+    int? willBeRetriedByMediaUpload,
+    Value<int?> markForRetry = const Value.absent(),
+    Value<int?> markForRetryAfterAccepted = const Value.absent(),
+    Value<int?> ackByServerAt = const Value.absent(),
+    int? retryCount,
+    Value<int?> lastRetry = const Value.absent(),
+    int? createdAt,
+  }) => ReceiptsData(
+    receiptId: receiptId ?? this.receiptId,
+    contactId: contactId ?? this.contactId,
+    messageId: messageId.present ? messageId.value : this.messageId,
+    message: message ?? this.message,
+    contactWillSendsReceipt:
+        contactWillSendsReceipt ?? this.contactWillSendsReceipt,
+    willBeRetriedByMediaUpload:
+        willBeRetriedByMediaUpload ?? this.willBeRetriedByMediaUpload,
+    markForRetry: markForRetry.present ? markForRetry.value : this.markForRetry,
+    markForRetryAfterAccepted: markForRetryAfterAccepted.present
+        ? markForRetryAfterAccepted.value
+        : this.markForRetryAfterAccepted,
+    ackByServerAt: ackByServerAt.present
+        ? ackByServerAt.value
+        : this.ackByServerAt,
+    retryCount: retryCount ?? this.retryCount,
+    lastRetry: lastRetry.present ? lastRetry.value : this.lastRetry,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  ReceiptsData copyWithCompanion(ReceiptsCompanion data) {
+    return ReceiptsData(
+      receiptId: data.receiptId.present ? data.receiptId.value : this.receiptId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      messageId: data.messageId.present ? data.messageId.value : this.messageId,
+      message: data.message.present ? data.message.value : this.message,
+      contactWillSendsReceipt: data.contactWillSendsReceipt.present
+          ? data.contactWillSendsReceipt.value
+          : this.contactWillSendsReceipt,
+      willBeRetriedByMediaUpload: data.willBeRetriedByMediaUpload.present
+          ? data.willBeRetriedByMediaUpload.value
+          : this.willBeRetriedByMediaUpload,
+      markForRetry: data.markForRetry.present
+          ? data.markForRetry.value
+          : this.markForRetry,
+      markForRetryAfterAccepted: data.markForRetryAfterAccepted.present
+          ? data.markForRetryAfterAccepted.value
+          : this.markForRetryAfterAccepted,
+      ackByServerAt: data.ackByServerAt.present
+          ? data.ackByServerAt.value
+          : this.ackByServerAt,
+      retryCount: data.retryCount.present
+          ? data.retryCount.value
+          : this.retryCount,
+      lastRetry: data.lastRetry.present ? data.lastRetry.value : this.lastRetry,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ReceiptsData(')
+          ..write('receiptId: $receiptId, ')
+          ..write('contactId: $contactId, ')
+          ..write('messageId: $messageId, ')
+          ..write('message: $message, ')
+          ..write('contactWillSendsReceipt: $contactWillSendsReceipt, ')
+          ..write('willBeRetriedByMediaUpload: $willBeRetriedByMediaUpload, ')
+          ..write('markForRetry: $markForRetry, ')
+          ..write('markForRetryAfterAccepted: $markForRetryAfterAccepted, ')
+          ..write('ackByServerAt: $ackByServerAt, ')
+          ..write('retryCount: $retryCount, ')
+          ..write('lastRetry: $lastRetry, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    receiptId,
+    contactId,
+    messageId,
+    $driftBlobEquality.hash(message),
+    contactWillSendsReceipt,
+    willBeRetriedByMediaUpload,
+    markForRetry,
+    markForRetryAfterAccepted,
+    ackByServerAt,
+    retryCount,
+    lastRetry,
+    createdAt,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is ReceiptsData &&
+          other.receiptId == this.receiptId &&
+          other.contactId == this.contactId &&
+          other.messageId == this.messageId &&
+          $driftBlobEquality.equals(other.message, this.message) &&
+          other.contactWillSendsReceipt == this.contactWillSendsReceipt &&
+          other.willBeRetriedByMediaUpload == this.willBeRetriedByMediaUpload &&
+          other.markForRetry == this.markForRetry &&
+          other.markForRetryAfterAccepted == this.markForRetryAfterAccepted &&
+          other.ackByServerAt == this.ackByServerAt &&
+          other.retryCount == this.retryCount &&
+          other.lastRetry == this.lastRetry &&
+          other.createdAt == this.createdAt);
+}
+
+class ReceiptsCompanion extends UpdateCompanion<ReceiptsData> {
+  final Value<String> receiptId;
+  final Value<int> contactId;
+  final Value<String?> messageId;
+  final Value<i2.Uint8List> message;
+  final Value<int> contactWillSendsReceipt;
+  final Value<int> willBeRetriedByMediaUpload;
+  final Value<int?> markForRetry;
+  final Value<int?> markForRetryAfterAccepted;
+  final Value<int?> ackByServerAt;
+  final Value<int> retryCount;
+  final Value<int?> lastRetry;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const ReceiptsCompanion({
+    this.receiptId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.messageId = const Value.absent(),
+    this.message = const Value.absent(),
+    this.contactWillSendsReceipt = const Value.absent(),
+    this.willBeRetriedByMediaUpload = const Value.absent(),
+    this.markForRetry = const Value.absent(),
+    this.markForRetryAfterAccepted = const Value.absent(),
+    this.ackByServerAt = const Value.absent(),
+    this.retryCount = const Value.absent(),
+    this.lastRetry = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  ReceiptsCompanion.insert({
+    required String receiptId,
+    required int contactId,
+    this.messageId = const Value.absent(),
+    required i2.Uint8List message,
+    this.contactWillSendsReceipt = const Value.absent(),
+    this.willBeRetriedByMediaUpload = const Value.absent(),
+    this.markForRetry = const Value.absent(),
+    this.markForRetryAfterAccepted = const Value.absent(),
+    this.ackByServerAt = const Value.absent(),
+    this.retryCount = const Value.absent(),
+    this.lastRetry = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : receiptId = Value(receiptId),
+       contactId = Value(contactId),
+       message = Value(message);
+  static Insertable<ReceiptsData> custom({
+    Expression<String>? receiptId,
+    Expression<int>? contactId,
+    Expression<String>? messageId,
+    Expression<i2.Uint8List>? message,
+    Expression<int>? contactWillSendsReceipt,
+    Expression<int>? willBeRetriedByMediaUpload,
+    Expression<int>? markForRetry,
+    Expression<int>? markForRetryAfterAccepted,
+    Expression<int>? ackByServerAt,
+    Expression<int>? retryCount,
+    Expression<int>? lastRetry,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (receiptId != null) 'receipt_id': receiptId,
+      if (contactId != null) 'contact_id': contactId,
+      if (messageId != null) 'message_id': messageId,
+      if (message != null) 'message': message,
+      if (contactWillSendsReceipt != null)
+        'contact_will_sends_receipt': contactWillSendsReceipt,
+      if (willBeRetriedByMediaUpload != null)
+        'will_be_retried_by_media_upload': willBeRetriedByMediaUpload,
+      if (markForRetry != null) 'mark_for_retry': markForRetry,
+      if (markForRetryAfterAccepted != null)
+        'mark_for_retry_after_accepted': markForRetryAfterAccepted,
+      if (ackByServerAt != null) 'ack_by_server_at': ackByServerAt,
+      if (retryCount != null) 'retry_count': retryCount,
+      if (lastRetry != null) 'last_retry': lastRetry,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  ReceiptsCompanion copyWith({
+    Value<String>? receiptId,
+    Value<int>? contactId,
+    Value<String?>? messageId,
+    Value<i2.Uint8List>? message,
+    Value<int>? contactWillSendsReceipt,
+    Value<int>? willBeRetriedByMediaUpload,
+    Value<int?>? markForRetry,
+    Value<int?>? markForRetryAfterAccepted,
+    Value<int?>? ackByServerAt,
+    Value<int>? retryCount,
+    Value<int?>? lastRetry,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return ReceiptsCompanion(
+      receiptId: receiptId ?? this.receiptId,
+      contactId: contactId ?? this.contactId,
+      messageId: messageId ?? this.messageId,
+      message: message ?? this.message,
+      contactWillSendsReceipt:
+          contactWillSendsReceipt ?? this.contactWillSendsReceipt,
+      willBeRetriedByMediaUpload:
+          willBeRetriedByMediaUpload ?? this.willBeRetriedByMediaUpload,
+      markForRetry: markForRetry ?? this.markForRetry,
+      markForRetryAfterAccepted:
+          markForRetryAfterAccepted ?? this.markForRetryAfterAccepted,
+      ackByServerAt: ackByServerAt ?? this.ackByServerAt,
+      retryCount: retryCount ?? this.retryCount,
+      lastRetry: lastRetry ?? this.lastRetry,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (receiptId.present) {
+      map['receipt_id'] = Variable<String>(receiptId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (messageId.present) {
+      map['message_id'] = Variable<String>(messageId.value);
+    }
+    if (message.present) {
+      map['message'] = Variable<i2.Uint8List>(message.value);
+    }
+    if (contactWillSendsReceipt.present) {
+      map['contact_will_sends_receipt'] = Variable<int>(
+        contactWillSendsReceipt.value,
+      );
+    }
+    if (willBeRetriedByMediaUpload.present) {
+      map['will_be_retried_by_media_upload'] = Variable<int>(
+        willBeRetriedByMediaUpload.value,
+      );
+    }
+    if (markForRetry.present) {
+      map['mark_for_retry'] = Variable<int>(markForRetry.value);
+    }
+    if (markForRetryAfterAccepted.present) {
+      map['mark_for_retry_after_accepted'] = Variable<int>(
+        markForRetryAfterAccepted.value,
+      );
+    }
+    if (ackByServerAt.present) {
+      map['ack_by_server_at'] = Variable<int>(ackByServerAt.value);
+    }
+    if (retryCount.present) {
+      map['retry_count'] = Variable<int>(retryCount.value);
+    }
+    if (lastRetry.present) {
+      map['last_retry'] = Variable<int>(lastRetry.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ReceiptsCompanion(')
+          ..write('receiptId: $receiptId, ')
+          ..write('contactId: $contactId, ')
+          ..write('messageId: $messageId, ')
+          ..write('message: $message, ')
+          ..write('contactWillSendsReceipt: $contactWillSendsReceipt, ')
+          ..write('willBeRetriedByMediaUpload: $willBeRetriedByMediaUpload, ')
+          ..write('markForRetry: $markForRetry, ')
+          ..write('markForRetryAfterAccepted: $markForRetryAfterAccepted, ')
+          ..write('ackByServerAt: $ackByServerAt, ')
+          ..write('retryCount: $retryCount, ')
+          ..write('lastRetry: $lastRetry, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class ReceivedReceipts extends Table
+    with TableInfo<ReceivedReceipts, ReceivedReceiptsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  ReceivedReceipts(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> receiptId = GeneratedColumn<String>(
+    'receipt_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [receiptId, createdAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'received_receipts';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {receiptId};
+  @override
+  ReceivedReceiptsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return ReceivedReceiptsData(
+      receiptId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}receipt_id'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  ReceivedReceipts createAlias(String alias) {
+    return ReceivedReceipts(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(receipt_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class ReceivedReceiptsData extends DataClass
+    implements Insertable<ReceivedReceiptsData> {
+  final String receiptId;
+  final int createdAt;
+  const ReceivedReceiptsData({
+    required this.receiptId,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['receipt_id'] = Variable<String>(receiptId);
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  ReceivedReceiptsCompanion toCompanion(bool nullToAbsent) {
+    return ReceivedReceiptsCompanion(
+      receiptId: Value(receiptId),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory ReceivedReceiptsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return ReceivedReceiptsData(
+      receiptId: serializer.fromJson<String>(json['receiptId']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'receiptId': serializer.toJson<String>(receiptId),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  ReceivedReceiptsData copyWith({String? receiptId, int? createdAt}) =>
+      ReceivedReceiptsData(
+        receiptId: receiptId ?? this.receiptId,
+        createdAt: createdAt ?? this.createdAt,
+      );
+  ReceivedReceiptsData copyWithCompanion(ReceivedReceiptsCompanion data) {
+    return ReceivedReceiptsData(
+      receiptId: data.receiptId.present ? data.receiptId.value : this.receiptId,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ReceivedReceiptsData(')
+          ..write('receiptId: $receiptId, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(receiptId, createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is ReceivedReceiptsData &&
+          other.receiptId == this.receiptId &&
+          other.createdAt == this.createdAt);
+}
+
+class ReceivedReceiptsCompanion extends UpdateCompanion<ReceivedReceiptsData> {
+  final Value<String> receiptId;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const ReceivedReceiptsCompanion({
+    this.receiptId = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  ReceivedReceiptsCompanion.insert({
+    required String receiptId,
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : receiptId = Value(receiptId);
+  static Insertable<ReceivedReceiptsData> custom({
+    Expression<String>? receiptId,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (receiptId != null) 'receipt_id': receiptId,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  ReceivedReceiptsCompanion copyWith({
+    Value<String>? receiptId,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return ReceivedReceiptsCompanion(
+      receiptId: receiptId ?? this.receiptId,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (receiptId.present) {
+      map['receipt_id'] = Variable<String>(receiptId.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ReceivedReceiptsCompanion(')
+          ..write('receiptId: $receiptId, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class SignalIdentityKeyStores extends Table
+    with TableInfo<SignalIdentityKeyStores, SignalIdentityKeyStoresData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  SignalIdentityKeyStores(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> deviceId = GeneratedColumn<int>(
+    'device_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> name = GeneratedColumn<String>(
+    'name',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> identityKey =
+      GeneratedColumn<i2.Uint8List>(
+        'identity_key',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    deviceId,
+    name,
+    identityKey,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'signal_identity_key_stores';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {deviceId, name};
+  @override
+  SignalIdentityKeyStoresData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return SignalIdentityKeyStoresData(
+      deviceId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}device_id'],
+      )!,
+      name: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}name'],
+      )!,
+      identityKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}identity_key'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  SignalIdentityKeyStores createAlias(String alias) {
+    return SignalIdentityKeyStores(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(device_id, name)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class SignalIdentityKeyStoresData extends DataClass
+    implements Insertable<SignalIdentityKeyStoresData> {
+  final int deviceId;
+  final String name;
+  final i2.Uint8List identityKey;
+  final int createdAt;
+  const SignalIdentityKeyStoresData({
+    required this.deviceId,
+    required this.name,
+    required this.identityKey,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['device_id'] = Variable<int>(deviceId);
+    map['name'] = Variable<String>(name);
+    map['identity_key'] = Variable<i2.Uint8List>(identityKey);
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  SignalIdentityKeyStoresCompanion toCompanion(bool nullToAbsent) {
+    return SignalIdentityKeyStoresCompanion(
+      deviceId: Value(deviceId),
+      name: Value(name),
+      identityKey: Value(identityKey),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory SignalIdentityKeyStoresData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return SignalIdentityKeyStoresData(
+      deviceId: serializer.fromJson<int>(json['deviceId']),
+      name: serializer.fromJson<String>(json['name']),
+      identityKey: serializer.fromJson<i2.Uint8List>(json['identityKey']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'deviceId': serializer.toJson<int>(deviceId),
+      'name': serializer.toJson<String>(name),
+      'identityKey': serializer.toJson<i2.Uint8List>(identityKey),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  SignalIdentityKeyStoresData copyWith({
+    int? deviceId,
+    String? name,
+    i2.Uint8List? identityKey,
+    int? createdAt,
+  }) => SignalIdentityKeyStoresData(
+    deviceId: deviceId ?? this.deviceId,
+    name: name ?? this.name,
+    identityKey: identityKey ?? this.identityKey,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  SignalIdentityKeyStoresData copyWithCompanion(
+    SignalIdentityKeyStoresCompanion data,
+  ) {
+    return SignalIdentityKeyStoresData(
+      deviceId: data.deviceId.present ? data.deviceId.value : this.deviceId,
+      name: data.name.present ? data.name.value : this.name,
+      identityKey: data.identityKey.present
+          ? data.identityKey.value
+          : this.identityKey,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalIdentityKeyStoresData(')
+          ..write('deviceId: $deviceId, ')
+          ..write('name: $name, ')
+          ..write('identityKey: $identityKey, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    deviceId,
+    name,
+    $driftBlobEquality.hash(identityKey),
+    createdAt,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is SignalIdentityKeyStoresData &&
+          other.deviceId == this.deviceId &&
+          other.name == this.name &&
+          $driftBlobEquality.equals(other.identityKey, this.identityKey) &&
+          other.createdAt == this.createdAt);
+}
+
+class SignalIdentityKeyStoresCompanion
+    extends UpdateCompanion<SignalIdentityKeyStoresData> {
+  final Value<int> deviceId;
+  final Value<String> name;
+  final Value<i2.Uint8List> identityKey;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const SignalIdentityKeyStoresCompanion({
+    this.deviceId = const Value.absent(),
+    this.name = const Value.absent(),
+    this.identityKey = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  SignalIdentityKeyStoresCompanion.insert({
+    required int deviceId,
+    required String name,
+    required i2.Uint8List identityKey,
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : deviceId = Value(deviceId),
+       name = Value(name),
+       identityKey = Value(identityKey);
+  static Insertable<SignalIdentityKeyStoresData> custom({
+    Expression<int>? deviceId,
+    Expression<String>? name,
+    Expression<i2.Uint8List>? identityKey,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (deviceId != null) 'device_id': deviceId,
+      if (name != null) 'name': name,
+      if (identityKey != null) 'identity_key': identityKey,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  SignalIdentityKeyStoresCompanion copyWith({
+    Value<int>? deviceId,
+    Value<String>? name,
+    Value<i2.Uint8List>? identityKey,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return SignalIdentityKeyStoresCompanion(
+      deviceId: deviceId ?? this.deviceId,
+      name: name ?? this.name,
+      identityKey: identityKey ?? this.identityKey,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (deviceId.present) {
+      map['device_id'] = Variable<int>(deviceId.value);
+    }
+    if (name.present) {
+      map['name'] = Variable<String>(name.value);
+    }
+    if (identityKey.present) {
+      map['identity_key'] = Variable<i2.Uint8List>(identityKey.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalIdentityKeyStoresCompanion(')
+          ..write('deviceId: $deviceId, ')
+          ..write('name: $name, ')
+          ..write('identityKey: $identityKey, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class SignalPreKeyStores extends Table
+    with TableInfo<SignalPreKeyStores, SignalPreKeyStoresData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  SignalPreKeyStores(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> preKeyId = GeneratedColumn<int>(
+    'pre_key_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> preKey =
+      GeneratedColumn<i2.Uint8List>(
+        'pre_key',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [preKeyId, preKey, createdAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'signal_pre_key_stores';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {preKeyId};
+  @override
+  SignalPreKeyStoresData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return SignalPreKeyStoresData(
+      preKeyId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}pre_key_id'],
+      )!,
+      preKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}pre_key'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  SignalPreKeyStores createAlias(String alias) {
+    return SignalPreKeyStores(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(pre_key_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class SignalPreKeyStoresData extends DataClass
+    implements Insertable<SignalPreKeyStoresData> {
+  final int preKeyId;
+  final i2.Uint8List preKey;
+  final int createdAt;
+  const SignalPreKeyStoresData({
+    required this.preKeyId,
+    required this.preKey,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['pre_key_id'] = Variable<int>(preKeyId);
+    map['pre_key'] = Variable<i2.Uint8List>(preKey);
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  SignalPreKeyStoresCompanion toCompanion(bool nullToAbsent) {
+    return SignalPreKeyStoresCompanion(
+      preKeyId: Value(preKeyId),
+      preKey: Value(preKey),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory SignalPreKeyStoresData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return SignalPreKeyStoresData(
+      preKeyId: serializer.fromJson<int>(json['preKeyId']),
+      preKey: serializer.fromJson<i2.Uint8List>(json['preKey']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'preKeyId': serializer.toJson<int>(preKeyId),
+      'preKey': serializer.toJson<i2.Uint8List>(preKey),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  SignalPreKeyStoresData copyWith({
+    int? preKeyId,
+    i2.Uint8List? preKey,
+    int? createdAt,
+  }) => SignalPreKeyStoresData(
+    preKeyId: preKeyId ?? this.preKeyId,
+    preKey: preKey ?? this.preKey,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  SignalPreKeyStoresData copyWithCompanion(SignalPreKeyStoresCompanion data) {
+    return SignalPreKeyStoresData(
+      preKeyId: data.preKeyId.present ? data.preKeyId.value : this.preKeyId,
+      preKey: data.preKey.present ? data.preKey.value : this.preKey,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalPreKeyStoresData(')
+          ..write('preKeyId: $preKeyId, ')
+          ..write('preKey: $preKey, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(preKeyId, $driftBlobEquality.hash(preKey), createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is SignalPreKeyStoresData &&
+          other.preKeyId == this.preKeyId &&
+          $driftBlobEquality.equals(other.preKey, this.preKey) &&
+          other.createdAt == this.createdAt);
+}
+
+class SignalPreKeyStoresCompanion
+    extends UpdateCompanion<SignalPreKeyStoresData> {
+  final Value<int> preKeyId;
+  final Value<i2.Uint8List> preKey;
+  final Value<int> createdAt;
+  const SignalPreKeyStoresCompanion({
+    this.preKeyId = const Value.absent(),
+    this.preKey = const Value.absent(),
+    this.createdAt = const Value.absent(),
+  });
+  SignalPreKeyStoresCompanion.insert({
+    this.preKeyId = const Value.absent(),
+    required i2.Uint8List preKey,
+    this.createdAt = const Value.absent(),
+  }) : preKey = Value(preKey);
+  static Insertable<SignalPreKeyStoresData> custom({
+    Expression<int>? preKeyId,
+    Expression<i2.Uint8List>? preKey,
+    Expression<int>? createdAt,
+  }) {
+    return RawValuesInsertable({
+      if (preKeyId != null) 'pre_key_id': preKeyId,
+      if (preKey != null) 'pre_key': preKey,
+      if (createdAt != null) 'created_at': createdAt,
+    });
+  }
+
+  SignalPreKeyStoresCompanion copyWith({
+    Value<int>? preKeyId,
+    Value<i2.Uint8List>? preKey,
+    Value<int>? createdAt,
+  }) {
+    return SignalPreKeyStoresCompanion(
+      preKeyId: preKeyId ?? this.preKeyId,
+      preKey: preKey ?? this.preKey,
+      createdAt: createdAt ?? this.createdAt,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (preKeyId.present) {
+      map['pre_key_id'] = Variable<int>(preKeyId.value);
+    }
+    if (preKey.present) {
+      map['pre_key'] = Variable<i2.Uint8List>(preKey.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalPreKeyStoresCompanion(')
+          ..write('preKeyId: $preKeyId, ')
+          ..write('preKey: $preKey, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class SignalSenderKeyStores extends Table
+    with TableInfo<SignalSenderKeyStores, SignalSenderKeyStoresData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  SignalSenderKeyStores(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> senderKeyName = GeneratedColumn<String>(
+    'sender_key_name',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> senderKey =
+      GeneratedColumn<i2.Uint8List>(
+        'sender_key',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  @override
+  List<GeneratedColumn> get $columns => [senderKeyName, senderKey];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'signal_sender_key_stores';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {senderKeyName};
+  @override
+  SignalSenderKeyStoresData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return SignalSenderKeyStoresData(
+      senderKeyName: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}sender_key_name'],
+      )!,
+      senderKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}sender_key'],
+      )!,
+    );
+  }
+
+  @override
+  SignalSenderKeyStores createAlias(String alias) {
+    return SignalSenderKeyStores(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(sender_key_name)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class SignalSenderKeyStoresData extends DataClass
+    implements Insertable<SignalSenderKeyStoresData> {
+  final String senderKeyName;
+  final i2.Uint8List senderKey;
+  const SignalSenderKeyStoresData({
+    required this.senderKeyName,
+    required this.senderKey,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['sender_key_name'] = Variable<String>(senderKeyName);
+    map['sender_key'] = Variable<i2.Uint8List>(senderKey);
+    return map;
+  }
+
+  SignalSenderKeyStoresCompanion toCompanion(bool nullToAbsent) {
+    return SignalSenderKeyStoresCompanion(
+      senderKeyName: Value(senderKeyName),
+      senderKey: Value(senderKey),
+    );
+  }
+
+  factory SignalSenderKeyStoresData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return SignalSenderKeyStoresData(
+      senderKeyName: serializer.fromJson<String>(json['senderKeyName']),
+      senderKey: serializer.fromJson<i2.Uint8List>(json['senderKey']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'senderKeyName': serializer.toJson<String>(senderKeyName),
+      'senderKey': serializer.toJson<i2.Uint8List>(senderKey),
+    };
+  }
+
+  SignalSenderKeyStoresData copyWith({
+    String? senderKeyName,
+    i2.Uint8List? senderKey,
+  }) => SignalSenderKeyStoresData(
+    senderKeyName: senderKeyName ?? this.senderKeyName,
+    senderKey: senderKey ?? this.senderKey,
+  );
+  SignalSenderKeyStoresData copyWithCompanion(
+    SignalSenderKeyStoresCompanion data,
+  ) {
+    return SignalSenderKeyStoresData(
+      senderKeyName: data.senderKeyName.present
+          ? data.senderKeyName.value
+          : this.senderKeyName,
+      senderKey: data.senderKey.present ? data.senderKey.value : this.senderKey,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalSenderKeyStoresData(')
+          ..write('senderKeyName: $senderKeyName, ')
+          ..write('senderKey: $senderKey')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(senderKeyName, $driftBlobEquality.hash(senderKey));
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is SignalSenderKeyStoresData &&
+          other.senderKeyName == this.senderKeyName &&
+          $driftBlobEquality.equals(other.senderKey, this.senderKey));
+}
+
+class SignalSenderKeyStoresCompanion
+    extends UpdateCompanion<SignalSenderKeyStoresData> {
+  final Value<String> senderKeyName;
+  final Value<i2.Uint8List> senderKey;
+  final Value<int> rowid;
+  const SignalSenderKeyStoresCompanion({
+    this.senderKeyName = const Value.absent(),
+    this.senderKey = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  SignalSenderKeyStoresCompanion.insert({
+    required String senderKeyName,
+    required i2.Uint8List senderKey,
+    this.rowid = const Value.absent(),
+  }) : senderKeyName = Value(senderKeyName),
+       senderKey = Value(senderKey);
+  static Insertable<SignalSenderKeyStoresData> custom({
+    Expression<String>? senderKeyName,
+    Expression<i2.Uint8List>? senderKey,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (senderKeyName != null) 'sender_key_name': senderKeyName,
+      if (senderKey != null) 'sender_key': senderKey,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  SignalSenderKeyStoresCompanion copyWith({
+    Value<String>? senderKeyName,
+    Value<i2.Uint8List>? senderKey,
+    Value<int>? rowid,
+  }) {
+    return SignalSenderKeyStoresCompanion(
+      senderKeyName: senderKeyName ?? this.senderKeyName,
+      senderKey: senderKey ?? this.senderKey,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (senderKeyName.present) {
+      map['sender_key_name'] = Variable<String>(senderKeyName.value);
+    }
+    if (senderKey.present) {
+      map['sender_key'] = Variable<i2.Uint8List>(senderKey.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalSenderKeyStoresCompanion(')
+          ..write('senderKeyName: $senderKeyName, ')
+          ..write('senderKey: $senderKey, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class SignalSessionStores extends Table
+    with TableInfo<SignalSessionStores, SignalSessionStoresData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  SignalSessionStores(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> deviceId = GeneratedColumn<int>(
+    'device_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> name = GeneratedColumn<String>(
+    'name',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> sessionRecord =
+      GeneratedColumn<i2.Uint8List>(
+        'session_record',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    deviceId,
+    name,
+    sessionRecord,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'signal_session_stores';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {deviceId, name};
+  @override
+  SignalSessionStoresData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return SignalSessionStoresData(
+      deviceId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}device_id'],
+      )!,
+      name: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}name'],
+      )!,
+      sessionRecord: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}session_record'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  SignalSessionStores createAlias(String alias) {
+    return SignalSessionStores(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(device_id, name)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class SignalSessionStoresData extends DataClass
+    implements Insertable<SignalSessionStoresData> {
+  final int deviceId;
+  final String name;
+  final i2.Uint8List sessionRecord;
+  final int createdAt;
+  const SignalSessionStoresData({
+    required this.deviceId,
+    required this.name,
+    required this.sessionRecord,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['device_id'] = Variable<int>(deviceId);
+    map['name'] = Variable<String>(name);
+    map['session_record'] = Variable<i2.Uint8List>(sessionRecord);
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  SignalSessionStoresCompanion toCompanion(bool nullToAbsent) {
+    return SignalSessionStoresCompanion(
+      deviceId: Value(deviceId),
+      name: Value(name),
+      sessionRecord: Value(sessionRecord),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory SignalSessionStoresData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return SignalSessionStoresData(
+      deviceId: serializer.fromJson<int>(json['deviceId']),
+      name: serializer.fromJson<String>(json['name']),
+      sessionRecord: serializer.fromJson<i2.Uint8List>(json['sessionRecord']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'deviceId': serializer.toJson<int>(deviceId),
+      'name': serializer.toJson<String>(name),
+      'sessionRecord': serializer.toJson<i2.Uint8List>(sessionRecord),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  SignalSessionStoresData copyWith({
+    int? deviceId,
+    String? name,
+    i2.Uint8List? sessionRecord,
+    int? createdAt,
+  }) => SignalSessionStoresData(
+    deviceId: deviceId ?? this.deviceId,
+    name: name ?? this.name,
+    sessionRecord: sessionRecord ?? this.sessionRecord,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  SignalSessionStoresData copyWithCompanion(SignalSessionStoresCompanion data) {
+    return SignalSessionStoresData(
+      deviceId: data.deviceId.present ? data.deviceId.value : this.deviceId,
+      name: data.name.present ? data.name.value : this.name,
+      sessionRecord: data.sessionRecord.present
+          ? data.sessionRecord.value
+          : this.sessionRecord,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalSessionStoresData(')
+          ..write('deviceId: $deviceId, ')
+          ..write('name: $name, ')
+          ..write('sessionRecord: $sessionRecord, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    deviceId,
+    name,
+    $driftBlobEquality.hash(sessionRecord),
+    createdAt,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is SignalSessionStoresData &&
+          other.deviceId == this.deviceId &&
+          other.name == this.name &&
+          $driftBlobEquality.equals(other.sessionRecord, this.sessionRecord) &&
+          other.createdAt == this.createdAt);
+}
+
+class SignalSessionStoresCompanion
+    extends UpdateCompanion<SignalSessionStoresData> {
+  final Value<int> deviceId;
+  final Value<String> name;
+  final Value<i2.Uint8List> sessionRecord;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const SignalSessionStoresCompanion({
+    this.deviceId = const Value.absent(),
+    this.name = const Value.absent(),
+    this.sessionRecord = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  SignalSessionStoresCompanion.insert({
+    required int deviceId,
+    required String name,
+    required i2.Uint8List sessionRecord,
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : deviceId = Value(deviceId),
+       name = Value(name),
+       sessionRecord = Value(sessionRecord);
+  static Insertable<SignalSessionStoresData> custom({
+    Expression<int>? deviceId,
+    Expression<String>? name,
+    Expression<i2.Uint8List>? sessionRecord,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (deviceId != null) 'device_id': deviceId,
+      if (name != null) 'name': name,
+      if (sessionRecord != null) 'session_record': sessionRecord,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  SignalSessionStoresCompanion copyWith({
+    Value<int>? deviceId,
+    Value<String>? name,
+    Value<i2.Uint8List>? sessionRecord,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return SignalSessionStoresCompanion(
+      deviceId: deviceId ?? this.deviceId,
+      name: name ?? this.name,
+      sessionRecord: sessionRecord ?? this.sessionRecord,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (deviceId.present) {
+      map['device_id'] = Variable<int>(deviceId.value);
+    }
+    if (name.present) {
+      map['name'] = Variable<String>(name.value);
+    }
+    if (sessionRecord.present) {
+      map['session_record'] = Variable<i2.Uint8List>(sessionRecord.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalSessionStoresCompanion(')
+          ..write('deviceId: $deviceId, ')
+          ..write('name: $name, ')
+          ..write('sessionRecord: $sessionRecord, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class MessageActions extends Table
+    with TableInfo<MessageActions, MessageActionsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  MessageActions(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> messageId = GeneratedColumn<String>(
+    'message_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES messages(message_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<String> type = GeneratedColumn<String>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> actionAt = GeneratedColumn<int>(
+    'action_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [messageId, contactId, type, actionAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'message_actions';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {messageId, contactId, type};
+  @override
+  MessageActionsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return MessageActionsData(
+      messageId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}message_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      )!,
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}type'],
+      )!,
+      actionAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}action_at'],
+      )!,
+    );
+  }
+
+  @override
+  MessageActions createAlias(String alias) {
+    return MessageActions(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const [
+    'PRIMARY KEY(message_id, contact_id, type)',
+  ];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class MessageActionsData extends DataClass
+    implements Insertable<MessageActionsData> {
+  final String messageId;
+  final int contactId;
+  final String type;
+  final int actionAt;
+  const MessageActionsData({
+    required this.messageId,
+    required this.contactId,
+    required this.type,
+    required this.actionAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['message_id'] = Variable<String>(messageId);
+    map['contact_id'] = Variable<int>(contactId);
+    map['type'] = Variable<String>(type);
+    map['action_at'] = Variable<int>(actionAt);
+    return map;
+  }
+
+  MessageActionsCompanion toCompanion(bool nullToAbsent) {
+    return MessageActionsCompanion(
+      messageId: Value(messageId),
+      contactId: Value(contactId),
+      type: Value(type),
+      actionAt: Value(actionAt),
+    );
+  }
+
+  factory MessageActionsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return MessageActionsData(
+      messageId: serializer.fromJson<String>(json['messageId']),
+      contactId: serializer.fromJson<int>(json['contactId']),
+      type: serializer.fromJson<String>(json['type']),
+      actionAt: serializer.fromJson<int>(json['actionAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'messageId': serializer.toJson<String>(messageId),
+      'contactId': serializer.toJson<int>(contactId),
+      'type': serializer.toJson<String>(type),
+      'actionAt': serializer.toJson<int>(actionAt),
+    };
+  }
+
+  MessageActionsData copyWith({
+    String? messageId,
+    int? contactId,
+    String? type,
+    int? actionAt,
+  }) => MessageActionsData(
+    messageId: messageId ?? this.messageId,
+    contactId: contactId ?? this.contactId,
+    type: type ?? this.type,
+    actionAt: actionAt ?? this.actionAt,
+  );
+  MessageActionsData copyWithCompanion(MessageActionsCompanion data) {
+    return MessageActionsData(
+      messageId: data.messageId.present ? data.messageId.value : this.messageId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      type: data.type.present ? data.type.value : this.type,
+      actionAt: data.actionAt.present ? data.actionAt.value : this.actionAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MessageActionsData(')
+          ..write('messageId: $messageId, ')
+          ..write('contactId: $contactId, ')
+          ..write('type: $type, ')
+          ..write('actionAt: $actionAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(messageId, contactId, type, actionAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is MessageActionsData &&
+          other.messageId == this.messageId &&
+          other.contactId == this.contactId &&
+          other.type == this.type &&
+          other.actionAt == this.actionAt);
+}
+
+class MessageActionsCompanion extends UpdateCompanion<MessageActionsData> {
+  final Value<String> messageId;
+  final Value<int> contactId;
+  final Value<String> type;
+  final Value<int> actionAt;
+  final Value<int> rowid;
+  const MessageActionsCompanion({
+    this.messageId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.type = const Value.absent(),
+    this.actionAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  MessageActionsCompanion.insert({
+    required String messageId,
+    required int contactId,
+    required String type,
+    this.actionAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : messageId = Value(messageId),
+       contactId = Value(contactId),
+       type = Value(type);
+  static Insertable<MessageActionsData> custom({
+    Expression<String>? messageId,
+    Expression<int>? contactId,
+    Expression<String>? type,
+    Expression<int>? actionAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (messageId != null) 'message_id': messageId,
+      if (contactId != null) 'contact_id': contactId,
+      if (type != null) 'type': type,
+      if (actionAt != null) 'action_at': actionAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  MessageActionsCompanion copyWith({
+    Value<String>? messageId,
+    Value<int>? contactId,
+    Value<String>? type,
+    Value<int>? actionAt,
+    Value<int>? rowid,
+  }) {
+    return MessageActionsCompanion(
+      messageId: messageId ?? this.messageId,
+      contactId: contactId ?? this.contactId,
+      type: type ?? this.type,
+      actionAt: actionAt ?? this.actionAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (messageId.present) {
+      map['message_id'] = Variable<String>(messageId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (type.present) {
+      map['type'] = Variable<String>(type.value);
+    }
+    if (actionAt.present) {
+      map['action_at'] = Variable<int>(actionAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MessageActionsCompanion(')
+          ..write('messageId: $messageId, ')
+          ..write('contactId: $contactId, ')
+          ..write('type: $type, ')
+          ..write('actionAt: $actionAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class GroupHistories extends Table
+    with TableInfo<GroupHistories, GroupHistoriesData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  GroupHistories(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> groupHistoryId = GeneratedColumn<String>(
+    'group_history_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> groupId = GeneratedColumn<String>(
+    'group_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES "groups"(group_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL REFERENCES contacts(user_id)',
+  );
+  late final GeneratedColumn<int> affectedContactId = GeneratedColumn<int>(
+    'affected_contact_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<String> oldGroupName = GeneratedColumn<String>(
+    'old_group_name',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<String> newGroupName = GeneratedColumn<String>(
+    'new_group_name',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> newDeleteMessagesAfterMilliseconds =
+      GeneratedColumn<int>(
+        'new_delete_messages_after_milliseconds',
+        aliasedName,
+        true,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<String> type = GeneratedColumn<String>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> actionAt = GeneratedColumn<int>(
+    'action_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    groupHistoryId,
+    groupId,
+    contactId,
+    affectedContactId,
+    oldGroupName,
+    newGroupName,
+    newDeleteMessagesAfterMilliseconds,
+    type,
+    actionAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'group_histories';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {groupHistoryId};
+  @override
+  GroupHistoriesData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return GroupHistoriesData(
+      groupHistoryId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}group_history_id'],
+      )!,
+      groupId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}group_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      ),
+      affectedContactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}affected_contact_id'],
+      ),
+      oldGroupName: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}old_group_name'],
+      ),
+      newGroupName: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}new_group_name'],
+      ),
+      newDeleteMessagesAfterMilliseconds: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}new_delete_messages_after_milliseconds'],
+      ),
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}type'],
+      )!,
+      actionAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}action_at'],
+      )!,
+    );
+  }
+
+  @override
+  GroupHistories createAlias(String alias) {
+    return GroupHistories(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(group_history_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class GroupHistoriesData extends DataClass
+    implements Insertable<GroupHistoriesData> {
+  final String groupHistoryId;
+  final String groupId;
+  final int? contactId;
+  final int? affectedContactId;
+  final String? oldGroupName;
+  final String? newGroupName;
+  final int? newDeleteMessagesAfterMilliseconds;
+  final String type;
+  final int actionAt;
+  const GroupHistoriesData({
+    required this.groupHistoryId,
+    required this.groupId,
+    this.contactId,
+    this.affectedContactId,
+    this.oldGroupName,
+    this.newGroupName,
+    this.newDeleteMessagesAfterMilliseconds,
+    required this.type,
+    required this.actionAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['group_history_id'] = Variable<String>(groupHistoryId);
+    map['group_id'] = Variable<String>(groupId);
+    if (!nullToAbsent || contactId != null) {
+      map['contact_id'] = Variable<int>(contactId);
+    }
+    if (!nullToAbsent || affectedContactId != null) {
+      map['affected_contact_id'] = Variable<int>(affectedContactId);
+    }
+    if (!nullToAbsent || oldGroupName != null) {
+      map['old_group_name'] = Variable<String>(oldGroupName);
+    }
+    if (!nullToAbsent || newGroupName != null) {
+      map['new_group_name'] = Variable<String>(newGroupName);
+    }
+    if (!nullToAbsent || newDeleteMessagesAfterMilliseconds != null) {
+      map['new_delete_messages_after_milliseconds'] = Variable<int>(
+        newDeleteMessagesAfterMilliseconds,
+      );
+    }
+    map['type'] = Variable<String>(type);
+    map['action_at'] = Variable<int>(actionAt);
+    return map;
+  }
+
+  GroupHistoriesCompanion toCompanion(bool nullToAbsent) {
+    return GroupHistoriesCompanion(
+      groupHistoryId: Value(groupHistoryId),
+      groupId: Value(groupId),
+      contactId: contactId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(contactId),
+      affectedContactId: affectedContactId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(affectedContactId),
+      oldGroupName: oldGroupName == null && nullToAbsent
+          ? const Value.absent()
+          : Value(oldGroupName),
+      newGroupName: newGroupName == null && nullToAbsent
+          ? const Value.absent()
+          : Value(newGroupName),
+      newDeleteMessagesAfterMilliseconds:
+          newDeleteMessagesAfterMilliseconds == null && nullToAbsent
+          ? const Value.absent()
+          : Value(newDeleteMessagesAfterMilliseconds),
+      type: Value(type),
+      actionAt: Value(actionAt),
+    );
+  }
+
+  factory GroupHistoriesData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return GroupHistoriesData(
+      groupHistoryId: serializer.fromJson<String>(json['groupHistoryId']),
+      groupId: serializer.fromJson<String>(json['groupId']),
+      contactId: serializer.fromJson<int?>(json['contactId']),
+      affectedContactId: serializer.fromJson<int?>(json['affectedContactId']),
+      oldGroupName: serializer.fromJson<String?>(json['oldGroupName']),
+      newGroupName: serializer.fromJson<String?>(json['newGroupName']),
+      newDeleteMessagesAfterMilliseconds: serializer.fromJson<int?>(
+        json['newDeleteMessagesAfterMilliseconds'],
+      ),
+      type: serializer.fromJson<String>(json['type']),
+      actionAt: serializer.fromJson<int>(json['actionAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'groupHistoryId': serializer.toJson<String>(groupHistoryId),
+      'groupId': serializer.toJson<String>(groupId),
+      'contactId': serializer.toJson<int?>(contactId),
+      'affectedContactId': serializer.toJson<int?>(affectedContactId),
+      'oldGroupName': serializer.toJson<String?>(oldGroupName),
+      'newGroupName': serializer.toJson<String?>(newGroupName),
+      'newDeleteMessagesAfterMilliseconds': serializer.toJson<int?>(
+        newDeleteMessagesAfterMilliseconds,
+      ),
+      'type': serializer.toJson<String>(type),
+      'actionAt': serializer.toJson<int>(actionAt),
+    };
+  }
+
+  GroupHistoriesData copyWith({
+    String? groupHistoryId,
+    String? groupId,
+    Value<int?> contactId = const Value.absent(),
+    Value<int?> affectedContactId = const Value.absent(),
+    Value<String?> oldGroupName = const Value.absent(),
+    Value<String?> newGroupName = const Value.absent(),
+    Value<int?> newDeleteMessagesAfterMilliseconds = const Value.absent(),
+    String? type,
+    int? actionAt,
+  }) => GroupHistoriesData(
+    groupHistoryId: groupHistoryId ?? this.groupHistoryId,
+    groupId: groupId ?? this.groupId,
+    contactId: contactId.present ? contactId.value : this.contactId,
+    affectedContactId: affectedContactId.present
+        ? affectedContactId.value
+        : this.affectedContactId,
+    oldGroupName: oldGroupName.present ? oldGroupName.value : this.oldGroupName,
+    newGroupName: newGroupName.present ? newGroupName.value : this.newGroupName,
+    newDeleteMessagesAfterMilliseconds:
+        newDeleteMessagesAfterMilliseconds.present
+        ? newDeleteMessagesAfterMilliseconds.value
+        : this.newDeleteMessagesAfterMilliseconds,
+    type: type ?? this.type,
+    actionAt: actionAt ?? this.actionAt,
+  );
+  GroupHistoriesData copyWithCompanion(GroupHistoriesCompanion data) {
+    return GroupHistoriesData(
+      groupHistoryId: data.groupHistoryId.present
+          ? data.groupHistoryId.value
+          : this.groupHistoryId,
+      groupId: data.groupId.present ? data.groupId.value : this.groupId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      affectedContactId: data.affectedContactId.present
+          ? data.affectedContactId.value
+          : this.affectedContactId,
+      oldGroupName: data.oldGroupName.present
+          ? data.oldGroupName.value
+          : this.oldGroupName,
+      newGroupName: data.newGroupName.present
+          ? data.newGroupName.value
+          : this.newGroupName,
+      newDeleteMessagesAfterMilliseconds:
+          data.newDeleteMessagesAfterMilliseconds.present
+          ? data.newDeleteMessagesAfterMilliseconds.value
+          : this.newDeleteMessagesAfterMilliseconds,
+      type: data.type.present ? data.type.value : this.type,
+      actionAt: data.actionAt.present ? data.actionAt.value : this.actionAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('GroupHistoriesData(')
+          ..write('groupHistoryId: $groupHistoryId, ')
+          ..write('groupId: $groupId, ')
+          ..write('contactId: $contactId, ')
+          ..write('affectedContactId: $affectedContactId, ')
+          ..write('oldGroupName: $oldGroupName, ')
+          ..write('newGroupName: $newGroupName, ')
+          ..write(
+            'newDeleteMessagesAfterMilliseconds: $newDeleteMessagesAfterMilliseconds, ',
+          )
+          ..write('type: $type, ')
+          ..write('actionAt: $actionAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    groupHistoryId,
+    groupId,
+    contactId,
+    affectedContactId,
+    oldGroupName,
+    newGroupName,
+    newDeleteMessagesAfterMilliseconds,
+    type,
+    actionAt,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is GroupHistoriesData &&
+          other.groupHistoryId == this.groupHistoryId &&
+          other.groupId == this.groupId &&
+          other.contactId == this.contactId &&
+          other.affectedContactId == this.affectedContactId &&
+          other.oldGroupName == this.oldGroupName &&
+          other.newGroupName == this.newGroupName &&
+          other.newDeleteMessagesAfterMilliseconds ==
+              this.newDeleteMessagesAfterMilliseconds &&
+          other.type == this.type &&
+          other.actionAt == this.actionAt);
+}
+
+class GroupHistoriesCompanion extends UpdateCompanion<GroupHistoriesData> {
+  final Value<String> groupHistoryId;
+  final Value<String> groupId;
+  final Value<int?> contactId;
+  final Value<int?> affectedContactId;
+  final Value<String?> oldGroupName;
+  final Value<String?> newGroupName;
+  final Value<int?> newDeleteMessagesAfterMilliseconds;
+  final Value<String> type;
+  final Value<int> actionAt;
+  final Value<int> rowid;
+  const GroupHistoriesCompanion({
+    this.groupHistoryId = const Value.absent(),
+    this.groupId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.affectedContactId = const Value.absent(),
+    this.oldGroupName = const Value.absent(),
+    this.newGroupName = const Value.absent(),
+    this.newDeleteMessagesAfterMilliseconds = const Value.absent(),
+    this.type = const Value.absent(),
+    this.actionAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  GroupHistoriesCompanion.insert({
+    required String groupHistoryId,
+    required String groupId,
+    this.contactId = const Value.absent(),
+    this.affectedContactId = const Value.absent(),
+    this.oldGroupName = const Value.absent(),
+    this.newGroupName = const Value.absent(),
+    this.newDeleteMessagesAfterMilliseconds = const Value.absent(),
+    required String type,
+    this.actionAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : groupHistoryId = Value(groupHistoryId),
+       groupId = Value(groupId),
+       type = Value(type);
+  static Insertable<GroupHistoriesData> custom({
+    Expression<String>? groupHistoryId,
+    Expression<String>? groupId,
+    Expression<int>? contactId,
+    Expression<int>? affectedContactId,
+    Expression<String>? oldGroupName,
+    Expression<String>? newGroupName,
+    Expression<int>? newDeleteMessagesAfterMilliseconds,
+    Expression<String>? type,
+    Expression<int>? actionAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (groupHistoryId != null) 'group_history_id': groupHistoryId,
+      if (groupId != null) 'group_id': groupId,
+      if (contactId != null) 'contact_id': contactId,
+      if (affectedContactId != null) 'affected_contact_id': affectedContactId,
+      if (oldGroupName != null) 'old_group_name': oldGroupName,
+      if (newGroupName != null) 'new_group_name': newGroupName,
+      if (newDeleteMessagesAfterMilliseconds != null)
+        'new_delete_messages_after_milliseconds':
+            newDeleteMessagesAfterMilliseconds,
+      if (type != null) 'type': type,
+      if (actionAt != null) 'action_at': actionAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  GroupHistoriesCompanion copyWith({
+    Value<String>? groupHistoryId,
+    Value<String>? groupId,
+    Value<int?>? contactId,
+    Value<int?>? affectedContactId,
+    Value<String?>? oldGroupName,
+    Value<String?>? newGroupName,
+    Value<int?>? newDeleteMessagesAfterMilliseconds,
+    Value<String>? type,
+    Value<int>? actionAt,
+    Value<int>? rowid,
+  }) {
+    return GroupHistoriesCompanion(
+      groupHistoryId: groupHistoryId ?? this.groupHistoryId,
+      groupId: groupId ?? this.groupId,
+      contactId: contactId ?? this.contactId,
+      affectedContactId: affectedContactId ?? this.affectedContactId,
+      oldGroupName: oldGroupName ?? this.oldGroupName,
+      newGroupName: newGroupName ?? this.newGroupName,
+      newDeleteMessagesAfterMilliseconds:
+          newDeleteMessagesAfterMilliseconds ??
+          this.newDeleteMessagesAfterMilliseconds,
+      type: type ?? this.type,
+      actionAt: actionAt ?? this.actionAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (groupHistoryId.present) {
+      map['group_history_id'] = Variable<String>(groupHistoryId.value);
+    }
+    if (groupId.present) {
+      map['group_id'] = Variable<String>(groupId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (affectedContactId.present) {
+      map['affected_contact_id'] = Variable<int>(affectedContactId.value);
+    }
+    if (oldGroupName.present) {
+      map['old_group_name'] = Variable<String>(oldGroupName.value);
+    }
+    if (newGroupName.present) {
+      map['new_group_name'] = Variable<String>(newGroupName.value);
+    }
+    if (newDeleteMessagesAfterMilliseconds.present) {
+      map['new_delete_messages_after_milliseconds'] = Variable<int>(
+        newDeleteMessagesAfterMilliseconds.value,
+      );
+    }
+    if (type.present) {
+      map['type'] = Variable<String>(type.value);
+    }
+    if (actionAt.present) {
+      map['action_at'] = Variable<int>(actionAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('GroupHistoriesCompanion(')
+          ..write('groupHistoryId: $groupHistoryId, ')
+          ..write('groupId: $groupId, ')
+          ..write('contactId: $contactId, ')
+          ..write('affectedContactId: $affectedContactId, ')
+          ..write('oldGroupName: $oldGroupName, ')
+          ..write('newGroupName: $newGroupName, ')
+          ..write(
+            'newDeleteMessagesAfterMilliseconds: $newDeleteMessagesAfterMilliseconds, ',
+          )
+          ..write('type: $type, ')
+          ..write('actionAt: $actionAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class KeyVerifications extends Table
+    with TableInfo<KeyVerifications, KeyVerificationsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  KeyVerifications(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> verificationId = GeneratedColumn<int>(
+    'verification_id',
+    aliasedName,
+    false,
+    hasAutoIncrement: true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL PRIMARY KEY AUTOINCREMENT',
+  );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<String> type = GeneratedColumn<String>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    verificationId,
+    contactId,
+    type,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'key_verifications';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {verificationId};
+  @override
+  KeyVerificationsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return KeyVerificationsData(
+      verificationId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}verification_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      )!,
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}type'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  KeyVerifications createAlias(String alias) {
+    return KeyVerifications(attachedDatabase, alias);
+  }
+
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class KeyVerificationsData extends DataClass
+    implements Insertable<KeyVerificationsData> {
+  final int verificationId;
+  final int contactId;
+  final String type;
+  final int createdAt;
+  const KeyVerificationsData({
+    required this.verificationId,
+    required this.contactId,
+    required this.type,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['verification_id'] = Variable<int>(verificationId);
+    map['contact_id'] = Variable<int>(contactId);
+    map['type'] = Variable<String>(type);
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  KeyVerificationsCompanion toCompanion(bool nullToAbsent) {
+    return KeyVerificationsCompanion(
+      verificationId: Value(verificationId),
+      contactId: Value(contactId),
+      type: Value(type),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory KeyVerificationsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return KeyVerificationsData(
+      verificationId: serializer.fromJson<int>(json['verificationId']),
+      contactId: serializer.fromJson<int>(json['contactId']),
+      type: serializer.fromJson<String>(json['type']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'verificationId': serializer.toJson<int>(verificationId),
+      'contactId': serializer.toJson<int>(contactId),
+      'type': serializer.toJson<String>(type),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  KeyVerificationsData copyWith({
+    int? verificationId,
+    int? contactId,
+    String? type,
+    int? createdAt,
+  }) => KeyVerificationsData(
+    verificationId: verificationId ?? this.verificationId,
+    contactId: contactId ?? this.contactId,
+    type: type ?? this.type,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  KeyVerificationsData copyWithCompanion(KeyVerificationsCompanion data) {
+    return KeyVerificationsData(
+      verificationId: data.verificationId.present
+          ? data.verificationId.value
+          : this.verificationId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      type: data.type.present ? data.type.value : this.type,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('KeyVerificationsData(')
+          ..write('verificationId: $verificationId, ')
+          ..write('contactId: $contactId, ')
+          ..write('type: $type, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(verificationId, contactId, type, createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is KeyVerificationsData &&
+          other.verificationId == this.verificationId &&
+          other.contactId == this.contactId &&
+          other.type == this.type &&
+          other.createdAt == this.createdAt);
+}
+
+class KeyVerificationsCompanion extends UpdateCompanion<KeyVerificationsData> {
+  final Value<int> verificationId;
+  final Value<int> contactId;
+  final Value<String> type;
+  final Value<int> createdAt;
+  const KeyVerificationsCompanion({
+    this.verificationId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.type = const Value.absent(),
+    this.createdAt = const Value.absent(),
+  });
+  KeyVerificationsCompanion.insert({
+    this.verificationId = const Value.absent(),
+    required int contactId,
+    required String type,
+    this.createdAt = const Value.absent(),
+  }) : contactId = Value(contactId),
+       type = Value(type);
+  static Insertable<KeyVerificationsData> custom({
+    Expression<int>? verificationId,
+    Expression<int>? contactId,
+    Expression<String>? type,
+    Expression<int>? createdAt,
+  }) {
+    return RawValuesInsertable({
+      if (verificationId != null) 'verification_id': verificationId,
+      if (contactId != null) 'contact_id': contactId,
+      if (type != null) 'type': type,
+      if (createdAt != null) 'created_at': createdAt,
+    });
+  }
+
+  KeyVerificationsCompanion copyWith({
+    Value<int>? verificationId,
+    Value<int>? contactId,
+    Value<String>? type,
+    Value<int>? createdAt,
+  }) {
+    return KeyVerificationsCompanion(
+      verificationId: verificationId ?? this.verificationId,
+      contactId: contactId ?? this.contactId,
+      type: type ?? this.type,
+      createdAt: createdAt ?? this.createdAt,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (verificationId.present) {
+      map['verification_id'] = Variable<int>(verificationId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (type.present) {
+      map['type'] = Variable<String>(type.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('KeyVerificationsCompanion(')
+          ..write('verificationId: $verificationId, ')
+          ..write('contactId: $contactId, ')
+          ..write('type: $type, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class VerificationTokens extends Table
+    with TableInfo<VerificationTokens, VerificationTokensData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  VerificationTokens(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> tokenId = GeneratedColumn<int>(
+    'token_id',
+    aliasedName,
+    false,
+    hasAutoIncrement: true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL PRIMARY KEY AUTOINCREMENT',
+  );
+  late final GeneratedColumn<i2.Uint8List> token =
+      GeneratedColumn<i2.Uint8List>(
+        'token',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [tokenId, token, createdAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'verification_tokens';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {tokenId};
+  @override
+  VerificationTokensData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return VerificationTokensData(
+      tokenId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}token_id'],
+      )!,
+      token: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}token'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  VerificationTokens createAlias(String alias) {
+    return VerificationTokens(attachedDatabase, alias);
+  }
+
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class VerificationTokensData extends DataClass
+    implements Insertable<VerificationTokensData> {
+  final int tokenId;
+  final i2.Uint8List token;
+  final int createdAt;
+  const VerificationTokensData({
+    required this.tokenId,
+    required this.token,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['token_id'] = Variable<int>(tokenId);
+    map['token'] = Variable<i2.Uint8List>(token);
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  VerificationTokensCompanion toCompanion(bool nullToAbsent) {
+    return VerificationTokensCompanion(
+      tokenId: Value(tokenId),
+      token: Value(token),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory VerificationTokensData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return VerificationTokensData(
+      tokenId: serializer.fromJson<int>(json['tokenId']),
+      token: serializer.fromJson<i2.Uint8List>(json['token']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'tokenId': serializer.toJson<int>(tokenId),
+      'token': serializer.toJson<i2.Uint8List>(token),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  VerificationTokensData copyWith({
+    int? tokenId,
+    i2.Uint8List? token,
+    int? createdAt,
+  }) => VerificationTokensData(
+    tokenId: tokenId ?? this.tokenId,
+    token: token ?? this.token,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  VerificationTokensData copyWithCompanion(VerificationTokensCompanion data) {
+    return VerificationTokensData(
+      tokenId: data.tokenId.present ? data.tokenId.value : this.tokenId,
+      token: data.token.present ? data.token.value : this.token,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('VerificationTokensData(')
+          ..write('tokenId: $tokenId, ')
+          ..write('token: $token, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(tokenId, $driftBlobEquality.hash(token), createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is VerificationTokensData &&
+          other.tokenId == this.tokenId &&
+          $driftBlobEquality.equals(other.token, this.token) &&
+          other.createdAt == this.createdAt);
+}
+
+class VerificationTokensCompanion
+    extends UpdateCompanion<VerificationTokensData> {
+  final Value<int> tokenId;
+  final Value<i2.Uint8List> token;
+  final Value<int> createdAt;
+  const VerificationTokensCompanion({
+    this.tokenId = const Value.absent(),
+    this.token = const Value.absent(),
+    this.createdAt = const Value.absent(),
+  });
+  VerificationTokensCompanion.insert({
+    this.tokenId = const Value.absent(),
+    required i2.Uint8List token,
+    this.createdAt = const Value.absent(),
+  }) : token = Value(token);
+  static Insertable<VerificationTokensData> custom({
+    Expression<int>? tokenId,
+    Expression<i2.Uint8List>? token,
+    Expression<int>? createdAt,
+  }) {
+    return RawValuesInsertable({
+      if (tokenId != null) 'token_id': tokenId,
+      if (token != null) 'token': token,
+      if (createdAt != null) 'created_at': createdAt,
+    });
+  }
+
+  VerificationTokensCompanion copyWith({
+    Value<int>? tokenId,
+    Value<i2.Uint8List>? token,
+    Value<int>? createdAt,
+  }) {
+    return VerificationTokensCompanion(
+      tokenId: tokenId ?? this.tokenId,
+      token: token ?? this.token,
+      createdAt: createdAt ?? this.createdAt,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (tokenId.present) {
+      map['token_id'] = Variable<int>(tokenId.value);
+    }
+    if (token.present) {
+      map['token'] = Variable<i2.Uint8List>(token.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('VerificationTokensCompanion(')
+          ..write('tokenId: $tokenId, ')
+          ..write('token: $token, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class UserDiscoveryAnnouncedUsers extends Table
+    with
+        TableInfo<
+          UserDiscoveryAnnouncedUsers,
+          UserDiscoveryAnnouncedUsersData
+        > {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  UserDiscoveryAnnouncedUsers(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> announcedUserId = GeneratedColumn<int>(
+    'announced_user_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> announcedPublicKey =
+      GeneratedColumn<i2.Uint8List>(
+        'announced_public_key',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> publicId = GeneratedColumn<int>(
+    'public_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL UNIQUE',
+  );
+  late final GeneratedColumn<String> username = GeneratedColumn<String>(
+    'username',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> wasShownToTheUser = GeneratedColumn<int>(
+    'was_shown_to_the_user',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT 0 CHECK (was_shown_to_the_user IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> isHidden = GeneratedColumn<int>(
+    'is_hidden',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (is_hidden IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    announcedUserId,
+    announcedPublicKey,
+    publicId,
+    username,
+    wasShownToTheUser,
+    isHidden,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_discovery_announced_users';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {announcedUserId};
+  @override
+  UserDiscoveryAnnouncedUsersData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserDiscoveryAnnouncedUsersData(
+      announcedUserId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}announced_user_id'],
+      )!,
+      announcedPublicKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}announced_public_key'],
+      )!,
+      publicId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}public_id'],
+      )!,
+      username: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}username'],
+      ),
+      wasShownToTheUser: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}was_shown_to_the_user'],
+      )!,
+      isHidden: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}is_hidden'],
+      )!,
+    );
+  }
+
+  @override
+  UserDiscoveryAnnouncedUsers createAlias(String alias) {
+    return UserDiscoveryAnnouncedUsers(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const [
+    'PRIMARY KEY(announced_user_id)',
+  ];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class UserDiscoveryAnnouncedUsersData extends DataClass
+    implements Insertable<UserDiscoveryAnnouncedUsersData> {
+  final int announcedUserId;
+  final i2.Uint8List announcedPublicKey;
+  final int publicId;
+  final String? username;
+  final int wasShownToTheUser;
+  final int isHidden;
+  const UserDiscoveryAnnouncedUsersData({
+    required this.announcedUserId,
+    required this.announcedPublicKey,
+    required this.publicId,
+    this.username,
+    required this.wasShownToTheUser,
+    required this.isHidden,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['announced_user_id'] = Variable<int>(announcedUserId);
+    map['announced_public_key'] = Variable<i2.Uint8List>(announcedPublicKey);
+    map['public_id'] = Variable<int>(publicId);
+    if (!nullToAbsent || username != null) {
+      map['username'] = Variable<String>(username);
+    }
+    map['was_shown_to_the_user'] = Variable<int>(wasShownToTheUser);
+    map['is_hidden'] = Variable<int>(isHidden);
+    return map;
+  }
+
+  UserDiscoveryAnnouncedUsersCompanion toCompanion(bool nullToAbsent) {
+    return UserDiscoveryAnnouncedUsersCompanion(
+      announcedUserId: Value(announcedUserId),
+      announcedPublicKey: Value(announcedPublicKey),
+      publicId: Value(publicId),
+      username: username == null && nullToAbsent
+          ? const Value.absent()
+          : Value(username),
+      wasShownToTheUser: Value(wasShownToTheUser),
+      isHidden: Value(isHidden),
+    );
+  }
+
+  factory UserDiscoveryAnnouncedUsersData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserDiscoveryAnnouncedUsersData(
+      announcedUserId: serializer.fromJson<int>(json['announcedUserId']),
+      announcedPublicKey: serializer.fromJson<i2.Uint8List>(
+        json['announcedPublicKey'],
+      ),
+      publicId: serializer.fromJson<int>(json['publicId']),
+      username: serializer.fromJson<String?>(json['username']),
+      wasShownToTheUser: serializer.fromJson<int>(json['wasShownToTheUser']),
+      isHidden: serializer.fromJson<int>(json['isHidden']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'announcedUserId': serializer.toJson<int>(announcedUserId),
+      'announcedPublicKey': serializer.toJson<i2.Uint8List>(announcedPublicKey),
+      'publicId': serializer.toJson<int>(publicId),
+      'username': serializer.toJson<String?>(username),
+      'wasShownToTheUser': serializer.toJson<int>(wasShownToTheUser),
+      'isHidden': serializer.toJson<int>(isHidden),
+    };
+  }
+
+  UserDiscoveryAnnouncedUsersData copyWith({
+    int? announcedUserId,
+    i2.Uint8List? announcedPublicKey,
+    int? publicId,
+    Value<String?> username = const Value.absent(),
+    int? wasShownToTheUser,
+    int? isHidden,
+  }) => UserDiscoveryAnnouncedUsersData(
+    announcedUserId: announcedUserId ?? this.announcedUserId,
+    announcedPublicKey: announcedPublicKey ?? this.announcedPublicKey,
+    publicId: publicId ?? this.publicId,
+    username: username.present ? username.value : this.username,
+    wasShownToTheUser: wasShownToTheUser ?? this.wasShownToTheUser,
+    isHidden: isHidden ?? this.isHidden,
+  );
+  UserDiscoveryAnnouncedUsersData copyWithCompanion(
+    UserDiscoveryAnnouncedUsersCompanion data,
+  ) {
+    return UserDiscoveryAnnouncedUsersData(
+      announcedUserId: data.announcedUserId.present
+          ? data.announcedUserId.value
+          : this.announcedUserId,
+      announcedPublicKey: data.announcedPublicKey.present
+          ? data.announcedPublicKey.value
+          : this.announcedPublicKey,
+      publicId: data.publicId.present ? data.publicId.value : this.publicId,
+      username: data.username.present ? data.username.value : this.username,
+      wasShownToTheUser: data.wasShownToTheUser.present
+          ? data.wasShownToTheUser.value
+          : this.wasShownToTheUser,
+      isHidden: data.isHidden.present ? data.isHidden.value : this.isHidden,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryAnnouncedUsersData(')
+          ..write('announcedUserId: $announcedUserId, ')
+          ..write('announcedPublicKey: $announcedPublicKey, ')
+          ..write('publicId: $publicId, ')
+          ..write('username: $username, ')
+          ..write('wasShownToTheUser: $wasShownToTheUser, ')
+          ..write('isHidden: $isHidden')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    announcedUserId,
+    $driftBlobEquality.hash(announcedPublicKey),
+    publicId,
+    username,
+    wasShownToTheUser,
+    isHidden,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserDiscoveryAnnouncedUsersData &&
+          other.announcedUserId == this.announcedUserId &&
+          $driftBlobEquality.equals(
+            other.announcedPublicKey,
+            this.announcedPublicKey,
+          ) &&
+          other.publicId == this.publicId &&
+          other.username == this.username &&
+          other.wasShownToTheUser == this.wasShownToTheUser &&
+          other.isHidden == this.isHidden);
+}
+
+class UserDiscoveryAnnouncedUsersCompanion
+    extends UpdateCompanion<UserDiscoveryAnnouncedUsersData> {
+  final Value<int> announcedUserId;
+  final Value<i2.Uint8List> announcedPublicKey;
+  final Value<int> publicId;
+  final Value<String?> username;
+  final Value<int> wasShownToTheUser;
+  final Value<int> isHidden;
+  const UserDiscoveryAnnouncedUsersCompanion({
+    this.announcedUserId = const Value.absent(),
+    this.announcedPublicKey = const Value.absent(),
+    this.publicId = const Value.absent(),
+    this.username = const Value.absent(),
+    this.wasShownToTheUser = const Value.absent(),
+    this.isHidden = const Value.absent(),
+  });
+  UserDiscoveryAnnouncedUsersCompanion.insert({
+    this.announcedUserId = const Value.absent(),
+    required i2.Uint8List announcedPublicKey,
+    required int publicId,
+    this.username = const Value.absent(),
+    this.wasShownToTheUser = const Value.absent(),
+    this.isHidden = const Value.absent(),
+  }) : announcedPublicKey = Value(announcedPublicKey),
+       publicId = Value(publicId);
+  static Insertable<UserDiscoveryAnnouncedUsersData> custom({
+    Expression<int>? announcedUserId,
+    Expression<i2.Uint8List>? announcedPublicKey,
+    Expression<int>? publicId,
+    Expression<String>? username,
+    Expression<int>? wasShownToTheUser,
+    Expression<int>? isHidden,
+  }) {
+    return RawValuesInsertable({
+      if (announcedUserId != null) 'announced_user_id': announcedUserId,
+      if (announcedPublicKey != null)
+        'announced_public_key': announcedPublicKey,
+      if (publicId != null) 'public_id': publicId,
+      if (username != null) 'username': username,
+      if (wasShownToTheUser != null) 'was_shown_to_the_user': wasShownToTheUser,
+      if (isHidden != null) 'is_hidden': isHidden,
+    });
+  }
+
+  UserDiscoveryAnnouncedUsersCompanion copyWith({
+    Value<int>? announcedUserId,
+    Value<i2.Uint8List>? announcedPublicKey,
+    Value<int>? publicId,
+    Value<String?>? username,
+    Value<int>? wasShownToTheUser,
+    Value<int>? isHidden,
+  }) {
+    return UserDiscoveryAnnouncedUsersCompanion(
+      announcedUserId: announcedUserId ?? this.announcedUserId,
+      announcedPublicKey: announcedPublicKey ?? this.announcedPublicKey,
+      publicId: publicId ?? this.publicId,
+      username: username ?? this.username,
+      wasShownToTheUser: wasShownToTheUser ?? this.wasShownToTheUser,
+      isHidden: isHidden ?? this.isHidden,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (announcedUserId.present) {
+      map['announced_user_id'] = Variable<int>(announcedUserId.value);
+    }
+    if (announcedPublicKey.present) {
+      map['announced_public_key'] = Variable<i2.Uint8List>(
+        announcedPublicKey.value,
+      );
+    }
+    if (publicId.present) {
+      map['public_id'] = Variable<int>(publicId.value);
+    }
+    if (username.present) {
+      map['username'] = Variable<String>(username.value);
+    }
+    if (wasShownToTheUser.present) {
+      map['was_shown_to_the_user'] = Variable<int>(wasShownToTheUser.value);
+    }
+    if (isHidden.present) {
+      map['is_hidden'] = Variable<int>(isHidden.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryAnnouncedUsersCompanion(')
+          ..write('announcedUserId: $announcedUserId, ')
+          ..write('announcedPublicKey: $announcedPublicKey, ')
+          ..write('publicId: $publicId, ')
+          ..write('username: $username, ')
+          ..write('wasShownToTheUser: $wasShownToTheUser, ')
+          ..write('isHidden: $isHidden')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class UserDiscoveryUserRelations extends Table
+    with TableInfo<UserDiscoveryUserRelations, UserDiscoveryUserRelationsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  UserDiscoveryUserRelations(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> announcedUserId = GeneratedColumn<int>(
+    'announced_user_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES user_discovery_announced_users(announced_user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> fromContactId = GeneratedColumn<int>(
+    'from_contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> publicKeyVerifiedTimestamp =
+      GeneratedColumn<int>(
+        'public_key_verified_timestamp',
+        aliasedName,
+        true,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  @override
+  List<GeneratedColumn> get $columns => [
+    announcedUserId,
+    fromContactId,
+    publicKeyVerifiedTimestamp,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_discovery_user_relations';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {announcedUserId, fromContactId};
+  @override
+  UserDiscoveryUserRelationsData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserDiscoveryUserRelationsData(
+      announcedUserId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}announced_user_id'],
+      )!,
+      fromContactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}from_contact_id'],
+      )!,
+      publicKeyVerifiedTimestamp: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}public_key_verified_timestamp'],
+      ),
+    );
+  }
+
+  @override
+  UserDiscoveryUserRelations createAlias(String alias) {
+    return UserDiscoveryUserRelations(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const [
+    'PRIMARY KEY(announced_user_id, from_contact_id)',
+  ];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class UserDiscoveryUserRelationsData extends DataClass
+    implements Insertable<UserDiscoveryUserRelationsData> {
+  final int announcedUserId;
+  final int fromContactId;
+  final int? publicKeyVerifiedTimestamp;
+  const UserDiscoveryUserRelationsData({
+    required this.announcedUserId,
+    required this.fromContactId,
+    this.publicKeyVerifiedTimestamp,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['announced_user_id'] = Variable<int>(announcedUserId);
+    map['from_contact_id'] = Variable<int>(fromContactId);
+    if (!nullToAbsent || publicKeyVerifiedTimestamp != null) {
+      map['public_key_verified_timestamp'] = Variable<int>(
+        publicKeyVerifiedTimestamp,
+      );
+    }
+    return map;
+  }
+
+  UserDiscoveryUserRelationsCompanion toCompanion(bool nullToAbsent) {
+    return UserDiscoveryUserRelationsCompanion(
+      announcedUserId: Value(announcedUserId),
+      fromContactId: Value(fromContactId),
+      publicKeyVerifiedTimestamp:
+          publicKeyVerifiedTimestamp == null && nullToAbsent
+          ? const Value.absent()
+          : Value(publicKeyVerifiedTimestamp),
+    );
+  }
+
+  factory UserDiscoveryUserRelationsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserDiscoveryUserRelationsData(
+      announcedUserId: serializer.fromJson<int>(json['announcedUserId']),
+      fromContactId: serializer.fromJson<int>(json['fromContactId']),
+      publicKeyVerifiedTimestamp: serializer.fromJson<int?>(
+        json['publicKeyVerifiedTimestamp'],
+      ),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'announcedUserId': serializer.toJson<int>(announcedUserId),
+      'fromContactId': serializer.toJson<int>(fromContactId),
+      'publicKeyVerifiedTimestamp': serializer.toJson<int?>(
+        publicKeyVerifiedTimestamp,
+      ),
+    };
+  }
+
+  UserDiscoveryUserRelationsData copyWith({
+    int? announcedUserId,
+    int? fromContactId,
+    Value<int?> publicKeyVerifiedTimestamp = const Value.absent(),
+  }) => UserDiscoveryUserRelationsData(
+    announcedUserId: announcedUserId ?? this.announcedUserId,
+    fromContactId: fromContactId ?? this.fromContactId,
+    publicKeyVerifiedTimestamp: publicKeyVerifiedTimestamp.present
+        ? publicKeyVerifiedTimestamp.value
+        : this.publicKeyVerifiedTimestamp,
+  );
+  UserDiscoveryUserRelationsData copyWithCompanion(
+    UserDiscoveryUserRelationsCompanion data,
+  ) {
+    return UserDiscoveryUserRelationsData(
+      announcedUserId: data.announcedUserId.present
+          ? data.announcedUserId.value
+          : this.announcedUserId,
+      fromContactId: data.fromContactId.present
+          ? data.fromContactId.value
+          : this.fromContactId,
+      publicKeyVerifiedTimestamp: data.publicKeyVerifiedTimestamp.present
+          ? data.publicKeyVerifiedTimestamp.value
+          : this.publicKeyVerifiedTimestamp,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryUserRelationsData(')
+          ..write('announcedUserId: $announcedUserId, ')
+          ..write('fromContactId: $fromContactId, ')
+          ..write('publicKeyVerifiedTimestamp: $publicKeyVerifiedTimestamp')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(announcedUserId, fromContactId, publicKeyVerifiedTimestamp);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserDiscoveryUserRelationsData &&
+          other.announcedUserId == this.announcedUserId &&
+          other.fromContactId == this.fromContactId &&
+          other.publicKeyVerifiedTimestamp == this.publicKeyVerifiedTimestamp);
+}
+
+class UserDiscoveryUserRelationsCompanion
+    extends UpdateCompanion<UserDiscoveryUserRelationsData> {
+  final Value<int> announcedUserId;
+  final Value<int> fromContactId;
+  final Value<int?> publicKeyVerifiedTimestamp;
+  final Value<int> rowid;
+  const UserDiscoveryUserRelationsCompanion({
+    this.announcedUserId = const Value.absent(),
+    this.fromContactId = const Value.absent(),
+    this.publicKeyVerifiedTimestamp = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  UserDiscoveryUserRelationsCompanion.insert({
+    required int announcedUserId,
+    required int fromContactId,
+    this.publicKeyVerifiedTimestamp = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : announcedUserId = Value(announcedUserId),
+       fromContactId = Value(fromContactId);
+  static Insertable<UserDiscoveryUserRelationsData> custom({
+    Expression<int>? announcedUserId,
+    Expression<int>? fromContactId,
+    Expression<int>? publicKeyVerifiedTimestamp,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (announcedUserId != null) 'announced_user_id': announcedUserId,
+      if (fromContactId != null) 'from_contact_id': fromContactId,
+      if (publicKeyVerifiedTimestamp != null)
+        'public_key_verified_timestamp': publicKeyVerifiedTimestamp,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  UserDiscoveryUserRelationsCompanion copyWith({
+    Value<int>? announcedUserId,
+    Value<int>? fromContactId,
+    Value<int?>? publicKeyVerifiedTimestamp,
+    Value<int>? rowid,
+  }) {
+    return UserDiscoveryUserRelationsCompanion(
+      announcedUserId: announcedUserId ?? this.announcedUserId,
+      fromContactId: fromContactId ?? this.fromContactId,
+      publicKeyVerifiedTimestamp:
+          publicKeyVerifiedTimestamp ?? this.publicKeyVerifiedTimestamp,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (announcedUserId.present) {
+      map['announced_user_id'] = Variable<int>(announcedUserId.value);
+    }
+    if (fromContactId.present) {
+      map['from_contact_id'] = Variable<int>(fromContactId.value);
+    }
+    if (publicKeyVerifiedTimestamp.present) {
+      map['public_key_verified_timestamp'] = Variable<int>(
+        publicKeyVerifiedTimestamp.value,
+      );
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryUserRelationsCompanion(')
+          ..write('announcedUserId: $announcedUserId, ')
+          ..write('fromContactId: $fromContactId, ')
+          ..write('publicKeyVerifiedTimestamp: $publicKeyVerifiedTimestamp, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class UserDiscoveryOtherPromotions extends Table
+    with
+        TableInfo<
+          UserDiscoveryOtherPromotions,
+          UserDiscoveryOtherPromotionsData
+        > {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  UserDiscoveryOtherPromotions(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> fromContactId = GeneratedColumn<int>(
+    'from_contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> promotionId = GeneratedColumn<int>(
+    'promotion_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> publicId = GeneratedColumn<int>(
+    'public_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> threshold = GeneratedColumn<int>(
+    'threshold',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> announcementShare =
+      GeneratedColumn<i2.Uint8List>(
+        'announcement_share',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> publicKeyVerifiedTimestamp =
+      GeneratedColumn<int>(
+        'public_key_verified_timestamp',
+        aliasedName,
+        true,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  @override
+  List<GeneratedColumn> get $columns => [
+    fromContactId,
+    promotionId,
+    publicId,
+    threshold,
+    announcementShare,
+    publicKeyVerifiedTimestamp,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_discovery_other_promotions';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {fromContactId, publicId};
+  @override
+  UserDiscoveryOtherPromotionsData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserDiscoveryOtherPromotionsData(
+      fromContactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}from_contact_id'],
+      )!,
+      promotionId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}promotion_id'],
+      )!,
+      publicId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}public_id'],
+      )!,
+      threshold: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}threshold'],
+      )!,
+      announcementShare: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}announcement_share'],
+      )!,
+      publicKeyVerifiedTimestamp: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}public_key_verified_timestamp'],
+      ),
+    );
+  }
+
+  @override
+  UserDiscoveryOtherPromotions createAlias(String alias) {
+    return UserDiscoveryOtherPromotions(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const [
+    'PRIMARY KEY(from_contact_id, public_id)',
+  ];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class UserDiscoveryOtherPromotionsData extends DataClass
+    implements Insertable<UserDiscoveryOtherPromotionsData> {
+  final int fromContactId;
+  final int promotionId;
+  final int publicId;
+  final int threshold;
+  final i2.Uint8List announcementShare;
+  final int? publicKeyVerifiedTimestamp;
+  const UserDiscoveryOtherPromotionsData({
+    required this.fromContactId,
+    required this.promotionId,
+    required this.publicId,
+    required this.threshold,
+    required this.announcementShare,
+    this.publicKeyVerifiedTimestamp,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['from_contact_id'] = Variable<int>(fromContactId);
+    map['promotion_id'] = Variable<int>(promotionId);
+    map['public_id'] = Variable<int>(publicId);
+    map['threshold'] = Variable<int>(threshold);
+    map['announcement_share'] = Variable<i2.Uint8List>(announcementShare);
+    if (!nullToAbsent || publicKeyVerifiedTimestamp != null) {
+      map['public_key_verified_timestamp'] = Variable<int>(
+        publicKeyVerifiedTimestamp,
+      );
+    }
+    return map;
+  }
+
+  UserDiscoveryOtherPromotionsCompanion toCompanion(bool nullToAbsent) {
+    return UserDiscoveryOtherPromotionsCompanion(
+      fromContactId: Value(fromContactId),
+      promotionId: Value(promotionId),
+      publicId: Value(publicId),
+      threshold: Value(threshold),
+      announcementShare: Value(announcementShare),
+      publicKeyVerifiedTimestamp:
+          publicKeyVerifiedTimestamp == null && nullToAbsent
+          ? const Value.absent()
+          : Value(publicKeyVerifiedTimestamp),
+    );
+  }
+
+  factory UserDiscoveryOtherPromotionsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserDiscoveryOtherPromotionsData(
+      fromContactId: serializer.fromJson<int>(json['fromContactId']),
+      promotionId: serializer.fromJson<int>(json['promotionId']),
+      publicId: serializer.fromJson<int>(json['publicId']),
+      threshold: serializer.fromJson<int>(json['threshold']),
+      announcementShare: serializer.fromJson<i2.Uint8List>(
+        json['announcementShare'],
+      ),
+      publicKeyVerifiedTimestamp: serializer.fromJson<int?>(
+        json['publicKeyVerifiedTimestamp'],
+      ),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'fromContactId': serializer.toJson<int>(fromContactId),
+      'promotionId': serializer.toJson<int>(promotionId),
+      'publicId': serializer.toJson<int>(publicId),
+      'threshold': serializer.toJson<int>(threshold),
+      'announcementShare': serializer.toJson<i2.Uint8List>(announcementShare),
+      'publicKeyVerifiedTimestamp': serializer.toJson<int?>(
+        publicKeyVerifiedTimestamp,
+      ),
+    };
+  }
+
+  UserDiscoveryOtherPromotionsData copyWith({
+    int? fromContactId,
+    int? promotionId,
+    int? publicId,
+    int? threshold,
+    i2.Uint8List? announcementShare,
+    Value<int?> publicKeyVerifiedTimestamp = const Value.absent(),
+  }) => UserDiscoveryOtherPromotionsData(
+    fromContactId: fromContactId ?? this.fromContactId,
+    promotionId: promotionId ?? this.promotionId,
+    publicId: publicId ?? this.publicId,
+    threshold: threshold ?? this.threshold,
+    announcementShare: announcementShare ?? this.announcementShare,
+    publicKeyVerifiedTimestamp: publicKeyVerifiedTimestamp.present
+        ? publicKeyVerifiedTimestamp.value
+        : this.publicKeyVerifiedTimestamp,
+  );
+  UserDiscoveryOtherPromotionsData copyWithCompanion(
+    UserDiscoveryOtherPromotionsCompanion data,
+  ) {
+    return UserDiscoveryOtherPromotionsData(
+      fromContactId: data.fromContactId.present
+          ? data.fromContactId.value
+          : this.fromContactId,
+      promotionId: data.promotionId.present
+          ? data.promotionId.value
+          : this.promotionId,
+      publicId: data.publicId.present ? data.publicId.value : this.publicId,
+      threshold: data.threshold.present ? data.threshold.value : this.threshold,
+      announcementShare: data.announcementShare.present
+          ? data.announcementShare.value
+          : this.announcementShare,
+      publicKeyVerifiedTimestamp: data.publicKeyVerifiedTimestamp.present
+          ? data.publicKeyVerifiedTimestamp.value
+          : this.publicKeyVerifiedTimestamp,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryOtherPromotionsData(')
+          ..write('fromContactId: $fromContactId, ')
+          ..write('promotionId: $promotionId, ')
+          ..write('publicId: $publicId, ')
+          ..write('threshold: $threshold, ')
+          ..write('announcementShare: $announcementShare, ')
+          ..write('publicKeyVerifiedTimestamp: $publicKeyVerifiedTimestamp')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    fromContactId,
+    promotionId,
+    publicId,
+    threshold,
+    $driftBlobEquality.hash(announcementShare),
+    publicKeyVerifiedTimestamp,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserDiscoveryOtherPromotionsData &&
+          other.fromContactId == this.fromContactId &&
+          other.promotionId == this.promotionId &&
+          other.publicId == this.publicId &&
+          other.threshold == this.threshold &&
+          $driftBlobEquality.equals(
+            other.announcementShare,
+            this.announcementShare,
+          ) &&
+          other.publicKeyVerifiedTimestamp == this.publicKeyVerifiedTimestamp);
+}
+
+class UserDiscoveryOtherPromotionsCompanion
+    extends UpdateCompanion<UserDiscoveryOtherPromotionsData> {
+  final Value<int> fromContactId;
+  final Value<int> promotionId;
+  final Value<int> publicId;
+  final Value<int> threshold;
+  final Value<i2.Uint8List> announcementShare;
+  final Value<int?> publicKeyVerifiedTimestamp;
+  final Value<int> rowid;
+  const UserDiscoveryOtherPromotionsCompanion({
+    this.fromContactId = const Value.absent(),
+    this.promotionId = const Value.absent(),
+    this.publicId = const Value.absent(),
+    this.threshold = const Value.absent(),
+    this.announcementShare = const Value.absent(),
+    this.publicKeyVerifiedTimestamp = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  UserDiscoveryOtherPromotionsCompanion.insert({
+    required int fromContactId,
+    required int promotionId,
+    required int publicId,
+    required int threshold,
+    required i2.Uint8List announcementShare,
+    this.publicKeyVerifiedTimestamp = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : fromContactId = Value(fromContactId),
+       promotionId = Value(promotionId),
+       publicId = Value(publicId),
+       threshold = Value(threshold),
+       announcementShare = Value(announcementShare);
+  static Insertable<UserDiscoveryOtherPromotionsData> custom({
+    Expression<int>? fromContactId,
+    Expression<int>? promotionId,
+    Expression<int>? publicId,
+    Expression<int>? threshold,
+    Expression<i2.Uint8List>? announcementShare,
+    Expression<int>? publicKeyVerifiedTimestamp,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (fromContactId != null) 'from_contact_id': fromContactId,
+      if (promotionId != null) 'promotion_id': promotionId,
+      if (publicId != null) 'public_id': publicId,
+      if (threshold != null) 'threshold': threshold,
+      if (announcementShare != null) 'announcement_share': announcementShare,
+      if (publicKeyVerifiedTimestamp != null)
+        'public_key_verified_timestamp': publicKeyVerifiedTimestamp,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  UserDiscoveryOtherPromotionsCompanion copyWith({
+    Value<int>? fromContactId,
+    Value<int>? promotionId,
+    Value<int>? publicId,
+    Value<int>? threshold,
+    Value<i2.Uint8List>? announcementShare,
+    Value<int?>? publicKeyVerifiedTimestamp,
+    Value<int>? rowid,
+  }) {
+    return UserDiscoveryOtherPromotionsCompanion(
+      fromContactId: fromContactId ?? this.fromContactId,
+      promotionId: promotionId ?? this.promotionId,
+      publicId: publicId ?? this.publicId,
+      threshold: threshold ?? this.threshold,
+      announcementShare: announcementShare ?? this.announcementShare,
+      publicKeyVerifiedTimestamp:
+          publicKeyVerifiedTimestamp ?? this.publicKeyVerifiedTimestamp,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (fromContactId.present) {
+      map['from_contact_id'] = Variable<int>(fromContactId.value);
+    }
+    if (promotionId.present) {
+      map['promotion_id'] = Variable<int>(promotionId.value);
+    }
+    if (publicId.present) {
+      map['public_id'] = Variable<int>(publicId.value);
+    }
+    if (threshold.present) {
+      map['threshold'] = Variable<int>(threshold.value);
+    }
+    if (announcementShare.present) {
+      map['announcement_share'] = Variable<i2.Uint8List>(
+        announcementShare.value,
+      );
+    }
+    if (publicKeyVerifiedTimestamp.present) {
+      map['public_key_verified_timestamp'] = Variable<int>(
+        publicKeyVerifiedTimestamp.value,
+      );
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryOtherPromotionsCompanion(')
+          ..write('fromContactId: $fromContactId, ')
+          ..write('promotionId: $promotionId, ')
+          ..write('publicId: $publicId, ')
+          ..write('threshold: $threshold, ')
+          ..write('announcementShare: $announcementShare, ')
+          ..write('publicKeyVerifiedTimestamp: $publicKeyVerifiedTimestamp, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class UserDiscoveryOwnPromotions extends Table
+    with TableInfo<UserDiscoveryOwnPromotions, UserDiscoveryOwnPromotionsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  UserDiscoveryOwnPromotions(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> versionId = GeneratedColumn<int>(
+    'version_id',
+    aliasedName,
+    false,
+    hasAutoIncrement: true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL PRIMARY KEY AUTOINCREMENT',
+  );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<i2.Uint8List> promotion =
+      GeneratedColumn<i2.Uint8List>(
+        'promotion',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  @override
+  List<GeneratedColumn> get $columns => [versionId, contactId, promotion];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_discovery_own_promotions';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {versionId};
+  @override
+  UserDiscoveryOwnPromotionsData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserDiscoveryOwnPromotionsData(
+      versionId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}version_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      )!,
+      promotion: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}promotion'],
+      )!,
+    );
+  }
+
+  @override
+  UserDiscoveryOwnPromotions createAlias(String alias) {
+    return UserDiscoveryOwnPromotions(attachedDatabase, alias);
+  }
+
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class UserDiscoveryOwnPromotionsData extends DataClass
+    implements Insertable<UserDiscoveryOwnPromotionsData> {
+  final int versionId;
+  final int contactId;
+  final i2.Uint8List promotion;
+  const UserDiscoveryOwnPromotionsData({
+    required this.versionId,
+    required this.contactId,
+    required this.promotion,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['version_id'] = Variable<int>(versionId);
+    map['contact_id'] = Variable<int>(contactId);
+    map['promotion'] = Variable<i2.Uint8List>(promotion);
+    return map;
+  }
+
+  UserDiscoveryOwnPromotionsCompanion toCompanion(bool nullToAbsent) {
+    return UserDiscoveryOwnPromotionsCompanion(
+      versionId: Value(versionId),
+      contactId: Value(contactId),
+      promotion: Value(promotion),
+    );
+  }
+
+  factory UserDiscoveryOwnPromotionsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserDiscoveryOwnPromotionsData(
+      versionId: serializer.fromJson<int>(json['versionId']),
+      contactId: serializer.fromJson<int>(json['contactId']),
+      promotion: serializer.fromJson<i2.Uint8List>(json['promotion']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'versionId': serializer.toJson<int>(versionId),
+      'contactId': serializer.toJson<int>(contactId),
+      'promotion': serializer.toJson<i2.Uint8List>(promotion),
+    };
+  }
+
+  UserDiscoveryOwnPromotionsData copyWith({
+    int? versionId,
+    int? contactId,
+    i2.Uint8List? promotion,
+  }) => UserDiscoveryOwnPromotionsData(
+    versionId: versionId ?? this.versionId,
+    contactId: contactId ?? this.contactId,
+    promotion: promotion ?? this.promotion,
+  );
+  UserDiscoveryOwnPromotionsData copyWithCompanion(
+    UserDiscoveryOwnPromotionsCompanion data,
+  ) {
+    return UserDiscoveryOwnPromotionsData(
+      versionId: data.versionId.present ? data.versionId.value : this.versionId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      promotion: data.promotion.present ? data.promotion.value : this.promotion,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryOwnPromotionsData(')
+          ..write('versionId: $versionId, ')
+          ..write('contactId: $contactId, ')
+          ..write('promotion: $promotion')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(versionId, contactId, $driftBlobEquality.hash(promotion));
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserDiscoveryOwnPromotionsData &&
+          other.versionId == this.versionId &&
+          other.contactId == this.contactId &&
+          $driftBlobEquality.equals(other.promotion, this.promotion));
+}
+
+class UserDiscoveryOwnPromotionsCompanion
+    extends UpdateCompanion<UserDiscoveryOwnPromotionsData> {
+  final Value<int> versionId;
+  final Value<int> contactId;
+  final Value<i2.Uint8List> promotion;
+  const UserDiscoveryOwnPromotionsCompanion({
+    this.versionId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.promotion = const Value.absent(),
+  });
+  UserDiscoveryOwnPromotionsCompanion.insert({
+    this.versionId = const Value.absent(),
+    required int contactId,
+    required i2.Uint8List promotion,
+  }) : contactId = Value(contactId),
+       promotion = Value(promotion);
+  static Insertable<UserDiscoveryOwnPromotionsData> custom({
+    Expression<int>? versionId,
+    Expression<int>? contactId,
+    Expression<i2.Uint8List>? promotion,
+  }) {
+    return RawValuesInsertable({
+      if (versionId != null) 'version_id': versionId,
+      if (contactId != null) 'contact_id': contactId,
+      if (promotion != null) 'promotion': promotion,
+    });
+  }
+
+  UserDiscoveryOwnPromotionsCompanion copyWith({
+    Value<int>? versionId,
+    Value<int>? contactId,
+    Value<i2.Uint8List>? promotion,
+  }) {
+    return UserDiscoveryOwnPromotionsCompanion(
+      versionId: versionId ?? this.versionId,
+      contactId: contactId ?? this.contactId,
+      promotion: promotion ?? this.promotion,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (versionId.present) {
+      map['version_id'] = Variable<int>(versionId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (promotion.present) {
+      map['promotion'] = Variable<i2.Uint8List>(promotion.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryOwnPromotionsCompanion(')
+          ..write('versionId: $versionId, ')
+          ..write('contactId: $contactId, ')
+          ..write('promotion: $promotion')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class UserDiscoveryShares extends Table
+    with TableInfo<UserDiscoveryShares, UserDiscoverySharesData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  UserDiscoveryShares(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> shareId = GeneratedColumn<int>(
+    'share_id',
+    aliasedName,
+    false,
+    hasAutoIncrement: true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL PRIMARY KEY AUTOINCREMENT',
+  );
+  late final GeneratedColumn<i2.Uint8List> share =
+      GeneratedColumn<i2.Uint8List>(
+        'share',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  @override
+  List<GeneratedColumn> get $columns => [shareId, share, contactId];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_discovery_shares';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {shareId};
+  @override
+  UserDiscoverySharesData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserDiscoverySharesData(
+      shareId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}share_id'],
+      )!,
+      share: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}share'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      ),
+    );
+  }
+
+  @override
+  UserDiscoveryShares createAlias(String alias) {
+    return UserDiscoveryShares(attachedDatabase, alias);
+  }
+
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class UserDiscoverySharesData extends DataClass
+    implements Insertable<UserDiscoverySharesData> {
+  final int shareId;
+  final i2.Uint8List share;
+  final int? contactId;
+  const UserDiscoverySharesData({
+    required this.shareId,
+    required this.share,
+    this.contactId,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['share_id'] = Variable<int>(shareId);
+    map['share'] = Variable<i2.Uint8List>(share);
+    if (!nullToAbsent || contactId != null) {
+      map['contact_id'] = Variable<int>(contactId);
+    }
+    return map;
+  }
+
+  UserDiscoverySharesCompanion toCompanion(bool nullToAbsent) {
+    return UserDiscoverySharesCompanion(
+      shareId: Value(shareId),
+      share: Value(share),
+      contactId: contactId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(contactId),
+    );
+  }
+
+  factory UserDiscoverySharesData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserDiscoverySharesData(
+      shareId: serializer.fromJson<int>(json['shareId']),
+      share: serializer.fromJson<i2.Uint8List>(json['share']),
+      contactId: serializer.fromJson<int?>(json['contactId']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'shareId': serializer.toJson<int>(shareId),
+      'share': serializer.toJson<i2.Uint8List>(share),
+      'contactId': serializer.toJson<int?>(contactId),
+    };
+  }
+
+  UserDiscoverySharesData copyWith({
+    int? shareId,
+    i2.Uint8List? share,
+    Value<int?> contactId = const Value.absent(),
+  }) => UserDiscoverySharesData(
+    shareId: shareId ?? this.shareId,
+    share: share ?? this.share,
+    contactId: contactId.present ? contactId.value : this.contactId,
+  );
+  UserDiscoverySharesData copyWithCompanion(UserDiscoverySharesCompanion data) {
+    return UserDiscoverySharesData(
+      shareId: data.shareId.present ? data.shareId.value : this.shareId,
+      share: data.share.present ? data.share.value : this.share,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoverySharesData(')
+          ..write('shareId: $shareId, ')
+          ..write('share: $share, ')
+          ..write('contactId: $contactId')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(shareId, $driftBlobEquality.hash(share), contactId);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserDiscoverySharesData &&
+          other.shareId == this.shareId &&
+          $driftBlobEquality.equals(other.share, this.share) &&
+          other.contactId == this.contactId);
+}
+
+class UserDiscoverySharesCompanion
+    extends UpdateCompanion<UserDiscoverySharesData> {
+  final Value<int> shareId;
+  final Value<i2.Uint8List> share;
+  final Value<int?> contactId;
+  const UserDiscoverySharesCompanion({
+    this.shareId = const Value.absent(),
+    this.share = const Value.absent(),
+    this.contactId = const Value.absent(),
+  });
+  UserDiscoverySharesCompanion.insert({
+    this.shareId = const Value.absent(),
+    required i2.Uint8List share,
+    this.contactId = const Value.absent(),
+  }) : share = Value(share);
+  static Insertable<UserDiscoverySharesData> custom({
+    Expression<int>? shareId,
+    Expression<i2.Uint8List>? share,
+    Expression<int>? contactId,
+  }) {
+    return RawValuesInsertable({
+      if (shareId != null) 'share_id': shareId,
+      if (share != null) 'share': share,
+      if (contactId != null) 'contact_id': contactId,
+    });
+  }
+
+  UserDiscoverySharesCompanion copyWith({
+    Value<int>? shareId,
+    Value<i2.Uint8List>? share,
+    Value<int?>? contactId,
+  }) {
+    return UserDiscoverySharesCompanion(
+      shareId: shareId ?? this.shareId,
+      share: share ?? this.share,
+      contactId: contactId ?? this.contactId,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (shareId.present) {
+      map['share_id'] = Variable<int>(shareId.value);
+    }
+    if (share.present) {
+      map['share'] = Variable<i2.Uint8List>(share.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoverySharesCompanion(')
+          ..write('shareId: $shareId, ')
+          ..write('share: $share, ')
+          ..write('contactId: $contactId')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class DatabaseAtV12 extends GeneratedDatabase {
+  DatabaseAtV12(QueryExecutor e) : super(e);
+  late final Contacts contacts = Contacts(this);
+  late final Groups groups = Groups(this);
+  late final MediaFiles mediaFiles = MediaFiles(this);
+  late final Messages messages = Messages(this);
+  late final MessageHistories messageHistories = MessageHistories(this);
+  late final Reactions reactions = Reactions(this);
+  late final GroupMembers groupMembers = GroupMembers(this);
+  late final Receipts receipts = Receipts(this);
+  late final ReceivedReceipts receivedReceipts = ReceivedReceipts(this);
+  late final SignalIdentityKeyStores signalIdentityKeyStores =
+      SignalIdentityKeyStores(this);
+  late final SignalPreKeyStores signalPreKeyStores = SignalPreKeyStores(this);
+  late final SignalSenderKeyStores signalSenderKeyStores =
+      SignalSenderKeyStores(this);
+  late final SignalSessionStores signalSessionStores = SignalSessionStores(
+    this,
+  );
+  late final MessageActions messageActions = MessageActions(this);
+  late final GroupHistories groupHistories = GroupHistories(this);
+  late final KeyVerifications keyVerifications = KeyVerifications(this);
+  late final VerificationTokens verificationTokens = VerificationTokens(this);
+  late final UserDiscoveryAnnouncedUsers userDiscoveryAnnouncedUsers =
+      UserDiscoveryAnnouncedUsers(this);
+  late final UserDiscoveryUserRelations userDiscoveryUserRelations =
+      UserDiscoveryUserRelations(this);
+  late final UserDiscoveryOtherPromotions userDiscoveryOtherPromotions =
+      UserDiscoveryOtherPromotions(this);
+  late final UserDiscoveryOwnPromotions userDiscoveryOwnPromotions =
+      UserDiscoveryOwnPromotions(this);
+  late final UserDiscoveryShares userDiscoveryShares = UserDiscoveryShares(
+    this,
+  );
+  @override
+  Iterable<TableInfo<Table, Object?>> get allTables =>
+      allSchemaEntities.whereType<TableInfo<Table, Object?>>();
+  @override
+  List<DatabaseSchemaEntity> get allSchemaEntities => [
+    contacts,
+    groups,
+    mediaFiles,
+    messages,
+    messageHistories,
+    reactions,
+    groupMembers,
+    receipts,
+    receivedReceipts,
+    signalIdentityKeyStores,
+    signalPreKeyStores,
+    signalSenderKeyStores,
+    signalSessionStores,
+    messageActions,
+    groupHistories,
+    keyVerifications,
+    verificationTokens,
+    userDiscoveryAnnouncedUsers,
+    userDiscoveryUserRelations,
+    userDiscoveryOtherPromotions,
+    userDiscoveryOwnPromotions,
+    userDiscoveryShares,
+  ];
+  @override
+  StreamQueryUpdateRules get streamUpdateRules => const StreamQueryUpdateRules([
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'groups',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('messages', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'media_files',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('messages', kind: UpdateKind.update)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'messages',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('message_histories', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('message_histories', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'messages',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('reactions', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('reactions', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'groups',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('group_members', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('receipts', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'messages',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('receipts', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'messages',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('message_actions', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('message_actions', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'groups',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('group_histories', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('key_verifications', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'user_discovery_announced_users',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [
+        TableUpdate('user_discovery_user_relations', kind: UpdateKind.delete),
+      ],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [
+        TableUpdate('user_discovery_user_relations', kind: UpdateKind.delete),
+      ],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [
+        TableUpdate('user_discovery_other_promotions', kind: UpdateKind.delete),
+      ],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [
+        TableUpdate('user_discovery_own_promotions', kind: UpdateKind.delete),
+      ],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('user_discovery_shares', kind: UpdateKind.delete)],
+    ),
+  ]);
+  @override
+  int get schemaVersion => 12;
+}
diff --git a/test/drift/twonly_db/generated/schema_v13.dart b/test/drift/twonly_db/generated/schema_v13.dart
new file mode 100644
index 00000000..4f14bd6f
--- /dev/null
+++ b/test/drift/twonly_db/generated/schema_v13.dart
@@ -0,0 +1,9439 @@
+// dart format width=80
+import 'dart:typed_data' as i2;
+// GENERATED BY drift_dev, DO NOT MODIFY.
+// ignore_for_file: type=lint,unused_import
+//
+import 'package:drift/drift.dart';
+
+class Contacts extends Table with TableInfo<Contacts, ContactsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  Contacts(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> userId = GeneratedColumn<int>(
+    'user_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> username = GeneratedColumn<String>(
+    'username',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> displayName = GeneratedColumn<String>(
+    'display_name',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<String> nickName = GeneratedColumn<String>(
+    'nick_name',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> avatarSvgCompressed =
+      GeneratedColumn<i2.Uint8List>(
+        'avatar_svg_compressed',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> senderProfileCounter = GeneratedColumn<int>(
+    'sender_profile_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> accepted = GeneratedColumn<int>(
+    'accepted',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (accepted IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> deletedByUser = GeneratedColumn<int>(
+    'deleted_by_user',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (deleted_by_user IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> requested = GeneratedColumn<int>(
+    'requested',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (requested IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> blocked = GeneratedColumn<int>(
+    'blocked',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (blocked IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> verified = GeneratedColumn<int>(
+    'verified',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (verified IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> accountDeleted = GeneratedColumn<int>(
+    'account_deleted',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (account_deleted IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  late final GeneratedColumn<i2.Uint8List> userDiscoveryVersion =
+      GeneratedColumn<i2.Uint8List>(
+        'user_discovery_version',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> mediaSendCounter = GeneratedColumn<int>(
+    'media_send_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> mediaReceivedCounter = GeneratedColumn<int>(
+    'media_received_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    userId,
+    username,
+    displayName,
+    nickName,
+    avatarSvgCompressed,
+    senderProfileCounter,
+    accepted,
+    deletedByUser,
+    requested,
+    blocked,
+    verified,
+    accountDeleted,
+    createdAt,
+    userDiscoveryVersion,
+    mediaSendCounter,
+    mediaReceivedCounter,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'contacts';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {userId};
+  @override
+  ContactsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return ContactsData(
+      userId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}user_id'],
+      )!,
+      username: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}username'],
+      )!,
+      displayName: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}display_name'],
+      ),
+      nickName: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}nick_name'],
+      ),
+      avatarSvgCompressed: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}avatar_svg_compressed'],
+      ),
+      senderProfileCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}sender_profile_counter'],
+      )!,
+      accepted: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}accepted'],
+      )!,
+      deletedByUser: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}deleted_by_user'],
+      )!,
+      requested: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}requested'],
+      )!,
+      blocked: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}blocked'],
+      )!,
+      verified: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}verified'],
+      )!,
+      accountDeleted: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}account_deleted'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+      userDiscoveryVersion: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}user_discovery_version'],
+      ),
+      mediaSendCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}media_send_counter'],
+      )!,
+      mediaReceivedCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}media_received_counter'],
+      )!,
+    );
+  }
+
+  @override
+  Contacts createAlias(String alias) {
+    return Contacts(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(user_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class ContactsData extends DataClass implements Insertable<ContactsData> {
+  final int userId;
+  final String username;
+  final String? displayName;
+  final String? nickName;
+  final i2.Uint8List? avatarSvgCompressed;
+  final int senderProfileCounter;
+  final int accepted;
+  final int deletedByUser;
+  final int requested;
+  final int blocked;
+  final int verified;
+  final int accountDeleted;
+  final int createdAt;
+  final i2.Uint8List? userDiscoveryVersion;
+  final int mediaSendCounter;
+  final int mediaReceivedCounter;
+  const ContactsData({
+    required this.userId,
+    required this.username,
+    this.displayName,
+    this.nickName,
+    this.avatarSvgCompressed,
+    required this.senderProfileCounter,
+    required this.accepted,
+    required this.deletedByUser,
+    required this.requested,
+    required this.blocked,
+    required this.verified,
+    required this.accountDeleted,
+    required this.createdAt,
+    this.userDiscoveryVersion,
+    required this.mediaSendCounter,
+    required this.mediaReceivedCounter,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['user_id'] = Variable<int>(userId);
+    map['username'] = Variable<String>(username);
+    if (!nullToAbsent || displayName != null) {
+      map['display_name'] = Variable<String>(displayName);
+    }
+    if (!nullToAbsent || nickName != null) {
+      map['nick_name'] = Variable<String>(nickName);
+    }
+    if (!nullToAbsent || avatarSvgCompressed != null) {
+      map['avatar_svg_compressed'] = Variable<i2.Uint8List>(
+        avatarSvgCompressed,
+      );
+    }
+    map['sender_profile_counter'] = Variable<int>(senderProfileCounter);
+    map['accepted'] = Variable<int>(accepted);
+    map['deleted_by_user'] = Variable<int>(deletedByUser);
+    map['requested'] = Variable<int>(requested);
+    map['blocked'] = Variable<int>(blocked);
+    map['verified'] = Variable<int>(verified);
+    map['account_deleted'] = Variable<int>(accountDeleted);
+    map['created_at'] = Variable<int>(createdAt);
+    if (!nullToAbsent || userDiscoveryVersion != null) {
+      map['user_discovery_version'] = Variable<i2.Uint8List>(
+        userDiscoveryVersion,
+      );
+    }
+    map['media_send_counter'] = Variable<int>(mediaSendCounter);
+    map['media_received_counter'] = Variable<int>(mediaReceivedCounter);
+    return map;
+  }
+
+  ContactsCompanion toCompanion(bool nullToAbsent) {
+    return ContactsCompanion(
+      userId: Value(userId),
+      username: Value(username),
+      displayName: displayName == null && nullToAbsent
+          ? const Value.absent()
+          : Value(displayName),
+      nickName: nickName == null && nullToAbsent
+          ? const Value.absent()
+          : Value(nickName),
+      avatarSvgCompressed: avatarSvgCompressed == null && nullToAbsent
+          ? const Value.absent()
+          : Value(avatarSvgCompressed),
+      senderProfileCounter: Value(senderProfileCounter),
+      accepted: Value(accepted),
+      deletedByUser: Value(deletedByUser),
+      requested: Value(requested),
+      blocked: Value(blocked),
+      verified: Value(verified),
+      accountDeleted: Value(accountDeleted),
+      createdAt: Value(createdAt),
+      userDiscoveryVersion: userDiscoveryVersion == null && nullToAbsent
+          ? const Value.absent()
+          : Value(userDiscoveryVersion),
+      mediaSendCounter: Value(mediaSendCounter),
+      mediaReceivedCounter: Value(mediaReceivedCounter),
+    );
+  }
+
+  factory ContactsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return ContactsData(
+      userId: serializer.fromJson<int>(json['userId']),
+      username: serializer.fromJson<String>(json['username']),
+      displayName: serializer.fromJson<String?>(json['displayName']),
+      nickName: serializer.fromJson<String?>(json['nickName']),
+      avatarSvgCompressed: serializer.fromJson<i2.Uint8List?>(
+        json['avatarSvgCompressed'],
+      ),
+      senderProfileCounter: serializer.fromJson<int>(
+        json['senderProfileCounter'],
+      ),
+      accepted: serializer.fromJson<int>(json['accepted']),
+      deletedByUser: serializer.fromJson<int>(json['deletedByUser']),
+      requested: serializer.fromJson<int>(json['requested']),
+      blocked: serializer.fromJson<int>(json['blocked']),
+      verified: serializer.fromJson<int>(json['verified']),
+      accountDeleted: serializer.fromJson<int>(json['accountDeleted']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+      userDiscoveryVersion: serializer.fromJson<i2.Uint8List?>(
+        json['userDiscoveryVersion'],
+      ),
+      mediaSendCounter: serializer.fromJson<int>(json['mediaSendCounter']),
+      mediaReceivedCounter: serializer.fromJson<int>(
+        json['mediaReceivedCounter'],
+      ),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'userId': serializer.toJson<int>(userId),
+      'username': serializer.toJson<String>(username),
+      'displayName': serializer.toJson<String?>(displayName),
+      'nickName': serializer.toJson<String?>(nickName),
+      'avatarSvgCompressed': serializer.toJson<i2.Uint8List?>(
+        avatarSvgCompressed,
+      ),
+      'senderProfileCounter': serializer.toJson<int>(senderProfileCounter),
+      'accepted': serializer.toJson<int>(accepted),
+      'deletedByUser': serializer.toJson<int>(deletedByUser),
+      'requested': serializer.toJson<int>(requested),
+      'blocked': serializer.toJson<int>(blocked),
+      'verified': serializer.toJson<int>(verified),
+      'accountDeleted': serializer.toJson<int>(accountDeleted),
+      'createdAt': serializer.toJson<int>(createdAt),
+      'userDiscoveryVersion': serializer.toJson<i2.Uint8List?>(
+        userDiscoveryVersion,
+      ),
+      'mediaSendCounter': serializer.toJson<int>(mediaSendCounter),
+      'mediaReceivedCounter': serializer.toJson<int>(mediaReceivedCounter),
+    };
+  }
+
+  ContactsData copyWith({
+    int? userId,
+    String? username,
+    Value<String?> displayName = const Value.absent(),
+    Value<String?> nickName = const Value.absent(),
+    Value<i2.Uint8List?> avatarSvgCompressed = const Value.absent(),
+    int? senderProfileCounter,
+    int? accepted,
+    int? deletedByUser,
+    int? requested,
+    int? blocked,
+    int? verified,
+    int? accountDeleted,
+    int? createdAt,
+    Value<i2.Uint8List?> userDiscoveryVersion = const Value.absent(),
+    int? mediaSendCounter,
+    int? mediaReceivedCounter,
+  }) => ContactsData(
+    userId: userId ?? this.userId,
+    username: username ?? this.username,
+    displayName: displayName.present ? displayName.value : this.displayName,
+    nickName: nickName.present ? nickName.value : this.nickName,
+    avatarSvgCompressed: avatarSvgCompressed.present
+        ? avatarSvgCompressed.value
+        : this.avatarSvgCompressed,
+    senderProfileCounter: senderProfileCounter ?? this.senderProfileCounter,
+    accepted: accepted ?? this.accepted,
+    deletedByUser: deletedByUser ?? this.deletedByUser,
+    requested: requested ?? this.requested,
+    blocked: blocked ?? this.blocked,
+    verified: verified ?? this.verified,
+    accountDeleted: accountDeleted ?? this.accountDeleted,
+    createdAt: createdAt ?? this.createdAt,
+    userDiscoveryVersion: userDiscoveryVersion.present
+        ? userDiscoveryVersion.value
+        : this.userDiscoveryVersion,
+    mediaSendCounter: mediaSendCounter ?? this.mediaSendCounter,
+    mediaReceivedCounter: mediaReceivedCounter ?? this.mediaReceivedCounter,
+  );
+  ContactsData copyWithCompanion(ContactsCompanion data) {
+    return ContactsData(
+      userId: data.userId.present ? data.userId.value : this.userId,
+      username: data.username.present ? data.username.value : this.username,
+      displayName: data.displayName.present
+          ? data.displayName.value
+          : this.displayName,
+      nickName: data.nickName.present ? data.nickName.value : this.nickName,
+      avatarSvgCompressed: data.avatarSvgCompressed.present
+          ? data.avatarSvgCompressed.value
+          : this.avatarSvgCompressed,
+      senderProfileCounter: data.senderProfileCounter.present
+          ? data.senderProfileCounter.value
+          : this.senderProfileCounter,
+      accepted: data.accepted.present ? data.accepted.value : this.accepted,
+      deletedByUser: data.deletedByUser.present
+          ? data.deletedByUser.value
+          : this.deletedByUser,
+      requested: data.requested.present ? data.requested.value : this.requested,
+      blocked: data.blocked.present ? data.blocked.value : this.blocked,
+      verified: data.verified.present ? data.verified.value : this.verified,
+      accountDeleted: data.accountDeleted.present
+          ? data.accountDeleted.value
+          : this.accountDeleted,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      userDiscoveryVersion: data.userDiscoveryVersion.present
+          ? data.userDiscoveryVersion.value
+          : this.userDiscoveryVersion,
+      mediaSendCounter: data.mediaSendCounter.present
+          ? data.mediaSendCounter.value
+          : this.mediaSendCounter,
+      mediaReceivedCounter: data.mediaReceivedCounter.present
+          ? data.mediaReceivedCounter.value
+          : this.mediaReceivedCounter,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ContactsData(')
+          ..write('userId: $userId, ')
+          ..write('username: $username, ')
+          ..write('displayName: $displayName, ')
+          ..write('nickName: $nickName, ')
+          ..write('avatarSvgCompressed: $avatarSvgCompressed, ')
+          ..write('senderProfileCounter: $senderProfileCounter, ')
+          ..write('accepted: $accepted, ')
+          ..write('deletedByUser: $deletedByUser, ')
+          ..write('requested: $requested, ')
+          ..write('blocked: $blocked, ')
+          ..write('verified: $verified, ')
+          ..write('accountDeleted: $accountDeleted, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('userDiscoveryVersion: $userDiscoveryVersion, ')
+          ..write('mediaSendCounter: $mediaSendCounter, ')
+          ..write('mediaReceivedCounter: $mediaReceivedCounter')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    userId,
+    username,
+    displayName,
+    nickName,
+    $driftBlobEquality.hash(avatarSvgCompressed),
+    senderProfileCounter,
+    accepted,
+    deletedByUser,
+    requested,
+    blocked,
+    verified,
+    accountDeleted,
+    createdAt,
+    $driftBlobEquality.hash(userDiscoveryVersion),
+    mediaSendCounter,
+    mediaReceivedCounter,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is ContactsData &&
+          other.userId == this.userId &&
+          other.username == this.username &&
+          other.displayName == this.displayName &&
+          other.nickName == this.nickName &&
+          $driftBlobEquality.equals(
+            other.avatarSvgCompressed,
+            this.avatarSvgCompressed,
+          ) &&
+          other.senderProfileCounter == this.senderProfileCounter &&
+          other.accepted == this.accepted &&
+          other.deletedByUser == this.deletedByUser &&
+          other.requested == this.requested &&
+          other.blocked == this.blocked &&
+          other.verified == this.verified &&
+          other.accountDeleted == this.accountDeleted &&
+          other.createdAt == this.createdAt &&
+          $driftBlobEquality.equals(
+            other.userDiscoveryVersion,
+            this.userDiscoveryVersion,
+          ) &&
+          other.mediaSendCounter == this.mediaSendCounter &&
+          other.mediaReceivedCounter == this.mediaReceivedCounter);
+}
+
+class ContactsCompanion extends UpdateCompanion<ContactsData> {
+  final Value<int> userId;
+  final Value<String> username;
+  final Value<String?> displayName;
+  final Value<String?> nickName;
+  final Value<i2.Uint8List?> avatarSvgCompressed;
+  final Value<int> senderProfileCounter;
+  final Value<int> accepted;
+  final Value<int> deletedByUser;
+  final Value<int> requested;
+  final Value<int> blocked;
+  final Value<int> verified;
+  final Value<int> accountDeleted;
+  final Value<int> createdAt;
+  final Value<i2.Uint8List?> userDiscoveryVersion;
+  final Value<int> mediaSendCounter;
+  final Value<int> mediaReceivedCounter;
+  const ContactsCompanion({
+    this.userId = const Value.absent(),
+    this.username = const Value.absent(),
+    this.displayName = const Value.absent(),
+    this.nickName = const Value.absent(),
+    this.avatarSvgCompressed = const Value.absent(),
+    this.senderProfileCounter = const Value.absent(),
+    this.accepted = const Value.absent(),
+    this.deletedByUser = const Value.absent(),
+    this.requested = const Value.absent(),
+    this.blocked = const Value.absent(),
+    this.verified = const Value.absent(),
+    this.accountDeleted = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.userDiscoveryVersion = const Value.absent(),
+    this.mediaSendCounter = const Value.absent(),
+    this.mediaReceivedCounter = const Value.absent(),
+  });
+  ContactsCompanion.insert({
+    this.userId = const Value.absent(),
+    required String username,
+    this.displayName = const Value.absent(),
+    this.nickName = const Value.absent(),
+    this.avatarSvgCompressed = const Value.absent(),
+    this.senderProfileCounter = const Value.absent(),
+    this.accepted = const Value.absent(),
+    this.deletedByUser = const Value.absent(),
+    this.requested = const Value.absent(),
+    this.blocked = const Value.absent(),
+    this.verified = const Value.absent(),
+    this.accountDeleted = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.userDiscoveryVersion = const Value.absent(),
+    this.mediaSendCounter = const Value.absent(),
+    this.mediaReceivedCounter = const Value.absent(),
+  }) : username = Value(username);
+  static Insertable<ContactsData> custom({
+    Expression<int>? userId,
+    Expression<String>? username,
+    Expression<String>? displayName,
+    Expression<String>? nickName,
+    Expression<i2.Uint8List>? avatarSvgCompressed,
+    Expression<int>? senderProfileCounter,
+    Expression<int>? accepted,
+    Expression<int>? deletedByUser,
+    Expression<int>? requested,
+    Expression<int>? blocked,
+    Expression<int>? verified,
+    Expression<int>? accountDeleted,
+    Expression<int>? createdAt,
+    Expression<i2.Uint8List>? userDiscoveryVersion,
+    Expression<int>? mediaSendCounter,
+    Expression<int>? mediaReceivedCounter,
+  }) {
+    return RawValuesInsertable({
+      if (userId != null) 'user_id': userId,
+      if (username != null) 'username': username,
+      if (displayName != null) 'display_name': displayName,
+      if (nickName != null) 'nick_name': nickName,
+      if (avatarSvgCompressed != null)
+        'avatar_svg_compressed': avatarSvgCompressed,
+      if (senderProfileCounter != null)
+        'sender_profile_counter': senderProfileCounter,
+      if (accepted != null) 'accepted': accepted,
+      if (deletedByUser != null) 'deleted_by_user': deletedByUser,
+      if (requested != null) 'requested': requested,
+      if (blocked != null) 'blocked': blocked,
+      if (verified != null) 'verified': verified,
+      if (accountDeleted != null) 'account_deleted': accountDeleted,
+      if (createdAt != null) 'created_at': createdAt,
+      if (userDiscoveryVersion != null)
+        'user_discovery_version': userDiscoveryVersion,
+      if (mediaSendCounter != null) 'media_send_counter': mediaSendCounter,
+      if (mediaReceivedCounter != null)
+        'media_received_counter': mediaReceivedCounter,
+    });
+  }
+
+  ContactsCompanion copyWith({
+    Value<int>? userId,
+    Value<String>? username,
+    Value<String?>? displayName,
+    Value<String?>? nickName,
+    Value<i2.Uint8List?>? avatarSvgCompressed,
+    Value<int>? senderProfileCounter,
+    Value<int>? accepted,
+    Value<int>? deletedByUser,
+    Value<int>? requested,
+    Value<int>? blocked,
+    Value<int>? verified,
+    Value<int>? accountDeleted,
+    Value<int>? createdAt,
+    Value<i2.Uint8List?>? userDiscoveryVersion,
+    Value<int>? mediaSendCounter,
+    Value<int>? mediaReceivedCounter,
+  }) {
+    return ContactsCompanion(
+      userId: userId ?? this.userId,
+      username: username ?? this.username,
+      displayName: displayName ?? this.displayName,
+      nickName: nickName ?? this.nickName,
+      avatarSvgCompressed: avatarSvgCompressed ?? this.avatarSvgCompressed,
+      senderProfileCounter: senderProfileCounter ?? this.senderProfileCounter,
+      accepted: accepted ?? this.accepted,
+      deletedByUser: deletedByUser ?? this.deletedByUser,
+      requested: requested ?? this.requested,
+      blocked: blocked ?? this.blocked,
+      verified: verified ?? this.verified,
+      accountDeleted: accountDeleted ?? this.accountDeleted,
+      createdAt: createdAt ?? this.createdAt,
+      userDiscoveryVersion: userDiscoveryVersion ?? this.userDiscoveryVersion,
+      mediaSendCounter: mediaSendCounter ?? this.mediaSendCounter,
+      mediaReceivedCounter: mediaReceivedCounter ?? this.mediaReceivedCounter,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (userId.present) {
+      map['user_id'] = Variable<int>(userId.value);
+    }
+    if (username.present) {
+      map['username'] = Variable<String>(username.value);
+    }
+    if (displayName.present) {
+      map['display_name'] = Variable<String>(displayName.value);
+    }
+    if (nickName.present) {
+      map['nick_name'] = Variable<String>(nickName.value);
+    }
+    if (avatarSvgCompressed.present) {
+      map['avatar_svg_compressed'] = Variable<i2.Uint8List>(
+        avatarSvgCompressed.value,
+      );
+    }
+    if (senderProfileCounter.present) {
+      map['sender_profile_counter'] = Variable<int>(senderProfileCounter.value);
+    }
+    if (accepted.present) {
+      map['accepted'] = Variable<int>(accepted.value);
+    }
+    if (deletedByUser.present) {
+      map['deleted_by_user'] = Variable<int>(deletedByUser.value);
+    }
+    if (requested.present) {
+      map['requested'] = Variable<int>(requested.value);
+    }
+    if (blocked.present) {
+      map['blocked'] = Variable<int>(blocked.value);
+    }
+    if (verified.present) {
+      map['verified'] = Variable<int>(verified.value);
+    }
+    if (accountDeleted.present) {
+      map['account_deleted'] = Variable<int>(accountDeleted.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (userDiscoveryVersion.present) {
+      map['user_discovery_version'] = Variable<i2.Uint8List>(
+        userDiscoveryVersion.value,
+      );
+    }
+    if (mediaSendCounter.present) {
+      map['media_send_counter'] = Variable<int>(mediaSendCounter.value);
+    }
+    if (mediaReceivedCounter.present) {
+      map['media_received_counter'] = Variable<int>(mediaReceivedCounter.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ContactsCompanion(')
+          ..write('userId: $userId, ')
+          ..write('username: $username, ')
+          ..write('displayName: $displayName, ')
+          ..write('nickName: $nickName, ')
+          ..write('avatarSvgCompressed: $avatarSvgCompressed, ')
+          ..write('senderProfileCounter: $senderProfileCounter, ')
+          ..write('accepted: $accepted, ')
+          ..write('deletedByUser: $deletedByUser, ')
+          ..write('requested: $requested, ')
+          ..write('blocked: $blocked, ')
+          ..write('verified: $verified, ')
+          ..write('accountDeleted: $accountDeleted, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('userDiscoveryVersion: $userDiscoveryVersion, ')
+          ..write('mediaSendCounter: $mediaSendCounter, ')
+          ..write('mediaReceivedCounter: $mediaReceivedCounter')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class Groups extends Table with TableInfo<Groups, GroupsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  Groups(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> groupId = GeneratedColumn<String>(
+    'group_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> isGroupAdmin = GeneratedColumn<int>(
+    'is_group_admin',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (is_group_admin IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> isDirectChat = GeneratedColumn<int>(
+    'is_direct_chat',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (is_direct_chat IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> pinned = GeneratedColumn<int>(
+    'pinned',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (pinned IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> archived = GeneratedColumn<int>(
+    'archived',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (archived IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> joinedGroup = GeneratedColumn<int>(
+    'joined_group',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (joined_group IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> leftGroup = GeneratedColumn<int>(
+    'left_group',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (left_group IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> deletedContent = GeneratedColumn<int>(
+    'deleted_content',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (deleted_content IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> stateVersionId = GeneratedColumn<int>(
+    'state_version_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<i2.Uint8List> stateEncryptionKey =
+      GeneratedColumn<i2.Uint8List>(
+        'state_encryption_key',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<i2.Uint8List> myGroupPrivateKey =
+      GeneratedColumn<i2.Uint8List>(
+        'my_group_private_key',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<String> groupName = GeneratedColumn<String>(
+    'group_name',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> draftMessage = GeneratedColumn<String>(
+    'draft_message',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> totalMediaCounter = GeneratedColumn<int>(
+    'total_media_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> alsoBestFriend = GeneratedColumn<int>(
+    'also_best_friend',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (also_best_friend IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> deleteMessagesAfterMilliseconds =
+      GeneratedColumn<int>(
+        'delete_messages_after_milliseconds',
+        aliasedName,
+        false,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints: 'NOT NULL DEFAULT 86400000',
+        defaultValue: const CustomExpression('86400000'),
+      );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  late final GeneratedColumn<int> lastMessageSend = GeneratedColumn<int>(
+    'last_message_send',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> lastMessageReceived = GeneratedColumn<int>(
+    'last_message_received',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> lastFlameCounterChange = GeneratedColumn<int>(
+    'last_flame_counter_change',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> lastFlameSync = GeneratedColumn<int>(
+    'last_flame_sync',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> flameCounter = GeneratedColumn<int>(
+    'flame_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> maxFlameCounter = GeneratedColumn<int>(
+    'max_flame_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> maxFlameCounterFrom = GeneratedColumn<int>(
+    'max_flame_counter_from',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> lastMessageExchange = GeneratedColumn<int>(
+    'last_message_exchange',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    groupId,
+    isGroupAdmin,
+    isDirectChat,
+    pinned,
+    archived,
+    joinedGroup,
+    leftGroup,
+    deletedContent,
+    stateVersionId,
+    stateEncryptionKey,
+    myGroupPrivateKey,
+    groupName,
+    draftMessage,
+    totalMediaCounter,
+    alsoBestFriend,
+    deleteMessagesAfterMilliseconds,
+    createdAt,
+    lastMessageSend,
+    lastMessageReceived,
+    lastFlameCounterChange,
+    lastFlameSync,
+    flameCounter,
+    maxFlameCounter,
+    maxFlameCounterFrom,
+    lastMessageExchange,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'groups';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {groupId};
+  @override
+  GroupsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return GroupsData(
+      groupId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}group_id'],
+      )!,
+      isGroupAdmin: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}is_group_admin'],
+      )!,
+      isDirectChat: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}is_direct_chat'],
+      )!,
+      pinned: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}pinned'],
+      )!,
+      archived: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}archived'],
+      )!,
+      joinedGroup: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}joined_group'],
+      )!,
+      leftGroup: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}left_group'],
+      )!,
+      deletedContent: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}deleted_content'],
+      )!,
+      stateVersionId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}state_version_id'],
+      )!,
+      stateEncryptionKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}state_encryption_key'],
+      ),
+      myGroupPrivateKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}my_group_private_key'],
+      ),
+      groupName: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}group_name'],
+      )!,
+      draftMessage: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}draft_message'],
+      ),
+      totalMediaCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}total_media_counter'],
+      )!,
+      alsoBestFriend: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}also_best_friend'],
+      )!,
+      deleteMessagesAfterMilliseconds: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}delete_messages_after_milliseconds'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+      lastMessageSend: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_message_send'],
+      ),
+      lastMessageReceived: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_message_received'],
+      ),
+      lastFlameCounterChange: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_flame_counter_change'],
+      ),
+      lastFlameSync: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_flame_sync'],
+      ),
+      flameCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}flame_counter'],
+      )!,
+      maxFlameCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}max_flame_counter'],
+      )!,
+      maxFlameCounterFrom: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}max_flame_counter_from'],
+      ),
+      lastMessageExchange: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_message_exchange'],
+      )!,
+    );
+  }
+
+  @override
+  Groups createAlias(String alias) {
+    return Groups(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(group_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class GroupsData extends DataClass implements Insertable<GroupsData> {
+  final String groupId;
+  final int isGroupAdmin;
+  final int isDirectChat;
+  final int pinned;
+  final int archived;
+  final int joinedGroup;
+  final int leftGroup;
+  final int deletedContent;
+  final int stateVersionId;
+  final i2.Uint8List? stateEncryptionKey;
+  final i2.Uint8List? myGroupPrivateKey;
+  final String groupName;
+  final String? draftMessage;
+  final int totalMediaCounter;
+  final int alsoBestFriend;
+  final int deleteMessagesAfterMilliseconds;
+  final int createdAt;
+  final int? lastMessageSend;
+  final int? lastMessageReceived;
+  final int? lastFlameCounterChange;
+  final int? lastFlameSync;
+  final int flameCounter;
+  final int maxFlameCounter;
+  final int? maxFlameCounterFrom;
+  final int lastMessageExchange;
+  const GroupsData({
+    required this.groupId,
+    required this.isGroupAdmin,
+    required this.isDirectChat,
+    required this.pinned,
+    required this.archived,
+    required this.joinedGroup,
+    required this.leftGroup,
+    required this.deletedContent,
+    required this.stateVersionId,
+    this.stateEncryptionKey,
+    this.myGroupPrivateKey,
+    required this.groupName,
+    this.draftMessage,
+    required this.totalMediaCounter,
+    required this.alsoBestFriend,
+    required this.deleteMessagesAfterMilliseconds,
+    required this.createdAt,
+    this.lastMessageSend,
+    this.lastMessageReceived,
+    this.lastFlameCounterChange,
+    this.lastFlameSync,
+    required this.flameCounter,
+    required this.maxFlameCounter,
+    this.maxFlameCounterFrom,
+    required this.lastMessageExchange,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['group_id'] = Variable<String>(groupId);
+    map['is_group_admin'] = Variable<int>(isGroupAdmin);
+    map['is_direct_chat'] = Variable<int>(isDirectChat);
+    map['pinned'] = Variable<int>(pinned);
+    map['archived'] = Variable<int>(archived);
+    map['joined_group'] = Variable<int>(joinedGroup);
+    map['left_group'] = Variable<int>(leftGroup);
+    map['deleted_content'] = Variable<int>(deletedContent);
+    map['state_version_id'] = Variable<int>(stateVersionId);
+    if (!nullToAbsent || stateEncryptionKey != null) {
+      map['state_encryption_key'] = Variable<i2.Uint8List>(stateEncryptionKey);
+    }
+    if (!nullToAbsent || myGroupPrivateKey != null) {
+      map['my_group_private_key'] = Variable<i2.Uint8List>(myGroupPrivateKey);
+    }
+    map['group_name'] = Variable<String>(groupName);
+    if (!nullToAbsent || draftMessage != null) {
+      map['draft_message'] = Variable<String>(draftMessage);
+    }
+    map['total_media_counter'] = Variable<int>(totalMediaCounter);
+    map['also_best_friend'] = Variable<int>(alsoBestFriend);
+    map['delete_messages_after_milliseconds'] = Variable<int>(
+      deleteMessagesAfterMilliseconds,
+    );
+    map['created_at'] = Variable<int>(createdAt);
+    if (!nullToAbsent || lastMessageSend != null) {
+      map['last_message_send'] = Variable<int>(lastMessageSend);
+    }
+    if (!nullToAbsent || lastMessageReceived != null) {
+      map['last_message_received'] = Variable<int>(lastMessageReceived);
+    }
+    if (!nullToAbsent || lastFlameCounterChange != null) {
+      map['last_flame_counter_change'] = Variable<int>(lastFlameCounterChange);
+    }
+    if (!nullToAbsent || lastFlameSync != null) {
+      map['last_flame_sync'] = Variable<int>(lastFlameSync);
+    }
+    map['flame_counter'] = Variable<int>(flameCounter);
+    map['max_flame_counter'] = Variable<int>(maxFlameCounter);
+    if (!nullToAbsent || maxFlameCounterFrom != null) {
+      map['max_flame_counter_from'] = Variable<int>(maxFlameCounterFrom);
+    }
+    map['last_message_exchange'] = Variable<int>(lastMessageExchange);
+    return map;
+  }
+
+  GroupsCompanion toCompanion(bool nullToAbsent) {
+    return GroupsCompanion(
+      groupId: Value(groupId),
+      isGroupAdmin: Value(isGroupAdmin),
+      isDirectChat: Value(isDirectChat),
+      pinned: Value(pinned),
+      archived: Value(archived),
+      joinedGroup: Value(joinedGroup),
+      leftGroup: Value(leftGroup),
+      deletedContent: Value(deletedContent),
+      stateVersionId: Value(stateVersionId),
+      stateEncryptionKey: stateEncryptionKey == null && nullToAbsent
+          ? const Value.absent()
+          : Value(stateEncryptionKey),
+      myGroupPrivateKey: myGroupPrivateKey == null && nullToAbsent
+          ? const Value.absent()
+          : Value(myGroupPrivateKey),
+      groupName: Value(groupName),
+      draftMessage: draftMessage == null && nullToAbsent
+          ? const Value.absent()
+          : Value(draftMessage),
+      totalMediaCounter: Value(totalMediaCounter),
+      alsoBestFriend: Value(alsoBestFriend),
+      deleteMessagesAfterMilliseconds: Value(deleteMessagesAfterMilliseconds),
+      createdAt: Value(createdAt),
+      lastMessageSend: lastMessageSend == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastMessageSend),
+      lastMessageReceived: lastMessageReceived == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastMessageReceived),
+      lastFlameCounterChange: lastFlameCounterChange == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastFlameCounterChange),
+      lastFlameSync: lastFlameSync == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastFlameSync),
+      flameCounter: Value(flameCounter),
+      maxFlameCounter: Value(maxFlameCounter),
+      maxFlameCounterFrom: maxFlameCounterFrom == null && nullToAbsent
+          ? const Value.absent()
+          : Value(maxFlameCounterFrom),
+      lastMessageExchange: Value(lastMessageExchange),
+    );
+  }
+
+  factory GroupsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return GroupsData(
+      groupId: serializer.fromJson<String>(json['groupId']),
+      isGroupAdmin: serializer.fromJson<int>(json['isGroupAdmin']),
+      isDirectChat: serializer.fromJson<int>(json['isDirectChat']),
+      pinned: serializer.fromJson<int>(json['pinned']),
+      archived: serializer.fromJson<int>(json['archived']),
+      joinedGroup: serializer.fromJson<int>(json['joinedGroup']),
+      leftGroup: serializer.fromJson<int>(json['leftGroup']),
+      deletedContent: serializer.fromJson<int>(json['deletedContent']),
+      stateVersionId: serializer.fromJson<int>(json['stateVersionId']),
+      stateEncryptionKey: serializer.fromJson<i2.Uint8List?>(
+        json['stateEncryptionKey'],
+      ),
+      myGroupPrivateKey: serializer.fromJson<i2.Uint8List?>(
+        json['myGroupPrivateKey'],
+      ),
+      groupName: serializer.fromJson<String>(json['groupName']),
+      draftMessage: serializer.fromJson<String?>(json['draftMessage']),
+      totalMediaCounter: serializer.fromJson<int>(json['totalMediaCounter']),
+      alsoBestFriend: serializer.fromJson<int>(json['alsoBestFriend']),
+      deleteMessagesAfterMilliseconds: serializer.fromJson<int>(
+        json['deleteMessagesAfterMilliseconds'],
+      ),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+      lastMessageSend: serializer.fromJson<int?>(json['lastMessageSend']),
+      lastMessageReceived: serializer.fromJson<int?>(
+        json['lastMessageReceived'],
+      ),
+      lastFlameCounterChange: serializer.fromJson<int?>(
+        json['lastFlameCounterChange'],
+      ),
+      lastFlameSync: serializer.fromJson<int?>(json['lastFlameSync']),
+      flameCounter: serializer.fromJson<int>(json['flameCounter']),
+      maxFlameCounter: serializer.fromJson<int>(json['maxFlameCounter']),
+      maxFlameCounterFrom: serializer.fromJson<int?>(
+        json['maxFlameCounterFrom'],
+      ),
+      lastMessageExchange: serializer.fromJson<int>(
+        json['lastMessageExchange'],
+      ),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'groupId': serializer.toJson<String>(groupId),
+      'isGroupAdmin': serializer.toJson<int>(isGroupAdmin),
+      'isDirectChat': serializer.toJson<int>(isDirectChat),
+      'pinned': serializer.toJson<int>(pinned),
+      'archived': serializer.toJson<int>(archived),
+      'joinedGroup': serializer.toJson<int>(joinedGroup),
+      'leftGroup': serializer.toJson<int>(leftGroup),
+      'deletedContent': serializer.toJson<int>(deletedContent),
+      'stateVersionId': serializer.toJson<int>(stateVersionId),
+      'stateEncryptionKey': serializer.toJson<i2.Uint8List?>(
+        stateEncryptionKey,
+      ),
+      'myGroupPrivateKey': serializer.toJson<i2.Uint8List?>(myGroupPrivateKey),
+      'groupName': serializer.toJson<String>(groupName),
+      'draftMessage': serializer.toJson<String?>(draftMessage),
+      'totalMediaCounter': serializer.toJson<int>(totalMediaCounter),
+      'alsoBestFriend': serializer.toJson<int>(alsoBestFriend),
+      'deleteMessagesAfterMilliseconds': serializer.toJson<int>(
+        deleteMessagesAfterMilliseconds,
+      ),
+      'createdAt': serializer.toJson<int>(createdAt),
+      'lastMessageSend': serializer.toJson<int?>(lastMessageSend),
+      'lastMessageReceived': serializer.toJson<int?>(lastMessageReceived),
+      'lastFlameCounterChange': serializer.toJson<int?>(lastFlameCounterChange),
+      'lastFlameSync': serializer.toJson<int?>(lastFlameSync),
+      'flameCounter': serializer.toJson<int>(flameCounter),
+      'maxFlameCounter': serializer.toJson<int>(maxFlameCounter),
+      'maxFlameCounterFrom': serializer.toJson<int?>(maxFlameCounterFrom),
+      'lastMessageExchange': serializer.toJson<int>(lastMessageExchange),
+    };
+  }
+
+  GroupsData copyWith({
+    String? groupId,
+    int? isGroupAdmin,
+    int? isDirectChat,
+    int? pinned,
+    int? archived,
+    int? joinedGroup,
+    int? leftGroup,
+    int? deletedContent,
+    int? stateVersionId,
+    Value<i2.Uint8List?> stateEncryptionKey = const Value.absent(),
+    Value<i2.Uint8List?> myGroupPrivateKey = const Value.absent(),
+    String? groupName,
+    Value<String?> draftMessage = const Value.absent(),
+    int? totalMediaCounter,
+    int? alsoBestFriend,
+    int? deleteMessagesAfterMilliseconds,
+    int? createdAt,
+    Value<int?> lastMessageSend = const Value.absent(),
+    Value<int?> lastMessageReceived = const Value.absent(),
+    Value<int?> lastFlameCounterChange = const Value.absent(),
+    Value<int?> lastFlameSync = const Value.absent(),
+    int? flameCounter,
+    int? maxFlameCounter,
+    Value<int?> maxFlameCounterFrom = const Value.absent(),
+    int? lastMessageExchange,
+  }) => GroupsData(
+    groupId: groupId ?? this.groupId,
+    isGroupAdmin: isGroupAdmin ?? this.isGroupAdmin,
+    isDirectChat: isDirectChat ?? this.isDirectChat,
+    pinned: pinned ?? this.pinned,
+    archived: archived ?? this.archived,
+    joinedGroup: joinedGroup ?? this.joinedGroup,
+    leftGroup: leftGroup ?? this.leftGroup,
+    deletedContent: deletedContent ?? this.deletedContent,
+    stateVersionId: stateVersionId ?? this.stateVersionId,
+    stateEncryptionKey: stateEncryptionKey.present
+        ? stateEncryptionKey.value
+        : this.stateEncryptionKey,
+    myGroupPrivateKey: myGroupPrivateKey.present
+        ? myGroupPrivateKey.value
+        : this.myGroupPrivateKey,
+    groupName: groupName ?? this.groupName,
+    draftMessage: draftMessage.present ? draftMessage.value : this.draftMessage,
+    totalMediaCounter: totalMediaCounter ?? this.totalMediaCounter,
+    alsoBestFriend: alsoBestFriend ?? this.alsoBestFriend,
+    deleteMessagesAfterMilliseconds:
+        deleteMessagesAfterMilliseconds ?? this.deleteMessagesAfterMilliseconds,
+    createdAt: createdAt ?? this.createdAt,
+    lastMessageSend: lastMessageSend.present
+        ? lastMessageSend.value
+        : this.lastMessageSend,
+    lastMessageReceived: lastMessageReceived.present
+        ? lastMessageReceived.value
+        : this.lastMessageReceived,
+    lastFlameCounterChange: lastFlameCounterChange.present
+        ? lastFlameCounterChange.value
+        : this.lastFlameCounterChange,
+    lastFlameSync: lastFlameSync.present
+        ? lastFlameSync.value
+        : this.lastFlameSync,
+    flameCounter: flameCounter ?? this.flameCounter,
+    maxFlameCounter: maxFlameCounter ?? this.maxFlameCounter,
+    maxFlameCounterFrom: maxFlameCounterFrom.present
+        ? maxFlameCounterFrom.value
+        : this.maxFlameCounterFrom,
+    lastMessageExchange: lastMessageExchange ?? this.lastMessageExchange,
+  );
+  GroupsData copyWithCompanion(GroupsCompanion data) {
+    return GroupsData(
+      groupId: data.groupId.present ? data.groupId.value : this.groupId,
+      isGroupAdmin: data.isGroupAdmin.present
+          ? data.isGroupAdmin.value
+          : this.isGroupAdmin,
+      isDirectChat: data.isDirectChat.present
+          ? data.isDirectChat.value
+          : this.isDirectChat,
+      pinned: data.pinned.present ? data.pinned.value : this.pinned,
+      archived: data.archived.present ? data.archived.value : this.archived,
+      joinedGroup: data.joinedGroup.present
+          ? data.joinedGroup.value
+          : this.joinedGroup,
+      leftGroup: data.leftGroup.present ? data.leftGroup.value : this.leftGroup,
+      deletedContent: data.deletedContent.present
+          ? data.deletedContent.value
+          : this.deletedContent,
+      stateVersionId: data.stateVersionId.present
+          ? data.stateVersionId.value
+          : this.stateVersionId,
+      stateEncryptionKey: data.stateEncryptionKey.present
+          ? data.stateEncryptionKey.value
+          : this.stateEncryptionKey,
+      myGroupPrivateKey: data.myGroupPrivateKey.present
+          ? data.myGroupPrivateKey.value
+          : this.myGroupPrivateKey,
+      groupName: data.groupName.present ? data.groupName.value : this.groupName,
+      draftMessage: data.draftMessage.present
+          ? data.draftMessage.value
+          : this.draftMessage,
+      totalMediaCounter: data.totalMediaCounter.present
+          ? data.totalMediaCounter.value
+          : this.totalMediaCounter,
+      alsoBestFriend: data.alsoBestFriend.present
+          ? data.alsoBestFriend.value
+          : this.alsoBestFriend,
+      deleteMessagesAfterMilliseconds:
+          data.deleteMessagesAfterMilliseconds.present
+          ? data.deleteMessagesAfterMilliseconds.value
+          : this.deleteMessagesAfterMilliseconds,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      lastMessageSend: data.lastMessageSend.present
+          ? data.lastMessageSend.value
+          : this.lastMessageSend,
+      lastMessageReceived: data.lastMessageReceived.present
+          ? data.lastMessageReceived.value
+          : this.lastMessageReceived,
+      lastFlameCounterChange: data.lastFlameCounterChange.present
+          ? data.lastFlameCounterChange.value
+          : this.lastFlameCounterChange,
+      lastFlameSync: data.lastFlameSync.present
+          ? data.lastFlameSync.value
+          : this.lastFlameSync,
+      flameCounter: data.flameCounter.present
+          ? data.flameCounter.value
+          : this.flameCounter,
+      maxFlameCounter: data.maxFlameCounter.present
+          ? data.maxFlameCounter.value
+          : this.maxFlameCounter,
+      maxFlameCounterFrom: data.maxFlameCounterFrom.present
+          ? data.maxFlameCounterFrom.value
+          : this.maxFlameCounterFrom,
+      lastMessageExchange: data.lastMessageExchange.present
+          ? data.lastMessageExchange.value
+          : this.lastMessageExchange,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('GroupsData(')
+          ..write('groupId: $groupId, ')
+          ..write('isGroupAdmin: $isGroupAdmin, ')
+          ..write('isDirectChat: $isDirectChat, ')
+          ..write('pinned: $pinned, ')
+          ..write('archived: $archived, ')
+          ..write('joinedGroup: $joinedGroup, ')
+          ..write('leftGroup: $leftGroup, ')
+          ..write('deletedContent: $deletedContent, ')
+          ..write('stateVersionId: $stateVersionId, ')
+          ..write('stateEncryptionKey: $stateEncryptionKey, ')
+          ..write('myGroupPrivateKey: $myGroupPrivateKey, ')
+          ..write('groupName: $groupName, ')
+          ..write('draftMessage: $draftMessage, ')
+          ..write('totalMediaCounter: $totalMediaCounter, ')
+          ..write('alsoBestFriend: $alsoBestFriend, ')
+          ..write(
+            'deleteMessagesAfterMilliseconds: $deleteMessagesAfterMilliseconds, ',
+          )
+          ..write('createdAt: $createdAt, ')
+          ..write('lastMessageSend: $lastMessageSend, ')
+          ..write('lastMessageReceived: $lastMessageReceived, ')
+          ..write('lastFlameCounterChange: $lastFlameCounterChange, ')
+          ..write('lastFlameSync: $lastFlameSync, ')
+          ..write('flameCounter: $flameCounter, ')
+          ..write('maxFlameCounter: $maxFlameCounter, ')
+          ..write('maxFlameCounterFrom: $maxFlameCounterFrom, ')
+          ..write('lastMessageExchange: $lastMessageExchange')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hashAll([
+    groupId,
+    isGroupAdmin,
+    isDirectChat,
+    pinned,
+    archived,
+    joinedGroup,
+    leftGroup,
+    deletedContent,
+    stateVersionId,
+    $driftBlobEquality.hash(stateEncryptionKey),
+    $driftBlobEquality.hash(myGroupPrivateKey),
+    groupName,
+    draftMessage,
+    totalMediaCounter,
+    alsoBestFriend,
+    deleteMessagesAfterMilliseconds,
+    createdAt,
+    lastMessageSend,
+    lastMessageReceived,
+    lastFlameCounterChange,
+    lastFlameSync,
+    flameCounter,
+    maxFlameCounter,
+    maxFlameCounterFrom,
+    lastMessageExchange,
+  ]);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is GroupsData &&
+          other.groupId == this.groupId &&
+          other.isGroupAdmin == this.isGroupAdmin &&
+          other.isDirectChat == this.isDirectChat &&
+          other.pinned == this.pinned &&
+          other.archived == this.archived &&
+          other.joinedGroup == this.joinedGroup &&
+          other.leftGroup == this.leftGroup &&
+          other.deletedContent == this.deletedContent &&
+          other.stateVersionId == this.stateVersionId &&
+          $driftBlobEquality.equals(
+            other.stateEncryptionKey,
+            this.stateEncryptionKey,
+          ) &&
+          $driftBlobEquality.equals(
+            other.myGroupPrivateKey,
+            this.myGroupPrivateKey,
+          ) &&
+          other.groupName == this.groupName &&
+          other.draftMessage == this.draftMessage &&
+          other.totalMediaCounter == this.totalMediaCounter &&
+          other.alsoBestFriend == this.alsoBestFriend &&
+          other.deleteMessagesAfterMilliseconds ==
+              this.deleteMessagesAfterMilliseconds &&
+          other.createdAt == this.createdAt &&
+          other.lastMessageSend == this.lastMessageSend &&
+          other.lastMessageReceived == this.lastMessageReceived &&
+          other.lastFlameCounterChange == this.lastFlameCounterChange &&
+          other.lastFlameSync == this.lastFlameSync &&
+          other.flameCounter == this.flameCounter &&
+          other.maxFlameCounter == this.maxFlameCounter &&
+          other.maxFlameCounterFrom == this.maxFlameCounterFrom &&
+          other.lastMessageExchange == this.lastMessageExchange);
+}
+
+class GroupsCompanion extends UpdateCompanion<GroupsData> {
+  final Value<String> groupId;
+  final Value<int> isGroupAdmin;
+  final Value<int> isDirectChat;
+  final Value<int> pinned;
+  final Value<int> archived;
+  final Value<int> joinedGroup;
+  final Value<int> leftGroup;
+  final Value<int> deletedContent;
+  final Value<int> stateVersionId;
+  final Value<i2.Uint8List?> stateEncryptionKey;
+  final Value<i2.Uint8List?> myGroupPrivateKey;
+  final Value<String> groupName;
+  final Value<String?> draftMessage;
+  final Value<int> totalMediaCounter;
+  final Value<int> alsoBestFriend;
+  final Value<int> deleteMessagesAfterMilliseconds;
+  final Value<int> createdAt;
+  final Value<int?> lastMessageSend;
+  final Value<int?> lastMessageReceived;
+  final Value<int?> lastFlameCounterChange;
+  final Value<int?> lastFlameSync;
+  final Value<int> flameCounter;
+  final Value<int> maxFlameCounter;
+  final Value<int?> maxFlameCounterFrom;
+  final Value<int> lastMessageExchange;
+  final Value<int> rowid;
+  const GroupsCompanion({
+    this.groupId = const Value.absent(),
+    this.isGroupAdmin = const Value.absent(),
+    this.isDirectChat = const Value.absent(),
+    this.pinned = const Value.absent(),
+    this.archived = const Value.absent(),
+    this.joinedGroup = const Value.absent(),
+    this.leftGroup = const Value.absent(),
+    this.deletedContent = const Value.absent(),
+    this.stateVersionId = const Value.absent(),
+    this.stateEncryptionKey = const Value.absent(),
+    this.myGroupPrivateKey = const Value.absent(),
+    this.groupName = const Value.absent(),
+    this.draftMessage = const Value.absent(),
+    this.totalMediaCounter = const Value.absent(),
+    this.alsoBestFriend = const Value.absent(),
+    this.deleteMessagesAfterMilliseconds = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.lastMessageSend = const Value.absent(),
+    this.lastMessageReceived = const Value.absent(),
+    this.lastFlameCounterChange = const Value.absent(),
+    this.lastFlameSync = const Value.absent(),
+    this.flameCounter = const Value.absent(),
+    this.maxFlameCounter = const Value.absent(),
+    this.maxFlameCounterFrom = const Value.absent(),
+    this.lastMessageExchange = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  GroupsCompanion.insert({
+    required String groupId,
+    this.isGroupAdmin = const Value.absent(),
+    this.isDirectChat = const Value.absent(),
+    this.pinned = const Value.absent(),
+    this.archived = const Value.absent(),
+    this.joinedGroup = const Value.absent(),
+    this.leftGroup = const Value.absent(),
+    this.deletedContent = const Value.absent(),
+    this.stateVersionId = const Value.absent(),
+    this.stateEncryptionKey = const Value.absent(),
+    this.myGroupPrivateKey = const Value.absent(),
+    required String groupName,
+    this.draftMessage = const Value.absent(),
+    this.totalMediaCounter = const Value.absent(),
+    this.alsoBestFriend = const Value.absent(),
+    this.deleteMessagesAfterMilliseconds = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.lastMessageSend = const Value.absent(),
+    this.lastMessageReceived = const Value.absent(),
+    this.lastFlameCounterChange = const Value.absent(),
+    this.lastFlameSync = const Value.absent(),
+    this.flameCounter = const Value.absent(),
+    this.maxFlameCounter = const Value.absent(),
+    this.maxFlameCounterFrom = const Value.absent(),
+    this.lastMessageExchange = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : groupId = Value(groupId),
+       groupName = Value(groupName);
+  static Insertable<GroupsData> custom({
+    Expression<String>? groupId,
+    Expression<int>? isGroupAdmin,
+    Expression<int>? isDirectChat,
+    Expression<int>? pinned,
+    Expression<int>? archived,
+    Expression<int>? joinedGroup,
+    Expression<int>? leftGroup,
+    Expression<int>? deletedContent,
+    Expression<int>? stateVersionId,
+    Expression<i2.Uint8List>? stateEncryptionKey,
+    Expression<i2.Uint8List>? myGroupPrivateKey,
+    Expression<String>? groupName,
+    Expression<String>? draftMessage,
+    Expression<int>? totalMediaCounter,
+    Expression<int>? alsoBestFriend,
+    Expression<int>? deleteMessagesAfterMilliseconds,
+    Expression<int>? createdAt,
+    Expression<int>? lastMessageSend,
+    Expression<int>? lastMessageReceived,
+    Expression<int>? lastFlameCounterChange,
+    Expression<int>? lastFlameSync,
+    Expression<int>? flameCounter,
+    Expression<int>? maxFlameCounter,
+    Expression<int>? maxFlameCounterFrom,
+    Expression<int>? lastMessageExchange,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (groupId != null) 'group_id': groupId,
+      if (isGroupAdmin != null) 'is_group_admin': isGroupAdmin,
+      if (isDirectChat != null) 'is_direct_chat': isDirectChat,
+      if (pinned != null) 'pinned': pinned,
+      if (archived != null) 'archived': archived,
+      if (joinedGroup != null) 'joined_group': joinedGroup,
+      if (leftGroup != null) 'left_group': leftGroup,
+      if (deletedContent != null) 'deleted_content': deletedContent,
+      if (stateVersionId != null) 'state_version_id': stateVersionId,
+      if (stateEncryptionKey != null)
+        'state_encryption_key': stateEncryptionKey,
+      if (myGroupPrivateKey != null) 'my_group_private_key': myGroupPrivateKey,
+      if (groupName != null) 'group_name': groupName,
+      if (draftMessage != null) 'draft_message': draftMessage,
+      if (totalMediaCounter != null) 'total_media_counter': totalMediaCounter,
+      if (alsoBestFriend != null) 'also_best_friend': alsoBestFriend,
+      if (deleteMessagesAfterMilliseconds != null)
+        'delete_messages_after_milliseconds': deleteMessagesAfterMilliseconds,
+      if (createdAt != null) 'created_at': createdAt,
+      if (lastMessageSend != null) 'last_message_send': lastMessageSend,
+      if (lastMessageReceived != null)
+        'last_message_received': lastMessageReceived,
+      if (lastFlameCounterChange != null)
+        'last_flame_counter_change': lastFlameCounterChange,
+      if (lastFlameSync != null) 'last_flame_sync': lastFlameSync,
+      if (flameCounter != null) 'flame_counter': flameCounter,
+      if (maxFlameCounter != null) 'max_flame_counter': maxFlameCounter,
+      if (maxFlameCounterFrom != null)
+        'max_flame_counter_from': maxFlameCounterFrom,
+      if (lastMessageExchange != null)
+        'last_message_exchange': lastMessageExchange,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  GroupsCompanion copyWith({
+    Value<String>? groupId,
+    Value<int>? isGroupAdmin,
+    Value<int>? isDirectChat,
+    Value<int>? pinned,
+    Value<int>? archived,
+    Value<int>? joinedGroup,
+    Value<int>? leftGroup,
+    Value<int>? deletedContent,
+    Value<int>? stateVersionId,
+    Value<i2.Uint8List?>? stateEncryptionKey,
+    Value<i2.Uint8List?>? myGroupPrivateKey,
+    Value<String>? groupName,
+    Value<String?>? draftMessage,
+    Value<int>? totalMediaCounter,
+    Value<int>? alsoBestFriend,
+    Value<int>? deleteMessagesAfterMilliseconds,
+    Value<int>? createdAt,
+    Value<int?>? lastMessageSend,
+    Value<int?>? lastMessageReceived,
+    Value<int?>? lastFlameCounterChange,
+    Value<int?>? lastFlameSync,
+    Value<int>? flameCounter,
+    Value<int>? maxFlameCounter,
+    Value<int?>? maxFlameCounterFrom,
+    Value<int>? lastMessageExchange,
+    Value<int>? rowid,
+  }) {
+    return GroupsCompanion(
+      groupId: groupId ?? this.groupId,
+      isGroupAdmin: isGroupAdmin ?? this.isGroupAdmin,
+      isDirectChat: isDirectChat ?? this.isDirectChat,
+      pinned: pinned ?? this.pinned,
+      archived: archived ?? this.archived,
+      joinedGroup: joinedGroup ?? this.joinedGroup,
+      leftGroup: leftGroup ?? this.leftGroup,
+      deletedContent: deletedContent ?? this.deletedContent,
+      stateVersionId: stateVersionId ?? this.stateVersionId,
+      stateEncryptionKey: stateEncryptionKey ?? this.stateEncryptionKey,
+      myGroupPrivateKey: myGroupPrivateKey ?? this.myGroupPrivateKey,
+      groupName: groupName ?? this.groupName,
+      draftMessage: draftMessage ?? this.draftMessage,
+      totalMediaCounter: totalMediaCounter ?? this.totalMediaCounter,
+      alsoBestFriend: alsoBestFriend ?? this.alsoBestFriend,
+      deleteMessagesAfterMilliseconds:
+          deleteMessagesAfterMilliseconds ??
+          this.deleteMessagesAfterMilliseconds,
+      createdAt: createdAt ?? this.createdAt,
+      lastMessageSend: lastMessageSend ?? this.lastMessageSend,
+      lastMessageReceived: lastMessageReceived ?? this.lastMessageReceived,
+      lastFlameCounterChange:
+          lastFlameCounterChange ?? this.lastFlameCounterChange,
+      lastFlameSync: lastFlameSync ?? this.lastFlameSync,
+      flameCounter: flameCounter ?? this.flameCounter,
+      maxFlameCounter: maxFlameCounter ?? this.maxFlameCounter,
+      maxFlameCounterFrom: maxFlameCounterFrom ?? this.maxFlameCounterFrom,
+      lastMessageExchange: lastMessageExchange ?? this.lastMessageExchange,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (groupId.present) {
+      map['group_id'] = Variable<String>(groupId.value);
+    }
+    if (isGroupAdmin.present) {
+      map['is_group_admin'] = Variable<int>(isGroupAdmin.value);
+    }
+    if (isDirectChat.present) {
+      map['is_direct_chat'] = Variable<int>(isDirectChat.value);
+    }
+    if (pinned.present) {
+      map['pinned'] = Variable<int>(pinned.value);
+    }
+    if (archived.present) {
+      map['archived'] = Variable<int>(archived.value);
+    }
+    if (joinedGroup.present) {
+      map['joined_group'] = Variable<int>(joinedGroup.value);
+    }
+    if (leftGroup.present) {
+      map['left_group'] = Variable<int>(leftGroup.value);
+    }
+    if (deletedContent.present) {
+      map['deleted_content'] = Variable<int>(deletedContent.value);
+    }
+    if (stateVersionId.present) {
+      map['state_version_id'] = Variable<int>(stateVersionId.value);
+    }
+    if (stateEncryptionKey.present) {
+      map['state_encryption_key'] = Variable<i2.Uint8List>(
+        stateEncryptionKey.value,
+      );
+    }
+    if (myGroupPrivateKey.present) {
+      map['my_group_private_key'] = Variable<i2.Uint8List>(
+        myGroupPrivateKey.value,
+      );
+    }
+    if (groupName.present) {
+      map['group_name'] = Variable<String>(groupName.value);
+    }
+    if (draftMessage.present) {
+      map['draft_message'] = Variable<String>(draftMessage.value);
+    }
+    if (totalMediaCounter.present) {
+      map['total_media_counter'] = Variable<int>(totalMediaCounter.value);
+    }
+    if (alsoBestFriend.present) {
+      map['also_best_friend'] = Variable<int>(alsoBestFriend.value);
+    }
+    if (deleteMessagesAfterMilliseconds.present) {
+      map['delete_messages_after_milliseconds'] = Variable<int>(
+        deleteMessagesAfterMilliseconds.value,
+      );
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (lastMessageSend.present) {
+      map['last_message_send'] = Variable<int>(lastMessageSend.value);
+    }
+    if (lastMessageReceived.present) {
+      map['last_message_received'] = Variable<int>(lastMessageReceived.value);
+    }
+    if (lastFlameCounterChange.present) {
+      map['last_flame_counter_change'] = Variable<int>(
+        lastFlameCounterChange.value,
+      );
+    }
+    if (lastFlameSync.present) {
+      map['last_flame_sync'] = Variable<int>(lastFlameSync.value);
+    }
+    if (flameCounter.present) {
+      map['flame_counter'] = Variable<int>(flameCounter.value);
+    }
+    if (maxFlameCounter.present) {
+      map['max_flame_counter'] = Variable<int>(maxFlameCounter.value);
+    }
+    if (maxFlameCounterFrom.present) {
+      map['max_flame_counter_from'] = Variable<int>(maxFlameCounterFrom.value);
+    }
+    if (lastMessageExchange.present) {
+      map['last_message_exchange'] = Variable<int>(lastMessageExchange.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('GroupsCompanion(')
+          ..write('groupId: $groupId, ')
+          ..write('isGroupAdmin: $isGroupAdmin, ')
+          ..write('isDirectChat: $isDirectChat, ')
+          ..write('pinned: $pinned, ')
+          ..write('archived: $archived, ')
+          ..write('joinedGroup: $joinedGroup, ')
+          ..write('leftGroup: $leftGroup, ')
+          ..write('deletedContent: $deletedContent, ')
+          ..write('stateVersionId: $stateVersionId, ')
+          ..write('stateEncryptionKey: $stateEncryptionKey, ')
+          ..write('myGroupPrivateKey: $myGroupPrivateKey, ')
+          ..write('groupName: $groupName, ')
+          ..write('draftMessage: $draftMessage, ')
+          ..write('totalMediaCounter: $totalMediaCounter, ')
+          ..write('alsoBestFriend: $alsoBestFriend, ')
+          ..write(
+            'deleteMessagesAfterMilliseconds: $deleteMessagesAfterMilliseconds, ',
+          )
+          ..write('createdAt: $createdAt, ')
+          ..write('lastMessageSend: $lastMessageSend, ')
+          ..write('lastMessageReceived: $lastMessageReceived, ')
+          ..write('lastFlameCounterChange: $lastFlameCounterChange, ')
+          ..write('lastFlameSync: $lastFlameSync, ')
+          ..write('flameCounter: $flameCounter, ')
+          ..write('maxFlameCounter: $maxFlameCounter, ')
+          ..write('maxFlameCounterFrom: $maxFlameCounterFrom, ')
+          ..write('lastMessageExchange: $lastMessageExchange, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class MediaFiles extends Table with TableInfo<MediaFiles, MediaFilesData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  MediaFiles(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> mediaId = GeneratedColumn<String>(
+    'media_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> type = GeneratedColumn<String>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> uploadState = GeneratedColumn<String>(
+    'upload_state',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<String> downloadState = GeneratedColumn<String>(
+    'download_state',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> requiresAuthentication = GeneratedColumn<int>(
+    'requires_authentication',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT 0 CHECK (requires_authentication IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> stored = GeneratedColumn<int>(
+    'stored',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK ("stored" IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> isDraftMedia = GeneratedColumn<int>(
+    'is_draft_media',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (is_draft_media IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> preProgressingProcess = GeneratedColumn<int>(
+    'pre_progressing_process',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<String> reuploadRequestedBy =
+      GeneratedColumn<String>(
+        'reupload_requested_by',
+        aliasedName,
+        true,
+        type: DriftSqlType.string,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> displayLimitInMilliseconds =
+      GeneratedColumn<int>(
+        'display_limit_in_milliseconds',
+        aliasedName,
+        true,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> removeAudio = GeneratedColumn<int>(
+    'remove_audio',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL CHECK (remove_audio IN (0, 1))',
+  );
+  late final GeneratedColumn<i2.Uint8List> downloadToken =
+      GeneratedColumn<i2.Uint8List>(
+        'download_token',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<i2.Uint8List> encryptionKey =
+      GeneratedColumn<i2.Uint8List>(
+        'encryption_key',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<i2.Uint8List> encryptionMac =
+      GeneratedColumn<i2.Uint8List>(
+        'encryption_mac',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<i2.Uint8List> encryptionNonce =
+      GeneratedColumn<i2.Uint8List>(
+        'encryption_nonce',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<i2.Uint8List> storedFileHash =
+      GeneratedColumn<i2.Uint8List>(
+        'stored_file_hash',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    mediaId,
+    type,
+    uploadState,
+    downloadState,
+    requiresAuthentication,
+    stored,
+    isDraftMedia,
+    preProgressingProcess,
+    reuploadRequestedBy,
+    displayLimitInMilliseconds,
+    removeAudio,
+    downloadToken,
+    encryptionKey,
+    encryptionMac,
+    encryptionNonce,
+    storedFileHash,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'media_files';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {mediaId};
+  @override
+  MediaFilesData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return MediaFilesData(
+      mediaId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}media_id'],
+      )!,
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}type'],
+      )!,
+      uploadState: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}upload_state'],
+      ),
+      downloadState: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}download_state'],
+      ),
+      requiresAuthentication: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}requires_authentication'],
+      )!,
+      stored: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}stored'],
+      )!,
+      isDraftMedia: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}is_draft_media'],
+      )!,
+      preProgressingProcess: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}pre_progressing_process'],
+      ),
+      reuploadRequestedBy: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}reupload_requested_by'],
+      ),
+      displayLimitInMilliseconds: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}display_limit_in_milliseconds'],
+      ),
+      removeAudio: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}remove_audio'],
+      ),
+      downloadToken: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}download_token'],
+      ),
+      encryptionKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}encryption_key'],
+      ),
+      encryptionMac: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}encryption_mac'],
+      ),
+      encryptionNonce: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}encryption_nonce'],
+      ),
+      storedFileHash: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}stored_file_hash'],
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  MediaFiles createAlias(String alias) {
+    return MediaFiles(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(media_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class MediaFilesData extends DataClass implements Insertable<MediaFilesData> {
+  final String mediaId;
+  final String type;
+  final String? uploadState;
+  final String? downloadState;
+  final int requiresAuthentication;
+  final int stored;
+  final int isDraftMedia;
+  final int? preProgressingProcess;
+  final String? reuploadRequestedBy;
+  final int? displayLimitInMilliseconds;
+  final int? removeAudio;
+  final i2.Uint8List? downloadToken;
+  final i2.Uint8List? encryptionKey;
+  final i2.Uint8List? encryptionMac;
+  final i2.Uint8List? encryptionNonce;
+  final i2.Uint8List? storedFileHash;
+  final int createdAt;
+  const MediaFilesData({
+    required this.mediaId,
+    required this.type,
+    this.uploadState,
+    this.downloadState,
+    required this.requiresAuthentication,
+    required this.stored,
+    required this.isDraftMedia,
+    this.preProgressingProcess,
+    this.reuploadRequestedBy,
+    this.displayLimitInMilliseconds,
+    this.removeAudio,
+    this.downloadToken,
+    this.encryptionKey,
+    this.encryptionMac,
+    this.encryptionNonce,
+    this.storedFileHash,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['media_id'] = Variable<String>(mediaId);
+    map['type'] = Variable<String>(type);
+    if (!nullToAbsent || uploadState != null) {
+      map['upload_state'] = Variable<String>(uploadState);
+    }
+    if (!nullToAbsent || downloadState != null) {
+      map['download_state'] = Variable<String>(downloadState);
+    }
+    map['requires_authentication'] = Variable<int>(requiresAuthentication);
+    map['stored'] = Variable<int>(stored);
+    map['is_draft_media'] = Variable<int>(isDraftMedia);
+    if (!nullToAbsent || preProgressingProcess != null) {
+      map['pre_progressing_process'] = Variable<int>(preProgressingProcess);
+    }
+    if (!nullToAbsent || reuploadRequestedBy != null) {
+      map['reupload_requested_by'] = Variable<String>(reuploadRequestedBy);
+    }
+    if (!nullToAbsent || displayLimitInMilliseconds != null) {
+      map['display_limit_in_milliseconds'] = Variable<int>(
+        displayLimitInMilliseconds,
+      );
+    }
+    if (!nullToAbsent || removeAudio != null) {
+      map['remove_audio'] = Variable<int>(removeAudio);
+    }
+    if (!nullToAbsent || downloadToken != null) {
+      map['download_token'] = Variable<i2.Uint8List>(downloadToken);
+    }
+    if (!nullToAbsent || encryptionKey != null) {
+      map['encryption_key'] = Variable<i2.Uint8List>(encryptionKey);
+    }
+    if (!nullToAbsent || encryptionMac != null) {
+      map['encryption_mac'] = Variable<i2.Uint8List>(encryptionMac);
+    }
+    if (!nullToAbsent || encryptionNonce != null) {
+      map['encryption_nonce'] = Variable<i2.Uint8List>(encryptionNonce);
+    }
+    if (!nullToAbsent || storedFileHash != null) {
+      map['stored_file_hash'] = Variable<i2.Uint8List>(storedFileHash);
+    }
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  MediaFilesCompanion toCompanion(bool nullToAbsent) {
+    return MediaFilesCompanion(
+      mediaId: Value(mediaId),
+      type: Value(type),
+      uploadState: uploadState == null && nullToAbsent
+          ? const Value.absent()
+          : Value(uploadState),
+      downloadState: downloadState == null && nullToAbsent
+          ? const Value.absent()
+          : Value(downloadState),
+      requiresAuthentication: Value(requiresAuthentication),
+      stored: Value(stored),
+      isDraftMedia: Value(isDraftMedia),
+      preProgressingProcess: preProgressingProcess == null && nullToAbsent
+          ? const Value.absent()
+          : Value(preProgressingProcess),
+      reuploadRequestedBy: reuploadRequestedBy == null && nullToAbsent
+          ? const Value.absent()
+          : Value(reuploadRequestedBy),
+      displayLimitInMilliseconds:
+          displayLimitInMilliseconds == null && nullToAbsent
+          ? const Value.absent()
+          : Value(displayLimitInMilliseconds),
+      removeAudio: removeAudio == null && nullToAbsent
+          ? const Value.absent()
+          : Value(removeAudio),
+      downloadToken: downloadToken == null && nullToAbsent
+          ? const Value.absent()
+          : Value(downloadToken),
+      encryptionKey: encryptionKey == null && nullToAbsent
+          ? const Value.absent()
+          : Value(encryptionKey),
+      encryptionMac: encryptionMac == null && nullToAbsent
+          ? const Value.absent()
+          : Value(encryptionMac),
+      encryptionNonce: encryptionNonce == null && nullToAbsent
+          ? const Value.absent()
+          : Value(encryptionNonce),
+      storedFileHash: storedFileHash == null && nullToAbsent
+          ? const Value.absent()
+          : Value(storedFileHash),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory MediaFilesData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return MediaFilesData(
+      mediaId: serializer.fromJson<String>(json['mediaId']),
+      type: serializer.fromJson<String>(json['type']),
+      uploadState: serializer.fromJson<String?>(json['uploadState']),
+      downloadState: serializer.fromJson<String?>(json['downloadState']),
+      requiresAuthentication: serializer.fromJson<int>(
+        json['requiresAuthentication'],
+      ),
+      stored: serializer.fromJson<int>(json['stored']),
+      isDraftMedia: serializer.fromJson<int>(json['isDraftMedia']),
+      preProgressingProcess: serializer.fromJson<int?>(
+        json['preProgressingProcess'],
+      ),
+      reuploadRequestedBy: serializer.fromJson<String?>(
+        json['reuploadRequestedBy'],
+      ),
+      displayLimitInMilliseconds: serializer.fromJson<int?>(
+        json['displayLimitInMilliseconds'],
+      ),
+      removeAudio: serializer.fromJson<int?>(json['removeAudio']),
+      downloadToken: serializer.fromJson<i2.Uint8List?>(json['downloadToken']),
+      encryptionKey: serializer.fromJson<i2.Uint8List?>(json['encryptionKey']),
+      encryptionMac: serializer.fromJson<i2.Uint8List?>(json['encryptionMac']),
+      encryptionNonce: serializer.fromJson<i2.Uint8List?>(
+        json['encryptionNonce'],
+      ),
+      storedFileHash: serializer.fromJson<i2.Uint8List?>(
+        json['storedFileHash'],
+      ),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'mediaId': serializer.toJson<String>(mediaId),
+      'type': serializer.toJson<String>(type),
+      'uploadState': serializer.toJson<String?>(uploadState),
+      'downloadState': serializer.toJson<String?>(downloadState),
+      'requiresAuthentication': serializer.toJson<int>(requiresAuthentication),
+      'stored': serializer.toJson<int>(stored),
+      'isDraftMedia': serializer.toJson<int>(isDraftMedia),
+      'preProgressingProcess': serializer.toJson<int?>(preProgressingProcess),
+      'reuploadRequestedBy': serializer.toJson<String?>(reuploadRequestedBy),
+      'displayLimitInMilliseconds': serializer.toJson<int?>(
+        displayLimitInMilliseconds,
+      ),
+      'removeAudio': serializer.toJson<int?>(removeAudio),
+      'downloadToken': serializer.toJson<i2.Uint8List?>(downloadToken),
+      'encryptionKey': serializer.toJson<i2.Uint8List?>(encryptionKey),
+      'encryptionMac': serializer.toJson<i2.Uint8List?>(encryptionMac),
+      'encryptionNonce': serializer.toJson<i2.Uint8List?>(encryptionNonce),
+      'storedFileHash': serializer.toJson<i2.Uint8List?>(storedFileHash),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  MediaFilesData copyWith({
+    String? mediaId,
+    String? type,
+    Value<String?> uploadState = const Value.absent(),
+    Value<String?> downloadState = const Value.absent(),
+    int? requiresAuthentication,
+    int? stored,
+    int? isDraftMedia,
+    Value<int?> preProgressingProcess = const Value.absent(),
+    Value<String?> reuploadRequestedBy = const Value.absent(),
+    Value<int?> displayLimitInMilliseconds = const Value.absent(),
+    Value<int?> removeAudio = const Value.absent(),
+    Value<i2.Uint8List?> downloadToken = const Value.absent(),
+    Value<i2.Uint8List?> encryptionKey = const Value.absent(),
+    Value<i2.Uint8List?> encryptionMac = const Value.absent(),
+    Value<i2.Uint8List?> encryptionNonce = const Value.absent(),
+    Value<i2.Uint8List?> storedFileHash = const Value.absent(),
+    int? createdAt,
+  }) => MediaFilesData(
+    mediaId: mediaId ?? this.mediaId,
+    type: type ?? this.type,
+    uploadState: uploadState.present ? uploadState.value : this.uploadState,
+    downloadState: downloadState.present
+        ? downloadState.value
+        : this.downloadState,
+    requiresAuthentication:
+        requiresAuthentication ?? this.requiresAuthentication,
+    stored: stored ?? this.stored,
+    isDraftMedia: isDraftMedia ?? this.isDraftMedia,
+    preProgressingProcess: preProgressingProcess.present
+        ? preProgressingProcess.value
+        : this.preProgressingProcess,
+    reuploadRequestedBy: reuploadRequestedBy.present
+        ? reuploadRequestedBy.value
+        : this.reuploadRequestedBy,
+    displayLimitInMilliseconds: displayLimitInMilliseconds.present
+        ? displayLimitInMilliseconds.value
+        : this.displayLimitInMilliseconds,
+    removeAudio: removeAudio.present ? removeAudio.value : this.removeAudio,
+    downloadToken: downloadToken.present
+        ? downloadToken.value
+        : this.downloadToken,
+    encryptionKey: encryptionKey.present
+        ? encryptionKey.value
+        : this.encryptionKey,
+    encryptionMac: encryptionMac.present
+        ? encryptionMac.value
+        : this.encryptionMac,
+    encryptionNonce: encryptionNonce.present
+        ? encryptionNonce.value
+        : this.encryptionNonce,
+    storedFileHash: storedFileHash.present
+        ? storedFileHash.value
+        : this.storedFileHash,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  MediaFilesData copyWithCompanion(MediaFilesCompanion data) {
+    return MediaFilesData(
+      mediaId: data.mediaId.present ? data.mediaId.value : this.mediaId,
+      type: data.type.present ? data.type.value : this.type,
+      uploadState: data.uploadState.present
+          ? data.uploadState.value
+          : this.uploadState,
+      downloadState: data.downloadState.present
+          ? data.downloadState.value
+          : this.downloadState,
+      requiresAuthentication: data.requiresAuthentication.present
+          ? data.requiresAuthentication.value
+          : this.requiresAuthentication,
+      stored: data.stored.present ? data.stored.value : this.stored,
+      isDraftMedia: data.isDraftMedia.present
+          ? data.isDraftMedia.value
+          : this.isDraftMedia,
+      preProgressingProcess: data.preProgressingProcess.present
+          ? data.preProgressingProcess.value
+          : this.preProgressingProcess,
+      reuploadRequestedBy: data.reuploadRequestedBy.present
+          ? data.reuploadRequestedBy.value
+          : this.reuploadRequestedBy,
+      displayLimitInMilliseconds: data.displayLimitInMilliseconds.present
+          ? data.displayLimitInMilliseconds.value
+          : this.displayLimitInMilliseconds,
+      removeAudio: data.removeAudio.present
+          ? data.removeAudio.value
+          : this.removeAudio,
+      downloadToken: data.downloadToken.present
+          ? data.downloadToken.value
+          : this.downloadToken,
+      encryptionKey: data.encryptionKey.present
+          ? data.encryptionKey.value
+          : this.encryptionKey,
+      encryptionMac: data.encryptionMac.present
+          ? data.encryptionMac.value
+          : this.encryptionMac,
+      encryptionNonce: data.encryptionNonce.present
+          ? data.encryptionNonce.value
+          : this.encryptionNonce,
+      storedFileHash: data.storedFileHash.present
+          ? data.storedFileHash.value
+          : this.storedFileHash,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MediaFilesData(')
+          ..write('mediaId: $mediaId, ')
+          ..write('type: $type, ')
+          ..write('uploadState: $uploadState, ')
+          ..write('downloadState: $downloadState, ')
+          ..write('requiresAuthentication: $requiresAuthentication, ')
+          ..write('stored: $stored, ')
+          ..write('isDraftMedia: $isDraftMedia, ')
+          ..write('preProgressingProcess: $preProgressingProcess, ')
+          ..write('reuploadRequestedBy: $reuploadRequestedBy, ')
+          ..write('displayLimitInMilliseconds: $displayLimitInMilliseconds, ')
+          ..write('removeAudio: $removeAudio, ')
+          ..write('downloadToken: $downloadToken, ')
+          ..write('encryptionKey: $encryptionKey, ')
+          ..write('encryptionMac: $encryptionMac, ')
+          ..write('encryptionNonce: $encryptionNonce, ')
+          ..write('storedFileHash: $storedFileHash, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    mediaId,
+    type,
+    uploadState,
+    downloadState,
+    requiresAuthentication,
+    stored,
+    isDraftMedia,
+    preProgressingProcess,
+    reuploadRequestedBy,
+    displayLimitInMilliseconds,
+    removeAudio,
+    $driftBlobEquality.hash(downloadToken),
+    $driftBlobEquality.hash(encryptionKey),
+    $driftBlobEquality.hash(encryptionMac),
+    $driftBlobEquality.hash(encryptionNonce),
+    $driftBlobEquality.hash(storedFileHash),
+    createdAt,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is MediaFilesData &&
+          other.mediaId == this.mediaId &&
+          other.type == this.type &&
+          other.uploadState == this.uploadState &&
+          other.downloadState == this.downloadState &&
+          other.requiresAuthentication == this.requiresAuthentication &&
+          other.stored == this.stored &&
+          other.isDraftMedia == this.isDraftMedia &&
+          other.preProgressingProcess == this.preProgressingProcess &&
+          other.reuploadRequestedBy == this.reuploadRequestedBy &&
+          other.displayLimitInMilliseconds == this.displayLimitInMilliseconds &&
+          other.removeAudio == this.removeAudio &&
+          $driftBlobEquality.equals(other.downloadToken, this.downloadToken) &&
+          $driftBlobEquality.equals(other.encryptionKey, this.encryptionKey) &&
+          $driftBlobEquality.equals(other.encryptionMac, this.encryptionMac) &&
+          $driftBlobEquality.equals(
+            other.encryptionNonce,
+            this.encryptionNonce,
+          ) &&
+          $driftBlobEquality.equals(
+            other.storedFileHash,
+            this.storedFileHash,
+          ) &&
+          other.createdAt == this.createdAt);
+}
+
+class MediaFilesCompanion extends UpdateCompanion<MediaFilesData> {
+  final Value<String> mediaId;
+  final Value<String> type;
+  final Value<String?> uploadState;
+  final Value<String?> downloadState;
+  final Value<int> requiresAuthentication;
+  final Value<int> stored;
+  final Value<int> isDraftMedia;
+  final Value<int?> preProgressingProcess;
+  final Value<String?> reuploadRequestedBy;
+  final Value<int?> displayLimitInMilliseconds;
+  final Value<int?> removeAudio;
+  final Value<i2.Uint8List?> downloadToken;
+  final Value<i2.Uint8List?> encryptionKey;
+  final Value<i2.Uint8List?> encryptionMac;
+  final Value<i2.Uint8List?> encryptionNonce;
+  final Value<i2.Uint8List?> storedFileHash;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const MediaFilesCompanion({
+    this.mediaId = const Value.absent(),
+    this.type = const Value.absent(),
+    this.uploadState = const Value.absent(),
+    this.downloadState = const Value.absent(),
+    this.requiresAuthentication = const Value.absent(),
+    this.stored = const Value.absent(),
+    this.isDraftMedia = const Value.absent(),
+    this.preProgressingProcess = const Value.absent(),
+    this.reuploadRequestedBy = const Value.absent(),
+    this.displayLimitInMilliseconds = const Value.absent(),
+    this.removeAudio = const Value.absent(),
+    this.downloadToken = const Value.absent(),
+    this.encryptionKey = const Value.absent(),
+    this.encryptionMac = const Value.absent(),
+    this.encryptionNonce = const Value.absent(),
+    this.storedFileHash = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  MediaFilesCompanion.insert({
+    required String mediaId,
+    required String type,
+    this.uploadState = const Value.absent(),
+    this.downloadState = const Value.absent(),
+    this.requiresAuthentication = const Value.absent(),
+    this.stored = const Value.absent(),
+    this.isDraftMedia = const Value.absent(),
+    this.preProgressingProcess = const Value.absent(),
+    this.reuploadRequestedBy = const Value.absent(),
+    this.displayLimitInMilliseconds = const Value.absent(),
+    this.removeAudio = const Value.absent(),
+    this.downloadToken = const Value.absent(),
+    this.encryptionKey = const Value.absent(),
+    this.encryptionMac = const Value.absent(),
+    this.encryptionNonce = const Value.absent(),
+    this.storedFileHash = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : mediaId = Value(mediaId),
+       type = Value(type);
+  static Insertable<MediaFilesData> custom({
+    Expression<String>? mediaId,
+    Expression<String>? type,
+    Expression<String>? uploadState,
+    Expression<String>? downloadState,
+    Expression<int>? requiresAuthentication,
+    Expression<int>? stored,
+    Expression<int>? isDraftMedia,
+    Expression<int>? preProgressingProcess,
+    Expression<String>? reuploadRequestedBy,
+    Expression<int>? displayLimitInMilliseconds,
+    Expression<int>? removeAudio,
+    Expression<i2.Uint8List>? downloadToken,
+    Expression<i2.Uint8List>? encryptionKey,
+    Expression<i2.Uint8List>? encryptionMac,
+    Expression<i2.Uint8List>? encryptionNonce,
+    Expression<i2.Uint8List>? storedFileHash,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (mediaId != null) 'media_id': mediaId,
+      if (type != null) 'type': type,
+      if (uploadState != null) 'upload_state': uploadState,
+      if (downloadState != null) 'download_state': downloadState,
+      if (requiresAuthentication != null)
+        'requires_authentication': requiresAuthentication,
+      if (stored != null) 'stored': stored,
+      if (isDraftMedia != null) 'is_draft_media': isDraftMedia,
+      if (preProgressingProcess != null)
+        'pre_progressing_process': preProgressingProcess,
+      if (reuploadRequestedBy != null)
+        'reupload_requested_by': reuploadRequestedBy,
+      if (displayLimitInMilliseconds != null)
+        'display_limit_in_milliseconds': displayLimitInMilliseconds,
+      if (removeAudio != null) 'remove_audio': removeAudio,
+      if (downloadToken != null) 'download_token': downloadToken,
+      if (encryptionKey != null) 'encryption_key': encryptionKey,
+      if (encryptionMac != null) 'encryption_mac': encryptionMac,
+      if (encryptionNonce != null) 'encryption_nonce': encryptionNonce,
+      if (storedFileHash != null) 'stored_file_hash': storedFileHash,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  MediaFilesCompanion copyWith({
+    Value<String>? mediaId,
+    Value<String>? type,
+    Value<String?>? uploadState,
+    Value<String?>? downloadState,
+    Value<int>? requiresAuthentication,
+    Value<int>? stored,
+    Value<int>? isDraftMedia,
+    Value<int?>? preProgressingProcess,
+    Value<String?>? reuploadRequestedBy,
+    Value<int?>? displayLimitInMilliseconds,
+    Value<int?>? removeAudio,
+    Value<i2.Uint8List?>? downloadToken,
+    Value<i2.Uint8List?>? encryptionKey,
+    Value<i2.Uint8List?>? encryptionMac,
+    Value<i2.Uint8List?>? encryptionNonce,
+    Value<i2.Uint8List?>? storedFileHash,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return MediaFilesCompanion(
+      mediaId: mediaId ?? this.mediaId,
+      type: type ?? this.type,
+      uploadState: uploadState ?? this.uploadState,
+      downloadState: downloadState ?? this.downloadState,
+      requiresAuthentication:
+          requiresAuthentication ?? this.requiresAuthentication,
+      stored: stored ?? this.stored,
+      isDraftMedia: isDraftMedia ?? this.isDraftMedia,
+      preProgressingProcess:
+          preProgressingProcess ?? this.preProgressingProcess,
+      reuploadRequestedBy: reuploadRequestedBy ?? this.reuploadRequestedBy,
+      displayLimitInMilliseconds:
+          displayLimitInMilliseconds ?? this.displayLimitInMilliseconds,
+      removeAudio: removeAudio ?? this.removeAudio,
+      downloadToken: downloadToken ?? this.downloadToken,
+      encryptionKey: encryptionKey ?? this.encryptionKey,
+      encryptionMac: encryptionMac ?? this.encryptionMac,
+      encryptionNonce: encryptionNonce ?? this.encryptionNonce,
+      storedFileHash: storedFileHash ?? this.storedFileHash,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (mediaId.present) {
+      map['media_id'] = Variable<String>(mediaId.value);
+    }
+    if (type.present) {
+      map['type'] = Variable<String>(type.value);
+    }
+    if (uploadState.present) {
+      map['upload_state'] = Variable<String>(uploadState.value);
+    }
+    if (downloadState.present) {
+      map['download_state'] = Variable<String>(downloadState.value);
+    }
+    if (requiresAuthentication.present) {
+      map['requires_authentication'] = Variable<int>(
+        requiresAuthentication.value,
+      );
+    }
+    if (stored.present) {
+      map['stored'] = Variable<int>(stored.value);
+    }
+    if (isDraftMedia.present) {
+      map['is_draft_media'] = Variable<int>(isDraftMedia.value);
+    }
+    if (preProgressingProcess.present) {
+      map['pre_progressing_process'] = Variable<int>(
+        preProgressingProcess.value,
+      );
+    }
+    if (reuploadRequestedBy.present) {
+      map['reupload_requested_by'] = Variable<String>(
+        reuploadRequestedBy.value,
+      );
+    }
+    if (displayLimitInMilliseconds.present) {
+      map['display_limit_in_milliseconds'] = Variable<int>(
+        displayLimitInMilliseconds.value,
+      );
+    }
+    if (removeAudio.present) {
+      map['remove_audio'] = Variable<int>(removeAudio.value);
+    }
+    if (downloadToken.present) {
+      map['download_token'] = Variable<i2.Uint8List>(downloadToken.value);
+    }
+    if (encryptionKey.present) {
+      map['encryption_key'] = Variable<i2.Uint8List>(encryptionKey.value);
+    }
+    if (encryptionMac.present) {
+      map['encryption_mac'] = Variable<i2.Uint8List>(encryptionMac.value);
+    }
+    if (encryptionNonce.present) {
+      map['encryption_nonce'] = Variable<i2.Uint8List>(encryptionNonce.value);
+    }
+    if (storedFileHash.present) {
+      map['stored_file_hash'] = Variable<i2.Uint8List>(storedFileHash.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MediaFilesCompanion(')
+          ..write('mediaId: $mediaId, ')
+          ..write('type: $type, ')
+          ..write('uploadState: $uploadState, ')
+          ..write('downloadState: $downloadState, ')
+          ..write('requiresAuthentication: $requiresAuthentication, ')
+          ..write('stored: $stored, ')
+          ..write('isDraftMedia: $isDraftMedia, ')
+          ..write('preProgressingProcess: $preProgressingProcess, ')
+          ..write('reuploadRequestedBy: $reuploadRequestedBy, ')
+          ..write('displayLimitInMilliseconds: $displayLimitInMilliseconds, ')
+          ..write('removeAudio: $removeAudio, ')
+          ..write('downloadToken: $downloadToken, ')
+          ..write('encryptionKey: $encryptionKey, ')
+          ..write('encryptionMac: $encryptionMac, ')
+          ..write('encryptionNonce: $encryptionNonce, ')
+          ..write('storedFileHash: $storedFileHash, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class Messages extends Table with TableInfo<Messages, MessagesData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  Messages(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> groupId = GeneratedColumn<String>(
+    'group_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES "groups"(group_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<String> messageId = GeneratedColumn<String>(
+    'message_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> senderId = GeneratedColumn<int>(
+    'sender_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL REFERENCES contacts(user_id)',
+  );
+  late final GeneratedColumn<String> type = GeneratedColumn<String>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> content = GeneratedColumn<String>(
+    'content',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<String> mediaId = GeneratedColumn<String>(
+    'media_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NULL REFERENCES media_files(media_id)ON DELETE SET NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> additionalMessageData =
+      GeneratedColumn<i2.Uint8List>(
+        'additional_message_data',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> mediaStored = GeneratedColumn<int>(
+    'media_stored',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (media_stored IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> mediaReopened = GeneratedColumn<int>(
+    'media_reopened',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (media_reopened IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<i2.Uint8List> downloadToken =
+      GeneratedColumn<i2.Uint8List>(
+        'download_token',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<String> quotesMessageId = GeneratedColumn<String>(
+    'quotes_message_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> isDeletedFromSender = GeneratedColumn<int>(
+    'is_deleted_from_sender',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT 0 CHECK (is_deleted_from_sender IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> openedAt = GeneratedColumn<int>(
+    'opened_at',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> openedByAll = GeneratedColumn<int>(
+    'opened_by_all',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  late final GeneratedColumn<int> modifiedAt = GeneratedColumn<int>(
+    'modified_at',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> ackByUser = GeneratedColumn<int>(
+    'ack_by_user',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> ackByServer = GeneratedColumn<int>(
+    'ack_by_server',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    groupId,
+    messageId,
+    senderId,
+    type,
+    content,
+    mediaId,
+    additionalMessageData,
+    mediaStored,
+    mediaReopened,
+    downloadToken,
+    quotesMessageId,
+    isDeletedFromSender,
+    openedAt,
+    openedByAll,
+    createdAt,
+    modifiedAt,
+    ackByUser,
+    ackByServer,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'messages';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {messageId};
+  @override
+  MessagesData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return MessagesData(
+      groupId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}group_id'],
+      )!,
+      messageId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}message_id'],
+      )!,
+      senderId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}sender_id'],
+      ),
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}type'],
+      )!,
+      content: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}content'],
+      ),
+      mediaId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}media_id'],
+      ),
+      additionalMessageData: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}additional_message_data'],
+      ),
+      mediaStored: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}media_stored'],
+      )!,
+      mediaReopened: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}media_reopened'],
+      )!,
+      downloadToken: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}download_token'],
+      ),
+      quotesMessageId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}quotes_message_id'],
+      ),
+      isDeletedFromSender: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}is_deleted_from_sender'],
+      )!,
+      openedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}opened_at'],
+      ),
+      openedByAll: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}opened_by_all'],
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+      modifiedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}modified_at'],
+      ),
+      ackByUser: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}ack_by_user'],
+      ),
+      ackByServer: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}ack_by_server'],
+      ),
+    );
+  }
+
+  @override
+  Messages createAlias(String alias) {
+    return Messages(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(message_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class MessagesData extends DataClass implements Insertable<MessagesData> {
+  final String groupId;
+  final String messageId;
+  final int? senderId;
+  final String type;
+  final String? content;
+  final String? mediaId;
+  final i2.Uint8List? additionalMessageData;
+  final int mediaStored;
+  final int mediaReopened;
+  final i2.Uint8List? downloadToken;
+  final String? quotesMessageId;
+  final int isDeletedFromSender;
+  final int? openedAt;
+  final int? openedByAll;
+  final int createdAt;
+  final int? modifiedAt;
+  final int? ackByUser;
+  final int? ackByServer;
+  const MessagesData({
+    required this.groupId,
+    required this.messageId,
+    this.senderId,
+    required this.type,
+    this.content,
+    this.mediaId,
+    this.additionalMessageData,
+    required this.mediaStored,
+    required this.mediaReopened,
+    this.downloadToken,
+    this.quotesMessageId,
+    required this.isDeletedFromSender,
+    this.openedAt,
+    this.openedByAll,
+    required this.createdAt,
+    this.modifiedAt,
+    this.ackByUser,
+    this.ackByServer,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['group_id'] = Variable<String>(groupId);
+    map['message_id'] = Variable<String>(messageId);
+    if (!nullToAbsent || senderId != null) {
+      map['sender_id'] = Variable<int>(senderId);
+    }
+    map['type'] = Variable<String>(type);
+    if (!nullToAbsent || content != null) {
+      map['content'] = Variable<String>(content);
+    }
+    if (!nullToAbsent || mediaId != null) {
+      map['media_id'] = Variable<String>(mediaId);
+    }
+    if (!nullToAbsent || additionalMessageData != null) {
+      map['additional_message_data'] = Variable<i2.Uint8List>(
+        additionalMessageData,
+      );
+    }
+    map['media_stored'] = Variable<int>(mediaStored);
+    map['media_reopened'] = Variable<int>(mediaReopened);
+    if (!nullToAbsent || downloadToken != null) {
+      map['download_token'] = Variable<i2.Uint8List>(downloadToken);
+    }
+    if (!nullToAbsent || quotesMessageId != null) {
+      map['quotes_message_id'] = Variable<String>(quotesMessageId);
+    }
+    map['is_deleted_from_sender'] = Variable<int>(isDeletedFromSender);
+    if (!nullToAbsent || openedAt != null) {
+      map['opened_at'] = Variable<int>(openedAt);
+    }
+    if (!nullToAbsent || openedByAll != null) {
+      map['opened_by_all'] = Variable<int>(openedByAll);
+    }
+    map['created_at'] = Variable<int>(createdAt);
+    if (!nullToAbsent || modifiedAt != null) {
+      map['modified_at'] = Variable<int>(modifiedAt);
+    }
+    if (!nullToAbsent || ackByUser != null) {
+      map['ack_by_user'] = Variable<int>(ackByUser);
+    }
+    if (!nullToAbsent || ackByServer != null) {
+      map['ack_by_server'] = Variable<int>(ackByServer);
+    }
+    return map;
+  }
+
+  MessagesCompanion toCompanion(bool nullToAbsent) {
+    return MessagesCompanion(
+      groupId: Value(groupId),
+      messageId: Value(messageId),
+      senderId: senderId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(senderId),
+      type: Value(type),
+      content: content == null && nullToAbsent
+          ? const Value.absent()
+          : Value(content),
+      mediaId: mediaId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(mediaId),
+      additionalMessageData: additionalMessageData == null && nullToAbsent
+          ? const Value.absent()
+          : Value(additionalMessageData),
+      mediaStored: Value(mediaStored),
+      mediaReopened: Value(mediaReopened),
+      downloadToken: downloadToken == null && nullToAbsent
+          ? const Value.absent()
+          : Value(downloadToken),
+      quotesMessageId: quotesMessageId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(quotesMessageId),
+      isDeletedFromSender: Value(isDeletedFromSender),
+      openedAt: openedAt == null && nullToAbsent
+          ? const Value.absent()
+          : Value(openedAt),
+      openedByAll: openedByAll == null && nullToAbsent
+          ? const Value.absent()
+          : Value(openedByAll),
+      createdAt: Value(createdAt),
+      modifiedAt: modifiedAt == null && nullToAbsent
+          ? const Value.absent()
+          : Value(modifiedAt),
+      ackByUser: ackByUser == null && nullToAbsent
+          ? const Value.absent()
+          : Value(ackByUser),
+      ackByServer: ackByServer == null && nullToAbsent
+          ? const Value.absent()
+          : Value(ackByServer),
+    );
+  }
+
+  factory MessagesData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return MessagesData(
+      groupId: serializer.fromJson<String>(json['groupId']),
+      messageId: serializer.fromJson<String>(json['messageId']),
+      senderId: serializer.fromJson<int?>(json['senderId']),
+      type: serializer.fromJson<String>(json['type']),
+      content: serializer.fromJson<String?>(json['content']),
+      mediaId: serializer.fromJson<String?>(json['mediaId']),
+      additionalMessageData: serializer.fromJson<i2.Uint8List?>(
+        json['additionalMessageData'],
+      ),
+      mediaStored: serializer.fromJson<int>(json['mediaStored']),
+      mediaReopened: serializer.fromJson<int>(json['mediaReopened']),
+      downloadToken: serializer.fromJson<i2.Uint8List?>(json['downloadToken']),
+      quotesMessageId: serializer.fromJson<String?>(json['quotesMessageId']),
+      isDeletedFromSender: serializer.fromJson<int>(
+        json['isDeletedFromSender'],
+      ),
+      openedAt: serializer.fromJson<int?>(json['openedAt']),
+      openedByAll: serializer.fromJson<int?>(json['openedByAll']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+      modifiedAt: serializer.fromJson<int?>(json['modifiedAt']),
+      ackByUser: serializer.fromJson<int?>(json['ackByUser']),
+      ackByServer: serializer.fromJson<int?>(json['ackByServer']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'groupId': serializer.toJson<String>(groupId),
+      'messageId': serializer.toJson<String>(messageId),
+      'senderId': serializer.toJson<int?>(senderId),
+      'type': serializer.toJson<String>(type),
+      'content': serializer.toJson<String?>(content),
+      'mediaId': serializer.toJson<String?>(mediaId),
+      'additionalMessageData': serializer.toJson<i2.Uint8List?>(
+        additionalMessageData,
+      ),
+      'mediaStored': serializer.toJson<int>(mediaStored),
+      'mediaReopened': serializer.toJson<int>(mediaReopened),
+      'downloadToken': serializer.toJson<i2.Uint8List?>(downloadToken),
+      'quotesMessageId': serializer.toJson<String?>(quotesMessageId),
+      'isDeletedFromSender': serializer.toJson<int>(isDeletedFromSender),
+      'openedAt': serializer.toJson<int?>(openedAt),
+      'openedByAll': serializer.toJson<int?>(openedByAll),
+      'createdAt': serializer.toJson<int>(createdAt),
+      'modifiedAt': serializer.toJson<int?>(modifiedAt),
+      'ackByUser': serializer.toJson<int?>(ackByUser),
+      'ackByServer': serializer.toJson<int?>(ackByServer),
+    };
+  }
+
+  MessagesData copyWith({
+    String? groupId,
+    String? messageId,
+    Value<int?> senderId = const Value.absent(),
+    String? type,
+    Value<String?> content = const Value.absent(),
+    Value<String?> mediaId = const Value.absent(),
+    Value<i2.Uint8List?> additionalMessageData = const Value.absent(),
+    int? mediaStored,
+    int? mediaReopened,
+    Value<i2.Uint8List?> downloadToken = const Value.absent(),
+    Value<String?> quotesMessageId = const Value.absent(),
+    int? isDeletedFromSender,
+    Value<int?> openedAt = const Value.absent(),
+    Value<int?> openedByAll = const Value.absent(),
+    int? createdAt,
+    Value<int?> modifiedAt = const Value.absent(),
+    Value<int?> ackByUser = const Value.absent(),
+    Value<int?> ackByServer = const Value.absent(),
+  }) => MessagesData(
+    groupId: groupId ?? this.groupId,
+    messageId: messageId ?? this.messageId,
+    senderId: senderId.present ? senderId.value : this.senderId,
+    type: type ?? this.type,
+    content: content.present ? content.value : this.content,
+    mediaId: mediaId.present ? mediaId.value : this.mediaId,
+    additionalMessageData: additionalMessageData.present
+        ? additionalMessageData.value
+        : this.additionalMessageData,
+    mediaStored: mediaStored ?? this.mediaStored,
+    mediaReopened: mediaReopened ?? this.mediaReopened,
+    downloadToken: downloadToken.present
+        ? downloadToken.value
+        : this.downloadToken,
+    quotesMessageId: quotesMessageId.present
+        ? quotesMessageId.value
+        : this.quotesMessageId,
+    isDeletedFromSender: isDeletedFromSender ?? this.isDeletedFromSender,
+    openedAt: openedAt.present ? openedAt.value : this.openedAt,
+    openedByAll: openedByAll.present ? openedByAll.value : this.openedByAll,
+    createdAt: createdAt ?? this.createdAt,
+    modifiedAt: modifiedAt.present ? modifiedAt.value : this.modifiedAt,
+    ackByUser: ackByUser.present ? ackByUser.value : this.ackByUser,
+    ackByServer: ackByServer.present ? ackByServer.value : this.ackByServer,
+  );
+  MessagesData copyWithCompanion(MessagesCompanion data) {
+    return MessagesData(
+      groupId: data.groupId.present ? data.groupId.value : this.groupId,
+      messageId: data.messageId.present ? data.messageId.value : this.messageId,
+      senderId: data.senderId.present ? data.senderId.value : this.senderId,
+      type: data.type.present ? data.type.value : this.type,
+      content: data.content.present ? data.content.value : this.content,
+      mediaId: data.mediaId.present ? data.mediaId.value : this.mediaId,
+      additionalMessageData: data.additionalMessageData.present
+          ? data.additionalMessageData.value
+          : this.additionalMessageData,
+      mediaStored: data.mediaStored.present
+          ? data.mediaStored.value
+          : this.mediaStored,
+      mediaReopened: data.mediaReopened.present
+          ? data.mediaReopened.value
+          : this.mediaReopened,
+      downloadToken: data.downloadToken.present
+          ? data.downloadToken.value
+          : this.downloadToken,
+      quotesMessageId: data.quotesMessageId.present
+          ? data.quotesMessageId.value
+          : this.quotesMessageId,
+      isDeletedFromSender: data.isDeletedFromSender.present
+          ? data.isDeletedFromSender.value
+          : this.isDeletedFromSender,
+      openedAt: data.openedAt.present ? data.openedAt.value : this.openedAt,
+      openedByAll: data.openedByAll.present
+          ? data.openedByAll.value
+          : this.openedByAll,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      modifiedAt: data.modifiedAt.present
+          ? data.modifiedAt.value
+          : this.modifiedAt,
+      ackByUser: data.ackByUser.present ? data.ackByUser.value : this.ackByUser,
+      ackByServer: data.ackByServer.present
+          ? data.ackByServer.value
+          : this.ackByServer,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MessagesData(')
+          ..write('groupId: $groupId, ')
+          ..write('messageId: $messageId, ')
+          ..write('senderId: $senderId, ')
+          ..write('type: $type, ')
+          ..write('content: $content, ')
+          ..write('mediaId: $mediaId, ')
+          ..write('additionalMessageData: $additionalMessageData, ')
+          ..write('mediaStored: $mediaStored, ')
+          ..write('mediaReopened: $mediaReopened, ')
+          ..write('downloadToken: $downloadToken, ')
+          ..write('quotesMessageId: $quotesMessageId, ')
+          ..write('isDeletedFromSender: $isDeletedFromSender, ')
+          ..write('openedAt: $openedAt, ')
+          ..write('openedByAll: $openedByAll, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('modifiedAt: $modifiedAt, ')
+          ..write('ackByUser: $ackByUser, ')
+          ..write('ackByServer: $ackByServer')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    groupId,
+    messageId,
+    senderId,
+    type,
+    content,
+    mediaId,
+    $driftBlobEquality.hash(additionalMessageData),
+    mediaStored,
+    mediaReopened,
+    $driftBlobEquality.hash(downloadToken),
+    quotesMessageId,
+    isDeletedFromSender,
+    openedAt,
+    openedByAll,
+    createdAt,
+    modifiedAt,
+    ackByUser,
+    ackByServer,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is MessagesData &&
+          other.groupId == this.groupId &&
+          other.messageId == this.messageId &&
+          other.senderId == this.senderId &&
+          other.type == this.type &&
+          other.content == this.content &&
+          other.mediaId == this.mediaId &&
+          $driftBlobEquality.equals(
+            other.additionalMessageData,
+            this.additionalMessageData,
+          ) &&
+          other.mediaStored == this.mediaStored &&
+          other.mediaReopened == this.mediaReopened &&
+          $driftBlobEquality.equals(other.downloadToken, this.downloadToken) &&
+          other.quotesMessageId == this.quotesMessageId &&
+          other.isDeletedFromSender == this.isDeletedFromSender &&
+          other.openedAt == this.openedAt &&
+          other.openedByAll == this.openedByAll &&
+          other.createdAt == this.createdAt &&
+          other.modifiedAt == this.modifiedAt &&
+          other.ackByUser == this.ackByUser &&
+          other.ackByServer == this.ackByServer);
+}
+
+class MessagesCompanion extends UpdateCompanion<MessagesData> {
+  final Value<String> groupId;
+  final Value<String> messageId;
+  final Value<int?> senderId;
+  final Value<String> type;
+  final Value<String?> content;
+  final Value<String?> mediaId;
+  final Value<i2.Uint8List?> additionalMessageData;
+  final Value<int> mediaStored;
+  final Value<int> mediaReopened;
+  final Value<i2.Uint8List?> downloadToken;
+  final Value<String?> quotesMessageId;
+  final Value<int> isDeletedFromSender;
+  final Value<int?> openedAt;
+  final Value<int?> openedByAll;
+  final Value<int> createdAt;
+  final Value<int?> modifiedAt;
+  final Value<int?> ackByUser;
+  final Value<int?> ackByServer;
+  final Value<int> rowid;
+  const MessagesCompanion({
+    this.groupId = const Value.absent(),
+    this.messageId = const Value.absent(),
+    this.senderId = const Value.absent(),
+    this.type = const Value.absent(),
+    this.content = const Value.absent(),
+    this.mediaId = const Value.absent(),
+    this.additionalMessageData = const Value.absent(),
+    this.mediaStored = const Value.absent(),
+    this.mediaReopened = const Value.absent(),
+    this.downloadToken = const Value.absent(),
+    this.quotesMessageId = const Value.absent(),
+    this.isDeletedFromSender = const Value.absent(),
+    this.openedAt = const Value.absent(),
+    this.openedByAll = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.modifiedAt = const Value.absent(),
+    this.ackByUser = const Value.absent(),
+    this.ackByServer = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  MessagesCompanion.insert({
+    required String groupId,
+    required String messageId,
+    this.senderId = const Value.absent(),
+    required String type,
+    this.content = const Value.absent(),
+    this.mediaId = const Value.absent(),
+    this.additionalMessageData = const Value.absent(),
+    this.mediaStored = const Value.absent(),
+    this.mediaReopened = const Value.absent(),
+    this.downloadToken = const Value.absent(),
+    this.quotesMessageId = const Value.absent(),
+    this.isDeletedFromSender = const Value.absent(),
+    this.openedAt = const Value.absent(),
+    this.openedByAll = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.modifiedAt = const Value.absent(),
+    this.ackByUser = const Value.absent(),
+    this.ackByServer = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : groupId = Value(groupId),
+       messageId = Value(messageId),
+       type = Value(type);
+  static Insertable<MessagesData> custom({
+    Expression<String>? groupId,
+    Expression<String>? messageId,
+    Expression<int>? senderId,
+    Expression<String>? type,
+    Expression<String>? content,
+    Expression<String>? mediaId,
+    Expression<i2.Uint8List>? additionalMessageData,
+    Expression<int>? mediaStored,
+    Expression<int>? mediaReopened,
+    Expression<i2.Uint8List>? downloadToken,
+    Expression<String>? quotesMessageId,
+    Expression<int>? isDeletedFromSender,
+    Expression<int>? openedAt,
+    Expression<int>? openedByAll,
+    Expression<int>? createdAt,
+    Expression<int>? modifiedAt,
+    Expression<int>? ackByUser,
+    Expression<int>? ackByServer,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (groupId != null) 'group_id': groupId,
+      if (messageId != null) 'message_id': messageId,
+      if (senderId != null) 'sender_id': senderId,
+      if (type != null) 'type': type,
+      if (content != null) 'content': content,
+      if (mediaId != null) 'media_id': mediaId,
+      if (additionalMessageData != null)
+        'additional_message_data': additionalMessageData,
+      if (mediaStored != null) 'media_stored': mediaStored,
+      if (mediaReopened != null) 'media_reopened': mediaReopened,
+      if (downloadToken != null) 'download_token': downloadToken,
+      if (quotesMessageId != null) 'quotes_message_id': quotesMessageId,
+      if (isDeletedFromSender != null)
+        'is_deleted_from_sender': isDeletedFromSender,
+      if (openedAt != null) 'opened_at': openedAt,
+      if (openedByAll != null) 'opened_by_all': openedByAll,
+      if (createdAt != null) 'created_at': createdAt,
+      if (modifiedAt != null) 'modified_at': modifiedAt,
+      if (ackByUser != null) 'ack_by_user': ackByUser,
+      if (ackByServer != null) 'ack_by_server': ackByServer,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  MessagesCompanion copyWith({
+    Value<String>? groupId,
+    Value<String>? messageId,
+    Value<int?>? senderId,
+    Value<String>? type,
+    Value<String?>? content,
+    Value<String?>? mediaId,
+    Value<i2.Uint8List?>? additionalMessageData,
+    Value<int>? mediaStored,
+    Value<int>? mediaReopened,
+    Value<i2.Uint8List?>? downloadToken,
+    Value<String?>? quotesMessageId,
+    Value<int>? isDeletedFromSender,
+    Value<int?>? openedAt,
+    Value<int?>? openedByAll,
+    Value<int>? createdAt,
+    Value<int?>? modifiedAt,
+    Value<int?>? ackByUser,
+    Value<int?>? ackByServer,
+    Value<int>? rowid,
+  }) {
+    return MessagesCompanion(
+      groupId: groupId ?? this.groupId,
+      messageId: messageId ?? this.messageId,
+      senderId: senderId ?? this.senderId,
+      type: type ?? this.type,
+      content: content ?? this.content,
+      mediaId: mediaId ?? this.mediaId,
+      additionalMessageData:
+          additionalMessageData ?? this.additionalMessageData,
+      mediaStored: mediaStored ?? this.mediaStored,
+      mediaReopened: mediaReopened ?? this.mediaReopened,
+      downloadToken: downloadToken ?? this.downloadToken,
+      quotesMessageId: quotesMessageId ?? this.quotesMessageId,
+      isDeletedFromSender: isDeletedFromSender ?? this.isDeletedFromSender,
+      openedAt: openedAt ?? this.openedAt,
+      openedByAll: openedByAll ?? this.openedByAll,
+      createdAt: createdAt ?? this.createdAt,
+      modifiedAt: modifiedAt ?? this.modifiedAt,
+      ackByUser: ackByUser ?? this.ackByUser,
+      ackByServer: ackByServer ?? this.ackByServer,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (groupId.present) {
+      map['group_id'] = Variable<String>(groupId.value);
+    }
+    if (messageId.present) {
+      map['message_id'] = Variable<String>(messageId.value);
+    }
+    if (senderId.present) {
+      map['sender_id'] = Variable<int>(senderId.value);
+    }
+    if (type.present) {
+      map['type'] = Variable<String>(type.value);
+    }
+    if (content.present) {
+      map['content'] = Variable<String>(content.value);
+    }
+    if (mediaId.present) {
+      map['media_id'] = Variable<String>(mediaId.value);
+    }
+    if (additionalMessageData.present) {
+      map['additional_message_data'] = Variable<i2.Uint8List>(
+        additionalMessageData.value,
+      );
+    }
+    if (mediaStored.present) {
+      map['media_stored'] = Variable<int>(mediaStored.value);
+    }
+    if (mediaReopened.present) {
+      map['media_reopened'] = Variable<int>(mediaReopened.value);
+    }
+    if (downloadToken.present) {
+      map['download_token'] = Variable<i2.Uint8List>(downloadToken.value);
+    }
+    if (quotesMessageId.present) {
+      map['quotes_message_id'] = Variable<String>(quotesMessageId.value);
+    }
+    if (isDeletedFromSender.present) {
+      map['is_deleted_from_sender'] = Variable<int>(isDeletedFromSender.value);
+    }
+    if (openedAt.present) {
+      map['opened_at'] = Variable<int>(openedAt.value);
+    }
+    if (openedByAll.present) {
+      map['opened_by_all'] = Variable<int>(openedByAll.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (modifiedAt.present) {
+      map['modified_at'] = Variable<int>(modifiedAt.value);
+    }
+    if (ackByUser.present) {
+      map['ack_by_user'] = Variable<int>(ackByUser.value);
+    }
+    if (ackByServer.present) {
+      map['ack_by_server'] = Variable<int>(ackByServer.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MessagesCompanion(')
+          ..write('groupId: $groupId, ')
+          ..write('messageId: $messageId, ')
+          ..write('senderId: $senderId, ')
+          ..write('type: $type, ')
+          ..write('content: $content, ')
+          ..write('mediaId: $mediaId, ')
+          ..write('additionalMessageData: $additionalMessageData, ')
+          ..write('mediaStored: $mediaStored, ')
+          ..write('mediaReopened: $mediaReopened, ')
+          ..write('downloadToken: $downloadToken, ')
+          ..write('quotesMessageId: $quotesMessageId, ')
+          ..write('isDeletedFromSender: $isDeletedFromSender, ')
+          ..write('openedAt: $openedAt, ')
+          ..write('openedByAll: $openedByAll, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('modifiedAt: $modifiedAt, ')
+          ..write('ackByUser: $ackByUser, ')
+          ..write('ackByServer: $ackByServer, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class MessageHistories extends Table
+    with TableInfo<MessageHistories, MessageHistoriesData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  MessageHistories(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> id = GeneratedColumn<int>(
+    'id',
+    aliasedName,
+    false,
+    hasAutoIncrement: true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL PRIMARY KEY AUTOINCREMENT',
+  );
+  late final GeneratedColumn<String> messageId = GeneratedColumn<String>(
+    'message_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES messages(message_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<String> content = GeneratedColumn<String>(
+    'content',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    id,
+    messageId,
+    contactId,
+    content,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'message_histories';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {id};
+  @override
+  MessageHistoriesData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return MessageHistoriesData(
+      id: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}id'],
+      )!,
+      messageId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}message_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      ),
+      content: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}content'],
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  MessageHistories createAlias(String alias) {
+    return MessageHistories(attachedDatabase, alias);
+  }
+
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class MessageHistoriesData extends DataClass
+    implements Insertable<MessageHistoriesData> {
+  final int id;
+  final String messageId;
+  final int? contactId;
+  final String? content;
+  final int createdAt;
+  const MessageHistoriesData({
+    required this.id,
+    required this.messageId,
+    this.contactId,
+    this.content,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['id'] = Variable<int>(id);
+    map['message_id'] = Variable<String>(messageId);
+    if (!nullToAbsent || contactId != null) {
+      map['contact_id'] = Variable<int>(contactId);
+    }
+    if (!nullToAbsent || content != null) {
+      map['content'] = Variable<String>(content);
+    }
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  MessageHistoriesCompanion toCompanion(bool nullToAbsent) {
+    return MessageHistoriesCompanion(
+      id: Value(id),
+      messageId: Value(messageId),
+      contactId: contactId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(contactId),
+      content: content == null && nullToAbsent
+          ? const Value.absent()
+          : Value(content),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory MessageHistoriesData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return MessageHistoriesData(
+      id: serializer.fromJson<int>(json['id']),
+      messageId: serializer.fromJson<String>(json['messageId']),
+      contactId: serializer.fromJson<int?>(json['contactId']),
+      content: serializer.fromJson<String?>(json['content']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<int>(id),
+      'messageId': serializer.toJson<String>(messageId),
+      'contactId': serializer.toJson<int?>(contactId),
+      'content': serializer.toJson<String?>(content),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  MessageHistoriesData copyWith({
+    int? id,
+    String? messageId,
+    Value<int?> contactId = const Value.absent(),
+    Value<String?> content = const Value.absent(),
+    int? createdAt,
+  }) => MessageHistoriesData(
+    id: id ?? this.id,
+    messageId: messageId ?? this.messageId,
+    contactId: contactId.present ? contactId.value : this.contactId,
+    content: content.present ? content.value : this.content,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  MessageHistoriesData copyWithCompanion(MessageHistoriesCompanion data) {
+    return MessageHistoriesData(
+      id: data.id.present ? data.id.value : this.id,
+      messageId: data.messageId.present ? data.messageId.value : this.messageId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      content: data.content.present ? data.content.value : this.content,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MessageHistoriesData(')
+          ..write('id: $id, ')
+          ..write('messageId: $messageId, ')
+          ..write('contactId: $contactId, ')
+          ..write('content: $content, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(id, messageId, contactId, content, createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is MessageHistoriesData &&
+          other.id == this.id &&
+          other.messageId == this.messageId &&
+          other.contactId == this.contactId &&
+          other.content == this.content &&
+          other.createdAt == this.createdAt);
+}
+
+class MessageHistoriesCompanion extends UpdateCompanion<MessageHistoriesData> {
+  final Value<int> id;
+  final Value<String> messageId;
+  final Value<int?> contactId;
+  final Value<String?> content;
+  final Value<int> createdAt;
+  const MessageHistoriesCompanion({
+    this.id = const Value.absent(),
+    this.messageId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.content = const Value.absent(),
+    this.createdAt = const Value.absent(),
+  });
+  MessageHistoriesCompanion.insert({
+    this.id = const Value.absent(),
+    required String messageId,
+    this.contactId = const Value.absent(),
+    this.content = const Value.absent(),
+    this.createdAt = const Value.absent(),
+  }) : messageId = Value(messageId);
+  static Insertable<MessageHistoriesData> custom({
+    Expression<int>? id,
+    Expression<String>? messageId,
+    Expression<int>? contactId,
+    Expression<String>? content,
+    Expression<int>? createdAt,
+  }) {
+    return RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (messageId != null) 'message_id': messageId,
+      if (contactId != null) 'contact_id': contactId,
+      if (content != null) 'content': content,
+      if (createdAt != null) 'created_at': createdAt,
+    });
+  }
+
+  MessageHistoriesCompanion copyWith({
+    Value<int>? id,
+    Value<String>? messageId,
+    Value<int?>? contactId,
+    Value<String?>? content,
+    Value<int>? createdAt,
+  }) {
+    return MessageHistoriesCompanion(
+      id: id ?? this.id,
+      messageId: messageId ?? this.messageId,
+      contactId: contactId ?? this.contactId,
+      content: content ?? this.content,
+      createdAt: createdAt ?? this.createdAt,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<int>(id.value);
+    }
+    if (messageId.present) {
+      map['message_id'] = Variable<String>(messageId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (content.present) {
+      map['content'] = Variable<String>(content.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MessageHistoriesCompanion(')
+          ..write('id: $id, ')
+          ..write('messageId: $messageId, ')
+          ..write('contactId: $contactId, ')
+          ..write('content: $content, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class Reactions extends Table with TableInfo<Reactions, ReactionsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  Reactions(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> messageId = GeneratedColumn<String>(
+    'message_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES messages(message_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<String> emoji = GeneratedColumn<String>(
+    'emoji',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> senderId = GeneratedColumn<int>(
+    'sender_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [messageId, emoji, senderId, createdAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'reactions';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {messageId, senderId, emoji};
+  @override
+  ReactionsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return ReactionsData(
+      messageId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}message_id'],
+      )!,
+      emoji: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}emoji'],
+      )!,
+      senderId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}sender_id'],
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  Reactions createAlias(String alias) {
+    return Reactions(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const [
+    'PRIMARY KEY(message_id, sender_id, emoji)',
+  ];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class ReactionsData extends DataClass implements Insertable<ReactionsData> {
+  final String messageId;
+  final String emoji;
+  final int? senderId;
+  final int createdAt;
+  const ReactionsData({
+    required this.messageId,
+    required this.emoji,
+    this.senderId,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['message_id'] = Variable<String>(messageId);
+    map['emoji'] = Variable<String>(emoji);
+    if (!nullToAbsent || senderId != null) {
+      map['sender_id'] = Variable<int>(senderId);
+    }
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  ReactionsCompanion toCompanion(bool nullToAbsent) {
+    return ReactionsCompanion(
+      messageId: Value(messageId),
+      emoji: Value(emoji),
+      senderId: senderId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(senderId),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory ReactionsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return ReactionsData(
+      messageId: serializer.fromJson<String>(json['messageId']),
+      emoji: serializer.fromJson<String>(json['emoji']),
+      senderId: serializer.fromJson<int?>(json['senderId']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'messageId': serializer.toJson<String>(messageId),
+      'emoji': serializer.toJson<String>(emoji),
+      'senderId': serializer.toJson<int?>(senderId),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  ReactionsData copyWith({
+    String? messageId,
+    String? emoji,
+    Value<int?> senderId = const Value.absent(),
+    int? createdAt,
+  }) => ReactionsData(
+    messageId: messageId ?? this.messageId,
+    emoji: emoji ?? this.emoji,
+    senderId: senderId.present ? senderId.value : this.senderId,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  ReactionsData copyWithCompanion(ReactionsCompanion data) {
+    return ReactionsData(
+      messageId: data.messageId.present ? data.messageId.value : this.messageId,
+      emoji: data.emoji.present ? data.emoji.value : this.emoji,
+      senderId: data.senderId.present ? data.senderId.value : this.senderId,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ReactionsData(')
+          ..write('messageId: $messageId, ')
+          ..write('emoji: $emoji, ')
+          ..write('senderId: $senderId, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(messageId, emoji, senderId, createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is ReactionsData &&
+          other.messageId == this.messageId &&
+          other.emoji == this.emoji &&
+          other.senderId == this.senderId &&
+          other.createdAt == this.createdAt);
+}
+
+class ReactionsCompanion extends UpdateCompanion<ReactionsData> {
+  final Value<String> messageId;
+  final Value<String> emoji;
+  final Value<int?> senderId;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const ReactionsCompanion({
+    this.messageId = const Value.absent(),
+    this.emoji = const Value.absent(),
+    this.senderId = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  ReactionsCompanion.insert({
+    required String messageId,
+    required String emoji,
+    this.senderId = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : messageId = Value(messageId),
+       emoji = Value(emoji);
+  static Insertable<ReactionsData> custom({
+    Expression<String>? messageId,
+    Expression<String>? emoji,
+    Expression<int>? senderId,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (messageId != null) 'message_id': messageId,
+      if (emoji != null) 'emoji': emoji,
+      if (senderId != null) 'sender_id': senderId,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  ReactionsCompanion copyWith({
+    Value<String>? messageId,
+    Value<String>? emoji,
+    Value<int?>? senderId,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return ReactionsCompanion(
+      messageId: messageId ?? this.messageId,
+      emoji: emoji ?? this.emoji,
+      senderId: senderId ?? this.senderId,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (messageId.present) {
+      map['message_id'] = Variable<String>(messageId.value);
+    }
+    if (emoji.present) {
+      map['emoji'] = Variable<String>(emoji.value);
+    }
+    if (senderId.present) {
+      map['sender_id'] = Variable<int>(senderId.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ReactionsCompanion(')
+          ..write('messageId: $messageId, ')
+          ..write('emoji: $emoji, ')
+          ..write('senderId: $senderId, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class GroupMembers extends Table
+    with TableInfo<GroupMembers, GroupMembersData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  GroupMembers(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> groupId = GeneratedColumn<String>(
+    'group_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES "groups"(group_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL REFERENCES contacts(user_id)',
+  );
+  late final GeneratedColumn<String> memberState = GeneratedColumn<String>(
+    'member_state',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> groupPublicKey =
+      GeneratedColumn<i2.Uint8List>(
+        'group_public_key',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> lastChatOpened = GeneratedColumn<int>(
+    'last_chat_opened',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> lastTypeIndicator = GeneratedColumn<int>(
+    'last_type_indicator',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> lastMessage = GeneratedColumn<int>(
+    'last_message',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    groupId,
+    contactId,
+    memberState,
+    groupPublicKey,
+    lastChatOpened,
+    lastTypeIndicator,
+    lastMessage,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'group_members';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {groupId, contactId};
+  @override
+  GroupMembersData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return GroupMembersData(
+      groupId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}group_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      )!,
+      memberState: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}member_state'],
+      ),
+      groupPublicKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}group_public_key'],
+      ),
+      lastChatOpened: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_chat_opened'],
+      ),
+      lastTypeIndicator: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_type_indicator'],
+      ),
+      lastMessage: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_message'],
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  GroupMembers createAlias(String alias) {
+    return GroupMembers(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const [
+    'PRIMARY KEY(group_id, contact_id)',
+  ];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class GroupMembersData extends DataClass
+    implements Insertable<GroupMembersData> {
+  final String groupId;
+  final int contactId;
+  final String? memberState;
+  final i2.Uint8List? groupPublicKey;
+  final int? lastChatOpened;
+  final int? lastTypeIndicator;
+  final int? lastMessage;
+  final int createdAt;
+  const GroupMembersData({
+    required this.groupId,
+    required this.contactId,
+    this.memberState,
+    this.groupPublicKey,
+    this.lastChatOpened,
+    this.lastTypeIndicator,
+    this.lastMessage,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['group_id'] = Variable<String>(groupId);
+    map['contact_id'] = Variable<int>(contactId);
+    if (!nullToAbsent || memberState != null) {
+      map['member_state'] = Variable<String>(memberState);
+    }
+    if (!nullToAbsent || groupPublicKey != null) {
+      map['group_public_key'] = Variable<i2.Uint8List>(groupPublicKey);
+    }
+    if (!nullToAbsent || lastChatOpened != null) {
+      map['last_chat_opened'] = Variable<int>(lastChatOpened);
+    }
+    if (!nullToAbsent || lastTypeIndicator != null) {
+      map['last_type_indicator'] = Variable<int>(lastTypeIndicator);
+    }
+    if (!nullToAbsent || lastMessage != null) {
+      map['last_message'] = Variable<int>(lastMessage);
+    }
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  GroupMembersCompanion toCompanion(bool nullToAbsent) {
+    return GroupMembersCompanion(
+      groupId: Value(groupId),
+      contactId: Value(contactId),
+      memberState: memberState == null && nullToAbsent
+          ? const Value.absent()
+          : Value(memberState),
+      groupPublicKey: groupPublicKey == null && nullToAbsent
+          ? const Value.absent()
+          : Value(groupPublicKey),
+      lastChatOpened: lastChatOpened == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastChatOpened),
+      lastTypeIndicator: lastTypeIndicator == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastTypeIndicator),
+      lastMessage: lastMessage == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastMessage),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory GroupMembersData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return GroupMembersData(
+      groupId: serializer.fromJson<String>(json['groupId']),
+      contactId: serializer.fromJson<int>(json['contactId']),
+      memberState: serializer.fromJson<String?>(json['memberState']),
+      groupPublicKey: serializer.fromJson<i2.Uint8List?>(
+        json['groupPublicKey'],
+      ),
+      lastChatOpened: serializer.fromJson<int?>(json['lastChatOpened']),
+      lastTypeIndicator: serializer.fromJson<int?>(json['lastTypeIndicator']),
+      lastMessage: serializer.fromJson<int?>(json['lastMessage']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'groupId': serializer.toJson<String>(groupId),
+      'contactId': serializer.toJson<int>(contactId),
+      'memberState': serializer.toJson<String?>(memberState),
+      'groupPublicKey': serializer.toJson<i2.Uint8List?>(groupPublicKey),
+      'lastChatOpened': serializer.toJson<int?>(lastChatOpened),
+      'lastTypeIndicator': serializer.toJson<int?>(lastTypeIndicator),
+      'lastMessage': serializer.toJson<int?>(lastMessage),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  GroupMembersData copyWith({
+    String? groupId,
+    int? contactId,
+    Value<String?> memberState = const Value.absent(),
+    Value<i2.Uint8List?> groupPublicKey = const Value.absent(),
+    Value<int?> lastChatOpened = const Value.absent(),
+    Value<int?> lastTypeIndicator = const Value.absent(),
+    Value<int?> lastMessage = const Value.absent(),
+    int? createdAt,
+  }) => GroupMembersData(
+    groupId: groupId ?? this.groupId,
+    contactId: contactId ?? this.contactId,
+    memberState: memberState.present ? memberState.value : this.memberState,
+    groupPublicKey: groupPublicKey.present
+        ? groupPublicKey.value
+        : this.groupPublicKey,
+    lastChatOpened: lastChatOpened.present
+        ? lastChatOpened.value
+        : this.lastChatOpened,
+    lastTypeIndicator: lastTypeIndicator.present
+        ? lastTypeIndicator.value
+        : this.lastTypeIndicator,
+    lastMessage: lastMessage.present ? lastMessage.value : this.lastMessage,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  GroupMembersData copyWithCompanion(GroupMembersCompanion data) {
+    return GroupMembersData(
+      groupId: data.groupId.present ? data.groupId.value : this.groupId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      memberState: data.memberState.present
+          ? data.memberState.value
+          : this.memberState,
+      groupPublicKey: data.groupPublicKey.present
+          ? data.groupPublicKey.value
+          : this.groupPublicKey,
+      lastChatOpened: data.lastChatOpened.present
+          ? data.lastChatOpened.value
+          : this.lastChatOpened,
+      lastTypeIndicator: data.lastTypeIndicator.present
+          ? data.lastTypeIndicator.value
+          : this.lastTypeIndicator,
+      lastMessage: data.lastMessage.present
+          ? data.lastMessage.value
+          : this.lastMessage,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('GroupMembersData(')
+          ..write('groupId: $groupId, ')
+          ..write('contactId: $contactId, ')
+          ..write('memberState: $memberState, ')
+          ..write('groupPublicKey: $groupPublicKey, ')
+          ..write('lastChatOpened: $lastChatOpened, ')
+          ..write('lastTypeIndicator: $lastTypeIndicator, ')
+          ..write('lastMessage: $lastMessage, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    groupId,
+    contactId,
+    memberState,
+    $driftBlobEquality.hash(groupPublicKey),
+    lastChatOpened,
+    lastTypeIndicator,
+    lastMessage,
+    createdAt,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is GroupMembersData &&
+          other.groupId == this.groupId &&
+          other.contactId == this.contactId &&
+          other.memberState == this.memberState &&
+          $driftBlobEquality.equals(
+            other.groupPublicKey,
+            this.groupPublicKey,
+          ) &&
+          other.lastChatOpened == this.lastChatOpened &&
+          other.lastTypeIndicator == this.lastTypeIndicator &&
+          other.lastMessage == this.lastMessage &&
+          other.createdAt == this.createdAt);
+}
+
+class GroupMembersCompanion extends UpdateCompanion<GroupMembersData> {
+  final Value<String> groupId;
+  final Value<int> contactId;
+  final Value<String?> memberState;
+  final Value<i2.Uint8List?> groupPublicKey;
+  final Value<int?> lastChatOpened;
+  final Value<int?> lastTypeIndicator;
+  final Value<int?> lastMessage;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const GroupMembersCompanion({
+    this.groupId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.memberState = const Value.absent(),
+    this.groupPublicKey = const Value.absent(),
+    this.lastChatOpened = const Value.absent(),
+    this.lastTypeIndicator = const Value.absent(),
+    this.lastMessage = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  GroupMembersCompanion.insert({
+    required String groupId,
+    required int contactId,
+    this.memberState = const Value.absent(),
+    this.groupPublicKey = const Value.absent(),
+    this.lastChatOpened = const Value.absent(),
+    this.lastTypeIndicator = const Value.absent(),
+    this.lastMessage = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : groupId = Value(groupId),
+       contactId = Value(contactId);
+  static Insertable<GroupMembersData> custom({
+    Expression<String>? groupId,
+    Expression<int>? contactId,
+    Expression<String>? memberState,
+    Expression<i2.Uint8List>? groupPublicKey,
+    Expression<int>? lastChatOpened,
+    Expression<int>? lastTypeIndicator,
+    Expression<int>? lastMessage,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (groupId != null) 'group_id': groupId,
+      if (contactId != null) 'contact_id': contactId,
+      if (memberState != null) 'member_state': memberState,
+      if (groupPublicKey != null) 'group_public_key': groupPublicKey,
+      if (lastChatOpened != null) 'last_chat_opened': lastChatOpened,
+      if (lastTypeIndicator != null) 'last_type_indicator': lastTypeIndicator,
+      if (lastMessage != null) 'last_message': lastMessage,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  GroupMembersCompanion copyWith({
+    Value<String>? groupId,
+    Value<int>? contactId,
+    Value<String?>? memberState,
+    Value<i2.Uint8List?>? groupPublicKey,
+    Value<int?>? lastChatOpened,
+    Value<int?>? lastTypeIndicator,
+    Value<int?>? lastMessage,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return GroupMembersCompanion(
+      groupId: groupId ?? this.groupId,
+      contactId: contactId ?? this.contactId,
+      memberState: memberState ?? this.memberState,
+      groupPublicKey: groupPublicKey ?? this.groupPublicKey,
+      lastChatOpened: lastChatOpened ?? this.lastChatOpened,
+      lastTypeIndicator: lastTypeIndicator ?? this.lastTypeIndicator,
+      lastMessage: lastMessage ?? this.lastMessage,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (groupId.present) {
+      map['group_id'] = Variable<String>(groupId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (memberState.present) {
+      map['member_state'] = Variable<String>(memberState.value);
+    }
+    if (groupPublicKey.present) {
+      map['group_public_key'] = Variable<i2.Uint8List>(groupPublicKey.value);
+    }
+    if (lastChatOpened.present) {
+      map['last_chat_opened'] = Variable<int>(lastChatOpened.value);
+    }
+    if (lastTypeIndicator.present) {
+      map['last_type_indicator'] = Variable<int>(lastTypeIndicator.value);
+    }
+    if (lastMessage.present) {
+      map['last_message'] = Variable<int>(lastMessage.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('GroupMembersCompanion(')
+          ..write('groupId: $groupId, ')
+          ..write('contactId: $contactId, ')
+          ..write('memberState: $memberState, ')
+          ..write('groupPublicKey: $groupPublicKey, ')
+          ..write('lastChatOpened: $lastChatOpened, ')
+          ..write('lastTypeIndicator: $lastTypeIndicator, ')
+          ..write('lastMessage: $lastMessage, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class Receipts extends Table with TableInfo<Receipts, ReceiptsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  Receipts(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> receiptId = GeneratedColumn<String>(
+    'receipt_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<String> messageId = GeneratedColumn<String>(
+    'message_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL REFERENCES messages(message_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<i2.Uint8List> message =
+      GeneratedColumn<i2.Uint8List>(
+        'message',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> contactWillSendsReceipt =
+      GeneratedColumn<int>(
+        'contact_will_sends_receipt',
+        aliasedName,
+        false,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints:
+            'NOT NULL DEFAULT 1 CHECK (contact_will_sends_receipt IN (0, 1))',
+        defaultValue: const CustomExpression('1'),
+      );
+  late final GeneratedColumn<int>
+  willBeRetriedByMediaUpload = GeneratedColumn<int>(
+    'will_be_retried_by_media_upload',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT 0 CHECK (will_be_retried_by_media_upload IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> markForRetry = GeneratedColumn<int>(
+    'mark_for_retry',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> markForRetryAfterAccepted =
+      GeneratedColumn<int>(
+        'mark_for_retry_after_accepted',
+        aliasedName,
+        true,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> ackByServerAt = GeneratedColumn<int>(
+    'ack_by_server_at',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> retryCount = GeneratedColumn<int>(
+    'retry_count',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> lastRetry = GeneratedColumn<int>(
+    'last_retry',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    receiptId,
+    contactId,
+    messageId,
+    message,
+    contactWillSendsReceipt,
+    willBeRetriedByMediaUpload,
+    markForRetry,
+    markForRetryAfterAccepted,
+    ackByServerAt,
+    retryCount,
+    lastRetry,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'receipts';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {receiptId};
+  @override
+  ReceiptsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return ReceiptsData(
+      receiptId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}receipt_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      )!,
+      messageId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}message_id'],
+      ),
+      message: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}message'],
+      )!,
+      contactWillSendsReceipt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_will_sends_receipt'],
+      )!,
+      willBeRetriedByMediaUpload: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}will_be_retried_by_media_upload'],
+      )!,
+      markForRetry: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}mark_for_retry'],
+      ),
+      markForRetryAfterAccepted: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}mark_for_retry_after_accepted'],
+      ),
+      ackByServerAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}ack_by_server_at'],
+      ),
+      retryCount: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}retry_count'],
+      )!,
+      lastRetry: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_retry'],
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  Receipts createAlias(String alias) {
+    return Receipts(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(receipt_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class ReceiptsData extends DataClass implements Insertable<ReceiptsData> {
+  final String receiptId;
+  final int contactId;
+  final String? messageId;
+  final i2.Uint8List message;
+  final int contactWillSendsReceipt;
+  final int willBeRetriedByMediaUpload;
+  final int? markForRetry;
+  final int? markForRetryAfterAccepted;
+  final int? ackByServerAt;
+  final int retryCount;
+  final int? lastRetry;
+  final int createdAt;
+  const ReceiptsData({
+    required this.receiptId,
+    required this.contactId,
+    this.messageId,
+    required this.message,
+    required this.contactWillSendsReceipt,
+    required this.willBeRetriedByMediaUpload,
+    this.markForRetry,
+    this.markForRetryAfterAccepted,
+    this.ackByServerAt,
+    required this.retryCount,
+    this.lastRetry,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['receipt_id'] = Variable<String>(receiptId);
+    map['contact_id'] = Variable<int>(contactId);
+    if (!nullToAbsent || messageId != null) {
+      map['message_id'] = Variable<String>(messageId);
+    }
+    map['message'] = Variable<i2.Uint8List>(message);
+    map['contact_will_sends_receipt'] = Variable<int>(contactWillSendsReceipt);
+    map['will_be_retried_by_media_upload'] = Variable<int>(
+      willBeRetriedByMediaUpload,
+    );
+    if (!nullToAbsent || markForRetry != null) {
+      map['mark_for_retry'] = Variable<int>(markForRetry);
+    }
+    if (!nullToAbsent || markForRetryAfterAccepted != null) {
+      map['mark_for_retry_after_accepted'] = Variable<int>(
+        markForRetryAfterAccepted,
+      );
+    }
+    if (!nullToAbsent || ackByServerAt != null) {
+      map['ack_by_server_at'] = Variable<int>(ackByServerAt);
+    }
+    map['retry_count'] = Variable<int>(retryCount);
+    if (!nullToAbsent || lastRetry != null) {
+      map['last_retry'] = Variable<int>(lastRetry);
+    }
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  ReceiptsCompanion toCompanion(bool nullToAbsent) {
+    return ReceiptsCompanion(
+      receiptId: Value(receiptId),
+      contactId: Value(contactId),
+      messageId: messageId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(messageId),
+      message: Value(message),
+      contactWillSendsReceipt: Value(contactWillSendsReceipt),
+      willBeRetriedByMediaUpload: Value(willBeRetriedByMediaUpload),
+      markForRetry: markForRetry == null && nullToAbsent
+          ? const Value.absent()
+          : Value(markForRetry),
+      markForRetryAfterAccepted:
+          markForRetryAfterAccepted == null && nullToAbsent
+          ? const Value.absent()
+          : Value(markForRetryAfterAccepted),
+      ackByServerAt: ackByServerAt == null && nullToAbsent
+          ? const Value.absent()
+          : Value(ackByServerAt),
+      retryCount: Value(retryCount),
+      lastRetry: lastRetry == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastRetry),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory ReceiptsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return ReceiptsData(
+      receiptId: serializer.fromJson<String>(json['receiptId']),
+      contactId: serializer.fromJson<int>(json['contactId']),
+      messageId: serializer.fromJson<String?>(json['messageId']),
+      message: serializer.fromJson<i2.Uint8List>(json['message']),
+      contactWillSendsReceipt: serializer.fromJson<int>(
+        json['contactWillSendsReceipt'],
+      ),
+      willBeRetriedByMediaUpload: serializer.fromJson<int>(
+        json['willBeRetriedByMediaUpload'],
+      ),
+      markForRetry: serializer.fromJson<int?>(json['markForRetry']),
+      markForRetryAfterAccepted: serializer.fromJson<int?>(
+        json['markForRetryAfterAccepted'],
+      ),
+      ackByServerAt: serializer.fromJson<int?>(json['ackByServerAt']),
+      retryCount: serializer.fromJson<int>(json['retryCount']),
+      lastRetry: serializer.fromJson<int?>(json['lastRetry']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'receiptId': serializer.toJson<String>(receiptId),
+      'contactId': serializer.toJson<int>(contactId),
+      'messageId': serializer.toJson<String?>(messageId),
+      'message': serializer.toJson<i2.Uint8List>(message),
+      'contactWillSendsReceipt': serializer.toJson<int>(
+        contactWillSendsReceipt,
+      ),
+      'willBeRetriedByMediaUpload': serializer.toJson<int>(
+        willBeRetriedByMediaUpload,
+      ),
+      'markForRetry': serializer.toJson<int?>(markForRetry),
+      'markForRetryAfterAccepted': serializer.toJson<int?>(
+        markForRetryAfterAccepted,
+      ),
+      'ackByServerAt': serializer.toJson<int?>(ackByServerAt),
+      'retryCount': serializer.toJson<int>(retryCount),
+      'lastRetry': serializer.toJson<int?>(lastRetry),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  ReceiptsData copyWith({
+    String? receiptId,
+    int? contactId,
+    Value<String?> messageId = const Value.absent(),
+    i2.Uint8List? message,
+    int? contactWillSendsReceipt,
+    int? willBeRetriedByMediaUpload,
+    Value<int?> markForRetry = const Value.absent(),
+    Value<int?> markForRetryAfterAccepted = const Value.absent(),
+    Value<int?> ackByServerAt = const Value.absent(),
+    int? retryCount,
+    Value<int?> lastRetry = const Value.absent(),
+    int? createdAt,
+  }) => ReceiptsData(
+    receiptId: receiptId ?? this.receiptId,
+    contactId: contactId ?? this.contactId,
+    messageId: messageId.present ? messageId.value : this.messageId,
+    message: message ?? this.message,
+    contactWillSendsReceipt:
+        contactWillSendsReceipt ?? this.contactWillSendsReceipt,
+    willBeRetriedByMediaUpload:
+        willBeRetriedByMediaUpload ?? this.willBeRetriedByMediaUpload,
+    markForRetry: markForRetry.present ? markForRetry.value : this.markForRetry,
+    markForRetryAfterAccepted: markForRetryAfterAccepted.present
+        ? markForRetryAfterAccepted.value
+        : this.markForRetryAfterAccepted,
+    ackByServerAt: ackByServerAt.present
+        ? ackByServerAt.value
+        : this.ackByServerAt,
+    retryCount: retryCount ?? this.retryCount,
+    lastRetry: lastRetry.present ? lastRetry.value : this.lastRetry,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  ReceiptsData copyWithCompanion(ReceiptsCompanion data) {
+    return ReceiptsData(
+      receiptId: data.receiptId.present ? data.receiptId.value : this.receiptId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      messageId: data.messageId.present ? data.messageId.value : this.messageId,
+      message: data.message.present ? data.message.value : this.message,
+      contactWillSendsReceipt: data.contactWillSendsReceipt.present
+          ? data.contactWillSendsReceipt.value
+          : this.contactWillSendsReceipt,
+      willBeRetriedByMediaUpload: data.willBeRetriedByMediaUpload.present
+          ? data.willBeRetriedByMediaUpload.value
+          : this.willBeRetriedByMediaUpload,
+      markForRetry: data.markForRetry.present
+          ? data.markForRetry.value
+          : this.markForRetry,
+      markForRetryAfterAccepted: data.markForRetryAfterAccepted.present
+          ? data.markForRetryAfterAccepted.value
+          : this.markForRetryAfterAccepted,
+      ackByServerAt: data.ackByServerAt.present
+          ? data.ackByServerAt.value
+          : this.ackByServerAt,
+      retryCount: data.retryCount.present
+          ? data.retryCount.value
+          : this.retryCount,
+      lastRetry: data.lastRetry.present ? data.lastRetry.value : this.lastRetry,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ReceiptsData(')
+          ..write('receiptId: $receiptId, ')
+          ..write('contactId: $contactId, ')
+          ..write('messageId: $messageId, ')
+          ..write('message: $message, ')
+          ..write('contactWillSendsReceipt: $contactWillSendsReceipt, ')
+          ..write('willBeRetriedByMediaUpload: $willBeRetriedByMediaUpload, ')
+          ..write('markForRetry: $markForRetry, ')
+          ..write('markForRetryAfterAccepted: $markForRetryAfterAccepted, ')
+          ..write('ackByServerAt: $ackByServerAt, ')
+          ..write('retryCount: $retryCount, ')
+          ..write('lastRetry: $lastRetry, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    receiptId,
+    contactId,
+    messageId,
+    $driftBlobEquality.hash(message),
+    contactWillSendsReceipt,
+    willBeRetriedByMediaUpload,
+    markForRetry,
+    markForRetryAfterAccepted,
+    ackByServerAt,
+    retryCount,
+    lastRetry,
+    createdAt,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is ReceiptsData &&
+          other.receiptId == this.receiptId &&
+          other.contactId == this.contactId &&
+          other.messageId == this.messageId &&
+          $driftBlobEquality.equals(other.message, this.message) &&
+          other.contactWillSendsReceipt == this.contactWillSendsReceipt &&
+          other.willBeRetriedByMediaUpload == this.willBeRetriedByMediaUpload &&
+          other.markForRetry == this.markForRetry &&
+          other.markForRetryAfterAccepted == this.markForRetryAfterAccepted &&
+          other.ackByServerAt == this.ackByServerAt &&
+          other.retryCount == this.retryCount &&
+          other.lastRetry == this.lastRetry &&
+          other.createdAt == this.createdAt);
+}
+
+class ReceiptsCompanion extends UpdateCompanion<ReceiptsData> {
+  final Value<String> receiptId;
+  final Value<int> contactId;
+  final Value<String?> messageId;
+  final Value<i2.Uint8List> message;
+  final Value<int> contactWillSendsReceipt;
+  final Value<int> willBeRetriedByMediaUpload;
+  final Value<int?> markForRetry;
+  final Value<int?> markForRetryAfterAccepted;
+  final Value<int?> ackByServerAt;
+  final Value<int> retryCount;
+  final Value<int?> lastRetry;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const ReceiptsCompanion({
+    this.receiptId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.messageId = const Value.absent(),
+    this.message = const Value.absent(),
+    this.contactWillSendsReceipt = const Value.absent(),
+    this.willBeRetriedByMediaUpload = const Value.absent(),
+    this.markForRetry = const Value.absent(),
+    this.markForRetryAfterAccepted = const Value.absent(),
+    this.ackByServerAt = const Value.absent(),
+    this.retryCount = const Value.absent(),
+    this.lastRetry = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  ReceiptsCompanion.insert({
+    required String receiptId,
+    required int contactId,
+    this.messageId = const Value.absent(),
+    required i2.Uint8List message,
+    this.contactWillSendsReceipt = const Value.absent(),
+    this.willBeRetriedByMediaUpload = const Value.absent(),
+    this.markForRetry = const Value.absent(),
+    this.markForRetryAfterAccepted = const Value.absent(),
+    this.ackByServerAt = const Value.absent(),
+    this.retryCount = const Value.absent(),
+    this.lastRetry = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : receiptId = Value(receiptId),
+       contactId = Value(contactId),
+       message = Value(message);
+  static Insertable<ReceiptsData> custom({
+    Expression<String>? receiptId,
+    Expression<int>? contactId,
+    Expression<String>? messageId,
+    Expression<i2.Uint8List>? message,
+    Expression<int>? contactWillSendsReceipt,
+    Expression<int>? willBeRetriedByMediaUpload,
+    Expression<int>? markForRetry,
+    Expression<int>? markForRetryAfterAccepted,
+    Expression<int>? ackByServerAt,
+    Expression<int>? retryCount,
+    Expression<int>? lastRetry,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (receiptId != null) 'receipt_id': receiptId,
+      if (contactId != null) 'contact_id': contactId,
+      if (messageId != null) 'message_id': messageId,
+      if (message != null) 'message': message,
+      if (contactWillSendsReceipt != null)
+        'contact_will_sends_receipt': contactWillSendsReceipt,
+      if (willBeRetriedByMediaUpload != null)
+        'will_be_retried_by_media_upload': willBeRetriedByMediaUpload,
+      if (markForRetry != null) 'mark_for_retry': markForRetry,
+      if (markForRetryAfterAccepted != null)
+        'mark_for_retry_after_accepted': markForRetryAfterAccepted,
+      if (ackByServerAt != null) 'ack_by_server_at': ackByServerAt,
+      if (retryCount != null) 'retry_count': retryCount,
+      if (lastRetry != null) 'last_retry': lastRetry,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  ReceiptsCompanion copyWith({
+    Value<String>? receiptId,
+    Value<int>? contactId,
+    Value<String?>? messageId,
+    Value<i2.Uint8List>? message,
+    Value<int>? contactWillSendsReceipt,
+    Value<int>? willBeRetriedByMediaUpload,
+    Value<int?>? markForRetry,
+    Value<int?>? markForRetryAfterAccepted,
+    Value<int?>? ackByServerAt,
+    Value<int>? retryCount,
+    Value<int?>? lastRetry,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return ReceiptsCompanion(
+      receiptId: receiptId ?? this.receiptId,
+      contactId: contactId ?? this.contactId,
+      messageId: messageId ?? this.messageId,
+      message: message ?? this.message,
+      contactWillSendsReceipt:
+          contactWillSendsReceipt ?? this.contactWillSendsReceipt,
+      willBeRetriedByMediaUpload:
+          willBeRetriedByMediaUpload ?? this.willBeRetriedByMediaUpload,
+      markForRetry: markForRetry ?? this.markForRetry,
+      markForRetryAfterAccepted:
+          markForRetryAfterAccepted ?? this.markForRetryAfterAccepted,
+      ackByServerAt: ackByServerAt ?? this.ackByServerAt,
+      retryCount: retryCount ?? this.retryCount,
+      lastRetry: lastRetry ?? this.lastRetry,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (receiptId.present) {
+      map['receipt_id'] = Variable<String>(receiptId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (messageId.present) {
+      map['message_id'] = Variable<String>(messageId.value);
+    }
+    if (message.present) {
+      map['message'] = Variable<i2.Uint8List>(message.value);
+    }
+    if (contactWillSendsReceipt.present) {
+      map['contact_will_sends_receipt'] = Variable<int>(
+        contactWillSendsReceipt.value,
+      );
+    }
+    if (willBeRetriedByMediaUpload.present) {
+      map['will_be_retried_by_media_upload'] = Variable<int>(
+        willBeRetriedByMediaUpload.value,
+      );
+    }
+    if (markForRetry.present) {
+      map['mark_for_retry'] = Variable<int>(markForRetry.value);
+    }
+    if (markForRetryAfterAccepted.present) {
+      map['mark_for_retry_after_accepted'] = Variable<int>(
+        markForRetryAfterAccepted.value,
+      );
+    }
+    if (ackByServerAt.present) {
+      map['ack_by_server_at'] = Variable<int>(ackByServerAt.value);
+    }
+    if (retryCount.present) {
+      map['retry_count'] = Variable<int>(retryCount.value);
+    }
+    if (lastRetry.present) {
+      map['last_retry'] = Variable<int>(lastRetry.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ReceiptsCompanion(')
+          ..write('receiptId: $receiptId, ')
+          ..write('contactId: $contactId, ')
+          ..write('messageId: $messageId, ')
+          ..write('message: $message, ')
+          ..write('contactWillSendsReceipt: $contactWillSendsReceipt, ')
+          ..write('willBeRetriedByMediaUpload: $willBeRetriedByMediaUpload, ')
+          ..write('markForRetry: $markForRetry, ')
+          ..write('markForRetryAfterAccepted: $markForRetryAfterAccepted, ')
+          ..write('ackByServerAt: $ackByServerAt, ')
+          ..write('retryCount: $retryCount, ')
+          ..write('lastRetry: $lastRetry, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class ReceivedReceipts extends Table
+    with TableInfo<ReceivedReceipts, ReceivedReceiptsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  ReceivedReceipts(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> receiptId = GeneratedColumn<String>(
+    'receipt_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [receiptId, createdAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'received_receipts';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {receiptId};
+  @override
+  ReceivedReceiptsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return ReceivedReceiptsData(
+      receiptId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}receipt_id'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  ReceivedReceipts createAlias(String alias) {
+    return ReceivedReceipts(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(receipt_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class ReceivedReceiptsData extends DataClass
+    implements Insertable<ReceivedReceiptsData> {
+  final String receiptId;
+  final int createdAt;
+  const ReceivedReceiptsData({
+    required this.receiptId,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['receipt_id'] = Variable<String>(receiptId);
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  ReceivedReceiptsCompanion toCompanion(bool nullToAbsent) {
+    return ReceivedReceiptsCompanion(
+      receiptId: Value(receiptId),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory ReceivedReceiptsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return ReceivedReceiptsData(
+      receiptId: serializer.fromJson<String>(json['receiptId']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'receiptId': serializer.toJson<String>(receiptId),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  ReceivedReceiptsData copyWith({String? receiptId, int? createdAt}) =>
+      ReceivedReceiptsData(
+        receiptId: receiptId ?? this.receiptId,
+        createdAt: createdAt ?? this.createdAt,
+      );
+  ReceivedReceiptsData copyWithCompanion(ReceivedReceiptsCompanion data) {
+    return ReceivedReceiptsData(
+      receiptId: data.receiptId.present ? data.receiptId.value : this.receiptId,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ReceivedReceiptsData(')
+          ..write('receiptId: $receiptId, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(receiptId, createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is ReceivedReceiptsData &&
+          other.receiptId == this.receiptId &&
+          other.createdAt == this.createdAt);
+}
+
+class ReceivedReceiptsCompanion extends UpdateCompanion<ReceivedReceiptsData> {
+  final Value<String> receiptId;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const ReceivedReceiptsCompanion({
+    this.receiptId = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  ReceivedReceiptsCompanion.insert({
+    required String receiptId,
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : receiptId = Value(receiptId);
+  static Insertable<ReceivedReceiptsData> custom({
+    Expression<String>? receiptId,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (receiptId != null) 'receipt_id': receiptId,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  ReceivedReceiptsCompanion copyWith({
+    Value<String>? receiptId,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return ReceivedReceiptsCompanion(
+      receiptId: receiptId ?? this.receiptId,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (receiptId.present) {
+      map['receipt_id'] = Variable<String>(receiptId.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ReceivedReceiptsCompanion(')
+          ..write('receiptId: $receiptId, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class SignalIdentityKeyStores extends Table
+    with TableInfo<SignalIdentityKeyStores, SignalIdentityKeyStoresData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  SignalIdentityKeyStores(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> deviceId = GeneratedColumn<int>(
+    'device_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> name = GeneratedColumn<String>(
+    'name',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> identityKey =
+      GeneratedColumn<i2.Uint8List>(
+        'identity_key',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    deviceId,
+    name,
+    identityKey,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'signal_identity_key_stores';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {deviceId, name};
+  @override
+  SignalIdentityKeyStoresData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return SignalIdentityKeyStoresData(
+      deviceId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}device_id'],
+      )!,
+      name: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}name'],
+      )!,
+      identityKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}identity_key'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  SignalIdentityKeyStores createAlias(String alias) {
+    return SignalIdentityKeyStores(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(device_id, name)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class SignalIdentityKeyStoresData extends DataClass
+    implements Insertable<SignalIdentityKeyStoresData> {
+  final int deviceId;
+  final String name;
+  final i2.Uint8List identityKey;
+  final int createdAt;
+  const SignalIdentityKeyStoresData({
+    required this.deviceId,
+    required this.name,
+    required this.identityKey,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['device_id'] = Variable<int>(deviceId);
+    map['name'] = Variable<String>(name);
+    map['identity_key'] = Variable<i2.Uint8List>(identityKey);
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  SignalIdentityKeyStoresCompanion toCompanion(bool nullToAbsent) {
+    return SignalIdentityKeyStoresCompanion(
+      deviceId: Value(deviceId),
+      name: Value(name),
+      identityKey: Value(identityKey),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory SignalIdentityKeyStoresData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return SignalIdentityKeyStoresData(
+      deviceId: serializer.fromJson<int>(json['deviceId']),
+      name: serializer.fromJson<String>(json['name']),
+      identityKey: serializer.fromJson<i2.Uint8List>(json['identityKey']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'deviceId': serializer.toJson<int>(deviceId),
+      'name': serializer.toJson<String>(name),
+      'identityKey': serializer.toJson<i2.Uint8List>(identityKey),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  SignalIdentityKeyStoresData copyWith({
+    int? deviceId,
+    String? name,
+    i2.Uint8List? identityKey,
+    int? createdAt,
+  }) => SignalIdentityKeyStoresData(
+    deviceId: deviceId ?? this.deviceId,
+    name: name ?? this.name,
+    identityKey: identityKey ?? this.identityKey,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  SignalIdentityKeyStoresData copyWithCompanion(
+    SignalIdentityKeyStoresCompanion data,
+  ) {
+    return SignalIdentityKeyStoresData(
+      deviceId: data.deviceId.present ? data.deviceId.value : this.deviceId,
+      name: data.name.present ? data.name.value : this.name,
+      identityKey: data.identityKey.present
+          ? data.identityKey.value
+          : this.identityKey,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalIdentityKeyStoresData(')
+          ..write('deviceId: $deviceId, ')
+          ..write('name: $name, ')
+          ..write('identityKey: $identityKey, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    deviceId,
+    name,
+    $driftBlobEquality.hash(identityKey),
+    createdAt,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is SignalIdentityKeyStoresData &&
+          other.deviceId == this.deviceId &&
+          other.name == this.name &&
+          $driftBlobEquality.equals(other.identityKey, this.identityKey) &&
+          other.createdAt == this.createdAt);
+}
+
+class SignalIdentityKeyStoresCompanion
+    extends UpdateCompanion<SignalIdentityKeyStoresData> {
+  final Value<int> deviceId;
+  final Value<String> name;
+  final Value<i2.Uint8List> identityKey;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const SignalIdentityKeyStoresCompanion({
+    this.deviceId = const Value.absent(),
+    this.name = const Value.absent(),
+    this.identityKey = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  SignalIdentityKeyStoresCompanion.insert({
+    required int deviceId,
+    required String name,
+    required i2.Uint8List identityKey,
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : deviceId = Value(deviceId),
+       name = Value(name),
+       identityKey = Value(identityKey);
+  static Insertable<SignalIdentityKeyStoresData> custom({
+    Expression<int>? deviceId,
+    Expression<String>? name,
+    Expression<i2.Uint8List>? identityKey,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (deviceId != null) 'device_id': deviceId,
+      if (name != null) 'name': name,
+      if (identityKey != null) 'identity_key': identityKey,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  SignalIdentityKeyStoresCompanion copyWith({
+    Value<int>? deviceId,
+    Value<String>? name,
+    Value<i2.Uint8List>? identityKey,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return SignalIdentityKeyStoresCompanion(
+      deviceId: deviceId ?? this.deviceId,
+      name: name ?? this.name,
+      identityKey: identityKey ?? this.identityKey,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (deviceId.present) {
+      map['device_id'] = Variable<int>(deviceId.value);
+    }
+    if (name.present) {
+      map['name'] = Variable<String>(name.value);
+    }
+    if (identityKey.present) {
+      map['identity_key'] = Variable<i2.Uint8List>(identityKey.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalIdentityKeyStoresCompanion(')
+          ..write('deviceId: $deviceId, ')
+          ..write('name: $name, ')
+          ..write('identityKey: $identityKey, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class SignalPreKeyStores extends Table
+    with TableInfo<SignalPreKeyStores, SignalPreKeyStoresData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  SignalPreKeyStores(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> preKeyId = GeneratedColumn<int>(
+    'pre_key_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> preKey =
+      GeneratedColumn<i2.Uint8List>(
+        'pre_key',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [preKeyId, preKey, createdAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'signal_pre_key_stores';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {preKeyId};
+  @override
+  SignalPreKeyStoresData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return SignalPreKeyStoresData(
+      preKeyId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}pre_key_id'],
+      )!,
+      preKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}pre_key'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  SignalPreKeyStores createAlias(String alias) {
+    return SignalPreKeyStores(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(pre_key_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class SignalPreKeyStoresData extends DataClass
+    implements Insertable<SignalPreKeyStoresData> {
+  final int preKeyId;
+  final i2.Uint8List preKey;
+  final int createdAt;
+  const SignalPreKeyStoresData({
+    required this.preKeyId,
+    required this.preKey,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['pre_key_id'] = Variable<int>(preKeyId);
+    map['pre_key'] = Variable<i2.Uint8List>(preKey);
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  SignalPreKeyStoresCompanion toCompanion(bool nullToAbsent) {
+    return SignalPreKeyStoresCompanion(
+      preKeyId: Value(preKeyId),
+      preKey: Value(preKey),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory SignalPreKeyStoresData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return SignalPreKeyStoresData(
+      preKeyId: serializer.fromJson<int>(json['preKeyId']),
+      preKey: serializer.fromJson<i2.Uint8List>(json['preKey']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'preKeyId': serializer.toJson<int>(preKeyId),
+      'preKey': serializer.toJson<i2.Uint8List>(preKey),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  SignalPreKeyStoresData copyWith({
+    int? preKeyId,
+    i2.Uint8List? preKey,
+    int? createdAt,
+  }) => SignalPreKeyStoresData(
+    preKeyId: preKeyId ?? this.preKeyId,
+    preKey: preKey ?? this.preKey,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  SignalPreKeyStoresData copyWithCompanion(SignalPreKeyStoresCompanion data) {
+    return SignalPreKeyStoresData(
+      preKeyId: data.preKeyId.present ? data.preKeyId.value : this.preKeyId,
+      preKey: data.preKey.present ? data.preKey.value : this.preKey,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalPreKeyStoresData(')
+          ..write('preKeyId: $preKeyId, ')
+          ..write('preKey: $preKey, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(preKeyId, $driftBlobEquality.hash(preKey), createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is SignalPreKeyStoresData &&
+          other.preKeyId == this.preKeyId &&
+          $driftBlobEquality.equals(other.preKey, this.preKey) &&
+          other.createdAt == this.createdAt);
+}
+
+class SignalPreKeyStoresCompanion
+    extends UpdateCompanion<SignalPreKeyStoresData> {
+  final Value<int> preKeyId;
+  final Value<i2.Uint8List> preKey;
+  final Value<int> createdAt;
+  const SignalPreKeyStoresCompanion({
+    this.preKeyId = const Value.absent(),
+    this.preKey = const Value.absent(),
+    this.createdAt = const Value.absent(),
+  });
+  SignalPreKeyStoresCompanion.insert({
+    this.preKeyId = const Value.absent(),
+    required i2.Uint8List preKey,
+    this.createdAt = const Value.absent(),
+  }) : preKey = Value(preKey);
+  static Insertable<SignalPreKeyStoresData> custom({
+    Expression<int>? preKeyId,
+    Expression<i2.Uint8List>? preKey,
+    Expression<int>? createdAt,
+  }) {
+    return RawValuesInsertable({
+      if (preKeyId != null) 'pre_key_id': preKeyId,
+      if (preKey != null) 'pre_key': preKey,
+      if (createdAt != null) 'created_at': createdAt,
+    });
+  }
+
+  SignalPreKeyStoresCompanion copyWith({
+    Value<int>? preKeyId,
+    Value<i2.Uint8List>? preKey,
+    Value<int>? createdAt,
+  }) {
+    return SignalPreKeyStoresCompanion(
+      preKeyId: preKeyId ?? this.preKeyId,
+      preKey: preKey ?? this.preKey,
+      createdAt: createdAt ?? this.createdAt,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (preKeyId.present) {
+      map['pre_key_id'] = Variable<int>(preKeyId.value);
+    }
+    if (preKey.present) {
+      map['pre_key'] = Variable<i2.Uint8List>(preKey.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalPreKeyStoresCompanion(')
+          ..write('preKeyId: $preKeyId, ')
+          ..write('preKey: $preKey, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class SignalSenderKeyStores extends Table
+    with TableInfo<SignalSenderKeyStores, SignalSenderKeyStoresData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  SignalSenderKeyStores(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> senderKeyName = GeneratedColumn<String>(
+    'sender_key_name',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> senderKey =
+      GeneratedColumn<i2.Uint8List>(
+        'sender_key',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  @override
+  List<GeneratedColumn> get $columns => [senderKeyName, senderKey];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'signal_sender_key_stores';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {senderKeyName};
+  @override
+  SignalSenderKeyStoresData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return SignalSenderKeyStoresData(
+      senderKeyName: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}sender_key_name'],
+      )!,
+      senderKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}sender_key'],
+      )!,
+    );
+  }
+
+  @override
+  SignalSenderKeyStores createAlias(String alias) {
+    return SignalSenderKeyStores(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(sender_key_name)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class SignalSenderKeyStoresData extends DataClass
+    implements Insertable<SignalSenderKeyStoresData> {
+  final String senderKeyName;
+  final i2.Uint8List senderKey;
+  const SignalSenderKeyStoresData({
+    required this.senderKeyName,
+    required this.senderKey,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['sender_key_name'] = Variable<String>(senderKeyName);
+    map['sender_key'] = Variable<i2.Uint8List>(senderKey);
+    return map;
+  }
+
+  SignalSenderKeyStoresCompanion toCompanion(bool nullToAbsent) {
+    return SignalSenderKeyStoresCompanion(
+      senderKeyName: Value(senderKeyName),
+      senderKey: Value(senderKey),
+    );
+  }
+
+  factory SignalSenderKeyStoresData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return SignalSenderKeyStoresData(
+      senderKeyName: serializer.fromJson<String>(json['senderKeyName']),
+      senderKey: serializer.fromJson<i2.Uint8List>(json['senderKey']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'senderKeyName': serializer.toJson<String>(senderKeyName),
+      'senderKey': serializer.toJson<i2.Uint8List>(senderKey),
+    };
+  }
+
+  SignalSenderKeyStoresData copyWith({
+    String? senderKeyName,
+    i2.Uint8List? senderKey,
+  }) => SignalSenderKeyStoresData(
+    senderKeyName: senderKeyName ?? this.senderKeyName,
+    senderKey: senderKey ?? this.senderKey,
+  );
+  SignalSenderKeyStoresData copyWithCompanion(
+    SignalSenderKeyStoresCompanion data,
+  ) {
+    return SignalSenderKeyStoresData(
+      senderKeyName: data.senderKeyName.present
+          ? data.senderKeyName.value
+          : this.senderKeyName,
+      senderKey: data.senderKey.present ? data.senderKey.value : this.senderKey,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalSenderKeyStoresData(')
+          ..write('senderKeyName: $senderKeyName, ')
+          ..write('senderKey: $senderKey')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(senderKeyName, $driftBlobEquality.hash(senderKey));
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is SignalSenderKeyStoresData &&
+          other.senderKeyName == this.senderKeyName &&
+          $driftBlobEquality.equals(other.senderKey, this.senderKey));
+}
+
+class SignalSenderKeyStoresCompanion
+    extends UpdateCompanion<SignalSenderKeyStoresData> {
+  final Value<String> senderKeyName;
+  final Value<i2.Uint8List> senderKey;
+  final Value<int> rowid;
+  const SignalSenderKeyStoresCompanion({
+    this.senderKeyName = const Value.absent(),
+    this.senderKey = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  SignalSenderKeyStoresCompanion.insert({
+    required String senderKeyName,
+    required i2.Uint8List senderKey,
+    this.rowid = const Value.absent(),
+  }) : senderKeyName = Value(senderKeyName),
+       senderKey = Value(senderKey);
+  static Insertable<SignalSenderKeyStoresData> custom({
+    Expression<String>? senderKeyName,
+    Expression<i2.Uint8List>? senderKey,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (senderKeyName != null) 'sender_key_name': senderKeyName,
+      if (senderKey != null) 'sender_key': senderKey,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  SignalSenderKeyStoresCompanion copyWith({
+    Value<String>? senderKeyName,
+    Value<i2.Uint8List>? senderKey,
+    Value<int>? rowid,
+  }) {
+    return SignalSenderKeyStoresCompanion(
+      senderKeyName: senderKeyName ?? this.senderKeyName,
+      senderKey: senderKey ?? this.senderKey,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (senderKeyName.present) {
+      map['sender_key_name'] = Variable<String>(senderKeyName.value);
+    }
+    if (senderKey.present) {
+      map['sender_key'] = Variable<i2.Uint8List>(senderKey.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalSenderKeyStoresCompanion(')
+          ..write('senderKeyName: $senderKeyName, ')
+          ..write('senderKey: $senderKey, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class SignalSessionStores extends Table
+    with TableInfo<SignalSessionStores, SignalSessionStoresData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  SignalSessionStores(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> deviceId = GeneratedColumn<int>(
+    'device_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> name = GeneratedColumn<String>(
+    'name',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> sessionRecord =
+      GeneratedColumn<i2.Uint8List>(
+        'session_record',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    deviceId,
+    name,
+    sessionRecord,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'signal_session_stores';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {deviceId, name};
+  @override
+  SignalSessionStoresData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return SignalSessionStoresData(
+      deviceId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}device_id'],
+      )!,
+      name: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}name'],
+      )!,
+      sessionRecord: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}session_record'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  SignalSessionStores createAlias(String alias) {
+    return SignalSessionStores(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(device_id, name)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class SignalSessionStoresData extends DataClass
+    implements Insertable<SignalSessionStoresData> {
+  final int deviceId;
+  final String name;
+  final i2.Uint8List sessionRecord;
+  final int createdAt;
+  const SignalSessionStoresData({
+    required this.deviceId,
+    required this.name,
+    required this.sessionRecord,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['device_id'] = Variable<int>(deviceId);
+    map['name'] = Variable<String>(name);
+    map['session_record'] = Variable<i2.Uint8List>(sessionRecord);
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  SignalSessionStoresCompanion toCompanion(bool nullToAbsent) {
+    return SignalSessionStoresCompanion(
+      deviceId: Value(deviceId),
+      name: Value(name),
+      sessionRecord: Value(sessionRecord),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory SignalSessionStoresData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return SignalSessionStoresData(
+      deviceId: serializer.fromJson<int>(json['deviceId']),
+      name: serializer.fromJson<String>(json['name']),
+      sessionRecord: serializer.fromJson<i2.Uint8List>(json['sessionRecord']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'deviceId': serializer.toJson<int>(deviceId),
+      'name': serializer.toJson<String>(name),
+      'sessionRecord': serializer.toJson<i2.Uint8List>(sessionRecord),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  SignalSessionStoresData copyWith({
+    int? deviceId,
+    String? name,
+    i2.Uint8List? sessionRecord,
+    int? createdAt,
+  }) => SignalSessionStoresData(
+    deviceId: deviceId ?? this.deviceId,
+    name: name ?? this.name,
+    sessionRecord: sessionRecord ?? this.sessionRecord,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  SignalSessionStoresData copyWithCompanion(SignalSessionStoresCompanion data) {
+    return SignalSessionStoresData(
+      deviceId: data.deviceId.present ? data.deviceId.value : this.deviceId,
+      name: data.name.present ? data.name.value : this.name,
+      sessionRecord: data.sessionRecord.present
+          ? data.sessionRecord.value
+          : this.sessionRecord,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalSessionStoresData(')
+          ..write('deviceId: $deviceId, ')
+          ..write('name: $name, ')
+          ..write('sessionRecord: $sessionRecord, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    deviceId,
+    name,
+    $driftBlobEquality.hash(sessionRecord),
+    createdAt,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is SignalSessionStoresData &&
+          other.deviceId == this.deviceId &&
+          other.name == this.name &&
+          $driftBlobEquality.equals(other.sessionRecord, this.sessionRecord) &&
+          other.createdAt == this.createdAt);
+}
+
+class SignalSessionStoresCompanion
+    extends UpdateCompanion<SignalSessionStoresData> {
+  final Value<int> deviceId;
+  final Value<String> name;
+  final Value<i2.Uint8List> sessionRecord;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const SignalSessionStoresCompanion({
+    this.deviceId = const Value.absent(),
+    this.name = const Value.absent(),
+    this.sessionRecord = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  SignalSessionStoresCompanion.insert({
+    required int deviceId,
+    required String name,
+    required i2.Uint8List sessionRecord,
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : deviceId = Value(deviceId),
+       name = Value(name),
+       sessionRecord = Value(sessionRecord);
+  static Insertable<SignalSessionStoresData> custom({
+    Expression<int>? deviceId,
+    Expression<String>? name,
+    Expression<i2.Uint8List>? sessionRecord,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (deviceId != null) 'device_id': deviceId,
+      if (name != null) 'name': name,
+      if (sessionRecord != null) 'session_record': sessionRecord,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  SignalSessionStoresCompanion copyWith({
+    Value<int>? deviceId,
+    Value<String>? name,
+    Value<i2.Uint8List>? sessionRecord,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return SignalSessionStoresCompanion(
+      deviceId: deviceId ?? this.deviceId,
+      name: name ?? this.name,
+      sessionRecord: sessionRecord ?? this.sessionRecord,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (deviceId.present) {
+      map['device_id'] = Variable<int>(deviceId.value);
+    }
+    if (name.present) {
+      map['name'] = Variable<String>(name.value);
+    }
+    if (sessionRecord.present) {
+      map['session_record'] = Variable<i2.Uint8List>(sessionRecord.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalSessionStoresCompanion(')
+          ..write('deviceId: $deviceId, ')
+          ..write('name: $name, ')
+          ..write('sessionRecord: $sessionRecord, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class MessageActions extends Table
+    with TableInfo<MessageActions, MessageActionsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  MessageActions(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> messageId = GeneratedColumn<String>(
+    'message_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES messages(message_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<String> type = GeneratedColumn<String>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> actionAt = GeneratedColumn<int>(
+    'action_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [messageId, contactId, type, actionAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'message_actions';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {messageId, contactId, type};
+  @override
+  MessageActionsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return MessageActionsData(
+      messageId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}message_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      )!,
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}type'],
+      )!,
+      actionAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}action_at'],
+      )!,
+    );
+  }
+
+  @override
+  MessageActions createAlias(String alias) {
+    return MessageActions(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const [
+    'PRIMARY KEY(message_id, contact_id, type)',
+  ];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class MessageActionsData extends DataClass
+    implements Insertable<MessageActionsData> {
+  final String messageId;
+  final int contactId;
+  final String type;
+  final int actionAt;
+  const MessageActionsData({
+    required this.messageId,
+    required this.contactId,
+    required this.type,
+    required this.actionAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['message_id'] = Variable<String>(messageId);
+    map['contact_id'] = Variable<int>(contactId);
+    map['type'] = Variable<String>(type);
+    map['action_at'] = Variable<int>(actionAt);
+    return map;
+  }
+
+  MessageActionsCompanion toCompanion(bool nullToAbsent) {
+    return MessageActionsCompanion(
+      messageId: Value(messageId),
+      contactId: Value(contactId),
+      type: Value(type),
+      actionAt: Value(actionAt),
+    );
+  }
+
+  factory MessageActionsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return MessageActionsData(
+      messageId: serializer.fromJson<String>(json['messageId']),
+      contactId: serializer.fromJson<int>(json['contactId']),
+      type: serializer.fromJson<String>(json['type']),
+      actionAt: serializer.fromJson<int>(json['actionAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'messageId': serializer.toJson<String>(messageId),
+      'contactId': serializer.toJson<int>(contactId),
+      'type': serializer.toJson<String>(type),
+      'actionAt': serializer.toJson<int>(actionAt),
+    };
+  }
+
+  MessageActionsData copyWith({
+    String? messageId,
+    int? contactId,
+    String? type,
+    int? actionAt,
+  }) => MessageActionsData(
+    messageId: messageId ?? this.messageId,
+    contactId: contactId ?? this.contactId,
+    type: type ?? this.type,
+    actionAt: actionAt ?? this.actionAt,
+  );
+  MessageActionsData copyWithCompanion(MessageActionsCompanion data) {
+    return MessageActionsData(
+      messageId: data.messageId.present ? data.messageId.value : this.messageId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      type: data.type.present ? data.type.value : this.type,
+      actionAt: data.actionAt.present ? data.actionAt.value : this.actionAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MessageActionsData(')
+          ..write('messageId: $messageId, ')
+          ..write('contactId: $contactId, ')
+          ..write('type: $type, ')
+          ..write('actionAt: $actionAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(messageId, contactId, type, actionAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is MessageActionsData &&
+          other.messageId == this.messageId &&
+          other.contactId == this.contactId &&
+          other.type == this.type &&
+          other.actionAt == this.actionAt);
+}
+
+class MessageActionsCompanion extends UpdateCompanion<MessageActionsData> {
+  final Value<String> messageId;
+  final Value<int> contactId;
+  final Value<String> type;
+  final Value<int> actionAt;
+  final Value<int> rowid;
+  const MessageActionsCompanion({
+    this.messageId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.type = const Value.absent(),
+    this.actionAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  MessageActionsCompanion.insert({
+    required String messageId,
+    required int contactId,
+    required String type,
+    this.actionAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : messageId = Value(messageId),
+       contactId = Value(contactId),
+       type = Value(type);
+  static Insertable<MessageActionsData> custom({
+    Expression<String>? messageId,
+    Expression<int>? contactId,
+    Expression<String>? type,
+    Expression<int>? actionAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (messageId != null) 'message_id': messageId,
+      if (contactId != null) 'contact_id': contactId,
+      if (type != null) 'type': type,
+      if (actionAt != null) 'action_at': actionAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  MessageActionsCompanion copyWith({
+    Value<String>? messageId,
+    Value<int>? contactId,
+    Value<String>? type,
+    Value<int>? actionAt,
+    Value<int>? rowid,
+  }) {
+    return MessageActionsCompanion(
+      messageId: messageId ?? this.messageId,
+      contactId: contactId ?? this.contactId,
+      type: type ?? this.type,
+      actionAt: actionAt ?? this.actionAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (messageId.present) {
+      map['message_id'] = Variable<String>(messageId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (type.present) {
+      map['type'] = Variable<String>(type.value);
+    }
+    if (actionAt.present) {
+      map['action_at'] = Variable<int>(actionAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MessageActionsCompanion(')
+          ..write('messageId: $messageId, ')
+          ..write('contactId: $contactId, ')
+          ..write('type: $type, ')
+          ..write('actionAt: $actionAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class GroupHistories extends Table
+    with TableInfo<GroupHistories, GroupHistoriesData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  GroupHistories(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> groupHistoryId = GeneratedColumn<String>(
+    'group_history_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> groupId = GeneratedColumn<String>(
+    'group_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES "groups"(group_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL REFERENCES contacts(user_id)',
+  );
+  late final GeneratedColumn<int> affectedContactId = GeneratedColumn<int>(
+    'affected_contact_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<String> oldGroupName = GeneratedColumn<String>(
+    'old_group_name',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<String> newGroupName = GeneratedColumn<String>(
+    'new_group_name',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> newDeleteMessagesAfterMilliseconds =
+      GeneratedColumn<int>(
+        'new_delete_messages_after_milliseconds',
+        aliasedName,
+        true,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<String> type = GeneratedColumn<String>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> actionAt = GeneratedColumn<int>(
+    'action_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    groupHistoryId,
+    groupId,
+    contactId,
+    affectedContactId,
+    oldGroupName,
+    newGroupName,
+    newDeleteMessagesAfterMilliseconds,
+    type,
+    actionAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'group_histories';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {groupHistoryId};
+  @override
+  GroupHistoriesData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return GroupHistoriesData(
+      groupHistoryId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}group_history_id'],
+      )!,
+      groupId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}group_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      ),
+      affectedContactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}affected_contact_id'],
+      ),
+      oldGroupName: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}old_group_name'],
+      ),
+      newGroupName: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}new_group_name'],
+      ),
+      newDeleteMessagesAfterMilliseconds: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}new_delete_messages_after_milliseconds'],
+      ),
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}type'],
+      )!,
+      actionAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}action_at'],
+      )!,
+    );
+  }
+
+  @override
+  GroupHistories createAlias(String alias) {
+    return GroupHistories(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(group_history_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class GroupHistoriesData extends DataClass
+    implements Insertable<GroupHistoriesData> {
+  final String groupHistoryId;
+  final String groupId;
+  final int? contactId;
+  final int? affectedContactId;
+  final String? oldGroupName;
+  final String? newGroupName;
+  final int? newDeleteMessagesAfterMilliseconds;
+  final String type;
+  final int actionAt;
+  const GroupHistoriesData({
+    required this.groupHistoryId,
+    required this.groupId,
+    this.contactId,
+    this.affectedContactId,
+    this.oldGroupName,
+    this.newGroupName,
+    this.newDeleteMessagesAfterMilliseconds,
+    required this.type,
+    required this.actionAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['group_history_id'] = Variable<String>(groupHistoryId);
+    map['group_id'] = Variable<String>(groupId);
+    if (!nullToAbsent || contactId != null) {
+      map['contact_id'] = Variable<int>(contactId);
+    }
+    if (!nullToAbsent || affectedContactId != null) {
+      map['affected_contact_id'] = Variable<int>(affectedContactId);
+    }
+    if (!nullToAbsent || oldGroupName != null) {
+      map['old_group_name'] = Variable<String>(oldGroupName);
+    }
+    if (!nullToAbsent || newGroupName != null) {
+      map['new_group_name'] = Variable<String>(newGroupName);
+    }
+    if (!nullToAbsent || newDeleteMessagesAfterMilliseconds != null) {
+      map['new_delete_messages_after_milliseconds'] = Variable<int>(
+        newDeleteMessagesAfterMilliseconds,
+      );
+    }
+    map['type'] = Variable<String>(type);
+    map['action_at'] = Variable<int>(actionAt);
+    return map;
+  }
+
+  GroupHistoriesCompanion toCompanion(bool nullToAbsent) {
+    return GroupHistoriesCompanion(
+      groupHistoryId: Value(groupHistoryId),
+      groupId: Value(groupId),
+      contactId: contactId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(contactId),
+      affectedContactId: affectedContactId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(affectedContactId),
+      oldGroupName: oldGroupName == null && nullToAbsent
+          ? const Value.absent()
+          : Value(oldGroupName),
+      newGroupName: newGroupName == null && nullToAbsent
+          ? const Value.absent()
+          : Value(newGroupName),
+      newDeleteMessagesAfterMilliseconds:
+          newDeleteMessagesAfterMilliseconds == null && nullToAbsent
+          ? const Value.absent()
+          : Value(newDeleteMessagesAfterMilliseconds),
+      type: Value(type),
+      actionAt: Value(actionAt),
+    );
+  }
+
+  factory GroupHistoriesData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return GroupHistoriesData(
+      groupHistoryId: serializer.fromJson<String>(json['groupHistoryId']),
+      groupId: serializer.fromJson<String>(json['groupId']),
+      contactId: serializer.fromJson<int?>(json['contactId']),
+      affectedContactId: serializer.fromJson<int?>(json['affectedContactId']),
+      oldGroupName: serializer.fromJson<String?>(json['oldGroupName']),
+      newGroupName: serializer.fromJson<String?>(json['newGroupName']),
+      newDeleteMessagesAfterMilliseconds: serializer.fromJson<int?>(
+        json['newDeleteMessagesAfterMilliseconds'],
+      ),
+      type: serializer.fromJson<String>(json['type']),
+      actionAt: serializer.fromJson<int>(json['actionAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'groupHistoryId': serializer.toJson<String>(groupHistoryId),
+      'groupId': serializer.toJson<String>(groupId),
+      'contactId': serializer.toJson<int?>(contactId),
+      'affectedContactId': serializer.toJson<int?>(affectedContactId),
+      'oldGroupName': serializer.toJson<String?>(oldGroupName),
+      'newGroupName': serializer.toJson<String?>(newGroupName),
+      'newDeleteMessagesAfterMilliseconds': serializer.toJson<int?>(
+        newDeleteMessagesAfterMilliseconds,
+      ),
+      'type': serializer.toJson<String>(type),
+      'actionAt': serializer.toJson<int>(actionAt),
+    };
+  }
+
+  GroupHistoriesData copyWith({
+    String? groupHistoryId,
+    String? groupId,
+    Value<int?> contactId = const Value.absent(),
+    Value<int?> affectedContactId = const Value.absent(),
+    Value<String?> oldGroupName = const Value.absent(),
+    Value<String?> newGroupName = const Value.absent(),
+    Value<int?> newDeleteMessagesAfterMilliseconds = const Value.absent(),
+    String? type,
+    int? actionAt,
+  }) => GroupHistoriesData(
+    groupHistoryId: groupHistoryId ?? this.groupHistoryId,
+    groupId: groupId ?? this.groupId,
+    contactId: contactId.present ? contactId.value : this.contactId,
+    affectedContactId: affectedContactId.present
+        ? affectedContactId.value
+        : this.affectedContactId,
+    oldGroupName: oldGroupName.present ? oldGroupName.value : this.oldGroupName,
+    newGroupName: newGroupName.present ? newGroupName.value : this.newGroupName,
+    newDeleteMessagesAfterMilliseconds:
+        newDeleteMessagesAfterMilliseconds.present
+        ? newDeleteMessagesAfterMilliseconds.value
+        : this.newDeleteMessagesAfterMilliseconds,
+    type: type ?? this.type,
+    actionAt: actionAt ?? this.actionAt,
+  );
+  GroupHistoriesData copyWithCompanion(GroupHistoriesCompanion data) {
+    return GroupHistoriesData(
+      groupHistoryId: data.groupHistoryId.present
+          ? data.groupHistoryId.value
+          : this.groupHistoryId,
+      groupId: data.groupId.present ? data.groupId.value : this.groupId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      affectedContactId: data.affectedContactId.present
+          ? data.affectedContactId.value
+          : this.affectedContactId,
+      oldGroupName: data.oldGroupName.present
+          ? data.oldGroupName.value
+          : this.oldGroupName,
+      newGroupName: data.newGroupName.present
+          ? data.newGroupName.value
+          : this.newGroupName,
+      newDeleteMessagesAfterMilliseconds:
+          data.newDeleteMessagesAfterMilliseconds.present
+          ? data.newDeleteMessagesAfterMilliseconds.value
+          : this.newDeleteMessagesAfterMilliseconds,
+      type: data.type.present ? data.type.value : this.type,
+      actionAt: data.actionAt.present ? data.actionAt.value : this.actionAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('GroupHistoriesData(')
+          ..write('groupHistoryId: $groupHistoryId, ')
+          ..write('groupId: $groupId, ')
+          ..write('contactId: $contactId, ')
+          ..write('affectedContactId: $affectedContactId, ')
+          ..write('oldGroupName: $oldGroupName, ')
+          ..write('newGroupName: $newGroupName, ')
+          ..write(
+            'newDeleteMessagesAfterMilliseconds: $newDeleteMessagesAfterMilliseconds, ',
+          )
+          ..write('type: $type, ')
+          ..write('actionAt: $actionAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    groupHistoryId,
+    groupId,
+    contactId,
+    affectedContactId,
+    oldGroupName,
+    newGroupName,
+    newDeleteMessagesAfterMilliseconds,
+    type,
+    actionAt,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is GroupHistoriesData &&
+          other.groupHistoryId == this.groupHistoryId &&
+          other.groupId == this.groupId &&
+          other.contactId == this.contactId &&
+          other.affectedContactId == this.affectedContactId &&
+          other.oldGroupName == this.oldGroupName &&
+          other.newGroupName == this.newGroupName &&
+          other.newDeleteMessagesAfterMilliseconds ==
+              this.newDeleteMessagesAfterMilliseconds &&
+          other.type == this.type &&
+          other.actionAt == this.actionAt);
+}
+
+class GroupHistoriesCompanion extends UpdateCompanion<GroupHistoriesData> {
+  final Value<String> groupHistoryId;
+  final Value<String> groupId;
+  final Value<int?> contactId;
+  final Value<int?> affectedContactId;
+  final Value<String?> oldGroupName;
+  final Value<String?> newGroupName;
+  final Value<int?> newDeleteMessagesAfterMilliseconds;
+  final Value<String> type;
+  final Value<int> actionAt;
+  final Value<int> rowid;
+  const GroupHistoriesCompanion({
+    this.groupHistoryId = const Value.absent(),
+    this.groupId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.affectedContactId = const Value.absent(),
+    this.oldGroupName = const Value.absent(),
+    this.newGroupName = const Value.absent(),
+    this.newDeleteMessagesAfterMilliseconds = const Value.absent(),
+    this.type = const Value.absent(),
+    this.actionAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  GroupHistoriesCompanion.insert({
+    required String groupHistoryId,
+    required String groupId,
+    this.contactId = const Value.absent(),
+    this.affectedContactId = const Value.absent(),
+    this.oldGroupName = const Value.absent(),
+    this.newGroupName = const Value.absent(),
+    this.newDeleteMessagesAfterMilliseconds = const Value.absent(),
+    required String type,
+    this.actionAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : groupHistoryId = Value(groupHistoryId),
+       groupId = Value(groupId),
+       type = Value(type);
+  static Insertable<GroupHistoriesData> custom({
+    Expression<String>? groupHistoryId,
+    Expression<String>? groupId,
+    Expression<int>? contactId,
+    Expression<int>? affectedContactId,
+    Expression<String>? oldGroupName,
+    Expression<String>? newGroupName,
+    Expression<int>? newDeleteMessagesAfterMilliseconds,
+    Expression<String>? type,
+    Expression<int>? actionAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (groupHistoryId != null) 'group_history_id': groupHistoryId,
+      if (groupId != null) 'group_id': groupId,
+      if (contactId != null) 'contact_id': contactId,
+      if (affectedContactId != null) 'affected_contact_id': affectedContactId,
+      if (oldGroupName != null) 'old_group_name': oldGroupName,
+      if (newGroupName != null) 'new_group_name': newGroupName,
+      if (newDeleteMessagesAfterMilliseconds != null)
+        'new_delete_messages_after_milliseconds':
+            newDeleteMessagesAfterMilliseconds,
+      if (type != null) 'type': type,
+      if (actionAt != null) 'action_at': actionAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  GroupHistoriesCompanion copyWith({
+    Value<String>? groupHistoryId,
+    Value<String>? groupId,
+    Value<int?>? contactId,
+    Value<int?>? affectedContactId,
+    Value<String?>? oldGroupName,
+    Value<String?>? newGroupName,
+    Value<int?>? newDeleteMessagesAfterMilliseconds,
+    Value<String>? type,
+    Value<int>? actionAt,
+    Value<int>? rowid,
+  }) {
+    return GroupHistoriesCompanion(
+      groupHistoryId: groupHistoryId ?? this.groupHistoryId,
+      groupId: groupId ?? this.groupId,
+      contactId: contactId ?? this.contactId,
+      affectedContactId: affectedContactId ?? this.affectedContactId,
+      oldGroupName: oldGroupName ?? this.oldGroupName,
+      newGroupName: newGroupName ?? this.newGroupName,
+      newDeleteMessagesAfterMilliseconds:
+          newDeleteMessagesAfterMilliseconds ??
+          this.newDeleteMessagesAfterMilliseconds,
+      type: type ?? this.type,
+      actionAt: actionAt ?? this.actionAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (groupHistoryId.present) {
+      map['group_history_id'] = Variable<String>(groupHistoryId.value);
+    }
+    if (groupId.present) {
+      map['group_id'] = Variable<String>(groupId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (affectedContactId.present) {
+      map['affected_contact_id'] = Variable<int>(affectedContactId.value);
+    }
+    if (oldGroupName.present) {
+      map['old_group_name'] = Variable<String>(oldGroupName.value);
+    }
+    if (newGroupName.present) {
+      map['new_group_name'] = Variable<String>(newGroupName.value);
+    }
+    if (newDeleteMessagesAfterMilliseconds.present) {
+      map['new_delete_messages_after_milliseconds'] = Variable<int>(
+        newDeleteMessagesAfterMilliseconds.value,
+      );
+    }
+    if (type.present) {
+      map['type'] = Variable<String>(type.value);
+    }
+    if (actionAt.present) {
+      map['action_at'] = Variable<int>(actionAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('GroupHistoriesCompanion(')
+          ..write('groupHistoryId: $groupHistoryId, ')
+          ..write('groupId: $groupId, ')
+          ..write('contactId: $contactId, ')
+          ..write('affectedContactId: $affectedContactId, ')
+          ..write('oldGroupName: $oldGroupName, ')
+          ..write('newGroupName: $newGroupName, ')
+          ..write(
+            'newDeleteMessagesAfterMilliseconds: $newDeleteMessagesAfterMilliseconds, ',
+          )
+          ..write('type: $type, ')
+          ..write('actionAt: $actionAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class KeyVerifications extends Table
+    with TableInfo<KeyVerifications, KeyVerificationsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  KeyVerifications(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<String> type = GeneratedColumn<String>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [contactId, type, createdAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'key_verifications';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {contactId};
+  @override
+  KeyVerificationsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return KeyVerificationsData(
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      )!,
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}type'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  KeyVerifications createAlias(String alias) {
+    return KeyVerifications(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(contact_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class KeyVerificationsData extends DataClass
+    implements Insertable<KeyVerificationsData> {
+  final int contactId;
+  final String type;
+  final int createdAt;
+  const KeyVerificationsData({
+    required this.contactId,
+    required this.type,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['contact_id'] = Variable<int>(contactId);
+    map['type'] = Variable<String>(type);
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  KeyVerificationsCompanion toCompanion(bool nullToAbsent) {
+    return KeyVerificationsCompanion(
+      contactId: Value(contactId),
+      type: Value(type),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory KeyVerificationsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return KeyVerificationsData(
+      contactId: serializer.fromJson<int>(json['contactId']),
+      type: serializer.fromJson<String>(json['type']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'contactId': serializer.toJson<int>(contactId),
+      'type': serializer.toJson<String>(type),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  KeyVerificationsData copyWith({
+    int? contactId,
+    String? type,
+    int? createdAt,
+  }) => KeyVerificationsData(
+    contactId: contactId ?? this.contactId,
+    type: type ?? this.type,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  KeyVerificationsData copyWithCompanion(KeyVerificationsCompanion data) {
+    return KeyVerificationsData(
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      type: data.type.present ? data.type.value : this.type,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('KeyVerificationsData(')
+          ..write('contactId: $contactId, ')
+          ..write('type: $type, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(contactId, type, createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is KeyVerificationsData &&
+          other.contactId == this.contactId &&
+          other.type == this.type &&
+          other.createdAt == this.createdAt);
+}
+
+class KeyVerificationsCompanion extends UpdateCompanion<KeyVerificationsData> {
+  final Value<int> contactId;
+  final Value<String> type;
+  final Value<int> createdAt;
+  const KeyVerificationsCompanion({
+    this.contactId = const Value.absent(),
+    this.type = const Value.absent(),
+    this.createdAt = const Value.absent(),
+  });
+  KeyVerificationsCompanion.insert({
+    this.contactId = const Value.absent(),
+    required String type,
+    this.createdAt = const Value.absent(),
+  }) : type = Value(type);
+  static Insertable<KeyVerificationsData> custom({
+    Expression<int>? contactId,
+    Expression<String>? type,
+    Expression<int>? createdAt,
+  }) {
+    return RawValuesInsertable({
+      if (contactId != null) 'contact_id': contactId,
+      if (type != null) 'type': type,
+      if (createdAt != null) 'created_at': createdAt,
+    });
+  }
+
+  KeyVerificationsCompanion copyWith({
+    Value<int>? contactId,
+    Value<String>? type,
+    Value<int>? createdAt,
+  }) {
+    return KeyVerificationsCompanion(
+      contactId: contactId ?? this.contactId,
+      type: type ?? this.type,
+      createdAt: createdAt ?? this.createdAt,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (type.present) {
+      map['type'] = Variable<String>(type.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('KeyVerificationsCompanion(')
+          ..write('contactId: $contactId, ')
+          ..write('type: $type, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class VerificationTokens extends Table
+    with TableInfo<VerificationTokens, VerificationTokensData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  VerificationTokens(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> tokenId = GeneratedColumn<int>(
+    'token_id',
+    aliasedName,
+    false,
+    hasAutoIncrement: true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL PRIMARY KEY AUTOINCREMENT',
+  );
+  late final GeneratedColumn<i2.Uint8List> token =
+      GeneratedColumn<i2.Uint8List>(
+        'token',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [tokenId, token, createdAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'verification_tokens';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {tokenId};
+  @override
+  VerificationTokensData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return VerificationTokensData(
+      tokenId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}token_id'],
+      )!,
+      token: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}token'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  VerificationTokens createAlias(String alias) {
+    return VerificationTokens(attachedDatabase, alias);
+  }
+
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class VerificationTokensData extends DataClass
+    implements Insertable<VerificationTokensData> {
+  final int tokenId;
+  final i2.Uint8List token;
+  final int createdAt;
+  const VerificationTokensData({
+    required this.tokenId,
+    required this.token,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['token_id'] = Variable<int>(tokenId);
+    map['token'] = Variable<i2.Uint8List>(token);
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  VerificationTokensCompanion toCompanion(bool nullToAbsent) {
+    return VerificationTokensCompanion(
+      tokenId: Value(tokenId),
+      token: Value(token),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory VerificationTokensData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return VerificationTokensData(
+      tokenId: serializer.fromJson<int>(json['tokenId']),
+      token: serializer.fromJson<i2.Uint8List>(json['token']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'tokenId': serializer.toJson<int>(tokenId),
+      'token': serializer.toJson<i2.Uint8List>(token),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  VerificationTokensData copyWith({
+    int? tokenId,
+    i2.Uint8List? token,
+    int? createdAt,
+  }) => VerificationTokensData(
+    tokenId: tokenId ?? this.tokenId,
+    token: token ?? this.token,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  VerificationTokensData copyWithCompanion(VerificationTokensCompanion data) {
+    return VerificationTokensData(
+      tokenId: data.tokenId.present ? data.tokenId.value : this.tokenId,
+      token: data.token.present ? data.token.value : this.token,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('VerificationTokensData(')
+          ..write('tokenId: $tokenId, ')
+          ..write('token: $token, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(tokenId, $driftBlobEquality.hash(token), createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is VerificationTokensData &&
+          other.tokenId == this.tokenId &&
+          $driftBlobEquality.equals(other.token, this.token) &&
+          other.createdAt == this.createdAt);
+}
+
+class VerificationTokensCompanion
+    extends UpdateCompanion<VerificationTokensData> {
+  final Value<int> tokenId;
+  final Value<i2.Uint8List> token;
+  final Value<int> createdAt;
+  const VerificationTokensCompanion({
+    this.tokenId = const Value.absent(),
+    this.token = const Value.absent(),
+    this.createdAt = const Value.absent(),
+  });
+  VerificationTokensCompanion.insert({
+    this.tokenId = const Value.absent(),
+    required i2.Uint8List token,
+    this.createdAt = const Value.absent(),
+  }) : token = Value(token);
+  static Insertable<VerificationTokensData> custom({
+    Expression<int>? tokenId,
+    Expression<i2.Uint8List>? token,
+    Expression<int>? createdAt,
+  }) {
+    return RawValuesInsertable({
+      if (tokenId != null) 'token_id': tokenId,
+      if (token != null) 'token': token,
+      if (createdAt != null) 'created_at': createdAt,
+    });
+  }
+
+  VerificationTokensCompanion copyWith({
+    Value<int>? tokenId,
+    Value<i2.Uint8List>? token,
+    Value<int>? createdAt,
+  }) {
+    return VerificationTokensCompanion(
+      tokenId: tokenId ?? this.tokenId,
+      token: token ?? this.token,
+      createdAt: createdAt ?? this.createdAt,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (tokenId.present) {
+      map['token_id'] = Variable<int>(tokenId.value);
+    }
+    if (token.present) {
+      map['token'] = Variable<i2.Uint8List>(token.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('VerificationTokensCompanion(')
+          ..write('tokenId: $tokenId, ')
+          ..write('token: $token, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class UserDiscoveryAnnouncedUsers extends Table
+    with
+        TableInfo<
+          UserDiscoveryAnnouncedUsers,
+          UserDiscoveryAnnouncedUsersData
+        > {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  UserDiscoveryAnnouncedUsers(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> announcedUserId = GeneratedColumn<int>(
+    'announced_user_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> announcedPublicKey =
+      GeneratedColumn<i2.Uint8List>(
+        'announced_public_key',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> publicId = GeneratedColumn<int>(
+    'public_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL UNIQUE',
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    announcedUserId,
+    announcedPublicKey,
+    publicId,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_discovery_announced_users';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {announcedUserId};
+  @override
+  UserDiscoveryAnnouncedUsersData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserDiscoveryAnnouncedUsersData(
+      announcedUserId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}announced_user_id'],
+      )!,
+      announcedPublicKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}announced_public_key'],
+      )!,
+      publicId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}public_id'],
+      )!,
+    );
+  }
+
+  @override
+  UserDiscoveryAnnouncedUsers createAlias(String alias) {
+    return UserDiscoveryAnnouncedUsers(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const [
+    'PRIMARY KEY(announced_user_id)',
+  ];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class UserDiscoveryAnnouncedUsersData extends DataClass
+    implements Insertable<UserDiscoveryAnnouncedUsersData> {
+  final int announcedUserId;
+  final i2.Uint8List announcedPublicKey;
+  final int publicId;
+  const UserDiscoveryAnnouncedUsersData({
+    required this.announcedUserId,
+    required this.announcedPublicKey,
+    required this.publicId,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['announced_user_id'] = Variable<int>(announcedUserId);
+    map['announced_public_key'] = Variable<i2.Uint8List>(announcedPublicKey);
+    map['public_id'] = Variable<int>(publicId);
+    return map;
+  }
+
+  UserDiscoveryAnnouncedUsersCompanion toCompanion(bool nullToAbsent) {
+    return UserDiscoveryAnnouncedUsersCompanion(
+      announcedUserId: Value(announcedUserId),
+      announcedPublicKey: Value(announcedPublicKey),
+      publicId: Value(publicId),
+    );
+  }
+
+  factory UserDiscoveryAnnouncedUsersData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserDiscoveryAnnouncedUsersData(
+      announcedUserId: serializer.fromJson<int>(json['announcedUserId']),
+      announcedPublicKey: serializer.fromJson<i2.Uint8List>(
+        json['announcedPublicKey'],
+      ),
+      publicId: serializer.fromJson<int>(json['publicId']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'announcedUserId': serializer.toJson<int>(announcedUserId),
+      'announcedPublicKey': serializer.toJson<i2.Uint8List>(announcedPublicKey),
+      'publicId': serializer.toJson<int>(publicId),
+    };
+  }
+
+  UserDiscoveryAnnouncedUsersData copyWith({
+    int? announcedUserId,
+    i2.Uint8List? announcedPublicKey,
+    int? publicId,
+  }) => UserDiscoveryAnnouncedUsersData(
+    announcedUserId: announcedUserId ?? this.announcedUserId,
+    announcedPublicKey: announcedPublicKey ?? this.announcedPublicKey,
+    publicId: publicId ?? this.publicId,
+  );
+  UserDiscoveryAnnouncedUsersData copyWithCompanion(
+    UserDiscoveryAnnouncedUsersCompanion data,
+  ) {
+    return UserDiscoveryAnnouncedUsersData(
+      announcedUserId: data.announcedUserId.present
+          ? data.announcedUserId.value
+          : this.announcedUserId,
+      announcedPublicKey: data.announcedPublicKey.present
+          ? data.announcedPublicKey.value
+          : this.announcedPublicKey,
+      publicId: data.publicId.present ? data.publicId.value : this.publicId,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryAnnouncedUsersData(')
+          ..write('announcedUserId: $announcedUserId, ')
+          ..write('announcedPublicKey: $announcedPublicKey, ')
+          ..write('publicId: $publicId')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    announcedUserId,
+    $driftBlobEquality.hash(announcedPublicKey),
+    publicId,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserDiscoveryAnnouncedUsersData &&
+          other.announcedUserId == this.announcedUserId &&
+          $driftBlobEquality.equals(
+            other.announcedPublicKey,
+            this.announcedPublicKey,
+          ) &&
+          other.publicId == this.publicId);
+}
+
+class UserDiscoveryAnnouncedUsersCompanion
+    extends UpdateCompanion<UserDiscoveryAnnouncedUsersData> {
+  final Value<int> announcedUserId;
+  final Value<i2.Uint8List> announcedPublicKey;
+  final Value<int> publicId;
+  const UserDiscoveryAnnouncedUsersCompanion({
+    this.announcedUserId = const Value.absent(),
+    this.announcedPublicKey = const Value.absent(),
+    this.publicId = const Value.absent(),
+  });
+  UserDiscoveryAnnouncedUsersCompanion.insert({
+    this.announcedUserId = const Value.absent(),
+    required i2.Uint8List announcedPublicKey,
+    required int publicId,
+  }) : announcedPublicKey = Value(announcedPublicKey),
+       publicId = Value(publicId);
+  static Insertable<UserDiscoveryAnnouncedUsersData> custom({
+    Expression<int>? announcedUserId,
+    Expression<i2.Uint8List>? announcedPublicKey,
+    Expression<int>? publicId,
+  }) {
+    return RawValuesInsertable({
+      if (announcedUserId != null) 'announced_user_id': announcedUserId,
+      if (announcedPublicKey != null)
+        'announced_public_key': announcedPublicKey,
+      if (publicId != null) 'public_id': publicId,
+    });
+  }
+
+  UserDiscoveryAnnouncedUsersCompanion copyWith({
+    Value<int>? announcedUserId,
+    Value<i2.Uint8List>? announcedPublicKey,
+    Value<int>? publicId,
+  }) {
+    return UserDiscoveryAnnouncedUsersCompanion(
+      announcedUserId: announcedUserId ?? this.announcedUserId,
+      announcedPublicKey: announcedPublicKey ?? this.announcedPublicKey,
+      publicId: publicId ?? this.publicId,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (announcedUserId.present) {
+      map['announced_user_id'] = Variable<int>(announcedUserId.value);
+    }
+    if (announcedPublicKey.present) {
+      map['announced_public_key'] = Variable<i2.Uint8List>(
+        announcedPublicKey.value,
+      );
+    }
+    if (publicId.present) {
+      map['public_id'] = Variable<int>(publicId.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryAnnouncedUsersCompanion(')
+          ..write('announcedUserId: $announcedUserId, ')
+          ..write('announcedPublicKey: $announcedPublicKey, ')
+          ..write('publicId: $publicId')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class UserDiscoveryUserRelations extends Table
+    with TableInfo<UserDiscoveryUserRelations, UserDiscoveryUserRelationsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  UserDiscoveryUserRelations(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> announcedUserId = GeneratedColumn<int>(
+    'announced_user_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES user_discovery_announced_users(announced_user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> fromContactId = GeneratedColumn<int>(
+    'from_contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> publicKeyVerifiedTimestamp =
+      GeneratedColumn<int>(
+        'public_key_verified_timestamp',
+        aliasedName,
+        true,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  @override
+  List<GeneratedColumn> get $columns => [
+    announcedUserId,
+    fromContactId,
+    publicKeyVerifiedTimestamp,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_discovery_user_relations';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {announcedUserId, fromContactId};
+  @override
+  UserDiscoveryUserRelationsData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserDiscoveryUserRelationsData(
+      announcedUserId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}announced_user_id'],
+      )!,
+      fromContactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}from_contact_id'],
+      )!,
+      publicKeyVerifiedTimestamp: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}public_key_verified_timestamp'],
+      ),
+    );
+  }
+
+  @override
+  UserDiscoveryUserRelations createAlias(String alias) {
+    return UserDiscoveryUserRelations(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const [
+    'PRIMARY KEY(announced_user_id, from_contact_id)',
+  ];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class UserDiscoveryUserRelationsData extends DataClass
+    implements Insertable<UserDiscoveryUserRelationsData> {
+  final int announcedUserId;
+  final int fromContactId;
+  final int? publicKeyVerifiedTimestamp;
+  const UserDiscoveryUserRelationsData({
+    required this.announcedUserId,
+    required this.fromContactId,
+    this.publicKeyVerifiedTimestamp,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['announced_user_id'] = Variable<int>(announcedUserId);
+    map['from_contact_id'] = Variable<int>(fromContactId);
+    if (!nullToAbsent || publicKeyVerifiedTimestamp != null) {
+      map['public_key_verified_timestamp'] = Variable<int>(
+        publicKeyVerifiedTimestamp,
+      );
+    }
+    return map;
+  }
+
+  UserDiscoveryUserRelationsCompanion toCompanion(bool nullToAbsent) {
+    return UserDiscoveryUserRelationsCompanion(
+      announcedUserId: Value(announcedUserId),
+      fromContactId: Value(fromContactId),
+      publicKeyVerifiedTimestamp:
+          publicKeyVerifiedTimestamp == null && nullToAbsent
+          ? const Value.absent()
+          : Value(publicKeyVerifiedTimestamp),
+    );
+  }
+
+  factory UserDiscoveryUserRelationsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserDiscoveryUserRelationsData(
+      announcedUserId: serializer.fromJson<int>(json['announcedUserId']),
+      fromContactId: serializer.fromJson<int>(json['fromContactId']),
+      publicKeyVerifiedTimestamp: serializer.fromJson<int?>(
+        json['publicKeyVerifiedTimestamp'],
+      ),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'announcedUserId': serializer.toJson<int>(announcedUserId),
+      'fromContactId': serializer.toJson<int>(fromContactId),
+      'publicKeyVerifiedTimestamp': serializer.toJson<int?>(
+        publicKeyVerifiedTimestamp,
+      ),
+    };
+  }
+
+  UserDiscoveryUserRelationsData copyWith({
+    int? announcedUserId,
+    int? fromContactId,
+    Value<int?> publicKeyVerifiedTimestamp = const Value.absent(),
+  }) => UserDiscoveryUserRelationsData(
+    announcedUserId: announcedUserId ?? this.announcedUserId,
+    fromContactId: fromContactId ?? this.fromContactId,
+    publicKeyVerifiedTimestamp: publicKeyVerifiedTimestamp.present
+        ? publicKeyVerifiedTimestamp.value
+        : this.publicKeyVerifiedTimestamp,
+  );
+  UserDiscoveryUserRelationsData copyWithCompanion(
+    UserDiscoveryUserRelationsCompanion data,
+  ) {
+    return UserDiscoveryUserRelationsData(
+      announcedUserId: data.announcedUserId.present
+          ? data.announcedUserId.value
+          : this.announcedUserId,
+      fromContactId: data.fromContactId.present
+          ? data.fromContactId.value
+          : this.fromContactId,
+      publicKeyVerifiedTimestamp: data.publicKeyVerifiedTimestamp.present
+          ? data.publicKeyVerifiedTimestamp.value
+          : this.publicKeyVerifiedTimestamp,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryUserRelationsData(')
+          ..write('announcedUserId: $announcedUserId, ')
+          ..write('fromContactId: $fromContactId, ')
+          ..write('publicKeyVerifiedTimestamp: $publicKeyVerifiedTimestamp')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(announcedUserId, fromContactId, publicKeyVerifiedTimestamp);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserDiscoveryUserRelationsData &&
+          other.announcedUserId == this.announcedUserId &&
+          other.fromContactId == this.fromContactId &&
+          other.publicKeyVerifiedTimestamp == this.publicKeyVerifiedTimestamp);
+}
+
+class UserDiscoveryUserRelationsCompanion
+    extends UpdateCompanion<UserDiscoveryUserRelationsData> {
+  final Value<int> announcedUserId;
+  final Value<int> fromContactId;
+  final Value<int?> publicKeyVerifiedTimestamp;
+  final Value<int> rowid;
+  const UserDiscoveryUserRelationsCompanion({
+    this.announcedUserId = const Value.absent(),
+    this.fromContactId = const Value.absent(),
+    this.publicKeyVerifiedTimestamp = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  UserDiscoveryUserRelationsCompanion.insert({
+    required int announcedUserId,
+    required int fromContactId,
+    this.publicKeyVerifiedTimestamp = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : announcedUserId = Value(announcedUserId),
+       fromContactId = Value(fromContactId);
+  static Insertable<UserDiscoveryUserRelationsData> custom({
+    Expression<int>? announcedUserId,
+    Expression<int>? fromContactId,
+    Expression<int>? publicKeyVerifiedTimestamp,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (announcedUserId != null) 'announced_user_id': announcedUserId,
+      if (fromContactId != null) 'from_contact_id': fromContactId,
+      if (publicKeyVerifiedTimestamp != null)
+        'public_key_verified_timestamp': publicKeyVerifiedTimestamp,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  UserDiscoveryUserRelationsCompanion copyWith({
+    Value<int>? announcedUserId,
+    Value<int>? fromContactId,
+    Value<int?>? publicKeyVerifiedTimestamp,
+    Value<int>? rowid,
+  }) {
+    return UserDiscoveryUserRelationsCompanion(
+      announcedUserId: announcedUserId ?? this.announcedUserId,
+      fromContactId: fromContactId ?? this.fromContactId,
+      publicKeyVerifiedTimestamp:
+          publicKeyVerifiedTimestamp ?? this.publicKeyVerifiedTimestamp,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (announcedUserId.present) {
+      map['announced_user_id'] = Variable<int>(announcedUserId.value);
+    }
+    if (fromContactId.present) {
+      map['from_contact_id'] = Variable<int>(fromContactId.value);
+    }
+    if (publicKeyVerifiedTimestamp.present) {
+      map['public_key_verified_timestamp'] = Variable<int>(
+        publicKeyVerifiedTimestamp.value,
+      );
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryUserRelationsCompanion(')
+          ..write('announcedUserId: $announcedUserId, ')
+          ..write('fromContactId: $fromContactId, ')
+          ..write('publicKeyVerifiedTimestamp: $publicKeyVerifiedTimestamp, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class UserDiscoveryOtherPromotions extends Table
+    with
+        TableInfo<
+          UserDiscoveryOtherPromotions,
+          UserDiscoveryOtherPromotionsData
+        > {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  UserDiscoveryOtherPromotions(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> fromContactId = GeneratedColumn<int>(
+    'from_contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> promotionId = GeneratedColumn<int>(
+    'promotion_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> publicId = GeneratedColumn<int>(
+    'public_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> threshold = GeneratedColumn<int>(
+    'threshold',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> announcementShare =
+      GeneratedColumn<i2.Uint8List>(
+        'announcement_share',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> publicKeyVerifiedTimestamp =
+      GeneratedColumn<int>(
+        'public_key_verified_timestamp',
+        aliasedName,
+        true,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  @override
+  List<GeneratedColumn> get $columns => [
+    fromContactId,
+    promotionId,
+    publicId,
+    threshold,
+    announcementShare,
+    publicKeyVerifiedTimestamp,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_discovery_other_promotions';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {fromContactId, promotionId};
+  @override
+  UserDiscoveryOtherPromotionsData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserDiscoveryOtherPromotionsData(
+      fromContactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}from_contact_id'],
+      )!,
+      promotionId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}promotion_id'],
+      )!,
+      publicId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}public_id'],
+      )!,
+      threshold: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}threshold'],
+      )!,
+      announcementShare: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}announcement_share'],
+      )!,
+      publicKeyVerifiedTimestamp: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}public_key_verified_timestamp'],
+      ),
+    );
+  }
+
+  @override
+  UserDiscoveryOtherPromotions createAlias(String alias) {
+    return UserDiscoveryOtherPromotions(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const [
+    'PRIMARY KEY(from_contact_id, promotion_id)',
+  ];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class UserDiscoveryOtherPromotionsData extends DataClass
+    implements Insertable<UserDiscoveryOtherPromotionsData> {
+  final int fromContactId;
+  final int promotionId;
+  final int publicId;
+  final int threshold;
+  final i2.Uint8List announcementShare;
+  final int? publicKeyVerifiedTimestamp;
+  const UserDiscoveryOtherPromotionsData({
+    required this.fromContactId,
+    required this.promotionId,
+    required this.publicId,
+    required this.threshold,
+    required this.announcementShare,
+    this.publicKeyVerifiedTimestamp,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['from_contact_id'] = Variable<int>(fromContactId);
+    map['promotion_id'] = Variable<int>(promotionId);
+    map['public_id'] = Variable<int>(publicId);
+    map['threshold'] = Variable<int>(threshold);
+    map['announcement_share'] = Variable<i2.Uint8List>(announcementShare);
+    if (!nullToAbsent || publicKeyVerifiedTimestamp != null) {
+      map['public_key_verified_timestamp'] = Variable<int>(
+        publicKeyVerifiedTimestamp,
+      );
+    }
+    return map;
+  }
+
+  UserDiscoveryOtherPromotionsCompanion toCompanion(bool nullToAbsent) {
+    return UserDiscoveryOtherPromotionsCompanion(
+      fromContactId: Value(fromContactId),
+      promotionId: Value(promotionId),
+      publicId: Value(publicId),
+      threshold: Value(threshold),
+      announcementShare: Value(announcementShare),
+      publicKeyVerifiedTimestamp:
+          publicKeyVerifiedTimestamp == null && nullToAbsent
+          ? const Value.absent()
+          : Value(publicKeyVerifiedTimestamp),
+    );
+  }
+
+  factory UserDiscoveryOtherPromotionsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserDiscoveryOtherPromotionsData(
+      fromContactId: serializer.fromJson<int>(json['fromContactId']),
+      promotionId: serializer.fromJson<int>(json['promotionId']),
+      publicId: serializer.fromJson<int>(json['publicId']),
+      threshold: serializer.fromJson<int>(json['threshold']),
+      announcementShare: serializer.fromJson<i2.Uint8List>(
+        json['announcementShare'],
+      ),
+      publicKeyVerifiedTimestamp: serializer.fromJson<int?>(
+        json['publicKeyVerifiedTimestamp'],
+      ),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'fromContactId': serializer.toJson<int>(fromContactId),
+      'promotionId': serializer.toJson<int>(promotionId),
+      'publicId': serializer.toJson<int>(publicId),
+      'threshold': serializer.toJson<int>(threshold),
+      'announcementShare': serializer.toJson<i2.Uint8List>(announcementShare),
+      'publicKeyVerifiedTimestamp': serializer.toJson<int?>(
+        publicKeyVerifiedTimestamp,
+      ),
+    };
+  }
+
+  UserDiscoveryOtherPromotionsData copyWith({
+    int? fromContactId,
+    int? promotionId,
+    int? publicId,
+    int? threshold,
+    i2.Uint8List? announcementShare,
+    Value<int?> publicKeyVerifiedTimestamp = const Value.absent(),
+  }) => UserDiscoveryOtherPromotionsData(
+    fromContactId: fromContactId ?? this.fromContactId,
+    promotionId: promotionId ?? this.promotionId,
+    publicId: publicId ?? this.publicId,
+    threshold: threshold ?? this.threshold,
+    announcementShare: announcementShare ?? this.announcementShare,
+    publicKeyVerifiedTimestamp: publicKeyVerifiedTimestamp.present
+        ? publicKeyVerifiedTimestamp.value
+        : this.publicKeyVerifiedTimestamp,
+  );
+  UserDiscoveryOtherPromotionsData copyWithCompanion(
+    UserDiscoveryOtherPromotionsCompanion data,
+  ) {
+    return UserDiscoveryOtherPromotionsData(
+      fromContactId: data.fromContactId.present
+          ? data.fromContactId.value
+          : this.fromContactId,
+      promotionId: data.promotionId.present
+          ? data.promotionId.value
+          : this.promotionId,
+      publicId: data.publicId.present ? data.publicId.value : this.publicId,
+      threshold: data.threshold.present ? data.threshold.value : this.threshold,
+      announcementShare: data.announcementShare.present
+          ? data.announcementShare.value
+          : this.announcementShare,
+      publicKeyVerifiedTimestamp: data.publicKeyVerifiedTimestamp.present
+          ? data.publicKeyVerifiedTimestamp.value
+          : this.publicKeyVerifiedTimestamp,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryOtherPromotionsData(')
+          ..write('fromContactId: $fromContactId, ')
+          ..write('promotionId: $promotionId, ')
+          ..write('publicId: $publicId, ')
+          ..write('threshold: $threshold, ')
+          ..write('announcementShare: $announcementShare, ')
+          ..write('publicKeyVerifiedTimestamp: $publicKeyVerifiedTimestamp')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    fromContactId,
+    promotionId,
+    publicId,
+    threshold,
+    $driftBlobEquality.hash(announcementShare),
+    publicKeyVerifiedTimestamp,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserDiscoveryOtherPromotionsData &&
+          other.fromContactId == this.fromContactId &&
+          other.promotionId == this.promotionId &&
+          other.publicId == this.publicId &&
+          other.threshold == this.threshold &&
+          $driftBlobEquality.equals(
+            other.announcementShare,
+            this.announcementShare,
+          ) &&
+          other.publicKeyVerifiedTimestamp == this.publicKeyVerifiedTimestamp);
+}
+
+class UserDiscoveryOtherPromotionsCompanion
+    extends UpdateCompanion<UserDiscoveryOtherPromotionsData> {
+  final Value<int> fromContactId;
+  final Value<int> promotionId;
+  final Value<int> publicId;
+  final Value<int> threshold;
+  final Value<i2.Uint8List> announcementShare;
+  final Value<int?> publicKeyVerifiedTimestamp;
+  final Value<int> rowid;
+  const UserDiscoveryOtherPromotionsCompanion({
+    this.fromContactId = const Value.absent(),
+    this.promotionId = const Value.absent(),
+    this.publicId = const Value.absent(),
+    this.threshold = const Value.absent(),
+    this.announcementShare = const Value.absent(),
+    this.publicKeyVerifiedTimestamp = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  UserDiscoveryOtherPromotionsCompanion.insert({
+    required int fromContactId,
+    required int promotionId,
+    required int publicId,
+    required int threshold,
+    required i2.Uint8List announcementShare,
+    this.publicKeyVerifiedTimestamp = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : fromContactId = Value(fromContactId),
+       promotionId = Value(promotionId),
+       publicId = Value(publicId),
+       threshold = Value(threshold),
+       announcementShare = Value(announcementShare);
+  static Insertable<UserDiscoveryOtherPromotionsData> custom({
+    Expression<int>? fromContactId,
+    Expression<int>? promotionId,
+    Expression<int>? publicId,
+    Expression<int>? threshold,
+    Expression<i2.Uint8List>? announcementShare,
+    Expression<int>? publicKeyVerifiedTimestamp,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (fromContactId != null) 'from_contact_id': fromContactId,
+      if (promotionId != null) 'promotion_id': promotionId,
+      if (publicId != null) 'public_id': publicId,
+      if (threshold != null) 'threshold': threshold,
+      if (announcementShare != null) 'announcement_share': announcementShare,
+      if (publicKeyVerifiedTimestamp != null)
+        'public_key_verified_timestamp': publicKeyVerifiedTimestamp,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  UserDiscoveryOtherPromotionsCompanion copyWith({
+    Value<int>? fromContactId,
+    Value<int>? promotionId,
+    Value<int>? publicId,
+    Value<int>? threshold,
+    Value<i2.Uint8List>? announcementShare,
+    Value<int?>? publicKeyVerifiedTimestamp,
+    Value<int>? rowid,
+  }) {
+    return UserDiscoveryOtherPromotionsCompanion(
+      fromContactId: fromContactId ?? this.fromContactId,
+      promotionId: promotionId ?? this.promotionId,
+      publicId: publicId ?? this.publicId,
+      threshold: threshold ?? this.threshold,
+      announcementShare: announcementShare ?? this.announcementShare,
+      publicKeyVerifiedTimestamp:
+          publicKeyVerifiedTimestamp ?? this.publicKeyVerifiedTimestamp,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (fromContactId.present) {
+      map['from_contact_id'] = Variable<int>(fromContactId.value);
+    }
+    if (promotionId.present) {
+      map['promotion_id'] = Variable<int>(promotionId.value);
+    }
+    if (publicId.present) {
+      map['public_id'] = Variable<int>(publicId.value);
+    }
+    if (threshold.present) {
+      map['threshold'] = Variable<int>(threshold.value);
+    }
+    if (announcementShare.present) {
+      map['announcement_share'] = Variable<i2.Uint8List>(
+        announcementShare.value,
+      );
+    }
+    if (publicKeyVerifiedTimestamp.present) {
+      map['public_key_verified_timestamp'] = Variable<int>(
+        publicKeyVerifiedTimestamp.value,
+      );
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryOtherPromotionsCompanion(')
+          ..write('fromContactId: $fromContactId, ')
+          ..write('promotionId: $promotionId, ')
+          ..write('publicId: $publicId, ')
+          ..write('threshold: $threshold, ')
+          ..write('announcementShare: $announcementShare, ')
+          ..write('publicKeyVerifiedTimestamp: $publicKeyVerifiedTimestamp, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class UserDiscoveryOwnPromotions extends Table
+    with TableInfo<UserDiscoveryOwnPromotions, UserDiscoveryOwnPromotionsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  UserDiscoveryOwnPromotions(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> versionId = GeneratedColumn<int>(
+    'version_id',
+    aliasedName,
+    false,
+    hasAutoIncrement: true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL PRIMARY KEY AUTOINCREMENT',
+  );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<i2.Uint8List> promotion =
+      GeneratedColumn<i2.Uint8List>(
+        'promotion',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  @override
+  List<GeneratedColumn> get $columns => [versionId, contactId, promotion];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_discovery_own_promotions';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {versionId};
+  @override
+  UserDiscoveryOwnPromotionsData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserDiscoveryOwnPromotionsData(
+      versionId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}version_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      )!,
+      promotion: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}promotion'],
+      )!,
+    );
+  }
+
+  @override
+  UserDiscoveryOwnPromotions createAlias(String alias) {
+    return UserDiscoveryOwnPromotions(attachedDatabase, alias);
+  }
+
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class UserDiscoveryOwnPromotionsData extends DataClass
+    implements Insertable<UserDiscoveryOwnPromotionsData> {
+  final int versionId;
+  final int contactId;
+  final i2.Uint8List promotion;
+  const UserDiscoveryOwnPromotionsData({
+    required this.versionId,
+    required this.contactId,
+    required this.promotion,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['version_id'] = Variable<int>(versionId);
+    map['contact_id'] = Variable<int>(contactId);
+    map['promotion'] = Variable<i2.Uint8List>(promotion);
+    return map;
+  }
+
+  UserDiscoveryOwnPromotionsCompanion toCompanion(bool nullToAbsent) {
+    return UserDiscoveryOwnPromotionsCompanion(
+      versionId: Value(versionId),
+      contactId: Value(contactId),
+      promotion: Value(promotion),
+    );
+  }
+
+  factory UserDiscoveryOwnPromotionsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserDiscoveryOwnPromotionsData(
+      versionId: serializer.fromJson<int>(json['versionId']),
+      contactId: serializer.fromJson<int>(json['contactId']),
+      promotion: serializer.fromJson<i2.Uint8List>(json['promotion']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'versionId': serializer.toJson<int>(versionId),
+      'contactId': serializer.toJson<int>(contactId),
+      'promotion': serializer.toJson<i2.Uint8List>(promotion),
+    };
+  }
+
+  UserDiscoveryOwnPromotionsData copyWith({
+    int? versionId,
+    int? contactId,
+    i2.Uint8List? promotion,
+  }) => UserDiscoveryOwnPromotionsData(
+    versionId: versionId ?? this.versionId,
+    contactId: contactId ?? this.contactId,
+    promotion: promotion ?? this.promotion,
+  );
+  UserDiscoveryOwnPromotionsData copyWithCompanion(
+    UserDiscoveryOwnPromotionsCompanion data,
+  ) {
+    return UserDiscoveryOwnPromotionsData(
+      versionId: data.versionId.present ? data.versionId.value : this.versionId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      promotion: data.promotion.present ? data.promotion.value : this.promotion,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryOwnPromotionsData(')
+          ..write('versionId: $versionId, ')
+          ..write('contactId: $contactId, ')
+          ..write('promotion: $promotion')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(versionId, contactId, $driftBlobEquality.hash(promotion));
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserDiscoveryOwnPromotionsData &&
+          other.versionId == this.versionId &&
+          other.contactId == this.contactId &&
+          $driftBlobEquality.equals(other.promotion, this.promotion));
+}
+
+class UserDiscoveryOwnPromotionsCompanion
+    extends UpdateCompanion<UserDiscoveryOwnPromotionsData> {
+  final Value<int> versionId;
+  final Value<int> contactId;
+  final Value<i2.Uint8List> promotion;
+  const UserDiscoveryOwnPromotionsCompanion({
+    this.versionId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.promotion = const Value.absent(),
+  });
+  UserDiscoveryOwnPromotionsCompanion.insert({
+    this.versionId = const Value.absent(),
+    required int contactId,
+    required i2.Uint8List promotion,
+  }) : contactId = Value(contactId),
+       promotion = Value(promotion);
+  static Insertable<UserDiscoveryOwnPromotionsData> custom({
+    Expression<int>? versionId,
+    Expression<int>? contactId,
+    Expression<i2.Uint8List>? promotion,
+  }) {
+    return RawValuesInsertable({
+      if (versionId != null) 'version_id': versionId,
+      if (contactId != null) 'contact_id': contactId,
+      if (promotion != null) 'promotion': promotion,
+    });
+  }
+
+  UserDiscoveryOwnPromotionsCompanion copyWith({
+    Value<int>? versionId,
+    Value<int>? contactId,
+    Value<i2.Uint8List>? promotion,
+  }) {
+    return UserDiscoveryOwnPromotionsCompanion(
+      versionId: versionId ?? this.versionId,
+      contactId: contactId ?? this.contactId,
+      promotion: promotion ?? this.promotion,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (versionId.present) {
+      map['version_id'] = Variable<int>(versionId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (promotion.present) {
+      map['promotion'] = Variable<i2.Uint8List>(promotion.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryOwnPromotionsCompanion(')
+          ..write('versionId: $versionId, ')
+          ..write('contactId: $contactId, ')
+          ..write('promotion: $promotion')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class UserDiscoveryShares extends Table
+    with TableInfo<UserDiscoveryShares, UserDiscoverySharesData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  UserDiscoveryShares(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> shareId = GeneratedColumn<int>(
+    'share_id',
+    aliasedName,
+    false,
+    hasAutoIncrement: true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL PRIMARY KEY AUTOINCREMENT',
+  );
+  late final GeneratedColumn<i2.Uint8List> share =
+      GeneratedColumn<i2.Uint8List>(
+        'share',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  @override
+  List<GeneratedColumn> get $columns => [shareId, share, contactId];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_discovery_shares';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {shareId};
+  @override
+  UserDiscoverySharesData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserDiscoverySharesData(
+      shareId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}share_id'],
+      )!,
+      share: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}share'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      ),
+    );
+  }
+
+  @override
+  UserDiscoveryShares createAlias(String alias) {
+    return UserDiscoveryShares(attachedDatabase, alias);
+  }
+
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class UserDiscoverySharesData extends DataClass
+    implements Insertable<UserDiscoverySharesData> {
+  final int shareId;
+  final i2.Uint8List share;
+  final int? contactId;
+  const UserDiscoverySharesData({
+    required this.shareId,
+    required this.share,
+    this.contactId,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['share_id'] = Variable<int>(shareId);
+    map['share'] = Variable<i2.Uint8List>(share);
+    if (!nullToAbsent || contactId != null) {
+      map['contact_id'] = Variable<int>(contactId);
+    }
+    return map;
+  }
+
+  UserDiscoverySharesCompanion toCompanion(bool nullToAbsent) {
+    return UserDiscoverySharesCompanion(
+      shareId: Value(shareId),
+      share: Value(share),
+      contactId: contactId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(contactId),
+    );
+  }
+
+  factory UserDiscoverySharesData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserDiscoverySharesData(
+      shareId: serializer.fromJson<int>(json['shareId']),
+      share: serializer.fromJson<i2.Uint8List>(json['share']),
+      contactId: serializer.fromJson<int?>(json['contactId']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'shareId': serializer.toJson<int>(shareId),
+      'share': serializer.toJson<i2.Uint8List>(share),
+      'contactId': serializer.toJson<int?>(contactId),
+    };
+  }
+
+  UserDiscoverySharesData copyWith({
+    int? shareId,
+    i2.Uint8List? share,
+    Value<int?> contactId = const Value.absent(),
+  }) => UserDiscoverySharesData(
+    shareId: shareId ?? this.shareId,
+    share: share ?? this.share,
+    contactId: contactId.present ? contactId.value : this.contactId,
+  );
+  UserDiscoverySharesData copyWithCompanion(UserDiscoverySharesCompanion data) {
+    return UserDiscoverySharesData(
+      shareId: data.shareId.present ? data.shareId.value : this.shareId,
+      share: data.share.present ? data.share.value : this.share,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoverySharesData(')
+          ..write('shareId: $shareId, ')
+          ..write('share: $share, ')
+          ..write('contactId: $contactId')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(shareId, $driftBlobEquality.hash(share), contactId);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserDiscoverySharesData &&
+          other.shareId == this.shareId &&
+          $driftBlobEquality.equals(other.share, this.share) &&
+          other.contactId == this.contactId);
+}
+
+class UserDiscoverySharesCompanion
+    extends UpdateCompanion<UserDiscoverySharesData> {
+  final Value<int> shareId;
+  final Value<i2.Uint8List> share;
+  final Value<int?> contactId;
+  const UserDiscoverySharesCompanion({
+    this.shareId = const Value.absent(),
+    this.share = const Value.absent(),
+    this.contactId = const Value.absent(),
+  });
+  UserDiscoverySharesCompanion.insert({
+    this.shareId = const Value.absent(),
+    required i2.Uint8List share,
+    this.contactId = const Value.absent(),
+  }) : share = Value(share);
+  static Insertable<UserDiscoverySharesData> custom({
+    Expression<int>? shareId,
+    Expression<i2.Uint8List>? share,
+    Expression<int>? contactId,
+  }) {
+    return RawValuesInsertable({
+      if (shareId != null) 'share_id': shareId,
+      if (share != null) 'share': share,
+      if (contactId != null) 'contact_id': contactId,
+    });
+  }
+
+  UserDiscoverySharesCompanion copyWith({
+    Value<int>? shareId,
+    Value<i2.Uint8List>? share,
+    Value<int?>? contactId,
+  }) {
+    return UserDiscoverySharesCompanion(
+      shareId: shareId ?? this.shareId,
+      share: share ?? this.share,
+      contactId: contactId ?? this.contactId,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (shareId.present) {
+      map['share_id'] = Variable<int>(shareId.value);
+    }
+    if (share.present) {
+      map['share'] = Variable<i2.Uint8List>(share.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoverySharesCompanion(')
+          ..write('shareId: $shareId, ')
+          ..write('share: $share, ')
+          ..write('contactId: $contactId')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class DatabaseAtV13 extends GeneratedDatabase {
+  DatabaseAtV13(QueryExecutor e) : super(e);
+  late final Contacts contacts = Contacts(this);
+  late final Groups groups = Groups(this);
+  late final MediaFiles mediaFiles = MediaFiles(this);
+  late final Messages messages = Messages(this);
+  late final MessageHistories messageHistories = MessageHistories(this);
+  late final Reactions reactions = Reactions(this);
+  late final GroupMembers groupMembers = GroupMembers(this);
+  late final Receipts receipts = Receipts(this);
+  late final ReceivedReceipts receivedReceipts = ReceivedReceipts(this);
+  late final SignalIdentityKeyStores signalIdentityKeyStores =
+      SignalIdentityKeyStores(this);
+  late final SignalPreKeyStores signalPreKeyStores = SignalPreKeyStores(this);
+  late final SignalSenderKeyStores signalSenderKeyStores =
+      SignalSenderKeyStores(this);
+  late final SignalSessionStores signalSessionStores = SignalSessionStores(
+    this,
+  );
+  late final MessageActions messageActions = MessageActions(this);
+  late final GroupHistories groupHistories = GroupHistories(this);
+  late final KeyVerifications keyVerifications = KeyVerifications(this);
+  late final VerificationTokens verificationTokens = VerificationTokens(this);
+  late final UserDiscoveryAnnouncedUsers userDiscoveryAnnouncedUsers =
+      UserDiscoveryAnnouncedUsers(this);
+  late final UserDiscoveryUserRelations userDiscoveryUserRelations =
+      UserDiscoveryUserRelations(this);
+  late final UserDiscoveryOtherPromotions userDiscoveryOtherPromotions =
+      UserDiscoveryOtherPromotions(this);
+  late final UserDiscoveryOwnPromotions userDiscoveryOwnPromotions =
+      UserDiscoveryOwnPromotions(this);
+  late final UserDiscoveryShares userDiscoveryShares = UserDiscoveryShares(
+    this,
+  );
+  @override
+  Iterable<TableInfo<Table, Object?>> get allTables =>
+      allSchemaEntities.whereType<TableInfo<Table, Object?>>();
+  @override
+  List<DatabaseSchemaEntity> get allSchemaEntities => [
+    contacts,
+    groups,
+    mediaFiles,
+    messages,
+    messageHistories,
+    reactions,
+    groupMembers,
+    receipts,
+    receivedReceipts,
+    signalIdentityKeyStores,
+    signalPreKeyStores,
+    signalSenderKeyStores,
+    signalSessionStores,
+    messageActions,
+    groupHistories,
+    keyVerifications,
+    verificationTokens,
+    userDiscoveryAnnouncedUsers,
+    userDiscoveryUserRelations,
+    userDiscoveryOtherPromotions,
+    userDiscoveryOwnPromotions,
+    userDiscoveryShares,
+  ];
+  @override
+  StreamQueryUpdateRules get streamUpdateRules => const StreamQueryUpdateRules([
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'groups',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('messages', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'media_files',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('messages', kind: UpdateKind.update)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'messages',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('message_histories', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('message_histories', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'messages',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('reactions', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('reactions', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'groups',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('group_members', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('receipts', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'messages',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('receipts', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'messages',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('message_actions', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('message_actions', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'groups',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('group_histories', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('key_verifications', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'user_discovery_announced_users',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [
+        TableUpdate('user_discovery_user_relations', kind: UpdateKind.delete),
+      ],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [
+        TableUpdate('user_discovery_user_relations', kind: UpdateKind.delete),
+      ],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [
+        TableUpdate('user_discovery_other_promotions', kind: UpdateKind.delete),
+      ],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [
+        TableUpdate('user_discovery_own_promotions', kind: UpdateKind.delete),
+      ],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('user_discovery_shares', kind: UpdateKind.delete)],
+    ),
+  ]);
+  @override
+  int get schemaVersion => 13;
+}
diff --git a/test/drift/twonly_db/generated/schema_v14.dart b/test/drift/twonly_db/generated/schema_v14.dart
new file mode 100644
index 00000000..b71ca169
--- /dev/null
+++ b/test/drift/twonly_db/generated/schema_v14.dart
@@ -0,0 +1,9556 @@
+// dart format width=80
+import 'dart:typed_data' as i2;
+// GENERATED BY drift_dev, DO NOT MODIFY.
+// ignore_for_file: type=lint,unused_import
+//
+import 'package:drift/drift.dart';
+
+class Contacts extends Table with TableInfo<Contacts, ContactsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  Contacts(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> userId = GeneratedColumn<int>(
+    'user_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> username = GeneratedColumn<String>(
+    'username',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> displayName = GeneratedColumn<String>(
+    'display_name',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<String> nickName = GeneratedColumn<String>(
+    'nick_name',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> avatarSvgCompressed =
+      GeneratedColumn<i2.Uint8List>(
+        'avatar_svg_compressed',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> senderProfileCounter = GeneratedColumn<int>(
+    'sender_profile_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> accepted = GeneratedColumn<int>(
+    'accepted',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (accepted IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> deletedByUser = GeneratedColumn<int>(
+    'deleted_by_user',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (deleted_by_user IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> requested = GeneratedColumn<int>(
+    'requested',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (requested IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> blocked = GeneratedColumn<int>(
+    'blocked',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (blocked IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> verified = GeneratedColumn<int>(
+    'verified',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (verified IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> accountDeleted = GeneratedColumn<int>(
+    'account_deleted',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (account_deleted IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  late final GeneratedColumn<i2.Uint8List> userDiscoveryVersion =
+      GeneratedColumn<i2.Uint8List>(
+        'user_discovery_version',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> mediaSendCounter = GeneratedColumn<int>(
+    'media_send_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> mediaReceivedCounter = GeneratedColumn<int>(
+    'media_received_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    userId,
+    username,
+    displayName,
+    nickName,
+    avatarSvgCompressed,
+    senderProfileCounter,
+    accepted,
+    deletedByUser,
+    requested,
+    blocked,
+    verified,
+    accountDeleted,
+    createdAt,
+    userDiscoveryVersion,
+    mediaSendCounter,
+    mediaReceivedCounter,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'contacts';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {userId};
+  @override
+  ContactsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return ContactsData(
+      userId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}user_id'],
+      )!,
+      username: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}username'],
+      )!,
+      displayName: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}display_name'],
+      ),
+      nickName: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}nick_name'],
+      ),
+      avatarSvgCompressed: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}avatar_svg_compressed'],
+      ),
+      senderProfileCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}sender_profile_counter'],
+      )!,
+      accepted: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}accepted'],
+      )!,
+      deletedByUser: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}deleted_by_user'],
+      )!,
+      requested: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}requested'],
+      )!,
+      blocked: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}blocked'],
+      )!,
+      verified: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}verified'],
+      )!,
+      accountDeleted: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}account_deleted'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+      userDiscoveryVersion: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}user_discovery_version'],
+      ),
+      mediaSendCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}media_send_counter'],
+      )!,
+      mediaReceivedCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}media_received_counter'],
+      )!,
+    );
+  }
+
+  @override
+  Contacts createAlias(String alias) {
+    return Contacts(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(user_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class ContactsData extends DataClass implements Insertable<ContactsData> {
+  final int userId;
+  final String username;
+  final String? displayName;
+  final String? nickName;
+  final i2.Uint8List? avatarSvgCompressed;
+  final int senderProfileCounter;
+  final int accepted;
+  final int deletedByUser;
+  final int requested;
+  final int blocked;
+  final int verified;
+  final int accountDeleted;
+  final int createdAt;
+  final i2.Uint8List? userDiscoveryVersion;
+  final int mediaSendCounter;
+  final int mediaReceivedCounter;
+  const ContactsData({
+    required this.userId,
+    required this.username,
+    this.displayName,
+    this.nickName,
+    this.avatarSvgCompressed,
+    required this.senderProfileCounter,
+    required this.accepted,
+    required this.deletedByUser,
+    required this.requested,
+    required this.blocked,
+    required this.verified,
+    required this.accountDeleted,
+    required this.createdAt,
+    this.userDiscoveryVersion,
+    required this.mediaSendCounter,
+    required this.mediaReceivedCounter,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['user_id'] = Variable<int>(userId);
+    map['username'] = Variable<String>(username);
+    if (!nullToAbsent || displayName != null) {
+      map['display_name'] = Variable<String>(displayName);
+    }
+    if (!nullToAbsent || nickName != null) {
+      map['nick_name'] = Variable<String>(nickName);
+    }
+    if (!nullToAbsent || avatarSvgCompressed != null) {
+      map['avatar_svg_compressed'] = Variable<i2.Uint8List>(
+        avatarSvgCompressed,
+      );
+    }
+    map['sender_profile_counter'] = Variable<int>(senderProfileCounter);
+    map['accepted'] = Variable<int>(accepted);
+    map['deleted_by_user'] = Variable<int>(deletedByUser);
+    map['requested'] = Variable<int>(requested);
+    map['blocked'] = Variable<int>(blocked);
+    map['verified'] = Variable<int>(verified);
+    map['account_deleted'] = Variable<int>(accountDeleted);
+    map['created_at'] = Variable<int>(createdAt);
+    if (!nullToAbsent || userDiscoveryVersion != null) {
+      map['user_discovery_version'] = Variable<i2.Uint8List>(
+        userDiscoveryVersion,
+      );
+    }
+    map['media_send_counter'] = Variable<int>(mediaSendCounter);
+    map['media_received_counter'] = Variable<int>(mediaReceivedCounter);
+    return map;
+  }
+
+  ContactsCompanion toCompanion(bool nullToAbsent) {
+    return ContactsCompanion(
+      userId: Value(userId),
+      username: Value(username),
+      displayName: displayName == null && nullToAbsent
+          ? const Value.absent()
+          : Value(displayName),
+      nickName: nickName == null && nullToAbsent
+          ? const Value.absent()
+          : Value(nickName),
+      avatarSvgCompressed: avatarSvgCompressed == null && nullToAbsent
+          ? const Value.absent()
+          : Value(avatarSvgCompressed),
+      senderProfileCounter: Value(senderProfileCounter),
+      accepted: Value(accepted),
+      deletedByUser: Value(deletedByUser),
+      requested: Value(requested),
+      blocked: Value(blocked),
+      verified: Value(verified),
+      accountDeleted: Value(accountDeleted),
+      createdAt: Value(createdAt),
+      userDiscoveryVersion: userDiscoveryVersion == null && nullToAbsent
+          ? const Value.absent()
+          : Value(userDiscoveryVersion),
+      mediaSendCounter: Value(mediaSendCounter),
+      mediaReceivedCounter: Value(mediaReceivedCounter),
+    );
+  }
+
+  factory ContactsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return ContactsData(
+      userId: serializer.fromJson<int>(json['userId']),
+      username: serializer.fromJson<String>(json['username']),
+      displayName: serializer.fromJson<String?>(json['displayName']),
+      nickName: serializer.fromJson<String?>(json['nickName']),
+      avatarSvgCompressed: serializer.fromJson<i2.Uint8List?>(
+        json['avatarSvgCompressed'],
+      ),
+      senderProfileCounter: serializer.fromJson<int>(
+        json['senderProfileCounter'],
+      ),
+      accepted: serializer.fromJson<int>(json['accepted']),
+      deletedByUser: serializer.fromJson<int>(json['deletedByUser']),
+      requested: serializer.fromJson<int>(json['requested']),
+      blocked: serializer.fromJson<int>(json['blocked']),
+      verified: serializer.fromJson<int>(json['verified']),
+      accountDeleted: serializer.fromJson<int>(json['accountDeleted']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+      userDiscoveryVersion: serializer.fromJson<i2.Uint8List?>(
+        json['userDiscoveryVersion'],
+      ),
+      mediaSendCounter: serializer.fromJson<int>(json['mediaSendCounter']),
+      mediaReceivedCounter: serializer.fromJson<int>(
+        json['mediaReceivedCounter'],
+      ),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'userId': serializer.toJson<int>(userId),
+      'username': serializer.toJson<String>(username),
+      'displayName': serializer.toJson<String?>(displayName),
+      'nickName': serializer.toJson<String?>(nickName),
+      'avatarSvgCompressed': serializer.toJson<i2.Uint8List?>(
+        avatarSvgCompressed,
+      ),
+      'senderProfileCounter': serializer.toJson<int>(senderProfileCounter),
+      'accepted': serializer.toJson<int>(accepted),
+      'deletedByUser': serializer.toJson<int>(deletedByUser),
+      'requested': serializer.toJson<int>(requested),
+      'blocked': serializer.toJson<int>(blocked),
+      'verified': serializer.toJson<int>(verified),
+      'accountDeleted': serializer.toJson<int>(accountDeleted),
+      'createdAt': serializer.toJson<int>(createdAt),
+      'userDiscoveryVersion': serializer.toJson<i2.Uint8List?>(
+        userDiscoveryVersion,
+      ),
+      'mediaSendCounter': serializer.toJson<int>(mediaSendCounter),
+      'mediaReceivedCounter': serializer.toJson<int>(mediaReceivedCounter),
+    };
+  }
+
+  ContactsData copyWith({
+    int? userId,
+    String? username,
+    Value<String?> displayName = const Value.absent(),
+    Value<String?> nickName = const Value.absent(),
+    Value<i2.Uint8List?> avatarSvgCompressed = const Value.absent(),
+    int? senderProfileCounter,
+    int? accepted,
+    int? deletedByUser,
+    int? requested,
+    int? blocked,
+    int? verified,
+    int? accountDeleted,
+    int? createdAt,
+    Value<i2.Uint8List?> userDiscoveryVersion = const Value.absent(),
+    int? mediaSendCounter,
+    int? mediaReceivedCounter,
+  }) => ContactsData(
+    userId: userId ?? this.userId,
+    username: username ?? this.username,
+    displayName: displayName.present ? displayName.value : this.displayName,
+    nickName: nickName.present ? nickName.value : this.nickName,
+    avatarSvgCompressed: avatarSvgCompressed.present
+        ? avatarSvgCompressed.value
+        : this.avatarSvgCompressed,
+    senderProfileCounter: senderProfileCounter ?? this.senderProfileCounter,
+    accepted: accepted ?? this.accepted,
+    deletedByUser: deletedByUser ?? this.deletedByUser,
+    requested: requested ?? this.requested,
+    blocked: blocked ?? this.blocked,
+    verified: verified ?? this.verified,
+    accountDeleted: accountDeleted ?? this.accountDeleted,
+    createdAt: createdAt ?? this.createdAt,
+    userDiscoveryVersion: userDiscoveryVersion.present
+        ? userDiscoveryVersion.value
+        : this.userDiscoveryVersion,
+    mediaSendCounter: mediaSendCounter ?? this.mediaSendCounter,
+    mediaReceivedCounter: mediaReceivedCounter ?? this.mediaReceivedCounter,
+  );
+  ContactsData copyWithCompanion(ContactsCompanion data) {
+    return ContactsData(
+      userId: data.userId.present ? data.userId.value : this.userId,
+      username: data.username.present ? data.username.value : this.username,
+      displayName: data.displayName.present
+          ? data.displayName.value
+          : this.displayName,
+      nickName: data.nickName.present ? data.nickName.value : this.nickName,
+      avatarSvgCompressed: data.avatarSvgCompressed.present
+          ? data.avatarSvgCompressed.value
+          : this.avatarSvgCompressed,
+      senderProfileCounter: data.senderProfileCounter.present
+          ? data.senderProfileCounter.value
+          : this.senderProfileCounter,
+      accepted: data.accepted.present ? data.accepted.value : this.accepted,
+      deletedByUser: data.deletedByUser.present
+          ? data.deletedByUser.value
+          : this.deletedByUser,
+      requested: data.requested.present ? data.requested.value : this.requested,
+      blocked: data.blocked.present ? data.blocked.value : this.blocked,
+      verified: data.verified.present ? data.verified.value : this.verified,
+      accountDeleted: data.accountDeleted.present
+          ? data.accountDeleted.value
+          : this.accountDeleted,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      userDiscoveryVersion: data.userDiscoveryVersion.present
+          ? data.userDiscoveryVersion.value
+          : this.userDiscoveryVersion,
+      mediaSendCounter: data.mediaSendCounter.present
+          ? data.mediaSendCounter.value
+          : this.mediaSendCounter,
+      mediaReceivedCounter: data.mediaReceivedCounter.present
+          ? data.mediaReceivedCounter.value
+          : this.mediaReceivedCounter,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ContactsData(')
+          ..write('userId: $userId, ')
+          ..write('username: $username, ')
+          ..write('displayName: $displayName, ')
+          ..write('nickName: $nickName, ')
+          ..write('avatarSvgCompressed: $avatarSvgCompressed, ')
+          ..write('senderProfileCounter: $senderProfileCounter, ')
+          ..write('accepted: $accepted, ')
+          ..write('deletedByUser: $deletedByUser, ')
+          ..write('requested: $requested, ')
+          ..write('blocked: $blocked, ')
+          ..write('verified: $verified, ')
+          ..write('accountDeleted: $accountDeleted, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('userDiscoveryVersion: $userDiscoveryVersion, ')
+          ..write('mediaSendCounter: $mediaSendCounter, ')
+          ..write('mediaReceivedCounter: $mediaReceivedCounter')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    userId,
+    username,
+    displayName,
+    nickName,
+    $driftBlobEquality.hash(avatarSvgCompressed),
+    senderProfileCounter,
+    accepted,
+    deletedByUser,
+    requested,
+    blocked,
+    verified,
+    accountDeleted,
+    createdAt,
+    $driftBlobEquality.hash(userDiscoveryVersion),
+    mediaSendCounter,
+    mediaReceivedCounter,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is ContactsData &&
+          other.userId == this.userId &&
+          other.username == this.username &&
+          other.displayName == this.displayName &&
+          other.nickName == this.nickName &&
+          $driftBlobEquality.equals(
+            other.avatarSvgCompressed,
+            this.avatarSvgCompressed,
+          ) &&
+          other.senderProfileCounter == this.senderProfileCounter &&
+          other.accepted == this.accepted &&
+          other.deletedByUser == this.deletedByUser &&
+          other.requested == this.requested &&
+          other.blocked == this.blocked &&
+          other.verified == this.verified &&
+          other.accountDeleted == this.accountDeleted &&
+          other.createdAt == this.createdAt &&
+          $driftBlobEquality.equals(
+            other.userDiscoveryVersion,
+            this.userDiscoveryVersion,
+          ) &&
+          other.mediaSendCounter == this.mediaSendCounter &&
+          other.mediaReceivedCounter == this.mediaReceivedCounter);
+}
+
+class ContactsCompanion extends UpdateCompanion<ContactsData> {
+  final Value<int> userId;
+  final Value<String> username;
+  final Value<String?> displayName;
+  final Value<String?> nickName;
+  final Value<i2.Uint8List?> avatarSvgCompressed;
+  final Value<int> senderProfileCounter;
+  final Value<int> accepted;
+  final Value<int> deletedByUser;
+  final Value<int> requested;
+  final Value<int> blocked;
+  final Value<int> verified;
+  final Value<int> accountDeleted;
+  final Value<int> createdAt;
+  final Value<i2.Uint8List?> userDiscoveryVersion;
+  final Value<int> mediaSendCounter;
+  final Value<int> mediaReceivedCounter;
+  const ContactsCompanion({
+    this.userId = const Value.absent(),
+    this.username = const Value.absent(),
+    this.displayName = const Value.absent(),
+    this.nickName = const Value.absent(),
+    this.avatarSvgCompressed = const Value.absent(),
+    this.senderProfileCounter = const Value.absent(),
+    this.accepted = const Value.absent(),
+    this.deletedByUser = const Value.absent(),
+    this.requested = const Value.absent(),
+    this.blocked = const Value.absent(),
+    this.verified = const Value.absent(),
+    this.accountDeleted = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.userDiscoveryVersion = const Value.absent(),
+    this.mediaSendCounter = const Value.absent(),
+    this.mediaReceivedCounter = const Value.absent(),
+  });
+  ContactsCompanion.insert({
+    this.userId = const Value.absent(),
+    required String username,
+    this.displayName = const Value.absent(),
+    this.nickName = const Value.absent(),
+    this.avatarSvgCompressed = const Value.absent(),
+    this.senderProfileCounter = const Value.absent(),
+    this.accepted = const Value.absent(),
+    this.deletedByUser = const Value.absent(),
+    this.requested = const Value.absent(),
+    this.blocked = const Value.absent(),
+    this.verified = const Value.absent(),
+    this.accountDeleted = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.userDiscoveryVersion = const Value.absent(),
+    this.mediaSendCounter = const Value.absent(),
+    this.mediaReceivedCounter = const Value.absent(),
+  }) : username = Value(username);
+  static Insertable<ContactsData> custom({
+    Expression<int>? userId,
+    Expression<String>? username,
+    Expression<String>? displayName,
+    Expression<String>? nickName,
+    Expression<i2.Uint8List>? avatarSvgCompressed,
+    Expression<int>? senderProfileCounter,
+    Expression<int>? accepted,
+    Expression<int>? deletedByUser,
+    Expression<int>? requested,
+    Expression<int>? blocked,
+    Expression<int>? verified,
+    Expression<int>? accountDeleted,
+    Expression<int>? createdAt,
+    Expression<i2.Uint8List>? userDiscoveryVersion,
+    Expression<int>? mediaSendCounter,
+    Expression<int>? mediaReceivedCounter,
+  }) {
+    return RawValuesInsertable({
+      if (userId != null) 'user_id': userId,
+      if (username != null) 'username': username,
+      if (displayName != null) 'display_name': displayName,
+      if (nickName != null) 'nick_name': nickName,
+      if (avatarSvgCompressed != null)
+        'avatar_svg_compressed': avatarSvgCompressed,
+      if (senderProfileCounter != null)
+        'sender_profile_counter': senderProfileCounter,
+      if (accepted != null) 'accepted': accepted,
+      if (deletedByUser != null) 'deleted_by_user': deletedByUser,
+      if (requested != null) 'requested': requested,
+      if (blocked != null) 'blocked': blocked,
+      if (verified != null) 'verified': verified,
+      if (accountDeleted != null) 'account_deleted': accountDeleted,
+      if (createdAt != null) 'created_at': createdAt,
+      if (userDiscoveryVersion != null)
+        'user_discovery_version': userDiscoveryVersion,
+      if (mediaSendCounter != null) 'media_send_counter': mediaSendCounter,
+      if (mediaReceivedCounter != null)
+        'media_received_counter': mediaReceivedCounter,
+    });
+  }
+
+  ContactsCompanion copyWith({
+    Value<int>? userId,
+    Value<String>? username,
+    Value<String?>? displayName,
+    Value<String?>? nickName,
+    Value<i2.Uint8List?>? avatarSvgCompressed,
+    Value<int>? senderProfileCounter,
+    Value<int>? accepted,
+    Value<int>? deletedByUser,
+    Value<int>? requested,
+    Value<int>? blocked,
+    Value<int>? verified,
+    Value<int>? accountDeleted,
+    Value<int>? createdAt,
+    Value<i2.Uint8List?>? userDiscoveryVersion,
+    Value<int>? mediaSendCounter,
+    Value<int>? mediaReceivedCounter,
+  }) {
+    return ContactsCompanion(
+      userId: userId ?? this.userId,
+      username: username ?? this.username,
+      displayName: displayName ?? this.displayName,
+      nickName: nickName ?? this.nickName,
+      avatarSvgCompressed: avatarSvgCompressed ?? this.avatarSvgCompressed,
+      senderProfileCounter: senderProfileCounter ?? this.senderProfileCounter,
+      accepted: accepted ?? this.accepted,
+      deletedByUser: deletedByUser ?? this.deletedByUser,
+      requested: requested ?? this.requested,
+      blocked: blocked ?? this.blocked,
+      verified: verified ?? this.verified,
+      accountDeleted: accountDeleted ?? this.accountDeleted,
+      createdAt: createdAt ?? this.createdAt,
+      userDiscoveryVersion: userDiscoveryVersion ?? this.userDiscoveryVersion,
+      mediaSendCounter: mediaSendCounter ?? this.mediaSendCounter,
+      mediaReceivedCounter: mediaReceivedCounter ?? this.mediaReceivedCounter,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (userId.present) {
+      map['user_id'] = Variable<int>(userId.value);
+    }
+    if (username.present) {
+      map['username'] = Variable<String>(username.value);
+    }
+    if (displayName.present) {
+      map['display_name'] = Variable<String>(displayName.value);
+    }
+    if (nickName.present) {
+      map['nick_name'] = Variable<String>(nickName.value);
+    }
+    if (avatarSvgCompressed.present) {
+      map['avatar_svg_compressed'] = Variable<i2.Uint8List>(
+        avatarSvgCompressed.value,
+      );
+    }
+    if (senderProfileCounter.present) {
+      map['sender_profile_counter'] = Variable<int>(senderProfileCounter.value);
+    }
+    if (accepted.present) {
+      map['accepted'] = Variable<int>(accepted.value);
+    }
+    if (deletedByUser.present) {
+      map['deleted_by_user'] = Variable<int>(deletedByUser.value);
+    }
+    if (requested.present) {
+      map['requested'] = Variable<int>(requested.value);
+    }
+    if (blocked.present) {
+      map['blocked'] = Variable<int>(blocked.value);
+    }
+    if (verified.present) {
+      map['verified'] = Variable<int>(verified.value);
+    }
+    if (accountDeleted.present) {
+      map['account_deleted'] = Variable<int>(accountDeleted.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (userDiscoveryVersion.present) {
+      map['user_discovery_version'] = Variable<i2.Uint8List>(
+        userDiscoveryVersion.value,
+      );
+    }
+    if (mediaSendCounter.present) {
+      map['media_send_counter'] = Variable<int>(mediaSendCounter.value);
+    }
+    if (mediaReceivedCounter.present) {
+      map['media_received_counter'] = Variable<int>(mediaReceivedCounter.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ContactsCompanion(')
+          ..write('userId: $userId, ')
+          ..write('username: $username, ')
+          ..write('displayName: $displayName, ')
+          ..write('nickName: $nickName, ')
+          ..write('avatarSvgCompressed: $avatarSvgCompressed, ')
+          ..write('senderProfileCounter: $senderProfileCounter, ')
+          ..write('accepted: $accepted, ')
+          ..write('deletedByUser: $deletedByUser, ')
+          ..write('requested: $requested, ')
+          ..write('blocked: $blocked, ')
+          ..write('verified: $verified, ')
+          ..write('accountDeleted: $accountDeleted, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('userDiscoveryVersion: $userDiscoveryVersion, ')
+          ..write('mediaSendCounter: $mediaSendCounter, ')
+          ..write('mediaReceivedCounter: $mediaReceivedCounter')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class Groups extends Table with TableInfo<Groups, GroupsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  Groups(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> groupId = GeneratedColumn<String>(
+    'group_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> isGroupAdmin = GeneratedColumn<int>(
+    'is_group_admin',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (is_group_admin IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> isDirectChat = GeneratedColumn<int>(
+    'is_direct_chat',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (is_direct_chat IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> pinned = GeneratedColumn<int>(
+    'pinned',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (pinned IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> archived = GeneratedColumn<int>(
+    'archived',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (archived IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> joinedGroup = GeneratedColumn<int>(
+    'joined_group',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (joined_group IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> leftGroup = GeneratedColumn<int>(
+    'left_group',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (left_group IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> deletedContent = GeneratedColumn<int>(
+    'deleted_content',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (deleted_content IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> stateVersionId = GeneratedColumn<int>(
+    'state_version_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<i2.Uint8List> stateEncryptionKey =
+      GeneratedColumn<i2.Uint8List>(
+        'state_encryption_key',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<i2.Uint8List> myGroupPrivateKey =
+      GeneratedColumn<i2.Uint8List>(
+        'my_group_private_key',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<String> groupName = GeneratedColumn<String>(
+    'group_name',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> draftMessage = GeneratedColumn<String>(
+    'draft_message',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> totalMediaCounter = GeneratedColumn<int>(
+    'total_media_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> alsoBestFriend = GeneratedColumn<int>(
+    'also_best_friend',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (also_best_friend IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> deleteMessagesAfterMilliseconds =
+      GeneratedColumn<int>(
+        'delete_messages_after_milliseconds',
+        aliasedName,
+        false,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints: 'NOT NULL DEFAULT 86400000',
+        defaultValue: const CustomExpression('86400000'),
+      );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  late final GeneratedColumn<int> lastMessageSend = GeneratedColumn<int>(
+    'last_message_send',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> lastMessageReceived = GeneratedColumn<int>(
+    'last_message_received',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> lastFlameCounterChange = GeneratedColumn<int>(
+    'last_flame_counter_change',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> lastFlameSync = GeneratedColumn<int>(
+    'last_flame_sync',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> flameCounter = GeneratedColumn<int>(
+    'flame_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> maxFlameCounter = GeneratedColumn<int>(
+    'max_flame_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> maxFlameCounterFrom = GeneratedColumn<int>(
+    'max_flame_counter_from',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> lastMessageExchange = GeneratedColumn<int>(
+    'last_message_exchange',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    groupId,
+    isGroupAdmin,
+    isDirectChat,
+    pinned,
+    archived,
+    joinedGroup,
+    leftGroup,
+    deletedContent,
+    stateVersionId,
+    stateEncryptionKey,
+    myGroupPrivateKey,
+    groupName,
+    draftMessage,
+    totalMediaCounter,
+    alsoBestFriend,
+    deleteMessagesAfterMilliseconds,
+    createdAt,
+    lastMessageSend,
+    lastMessageReceived,
+    lastFlameCounterChange,
+    lastFlameSync,
+    flameCounter,
+    maxFlameCounter,
+    maxFlameCounterFrom,
+    lastMessageExchange,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'groups';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {groupId};
+  @override
+  GroupsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return GroupsData(
+      groupId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}group_id'],
+      )!,
+      isGroupAdmin: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}is_group_admin'],
+      )!,
+      isDirectChat: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}is_direct_chat'],
+      )!,
+      pinned: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}pinned'],
+      )!,
+      archived: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}archived'],
+      )!,
+      joinedGroup: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}joined_group'],
+      )!,
+      leftGroup: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}left_group'],
+      )!,
+      deletedContent: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}deleted_content'],
+      )!,
+      stateVersionId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}state_version_id'],
+      )!,
+      stateEncryptionKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}state_encryption_key'],
+      ),
+      myGroupPrivateKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}my_group_private_key'],
+      ),
+      groupName: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}group_name'],
+      )!,
+      draftMessage: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}draft_message'],
+      ),
+      totalMediaCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}total_media_counter'],
+      )!,
+      alsoBestFriend: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}also_best_friend'],
+      )!,
+      deleteMessagesAfterMilliseconds: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}delete_messages_after_milliseconds'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+      lastMessageSend: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_message_send'],
+      ),
+      lastMessageReceived: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_message_received'],
+      ),
+      lastFlameCounterChange: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_flame_counter_change'],
+      ),
+      lastFlameSync: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_flame_sync'],
+      ),
+      flameCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}flame_counter'],
+      )!,
+      maxFlameCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}max_flame_counter'],
+      )!,
+      maxFlameCounterFrom: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}max_flame_counter_from'],
+      ),
+      lastMessageExchange: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_message_exchange'],
+      )!,
+    );
+  }
+
+  @override
+  Groups createAlias(String alias) {
+    return Groups(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(group_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class GroupsData extends DataClass implements Insertable<GroupsData> {
+  final String groupId;
+  final int isGroupAdmin;
+  final int isDirectChat;
+  final int pinned;
+  final int archived;
+  final int joinedGroup;
+  final int leftGroup;
+  final int deletedContent;
+  final int stateVersionId;
+  final i2.Uint8List? stateEncryptionKey;
+  final i2.Uint8List? myGroupPrivateKey;
+  final String groupName;
+  final String? draftMessage;
+  final int totalMediaCounter;
+  final int alsoBestFriend;
+  final int deleteMessagesAfterMilliseconds;
+  final int createdAt;
+  final int? lastMessageSend;
+  final int? lastMessageReceived;
+  final int? lastFlameCounterChange;
+  final int? lastFlameSync;
+  final int flameCounter;
+  final int maxFlameCounter;
+  final int? maxFlameCounterFrom;
+  final int lastMessageExchange;
+  const GroupsData({
+    required this.groupId,
+    required this.isGroupAdmin,
+    required this.isDirectChat,
+    required this.pinned,
+    required this.archived,
+    required this.joinedGroup,
+    required this.leftGroup,
+    required this.deletedContent,
+    required this.stateVersionId,
+    this.stateEncryptionKey,
+    this.myGroupPrivateKey,
+    required this.groupName,
+    this.draftMessage,
+    required this.totalMediaCounter,
+    required this.alsoBestFriend,
+    required this.deleteMessagesAfterMilliseconds,
+    required this.createdAt,
+    this.lastMessageSend,
+    this.lastMessageReceived,
+    this.lastFlameCounterChange,
+    this.lastFlameSync,
+    required this.flameCounter,
+    required this.maxFlameCounter,
+    this.maxFlameCounterFrom,
+    required this.lastMessageExchange,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['group_id'] = Variable<String>(groupId);
+    map['is_group_admin'] = Variable<int>(isGroupAdmin);
+    map['is_direct_chat'] = Variable<int>(isDirectChat);
+    map['pinned'] = Variable<int>(pinned);
+    map['archived'] = Variable<int>(archived);
+    map['joined_group'] = Variable<int>(joinedGroup);
+    map['left_group'] = Variable<int>(leftGroup);
+    map['deleted_content'] = Variable<int>(deletedContent);
+    map['state_version_id'] = Variable<int>(stateVersionId);
+    if (!nullToAbsent || stateEncryptionKey != null) {
+      map['state_encryption_key'] = Variable<i2.Uint8List>(stateEncryptionKey);
+    }
+    if (!nullToAbsent || myGroupPrivateKey != null) {
+      map['my_group_private_key'] = Variable<i2.Uint8List>(myGroupPrivateKey);
+    }
+    map['group_name'] = Variable<String>(groupName);
+    if (!nullToAbsent || draftMessage != null) {
+      map['draft_message'] = Variable<String>(draftMessage);
+    }
+    map['total_media_counter'] = Variable<int>(totalMediaCounter);
+    map['also_best_friend'] = Variable<int>(alsoBestFriend);
+    map['delete_messages_after_milliseconds'] = Variable<int>(
+      deleteMessagesAfterMilliseconds,
+    );
+    map['created_at'] = Variable<int>(createdAt);
+    if (!nullToAbsent || lastMessageSend != null) {
+      map['last_message_send'] = Variable<int>(lastMessageSend);
+    }
+    if (!nullToAbsent || lastMessageReceived != null) {
+      map['last_message_received'] = Variable<int>(lastMessageReceived);
+    }
+    if (!nullToAbsent || lastFlameCounterChange != null) {
+      map['last_flame_counter_change'] = Variable<int>(lastFlameCounterChange);
+    }
+    if (!nullToAbsent || lastFlameSync != null) {
+      map['last_flame_sync'] = Variable<int>(lastFlameSync);
+    }
+    map['flame_counter'] = Variable<int>(flameCounter);
+    map['max_flame_counter'] = Variable<int>(maxFlameCounter);
+    if (!nullToAbsent || maxFlameCounterFrom != null) {
+      map['max_flame_counter_from'] = Variable<int>(maxFlameCounterFrom);
+    }
+    map['last_message_exchange'] = Variable<int>(lastMessageExchange);
+    return map;
+  }
+
+  GroupsCompanion toCompanion(bool nullToAbsent) {
+    return GroupsCompanion(
+      groupId: Value(groupId),
+      isGroupAdmin: Value(isGroupAdmin),
+      isDirectChat: Value(isDirectChat),
+      pinned: Value(pinned),
+      archived: Value(archived),
+      joinedGroup: Value(joinedGroup),
+      leftGroup: Value(leftGroup),
+      deletedContent: Value(deletedContent),
+      stateVersionId: Value(stateVersionId),
+      stateEncryptionKey: stateEncryptionKey == null && nullToAbsent
+          ? const Value.absent()
+          : Value(stateEncryptionKey),
+      myGroupPrivateKey: myGroupPrivateKey == null && nullToAbsent
+          ? const Value.absent()
+          : Value(myGroupPrivateKey),
+      groupName: Value(groupName),
+      draftMessage: draftMessage == null && nullToAbsent
+          ? const Value.absent()
+          : Value(draftMessage),
+      totalMediaCounter: Value(totalMediaCounter),
+      alsoBestFriend: Value(alsoBestFriend),
+      deleteMessagesAfterMilliseconds: Value(deleteMessagesAfterMilliseconds),
+      createdAt: Value(createdAt),
+      lastMessageSend: lastMessageSend == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastMessageSend),
+      lastMessageReceived: lastMessageReceived == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastMessageReceived),
+      lastFlameCounterChange: lastFlameCounterChange == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastFlameCounterChange),
+      lastFlameSync: lastFlameSync == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastFlameSync),
+      flameCounter: Value(flameCounter),
+      maxFlameCounter: Value(maxFlameCounter),
+      maxFlameCounterFrom: maxFlameCounterFrom == null && nullToAbsent
+          ? const Value.absent()
+          : Value(maxFlameCounterFrom),
+      lastMessageExchange: Value(lastMessageExchange),
+    );
+  }
+
+  factory GroupsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return GroupsData(
+      groupId: serializer.fromJson<String>(json['groupId']),
+      isGroupAdmin: serializer.fromJson<int>(json['isGroupAdmin']),
+      isDirectChat: serializer.fromJson<int>(json['isDirectChat']),
+      pinned: serializer.fromJson<int>(json['pinned']),
+      archived: serializer.fromJson<int>(json['archived']),
+      joinedGroup: serializer.fromJson<int>(json['joinedGroup']),
+      leftGroup: serializer.fromJson<int>(json['leftGroup']),
+      deletedContent: serializer.fromJson<int>(json['deletedContent']),
+      stateVersionId: serializer.fromJson<int>(json['stateVersionId']),
+      stateEncryptionKey: serializer.fromJson<i2.Uint8List?>(
+        json['stateEncryptionKey'],
+      ),
+      myGroupPrivateKey: serializer.fromJson<i2.Uint8List?>(
+        json['myGroupPrivateKey'],
+      ),
+      groupName: serializer.fromJson<String>(json['groupName']),
+      draftMessage: serializer.fromJson<String?>(json['draftMessage']),
+      totalMediaCounter: serializer.fromJson<int>(json['totalMediaCounter']),
+      alsoBestFriend: serializer.fromJson<int>(json['alsoBestFriend']),
+      deleteMessagesAfterMilliseconds: serializer.fromJson<int>(
+        json['deleteMessagesAfterMilliseconds'],
+      ),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+      lastMessageSend: serializer.fromJson<int?>(json['lastMessageSend']),
+      lastMessageReceived: serializer.fromJson<int?>(
+        json['lastMessageReceived'],
+      ),
+      lastFlameCounterChange: serializer.fromJson<int?>(
+        json['lastFlameCounterChange'],
+      ),
+      lastFlameSync: serializer.fromJson<int?>(json['lastFlameSync']),
+      flameCounter: serializer.fromJson<int>(json['flameCounter']),
+      maxFlameCounter: serializer.fromJson<int>(json['maxFlameCounter']),
+      maxFlameCounterFrom: serializer.fromJson<int?>(
+        json['maxFlameCounterFrom'],
+      ),
+      lastMessageExchange: serializer.fromJson<int>(
+        json['lastMessageExchange'],
+      ),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'groupId': serializer.toJson<String>(groupId),
+      'isGroupAdmin': serializer.toJson<int>(isGroupAdmin),
+      'isDirectChat': serializer.toJson<int>(isDirectChat),
+      'pinned': serializer.toJson<int>(pinned),
+      'archived': serializer.toJson<int>(archived),
+      'joinedGroup': serializer.toJson<int>(joinedGroup),
+      'leftGroup': serializer.toJson<int>(leftGroup),
+      'deletedContent': serializer.toJson<int>(deletedContent),
+      'stateVersionId': serializer.toJson<int>(stateVersionId),
+      'stateEncryptionKey': serializer.toJson<i2.Uint8List?>(
+        stateEncryptionKey,
+      ),
+      'myGroupPrivateKey': serializer.toJson<i2.Uint8List?>(myGroupPrivateKey),
+      'groupName': serializer.toJson<String>(groupName),
+      'draftMessage': serializer.toJson<String?>(draftMessage),
+      'totalMediaCounter': serializer.toJson<int>(totalMediaCounter),
+      'alsoBestFriend': serializer.toJson<int>(alsoBestFriend),
+      'deleteMessagesAfterMilliseconds': serializer.toJson<int>(
+        deleteMessagesAfterMilliseconds,
+      ),
+      'createdAt': serializer.toJson<int>(createdAt),
+      'lastMessageSend': serializer.toJson<int?>(lastMessageSend),
+      'lastMessageReceived': serializer.toJson<int?>(lastMessageReceived),
+      'lastFlameCounterChange': serializer.toJson<int?>(lastFlameCounterChange),
+      'lastFlameSync': serializer.toJson<int?>(lastFlameSync),
+      'flameCounter': serializer.toJson<int>(flameCounter),
+      'maxFlameCounter': serializer.toJson<int>(maxFlameCounter),
+      'maxFlameCounterFrom': serializer.toJson<int?>(maxFlameCounterFrom),
+      'lastMessageExchange': serializer.toJson<int>(lastMessageExchange),
+    };
+  }
+
+  GroupsData copyWith({
+    String? groupId,
+    int? isGroupAdmin,
+    int? isDirectChat,
+    int? pinned,
+    int? archived,
+    int? joinedGroup,
+    int? leftGroup,
+    int? deletedContent,
+    int? stateVersionId,
+    Value<i2.Uint8List?> stateEncryptionKey = const Value.absent(),
+    Value<i2.Uint8List?> myGroupPrivateKey = const Value.absent(),
+    String? groupName,
+    Value<String?> draftMessage = const Value.absent(),
+    int? totalMediaCounter,
+    int? alsoBestFriend,
+    int? deleteMessagesAfterMilliseconds,
+    int? createdAt,
+    Value<int?> lastMessageSend = const Value.absent(),
+    Value<int?> lastMessageReceived = const Value.absent(),
+    Value<int?> lastFlameCounterChange = const Value.absent(),
+    Value<int?> lastFlameSync = const Value.absent(),
+    int? flameCounter,
+    int? maxFlameCounter,
+    Value<int?> maxFlameCounterFrom = const Value.absent(),
+    int? lastMessageExchange,
+  }) => GroupsData(
+    groupId: groupId ?? this.groupId,
+    isGroupAdmin: isGroupAdmin ?? this.isGroupAdmin,
+    isDirectChat: isDirectChat ?? this.isDirectChat,
+    pinned: pinned ?? this.pinned,
+    archived: archived ?? this.archived,
+    joinedGroup: joinedGroup ?? this.joinedGroup,
+    leftGroup: leftGroup ?? this.leftGroup,
+    deletedContent: deletedContent ?? this.deletedContent,
+    stateVersionId: stateVersionId ?? this.stateVersionId,
+    stateEncryptionKey: stateEncryptionKey.present
+        ? stateEncryptionKey.value
+        : this.stateEncryptionKey,
+    myGroupPrivateKey: myGroupPrivateKey.present
+        ? myGroupPrivateKey.value
+        : this.myGroupPrivateKey,
+    groupName: groupName ?? this.groupName,
+    draftMessage: draftMessage.present ? draftMessage.value : this.draftMessage,
+    totalMediaCounter: totalMediaCounter ?? this.totalMediaCounter,
+    alsoBestFriend: alsoBestFriend ?? this.alsoBestFriend,
+    deleteMessagesAfterMilliseconds:
+        deleteMessagesAfterMilliseconds ?? this.deleteMessagesAfterMilliseconds,
+    createdAt: createdAt ?? this.createdAt,
+    lastMessageSend: lastMessageSend.present
+        ? lastMessageSend.value
+        : this.lastMessageSend,
+    lastMessageReceived: lastMessageReceived.present
+        ? lastMessageReceived.value
+        : this.lastMessageReceived,
+    lastFlameCounterChange: lastFlameCounterChange.present
+        ? lastFlameCounterChange.value
+        : this.lastFlameCounterChange,
+    lastFlameSync: lastFlameSync.present
+        ? lastFlameSync.value
+        : this.lastFlameSync,
+    flameCounter: flameCounter ?? this.flameCounter,
+    maxFlameCounter: maxFlameCounter ?? this.maxFlameCounter,
+    maxFlameCounterFrom: maxFlameCounterFrom.present
+        ? maxFlameCounterFrom.value
+        : this.maxFlameCounterFrom,
+    lastMessageExchange: lastMessageExchange ?? this.lastMessageExchange,
+  );
+  GroupsData copyWithCompanion(GroupsCompanion data) {
+    return GroupsData(
+      groupId: data.groupId.present ? data.groupId.value : this.groupId,
+      isGroupAdmin: data.isGroupAdmin.present
+          ? data.isGroupAdmin.value
+          : this.isGroupAdmin,
+      isDirectChat: data.isDirectChat.present
+          ? data.isDirectChat.value
+          : this.isDirectChat,
+      pinned: data.pinned.present ? data.pinned.value : this.pinned,
+      archived: data.archived.present ? data.archived.value : this.archived,
+      joinedGroup: data.joinedGroup.present
+          ? data.joinedGroup.value
+          : this.joinedGroup,
+      leftGroup: data.leftGroup.present ? data.leftGroup.value : this.leftGroup,
+      deletedContent: data.deletedContent.present
+          ? data.deletedContent.value
+          : this.deletedContent,
+      stateVersionId: data.stateVersionId.present
+          ? data.stateVersionId.value
+          : this.stateVersionId,
+      stateEncryptionKey: data.stateEncryptionKey.present
+          ? data.stateEncryptionKey.value
+          : this.stateEncryptionKey,
+      myGroupPrivateKey: data.myGroupPrivateKey.present
+          ? data.myGroupPrivateKey.value
+          : this.myGroupPrivateKey,
+      groupName: data.groupName.present ? data.groupName.value : this.groupName,
+      draftMessage: data.draftMessage.present
+          ? data.draftMessage.value
+          : this.draftMessage,
+      totalMediaCounter: data.totalMediaCounter.present
+          ? data.totalMediaCounter.value
+          : this.totalMediaCounter,
+      alsoBestFriend: data.alsoBestFriend.present
+          ? data.alsoBestFriend.value
+          : this.alsoBestFriend,
+      deleteMessagesAfterMilliseconds:
+          data.deleteMessagesAfterMilliseconds.present
+          ? data.deleteMessagesAfterMilliseconds.value
+          : this.deleteMessagesAfterMilliseconds,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      lastMessageSend: data.lastMessageSend.present
+          ? data.lastMessageSend.value
+          : this.lastMessageSend,
+      lastMessageReceived: data.lastMessageReceived.present
+          ? data.lastMessageReceived.value
+          : this.lastMessageReceived,
+      lastFlameCounterChange: data.lastFlameCounterChange.present
+          ? data.lastFlameCounterChange.value
+          : this.lastFlameCounterChange,
+      lastFlameSync: data.lastFlameSync.present
+          ? data.lastFlameSync.value
+          : this.lastFlameSync,
+      flameCounter: data.flameCounter.present
+          ? data.flameCounter.value
+          : this.flameCounter,
+      maxFlameCounter: data.maxFlameCounter.present
+          ? data.maxFlameCounter.value
+          : this.maxFlameCounter,
+      maxFlameCounterFrom: data.maxFlameCounterFrom.present
+          ? data.maxFlameCounterFrom.value
+          : this.maxFlameCounterFrom,
+      lastMessageExchange: data.lastMessageExchange.present
+          ? data.lastMessageExchange.value
+          : this.lastMessageExchange,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('GroupsData(')
+          ..write('groupId: $groupId, ')
+          ..write('isGroupAdmin: $isGroupAdmin, ')
+          ..write('isDirectChat: $isDirectChat, ')
+          ..write('pinned: $pinned, ')
+          ..write('archived: $archived, ')
+          ..write('joinedGroup: $joinedGroup, ')
+          ..write('leftGroup: $leftGroup, ')
+          ..write('deletedContent: $deletedContent, ')
+          ..write('stateVersionId: $stateVersionId, ')
+          ..write('stateEncryptionKey: $stateEncryptionKey, ')
+          ..write('myGroupPrivateKey: $myGroupPrivateKey, ')
+          ..write('groupName: $groupName, ')
+          ..write('draftMessage: $draftMessage, ')
+          ..write('totalMediaCounter: $totalMediaCounter, ')
+          ..write('alsoBestFriend: $alsoBestFriend, ')
+          ..write(
+            'deleteMessagesAfterMilliseconds: $deleteMessagesAfterMilliseconds, ',
+          )
+          ..write('createdAt: $createdAt, ')
+          ..write('lastMessageSend: $lastMessageSend, ')
+          ..write('lastMessageReceived: $lastMessageReceived, ')
+          ..write('lastFlameCounterChange: $lastFlameCounterChange, ')
+          ..write('lastFlameSync: $lastFlameSync, ')
+          ..write('flameCounter: $flameCounter, ')
+          ..write('maxFlameCounter: $maxFlameCounter, ')
+          ..write('maxFlameCounterFrom: $maxFlameCounterFrom, ')
+          ..write('lastMessageExchange: $lastMessageExchange')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hashAll([
+    groupId,
+    isGroupAdmin,
+    isDirectChat,
+    pinned,
+    archived,
+    joinedGroup,
+    leftGroup,
+    deletedContent,
+    stateVersionId,
+    $driftBlobEquality.hash(stateEncryptionKey),
+    $driftBlobEquality.hash(myGroupPrivateKey),
+    groupName,
+    draftMessage,
+    totalMediaCounter,
+    alsoBestFriend,
+    deleteMessagesAfterMilliseconds,
+    createdAt,
+    lastMessageSend,
+    lastMessageReceived,
+    lastFlameCounterChange,
+    lastFlameSync,
+    flameCounter,
+    maxFlameCounter,
+    maxFlameCounterFrom,
+    lastMessageExchange,
+  ]);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is GroupsData &&
+          other.groupId == this.groupId &&
+          other.isGroupAdmin == this.isGroupAdmin &&
+          other.isDirectChat == this.isDirectChat &&
+          other.pinned == this.pinned &&
+          other.archived == this.archived &&
+          other.joinedGroup == this.joinedGroup &&
+          other.leftGroup == this.leftGroup &&
+          other.deletedContent == this.deletedContent &&
+          other.stateVersionId == this.stateVersionId &&
+          $driftBlobEquality.equals(
+            other.stateEncryptionKey,
+            this.stateEncryptionKey,
+          ) &&
+          $driftBlobEquality.equals(
+            other.myGroupPrivateKey,
+            this.myGroupPrivateKey,
+          ) &&
+          other.groupName == this.groupName &&
+          other.draftMessage == this.draftMessage &&
+          other.totalMediaCounter == this.totalMediaCounter &&
+          other.alsoBestFriend == this.alsoBestFriend &&
+          other.deleteMessagesAfterMilliseconds ==
+              this.deleteMessagesAfterMilliseconds &&
+          other.createdAt == this.createdAt &&
+          other.lastMessageSend == this.lastMessageSend &&
+          other.lastMessageReceived == this.lastMessageReceived &&
+          other.lastFlameCounterChange == this.lastFlameCounterChange &&
+          other.lastFlameSync == this.lastFlameSync &&
+          other.flameCounter == this.flameCounter &&
+          other.maxFlameCounter == this.maxFlameCounter &&
+          other.maxFlameCounterFrom == this.maxFlameCounterFrom &&
+          other.lastMessageExchange == this.lastMessageExchange);
+}
+
+class GroupsCompanion extends UpdateCompanion<GroupsData> {
+  final Value<String> groupId;
+  final Value<int> isGroupAdmin;
+  final Value<int> isDirectChat;
+  final Value<int> pinned;
+  final Value<int> archived;
+  final Value<int> joinedGroup;
+  final Value<int> leftGroup;
+  final Value<int> deletedContent;
+  final Value<int> stateVersionId;
+  final Value<i2.Uint8List?> stateEncryptionKey;
+  final Value<i2.Uint8List?> myGroupPrivateKey;
+  final Value<String> groupName;
+  final Value<String?> draftMessage;
+  final Value<int> totalMediaCounter;
+  final Value<int> alsoBestFriend;
+  final Value<int> deleteMessagesAfterMilliseconds;
+  final Value<int> createdAt;
+  final Value<int?> lastMessageSend;
+  final Value<int?> lastMessageReceived;
+  final Value<int?> lastFlameCounterChange;
+  final Value<int?> lastFlameSync;
+  final Value<int> flameCounter;
+  final Value<int> maxFlameCounter;
+  final Value<int?> maxFlameCounterFrom;
+  final Value<int> lastMessageExchange;
+  final Value<int> rowid;
+  const GroupsCompanion({
+    this.groupId = const Value.absent(),
+    this.isGroupAdmin = const Value.absent(),
+    this.isDirectChat = const Value.absent(),
+    this.pinned = const Value.absent(),
+    this.archived = const Value.absent(),
+    this.joinedGroup = const Value.absent(),
+    this.leftGroup = const Value.absent(),
+    this.deletedContent = const Value.absent(),
+    this.stateVersionId = const Value.absent(),
+    this.stateEncryptionKey = const Value.absent(),
+    this.myGroupPrivateKey = const Value.absent(),
+    this.groupName = const Value.absent(),
+    this.draftMessage = const Value.absent(),
+    this.totalMediaCounter = const Value.absent(),
+    this.alsoBestFriend = const Value.absent(),
+    this.deleteMessagesAfterMilliseconds = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.lastMessageSend = const Value.absent(),
+    this.lastMessageReceived = const Value.absent(),
+    this.lastFlameCounterChange = const Value.absent(),
+    this.lastFlameSync = const Value.absent(),
+    this.flameCounter = const Value.absent(),
+    this.maxFlameCounter = const Value.absent(),
+    this.maxFlameCounterFrom = const Value.absent(),
+    this.lastMessageExchange = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  GroupsCompanion.insert({
+    required String groupId,
+    this.isGroupAdmin = const Value.absent(),
+    this.isDirectChat = const Value.absent(),
+    this.pinned = const Value.absent(),
+    this.archived = const Value.absent(),
+    this.joinedGroup = const Value.absent(),
+    this.leftGroup = const Value.absent(),
+    this.deletedContent = const Value.absent(),
+    this.stateVersionId = const Value.absent(),
+    this.stateEncryptionKey = const Value.absent(),
+    this.myGroupPrivateKey = const Value.absent(),
+    required String groupName,
+    this.draftMessage = const Value.absent(),
+    this.totalMediaCounter = const Value.absent(),
+    this.alsoBestFriend = const Value.absent(),
+    this.deleteMessagesAfterMilliseconds = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.lastMessageSend = const Value.absent(),
+    this.lastMessageReceived = const Value.absent(),
+    this.lastFlameCounterChange = const Value.absent(),
+    this.lastFlameSync = const Value.absent(),
+    this.flameCounter = const Value.absent(),
+    this.maxFlameCounter = const Value.absent(),
+    this.maxFlameCounterFrom = const Value.absent(),
+    this.lastMessageExchange = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : groupId = Value(groupId),
+       groupName = Value(groupName);
+  static Insertable<GroupsData> custom({
+    Expression<String>? groupId,
+    Expression<int>? isGroupAdmin,
+    Expression<int>? isDirectChat,
+    Expression<int>? pinned,
+    Expression<int>? archived,
+    Expression<int>? joinedGroup,
+    Expression<int>? leftGroup,
+    Expression<int>? deletedContent,
+    Expression<int>? stateVersionId,
+    Expression<i2.Uint8List>? stateEncryptionKey,
+    Expression<i2.Uint8List>? myGroupPrivateKey,
+    Expression<String>? groupName,
+    Expression<String>? draftMessage,
+    Expression<int>? totalMediaCounter,
+    Expression<int>? alsoBestFriend,
+    Expression<int>? deleteMessagesAfterMilliseconds,
+    Expression<int>? createdAt,
+    Expression<int>? lastMessageSend,
+    Expression<int>? lastMessageReceived,
+    Expression<int>? lastFlameCounterChange,
+    Expression<int>? lastFlameSync,
+    Expression<int>? flameCounter,
+    Expression<int>? maxFlameCounter,
+    Expression<int>? maxFlameCounterFrom,
+    Expression<int>? lastMessageExchange,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (groupId != null) 'group_id': groupId,
+      if (isGroupAdmin != null) 'is_group_admin': isGroupAdmin,
+      if (isDirectChat != null) 'is_direct_chat': isDirectChat,
+      if (pinned != null) 'pinned': pinned,
+      if (archived != null) 'archived': archived,
+      if (joinedGroup != null) 'joined_group': joinedGroup,
+      if (leftGroup != null) 'left_group': leftGroup,
+      if (deletedContent != null) 'deleted_content': deletedContent,
+      if (stateVersionId != null) 'state_version_id': stateVersionId,
+      if (stateEncryptionKey != null)
+        'state_encryption_key': stateEncryptionKey,
+      if (myGroupPrivateKey != null) 'my_group_private_key': myGroupPrivateKey,
+      if (groupName != null) 'group_name': groupName,
+      if (draftMessage != null) 'draft_message': draftMessage,
+      if (totalMediaCounter != null) 'total_media_counter': totalMediaCounter,
+      if (alsoBestFriend != null) 'also_best_friend': alsoBestFriend,
+      if (deleteMessagesAfterMilliseconds != null)
+        'delete_messages_after_milliseconds': deleteMessagesAfterMilliseconds,
+      if (createdAt != null) 'created_at': createdAt,
+      if (lastMessageSend != null) 'last_message_send': lastMessageSend,
+      if (lastMessageReceived != null)
+        'last_message_received': lastMessageReceived,
+      if (lastFlameCounterChange != null)
+        'last_flame_counter_change': lastFlameCounterChange,
+      if (lastFlameSync != null) 'last_flame_sync': lastFlameSync,
+      if (flameCounter != null) 'flame_counter': flameCounter,
+      if (maxFlameCounter != null) 'max_flame_counter': maxFlameCounter,
+      if (maxFlameCounterFrom != null)
+        'max_flame_counter_from': maxFlameCounterFrom,
+      if (lastMessageExchange != null)
+        'last_message_exchange': lastMessageExchange,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  GroupsCompanion copyWith({
+    Value<String>? groupId,
+    Value<int>? isGroupAdmin,
+    Value<int>? isDirectChat,
+    Value<int>? pinned,
+    Value<int>? archived,
+    Value<int>? joinedGroup,
+    Value<int>? leftGroup,
+    Value<int>? deletedContent,
+    Value<int>? stateVersionId,
+    Value<i2.Uint8List?>? stateEncryptionKey,
+    Value<i2.Uint8List?>? myGroupPrivateKey,
+    Value<String>? groupName,
+    Value<String?>? draftMessage,
+    Value<int>? totalMediaCounter,
+    Value<int>? alsoBestFriend,
+    Value<int>? deleteMessagesAfterMilliseconds,
+    Value<int>? createdAt,
+    Value<int?>? lastMessageSend,
+    Value<int?>? lastMessageReceived,
+    Value<int?>? lastFlameCounterChange,
+    Value<int?>? lastFlameSync,
+    Value<int>? flameCounter,
+    Value<int>? maxFlameCounter,
+    Value<int?>? maxFlameCounterFrom,
+    Value<int>? lastMessageExchange,
+    Value<int>? rowid,
+  }) {
+    return GroupsCompanion(
+      groupId: groupId ?? this.groupId,
+      isGroupAdmin: isGroupAdmin ?? this.isGroupAdmin,
+      isDirectChat: isDirectChat ?? this.isDirectChat,
+      pinned: pinned ?? this.pinned,
+      archived: archived ?? this.archived,
+      joinedGroup: joinedGroup ?? this.joinedGroup,
+      leftGroup: leftGroup ?? this.leftGroup,
+      deletedContent: deletedContent ?? this.deletedContent,
+      stateVersionId: stateVersionId ?? this.stateVersionId,
+      stateEncryptionKey: stateEncryptionKey ?? this.stateEncryptionKey,
+      myGroupPrivateKey: myGroupPrivateKey ?? this.myGroupPrivateKey,
+      groupName: groupName ?? this.groupName,
+      draftMessage: draftMessage ?? this.draftMessage,
+      totalMediaCounter: totalMediaCounter ?? this.totalMediaCounter,
+      alsoBestFriend: alsoBestFriend ?? this.alsoBestFriend,
+      deleteMessagesAfterMilliseconds:
+          deleteMessagesAfterMilliseconds ??
+          this.deleteMessagesAfterMilliseconds,
+      createdAt: createdAt ?? this.createdAt,
+      lastMessageSend: lastMessageSend ?? this.lastMessageSend,
+      lastMessageReceived: lastMessageReceived ?? this.lastMessageReceived,
+      lastFlameCounterChange:
+          lastFlameCounterChange ?? this.lastFlameCounterChange,
+      lastFlameSync: lastFlameSync ?? this.lastFlameSync,
+      flameCounter: flameCounter ?? this.flameCounter,
+      maxFlameCounter: maxFlameCounter ?? this.maxFlameCounter,
+      maxFlameCounterFrom: maxFlameCounterFrom ?? this.maxFlameCounterFrom,
+      lastMessageExchange: lastMessageExchange ?? this.lastMessageExchange,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (groupId.present) {
+      map['group_id'] = Variable<String>(groupId.value);
+    }
+    if (isGroupAdmin.present) {
+      map['is_group_admin'] = Variable<int>(isGroupAdmin.value);
+    }
+    if (isDirectChat.present) {
+      map['is_direct_chat'] = Variable<int>(isDirectChat.value);
+    }
+    if (pinned.present) {
+      map['pinned'] = Variable<int>(pinned.value);
+    }
+    if (archived.present) {
+      map['archived'] = Variable<int>(archived.value);
+    }
+    if (joinedGroup.present) {
+      map['joined_group'] = Variable<int>(joinedGroup.value);
+    }
+    if (leftGroup.present) {
+      map['left_group'] = Variable<int>(leftGroup.value);
+    }
+    if (deletedContent.present) {
+      map['deleted_content'] = Variable<int>(deletedContent.value);
+    }
+    if (stateVersionId.present) {
+      map['state_version_id'] = Variable<int>(stateVersionId.value);
+    }
+    if (stateEncryptionKey.present) {
+      map['state_encryption_key'] = Variable<i2.Uint8List>(
+        stateEncryptionKey.value,
+      );
+    }
+    if (myGroupPrivateKey.present) {
+      map['my_group_private_key'] = Variable<i2.Uint8List>(
+        myGroupPrivateKey.value,
+      );
+    }
+    if (groupName.present) {
+      map['group_name'] = Variable<String>(groupName.value);
+    }
+    if (draftMessage.present) {
+      map['draft_message'] = Variable<String>(draftMessage.value);
+    }
+    if (totalMediaCounter.present) {
+      map['total_media_counter'] = Variable<int>(totalMediaCounter.value);
+    }
+    if (alsoBestFriend.present) {
+      map['also_best_friend'] = Variable<int>(alsoBestFriend.value);
+    }
+    if (deleteMessagesAfterMilliseconds.present) {
+      map['delete_messages_after_milliseconds'] = Variable<int>(
+        deleteMessagesAfterMilliseconds.value,
+      );
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (lastMessageSend.present) {
+      map['last_message_send'] = Variable<int>(lastMessageSend.value);
+    }
+    if (lastMessageReceived.present) {
+      map['last_message_received'] = Variable<int>(lastMessageReceived.value);
+    }
+    if (lastFlameCounterChange.present) {
+      map['last_flame_counter_change'] = Variable<int>(
+        lastFlameCounterChange.value,
+      );
+    }
+    if (lastFlameSync.present) {
+      map['last_flame_sync'] = Variable<int>(lastFlameSync.value);
+    }
+    if (flameCounter.present) {
+      map['flame_counter'] = Variable<int>(flameCounter.value);
+    }
+    if (maxFlameCounter.present) {
+      map['max_flame_counter'] = Variable<int>(maxFlameCounter.value);
+    }
+    if (maxFlameCounterFrom.present) {
+      map['max_flame_counter_from'] = Variable<int>(maxFlameCounterFrom.value);
+    }
+    if (lastMessageExchange.present) {
+      map['last_message_exchange'] = Variable<int>(lastMessageExchange.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('GroupsCompanion(')
+          ..write('groupId: $groupId, ')
+          ..write('isGroupAdmin: $isGroupAdmin, ')
+          ..write('isDirectChat: $isDirectChat, ')
+          ..write('pinned: $pinned, ')
+          ..write('archived: $archived, ')
+          ..write('joinedGroup: $joinedGroup, ')
+          ..write('leftGroup: $leftGroup, ')
+          ..write('deletedContent: $deletedContent, ')
+          ..write('stateVersionId: $stateVersionId, ')
+          ..write('stateEncryptionKey: $stateEncryptionKey, ')
+          ..write('myGroupPrivateKey: $myGroupPrivateKey, ')
+          ..write('groupName: $groupName, ')
+          ..write('draftMessage: $draftMessage, ')
+          ..write('totalMediaCounter: $totalMediaCounter, ')
+          ..write('alsoBestFriend: $alsoBestFriend, ')
+          ..write(
+            'deleteMessagesAfterMilliseconds: $deleteMessagesAfterMilliseconds, ',
+          )
+          ..write('createdAt: $createdAt, ')
+          ..write('lastMessageSend: $lastMessageSend, ')
+          ..write('lastMessageReceived: $lastMessageReceived, ')
+          ..write('lastFlameCounterChange: $lastFlameCounterChange, ')
+          ..write('lastFlameSync: $lastFlameSync, ')
+          ..write('flameCounter: $flameCounter, ')
+          ..write('maxFlameCounter: $maxFlameCounter, ')
+          ..write('maxFlameCounterFrom: $maxFlameCounterFrom, ')
+          ..write('lastMessageExchange: $lastMessageExchange, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class MediaFiles extends Table with TableInfo<MediaFiles, MediaFilesData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  MediaFiles(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> mediaId = GeneratedColumn<String>(
+    'media_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> type = GeneratedColumn<String>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> uploadState = GeneratedColumn<String>(
+    'upload_state',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<String> downloadState = GeneratedColumn<String>(
+    'download_state',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> requiresAuthentication = GeneratedColumn<int>(
+    'requires_authentication',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT 0 CHECK (requires_authentication IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> stored = GeneratedColumn<int>(
+    'stored',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK ("stored" IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> isDraftMedia = GeneratedColumn<int>(
+    'is_draft_media',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (is_draft_media IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> preProgressingProcess = GeneratedColumn<int>(
+    'pre_progressing_process',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<String> reuploadRequestedBy =
+      GeneratedColumn<String>(
+        'reupload_requested_by',
+        aliasedName,
+        true,
+        type: DriftSqlType.string,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> displayLimitInMilliseconds =
+      GeneratedColumn<int>(
+        'display_limit_in_milliseconds',
+        aliasedName,
+        true,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> removeAudio = GeneratedColumn<int>(
+    'remove_audio',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL CHECK (remove_audio IN (0, 1))',
+  );
+  late final GeneratedColumn<i2.Uint8List> downloadToken =
+      GeneratedColumn<i2.Uint8List>(
+        'download_token',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<i2.Uint8List> encryptionKey =
+      GeneratedColumn<i2.Uint8List>(
+        'encryption_key',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<i2.Uint8List> encryptionMac =
+      GeneratedColumn<i2.Uint8List>(
+        'encryption_mac',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<i2.Uint8List> encryptionNonce =
+      GeneratedColumn<i2.Uint8List>(
+        'encryption_nonce',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<i2.Uint8List> storedFileHash =
+      GeneratedColumn<i2.Uint8List>(
+        'stored_file_hash',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    mediaId,
+    type,
+    uploadState,
+    downloadState,
+    requiresAuthentication,
+    stored,
+    isDraftMedia,
+    preProgressingProcess,
+    reuploadRequestedBy,
+    displayLimitInMilliseconds,
+    removeAudio,
+    downloadToken,
+    encryptionKey,
+    encryptionMac,
+    encryptionNonce,
+    storedFileHash,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'media_files';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {mediaId};
+  @override
+  MediaFilesData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return MediaFilesData(
+      mediaId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}media_id'],
+      )!,
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}type'],
+      )!,
+      uploadState: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}upload_state'],
+      ),
+      downloadState: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}download_state'],
+      ),
+      requiresAuthentication: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}requires_authentication'],
+      )!,
+      stored: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}stored'],
+      )!,
+      isDraftMedia: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}is_draft_media'],
+      )!,
+      preProgressingProcess: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}pre_progressing_process'],
+      ),
+      reuploadRequestedBy: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}reupload_requested_by'],
+      ),
+      displayLimitInMilliseconds: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}display_limit_in_milliseconds'],
+      ),
+      removeAudio: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}remove_audio'],
+      ),
+      downloadToken: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}download_token'],
+      ),
+      encryptionKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}encryption_key'],
+      ),
+      encryptionMac: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}encryption_mac'],
+      ),
+      encryptionNonce: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}encryption_nonce'],
+      ),
+      storedFileHash: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}stored_file_hash'],
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  MediaFiles createAlias(String alias) {
+    return MediaFiles(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(media_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class MediaFilesData extends DataClass implements Insertable<MediaFilesData> {
+  final String mediaId;
+  final String type;
+  final String? uploadState;
+  final String? downloadState;
+  final int requiresAuthentication;
+  final int stored;
+  final int isDraftMedia;
+  final int? preProgressingProcess;
+  final String? reuploadRequestedBy;
+  final int? displayLimitInMilliseconds;
+  final int? removeAudio;
+  final i2.Uint8List? downloadToken;
+  final i2.Uint8List? encryptionKey;
+  final i2.Uint8List? encryptionMac;
+  final i2.Uint8List? encryptionNonce;
+  final i2.Uint8List? storedFileHash;
+  final int createdAt;
+  const MediaFilesData({
+    required this.mediaId,
+    required this.type,
+    this.uploadState,
+    this.downloadState,
+    required this.requiresAuthentication,
+    required this.stored,
+    required this.isDraftMedia,
+    this.preProgressingProcess,
+    this.reuploadRequestedBy,
+    this.displayLimitInMilliseconds,
+    this.removeAudio,
+    this.downloadToken,
+    this.encryptionKey,
+    this.encryptionMac,
+    this.encryptionNonce,
+    this.storedFileHash,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['media_id'] = Variable<String>(mediaId);
+    map['type'] = Variable<String>(type);
+    if (!nullToAbsent || uploadState != null) {
+      map['upload_state'] = Variable<String>(uploadState);
+    }
+    if (!nullToAbsent || downloadState != null) {
+      map['download_state'] = Variable<String>(downloadState);
+    }
+    map['requires_authentication'] = Variable<int>(requiresAuthentication);
+    map['stored'] = Variable<int>(stored);
+    map['is_draft_media'] = Variable<int>(isDraftMedia);
+    if (!nullToAbsent || preProgressingProcess != null) {
+      map['pre_progressing_process'] = Variable<int>(preProgressingProcess);
+    }
+    if (!nullToAbsent || reuploadRequestedBy != null) {
+      map['reupload_requested_by'] = Variable<String>(reuploadRequestedBy);
+    }
+    if (!nullToAbsent || displayLimitInMilliseconds != null) {
+      map['display_limit_in_milliseconds'] = Variable<int>(
+        displayLimitInMilliseconds,
+      );
+    }
+    if (!nullToAbsent || removeAudio != null) {
+      map['remove_audio'] = Variable<int>(removeAudio);
+    }
+    if (!nullToAbsent || downloadToken != null) {
+      map['download_token'] = Variable<i2.Uint8List>(downloadToken);
+    }
+    if (!nullToAbsent || encryptionKey != null) {
+      map['encryption_key'] = Variable<i2.Uint8List>(encryptionKey);
+    }
+    if (!nullToAbsent || encryptionMac != null) {
+      map['encryption_mac'] = Variable<i2.Uint8List>(encryptionMac);
+    }
+    if (!nullToAbsent || encryptionNonce != null) {
+      map['encryption_nonce'] = Variable<i2.Uint8List>(encryptionNonce);
+    }
+    if (!nullToAbsent || storedFileHash != null) {
+      map['stored_file_hash'] = Variable<i2.Uint8List>(storedFileHash);
+    }
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  MediaFilesCompanion toCompanion(bool nullToAbsent) {
+    return MediaFilesCompanion(
+      mediaId: Value(mediaId),
+      type: Value(type),
+      uploadState: uploadState == null && nullToAbsent
+          ? const Value.absent()
+          : Value(uploadState),
+      downloadState: downloadState == null && nullToAbsent
+          ? const Value.absent()
+          : Value(downloadState),
+      requiresAuthentication: Value(requiresAuthentication),
+      stored: Value(stored),
+      isDraftMedia: Value(isDraftMedia),
+      preProgressingProcess: preProgressingProcess == null && nullToAbsent
+          ? const Value.absent()
+          : Value(preProgressingProcess),
+      reuploadRequestedBy: reuploadRequestedBy == null && nullToAbsent
+          ? const Value.absent()
+          : Value(reuploadRequestedBy),
+      displayLimitInMilliseconds:
+          displayLimitInMilliseconds == null && nullToAbsent
+          ? const Value.absent()
+          : Value(displayLimitInMilliseconds),
+      removeAudio: removeAudio == null && nullToAbsent
+          ? const Value.absent()
+          : Value(removeAudio),
+      downloadToken: downloadToken == null && nullToAbsent
+          ? const Value.absent()
+          : Value(downloadToken),
+      encryptionKey: encryptionKey == null && nullToAbsent
+          ? const Value.absent()
+          : Value(encryptionKey),
+      encryptionMac: encryptionMac == null && nullToAbsent
+          ? const Value.absent()
+          : Value(encryptionMac),
+      encryptionNonce: encryptionNonce == null && nullToAbsent
+          ? const Value.absent()
+          : Value(encryptionNonce),
+      storedFileHash: storedFileHash == null && nullToAbsent
+          ? const Value.absent()
+          : Value(storedFileHash),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory MediaFilesData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return MediaFilesData(
+      mediaId: serializer.fromJson<String>(json['mediaId']),
+      type: serializer.fromJson<String>(json['type']),
+      uploadState: serializer.fromJson<String?>(json['uploadState']),
+      downloadState: serializer.fromJson<String?>(json['downloadState']),
+      requiresAuthentication: serializer.fromJson<int>(
+        json['requiresAuthentication'],
+      ),
+      stored: serializer.fromJson<int>(json['stored']),
+      isDraftMedia: serializer.fromJson<int>(json['isDraftMedia']),
+      preProgressingProcess: serializer.fromJson<int?>(
+        json['preProgressingProcess'],
+      ),
+      reuploadRequestedBy: serializer.fromJson<String?>(
+        json['reuploadRequestedBy'],
+      ),
+      displayLimitInMilliseconds: serializer.fromJson<int?>(
+        json['displayLimitInMilliseconds'],
+      ),
+      removeAudio: serializer.fromJson<int?>(json['removeAudio']),
+      downloadToken: serializer.fromJson<i2.Uint8List?>(json['downloadToken']),
+      encryptionKey: serializer.fromJson<i2.Uint8List?>(json['encryptionKey']),
+      encryptionMac: serializer.fromJson<i2.Uint8List?>(json['encryptionMac']),
+      encryptionNonce: serializer.fromJson<i2.Uint8List?>(
+        json['encryptionNonce'],
+      ),
+      storedFileHash: serializer.fromJson<i2.Uint8List?>(
+        json['storedFileHash'],
+      ),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'mediaId': serializer.toJson<String>(mediaId),
+      'type': serializer.toJson<String>(type),
+      'uploadState': serializer.toJson<String?>(uploadState),
+      'downloadState': serializer.toJson<String?>(downloadState),
+      'requiresAuthentication': serializer.toJson<int>(requiresAuthentication),
+      'stored': serializer.toJson<int>(stored),
+      'isDraftMedia': serializer.toJson<int>(isDraftMedia),
+      'preProgressingProcess': serializer.toJson<int?>(preProgressingProcess),
+      'reuploadRequestedBy': serializer.toJson<String?>(reuploadRequestedBy),
+      'displayLimitInMilliseconds': serializer.toJson<int?>(
+        displayLimitInMilliseconds,
+      ),
+      'removeAudio': serializer.toJson<int?>(removeAudio),
+      'downloadToken': serializer.toJson<i2.Uint8List?>(downloadToken),
+      'encryptionKey': serializer.toJson<i2.Uint8List?>(encryptionKey),
+      'encryptionMac': serializer.toJson<i2.Uint8List?>(encryptionMac),
+      'encryptionNonce': serializer.toJson<i2.Uint8List?>(encryptionNonce),
+      'storedFileHash': serializer.toJson<i2.Uint8List?>(storedFileHash),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  MediaFilesData copyWith({
+    String? mediaId,
+    String? type,
+    Value<String?> uploadState = const Value.absent(),
+    Value<String?> downloadState = const Value.absent(),
+    int? requiresAuthentication,
+    int? stored,
+    int? isDraftMedia,
+    Value<int?> preProgressingProcess = const Value.absent(),
+    Value<String?> reuploadRequestedBy = const Value.absent(),
+    Value<int?> displayLimitInMilliseconds = const Value.absent(),
+    Value<int?> removeAudio = const Value.absent(),
+    Value<i2.Uint8List?> downloadToken = const Value.absent(),
+    Value<i2.Uint8List?> encryptionKey = const Value.absent(),
+    Value<i2.Uint8List?> encryptionMac = const Value.absent(),
+    Value<i2.Uint8List?> encryptionNonce = const Value.absent(),
+    Value<i2.Uint8List?> storedFileHash = const Value.absent(),
+    int? createdAt,
+  }) => MediaFilesData(
+    mediaId: mediaId ?? this.mediaId,
+    type: type ?? this.type,
+    uploadState: uploadState.present ? uploadState.value : this.uploadState,
+    downloadState: downloadState.present
+        ? downloadState.value
+        : this.downloadState,
+    requiresAuthentication:
+        requiresAuthentication ?? this.requiresAuthentication,
+    stored: stored ?? this.stored,
+    isDraftMedia: isDraftMedia ?? this.isDraftMedia,
+    preProgressingProcess: preProgressingProcess.present
+        ? preProgressingProcess.value
+        : this.preProgressingProcess,
+    reuploadRequestedBy: reuploadRequestedBy.present
+        ? reuploadRequestedBy.value
+        : this.reuploadRequestedBy,
+    displayLimitInMilliseconds: displayLimitInMilliseconds.present
+        ? displayLimitInMilliseconds.value
+        : this.displayLimitInMilliseconds,
+    removeAudio: removeAudio.present ? removeAudio.value : this.removeAudio,
+    downloadToken: downloadToken.present
+        ? downloadToken.value
+        : this.downloadToken,
+    encryptionKey: encryptionKey.present
+        ? encryptionKey.value
+        : this.encryptionKey,
+    encryptionMac: encryptionMac.present
+        ? encryptionMac.value
+        : this.encryptionMac,
+    encryptionNonce: encryptionNonce.present
+        ? encryptionNonce.value
+        : this.encryptionNonce,
+    storedFileHash: storedFileHash.present
+        ? storedFileHash.value
+        : this.storedFileHash,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  MediaFilesData copyWithCompanion(MediaFilesCompanion data) {
+    return MediaFilesData(
+      mediaId: data.mediaId.present ? data.mediaId.value : this.mediaId,
+      type: data.type.present ? data.type.value : this.type,
+      uploadState: data.uploadState.present
+          ? data.uploadState.value
+          : this.uploadState,
+      downloadState: data.downloadState.present
+          ? data.downloadState.value
+          : this.downloadState,
+      requiresAuthentication: data.requiresAuthentication.present
+          ? data.requiresAuthentication.value
+          : this.requiresAuthentication,
+      stored: data.stored.present ? data.stored.value : this.stored,
+      isDraftMedia: data.isDraftMedia.present
+          ? data.isDraftMedia.value
+          : this.isDraftMedia,
+      preProgressingProcess: data.preProgressingProcess.present
+          ? data.preProgressingProcess.value
+          : this.preProgressingProcess,
+      reuploadRequestedBy: data.reuploadRequestedBy.present
+          ? data.reuploadRequestedBy.value
+          : this.reuploadRequestedBy,
+      displayLimitInMilliseconds: data.displayLimitInMilliseconds.present
+          ? data.displayLimitInMilliseconds.value
+          : this.displayLimitInMilliseconds,
+      removeAudio: data.removeAudio.present
+          ? data.removeAudio.value
+          : this.removeAudio,
+      downloadToken: data.downloadToken.present
+          ? data.downloadToken.value
+          : this.downloadToken,
+      encryptionKey: data.encryptionKey.present
+          ? data.encryptionKey.value
+          : this.encryptionKey,
+      encryptionMac: data.encryptionMac.present
+          ? data.encryptionMac.value
+          : this.encryptionMac,
+      encryptionNonce: data.encryptionNonce.present
+          ? data.encryptionNonce.value
+          : this.encryptionNonce,
+      storedFileHash: data.storedFileHash.present
+          ? data.storedFileHash.value
+          : this.storedFileHash,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MediaFilesData(')
+          ..write('mediaId: $mediaId, ')
+          ..write('type: $type, ')
+          ..write('uploadState: $uploadState, ')
+          ..write('downloadState: $downloadState, ')
+          ..write('requiresAuthentication: $requiresAuthentication, ')
+          ..write('stored: $stored, ')
+          ..write('isDraftMedia: $isDraftMedia, ')
+          ..write('preProgressingProcess: $preProgressingProcess, ')
+          ..write('reuploadRequestedBy: $reuploadRequestedBy, ')
+          ..write('displayLimitInMilliseconds: $displayLimitInMilliseconds, ')
+          ..write('removeAudio: $removeAudio, ')
+          ..write('downloadToken: $downloadToken, ')
+          ..write('encryptionKey: $encryptionKey, ')
+          ..write('encryptionMac: $encryptionMac, ')
+          ..write('encryptionNonce: $encryptionNonce, ')
+          ..write('storedFileHash: $storedFileHash, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    mediaId,
+    type,
+    uploadState,
+    downloadState,
+    requiresAuthentication,
+    stored,
+    isDraftMedia,
+    preProgressingProcess,
+    reuploadRequestedBy,
+    displayLimitInMilliseconds,
+    removeAudio,
+    $driftBlobEquality.hash(downloadToken),
+    $driftBlobEquality.hash(encryptionKey),
+    $driftBlobEquality.hash(encryptionMac),
+    $driftBlobEquality.hash(encryptionNonce),
+    $driftBlobEquality.hash(storedFileHash),
+    createdAt,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is MediaFilesData &&
+          other.mediaId == this.mediaId &&
+          other.type == this.type &&
+          other.uploadState == this.uploadState &&
+          other.downloadState == this.downloadState &&
+          other.requiresAuthentication == this.requiresAuthentication &&
+          other.stored == this.stored &&
+          other.isDraftMedia == this.isDraftMedia &&
+          other.preProgressingProcess == this.preProgressingProcess &&
+          other.reuploadRequestedBy == this.reuploadRequestedBy &&
+          other.displayLimitInMilliseconds == this.displayLimitInMilliseconds &&
+          other.removeAudio == this.removeAudio &&
+          $driftBlobEquality.equals(other.downloadToken, this.downloadToken) &&
+          $driftBlobEquality.equals(other.encryptionKey, this.encryptionKey) &&
+          $driftBlobEquality.equals(other.encryptionMac, this.encryptionMac) &&
+          $driftBlobEquality.equals(
+            other.encryptionNonce,
+            this.encryptionNonce,
+          ) &&
+          $driftBlobEquality.equals(
+            other.storedFileHash,
+            this.storedFileHash,
+          ) &&
+          other.createdAt == this.createdAt);
+}
+
+class MediaFilesCompanion extends UpdateCompanion<MediaFilesData> {
+  final Value<String> mediaId;
+  final Value<String> type;
+  final Value<String?> uploadState;
+  final Value<String?> downloadState;
+  final Value<int> requiresAuthentication;
+  final Value<int> stored;
+  final Value<int> isDraftMedia;
+  final Value<int?> preProgressingProcess;
+  final Value<String?> reuploadRequestedBy;
+  final Value<int?> displayLimitInMilliseconds;
+  final Value<int?> removeAudio;
+  final Value<i2.Uint8List?> downloadToken;
+  final Value<i2.Uint8List?> encryptionKey;
+  final Value<i2.Uint8List?> encryptionMac;
+  final Value<i2.Uint8List?> encryptionNonce;
+  final Value<i2.Uint8List?> storedFileHash;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const MediaFilesCompanion({
+    this.mediaId = const Value.absent(),
+    this.type = const Value.absent(),
+    this.uploadState = const Value.absent(),
+    this.downloadState = const Value.absent(),
+    this.requiresAuthentication = const Value.absent(),
+    this.stored = const Value.absent(),
+    this.isDraftMedia = const Value.absent(),
+    this.preProgressingProcess = const Value.absent(),
+    this.reuploadRequestedBy = const Value.absent(),
+    this.displayLimitInMilliseconds = const Value.absent(),
+    this.removeAudio = const Value.absent(),
+    this.downloadToken = const Value.absent(),
+    this.encryptionKey = const Value.absent(),
+    this.encryptionMac = const Value.absent(),
+    this.encryptionNonce = const Value.absent(),
+    this.storedFileHash = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  MediaFilesCompanion.insert({
+    required String mediaId,
+    required String type,
+    this.uploadState = const Value.absent(),
+    this.downloadState = const Value.absent(),
+    this.requiresAuthentication = const Value.absent(),
+    this.stored = const Value.absent(),
+    this.isDraftMedia = const Value.absent(),
+    this.preProgressingProcess = const Value.absent(),
+    this.reuploadRequestedBy = const Value.absent(),
+    this.displayLimitInMilliseconds = const Value.absent(),
+    this.removeAudio = const Value.absent(),
+    this.downloadToken = const Value.absent(),
+    this.encryptionKey = const Value.absent(),
+    this.encryptionMac = const Value.absent(),
+    this.encryptionNonce = const Value.absent(),
+    this.storedFileHash = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : mediaId = Value(mediaId),
+       type = Value(type);
+  static Insertable<MediaFilesData> custom({
+    Expression<String>? mediaId,
+    Expression<String>? type,
+    Expression<String>? uploadState,
+    Expression<String>? downloadState,
+    Expression<int>? requiresAuthentication,
+    Expression<int>? stored,
+    Expression<int>? isDraftMedia,
+    Expression<int>? preProgressingProcess,
+    Expression<String>? reuploadRequestedBy,
+    Expression<int>? displayLimitInMilliseconds,
+    Expression<int>? removeAudio,
+    Expression<i2.Uint8List>? downloadToken,
+    Expression<i2.Uint8List>? encryptionKey,
+    Expression<i2.Uint8List>? encryptionMac,
+    Expression<i2.Uint8List>? encryptionNonce,
+    Expression<i2.Uint8List>? storedFileHash,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (mediaId != null) 'media_id': mediaId,
+      if (type != null) 'type': type,
+      if (uploadState != null) 'upload_state': uploadState,
+      if (downloadState != null) 'download_state': downloadState,
+      if (requiresAuthentication != null)
+        'requires_authentication': requiresAuthentication,
+      if (stored != null) 'stored': stored,
+      if (isDraftMedia != null) 'is_draft_media': isDraftMedia,
+      if (preProgressingProcess != null)
+        'pre_progressing_process': preProgressingProcess,
+      if (reuploadRequestedBy != null)
+        'reupload_requested_by': reuploadRequestedBy,
+      if (displayLimitInMilliseconds != null)
+        'display_limit_in_milliseconds': displayLimitInMilliseconds,
+      if (removeAudio != null) 'remove_audio': removeAudio,
+      if (downloadToken != null) 'download_token': downloadToken,
+      if (encryptionKey != null) 'encryption_key': encryptionKey,
+      if (encryptionMac != null) 'encryption_mac': encryptionMac,
+      if (encryptionNonce != null) 'encryption_nonce': encryptionNonce,
+      if (storedFileHash != null) 'stored_file_hash': storedFileHash,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  MediaFilesCompanion copyWith({
+    Value<String>? mediaId,
+    Value<String>? type,
+    Value<String?>? uploadState,
+    Value<String?>? downloadState,
+    Value<int>? requiresAuthentication,
+    Value<int>? stored,
+    Value<int>? isDraftMedia,
+    Value<int?>? preProgressingProcess,
+    Value<String?>? reuploadRequestedBy,
+    Value<int?>? displayLimitInMilliseconds,
+    Value<int?>? removeAudio,
+    Value<i2.Uint8List?>? downloadToken,
+    Value<i2.Uint8List?>? encryptionKey,
+    Value<i2.Uint8List?>? encryptionMac,
+    Value<i2.Uint8List?>? encryptionNonce,
+    Value<i2.Uint8List?>? storedFileHash,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return MediaFilesCompanion(
+      mediaId: mediaId ?? this.mediaId,
+      type: type ?? this.type,
+      uploadState: uploadState ?? this.uploadState,
+      downloadState: downloadState ?? this.downloadState,
+      requiresAuthentication:
+          requiresAuthentication ?? this.requiresAuthentication,
+      stored: stored ?? this.stored,
+      isDraftMedia: isDraftMedia ?? this.isDraftMedia,
+      preProgressingProcess:
+          preProgressingProcess ?? this.preProgressingProcess,
+      reuploadRequestedBy: reuploadRequestedBy ?? this.reuploadRequestedBy,
+      displayLimitInMilliseconds:
+          displayLimitInMilliseconds ?? this.displayLimitInMilliseconds,
+      removeAudio: removeAudio ?? this.removeAudio,
+      downloadToken: downloadToken ?? this.downloadToken,
+      encryptionKey: encryptionKey ?? this.encryptionKey,
+      encryptionMac: encryptionMac ?? this.encryptionMac,
+      encryptionNonce: encryptionNonce ?? this.encryptionNonce,
+      storedFileHash: storedFileHash ?? this.storedFileHash,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (mediaId.present) {
+      map['media_id'] = Variable<String>(mediaId.value);
+    }
+    if (type.present) {
+      map['type'] = Variable<String>(type.value);
+    }
+    if (uploadState.present) {
+      map['upload_state'] = Variable<String>(uploadState.value);
+    }
+    if (downloadState.present) {
+      map['download_state'] = Variable<String>(downloadState.value);
+    }
+    if (requiresAuthentication.present) {
+      map['requires_authentication'] = Variable<int>(
+        requiresAuthentication.value,
+      );
+    }
+    if (stored.present) {
+      map['stored'] = Variable<int>(stored.value);
+    }
+    if (isDraftMedia.present) {
+      map['is_draft_media'] = Variable<int>(isDraftMedia.value);
+    }
+    if (preProgressingProcess.present) {
+      map['pre_progressing_process'] = Variable<int>(
+        preProgressingProcess.value,
+      );
+    }
+    if (reuploadRequestedBy.present) {
+      map['reupload_requested_by'] = Variable<String>(
+        reuploadRequestedBy.value,
+      );
+    }
+    if (displayLimitInMilliseconds.present) {
+      map['display_limit_in_milliseconds'] = Variable<int>(
+        displayLimitInMilliseconds.value,
+      );
+    }
+    if (removeAudio.present) {
+      map['remove_audio'] = Variable<int>(removeAudio.value);
+    }
+    if (downloadToken.present) {
+      map['download_token'] = Variable<i2.Uint8List>(downloadToken.value);
+    }
+    if (encryptionKey.present) {
+      map['encryption_key'] = Variable<i2.Uint8List>(encryptionKey.value);
+    }
+    if (encryptionMac.present) {
+      map['encryption_mac'] = Variable<i2.Uint8List>(encryptionMac.value);
+    }
+    if (encryptionNonce.present) {
+      map['encryption_nonce'] = Variable<i2.Uint8List>(encryptionNonce.value);
+    }
+    if (storedFileHash.present) {
+      map['stored_file_hash'] = Variable<i2.Uint8List>(storedFileHash.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MediaFilesCompanion(')
+          ..write('mediaId: $mediaId, ')
+          ..write('type: $type, ')
+          ..write('uploadState: $uploadState, ')
+          ..write('downloadState: $downloadState, ')
+          ..write('requiresAuthentication: $requiresAuthentication, ')
+          ..write('stored: $stored, ')
+          ..write('isDraftMedia: $isDraftMedia, ')
+          ..write('preProgressingProcess: $preProgressingProcess, ')
+          ..write('reuploadRequestedBy: $reuploadRequestedBy, ')
+          ..write('displayLimitInMilliseconds: $displayLimitInMilliseconds, ')
+          ..write('removeAudio: $removeAudio, ')
+          ..write('downloadToken: $downloadToken, ')
+          ..write('encryptionKey: $encryptionKey, ')
+          ..write('encryptionMac: $encryptionMac, ')
+          ..write('encryptionNonce: $encryptionNonce, ')
+          ..write('storedFileHash: $storedFileHash, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class Messages extends Table with TableInfo<Messages, MessagesData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  Messages(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> groupId = GeneratedColumn<String>(
+    'group_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES "groups"(group_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<String> messageId = GeneratedColumn<String>(
+    'message_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> senderId = GeneratedColumn<int>(
+    'sender_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL REFERENCES contacts(user_id)',
+  );
+  late final GeneratedColumn<String> type = GeneratedColumn<String>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> content = GeneratedColumn<String>(
+    'content',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<String> mediaId = GeneratedColumn<String>(
+    'media_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NULL REFERENCES media_files(media_id)ON DELETE SET NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> additionalMessageData =
+      GeneratedColumn<i2.Uint8List>(
+        'additional_message_data',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> mediaStored = GeneratedColumn<int>(
+    'media_stored',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (media_stored IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> mediaReopened = GeneratedColumn<int>(
+    'media_reopened',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (media_reopened IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<i2.Uint8List> downloadToken =
+      GeneratedColumn<i2.Uint8List>(
+        'download_token',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<String> quotesMessageId = GeneratedColumn<String>(
+    'quotes_message_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> isDeletedFromSender = GeneratedColumn<int>(
+    'is_deleted_from_sender',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT 0 CHECK (is_deleted_from_sender IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> openedAt = GeneratedColumn<int>(
+    'opened_at',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> openedByAll = GeneratedColumn<int>(
+    'opened_by_all',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  late final GeneratedColumn<int> modifiedAt = GeneratedColumn<int>(
+    'modified_at',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> ackByUser = GeneratedColumn<int>(
+    'ack_by_user',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> ackByServer = GeneratedColumn<int>(
+    'ack_by_server',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    groupId,
+    messageId,
+    senderId,
+    type,
+    content,
+    mediaId,
+    additionalMessageData,
+    mediaStored,
+    mediaReopened,
+    downloadToken,
+    quotesMessageId,
+    isDeletedFromSender,
+    openedAt,
+    openedByAll,
+    createdAt,
+    modifiedAt,
+    ackByUser,
+    ackByServer,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'messages';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {messageId};
+  @override
+  MessagesData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return MessagesData(
+      groupId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}group_id'],
+      )!,
+      messageId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}message_id'],
+      )!,
+      senderId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}sender_id'],
+      ),
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}type'],
+      )!,
+      content: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}content'],
+      ),
+      mediaId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}media_id'],
+      ),
+      additionalMessageData: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}additional_message_data'],
+      ),
+      mediaStored: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}media_stored'],
+      )!,
+      mediaReopened: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}media_reopened'],
+      )!,
+      downloadToken: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}download_token'],
+      ),
+      quotesMessageId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}quotes_message_id'],
+      ),
+      isDeletedFromSender: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}is_deleted_from_sender'],
+      )!,
+      openedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}opened_at'],
+      ),
+      openedByAll: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}opened_by_all'],
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+      modifiedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}modified_at'],
+      ),
+      ackByUser: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}ack_by_user'],
+      ),
+      ackByServer: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}ack_by_server'],
+      ),
+    );
+  }
+
+  @override
+  Messages createAlias(String alias) {
+    return Messages(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(message_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class MessagesData extends DataClass implements Insertable<MessagesData> {
+  final String groupId;
+  final String messageId;
+  final int? senderId;
+  final String type;
+  final String? content;
+  final String? mediaId;
+  final i2.Uint8List? additionalMessageData;
+  final int mediaStored;
+  final int mediaReopened;
+  final i2.Uint8List? downloadToken;
+  final String? quotesMessageId;
+  final int isDeletedFromSender;
+  final int? openedAt;
+  final int? openedByAll;
+  final int createdAt;
+  final int? modifiedAt;
+  final int? ackByUser;
+  final int? ackByServer;
+  const MessagesData({
+    required this.groupId,
+    required this.messageId,
+    this.senderId,
+    required this.type,
+    this.content,
+    this.mediaId,
+    this.additionalMessageData,
+    required this.mediaStored,
+    required this.mediaReopened,
+    this.downloadToken,
+    this.quotesMessageId,
+    required this.isDeletedFromSender,
+    this.openedAt,
+    this.openedByAll,
+    required this.createdAt,
+    this.modifiedAt,
+    this.ackByUser,
+    this.ackByServer,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['group_id'] = Variable<String>(groupId);
+    map['message_id'] = Variable<String>(messageId);
+    if (!nullToAbsent || senderId != null) {
+      map['sender_id'] = Variable<int>(senderId);
+    }
+    map['type'] = Variable<String>(type);
+    if (!nullToAbsent || content != null) {
+      map['content'] = Variable<String>(content);
+    }
+    if (!nullToAbsent || mediaId != null) {
+      map['media_id'] = Variable<String>(mediaId);
+    }
+    if (!nullToAbsent || additionalMessageData != null) {
+      map['additional_message_data'] = Variable<i2.Uint8List>(
+        additionalMessageData,
+      );
+    }
+    map['media_stored'] = Variable<int>(mediaStored);
+    map['media_reopened'] = Variable<int>(mediaReopened);
+    if (!nullToAbsent || downloadToken != null) {
+      map['download_token'] = Variable<i2.Uint8List>(downloadToken);
+    }
+    if (!nullToAbsent || quotesMessageId != null) {
+      map['quotes_message_id'] = Variable<String>(quotesMessageId);
+    }
+    map['is_deleted_from_sender'] = Variable<int>(isDeletedFromSender);
+    if (!nullToAbsent || openedAt != null) {
+      map['opened_at'] = Variable<int>(openedAt);
+    }
+    if (!nullToAbsent || openedByAll != null) {
+      map['opened_by_all'] = Variable<int>(openedByAll);
+    }
+    map['created_at'] = Variable<int>(createdAt);
+    if (!nullToAbsent || modifiedAt != null) {
+      map['modified_at'] = Variable<int>(modifiedAt);
+    }
+    if (!nullToAbsent || ackByUser != null) {
+      map['ack_by_user'] = Variable<int>(ackByUser);
+    }
+    if (!nullToAbsent || ackByServer != null) {
+      map['ack_by_server'] = Variable<int>(ackByServer);
+    }
+    return map;
+  }
+
+  MessagesCompanion toCompanion(bool nullToAbsent) {
+    return MessagesCompanion(
+      groupId: Value(groupId),
+      messageId: Value(messageId),
+      senderId: senderId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(senderId),
+      type: Value(type),
+      content: content == null && nullToAbsent
+          ? const Value.absent()
+          : Value(content),
+      mediaId: mediaId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(mediaId),
+      additionalMessageData: additionalMessageData == null && nullToAbsent
+          ? const Value.absent()
+          : Value(additionalMessageData),
+      mediaStored: Value(mediaStored),
+      mediaReopened: Value(mediaReopened),
+      downloadToken: downloadToken == null && nullToAbsent
+          ? const Value.absent()
+          : Value(downloadToken),
+      quotesMessageId: quotesMessageId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(quotesMessageId),
+      isDeletedFromSender: Value(isDeletedFromSender),
+      openedAt: openedAt == null && nullToAbsent
+          ? const Value.absent()
+          : Value(openedAt),
+      openedByAll: openedByAll == null && nullToAbsent
+          ? const Value.absent()
+          : Value(openedByAll),
+      createdAt: Value(createdAt),
+      modifiedAt: modifiedAt == null && nullToAbsent
+          ? const Value.absent()
+          : Value(modifiedAt),
+      ackByUser: ackByUser == null && nullToAbsent
+          ? const Value.absent()
+          : Value(ackByUser),
+      ackByServer: ackByServer == null && nullToAbsent
+          ? const Value.absent()
+          : Value(ackByServer),
+    );
+  }
+
+  factory MessagesData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return MessagesData(
+      groupId: serializer.fromJson<String>(json['groupId']),
+      messageId: serializer.fromJson<String>(json['messageId']),
+      senderId: serializer.fromJson<int?>(json['senderId']),
+      type: serializer.fromJson<String>(json['type']),
+      content: serializer.fromJson<String?>(json['content']),
+      mediaId: serializer.fromJson<String?>(json['mediaId']),
+      additionalMessageData: serializer.fromJson<i2.Uint8List?>(
+        json['additionalMessageData'],
+      ),
+      mediaStored: serializer.fromJson<int>(json['mediaStored']),
+      mediaReopened: serializer.fromJson<int>(json['mediaReopened']),
+      downloadToken: serializer.fromJson<i2.Uint8List?>(json['downloadToken']),
+      quotesMessageId: serializer.fromJson<String?>(json['quotesMessageId']),
+      isDeletedFromSender: serializer.fromJson<int>(
+        json['isDeletedFromSender'],
+      ),
+      openedAt: serializer.fromJson<int?>(json['openedAt']),
+      openedByAll: serializer.fromJson<int?>(json['openedByAll']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+      modifiedAt: serializer.fromJson<int?>(json['modifiedAt']),
+      ackByUser: serializer.fromJson<int?>(json['ackByUser']),
+      ackByServer: serializer.fromJson<int?>(json['ackByServer']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'groupId': serializer.toJson<String>(groupId),
+      'messageId': serializer.toJson<String>(messageId),
+      'senderId': serializer.toJson<int?>(senderId),
+      'type': serializer.toJson<String>(type),
+      'content': serializer.toJson<String?>(content),
+      'mediaId': serializer.toJson<String?>(mediaId),
+      'additionalMessageData': serializer.toJson<i2.Uint8List?>(
+        additionalMessageData,
+      ),
+      'mediaStored': serializer.toJson<int>(mediaStored),
+      'mediaReopened': serializer.toJson<int>(mediaReopened),
+      'downloadToken': serializer.toJson<i2.Uint8List?>(downloadToken),
+      'quotesMessageId': serializer.toJson<String?>(quotesMessageId),
+      'isDeletedFromSender': serializer.toJson<int>(isDeletedFromSender),
+      'openedAt': serializer.toJson<int?>(openedAt),
+      'openedByAll': serializer.toJson<int?>(openedByAll),
+      'createdAt': serializer.toJson<int>(createdAt),
+      'modifiedAt': serializer.toJson<int?>(modifiedAt),
+      'ackByUser': serializer.toJson<int?>(ackByUser),
+      'ackByServer': serializer.toJson<int?>(ackByServer),
+    };
+  }
+
+  MessagesData copyWith({
+    String? groupId,
+    String? messageId,
+    Value<int?> senderId = const Value.absent(),
+    String? type,
+    Value<String?> content = const Value.absent(),
+    Value<String?> mediaId = const Value.absent(),
+    Value<i2.Uint8List?> additionalMessageData = const Value.absent(),
+    int? mediaStored,
+    int? mediaReopened,
+    Value<i2.Uint8List?> downloadToken = const Value.absent(),
+    Value<String?> quotesMessageId = const Value.absent(),
+    int? isDeletedFromSender,
+    Value<int?> openedAt = const Value.absent(),
+    Value<int?> openedByAll = const Value.absent(),
+    int? createdAt,
+    Value<int?> modifiedAt = const Value.absent(),
+    Value<int?> ackByUser = const Value.absent(),
+    Value<int?> ackByServer = const Value.absent(),
+  }) => MessagesData(
+    groupId: groupId ?? this.groupId,
+    messageId: messageId ?? this.messageId,
+    senderId: senderId.present ? senderId.value : this.senderId,
+    type: type ?? this.type,
+    content: content.present ? content.value : this.content,
+    mediaId: mediaId.present ? mediaId.value : this.mediaId,
+    additionalMessageData: additionalMessageData.present
+        ? additionalMessageData.value
+        : this.additionalMessageData,
+    mediaStored: mediaStored ?? this.mediaStored,
+    mediaReopened: mediaReopened ?? this.mediaReopened,
+    downloadToken: downloadToken.present
+        ? downloadToken.value
+        : this.downloadToken,
+    quotesMessageId: quotesMessageId.present
+        ? quotesMessageId.value
+        : this.quotesMessageId,
+    isDeletedFromSender: isDeletedFromSender ?? this.isDeletedFromSender,
+    openedAt: openedAt.present ? openedAt.value : this.openedAt,
+    openedByAll: openedByAll.present ? openedByAll.value : this.openedByAll,
+    createdAt: createdAt ?? this.createdAt,
+    modifiedAt: modifiedAt.present ? modifiedAt.value : this.modifiedAt,
+    ackByUser: ackByUser.present ? ackByUser.value : this.ackByUser,
+    ackByServer: ackByServer.present ? ackByServer.value : this.ackByServer,
+  );
+  MessagesData copyWithCompanion(MessagesCompanion data) {
+    return MessagesData(
+      groupId: data.groupId.present ? data.groupId.value : this.groupId,
+      messageId: data.messageId.present ? data.messageId.value : this.messageId,
+      senderId: data.senderId.present ? data.senderId.value : this.senderId,
+      type: data.type.present ? data.type.value : this.type,
+      content: data.content.present ? data.content.value : this.content,
+      mediaId: data.mediaId.present ? data.mediaId.value : this.mediaId,
+      additionalMessageData: data.additionalMessageData.present
+          ? data.additionalMessageData.value
+          : this.additionalMessageData,
+      mediaStored: data.mediaStored.present
+          ? data.mediaStored.value
+          : this.mediaStored,
+      mediaReopened: data.mediaReopened.present
+          ? data.mediaReopened.value
+          : this.mediaReopened,
+      downloadToken: data.downloadToken.present
+          ? data.downloadToken.value
+          : this.downloadToken,
+      quotesMessageId: data.quotesMessageId.present
+          ? data.quotesMessageId.value
+          : this.quotesMessageId,
+      isDeletedFromSender: data.isDeletedFromSender.present
+          ? data.isDeletedFromSender.value
+          : this.isDeletedFromSender,
+      openedAt: data.openedAt.present ? data.openedAt.value : this.openedAt,
+      openedByAll: data.openedByAll.present
+          ? data.openedByAll.value
+          : this.openedByAll,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      modifiedAt: data.modifiedAt.present
+          ? data.modifiedAt.value
+          : this.modifiedAt,
+      ackByUser: data.ackByUser.present ? data.ackByUser.value : this.ackByUser,
+      ackByServer: data.ackByServer.present
+          ? data.ackByServer.value
+          : this.ackByServer,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MessagesData(')
+          ..write('groupId: $groupId, ')
+          ..write('messageId: $messageId, ')
+          ..write('senderId: $senderId, ')
+          ..write('type: $type, ')
+          ..write('content: $content, ')
+          ..write('mediaId: $mediaId, ')
+          ..write('additionalMessageData: $additionalMessageData, ')
+          ..write('mediaStored: $mediaStored, ')
+          ..write('mediaReopened: $mediaReopened, ')
+          ..write('downloadToken: $downloadToken, ')
+          ..write('quotesMessageId: $quotesMessageId, ')
+          ..write('isDeletedFromSender: $isDeletedFromSender, ')
+          ..write('openedAt: $openedAt, ')
+          ..write('openedByAll: $openedByAll, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('modifiedAt: $modifiedAt, ')
+          ..write('ackByUser: $ackByUser, ')
+          ..write('ackByServer: $ackByServer')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    groupId,
+    messageId,
+    senderId,
+    type,
+    content,
+    mediaId,
+    $driftBlobEquality.hash(additionalMessageData),
+    mediaStored,
+    mediaReopened,
+    $driftBlobEquality.hash(downloadToken),
+    quotesMessageId,
+    isDeletedFromSender,
+    openedAt,
+    openedByAll,
+    createdAt,
+    modifiedAt,
+    ackByUser,
+    ackByServer,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is MessagesData &&
+          other.groupId == this.groupId &&
+          other.messageId == this.messageId &&
+          other.senderId == this.senderId &&
+          other.type == this.type &&
+          other.content == this.content &&
+          other.mediaId == this.mediaId &&
+          $driftBlobEquality.equals(
+            other.additionalMessageData,
+            this.additionalMessageData,
+          ) &&
+          other.mediaStored == this.mediaStored &&
+          other.mediaReopened == this.mediaReopened &&
+          $driftBlobEquality.equals(other.downloadToken, this.downloadToken) &&
+          other.quotesMessageId == this.quotesMessageId &&
+          other.isDeletedFromSender == this.isDeletedFromSender &&
+          other.openedAt == this.openedAt &&
+          other.openedByAll == this.openedByAll &&
+          other.createdAt == this.createdAt &&
+          other.modifiedAt == this.modifiedAt &&
+          other.ackByUser == this.ackByUser &&
+          other.ackByServer == this.ackByServer);
+}
+
+class MessagesCompanion extends UpdateCompanion<MessagesData> {
+  final Value<String> groupId;
+  final Value<String> messageId;
+  final Value<int?> senderId;
+  final Value<String> type;
+  final Value<String?> content;
+  final Value<String?> mediaId;
+  final Value<i2.Uint8List?> additionalMessageData;
+  final Value<int> mediaStored;
+  final Value<int> mediaReopened;
+  final Value<i2.Uint8List?> downloadToken;
+  final Value<String?> quotesMessageId;
+  final Value<int> isDeletedFromSender;
+  final Value<int?> openedAt;
+  final Value<int?> openedByAll;
+  final Value<int> createdAt;
+  final Value<int?> modifiedAt;
+  final Value<int?> ackByUser;
+  final Value<int?> ackByServer;
+  final Value<int> rowid;
+  const MessagesCompanion({
+    this.groupId = const Value.absent(),
+    this.messageId = const Value.absent(),
+    this.senderId = const Value.absent(),
+    this.type = const Value.absent(),
+    this.content = const Value.absent(),
+    this.mediaId = const Value.absent(),
+    this.additionalMessageData = const Value.absent(),
+    this.mediaStored = const Value.absent(),
+    this.mediaReopened = const Value.absent(),
+    this.downloadToken = const Value.absent(),
+    this.quotesMessageId = const Value.absent(),
+    this.isDeletedFromSender = const Value.absent(),
+    this.openedAt = const Value.absent(),
+    this.openedByAll = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.modifiedAt = const Value.absent(),
+    this.ackByUser = const Value.absent(),
+    this.ackByServer = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  MessagesCompanion.insert({
+    required String groupId,
+    required String messageId,
+    this.senderId = const Value.absent(),
+    required String type,
+    this.content = const Value.absent(),
+    this.mediaId = const Value.absent(),
+    this.additionalMessageData = const Value.absent(),
+    this.mediaStored = const Value.absent(),
+    this.mediaReopened = const Value.absent(),
+    this.downloadToken = const Value.absent(),
+    this.quotesMessageId = const Value.absent(),
+    this.isDeletedFromSender = const Value.absent(),
+    this.openedAt = const Value.absent(),
+    this.openedByAll = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.modifiedAt = const Value.absent(),
+    this.ackByUser = const Value.absent(),
+    this.ackByServer = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : groupId = Value(groupId),
+       messageId = Value(messageId),
+       type = Value(type);
+  static Insertable<MessagesData> custom({
+    Expression<String>? groupId,
+    Expression<String>? messageId,
+    Expression<int>? senderId,
+    Expression<String>? type,
+    Expression<String>? content,
+    Expression<String>? mediaId,
+    Expression<i2.Uint8List>? additionalMessageData,
+    Expression<int>? mediaStored,
+    Expression<int>? mediaReopened,
+    Expression<i2.Uint8List>? downloadToken,
+    Expression<String>? quotesMessageId,
+    Expression<int>? isDeletedFromSender,
+    Expression<int>? openedAt,
+    Expression<int>? openedByAll,
+    Expression<int>? createdAt,
+    Expression<int>? modifiedAt,
+    Expression<int>? ackByUser,
+    Expression<int>? ackByServer,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (groupId != null) 'group_id': groupId,
+      if (messageId != null) 'message_id': messageId,
+      if (senderId != null) 'sender_id': senderId,
+      if (type != null) 'type': type,
+      if (content != null) 'content': content,
+      if (mediaId != null) 'media_id': mediaId,
+      if (additionalMessageData != null)
+        'additional_message_data': additionalMessageData,
+      if (mediaStored != null) 'media_stored': mediaStored,
+      if (mediaReopened != null) 'media_reopened': mediaReopened,
+      if (downloadToken != null) 'download_token': downloadToken,
+      if (quotesMessageId != null) 'quotes_message_id': quotesMessageId,
+      if (isDeletedFromSender != null)
+        'is_deleted_from_sender': isDeletedFromSender,
+      if (openedAt != null) 'opened_at': openedAt,
+      if (openedByAll != null) 'opened_by_all': openedByAll,
+      if (createdAt != null) 'created_at': createdAt,
+      if (modifiedAt != null) 'modified_at': modifiedAt,
+      if (ackByUser != null) 'ack_by_user': ackByUser,
+      if (ackByServer != null) 'ack_by_server': ackByServer,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  MessagesCompanion copyWith({
+    Value<String>? groupId,
+    Value<String>? messageId,
+    Value<int?>? senderId,
+    Value<String>? type,
+    Value<String?>? content,
+    Value<String?>? mediaId,
+    Value<i2.Uint8List?>? additionalMessageData,
+    Value<int>? mediaStored,
+    Value<int>? mediaReopened,
+    Value<i2.Uint8List?>? downloadToken,
+    Value<String?>? quotesMessageId,
+    Value<int>? isDeletedFromSender,
+    Value<int?>? openedAt,
+    Value<int?>? openedByAll,
+    Value<int>? createdAt,
+    Value<int?>? modifiedAt,
+    Value<int?>? ackByUser,
+    Value<int?>? ackByServer,
+    Value<int>? rowid,
+  }) {
+    return MessagesCompanion(
+      groupId: groupId ?? this.groupId,
+      messageId: messageId ?? this.messageId,
+      senderId: senderId ?? this.senderId,
+      type: type ?? this.type,
+      content: content ?? this.content,
+      mediaId: mediaId ?? this.mediaId,
+      additionalMessageData:
+          additionalMessageData ?? this.additionalMessageData,
+      mediaStored: mediaStored ?? this.mediaStored,
+      mediaReopened: mediaReopened ?? this.mediaReopened,
+      downloadToken: downloadToken ?? this.downloadToken,
+      quotesMessageId: quotesMessageId ?? this.quotesMessageId,
+      isDeletedFromSender: isDeletedFromSender ?? this.isDeletedFromSender,
+      openedAt: openedAt ?? this.openedAt,
+      openedByAll: openedByAll ?? this.openedByAll,
+      createdAt: createdAt ?? this.createdAt,
+      modifiedAt: modifiedAt ?? this.modifiedAt,
+      ackByUser: ackByUser ?? this.ackByUser,
+      ackByServer: ackByServer ?? this.ackByServer,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (groupId.present) {
+      map['group_id'] = Variable<String>(groupId.value);
+    }
+    if (messageId.present) {
+      map['message_id'] = Variable<String>(messageId.value);
+    }
+    if (senderId.present) {
+      map['sender_id'] = Variable<int>(senderId.value);
+    }
+    if (type.present) {
+      map['type'] = Variable<String>(type.value);
+    }
+    if (content.present) {
+      map['content'] = Variable<String>(content.value);
+    }
+    if (mediaId.present) {
+      map['media_id'] = Variable<String>(mediaId.value);
+    }
+    if (additionalMessageData.present) {
+      map['additional_message_data'] = Variable<i2.Uint8List>(
+        additionalMessageData.value,
+      );
+    }
+    if (mediaStored.present) {
+      map['media_stored'] = Variable<int>(mediaStored.value);
+    }
+    if (mediaReopened.present) {
+      map['media_reopened'] = Variable<int>(mediaReopened.value);
+    }
+    if (downloadToken.present) {
+      map['download_token'] = Variable<i2.Uint8List>(downloadToken.value);
+    }
+    if (quotesMessageId.present) {
+      map['quotes_message_id'] = Variable<String>(quotesMessageId.value);
+    }
+    if (isDeletedFromSender.present) {
+      map['is_deleted_from_sender'] = Variable<int>(isDeletedFromSender.value);
+    }
+    if (openedAt.present) {
+      map['opened_at'] = Variable<int>(openedAt.value);
+    }
+    if (openedByAll.present) {
+      map['opened_by_all'] = Variable<int>(openedByAll.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (modifiedAt.present) {
+      map['modified_at'] = Variable<int>(modifiedAt.value);
+    }
+    if (ackByUser.present) {
+      map['ack_by_user'] = Variable<int>(ackByUser.value);
+    }
+    if (ackByServer.present) {
+      map['ack_by_server'] = Variable<int>(ackByServer.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MessagesCompanion(')
+          ..write('groupId: $groupId, ')
+          ..write('messageId: $messageId, ')
+          ..write('senderId: $senderId, ')
+          ..write('type: $type, ')
+          ..write('content: $content, ')
+          ..write('mediaId: $mediaId, ')
+          ..write('additionalMessageData: $additionalMessageData, ')
+          ..write('mediaStored: $mediaStored, ')
+          ..write('mediaReopened: $mediaReopened, ')
+          ..write('downloadToken: $downloadToken, ')
+          ..write('quotesMessageId: $quotesMessageId, ')
+          ..write('isDeletedFromSender: $isDeletedFromSender, ')
+          ..write('openedAt: $openedAt, ')
+          ..write('openedByAll: $openedByAll, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('modifiedAt: $modifiedAt, ')
+          ..write('ackByUser: $ackByUser, ')
+          ..write('ackByServer: $ackByServer, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class MessageHistories extends Table
+    with TableInfo<MessageHistories, MessageHistoriesData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  MessageHistories(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> id = GeneratedColumn<int>(
+    'id',
+    aliasedName,
+    false,
+    hasAutoIncrement: true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL PRIMARY KEY AUTOINCREMENT',
+  );
+  late final GeneratedColumn<String> messageId = GeneratedColumn<String>(
+    'message_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES messages(message_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<String> content = GeneratedColumn<String>(
+    'content',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    id,
+    messageId,
+    contactId,
+    content,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'message_histories';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {id};
+  @override
+  MessageHistoriesData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return MessageHistoriesData(
+      id: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}id'],
+      )!,
+      messageId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}message_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      ),
+      content: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}content'],
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  MessageHistories createAlias(String alias) {
+    return MessageHistories(attachedDatabase, alias);
+  }
+
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class MessageHistoriesData extends DataClass
+    implements Insertable<MessageHistoriesData> {
+  final int id;
+  final String messageId;
+  final int? contactId;
+  final String? content;
+  final int createdAt;
+  const MessageHistoriesData({
+    required this.id,
+    required this.messageId,
+    this.contactId,
+    this.content,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['id'] = Variable<int>(id);
+    map['message_id'] = Variable<String>(messageId);
+    if (!nullToAbsent || contactId != null) {
+      map['contact_id'] = Variable<int>(contactId);
+    }
+    if (!nullToAbsent || content != null) {
+      map['content'] = Variable<String>(content);
+    }
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  MessageHistoriesCompanion toCompanion(bool nullToAbsent) {
+    return MessageHistoriesCompanion(
+      id: Value(id),
+      messageId: Value(messageId),
+      contactId: contactId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(contactId),
+      content: content == null && nullToAbsent
+          ? const Value.absent()
+          : Value(content),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory MessageHistoriesData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return MessageHistoriesData(
+      id: serializer.fromJson<int>(json['id']),
+      messageId: serializer.fromJson<String>(json['messageId']),
+      contactId: serializer.fromJson<int?>(json['contactId']),
+      content: serializer.fromJson<String?>(json['content']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<int>(id),
+      'messageId': serializer.toJson<String>(messageId),
+      'contactId': serializer.toJson<int?>(contactId),
+      'content': serializer.toJson<String?>(content),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  MessageHistoriesData copyWith({
+    int? id,
+    String? messageId,
+    Value<int?> contactId = const Value.absent(),
+    Value<String?> content = const Value.absent(),
+    int? createdAt,
+  }) => MessageHistoriesData(
+    id: id ?? this.id,
+    messageId: messageId ?? this.messageId,
+    contactId: contactId.present ? contactId.value : this.contactId,
+    content: content.present ? content.value : this.content,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  MessageHistoriesData copyWithCompanion(MessageHistoriesCompanion data) {
+    return MessageHistoriesData(
+      id: data.id.present ? data.id.value : this.id,
+      messageId: data.messageId.present ? data.messageId.value : this.messageId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      content: data.content.present ? data.content.value : this.content,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MessageHistoriesData(')
+          ..write('id: $id, ')
+          ..write('messageId: $messageId, ')
+          ..write('contactId: $contactId, ')
+          ..write('content: $content, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(id, messageId, contactId, content, createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is MessageHistoriesData &&
+          other.id == this.id &&
+          other.messageId == this.messageId &&
+          other.contactId == this.contactId &&
+          other.content == this.content &&
+          other.createdAt == this.createdAt);
+}
+
+class MessageHistoriesCompanion extends UpdateCompanion<MessageHistoriesData> {
+  final Value<int> id;
+  final Value<String> messageId;
+  final Value<int?> contactId;
+  final Value<String?> content;
+  final Value<int> createdAt;
+  const MessageHistoriesCompanion({
+    this.id = const Value.absent(),
+    this.messageId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.content = const Value.absent(),
+    this.createdAt = const Value.absent(),
+  });
+  MessageHistoriesCompanion.insert({
+    this.id = const Value.absent(),
+    required String messageId,
+    this.contactId = const Value.absent(),
+    this.content = const Value.absent(),
+    this.createdAt = const Value.absent(),
+  }) : messageId = Value(messageId);
+  static Insertable<MessageHistoriesData> custom({
+    Expression<int>? id,
+    Expression<String>? messageId,
+    Expression<int>? contactId,
+    Expression<String>? content,
+    Expression<int>? createdAt,
+  }) {
+    return RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (messageId != null) 'message_id': messageId,
+      if (contactId != null) 'contact_id': contactId,
+      if (content != null) 'content': content,
+      if (createdAt != null) 'created_at': createdAt,
+    });
+  }
+
+  MessageHistoriesCompanion copyWith({
+    Value<int>? id,
+    Value<String>? messageId,
+    Value<int?>? contactId,
+    Value<String?>? content,
+    Value<int>? createdAt,
+  }) {
+    return MessageHistoriesCompanion(
+      id: id ?? this.id,
+      messageId: messageId ?? this.messageId,
+      contactId: contactId ?? this.contactId,
+      content: content ?? this.content,
+      createdAt: createdAt ?? this.createdAt,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<int>(id.value);
+    }
+    if (messageId.present) {
+      map['message_id'] = Variable<String>(messageId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (content.present) {
+      map['content'] = Variable<String>(content.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MessageHistoriesCompanion(')
+          ..write('id: $id, ')
+          ..write('messageId: $messageId, ')
+          ..write('contactId: $contactId, ')
+          ..write('content: $content, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class Reactions extends Table with TableInfo<Reactions, ReactionsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  Reactions(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> messageId = GeneratedColumn<String>(
+    'message_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES messages(message_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<String> emoji = GeneratedColumn<String>(
+    'emoji',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> senderId = GeneratedColumn<int>(
+    'sender_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [messageId, emoji, senderId, createdAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'reactions';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {messageId, senderId, emoji};
+  @override
+  ReactionsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return ReactionsData(
+      messageId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}message_id'],
+      )!,
+      emoji: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}emoji'],
+      )!,
+      senderId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}sender_id'],
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  Reactions createAlias(String alias) {
+    return Reactions(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const [
+    'PRIMARY KEY(message_id, sender_id, emoji)',
+  ];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class ReactionsData extends DataClass implements Insertable<ReactionsData> {
+  final String messageId;
+  final String emoji;
+  final int? senderId;
+  final int createdAt;
+  const ReactionsData({
+    required this.messageId,
+    required this.emoji,
+    this.senderId,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['message_id'] = Variable<String>(messageId);
+    map['emoji'] = Variable<String>(emoji);
+    if (!nullToAbsent || senderId != null) {
+      map['sender_id'] = Variable<int>(senderId);
+    }
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  ReactionsCompanion toCompanion(bool nullToAbsent) {
+    return ReactionsCompanion(
+      messageId: Value(messageId),
+      emoji: Value(emoji),
+      senderId: senderId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(senderId),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory ReactionsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return ReactionsData(
+      messageId: serializer.fromJson<String>(json['messageId']),
+      emoji: serializer.fromJson<String>(json['emoji']),
+      senderId: serializer.fromJson<int?>(json['senderId']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'messageId': serializer.toJson<String>(messageId),
+      'emoji': serializer.toJson<String>(emoji),
+      'senderId': serializer.toJson<int?>(senderId),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  ReactionsData copyWith({
+    String? messageId,
+    String? emoji,
+    Value<int?> senderId = const Value.absent(),
+    int? createdAt,
+  }) => ReactionsData(
+    messageId: messageId ?? this.messageId,
+    emoji: emoji ?? this.emoji,
+    senderId: senderId.present ? senderId.value : this.senderId,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  ReactionsData copyWithCompanion(ReactionsCompanion data) {
+    return ReactionsData(
+      messageId: data.messageId.present ? data.messageId.value : this.messageId,
+      emoji: data.emoji.present ? data.emoji.value : this.emoji,
+      senderId: data.senderId.present ? data.senderId.value : this.senderId,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ReactionsData(')
+          ..write('messageId: $messageId, ')
+          ..write('emoji: $emoji, ')
+          ..write('senderId: $senderId, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(messageId, emoji, senderId, createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is ReactionsData &&
+          other.messageId == this.messageId &&
+          other.emoji == this.emoji &&
+          other.senderId == this.senderId &&
+          other.createdAt == this.createdAt);
+}
+
+class ReactionsCompanion extends UpdateCompanion<ReactionsData> {
+  final Value<String> messageId;
+  final Value<String> emoji;
+  final Value<int?> senderId;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const ReactionsCompanion({
+    this.messageId = const Value.absent(),
+    this.emoji = const Value.absent(),
+    this.senderId = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  ReactionsCompanion.insert({
+    required String messageId,
+    required String emoji,
+    this.senderId = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : messageId = Value(messageId),
+       emoji = Value(emoji);
+  static Insertable<ReactionsData> custom({
+    Expression<String>? messageId,
+    Expression<String>? emoji,
+    Expression<int>? senderId,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (messageId != null) 'message_id': messageId,
+      if (emoji != null) 'emoji': emoji,
+      if (senderId != null) 'sender_id': senderId,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  ReactionsCompanion copyWith({
+    Value<String>? messageId,
+    Value<String>? emoji,
+    Value<int?>? senderId,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return ReactionsCompanion(
+      messageId: messageId ?? this.messageId,
+      emoji: emoji ?? this.emoji,
+      senderId: senderId ?? this.senderId,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (messageId.present) {
+      map['message_id'] = Variable<String>(messageId.value);
+    }
+    if (emoji.present) {
+      map['emoji'] = Variable<String>(emoji.value);
+    }
+    if (senderId.present) {
+      map['sender_id'] = Variable<int>(senderId.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ReactionsCompanion(')
+          ..write('messageId: $messageId, ')
+          ..write('emoji: $emoji, ')
+          ..write('senderId: $senderId, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class GroupMembers extends Table
+    with TableInfo<GroupMembers, GroupMembersData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  GroupMembers(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> groupId = GeneratedColumn<String>(
+    'group_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES "groups"(group_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL REFERENCES contacts(user_id)',
+  );
+  late final GeneratedColumn<String> memberState = GeneratedColumn<String>(
+    'member_state',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> groupPublicKey =
+      GeneratedColumn<i2.Uint8List>(
+        'group_public_key',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> lastChatOpened = GeneratedColumn<int>(
+    'last_chat_opened',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> lastTypeIndicator = GeneratedColumn<int>(
+    'last_type_indicator',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> lastMessage = GeneratedColumn<int>(
+    'last_message',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    groupId,
+    contactId,
+    memberState,
+    groupPublicKey,
+    lastChatOpened,
+    lastTypeIndicator,
+    lastMessage,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'group_members';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {groupId, contactId};
+  @override
+  GroupMembersData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return GroupMembersData(
+      groupId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}group_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      )!,
+      memberState: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}member_state'],
+      ),
+      groupPublicKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}group_public_key'],
+      ),
+      lastChatOpened: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_chat_opened'],
+      ),
+      lastTypeIndicator: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_type_indicator'],
+      ),
+      lastMessage: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_message'],
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  GroupMembers createAlias(String alias) {
+    return GroupMembers(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const [
+    'PRIMARY KEY(group_id, contact_id)',
+  ];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class GroupMembersData extends DataClass
+    implements Insertable<GroupMembersData> {
+  final String groupId;
+  final int contactId;
+  final String? memberState;
+  final i2.Uint8List? groupPublicKey;
+  final int? lastChatOpened;
+  final int? lastTypeIndicator;
+  final int? lastMessage;
+  final int createdAt;
+  const GroupMembersData({
+    required this.groupId,
+    required this.contactId,
+    this.memberState,
+    this.groupPublicKey,
+    this.lastChatOpened,
+    this.lastTypeIndicator,
+    this.lastMessage,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['group_id'] = Variable<String>(groupId);
+    map['contact_id'] = Variable<int>(contactId);
+    if (!nullToAbsent || memberState != null) {
+      map['member_state'] = Variable<String>(memberState);
+    }
+    if (!nullToAbsent || groupPublicKey != null) {
+      map['group_public_key'] = Variable<i2.Uint8List>(groupPublicKey);
+    }
+    if (!nullToAbsent || lastChatOpened != null) {
+      map['last_chat_opened'] = Variable<int>(lastChatOpened);
+    }
+    if (!nullToAbsent || lastTypeIndicator != null) {
+      map['last_type_indicator'] = Variable<int>(lastTypeIndicator);
+    }
+    if (!nullToAbsent || lastMessage != null) {
+      map['last_message'] = Variable<int>(lastMessage);
+    }
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  GroupMembersCompanion toCompanion(bool nullToAbsent) {
+    return GroupMembersCompanion(
+      groupId: Value(groupId),
+      contactId: Value(contactId),
+      memberState: memberState == null && nullToAbsent
+          ? const Value.absent()
+          : Value(memberState),
+      groupPublicKey: groupPublicKey == null && nullToAbsent
+          ? const Value.absent()
+          : Value(groupPublicKey),
+      lastChatOpened: lastChatOpened == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastChatOpened),
+      lastTypeIndicator: lastTypeIndicator == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastTypeIndicator),
+      lastMessage: lastMessage == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastMessage),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory GroupMembersData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return GroupMembersData(
+      groupId: serializer.fromJson<String>(json['groupId']),
+      contactId: serializer.fromJson<int>(json['contactId']),
+      memberState: serializer.fromJson<String?>(json['memberState']),
+      groupPublicKey: serializer.fromJson<i2.Uint8List?>(
+        json['groupPublicKey'],
+      ),
+      lastChatOpened: serializer.fromJson<int?>(json['lastChatOpened']),
+      lastTypeIndicator: serializer.fromJson<int?>(json['lastTypeIndicator']),
+      lastMessage: serializer.fromJson<int?>(json['lastMessage']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'groupId': serializer.toJson<String>(groupId),
+      'contactId': serializer.toJson<int>(contactId),
+      'memberState': serializer.toJson<String?>(memberState),
+      'groupPublicKey': serializer.toJson<i2.Uint8List?>(groupPublicKey),
+      'lastChatOpened': serializer.toJson<int?>(lastChatOpened),
+      'lastTypeIndicator': serializer.toJson<int?>(lastTypeIndicator),
+      'lastMessage': serializer.toJson<int?>(lastMessage),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  GroupMembersData copyWith({
+    String? groupId,
+    int? contactId,
+    Value<String?> memberState = const Value.absent(),
+    Value<i2.Uint8List?> groupPublicKey = const Value.absent(),
+    Value<int?> lastChatOpened = const Value.absent(),
+    Value<int?> lastTypeIndicator = const Value.absent(),
+    Value<int?> lastMessage = const Value.absent(),
+    int? createdAt,
+  }) => GroupMembersData(
+    groupId: groupId ?? this.groupId,
+    contactId: contactId ?? this.contactId,
+    memberState: memberState.present ? memberState.value : this.memberState,
+    groupPublicKey: groupPublicKey.present
+        ? groupPublicKey.value
+        : this.groupPublicKey,
+    lastChatOpened: lastChatOpened.present
+        ? lastChatOpened.value
+        : this.lastChatOpened,
+    lastTypeIndicator: lastTypeIndicator.present
+        ? lastTypeIndicator.value
+        : this.lastTypeIndicator,
+    lastMessage: lastMessage.present ? lastMessage.value : this.lastMessage,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  GroupMembersData copyWithCompanion(GroupMembersCompanion data) {
+    return GroupMembersData(
+      groupId: data.groupId.present ? data.groupId.value : this.groupId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      memberState: data.memberState.present
+          ? data.memberState.value
+          : this.memberState,
+      groupPublicKey: data.groupPublicKey.present
+          ? data.groupPublicKey.value
+          : this.groupPublicKey,
+      lastChatOpened: data.lastChatOpened.present
+          ? data.lastChatOpened.value
+          : this.lastChatOpened,
+      lastTypeIndicator: data.lastTypeIndicator.present
+          ? data.lastTypeIndicator.value
+          : this.lastTypeIndicator,
+      lastMessage: data.lastMessage.present
+          ? data.lastMessage.value
+          : this.lastMessage,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('GroupMembersData(')
+          ..write('groupId: $groupId, ')
+          ..write('contactId: $contactId, ')
+          ..write('memberState: $memberState, ')
+          ..write('groupPublicKey: $groupPublicKey, ')
+          ..write('lastChatOpened: $lastChatOpened, ')
+          ..write('lastTypeIndicator: $lastTypeIndicator, ')
+          ..write('lastMessage: $lastMessage, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    groupId,
+    contactId,
+    memberState,
+    $driftBlobEquality.hash(groupPublicKey),
+    lastChatOpened,
+    lastTypeIndicator,
+    lastMessage,
+    createdAt,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is GroupMembersData &&
+          other.groupId == this.groupId &&
+          other.contactId == this.contactId &&
+          other.memberState == this.memberState &&
+          $driftBlobEquality.equals(
+            other.groupPublicKey,
+            this.groupPublicKey,
+          ) &&
+          other.lastChatOpened == this.lastChatOpened &&
+          other.lastTypeIndicator == this.lastTypeIndicator &&
+          other.lastMessage == this.lastMessage &&
+          other.createdAt == this.createdAt);
+}
+
+class GroupMembersCompanion extends UpdateCompanion<GroupMembersData> {
+  final Value<String> groupId;
+  final Value<int> contactId;
+  final Value<String?> memberState;
+  final Value<i2.Uint8List?> groupPublicKey;
+  final Value<int?> lastChatOpened;
+  final Value<int?> lastTypeIndicator;
+  final Value<int?> lastMessage;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const GroupMembersCompanion({
+    this.groupId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.memberState = const Value.absent(),
+    this.groupPublicKey = const Value.absent(),
+    this.lastChatOpened = const Value.absent(),
+    this.lastTypeIndicator = const Value.absent(),
+    this.lastMessage = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  GroupMembersCompanion.insert({
+    required String groupId,
+    required int contactId,
+    this.memberState = const Value.absent(),
+    this.groupPublicKey = const Value.absent(),
+    this.lastChatOpened = const Value.absent(),
+    this.lastTypeIndicator = const Value.absent(),
+    this.lastMessage = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : groupId = Value(groupId),
+       contactId = Value(contactId);
+  static Insertable<GroupMembersData> custom({
+    Expression<String>? groupId,
+    Expression<int>? contactId,
+    Expression<String>? memberState,
+    Expression<i2.Uint8List>? groupPublicKey,
+    Expression<int>? lastChatOpened,
+    Expression<int>? lastTypeIndicator,
+    Expression<int>? lastMessage,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (groupId != null) 'group_id': groupId,
+      if (contactId != null) 'contact_id': contactId,
+      if (memberState != null) 'member_state': memberState,
+      if (groupPublicKey != null) 'group_public_key': groupPublicKey,
+      if (lastChatOpened != null) 'last_chat_opened': lastChatOpened,
+      if (lastTypeIndicator != null) 'last_type_indicator': lastTypeIndicator,
+      if (lastMessage != null) 'last_message': lastMessage,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  GroupMembersCompanion copyWith({
+    Value<String>? groupId,
+    Value<int>? contactId,
+    Value<String?>? memberState,
+    Value<i2.Uint8List?>? groupPublicKey,
+    Value<int?>? lastChatOpened,
+    Value<int?>? lastTypeIndicator,
+    Value<int?>? lastMessage,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return GroupMembersCompanion(
+      groupId: groupId ?? this.groupId,
+      contactId: contactId ?? this.contactId,
+      memberState: memberState ?? this.memberState,
+      groupPublicKey: groupPublicKey ?? this.groupPublicKey,
+      lastChatOpened: lastChatOpened ?? this.lastChatOpened,
+      lastTypeIndicator: lastTypeIndicator ?? this.lastTypeIndicator,
+      lastMessage: lastMessage ?? this.lastMessage,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (groupId.present) {
+      map['group_id'] = Variable<String>(groupId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (memberState.present) {
+      map['member_state'] = Variable<String>(memberState.value);
+    }
+    if (groupPublicKey.present) {
+      map['group_public_key'] = Variable<i2.Uint8List>(groupPublicKey.value);
+    }
+    if (lastChatOpened.present) {
+      map['last_chat_opened'] = Variable<int>(lastChatOpened.value);
+    }
+    if (lastTypeIndicator.present) {
+      map['last_type_indicator'] = Variable<int>(lastTypeIndicator.value);
+    }
+    if (lastMessage.present) {
+      map['last_message'] = Variable<int>(lastMessage.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('GroupMembersCompanion(')
+          ..write('groupId: $groupId, ')
+          ..write('contactId: $contactId, ')
+          ..write('memberState: $memberState, ')
+          ..write('groupPublicKey: $groupPublicKey, ')
+          ..write('lastChatOpened: $lastChatOpened, ')
+          ..write('lastTypeIndicator: $lastTypeIndicator, ')
+          ..write('lastMessage: $lastMessage, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class Receipts extends Table with TableInfo<Receipts, ReceiptsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  Receipts(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> receiptId = GeneratedColumn<String>(
+    'receipt_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<String> messageId = GeneratedColumn<String>(
+    'message_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL REFERENCES messages(message_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<i2.Uint8List> message =
+      GeneratedColumn<i2.Uint8List>(
+        'message',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> contactWillSendsReceipt =
+      GeneratedColumn<int>(
+        'contact_will_sends_receipt',
+        aliasedName,
+        false,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints:
+            'NOT NULL DEFAULT 1 CHECK (contact_will_sends_receipt IN (0, 1))',
+        defaultValue: const CustomExpression('1'),
+      );
+  late final GeneratedColumn<int>
+  willBeRetriedByMediaUpload = GeneratedColumn<int>(
+    'will_be_retried_by_media_upload',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT 0 CHECK (will_be_retried_by_media_upload IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> markForRetry = GeneratedColumn<int>(
+    'mark_for_retry',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> markForRetryAfterAccepted =
+      GeneratedColumn<int>(
+        'mark_for_retry_after_accepted',
+        aliasedName,
+        true,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> ackByServerAt = GeneratedColumn<int>(
+    'ack_by_server_at',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> retryCount = GeneratedColumn<int>(
+    'retry_count',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> lastRetry = GeneratedColumn<int>(
+    'last_retry',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    receiptId,
+    contactId,
+    messageId,
+    message,
+    contactWillSendsReceipt,
+    willBeRetriedByMediaUpload,
+    markForRetry,
+    markForRetryAfterAccepted,
+    ackByServerAt,
+    retryCount,
+    lastRetry,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'receipts';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {receiptId};
+  @override
+  ReceiptsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return ReceiptsData(
+      receiptId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}receipt_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      )!,
+      messageId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}message_id'],
+      ),
+      message: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}message'],
+      )!,
+      contactWillSendsReceipt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_will_sends_receipt'],
+      )!,
+      willBeRetriedByMediaUpload: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}will_be_retried_by_media_upload'],
+      )!,
+      markForRetry: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}mark_for_retry'],
+      ),
+      markForRetryAfterAccepted: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}mark_for_retry_after_accepted'],
+      ),
+      ackByServerAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}ack_by_server_at'],
+      ),
+      retryCount: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}retry_count'],
+      )!,
+      lastRetry: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_retry'],
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  Receipts createAlias(String alias) {
+    return Receipts(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(receipt_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class ReceiptsData extends DataClass implements Insertable<ReceiptsData> {
+  final String receiptId;
+  final int contactId;
+  final String? messageId;
+  final i2.Uint8List message;
+  final int contactWillSendsReceipt;
+  final int willBeRetriedByMediaUpload;
+  final int? markForRetry;
+  final int? markForRetryAfterAccepted;
+  final int? ackByServerAt;
+  final int retryCount;
+  final int? lastRetry;
+  final int createdAt;
+  const ReceiptsData({
+    required this.receiptId,
+    required this.contactId,
+    this.messageId,
+    required this.message,
+    required this.contactWillSendsReceipt,
+    required this.willBeRetriedByMediaUpload,
+    this.markForRetry,
+    this.markForRetryAfterAccepted,
+    this.ackByServerAt,
+    required this.retryCount,
+    this.lastRetry,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['receipt_id'] = Variable<String>(receiptId);
+    map['contact_id'] = Variable<int>(contactId);
+    if (!nullToAbsent || messageId != null) {
+      map['message_id'] = Variable<String>(messageId);
+    }
+    map['message'] = Variable<i2.Uint8List>(message);
+    map['contact_will_sends_receipt'] = Variable<int>(contactWillSendsReceipt);
+    map['will_be_retried_by_media_upload'] = Variable<int>(
+      willBeRetriedByMediaUpload,
+    );
+    if (!nullToAbsent || markForRetry != null) {
+      map['mark_for_retry'] = Variable<int>(markForRetry);
+    }
+    if (!nullToAbsent || markForRetryAfterAccepted != null) {
+      map['mark_for_retry_after_accepted'] = Variable<int>(
+        markForRetryAfterAccepted,
+      );
+    }
+    if (!nullToAbsent || ackByServerAt != null) {
+      map['ack_by_server_at'] = Variable<int>(ackByServerAt);
+    }
+    map['retry_count'] = Variable<int>(retryCount);
+    if (!nullToAbsent || lastRetry != null) {
+      map['last_retry'] = Variable<int>(lastRetry);
+    }
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  ReceiptsCompanion toCompanion(bool nullToAbsent) {
+    return ReceiptsCompanion(
+      receiptId: Value(receiptId),
+      contactId: Value(contactId),
+      messageId: messageId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(messageId),
+      message: Value(message),
+      contactWillSendsReceipt: Value(contactWillSendsReceipt),
+      willBeRetriedByMediaUpload: Value(willBeRetriedByMediaUpload),
+      markForRetry: markForRetry == null && nullToAbsent
+          ? const Value.absent()
+          : Value(markForRetry),
+      markForRetryAfterAccepted:
+          markForRetryAfterAccepted == null && nullToAbsent
+          ? const Value.absent()
+          : Value(markForRetryAfterAccepted),
+      ackByServerAt: ackByServerAt == null && nullToAbsent
+          ? const Value.absent()
+          : Value(ackByServerAt),
+      retryCount: Value(retryCount),
+      lastRetry: lastRetry == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastRetry),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory ReceiptsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return ReceiptsData(
+      receiptId: serializer.fromJson<String>(json['receiptId']),
+      contactId: serializer.fromJson<int>(json['contactId']),
+      messageId: serializer.fromJson<String?>(json['messageId']),
+      message: serializer.fromJson<i2.Uint8List>(json['message']),
+      contactWillSendsReceipt: serializer.fromJson<int>(
+        json['contactWillSendsReceipt'],
+      ),
+      willBeRetriedByMediaUpload: serializer.fromJson<int>(
+        json['willBeRetriedByMediaUpload'],
+      ),
+      markForRetry: serializer.fromJson<int?>(json['markForRetry']),
+      markForRetryAfterAccepted: serializer.fromJson<int?>(
+        json['markForRetryAfterAccepted'],
+      ),
+      ackByServerAt: serializer.fromJson<int?>(json['ackByServerAt']),
+      retryCount: serializer.fromJson<int>(json['retryCount']),
+      lastRetry: serializer.fromJson<int?>(json['lastRetry']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'receiptId': serializer.toJson<String>(receiptId),
+      'contactId': serializer.toJson<int>(contactId),
+      'messageId': serializer.toJson<String?>(messageId),
+      'message': serializer.toJson<i2.Uint8List>(message),
+      'contactWillSendsReceipt': serializer.toJson<int>(
+        contactWillSendsReceipt,
+      ),
+      'willBeRetriedByMediaUpload': serializer.toJson<int>(
+        willBeRetriedByMediaUpload,
+      ),
+      'markForRetry': serializer.toJson<int?>(markForRetry),
+      'markForRetryAfterAccepted': serializer.toJson<int?>(
+        markForRetryAfterAccepted,
+      ),
+      'ackByServerAt': serializer.toJson<int?>(ackByServerAt),
+      'retryCount': serializer.toJson<int>(retryCount),
+      'lastRetry': serializer.toJson<int?>(lastRetry),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  ReceiptsData copyWith({
+    String? receiptId,
+    int? contactId,
+    Value<String?> messageId = const Value.absent(),
+    i2.Uint8List? message,
+    int? contactWillSendsReceipt,
+    int? willBeRetriedByMediaUpload,
+    Value<int?> markForRetry = const Value.absent(),
+    Value<int?> markForRetryAfterAccepted = const Value.absent(),
+    Value<int?> ackByServerAt = const Value.absent(),
+    int? retryCount,
+    Value<int?> lastRetry = const Value.absent(),
+    int? createdAt,
+  }) => ReceiptsData(
+    receiptId: receiptId ?? this.receiptId,
+    contactId: contactId ?? this.contactId,
+    messageId: messageId.present ? messageId.value : this.messageId,
+    message: message ?? this.message,
+    contactWillSendsReceipt:
+        contactWillSendsReceipt ?? this.contactWillSendsReceipt,
+    willBeRetriedByMediaUpload:
+        willBeRetriedByMediaUpload ?? this.willBeRetriedByMediaUpload,
+    markForRetry: markForRetry.present ? markForRetry.value : this.markForRetry,
+    markForRetryAfterAccepted: markForRetryAfterAccepted.present
+        ? markForRetryAfterAccepted.value
+        : this.markForRetryAfterAccepted,
+    ackByServerAt: ackByServerAt.present
+        ? ackByServerAt.value
+        : this.ackByServerAt,
+    retryCount: retryCount ?? this.retryCount,
+    lastRetry: lastRetry.present ? lastRetry.value : this.lastRetry,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  ReceiptsData copyWithCompanion(ReceiptsCompanion data) {
+    return ReceiptsData(
+      receiptId: data.receiptId.present ? data.receiptId.value : this.receiptId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      messageId: data.messageId.present ? data.messageId.value : this.messageId,
+      message: data.message.present ? data.message.value : this.message,
+      contactWillSendsReceipt: data.contactWillSendsReceipt.present
+          ? data.contactWillSendsReceipt.value
+          : this.contactWillSendsReceipt,
+      willBeRetriedByMediaUpload: data.willBeRetriedByMediaUpload.present
+          ? data.willBeRetriedByMediaUpload.value
+          : this.willBeRetriedByMediaUpload,
+      markForRetry: data.markForRetry.present
+          ? data.markForRetry.value
+          : this.markForRetry,
+      markForRetryAfterAccepted: data.markForRetryAfterAccepted.present
+          ? data.markForRetryAfterAccepted.value
+          : this.markForRetryAfterAccepted,
+      ackByServerAt: data.ackByServerAt.present
+          ? data.ackByServerAt.value
+          : this.ackByServerAt,
+      retryCount: data.retryCount.present
+          ? data.retryCount.value
+          : this.retryCount,
+      lastRetry: data.lastRetry.present ? data.lastRetry.value : this.lastRetry,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ReceiptsData(')
+          ..write('receiptId: $receiptId, ')
+          ..write('contactId: $contactId, ')
+          ..write('messageId: $messageId, ')
+          ..write('message: $message, ')
+          ..write('contactWillSendsReceipt: $contactWillSendsReceipt, ')
+          ..write('willBeRetriedByMediaUpload: $willBeRetriedByMediaUpload, ')
+          ..write('markForRetry: $markForRetry, ')
+          ..write('markForRetryAfterAccepted: $markForRetryAfterAccepted, ')
+          ..write('ackByServerAt: $ackByServerAt, ')
+          ..write('retryCount: $retryCount, ')
+          ..write('lastRetry: $lastRetry, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    receiptId,
+    contactId,
+    messageId,
+    $driftBlobEquality.hash(message),
+    contactWillSendsReceipt,
+    willBeRetriedByMediaUpload,
+    markForRetry,
+    markForRetryAfterAccepted,
+    ackByServerAt,
+    retryCount,
+    lastRetry,
+    createdAt,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is ReceiptsData &&
+          other.receiptId == this.receiptId &&
+          other.contactId == this.contactId &&
+          other.messageId == this.messageId &&
+          $driftBlobEquality.equals(other.message, this.message) &&
+          other.contactWillSendsReceipt == this.contactWillSendsReceipt &&
+          other.willBeRetriedByMediaUpload == this.willBeRetriedByMediaUpload &&
+          other.markForRetry == this.markForRetry &&
+          other.markForRetryAfterAccepted == this.markForRetryAfterAccepted &&
+          other.ackByServerAt == this.ackByServerAt &&
+          other.retryCount == this.retryCount &&
+          other.lastRetry == this.lastRetry &&
+          other.createdAt == this.createdAt);
+}
+
+class ReceiptsCompanion extends UpdateCompanion<ReceiptsData> {
+  final Value<String> receiptId;
+  final Value<int> contactId;
+  final Value<String?> messageId;
+  final Value<i2.Uint8List> message;
+  final Value<int> contactWillSendsReceipt;
+  final Value<int> willBeRetriedByMediaUpload;
+  final Value<int?> markForRetry;
+  final Value<int?> markForRetryAfterAccepted;
+  final Value<int?> ackByServerAt;
+  final Value<int> retryCount;
+  final Value<int?> lastRetry;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const ReceiptsCompanion({
+    this.receiptId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.messageId = const Value.absent(),
+    this.message = const Value.absent(),
+    this.contactWillSendsReceipt = const Value.absent(),
+    this.willBeRetriedByMediaUpload = const Value.absent(),
+    this.markForRetry = const Value.absent(),
+    this.markForRetryAfterAccepted = const Value.absent(),
+    this.ackByServerAt = const Value.absent(),
+    this.retryCount = const Value.absent(),
+    this.lastRetry = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  ReceiptsCompanion.insert({
+    required String receiptId,
+    required int contactId,
+    this.messageId = const Value.absent(),
+    required i2.Uint8List message,
+    this.contactWillSendsReceipt = const Value.absent(),
+    this.willBeRetriedByMediaUpload = const Value.absent(),
+    this.markForRetry = const Value.absent(),
+    this.markForRetryAfterAccepted = const Value.absent(),
+    this.ackByServerAt = const Value.absent(),
+    this.retryCount = const Value.absent(),
+    this.lastRetry = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : receiptId = Value(receiptId),
+       contactId = Value(contactId),
+       message = Value(message);
+  static Insertable<ReceiptsData> custom({
+    Expression<String>? receiptId,
+    Expression<int>? contactId,
+    Expression<String>? messageId,
+    Expression<i2.Uint8List>? message,
+    Expression<int>? contactWillSendsReceipt,
+    Expression<int>? willBeRetriedByMediaUpload,
+    Expression<int>? markForRetry,
+    Expression<int>? markForRetryAfterAccepted,
+    Expression<int>? ackByServerAt,
+    Expression<int>? retryCount,
+    Expression<int>? lastRetry,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (receiptId != null) 'receipt_id': receiptId,
+      if (contactId != null) 'contact_id': contactId,
+      if (messageId != null) 'message_id': messageId,
+      if (message != null) 'message': message,
+      if (contactWillSendsReceipt != null)
+        'contact_will_sends_receipt': contactWillSendsReceipt,
+      if (willBeRetriedByMediaUpload != null)
+        'will_be_retried_by_media_upload': willBeRetriedByMediaUpload,
+      if (markForRetry != null) 'mark_for_retry': markForRetry,
+      if (markForRetryAfterAccepted != null)
+        'mark_for_retry_after_accepted': markForRetryAfterAccepted,
+      if (ackByServerAt != null) 'ack_by_server_at': ackByServerAt,
+      if (retryCount != null) 'retry_count': retryCount,
+      if (lastRetry != null) 'last_retry': lastRetry,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  ReceiptsCompanion copyWith({
+    Value<String>? receiptId,
+    Value<int>? contactId,
+    Value<String?>? messageId,
+    Value<i2.Uint8List>? message,
+    Value<int>? contactWillSendsReceipt,
+    Value<int>? willBeRetriedByMediaUpload,
+    Value<int?>? markForRetry,
+    Value<int?>? markForRetryAfterAccepted,
+    Value<int?>? ackByServerAt,
+    Value<int>? retryCount,
+    Value<int?>? lastRetry,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return ReceiptsCompanion(
+      receiptId: receiptId ?? this.receiptId,
+      contactId: contactId ?? this.contactId,
+      messageId: messageId ?? this.messageId,
+      message: message ?? this.message,
+      contactWillSendsReceipt:
+          contactWillSendsReceipt ?? this.contactWillSendsReceipt,
+      willBeRetriedByMediaUpload:
+          willBeRetriedByMediaUpload ?? this.willBeRetriedByMediaUpload,
+      markForRetry: markForRetry ?? this.markForRetry,
+      markForRetryAfterAccepted:
+          markForRetryAfterAccepted ?? this.markForRetryAfterAccepted,
+      ackByServerAt: ackByServerAt ?? this.ackByServerAt,
+      retryCount: retryCount ?? this.retryCount,
+      lastRetry: lastRetry ?? this.lastRetry,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (receiptId.present) {
+      map['receipt_id'] = Variable<String>(receiptId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (messageId.present) {
+      map['message_id'] = Variable<String>(messageId.value);
+    }
+    if (message.present) {
+      map['message'] = Variable<i2.Uint8List>(message.value);
+    }
+    if (contactWillSendsReceipt.present) {
+      map['contact_will_sends_receipt'] = Variable<int>(
+        contactWillSendsReceipt.value,
+      );
+    }
+    if (willBeRetriedByMediaUpload.present) {
+      map['will_be_retried_by_media_upload'] = Variable<int>(
+        willBeRetriedByMediaUpload.value,
+      );
+    }
+    if (markForRetry.present) {
+      map['mark_for_retry'] = Variable<int>(markForRetry.value);
+    }
+    if (markForRetryAfterAccepted.present) {
+      map['mark_for_retry_after_accepted'] = Variable<int>(
+        markForRetryAfterAccepted.value,
+      );
+    }
+    if (ackByServerAt.present) {
+      map['ack_by_server_at'] = Variable<int>(ackByServerAt.value);
+    }
+    if (retryCount.present) {
+      map['retry_count'] = Variable<int>(retryCount.value);
+    }
+    if (lastRetry.present) {
+      map['last_retry'] = Variable<int>(lastRetry.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ReceiptsCompanion(')
+          ..write('receiptId: $receiptId, ')
+          ..write('contactId: $contactId, ')
+          ..write('messageId: $messageId, ')
+          ..write('message: $message, ')
+          ..write('contactWillSendsReceipt: $contactWillSendsReceipt, ')
+          ..write('willBeRetriedByMediaUpload: $willBeRetriedByMediaUpload, ')
+          ..write('markForRetry: $markForRetry, ')
+          ..write('markForRetryAfterAccepted: $markForRetryAfterAccepted, ')
+          ..write('ackByServerAt: $ackByServerAt, ')
+          ..write('retryCount: $retryCount, ')
+          ..write('lastRetry: $lastRetry, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class ReceivedReceipts extends Table
+    with TableInfo<ReceivedReceipts, ReceivedReceiptsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  ReceivedReceipts(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> receiptId = GeneratedColumn<String>(
+    'receipt_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [receiptId, createdAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'received_receipts';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {receiptId};
+  @override
+  ReceivedReceiptsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return ReceivedReceiptsData(
+      receiptId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}receipt_id'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  ReceivedReceipts createAlias(String alias) {
+    return ReceivedReceipts(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(receipt_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class ReceivedReceiptsData extends DataClass
+    implements Insertable<ReceivedReceiptsData> {
+  final String receiptId;
+  final int createdAt;
+  const ReceivedReceiptsData({
+    required this.receiptId,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['receipt_id'] = Variable<String>(receiptId);
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  ReceivedReceiptsCompanion toCompanion(bool nullToAbsent) {
+    return ReceivedReceiptsCompanion(
+      receiptId: Value(receiptId),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory ReceivedReceiptsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return ReceivedReceiptsData(
+      receiptId: serializer.fromJson<String>(json['receiptId']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'receiptId': serializer.toJson<String>(receiptId),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  ReceivedReceiptsData copyWith({String? receiptId, int? createdAt}) =>
+      ReceivedReceiptsData(
+        receiptId: receiptId ?? this.receiptId,
+        createdAt: createdAt ?? this.createdAt,
+      );
+  ReceivedReceiptsData copyWithCompanion(ReceivedReceiptsCompanion data) {
+    return ReceivedReceiptsData(
+      receiptId: data.receiptId.present ? data.receiptId.value : this.receiptId,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ReceivedReceiptsData(')
+          ..write('receiptId: $receiptId, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(receiptId, createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is ReceivedReceiptsData &&
+          other.receiptId == this.receiptId &&
+          other.createdAt == this.createdAt);
+}
+
+class ReceivedReceiptsCompanion extends UpdateCompanion<ReceivedReceiptsData> {
+  final Value<String> receiptId;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const ReceivedReceiptsCompanion({
+    this.receiptId = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  ReceivedReceiptsCompanion.insert({
+    required String receiptId,
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : receiptId = Value(receiptId);
+  static Insertable<ReceivedReceiptsData> custom({
+    Expression<String>? receiptId,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (receiptId != null) 'receipt_id': receiptId,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  ReceivedReceiptsCompanion copyWith({
+    Value<String>? receiptId,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return ReceivedReceiptsCompanion(
+      receiptId: receiptId ?? this.receiptId,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (receiptId.present) {
+      map['receipt_id'] = Variable<String>(receiptId.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ReceivedReceiptsCompanion(')
+          ..write('receiptId: $receiptId, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class SignalIdentityKeyStores extends Table
+    with TableInfo<SignalIdentityKeyStores, SignalIdentityKeyStoresData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  SignalIdentityKeyStores(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> deviceId = GeneratedColumn<int>(
+    'device_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> name = GeneratedColumn<String>(
+    'name',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> identityKey =
+      GeneratedColumn<i2.Uint8List>(
+        'identity_key',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    deviceId,
+    name,
+    identityKey,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'signal_identity_key_stores';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {deviceId, name};
+  @override
+  SignalIdentityKeyStoresData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return SignalIdentityKeyStoresData(
+      deviceId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}device_id'],
+      )!,
+      name: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}name'],
+      )!,
+      identityKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}identity_key'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  SignalIdentityKeyStores createAlias(String alias) {
+    return SignalIdentityKeyStores(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(device_id, name)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class SignalIdentityKeyStoresData extends DataClass
+    implements Insertable<SignalIdentityKeyStoresData> {
+  final int deviceId;
+  final String name;
+  final i2.Uint8List identityKey;
+  final int createdAt;
+  const SignalIdentityKeyStoresData({
+    required this.deviceId,
+    required this.name,
+    required this.identityKey,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['device_id'] = Variable<int>(deviceId);
+    map['name'] = Variable<String>(name);
+    map['identity_key'] = Variable<i2.Uint8List>(identityKey);
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  SignalIdentityKeyStoresCompanion toCompanion(bool nullToAbsent) {
+    return SignalIdentityKeyStoresCompanion(
+      deviceId: Value(deviceId),
+      name: Value(name),
+      identityKey: Value(identityKey),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory SignalIdentityKeyStoresData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return SignalIdentityKeyStoresData(
+      deviceId: serializer.fromJson<int>(json['deviceId']),
+      name: serializer.fromJson<String>(json['name']),
+      identityKey: serializer.fromJson<i2.Uint8List>(json['identityKey']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'deviceId': serializer.toJson<int>(deviceId),
+      'name': serializer.toJson<String>(name),
+      'identityKey': serializer.toJson<i2.Uint8List>(identityKey),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  SignalIdentityKeyStoresData copyWith({
+    int? deviceId,
+    String? name,
+    i2.Uint8List? identityKey,
+    int? createdAt,
+  }) => SignalIdentityKeyStoresData(
+    deviceId: deviceId ?? this.deviceId,
+    name: name ?? this.name,
+    identityKey: identityKey ?? this.identityKey,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  SignalIdentityKeyStoresData copyWithCompanion(
+    SignalIdentityKeyStoresCompanion data,
+  ) {
+    return SignalIdentityKeyStoresData(
+      deviceId: data.deviceId.present ? data.deviceId.value : this.deviceId,
+      name: data.name.present ? data.name.value : this.name,
+      identityKey: data.identityKey.present
+          ? data.identityKey.value
+          : this.identityKey,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalIdentityKeyStoresData(')
+          ..write('deviceId: $deviceId, ')
+          ..write('name: $name, ')
+          ..write('identityKey: $identityKey, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    deviceId,
+    name,
+    $driftBlobEquality.hash(identityKey),
+    createdAt,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is SignalIdentityKeyStoresData &&
+          other.deviceId == this.deviceId &&
+          other.name == this.name &&
+          $driftBlobEquality.equals(other.identityKey, this.identityKey) &&
+          other.createdAt == this.createdAt);
+}
+
+class SignalIdentityKeyStoresCompanion
+    extends UpdateCompanion<SignalIdentityKeyStoresData> {
+  final Value<int> deviceId;
+  final Value<String> name;
+  final Value<i2.Uint8List> identityKey;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const SignalIdentityKeyStoresCompanion({
+    this.deviceId = const Value.absent(),
+    this.name = const Value.absent(),
+    this.identityKey = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  SignalIdentityKeyStoresCompanion.insert({
+    required int deviceId,
+    required String name,
+    required i2.Uint8List identityKey,
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : deviceId = Value(deviceId),
+       name = Value(name),
+       identityKey = Value(identityKey);
+  static Insertable<SignalIdentityKeyStoresData> custom({
+    Expression<int>? deviceId,
+    Expression<String>? name,
+    Expression<i2.Uint8List>? identityKey,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (deviceId != null) 'device_id': deviceId,
+      if (name != null) 'name': name,
+      if (identityKey != null) 'identity_key': identityKey,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  SignalIdentityKeyStoresCompanion copyWith({
+    Value<int>? deviceId,
+    Value<String>? name,
+    Value<i2.Uint8List>? identityKey,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return SignalIdentityKeyStoresCompanion(
+      deviceId: deviceId ?? this.deviceId,
+      name: name ?? this.name,
+      identityKey: identityKey ?? this.identityKey,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (deviceId.present) {
+      map['device_id'] = Variable<int>(deviceId.value);
+    }
+    if (name.present) {
+      map['name'] = Variable<String>(name.value);
+    }
+    if (identityKey.present) {
+      map['identity_key'] = Variable<i2.Uint8List>(identityKey.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalIdentityKeyStoresCompanion(')
+          ..write('deviceId: $deviceId, ')
+          ..write('name: $name, ')
+          ..write('identityKey: $identityKey, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class SignalPreKeyStores extends Table
+    with TableInfo<SignalPreKeyStores, SignalPreKeyStoresData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  SignalPreKeyStores(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> preKeyId = GeneratedColumn<int>(
+    'pre_key_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> preKey =
+      GeneratedColumn<i2.Uint8List>(
+        'pre_key',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [preKeyId, preKey, createdAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'signal_pre_key_stores';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {preKeyId};
+  @override
+  SignalPreKeyStoresData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return SignalPreKeyStoresData(
+      preKeyId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}pre_key_id'],
+      )!,
+      preKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}pre_key'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  SignalPreKeyStores createAlias(String alias) {
+    return SignalPreKeyStores(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(pre_key_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class SignalPreKeyStoresData extends DataClass
+    implements Insertable<SignalPreKeyStoresData> {
+  final int preKeyId;
+  final i2.Uint8List preKey;
+  final int createdAt;
+  const SignalPreKeyStoresData({
+    required this.preKeyId,
+    required this.preKey,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['pre_key_id'] = Variable<int>(preKeyId);
+    map['pre_key'] = Variable<i2.Uint8List>(preKey);
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  SignalPreKeyStoresCompanion toCompanion(bool nullToAbsent) {
+    return SignalPreKeyStoresCompanion(
+      preKeyId: Value(preKeyId),
+      preKey: Value(preKey),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory SignalPreKeyStoresData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return SignalPreKeyStoresData(
+      preKeyId: serializer.fromJson<int>(json['preKeyId']),
+      preKey: serializer.fromJson<i2.Uint8List>(json['preKey']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'preKeyId': serializer.toJson<int>(preKeyId),
+      'preKey': serializer.toJson<i2.Uint8List>(preKey),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  SignalPreKeyStoresData copyWith({
+    int? preKeyId,
+    i2.Uint8List? preKey,
+    int? createdAt,
+  }) => SignalPreKeyStoresData(
+    preKeyId: preKeyId ?? this.preKeyId,
+    preKey: preKey ?? this.preKey,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  SignalPreKeyStoresData copyWithCompanion(SignalPreKeyStoresCompanion data) {
+    return SignalPreKeyStoresData(
+      preKeyId: data.preKeyId.present ? data.preKeyId.value : this.preKeyId,
+      preKey: data.preKey.present ? data.preKey.value : this.preKey,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalPreKeyStoresData(')
+          ..write('preKeyId: $preKeyId, ')
+          ..write('preKey: $preKey, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(preKeyId, $driftBlobEquality.hash(preKey), createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is SignalPreKeyStoresData &&
+          other.preKeyId == this.preKeyId &&
+          $driftBlobEquality.equals(other.preKey, this.preKey) &&
+          other.createdAt == this.createdAt);
+}
+
+class SignalPreKeyStoresCompanion
+    extends UpdateCompanion<SignalPreKeyStoresData> {
+  final Value<int> preKeyId;
+  final Value<i2.Uint8List> preKey;
+  final Value<int> createdAt;
+  const SignalPreKeyStoresCompanion({
+    this.preKeyId = const Value.absent(),
+    this.preKey = const Value.absent(),
+    this.createdAt = const Value.absent(),
+  });
+  SignalPreKeyStoresCompanion.insert({
+    this.preKeyId = const Value.absent(),
+    required i2.Uint8List preKey,
+    this.createdAt = const Value.absent(),
+  }) : preKey = Value(preKey);
+  static Insertable<SignalPreKeyStoresData> custom({
+    Expression<int>? preKeyId,
+    Expression<i2.Uint8List>? preKey,
+    Expression<int>? createdAt,
+  }) {
+    return RawValuesInsertable({
+      if (preKeyId != null) 'pre_key_id': preKeyId,
+      if (preKey != null) 'pre_key': preKey,
+      if (createdAt != null) 'created_at': createdAt,
+    });
+  }
+
+  SignalPreKeyStoresCompanion copyWith({
+    Value<int>? preKeyId,
+    Value<i2.Uint8List>? preKey,
+    Value<int>? createdAt,
+  }) {
+    return SignalPreKeyStoresCompanion(
+      preKeyId: preKeyId ?? this.preKeyId,
+      preKey: preKey ?? this.preKey,
+      createdAt: createdAt ?? this.createdAt,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (preKeyId.present) {
+      map['pre_key_id'] = Variable<int>(preKeyId.value);
+    }
+    if (preKey.present) {
+      map['pre_key'] = Variable<i2.Uint8List>(preKey.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalPreKeyStoresCompanion(')
+          ..write('preKeyId: $preKeyId, ')
+          ..write('preKey: $preKey, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class SignalSenderKeyStores extends Table
+    with TableInfo<SignalSenderKeyStores, SignalSenderKeyStoresData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  SignalSenderKeyStores(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> senderKeyName = GeneratedColumn<String>(
+    'sender_key_name',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> senderKey =
+      GeneratedColumn<i2.Uint8List>(
+        'sender_key',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  @override
+  List<GeneratedColumn> get $columns => [senderKeyName, senderKey];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'signal_sender_key_stores';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {senderKeyName};
+  @override
+  SignalSenderKeyStoresData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return SignalSenderKeyStoresData(
+      senderKeyName: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}sender_key_name'],
+      )!,
+      senderKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}sender_key'],
+      )!,
+    );
+  }
+
+  @override
+  SignalSenderKeyStores createAlias(String alias) {
+    return SignalSenderKeyStores(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(sender_key_name)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class SignalSenderKeyStoresData extends DataClass
+    implements Insertable<SignalSenderKeyStoresData> {
+  final String senderKeyName;
+  final i2.Uint8List senderKey;
+  const SignalSenderKeyStoresData({
+    required this.senderKeyName,
+    required this.senderKey,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['sender_key_name'] = Variable<String>(senderKeyName);
+    map['sender_key'] = Variable<i2.Uint8List>(senderKey);
+    return map;
+  }
+
+  SignalSenderKeyStoresCompanion toCompanion(bool nullToAbsent) {
+    return SignalSenderKeyStoresCompanion(
+      senderKeyName: Value(senderKeyName),
+      senderKey: Value(senderKey),
+    );
+  }
+
+  factory SignalSenderKeyStoresData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return SignalSenderKeyStoresData(
+      senderKeyName: serializer.fromJson<String>(json['senderKeyName']),
+      senderKey: serializer.fromJson<i2.Uint8List>(json['senderKey']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'senderKeyName': serializer.toJson<String>(senderKeyName),
+      'senderKey': serializer.toJson<i2.Uint8List>(senderKey),
+    };
+  }
+
+  SignalSenderKeyStoresData copyWith({
+    String? senderKeyName,
+    i2.Uint8List? senderKey,
+  }) => SignalSenderKeyStoresData(
+    senderKeyName: senderKeyName ?? this.senderKeyName,
+    senderKey: senderKey ?? this.senderKey,
+  );
+  SignalSenderKeyStoresData copyWithCompanion(
+    SignalSenderKeyStoresCompanion data,
+  ) {
+    return SignalSenderKeyStoresData(
+      senderKeyName: data.senderKeyName.present
+          ? data.senderKeyName.value
+          : this.senderKeyName,
+      senderKey: data.senderKey.present ? data.senderKey.value : this.senderKey,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalSenderKeyStoresData(')
+          ..write('senderKeyName: $senderKeyName, ')
+          ..write('senderKey: $senderKey')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(senderKeyName, $driftBlobEquality.hash(senderKey));
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is SignalSenderKeyStoresData &&
+          other.senderKeyName == this.senderKeyName &&
+          $driftBlobEquality.equals(other.senderKey, this.senderKey));
+}
+
+class SignalSenderKeyStoresCompanion
+    extends UpdateCompanion<SignalSenderKeyStoresData> {
+  final Value<String> senderKeyName;
+  final Value<i2.Uint8List> senderKey;
+  final Value<int> rowid;
+  const SignalSenderKeyStoresCompanion({
+    this.senderKeyName = const Value.absent(),
+    this.senderKey = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  SignalSenderKeyStoresCompanion.insert({
+    required String senderKeyName,
+    required i2.Uint8List senderKey,
+    this.rowid = const Value.absent(),
+  }) : senderKeyName = Value(senderKeyName),
+       senderKey = Value(senderKey);
+  static Insertable<SignalSenderKeyStoresData> custom({
+    Expression<String>? senderKeyName,
+    Expression<i2.Uint8List>? senderKey,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (senderKeyName != null) 'sender_key_name': senderKeyName,
+      if (senderKey != null) 'sender_key': senderKey,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  SignalSenderKeyStoresCompanion copyWith({
+    Value<String>? senderKeyName,
+    Value<i2.Uint8List>? senderKey,
+    Value<int>? rowid,
+  }) {
+    return SignalSenderKeyStoresCompanion(
+      senderKeyName: senderKeyName ?? this.senderKeyName,
+      senderKey: senderKey ?? this.senderKey,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (senderKeyName.present) {
+      map['sender_key_name'] = Variable<String>(senderKeyName.value);
+    }
+    if (senderKey.present) {
+      map['sender_key'] = Variable<i2.Uint8List>(senderKey.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalSenderKeyStoresCompanion(')
+          ..write('senderKeyName: $senderKeyName, ')
+          ..write('senderKey: $senderKey, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class SignalSessionStores extends Table
+    with TableInfo<SignalSessionStores, SignalSessionStoresData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  SignalSessionStores(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> deviceId = GeneratedColumn<int>(
+    'device_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> name = GeneratedColumn<String>(
+    'name',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> sessionRecord =
+      GeneratedColumn<i2.Uint8List>(
+        'session_record',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    deviceId,
+    name,
+    sessionRecord,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'signal_session_stores';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {deviceId, name};
+  @override
+  SignalSessionStoresData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return SignalSessionStoresData(
+      deviceId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}device_id'],
+      )!,
+      name: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}name'],
+      )!,
+      sessionRecord: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}session_record'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  SignalSessionStores createAlias(String alias) {
+    return SignalSessionStores(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(device_id, name)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class SignalSessionStoresData extends DataClass
+    implements Insertable<SignalSessionStoresData> {
+  final int deviceId;
+  final String name;
+  final i2.Uint8List sessionRecord;
+  final int createdAt;
+  const SignalSessionStoresData({
+    required this.deviceId,
+    required this.name,
+    required this.sessionRecord,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['device_id'] = Variable<int>(deviceId);
+    map['name'] = Variable<String>(name);
+    map['session_record'] = Variable<i2.Uint8List>(sessionRecord);
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  SignalSessionStoresCompanion toCompanion(bool nullToAbsent) {
+    return SignalSessionStoresCompanion(
+      deviceId: Value(deviceId),
+      name: Value(name),
+      sessionRecord: Value(sessionRecord),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory SignalSessionStoresData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return SignalSessionStoresData(
+      deviceId: serializer.fromJson<int>(json['deviceId']),
+      name: serializer.fromJson<String>(json['name']),
+      sessionRecord: serializer.fromJson<i2.Uint8List>(json['sessionRecord']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'deviceId': serializer.toJson<int>(deviceId),
+      'name': serializer.toJson<String>(name),
+      'sessionRecord': serializer.toJson<i2.Uint8List>(sessionRecord),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  SignalSessionStoresData copyWith({
+    int? deviceId,
+    String? name,
+    i2.Uint8List? sessionRecord,
+    int? createdAt,
+  }) => SignalSessionStoresData(
+    deviceId: deviceId ?? this.deviceId,
+    name: name ?? this.name,
+    sessionRecord: sessionRecord ?? this.sessionRecord,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  SignalSessionStoresData copyWithCompanion(SignalSessionStoresCompanion data) {
+    return SignalSessionStoresData(
+      deviceId: data.deviceId.present ? data.deviceId.value : this.deviceId,
+      name: data.name.present ? data.name.value : this.name,
+      sessionRecord: data.sessionRecord.present
+          ? data.sessionRecord.value
+          : this.sessionRecord,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalSessionStoresData(')
+          ..write('deviceId: $deviceId, ')
+          ..write('name: $name, ')
+          ..write('sessionRecord: $sessionRecord, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    deviceId,
+    name,
+    $driftBlobEquality.hash(sessionRecord),
+    createdAt,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is SignalSessionStoresData &&
+          other.deviceId == this.deviceId &&
+          other.name == this.name &&
+          $driftBlobEquality.equals(other.sessionRecord, this.sessionRecord) &&
+          other.createdAt == this.createdAt);
+}
+
+class SignalSessionStoresCompanion
+    extends UpdateCompanion<SignalSessionStoresData> {
+  final Value<int> deviceId;
+  final Value<String> name;
+  final Value<i2.Uint8List> sessionRecord;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const SignalSessionStoresCompanion({
+    this.deviceId = const Value.absent(),
+    this.name = const Value.absent(),
+    this.sessionRecord = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  SignalSessionStoresCompanion.insert({
+    required int deviceId,
+    required String name,
+    required i2.Uint8List sessionRecord,
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : deviceId = Value(deviceId),
+       name = Value(name),
+       sessionRecord = Value(sessionRecord);
+  static Insertable<SignalSessionStoresData> custom({
+    Expression<int>? deviceId,
+    Expression<String>? name,
+    Expression<i2.Uint8List>? sessionRecord,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (deviceId != null) 'device_id': deviceId,
+      if (name != null) 'name': name,
+      if (sessionRecord != null) 'session_record': sessionRecord,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  SignalSessionStoresCompanion copyWith({
+    Value<int>? deviceId,
+    Value<String>? name,
+    Value<i2.Uint8List>? sessionRecord,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return SignalSessionStoresCompanion(
+      deviceId: deviceId ?? this.deviceId,
+      name: name ?? this.name,
+      sessionRecord: sessionRecord ?? this.sessionRecord,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (deviceId.present) {
+      map['device_id'] = Variable<int>(deviceId.value);
+    }
+    if (name.present) {
+      map['name'] = Variable<String>(name.value);
+    }
+    if (sessionRecord.present) {
+      map['session_record'] = Variable<i2.Uint8List>(sessionRecord.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalSessionStoresCompanion(')
+          ..write('deviceId: $deviceId, ')
+          ..write('name: $name, ')
+          ..write('sessionRecord: $sessionRecord, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class MessageActions extends Table
+    with TableInfo<MessageActions, MessageActionsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  MessageActions(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> messageId = GeneratedColumn<String>(
+    'message_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES messages(message_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<String> type = GeneratedColumn<String>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> actionAt = GeneratedColumn<int>(
+    'action_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [messageId, contactId, type, actionAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'message_actions';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {messageId, contactId, type};
+  @override
+  MessageActionsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return MessageActionsData(
+      messageId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}message_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      )!,
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}type'],
+      )!,
+      actionAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}action_at'],
+      )!,
+    );
+  }
+
+  @override
+  MessageActions createAlias(String alias) {
+    return MessageActions(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const [
+    'PRIMARY KEY(message_id, contact_id, type)',
+  ];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class MessageActionsData extends DataClass
+    implements Insertable<MessageActionsData> {
+  final String messageId;
+  final int contactId;
+  final String type;
+  final int actionAt;
+  const MessageActionsData({
+    required this.messageId,
+    required this.contactId,
+    required this.type,
+    required this.actionAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['message_id'] = Variable<String>(messageId);
+    map['contact_id'] = Variable<int>(contactId);
+    map['type'] = Variable<String>(type);
+    map['action_at'] = Variable<int>(actionAt);
+    return map;
+  }
+
+  MessageActionsCompanion toCompanion(bool nullToAbsent) {
+    return MessageActionsCompanion(
+      messageId: Value(messageId),
+      contactId: Value(contactId),
+      type: Value(type),
+      actionAt: Value(actionAt),
+    );
+  }
+
+  factory MessageActionsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return MessageActionsData(
+      messageId: serializer.fromJson<String>(json['messageId']),
+      contactId: serializer.fromJson<int>(json['contactId']),
+      type: serializer.fromJson<String>(json['type']),
+      actionAt: serializer.fromJson<int>(json['actionAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'messageId': serializer.toJson<String>(messageId),
+      'contactId': serializer.toJson<int>(contactId),
+      'type': serializer.toJson<String>(type),
+      'actionAt': serializer.toJson<int>(actionAt),
+    };
+  }
+
+  MessageActionsData copyWith({
+    String? messageId,
+    int? contactId,
+    String? type,
+    int? actionAt,
+  }) => MessageActionsData(
+    messageId: messageId ?? this.messageId,
+    contactId: contactId ?? this.contactId,
+    type: type ?? this.type,
+    actionAt: actionAt ?? this.actionAt,
+  );
+  MessageActionsData copyWithCompanion(MessageActionsCompanion data) {
+    return MessageActionsData(
+      messageId: data.messageId.present ? data.messageId.value : this.messageId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      type: data.type.present ? data.type.value : this.type,
+      actionAt: data.actionAt.present ? data.actionAt.value : this.actionAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MessageActionsData(')
+          ..write('messageId: $messageId, ')
+          ..write('contactId: $contactId, ')
+          ..write('type: $type, ')
+          ..write('actionAt: $actionAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(messageId, contactId, type, actionAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is MessageActionsData &&
+          other.messageId == this.messageId &&
+          other.contactId == this.contactId &&
+          other.type == this.type &&
+          other.actionAt == this.actionAt);
+}
+
+class MessageActionsCompanion extends UpdateCompanion<MessageActionsData> {
+  final Value<String> messageId;
+  final Value<int> contactId;
+  final Value<String> type;
+  final Value<int> actionAt;
+  final Value<int> rowid;
+  const MessageActionsCompanion({
+    this.messageId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.type = const Value.absent(),
+    this.actionAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  MessageActionsCompanion.insert({
+    required String messageId,
+    required int contactId,
+    required String type,
+    this.actionAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : messageId = Value(messageId),
+       contactId = Value(contactId),
+       type = Value(type);
+  static Insertable<MessageActionsData> custom({
+    Expression<String>? messageId,
+    Expression<int>? contactId,
+    Expression<String>? type,
+    Expression<int>? actionAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (messageId != null) 'message_id': messageId,
+      if (contactId != null) 'contact_id': contactId,
+      if (type != null) 'type': type,
+      if (actionAt != null) 'action_at': actionAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  MessageActionsCompanion copyWith({
+    Value<String>? messageId,
+    Value<int>? contactId,
+    Value<String>? type,
+    Value<int>? actionAt,
+    Value<int>? rowid,
+  }) {
+    return MessageActionsCompanion(
+      messageId: messageId ?? this.messageId,
+      contactId: contactId ?? this.contactId,
+      type: type ?? this.type,
+      actionAt: actionAt ?? this.actionAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (messageId.present) {
+      map['message_id'] = Variable<String>(messageId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (type.present) {
+      map['type'] = Variable<String>(type.value);
+    }
+    if (actionAt.present) {
+      map['action_at'] = Variable<int>(actionAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MessageActionsCompanion(')
+          ..write('messageId: $messageId, ')
+          ..write('contactId: $contactId, ')
+          ..write('type: $type, ')
+          ..write('actionAt: $actionAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class GroupHistories extends Table
+    with TableInfo<GroupHistories, GroupHistoriesData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  GroupHistories(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> groupHistoryId = GeneratedColumn<String>(
+    'group_history_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> groupId = GeneratedColumn<String>(
+    'group_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES "groups"(group_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL REFERENCES contacts(user_id)',
+  );
+  late final GeneratedColumn<int> affectedContactId = GeneratedColumn<int>(
+    'affected_contact_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<String> oldGroupName = GeneratedColumn<String>(
+    'old_group_name',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<String> newGroupName = GeneratedColumn<String>(
+    'new_group_name',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> newDeleteMessagesAfterMilliseconds =
+      GeneratedColumn<int>(
+        'new_delete_messages_after_milliseconds',
+        aliasedName,
+        true,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<String> type = GeneratedColumn<String>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> actionAt = GeneratedColumn<int>(
+    'action_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    groupHistoryId,
+    groupId,
+    contactId,
+    affectedContactId,
+    oldGroupName,
+    newGroupName,
+    newDeleteMessagesAfterMilliseconds,
+    type,
+    actionAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'group_histories';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {groupHistoryId};
+  @override
+  GroupHistoriesData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return GroupHistoriesData(
+      groupHistoryId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}group_history_id'],
+      )!,
+      groupId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}group_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      ),
+      affectedContactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}affected_contact_id'],
+      ),
+      oldGroupName: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}old_group_name'],
+      ),
+      newGroupName: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}new_group_name'],
+      ),
+      newDeleteMessagesAfterMilliseconds: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}new_delete_messages_after_milliseconds'],
+      ),
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}type'],
+      )!,
+      actionAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}action_at'],
+      )!,
+    );
+  }
+
+  @override
+  GroupHistories createAlias(String alias) {
+    return GroupHistories(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(group_history_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class GroupHistoriesData extends DataClass
+    implements Insertable<GroupHistoriesData> {
+  final String groupHistoryId;
+  final String groupId;
+  final int? contactId;
+  final int? affectedContactId;
+  final String? oldGroupName;
+  final String? newGroupName;
+  final int? newDeleteMessagesAfterMilliseconds;
+  final String type;
+  final int actionAt;
+  const GroupHistoriesData({
+    required this.groupHistoryId,
+    required this.groupId,
+    this.contactId,
+    this.affectedContactId,
+    this.oldGroupName,
+    this.newGroupName,
+    this.newDeleteMessagesAfterMilliseconds,
+    required this.type,
+    required this.actionAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['group_history_id'] = Variable<String>(groupHistoryId);
+    map['group_id'] = Variable<String>(groupId);
+    if (!nullToAbsent || contactId != null) {
+      map['contact_id'] = Variable<int>(contactId);
+    }
+    if (!nullToAbsent || affectedContactId != null) {
+      map['affected_contact_id'] = Variable<int>(affectedContactId);
+    }
+    if (!nullToAbsent || oldGroupName != null) {
+      map['old_group_name'] = Variable<String>(oldGroupName);
+    }
+    if (!nullToAbsent || newGroupName != null) {
+      map['new_group_name'] = Variable<String>(newGroupName);
+    }
+    if (!nullToAbsent || newDeleteMessagesAfterMilliseconds != null) {
+      map['new_delete_messages_after_milliseconds'] = Variable<int>(
+        newDeleteMessagesAfterMilliseconds,
+      );
+    }
+    map['type'] = Variable<String>(type);
+    map['action_at'] = Variable<int>(actionAt);
+    return map;
+  }
+
+  GroupHistoriesCompanion toCompanion(bool nullToAbsent) {
+    return GroupHistoriesCompanion(
+      groupHistoryId: Value(groupHistoryId),
+      groupId: Value(groupId),
+      contactId: contactId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(contactId),
+      affectedContactId: affectedContactId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(affectedContactId),
+      oldGroupName: oldGroupName == null && nullToAbsent
+          ? const Value.absent()
+          : Value(oldGroupName),
+      newGroupName: newGroupName == null && nullToAbsent
+          ? const Value.absent()
+          : Value(newGroupName),
+      newDeleteMessagesAfterMilliseconds:
+          newDeleteMessagesAfterMilliseconds == null && nullToAbsent
+          ? const Value.absent()
+          : Value(newDeleteMessagesAfterMilliseconds),
+      type: Value(type),
+      actionAt: Value(actionAt),
+    );
+  }
+
+  factory GroupHistoriesData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return GroupHistoriesData(
+      groupHistoryId: serializer.fromJson<String>(json['groupHistoryId']),
+      groupId: serializer.fromJson<String>(json['groupId']),
+      contactId: serializer.fromJson<int?>(json['contactId']),
+      affectedContactId: serializer.fromJson<int?>(json['affectedContactId']),
+      oldGroupName: serializer.fromJson<String?>(json['oldGroupName']),
+      newGroupName: serializer.fromJson<String?>(json['newGroupName']),
+      newDeleteMessagesAfterMilliseconds: serializer.fromJson<int?>(
+        json['newDeleteMessagesAfterMilliseconds'],
+      ),
+      type: serializer.fromJson<String>(json['type']),
+      actionAt: serializer.fromJson<int>(json['actionAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'groupHistoryId': serializer.toJson<String>(groupHistoryId),
+      'groupId': serializer.toJson<String>(groupId),
+      'contactId': serializer.toJson<int?>(contactId),
+      'affectedContactId': serializer.toJson<int?>(affectedContactId),
+      'oldGroupName': serializer.toJson<String?>(oldGroupName),
+      'newGroupName': serializer.toJson<String?>(newGroupName),
+      'newDeleteMessagesAfterMilliseconds': serializer.toJson<int?>(
+        newDeleteMessagesAfterMilliseconds,
+      ),
+      'type': serializer.toJson<String>(type),
+      'actionAt': serializer.toJson<int>(actionAt),
+    };
+  }
+
+  GroupHistoriesData copyWith({
+    String? groupHistoryId,
+    String? groupId,
+    Value<int?> contactId = const Value.absent(),
+    Value<int?> affectedContactId = const Value.absent(),
+    Value<String?> oldGroupName = const Value.absent(),
+    Value<String?> newGroupName = const Value.absent(),
+    Value<int?> newDeleteMessagesAfterMilliseconds = const Value.absent(),
+    String? type,
+    int? actionAt,
+  }) => GroupHistoriesData(
+    groupHistoryId: groupHistoryId ?? this.groupHistoryId,
+    groupId: groupId ?? this.groupId,
+    contactId: contactId.present ? contactId.value : this.contactId,
+    affectedContactId: affectedContactId.present
+        ? affectedContactId.value
+        : this.affectedContactId,
+    oldGroupName: oldGroupName.present ? oldGroupName.value : this.oldGroupName,
+    newGroupName: newGroupName.present ? newGroupName.value : this.newGroupName,
+    newDeleteMessagesAfterMilliseconds:
+        newDeleteMessagesAfterMilliseconds.present
+        ? newDeleteMessagesAfterMilliseconds.value
+        : this.newDeleteMessagesAfterMilliseconds,
+    type: type ?? this.type,
+    actionAt: actionAt ?? this.actionAt,
+  );
+  GroupHistoriesData copyWithCompanion(GroupHistoriesCompanion data) {
+    return GroupHistoriesData(
+      groupHistoryId: data.groupHistoryId.present
+          ? data.groupHistoryId.value
+          : this.groupHistoryId,
+      groupId: data.groupId.present ? data.groupId.value : this.groupId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      affectedContactId: data.affectedContactId.present
+          ? data.affectedContactId.value
+          : this.affectedContactId,
+      oldGroupName: data.oldGroupName.present
+          ? data.oldGroupName.value
+          : this.oldGroupName,
+      newGroupName: data.newGroupName.present
+          ? data.newGroupName.value
+          : this.newGroupName,
+      newDeleteMessagesAfterMilliseconds:
+          data.newDeleteMessagesAfterMilliseconds.present
+          ? data.newDeleteMessagesAfterMilliseconds.value
+          : this.newDeleteMessagesAfterMilliseconds,
+      type: data.type.present ? data.type.value : this.type,
+      actionAt: data.actionAt.present ? data.actionAt.value : this.actionAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('GroupHistoriesData(')
+          ..write('groupHistoryId: $groupHistoryId, ')
+          ..write('groupId: $groupId, ')
+          ..write('contactId: $contactId, ')
+          ..write('affectedContactId: $affectedContactId, ')
+          ..write('oldGroupName: $oldGroupName, ')
+          ..write('newGroupName: $newGroupName, ')
+          ..write(
+            'newDeleteMessagesAfterMilliseconds: $newDeleteMessagesAfterMilliseconds, ',
+          )
+          ..write('type: $type, ')
+          ..write('actionAt: $actionAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    groupHistoryId,
+    groupId,
+    contactId,
+    affectedContactId,
+    oldGroupName,
+    newGroupName,
+    newDeleteMessagesAfterMilliseconds,
+    type,
+    actionAt,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is GroupHistoriesData &&
+          other.groupHistoryId == this.groupHistoryId &&
+          other.groupId == this.groupId &&
+          other.contactId == this.contactId &&
+          other.affectedContactId == this.affectedContactId &&
+          other.oldGroupName == this.oldGroupName &&
+          other.newGroupName == this.newGroupName &&
+          other.newDeleteMessagesAfterMilliseconds ==
+              this.newDeleteMessagesAfterMilliseconds &&
+          other.type == this.type &&
+          other.actionAt == this.actionAt);
+}
+
+class GroupHistoriesCompanion extends UpdateCompanion<GroupHistoriesData> {
+  final Value<String> groupHistoryId;
+  final Value<String> groupId;
+  final Value<int?> contactId;
+  final Value<int?> affectedContactId;
+  final Value<String?> oldGroupName;
+  final Value<String?> newGroupName;
+  final Value<int?> newDeleteMessagesAfterMilliseconds;
+  final Value<String> type;
+  final Value<int> actionAt;
+  final Value<int> rowid;
+  const GroupHistoriesCompanion({
+    this.groupHistoryId = const Value.absent(),
+    this.groupId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.affectedContactId = const Value.absent(),
+    this.oldGroupName = const Value.absent(),
+    this.newGroupName = const Value.absent(),
+    this.newDeleteMessagesAfterMilliseconds = const Value.absent(),
+    this.type = const Value.absent(),
+    this.actionAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  GroupHistoriesCompanion.insert({
+    required String groupHistoryId,
+    required String groupId,
+    this.contactId = const Value.absent(),
+    this.affectedContactId = const Value.absent(),
+    this.oldGroupName = const Value.absent(),
+    this.newGroupName = const Value.absent(),
+    this.newDeleteMessagesAfterMilliseconds = const Value.absent(),
+    required String type,
+    this.actionAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : groupHistoryId = Value(groupHistoryId),
+       groupId = Value(groupId),
+       type = Value(type);
+  static Insertable<GroupHistoriesData> custom({
+    Expression<String>? groupHistoryId,
+    Expression<String>? groupId,
+    Expression<int>? contactId,
+    Expression<int>? affectedContactId,
+    Expression<String>? oldGroupName,
+    Expression<String>? newGroupName,
+    Expression<int>? newDeleteMessagesAfterMilliseconds,
+    Expression<String>? type,
+    Expression<int>? actionAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (groupHistoryId != null) 'group_history_id': groupHistoryId,
+      if (groupId != null) 'group_id': groupId,
+      if (contactId != null) 'contact_id': contactId,
+      if (affectedContactId != null) 'affected_contact_id': affectedContactId,
+      if (oldGroupName != null) 'old_group_name': oldGroupName,
+      if (newGroupName != null) 'new_group_name': newGroupName,
+      if (newDeleteMessagesAfterMilliseconds != null)
+        'new_delete_messages_after_milliseconds':
+            newDeleteMessagesAfterMilliseconds,
+      if (type != null) 'type': type,
+      if (actionAt != null) 'action_at': actionAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  GroupHistoriesCompanion copyWith({
+    Value<String>? groupHistoryId,
+    Value<String>? groupId,
+    Value<int?>? contactId,
+    Value<int?>? affectedContactId,
+    Value<String?>? oldGroupName,
+    Value<String?>? newGroupName,
+    Value<int?>? newDeleteMessagesAfterMilliseconds,
+    Value<String>? type,
+    Value<int>? actionAt,
+    Value<int>? rowid,
+  }) {
+    return GroupHistoriesCompanion(
+      groupHistoryId: groupHistoryId ?? this.groupHistoryId,
+      groupId: groupId ?? this.groupId,
+      contactId: contactId ?? this.contactId,
+      affectedContactId: affectedContactId ?? this.affectedContactId,
+      oldGroupName: oldGroupName ?? this.oldGroupName,
+      newGroupName: newGroupName ?? this.newGroupName,
+      newDeleteMessagesAfterMilliseconds:
+          newDeleteMessagesAfterMilliseconds ??
+          this.newDeleteMessagesAfterMilliseconds,
+      type: type ?? this.type,
+      actionAt: actionAt ?? this.actionAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (groupHistoryId.present) {
+      map['group_history_id'] = Variable<String>(groupHistoryId.value);
+    }
+    if (groupId.present) {
+      map['group_id'] = Variable<String>(groupId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (affectedContactId.present) {
+      map['affected_contact_id'] = Variable<int>(affectedContactId.value);
+    }
+    if (oldGroupName.present) {
+      map['old_group_name'] = Variable<String>(oldGroupName.value);
+    }
+    if (newGroupName.present) {
+      map['new_group_name'] = Variable<String>(newGroupName.value);
+    }
+    if (newDeleteMessagesAfterMilliseconds.present) {
+      map['new_delete_messages_after_milliseconds'] = Variable<int>(
+        newDeleteMessagesAfterMilliseconds.value,
+      );
+    }
+    if (type.present) {
+      map['type'] = Variable<String>(type.value);
+    }
+    if (actionAt.present) {
+      map['action_at'] = Variable<int>(actionAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('GroupHistoriesCompanion(')
+          ..write('groupHistoryId: $groupHistoryId, ')
+          ..write('groupId: $groupId, ')
+          ..write('contactId: $contactId, ')
+          ..write('affectedContactId: $affectedContactId, ')
+          ..write('oldGroupName: $oldGroupName, ')
+          ..write('newGroupName: $newGroupName, ')
+          ..write(
+            'newDeleteMessagesAfterMilliseconds: $newDeleteMessagesAfterMilliseconds, ',
+          )
+          ..write('type: $type, ')
+          ..write('actionAt: $actionAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class KeyVerifications extends Table
+    with TableInfo<KeyVerifications, KeyVerificationsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  KeyVerifications(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<String> type = GeneratedColumn<String>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [contactId, type, createdAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'key_verifications';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {contactId};
+  @override
+  KeyVerificationsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return KeyVerificationsData(
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      )!,
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}type'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  KeyVerifications createAlias(String alias) {
+    return KeyVerifications(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(contact_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class KeyVerificationsData extends DataClass
+    implements Insertable<KeyVerificationsData> {
+  final int contactId;
+  final String type;
+  final int createdAt;
+  const KeyVerificationsData({
+    required this.contactId,
+    required this.type,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['contact_id'] = Variable<int>(contactId);
+    map['type'] = Variable<String>(type);
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  KeyVerificationsCompanion toCompanion(bool nullToAbsent) {
+    return KeyVerificationsCompanion(
+      contactId: Value(contactId),
+      type: Value(type),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory KeyVerificationsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return KeyVerificationsData(
+      contactId: serializer.fromJson<int>(json['contactId']),
+      type: serializer.fromJson<String>(json['type']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'contactId': serializer.toJson<int>(contactId),
+      'type': serializer.toJson<String>(type),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  KeyVerificationsData copyWith({
+    int? contactId,
+    String? type,
+    int? createdAt,
+  }) => KeyVerificationsData(
+    contactId: contactId ?? this.contactId,
+    type: type ?? this.type,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  KeyVerificationsData copyWithCompanion(KeyVerificationsCompanion data) {
+    return KeyVerificationsData(
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      type: data.type.present ? data.type.value : this.type,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('KeyVerificationsData(')
+          ..write('contactId: $contactId, ')
+          ..write('type: $type, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(contactId, type, createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is KeyVerificationsData &&
+          other.contactId == this.contactId &&
+          other.type == this.type &&
+          other.createdAt == this.createdAt);
+}
+
+class KeyVerificationsCompanion extends UpdateCompanion<KeyVerificationsData> {
+  final Value<int> contactId;
+  final Value<String> type;
+  final Value<int> createdAt;
+  const KeyVerificationsCompanion({
+    this.contactId = const Value.absent(),
+    this.type = const Value.absent(),
+    this.createdAt = const Value.absent(),
+  });
+  KeyVerificationsCompanion.insert({
+    this.contactId = const Value.absent(),
+    required String type,
+    this.createdAt = const Value.absent(),
+  }) : type = Value(type);
+  static Insertable<KeyVerificationsData> custom({
+    Expression<int>? contactId,
+    Expression<String>? type,
+    Expression<int>? createdAt,
+  }) {
+    return RawValuesInsertable({
+      if (contactId != null) 'contact_id': contactId,
+      if (type != null) 'type': type,
+      if (createdAt != null) 'created_at': createdAt,
+    });
+  }
+
+  KeyVerificationsCompanion copyWith({
+    Value<int>? contactId,
+    Value<String>? type,
+    Value<int>? createdAt,
+  }) {
+    return KeyVerificationsCompanion(
+      contactId: contactId ?? this.contactId,
+      type: type ?? this.type,
+      createdAt: createdAt ?? this.createdAt,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (type.present) {
+      map['type'] = Variable<String>(type.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('KeyVerificationsCompanion(')
+          ..write('contactId: $contactId, ')
+          ..write('type: $type, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class VerificationTokens extends Table
+    with TableInfo<VerificationTokens, VerificationTokensData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  VerificationTokens(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> tokenId = GeneratedColumn<int>(
+    'token_id',
+    aliasedName,
+    false,
+    hasAutoIncrement: true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL PRIMARY KEY AUTOINCREMENT',
+  );
+  late final GeneratedColumn<i2.Uint8List> token =
+      GeneratedColumn<i2.Uint8List>(
+        'token',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [tokenId, token, createdAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'verification_tokens';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {tokenId};
+  @override
+  VerificationTokensData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return VerificationTokensData(
+      tokenId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}token_id'],
+      )!,
+      token: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}token'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  VerificationTokens createAlias(String alias) {
+    return VerificationTokens(attachedDatabase, alias);
+  }
+
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class VerificationTokensData extends DataClass
+    implements Insertable<VerificationTokensData> {
+  final int tokenId;
+  final i2.Uint8List token;
+  final int createdAt;
+  const VerificationTokensData({
+    required this.tokenId,
+    required this.token,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['token_id'] = Variable<int>(tokenId);
+    map['token'] = Variable<i2.Uint8List>(token);
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  VerificationTokensCompanion toCompanion(bool nullToAbsent) {
+    return VerificationTokensCompanion(
+      tokenId: Value(tokenId),
+      token: Value(token),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory VerificationTokensData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return VerificationTokensData(
+      tokenId: serializer.fromJson<int>(json['tokenId']),
+      token: serializer.fromJson<i2.Uint8List>(json['token']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'tokenId': serializer.toJson<int>(tokenId),
+      'token': serializer.toJson<i2.Uint8List>(token),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  VerificationTokensData copyWith({
+    int? tokenId,
+    i2.Uint8List? token,
+    int? createdAt,
+  }) => VerificationTokensData(
+    tokenId: tokenId ?? this.tokenId,
+    token: token ?? this.token,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  VerificationTokensData copyWithCompanion(VerificationTokensCompanion data) {
+    return VerificationTokensData(
+      tokenId: data.tokenId.present ? data.tokenId.value : this.tokenId,
+      token: data.token.present ? data.token.value : this.token,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('VerificationTokensData(')
+          ..write('tokenId: $tokenId, ')
+          ..write('token: $token, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(tokenId, $driftBlobEquality.hash(token), createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is VerificationTokensData &&
+          other.tokenId == this.tokenId &&
+          $driftBlobEquality.equals(other.token, this.token) &&
+          other.createdAt == this.createdAt);
+}
+
+class VerificationTokensCompanion
+    extends UpdateCompanion<VerificationTokensData> {
+  final Value<int> tokenId;
+  final Value<i2.Uint8List> token;
+  final Value<int> createdAt;
+  const VerificationTokensCompanion({
+    this.tokenId = const Value.absent(),
+    this.token = const Value.absent(),
+    this.createdAt = const Value.absent(),
+  });
+  VerificationTokensCompanion.insert({
+    this.tokenId = const Value.absent(),
+    required i2.Uint8List token,
+    this.createdAt = const Value.absent(),
+  }) : token = Value(token);
+  static Insertable<VerificationTokensData> custom({
+    Expression<int>? tokenId,
+    Expression<i2.Uint8List>? token,
+    Expression<int>? createdAt,
+  }) {
+    return RawValuesInsertable({
+      if (tokenId != null) 'token_id': tokenId,
+      if (token != null) 'token': token,
+      if (createdAt != null) 'created_at': createdAt,
+    });
+  }
+
+  VerificationTokensCompanion copyWith({
+    Value<int>? tokenId,
+    Value<i2.Uint8List>? token,
+    Value<int>? createdAt,
+  }) {
+    return VerificationTokensCompanion(
+      tokenId: tokenId ?? this.tokenId,
+      token: token ?? this.token,
+      createdAt: createdAt ?? this.createdAt,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (tokenId.present) {
+      map['token_id'] = Variable<int>(tokenId.value);
+    }
+    if (token.present) {
+      map['token'] = Variable<i2.Uint8List>(token.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('VerificationTokensCompanion(')
+          ..write('tokenId: $tokenId, ')
+          ..write('token: $token, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class UserDiscoveryAnnouncedUsers extends Table
+    with
+        TableInfo<
+          UserDiscoveryAnnouncedUsers,
+          UserDiscoveryAnnouncedUsersData
+        > {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  UserDiscoveryAnnouncedUsers(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> announcedUserId = GeneratedColumn<int>(
+    'announced_user_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> announcedPublicKey =
+      GeneratedColumn<i2.Uint8List>(
+        'announced_public_key',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> publicId = GeneratedColumn<int>(
+    'public_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL UNIQUE',
+  );
+  late final GeneratedColumn<String> username = GeneratedColumn<String>(
+    'username',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> wasShownToTheUser = GeneratedColumn<int>(
+    'was_shown_to_the_user',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT 0 CHECK (was_shown_to_the_user IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> isHidden = GeneratedColumn<int>(
+    'is_hidden',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (is_hidden IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    announcedUserId,
+    announcedPublicKey,
+    publicId,
+    username,
+    wasShownToTheUser,
+    isHidden,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_discovery_announced_users';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {announcedUserId};
+  @override
+  UserDiscoveryAnnouncedUsersData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserDiscoveryAnnouncedUsersData(
+      announcedUserId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}announced_user_id'],
+      )!,
+      announcedPublicKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}announced_public_key'],
+      )!,
+      publicId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}public_id'],
+      )!,
+      username: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}username'],
+      ),
+      wasShownToTheUser: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}was_shown_to_the_user'],
+      )!,
+      isHidden: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}is_hidden'],
+      )!,
+    );
+  }
+
+  @override
+  UserDiscoveryAnnouncedUsers createAlias(String alias) {
+    return UserDiscoveryAnnouncedUsers(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const [
+    'PRIMARY KEY(announced_user_id)',
+  ];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class UserDiscoveryAnnouncedUsersData extends DataClass
+    implements Insertable<UserDiscoveryAnnouncedUsersData> {
+  final int announcedUserId;
+  final i2.Uint8List announcedPublicKey;
+  final int publicId;
+  final String? username;
+  final int wasShownToTheUser;
+  final int isHidden;
+  const UserDiscoveryAnnouncedUsersData({
+    required this.announcedUserId,
+    required this.announcedPublicKey,
+    required this.publicId,
+    this.username,
+    required this.wasShownToTheUser,
+    required this.isHidden,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['announced_user_id'] = Variable<int>(announcedUserId);
+    map['announced_public_key'] = Variable<i2.Uint8List>(announcedPublicKey);
+    map['public_id'] = Variable<int>(publicId);
+    if (!nullToAbsent || username != null) {
+      map['username'] = Variable<String>(username);
+    }
+    map['was_shown_to_the_user'] = Variable<int>(wasShownToTheUser);
+    map['is_hidden'] = Variable<int>(isHidden);
+    return map;
+  }
+
+  UserDiscoveryAnnouncedUsersCompanion toCompanion(bool nullToAbsent) {
+    return UserDiscoveryAnnouncedUsersCompanion(
+      announcedUserId: Value(announcedUserId),
+      announcedPublicKey: Value(announcedPublicKey),
+      publicId: Value(publicId),
+      username: username == null && nullToAbsent
+          ? const Value.absent()
+          : Value(username),
+      wasShownToTheUser: Value(wasShownToTheUser),
+      isHidden: Value(isHidden),
+    );
+  }
+
+  factory UserDiscoveryAnnouncedUsersData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserDiscoveryAnnouncedUsersData(
+      announcedUserId: serializer.fromJson<int>(json['announcedUserId']),
+      announcedPublicKey: serializer.fromJson<i2.Uint8List>(
+        json['announcedPublicKey'],
+      ),
+      publicId: serializer.fromJson<int>(json['publicId']),
+      username: serializer.fromJson<String?>(json['username']),
+      wasShownToTheUser: serializer.fromJson<int>(json['wasShownToTheUser']),
+      isHidden: serializer.fromJson<int>(json['isHidden']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'announcedUserId': serializer.toJson<int>(announcedUserId),
+      'announcedPublicKey': serializer.toJson<i2.Uint8List>(announcedPublicKey),
+      'publicId': serializer.toJson<int>(publicId),
+      'username': serializer.toJson<String?>(username),
+      'wasShownToTheUser': serializer.toJson<int>(wasShownToTheUser),
+      'isHidden': serializer.toJson<int>(isHidden),
+    };
+  }
+
+  UserDiscoveryAnnouncedUsersData copyWith({
+    int? announcedUserId,
+    i2.Uint8List? announcedPublicKey,
+    int? publicId,
+    Value<String?> username = const Value.absent(),
+    int? wasShownToTheUser,
+    int? isHidden,
+  }) => UserDiscoveryAnnouncedUsersData(
+    announcedUserId: announcedUserId ?? this.announcedUserId,
+    announcedPublicKey: announcedPublicKey ?? this.announcedPublicKey,
+    publicId: publicId ?? this.publicId,
+    username: username.present ? username.value : this.username,
+    wasShownToTheUser: wasShownToTheUser ?? this.wasShownToTheUser,
+    isHidden: isHidden ?? this.isHidden,
+  );
+  UserDiscoveryAnnouncedUsersData copyWithCompanion(
+    UserDiscoveryAnnouncedUsersCompanion data,
+  ) {
+    return UserDiscoveryAnnouncedUsersData(
+      announcedUserId: data.announcedUserId.present
+          ? data.announcedUserId.value
+          : this.announcedUserId,
+      announcedPublicKey: data.announcedPublicKey.present
+          ? data.announcedPublicKey.value
+          : this.announcedPublicKey,
+      publicId: data.publicId.present ? data.publicId.value : this.publicId,
+      username: data.username.present ? data.username.value : this.username,
+      wasShownToTheUser: data.wasShownToTheUser.present
+          ? data.wasShownToTheUser.value
+          : this.wasShownToTheUser,
+      isHidden: data.isHidden.present ? data.isHidden.value : this.isHidden,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryAnnouncedUsersData(')
+          ..write('announcedUserId: $announcedUserId, ')
+          ..write('announcedPublicKey: $announcedPublicKey, ')
+          ..write('publicId: $publicId, ')
+          ..write('username: $username, ')
+          ..write('wasShownToTheUser: $wasShownToTheUser, ')
+          ..write('isHidden: $isHidden')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    announcedUserId,
+    $driftBlobEquality.hash(announcedPublicKey),
+    publicId,
+    username,
+    wasShownToTheUser,
+    isHidden,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserDiscoveryAnnouncedUsersData &&
+          other.announcedUserId == this.announcedUserId &&
+          $driftBlobEquality.equals(
+            other.announcedPublicKey,
+            this.announcedPublicKey,
+          ) &&
+          other.publicId == this.publicId &&
+          other.username == this.username &&
+          other.wasShownToTheUser == this.wasShownToTheUser &&
+          other.isHidden == this.isHidden);
+}
+
+class UserDiscoveryAnnouncedUsersCompanion
+    extends UpdateCompanion<UserDiscoveryAnnouncedUsersData> {
+  final Value<int> announcedUserId;
+  final Value<i2.Uint8List> announcedPublicKey;
+  final Value<int> publicId;
+  final Value<String?> username;
+  final Value<int> wasShownToTheUser;
+  final Value<int> isHidden;
+  const UserDiscoveryAnnouncedUsersCompanion({
+    this.announcedUserId = const Value.absent(),
+    this.announcedPublicKey = const Value.absent(),
+    this.publicId = const Value.absent(),
+    this.username = const Value.absent(),
+    this.wasShownToTheUser = const Value.absent(),
+    this.isHidden = const Value.absent(),
+  });
+  UserDiscoveryAnnouncedUsersCompanion.insert({
+    this.announcedUserId = const Value.absent(),
+    required i2.Uint8List announcedPublicKey,
+    required int publicId,
+    this.username = const Value.absent(),
+    this.wasShownToTheUser = const Value.absent(),
+    this.isHidden = const Value.absent(),
+  }) : announcedPublicKey = Value(announcedPublicKey),
+       publicId = Value(publicId);
+  static Insertable<UserDiscoveryAnnouncedUsersData> custom({
+    Expression<int>? announcedUserId,
+    Expression<i2.Uint8List>? announcedPublicKey,
+    Expression<int>? publicId,
+    Expression<String>? username,
+    Expression<int>? wasShownToTheUser,
+    Expression<int>? isHidden,
+  }) {
+    return RawValuesInsertable({
+      if (announcedUserId != null) 'announced_user_id': announcedUserId,
+      if (announcedPublicKey != null)
+        'announced_public_key': announcedPublicKey,
+      if (publicId != null) 'public_id': publicId,
+      if (username != null) 'username': username,
+      if (wasShownToTheUser != null) 'was_shown_to_the_user': wasShownToTheUser,
+      if (isHidden != null) 'is_hidden': isHidden,
+    });
+  }
+
+  UserDiscoveryAnnouncedUsersCompanion copyWith({
+    Value<int>? announcedUserId,
+    Value<i2.Uint8List>? announcedPublicKey,
+    Value<int>? publicId,
+    Value<String?>? username,
+    Value<int>? wasShownToTheUser,
+    Value<int>? isHidden,
+  }) {
+    return UserDiscoveryAnnouncedUsersCompanion(
+      announcedUserId: announcedUserId ?? this.announcedUserId,
+      announcedPublicKey: announcedPublicKey ?? this.announcedPublicKey,
+      publicId: publicId ?? this.publicId,
+      username: username ?? this.username,
+      wasShownToTheUser: wasShownToTheUser ?? this.wasShownToTheUser,
+      isHidden: isHidden ?? this.isHidden,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (announcedUserId.present) {
+      map['announced_user_id'] = Variable<int>(announcedUserId.value);
+    }
+    if (announcedPublicKey.present) {
+      map['announced_public_key'] = Variable<i2.Uint8List>(
+        announcedPublicKey.value,
+      );
+    }
+    if (publicId.present) {
+      map['public_id'] = Variable<int>(publicId.value);
+    }
+    if (username.present) {
+      map['username'] = Variable<String>(username.value);
+    }
+    if (wasShownToTheUser.present) {
+      map['was_shown_to_the_user'] = Variable<int>(wasShownToTheUser.value);
+    }
+    if (isHidden.present) {
+      map['is_hidden'] = Variable<int>(isHidden.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryAnnouncedUsersCompanion(')
+          ..write('announcedUserId: $announcedUserId, ')
+          ..write('announcedPublicKey: $announcedPublicKey, ')
+          ..write('publicId: $publicId, ')
+          ..write('username: $username, ')
+          ..write('wasShownToTheUser: $wasShownToTheUser, ')
+          ..write('isHidden: $isHidden')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class UserDiscoveryUserRelations extends Table
+    with TableInfo<UserDiscoveryUserRelations, UserDiscoveryUserRelationsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  UserDiscoveryUserRelations(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> announcedUserId = GeneratedColumn<int>(
+    'announced_user_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES user_discovery_announced_users(announced_user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> fromContactId = GeneratedColumn<int>(
+    'from_contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> publicKeyVerifiedTimestamp =
+      GeneratedColumn<int>(
+        'public_key_verified_timestamp',
+        aliasedName,
+        true,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  @override
+  List<GeneratedColumn> get $columns => [
+    announcedUserId,
+    fromContactId,
+    publicKeyVerifiedTimestamp,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_discovery_user_relations';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {announcedUserId, fromContactId};
+  @override
+  UserDiscoveryUserRelationsData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserDiscoveryUserRelationsData(
+      announcedUserId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}announced_user_id'],
+      )!,
+      fromContactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}from_contact_id'],
+      )!,
+      publicKeyVerifiedTimestamp: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}public_key_verified_timestamp'],
+      ),
+    );
+  }
+
+  @override
+  UserDiscoveryUserRelations createAlias(String alias) {
+    return UserDiscoveryUserRelations(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const [
+    'PRIMARY KEY(announced_user_id, from_contact_id)',
+  ];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class UserDiscoveryUserRelationsData extends DataClass
+    implements Insertable<UserDiscoveryUserRelationsData> {
+  final int announcedUserId;
+  final int fromContactId;
+  final int? publicKeyVerifiedTimestamp;
+  const UserDiscoveryUserRelationsData({
+    required this.announcedUserId,
+    required this.fromContactId,
+    this.publicKeyVerifiedTimestamp,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['announced_user_id'] = Variable<int>(announcedUserId);
+    map['from_contact_id'] = Variable<int>(fromContactId);
+    if (!nullToAbsent || publicKeyVerifiedTimestamp != null) {
+      map['public_key_verified_timestamp'] = Variable<int>(
+        publicKeyVerifiedTimestamp,
+      );
+    }
+    return map;
+  }
+
+  UserDiscoveryUserRelationsCompanion toCompanion(bool nullToAbsent) {
+    return UserDiscoveryUserRelationsCompanion(
+      announcedUserId: Value(announcedUserId),
+      fromContactId: Value(fromContactId),
+      publicKeyVerifiedTimestamp:
+          publicKeyVerifiedTimestamp == null && nullToAbsent
+          ? const Value.absent()
+          : Value(publicKeyVerifiedTimestamp),
+    );
+  }
+
+  factory UserDiscoveryUserRelationsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserDiscoveryUserRelationsData(
+      announcedUserId: serializer.fromJson<int>(json['announcedUserId']),
+      fromContactId: serializer.fromJson<int>(json['fromContactId']),
+      publicKeyVerifiedTimestamp: serializer.fromJson<int?>(
+        json['publicKeyVerifiedTimestamp'],
+      ),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'announcedUserId': serializer.toJson<int>(announcedUserId),
+      'fromContactId': serializer.toJson<int>(fromContactId),
+      'publicKeyVerifiedTimestamp': serializer.toJson<int?>(
+        publicKeyVerifiedTimestamp,
+      ),
+    };
+  }
+
+  UserDiscoveryUserRelationsData copyWith({
+    int? announcedUserId,
+    int? fromContactId,
+    Value<int?> publicKeyVerifiedTimestamp = const Value.absent(),
+  }) => UserDiscoveryUserRelationsData(
+    announcedUserId: announcedUserId ?? this.announcedUserId,
+    fromContactId: fromContactId ?? this.fromContactId,
+    publicKeyVerifiedTimestamp: publicKeyVerifiedTimestamp.present
+        ? publicKeyVerifiedTimestamp.value
+        : this.publicKeyVerifiedTimestamp,
+  );
+  UserDiscoveryUserRelationsData copyWithCompanion(
+    UserDiscoveryUserRelationsCompanion data,
+  ) {
+    return UserDiscoveryUserRelationsData(
+      announcedUserId: data.announcedUserId.present
+          ? data.announcedUserId.value
+          : this.announcedUserId,
+      fromContactId: data.fromContactId.present
+          ? data.fromContactId.value
+          : this.fromContactId,
+      publicKeyVerifiedTimestamp: data.publicKeyVerifiedTimestamp.present
+          ? data.publicKeyVerifiedTimestamp.value
+          : this.publicKeyVerifiedTimestamp,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryUserRelationsData(')
+          ..write('announcedUserId: $announcedUserId, ')
+          ..write('fromContactId: $fromContactId, ')
+          ..write('publicKeyVerifiedTimestamp: $publicKeyVerifiedTimestamp')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(announcedUserId, fromContactId, publicKeyVerifiedTimestamp);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserDiscoveryUserRelationsData &&
+          other.announcedUserId == this.announcedUserId &&
+          other.fromContactId == this.fromContactId &&
+          other.publicKeyVerifiedTimestamp == this.publicKeyVerifiedTimestamp);
+}
+
+class UserDiscoveryUserRelationsCompanion
+    extends UpdateCompanion<UserDiscoveryUserRelationsData> {
+  final Value<int> announcedUserId;
+  final Value<int> fromContactId;
+  final Value<int?> publicKeyVerifiedTimestamp;
+  final Value<int> rowid;
+  const UserDiscoveryUserRelationsCompanion({
+    this.announcedUserId = const Value.absent(),
+    this.fromContactId = const Value.absent(),
+    this.publicKeyVerifiedTimestamp = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  UserDiscoveryUserRelationsCompanion.insert({
+    required int announcedUserId,
+    required int fromContactId,
+    this.publicKeyVerifiedTimestamp = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : announcedUserId = Value(announcedUserId),
+       fromContactId = Value(fromContactId);
+  static Insertable<UserDiscoveryUserRelationsData> custom({
+    Expression<int>? announcedUserId,
+    Expression<int>? fromContactId,
+    Expression<int>? publicKeyVerifiedTimestamp,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (announcedUserId != null) 'announced_user_id': announcedUserId,
+      if (fromContactId != null) 'from_contact_id': fromContactId,
+      if (publicKeyVerifiedTimestamp != null)
+        'public_key_verified_timestamp': publicKeyVerifiedTimestamp,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  UserDiscoveryUserRelationsCompanion copyWith({
+    Value<int>? announcedUserId,
+    Value<int>? fromContactId,
+    Value<int?>? publicKeyVerifiedTimestamp,
+    Value<int>? rowid,
+  }) {
+    return UserDiscoveryUserRelationsCompanion(
+      announcedUserId: announcedUserId ?? this.announcedUserId,
+      fromContactId: fromContactId ?? this.fromContactId,
+      publicKeyVerifiedTimestamp:
+          publicKeyVerifiedTimestamp ?? this.publicKeyVerifiedTimestamp,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (announcedUserId.present) {
+      map['announced_user_id'] = Variable<int>(announcedUserId.value);
+    }
+    if (fromContactId.present) {
+      map['from_contact_id'] = Variable<int>(fromContactId.value);
+    }
+    if (publicKeyVerifiedTimestamp.present) {
+      map['public_key_verified_timestamp'] = Variable<int>(
+        publicKeyVerifiedTimestamp.value,
+      );
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryUserRelationsCompanion(')
+          ..write('announcedUserId: $announcedUserId, ')
+          ..write('fromContactId: $fromContactId, ')
+          ..write('publicKeyVerifiedTimestamp: $publicKeyVerifiedTimestamp, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class UserDiscoveryOtherPromotions extends Table
+    with
+        TableInfo<
+          UserDiscoveryOtherPromotions,
+          UserDiscoveryOtherPromotionsData
+        > {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  UserDiscoveryOtherPromotions(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> fromContactId = GeneratedColumn<int>(
+    'from_contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> promotionId = GeneratedColumn<int>(
+    'promotion_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> publicId = GeneratedColumn<int>(
+    'public_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> threshold = GeneratedColumn<int>(
+    'threshold',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> announcementShare =
+      GeneratedColumn<i2.Uint8List>(
+        'announcement_share',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> publicKeyVerifiedTimestamp =
+      GeneratedColumn<int>(
+        'public_key_verified_timestamp',
+        aliasedName,
+        true,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  @override
+  List<GeneratedColumn> get $columns => [
+    fromContactId,
+    promotionId,
+    publicId,
+    threshold,
+    announcementShare,
+    publicKeyVerifiedTimestamp,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_discovery_other_promotions';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {fromContactId, promotionId};
+  @override
+  UserDiscoveryOtherPromotionsData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserDiscoveryOtherPromotionsData(
+      fromContactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}from_contact_id'],
+      )!,
+      promotionId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}promotion_id'],
+      )!,
+      publicId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}public_id'],
+      )!,
+      threshold: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}threshold'],
+      )!,
+      announcementShare: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}announcement_share'],
+      )!,
+      publicKeyVerifiedTimestamp: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}public_key_verified_timestamp'],
+      ),
+    );
+  }
+
+  @override
+  UserDiscoveryOtherPromotions createAlias(String alias) {
+    return UserDiscoveryOtherPromotions(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const [
+    'PRIMARY KEY(from_contact_id, promotion_id)',
+  ];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class UserDiscoveryOtherPromotionsData extends DataClass
+    implements Insertable<UserDiscoveryOtherPromotionsData> {
+  final int fromContactId;
+  final int promotionId;
+  final int publicId;
+  final int threshold;
+  final i2.Uint8List announcementShare;
+  final int? publicKeyVerifiedTimestamp;
+  const UserDiscoveryOtherPromotionsData({
+    required this.fromContactId,
+    required this.promotionId,
+    required this.publicId,
+    required this.threshold,
+    required this.announcementShare,
+    this.publicKeyVerifiedTimestamp,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['from_contact_id'] = Variable<int>(fromContactId);
+    map['promotion_id'] = Variable<int>(promotionId);
+    map['public_id'] = Variable<int>(publicId);
+    map['threshold'] = Variable<int>(threshold);
+    map['announcement_share'] = Variable<i2.Uint8List>(announcementShare);
+    if (!nullToAbsent || publicKeyVerifiedTimestamp != null) {
+      map['public_key_verified_timestamp'] = Variable<int>(
+        publicKeyVerifiedTimestamp,
+      );
+    }
+    return map;
+  }
+
+  UserDiscoveryOtherPromotionsCompanion toCompanion(bool nullToAbsent) {
+    return UserDiscoveryOtherPromotionsCompanion(
+      fromContactId: Value(fromContactId),
+      promotionId: Value(promotionId),
+      publicId: Value(publicId),
+      threshold: Value(threshold),
+      announcementShare: Value(announcementShare),
+      publicKeyVerifiedTimestamp:
+          publicKeyVerifiedTimestamp == null && nullToAbsent
+          ? const Value.absent()
+          : Value(publicKeyVerifiedTimestamp),
+    );
+  }
+
+  factory UserDiscoveryOtherPromotionsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserDiscoveryOtherPromotionsData(
+      fromContactId: serializer.fromJson<int>(json['fromContactId']),
+      promotionId: serializer.fromJson<int>(json['promotionId']),
+      publicId: serializer.fromJson<int>(json['publicId']),
+      threshold: serializer.fromJson<int>(json['threshold']),
+      announcementShare: serializer.fromJson<i2.Uint8List>(
+        json['announcementShare'],
+      ),
+      publicKeyVerifiedTimestamp: serializer.fromJson<int?>(
+        json['publicKeyVerifiedTimestamp'],
+      ),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'fromContactId': serializer.toJson<int>(fromContactId),
+      'promotionId': serializer.toJson<int>(promotionId),
+      'publicId': serializer.toJson<int>(publicId),
+      'threshold': serializer.toJson<int>(threshold),
+      'announcementShare': serializer.toJson<i2.Uint8List>(announcementShare),
+      'publicKeyVerifiedTimestamp': serializer.toJson<int?>(
+        publicKeyVerifiedTimestamp,
+      ),
+    };
+  }
+
+  UserDiscoveryOtherPromotionsData copyWith({
+    int? fromContactId,
+    int? promotionId,
+    int? publicId,
+    int? threshold,
+    i2.Uint8List? announcementShare,
+    Value<int?> publicKeyVerifiedTimestamp = const Value.absent(),
+  }) => UserDiscoveryOtherPromotionsData(
+    fromContactId: fromContactId ?? this.fromContactId,
+    promotionId: promotionId ?? this.promotionId,
+    publicId: publicId ?? this.publicId,
+    threshold: threshold ?? this.threshold,
+    announcementShare: announcementShare ?? this.announcementShare,
+    publicKeyVerifiedTimestamp: publicKeyVerifiedTimestamp.present
+        ? publicKeyVerifiedTimestamp.value
+        : this.publicKeyVerifiedTimestamp,
+  );
+  UserDiscoveryOtherPromotionsData copyWithCompanion(
+    UserDiscoveryOtherPromotionsCompanion data,
+  ) {
+    return UserDiscoveryOtherPromotionsData(
+      fromContactId: data.fromContactId.present
+          ? data.fromContactId.value
+          : this.fromContactId,
+      promotionId: data.promotionId.present
+          ? data.promotionId.value
+          : this.promotionId,
+      publicId: data.publicId.present ? data.publicId.value : this.publicId,
+      threshold: data.threshold.present ? data.threshold.value : this.threshold,
+      announcementShare: data.announcementShare.present
+          ? data.announcementShare.value
+          : this.announcementShare,
+      publicKeyVerifiedTimestamp: data.publicKeyVerifiedTimestamp.present
+          ? data.publicKeyVerifiedTimestamp.value
+          : this.publicKeyVerifiedTimestamp,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryOtherPromotionsData(')
+          ..write('fromContactId: $fromContactId, ')
+          ..write('promotionId: $promotionId, ')
+          ..write('publicId: $publicId, ')
+          ..write('threshold: $threshold, ')
+          ..write('announcementShare: $announcementShare, ')
+          ..write('publicKeyVerifiedTimestamp: $publicKeyVerifiedTimestamp')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    fromContactId,
+    promotionId,
+    publicId,
+    threshold,
+    $driftBlobEquality.hash(announcementShare),
+    publicKeyVerifiedTimestamp,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserDiscoveryOtherPromotionsData &&
+          other.fromContactId == this.fromContactId &&
+          other.promotionId == this.promotionId &&
+          other.publicId == this.publicId &&
+          other.threshold == this.threshold &&
+          $driftBlobEquality.equals(
+            other.announcementShare,
+            this.announcementShare,
+          ) &&
+          other.publicKeyVerifiedTimestamp == this.publicKeyVerifiedTimestamp);
+}
+
+class UserDiscoveryOtherPromotionsCompanion
+    extends UpdateCompanion<UserDiscoveryOtherPromotionsData> {
+  final Value<int> fromContactId;
+  final Value<int> promotionId;
+  final Value<int> publicId;
+  final Value<int> threshold;
+  final Value<i2.Uint8List> announcementShare;
+  final Value<int?> publicKeyVerifiedTimestamp;
+  final Value<int> rowid;
+  const UserDiscoveryOtherPromotionsCompanion({
+    this.fromContactId = const Value.absent(),
+    this.promotionId = const Value.absent(),
+    this.publicId = const Value.absent(),
+    this.threshold = const Value.absent(),
+    this.announcementShare = const Value.absent(),
+    this.publicKeyVerifiedTimestamp = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  UserDiscoveryOtherPromotionsCompanion.insert({
+    required int fromContactId,
+    required int promotionId,
+    required int publicId,
+    required int threshold,
+    required i2.Uint8List announcementShare,
+    this.publicKeyVerifiedTimestamp = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : fromContactId = Value(fromContactId),
+       promotionId = Value(promotionId),
+       publicId = Value(publicId),
+       threshold = Value(threshold),
+       announcementShare = Value(announcementShare);
+  static Insertable<UserDiscoveryOtherPromotionsData> custom({
+    Expression<int>? fromContactId,
+    Expression<int>? promotionId,
+    Expression<int>? publicId,
+    Expression<int>? threshold,
+    Expression<i2.Uint8List>? announcementShare,
+    Expression<int>? publicKeyVerifiedTimestamp,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (fromContactId != null) 'from_contact_id': fromContactId,
+      if (promotionId != null) 'promotion_id': promotionId,
+      if (publicId != null) 'public_id': publicId,
+      if (threshold != null) 'threshold': threshold,
+      if (announcementShare != null) 'announcement_share': announcementShare,
+      if (publicKeyVerifiedTimestamp != null)
+        'public_key_verified_timestamp': publicKeyVerifiedTimestamp,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  UserDiscoveryOtherPromotionsCompanion copyWith({
+    Value<int>? fromContactId,
+    Value<int>? promotionId,
+    Value<int>? publicId,
+    Value<int>? threshold,
+    Value<i2.Uint8List>? announcementShare,
+    Value<int?>? publicKeyVerifiedTimestamp,
+    Value<int>? rowid,
+  }) {
+    return UserDiscoveryOtherPromotionsCompanion(
+      fromContactId: fromContactId ?? this.fromContactId,
+      promotionId: promotionId ?? this.promotionId,
+      publicId: publicId ?? this.publicId,
+      threshold: threshold ?? this.threshold,
+      announcementShare: announcementShare ?? this.announcementShare,
+      publicKeyVerifiedTimestamp:
+          publicKeyVerifiedTimestamp ?? this.publicKeyVerifiedTimestamp,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (fromContactId.present) {
+      map['from_contact_id'] = Variable<int>(fromContactId.value);
+    }
+    if (promotionId.present) {
+      map['promotion_id'] = Variable<int>(promotionId.value);
+    }
+    if (publicId.present) {
+      map['public_id'] = Variable<int>(publicId.value);
+    }
+    if (threshold.present) {
+      map['threshold'] = Variable<int>(threshold.value);
+    }
+    if (announcementShare.present) {
+      map['announcement_share'] = Variable<i2.Uint8List>(
+        announcementShare.value,
+      );
+    }
+    if (publicKeyVerifiedTimestamp.present) {
+      map['public_key_verified_timestamp'] = Variable<int>(
+        publicKeyVerifiedTimestamp.value,
+      );
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryOtherPromotionsCompanion(')
+          ..write('fromContactId: $fromContactId, ')
+          ..write('promotionId: $promotionId, ')
+          ..write('publicId: $publicId, ')
+          ..write('threshold: $threshold, ')
+          ..write('announcementShare: $announcementShare, ')
+          ..write('publicKeyVerifiedTimestamp: $publicKeyVerifiedTimestamp, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class UserDiscoveryOwnPromotions extends Table
+    with TableInfo<UserDiscoveryOwnPromotions, UserDiscoveryOwnPromotionsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  UserDiscoveryOwnPromotions(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> versionId = GeneratedColumn<int>(
+    'version_id',
+    aliasedName,
+    false,
+    hasAutoIncrement: true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL PRIMARY KEY AUTOINCREMENT',
+  );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<i2.Uint8List> promotion =
+      GeneratedColumn<i2.Uint8List>(
+        'promotion',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  @override
+  List<GeneratedColumn> get $columns => [versionId, contactId, promotion];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_discovery_own_promotions';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {versionId};
+  @override
+  UserDiscoveryOwnPromotionsData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserDiscoveryOwnPromotionsData(
+      versionId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}version_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      )!,
+      promotion: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}promotion'],
+      )!,
+    );
+  }
+
+  @override
+  UserDiscoveryOwnPromotions createAlias(String alias) {
+    return UserDiscoveryOwnPromotions(attachedDatabase, alias);
+  }
+
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class UserDiscoveryOwnPromotionsData extends DataClass
+    implements Insertable<UserDiscoveryOwnPromotionsData> {
+  final int versionId;
+  final int contactId;
+  final i2.Uint8List promotion;
+  const UserDiscoveryOwnPromotionsData({
+    required this.versionId,
+    required this.contactId,
+    required this.promotion,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['version_id'] = Variable<int>(versionId);
+    map['contact_id'] = Variable<int>(contactId);
+    map['promotion'] = Variable<i2.Uint8List>(promotion);
+    return map;
+  }
+
+  UserDiscoveryOwnPromotionsCompanion toCompanion(bool nullToAbsent) {
+    return UserDiscoveryOwnPromotionsCompanion(
+      versionId: Value(versionId),
+      contactId: Value(contactId),
+      promotion: Value(promotion),
+    );
+  }
+
+  factory UserDiscoveryOwnPromotionsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserDiscoveryOwnPromotionsData(
+      versionId: serializer.fromJson<int>(json['versionId']),
+      contactId: serializer.fromJson<int>(json['contactId']),
+      promotion: serializer.fromJson<i2.Uint8List>(json['promotion']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'versionId': serializer.toJson<int>(versionId),
+      'contactId': serializer.toJson<int>(contactId),
+      'promotion': serializer.toJson<i2.Uint8List>(promotion),
+    };
+  }
+
+  UserDiscoveryOwnPromotionsData copyWith({
+    int? versionId,
+    int? contactId,
+    i2.Uint8List? promotion,
+  }) => UserDiscoveryOwnPromotionsData(
+    versionId: versionId ?? this.versionId,
+    contactId: contactId ?? this.contactId,
+    promotion: promotion ?? this.promotion,
+  );
+  UserDiscoveryOwnPromotionsData copyWithCompanion(
+    UserDiscoveryOwnPromotionsCompanion data,
+  ) {
+    return UserDiscoveryOwnPromotionsData(
+      versionId: data.versionId.present ? data.versionId.value : this.versionId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      promotion: data.promotion.present ? data.promotion.value : this.promotion,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryOwnPromotionsData(')
+          ..write('versionId: $versionId, ')
+          ..write('contactId: $contactId, ')
+          ..write('promotion: $promotion')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(versionId, contactId, $driftBlobEquality.hash(promotion));
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserDiscoveryOwnPromotionsData &&
+          other.versionId == this.versionId &&
+          other.contactId == this.contactId &&
+          $driftBlobEquality.equals(other.promotion, this.promotion));
+}
+
+class UserDiscoveryOwnPromotionsCompanion
+    extends UpdateCompanion<UserDiscoveryOwnPromotionsData> {
+  final Value<int> versionId;
+  final Value<int> contactId;
+  final Value<i2.Uint8List> promotion;
+  const UserDiscoveryOwnPromotionsCompanion({
+    this.versionId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.promotion = const Value.absent(),
+  });
+  UserDiscoveryOwnPromotionsCompanion.insert({
+    this.versionId = const Value.absent(),
+    required int contactId,
+    required i2.Uint8List promotion,
+  }) : contactId = Value(contactId),
+       promotion = Value(promotion);
+  static Insertable<UserDiscoveryOwnPromotionsData> custom({
+    Expression<int>? versionId,
+    Expression<int>? contactId,
+    Expression<i2.Uint8List>? promotion,
+  }) {
+    return RawValuesInsertable({
+      if (versionId != null) 'version_id': versionId,
+      if (contactId != null) 'contact_id': contactId,
+      if (promotion != null) 'promotion': promotion,
+    });
+  }
+
+  UserDiscoveryOwnPromotionsCompanion copyWith({
+    Value<int>? versionId,
+    Value<int>? contactId,
+    Value<i2.Uint8List>? promotion,
+  }) {
+    return UserDiscoveryOwnPromotionsCompanion(
+      versionId: versionId ?? this.versionId,
+      contactId: contactId ?? this.contactId,
+      promotion: promotion ?? this.promotion,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (versionId.present) {
+      map['version_id'] = Variable<int>(versionId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (promotion.present) {
+      map['promotion'] = Variable<i2.Uint8List>(promotion.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryOwnPromotionsCompanion(')
+          ..write('versionId: $versionId, ')
+          ..write('contactId: $contactId, ')
+          ..write('promotion: $promotion')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class UserDiscoveryShares extends Table
+    with TableInfo<UserDiscoveryShares, UserDiscoverySharesData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  UserDiscoveryShares(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> shareId = GeneratedColumn<int>(
+    'share_id',
+    aliasedName,
+    false,
+    hasAutoIncrement: true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL PRIMARY KEY AUTOINCREMENT',
+  );
+  late final GeneratedColumn<i2.Uint8List> share =
+      GeneratedColumn<i2.Uint8List>(
+        'share',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  @override
+  List<GeneratedColumn> get $columns => [shareId, share, contactId];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_discovery_shares';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {shareId};
+  @override
+  UserDiscoverySharesData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserDiscoverySharesData(
+      shareId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}share_id'],
+      )!,
+      share: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}share'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      ),
+    );
+  }
+
+  @override
+  UserDiscoveryShares createAlias(String alias) {
+    return UserDiscoveryShares(attachedDatabase, alias);
+  }
+
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class UserDiscoverySharesData extends DataClass
+    implements Insertable<UserDiscoverySharesData> {
+  final int shareId;
+  final i2.Uint8List share;
+  final int? contactId;
+  const UserDiscoverySharesData({
+    required this.shareId,
+    required this.share,
+    this.contactId,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['share_id'] = Variable<int>(shareId);
+    map['share'] = Variable<i2.Uint8List>(share);
+    if (!nullToAbsent || contactId != null) {
+      map['contact_id'] = Variable<int>(contactId);
+    }
+    return map;
+  }
+
+  UserDiscoverySharesCompanion toCompanion(bool nullToAbsent) {
+    return UserDiscoverySharesCompanion(
+      shareId: Value(shareId),
+      share: Value(share),
+      contactId: contactId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(contactId),
+    );
+  }
+
+  factory UserDiscoverySharesData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserDiscoverySharesData(
+      shareId: serializer.fromJson<int>(json['shareId']),
+      share: serializer.fromJson<i2.Uint8List>(json['share']),
+      contactId: serializer.fromJson<int?>(json['contactId']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'shareId': serializer.toJson<int>(shareId),
+      'share': serializer.toJson<i2.Uint8List>(share),
+      'contactId': serializer.toJson<int?>(contactId),
+    };
+  }
+
+  UserDiscoverySharesData copyWith({
+    int? shareId,
+    i2.Uint8List? share,
+    Value<int?> contactId = const Value.absent(),
+  }) => UserDiscoverySharesData(
+    shareId: shareId ?? this.shareId,
+    share: share ?? this.share,
+    contactId: contactId.present ? contactId.value : this.contactId,
+  );
+  UserDiscoverySharesData copyWithCompanion(UserDiscoverySharesCompanion data) {
+    return UserDiscoverySharesData(
+      shareId: data.shareId.present ? data.shareId.value : this.shareId,
+      share: data.share.present ? data.share.value : this.share,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoverySharesData(')
+          ..write('shareId: $shareId, ')
+          ..write('share: $share, ')
+          ..write('contactId: $contactId')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(shareId, $driftBlobEquality.hash(share), contactId);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserDiscoverySharesData &&
+          other.shareId == this.shareId &&
+          $driftBlobEquality.equals(other.share, this.share) &&
+          other.contactId == this.contactId);
+}
+
+class UserDiscoverySharesCompanion
+    extends UpdateCompanion<UserDiscoverySharesData> {
+  final Value<int> shareId;
+  final Value<i2.Uint8List> share;
+  final Value<int?> contactId;
+  const UserDiscoverySharesCompanion({
+    this.shareId = const Value.absent(),
+    this.share = const Value.absent(),
+    this.contactId = const Value.absent(),
+  });
+  UserDiscoverySharesCompanion.insert({
+    this.shareId = const Value.absent(),
+    required i2.Uint8List share,
+    this.contactId = const Value.absent(),
+  }) : share = Value(share);
+  static Insertable<UserDiscoverySharesData> custom({
+    Expression<int>? shareId,
+    Expression<i2.Uint8List>? share,
+    Expression<int>? contactId,
+  }) {
+    return RawValuesInsertable({
+      if (shareId != null) 'share_id': shareId,
+      if (share != null) 'share': share,
+      if (contactId != null) 'contact_id': contactId,
+    });
+  }
+
+  UserDiscoverySharesCompanion copyWith({
+    Value<int>? shareId,
+    Value<i2.Uint8List>? share,
+    Value<int?>? contactId,
+  }) {
+    return UserDiscoverySharesCompanion(
+      shareId: shareId ?? this.shareId,
+      share: share ?? this.share,
+      contactId: contactId ?? this.contactId,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (shareId.present) {
+      map['share_id'] = Variable<int>(shareId.value);
+    }
+    if (share.present) {
+      map['share'] = Variable<i2.Uint8List>(share.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoverySharesCompanion(')
+          ..write('shareId: $shareId, ')
+          ..write('share: $share, ')
+          ..write('contactId: $contactId')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class DatabaseAtV14 extends GeneratedDatabase {
+  DatabaseAtV14(QueryExecutor e) : super(e);
+  late final Contacts contacts = Contacts(this);
+  late final Groups groups = Groups(this);
+  late final MediaFiles mediaFiles = MediaFiles(this);
+  late final Messages messages = Messages(this);
+  late final MessageHistories messageHistories = MessageHistories(this);
+  late final Reactions reactions = Reactions(this);
+  late final GroupMembers groupMembers = GroupMembers(this);
+  late final Receipts receipts = Receipts(this);
+  late final ReceivedReceipts receivedReceipts = ReceivedReceipts(this);
+  late final SignalIdentityKeyStores signalIdentityKeyStores =
+      SignalIdentityKeyStores(this);
+  late final SignalPreKeyStores signalPreKeyStores = SignalPreKeyStores(this);
+  late final SignalSenderKeyStores signalSenderKeyStores =
+      SignalSenderKeyStores(this);
+  late final SignalSessionStores signalSessionStores = SignalSessionStores(
+    this,
+  );
+  late final MessageActions messageActions = MessageActions(this);
+  late final GroupHistories groupHistories = GroupHistories(this);
+  late final KeyVerifications keyVerifications = KeyVerifications(this);
+  late final VerificationTokens verificationTokens = VerificationTokens(this);
+  late final UserDiscoveryAnnouncedUsers userDiscoveryAnnouncedUsers =
+      UserDiscoveryAnnouncedUsers(this);
+  late final UserDiscoveryUserRelations userDiscoveryUserRelations =
+      UserDiscoveryUserRelations(this);
+  late final UserDiscoveryOtherPromotions userDiscoveryOtherPromotions =
+      UserDiscoveryOtherPromotions(this);
+  late final UserDiscoveryOwnPromotions userDiscoveryOwnPromotions =
+      UserDiscoveryOwnPromotions(this);
+  late final UserDiscoveryShares userDiscoveryShares = UserDiscoveryShares(
+    this,
+  );
+  @override
+  Iterable<TableInfo<Table, Object?>> get allTables =>
+      allSchemaEntities.whereType<TableInfo<Table, Object?>>();
+  @override
+  List<DatabaseSchemaEntity> get allSchemaEntities => [
+    contacts,
+    groups,
+    mediaFiles,
+    messages,
+    messageHistories,
+    reactions,
+    groupMembers,
+    receipts,
+    receivedReceipts,
+    signalIdentityKeyStores,
+    signalPreKeyStores,
+    signalSenderKeyStores,
+    signalSessionStores,
+    messageActions,
+    groupHistories,
+    keyVerifications,
+    verificationTokens,
+    userDiscoveryAnnouncedUsers,
+    userDiscoveryUserRelations,
+    userDiscoveryOtherPromotions,
+    userDiscoveryOwnPromotions,
+    userDiscoveryShares,
+  ];
+  @override
+  StreamQueryUpdateRules get streamUpdateRules => const StreamQueryUpdateRules([
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'groups',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('messages', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'media_files',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('messages', kind: UpdateKind.update)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'messages',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('message_histories', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('message_histories', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'messages',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('reactions', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('reactions', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'groups',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('group_members', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('receipts', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'messages',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('receipts', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'messages',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('message_actions', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('message_actions', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'groups',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('group_histories', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('key_verifications', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'user_discovery_announced_users',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [
+        TableUpdate('user_discovery_user_relations', kind: UpdateKind.delete),
+      ],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [
+        TableUpdate('user_discovery_user_relations', kind: UpdateKind.delete),
+      ],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [
+        TableUpdate('user_discovery_other_promotions', kind: UpdateKind.delete),
+      ],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [
+        TableUpdate('user_discovery_own_promotions', kind: UpdateKind.delete),
+      ],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('user_discovery_shares', kind: UpdateKind.delete)],
+    ),
+  ]);
+  @override
+  int get schemaVersion => 14;
+}
diff --git a/test/drift/twonly_db/generated/schema_v15.dart b/test/drift/twonly_db/generated/schema_v15.dart
new file mode 100644
index 00000000..8200e3b3
--- /dev/null
+++ b/test/drift/twonly_db/generated/schema_v15.dart
@@ -0,0 +1,9602 @@
+// dart format width=80
+import 'dart:typed_data' as i2;
+// GENERATED BY drift_dev, DO NOT MODIFY.
+// ignore_for_file: type=lint,unused_import
+//
+import 'package:drift/drift.dart';
+
+class Contacts extends Table with TableInfo<Contacts, ContactsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  Contacts(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> userId = GeneratedColumn<int>(
+    'user_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> username = GeneratedColumn<String>(
+    'username',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> displayName = GeneratedColumn<String>(
+    'display_name',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<String> nickName = GeneratedColumn<String>(
+    'nick_name',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> avatarSvgCompressed =
+      GeneratedColumn<i2.Uint8List>(
+        'avatar_svg_compressed',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> senderProfileCounter = GeneratedColumn<int>(
+    'sender_profile_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> accepted = GeneratedColumn<int>(
+    'accepted',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (accepted IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> deletedByUser = GeneratedColumn<int>(
+    'deleted_by_user',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (deleted_by_user IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> requested = GeneratedColumn<int>(
+    'requested',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (requested IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> blocked = GeneratedColumn<int>(
+    'blocked',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (blocked IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> verified = GeneratedColumn<int>(
+    'verified',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (verified IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> accountDeleted = GeneratedColumn<int>(
+    'account_deleted',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (account_deleted IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  late final GeneratedColumn<i2.Uint8List> userDiscoveryVersion =
+      GeneratedColumn<i2.Uint8List>(
+        'user_discovery_version',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> userDiscoveryExcluded = GeneratedColumn<int>(
+    'user_discovery_excluded',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT 0 CHECK (user_discovery_excluded IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> mediaSendCounter = GeneratedColumn<int>(
+    'media_send_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> mediaReceivedCounter = GeneratedColumn<int>(
+    'media_received_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    userId,
+    username,
+    displayName,
+    nickName,
+    avatarSvgCompressed,
+    senderProfileCounter,
+    accepted,
+    deletedByUser,
+    requested,
+    blocked,
+    verified,
+    accountDeleted,
+    createdAt,
+    userDiscoveryVersion,
+    userDiscoveryExcluded,
+    mediaSendCounter,
+    mediaReceivedCounter,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'contacts';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {userId};
+  @override
+  ContactsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return ContactsData(
+      userId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}user_id'],
+      )!,
+      username: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}username'],
+      )!,
+      displayName: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}display_name'],
+      ),
+      nickName: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}nick_name'],
+      ),
+      avatarSvgCompressed: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}avatar_svg_compressed'],
+      ),
+      senderProfileCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}sender_profile_counter'],
+      )!,
+      accepted: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}accepted'],
+      )!,
+      deletedByUser: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}deleted_by_user'],
+      )!,
+      requested: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}requested'],
+      )!,
+      blocked: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}blocked'],
+      )!,
+      verified: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}verified'],
+      )!,
+      accountDeleted: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}account_deleted'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+      userDiscoveryVersion: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}user_discovery_version'],
+      ),
+      userDiscoveryExcluded: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}user_discovery_excluded'],
+      )!,
+      mediaSendCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}media_send_counter'],
+      )!,
+      mediaReceivedCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}media_received_counter'],
+      )!,
+    );
+  }
+
+  @override
+  Contacts createAlias(String alias) {
+    return Contacts(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(user_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class ContactsData extends DataClass implements Insertable<ContactsData> {
+  final int userId;
+  final String username;
+  final String? displayName;
+  final String? nickName;
+  final i2.Uint8List? avatarSvgCompressed;
+  final int senderProfileCounter;
+  final int accepted;
+  final int deletedByUser;
+  final int requested;
+  final int blocked;
+  final int verified;
+  final int accountDeleted;
+  final int createdAt;
+  final i2.Uint8List? userDiscoveryVersion;
+  final int userDiscoveryExcluded;
+  final int mediaSendCounter;
+  final int mediaReceivedCounter;
+  const ContactsData({
+    required this.userId,
+    required this.username,
+    this.displayName,
+    this.nickName,
+    this.avatarSvgCompressed,
+    required this.senderProfileCounter,
+    required this.accepted,
+    required this.deletedByUser,
+    required this.requested,
+    required this.blocked,
+    required this.verified,
+    required this.accountDeleted,
+    required this.createdAt,
+    this.userDiscoveryVersion,
+    required this.userDiscoveryExcluded,
+    required this.mediaSendCounter,
+    required this.mediaReceivedCounter,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['user_id'] = Variable<int>(userId);
+    map['username'] = Variable<String>(username);
+    if (!nullToAbsent || displayName != null) {
+      map['display_name'] = Variable<String>(displayName);
+    }
+    if (!nullToAbsent || nickName != null) {
+      map['nick_name'] = Variable<String>(nickName);
+    }
+    if (!nullToAbsent || avatarSvgCompressed != null) {
+      map['avatar_svg_compressed'] = Variable<i2.Uint8List>(
+        avatarSvgCompressed,
+      );
+    }
+    map['sender_profile_counter'] = Variable<int>(senderProfileCounter);
+    map['accepted'] = Variable<int>(accepted);
+    map['deleted_by_user'] = Variable<int>(deletedByUser);
+    map['requested'] = Variable<int>(requested);
+    map['blocked'] = Variable<int>(blocked);
+    map['verified'] = Variable<int>(verified);
+    map['account_deleted'] = Variable<int>(accountDeleted);
+    map['created_at'] = Variable<int>(createdAt);
+    if (!nullToAbsent || userDiscoveryVersion != null) {
+      map['user_discovery_version'] = Variable<i2.Uint8List>(
+        userDiscoveryVersion,
+      );
+    }
+    map['user_discovery_excluded'] = Variable<int>(userDiscoveryExcluded);
+    map['media_send_counter'] = Variable<int>(mediaSendCounter);
+    map['media_received_counter'] = Variable<int>(mediaReceivedCounter);
+    return map;
+  }
+
+  ContactsCompanion toCompanion(bool nullToAbsent) {
+    return ContactsCompanion(
+      userId: Value(userId),
+      username: Value(username),
+      displayName: displayName == null && nullToAbsent
+          ? const Value.absent()
+          : Value(displayName),
+      nickName: nickName == null && nullToAbsent
+          ? const Value.absent()
+          : Value(nickName),
+      avatarSvgCompressed: avatarSvgCompressed == null && nullToAbsent
+          ? const Value.absent()
+          : Value(avatarSvgCompressed),
+      senderProfileCounter: Value(senderProfileCounter),
+      accepted: Value(accepted),
+      deletedByUser: Value(deletedByUser),
+      requested: Value(requested),
+      blocked: Value(blocked),
+      verified: Value(verified),
+      accountDeleted: Value(accountDeleted),
+      createdAt: Value(createdAt),
+      userDiscoveryVersion: userDiscoveryVersion == null && nullToAbsent
+          ? const Value.absent()
+          : Value(userDiscoveryVersion),
+      userDiscoveryExcluded: Value(userDiscoveryExcluded),
+      mediaSendCounter: Value(mediaSendCounter),
+      mediaReceivedCounter: Value(mediaReceivedCounter),
+    );
+  }
+
+  factory ContactsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return ContactsData(
+      userId: serializer.fromJson<int>(json['userId']),
+      username: serializer.fromJson<String>(json['username']),
+      displayName: serializer.fromJson<String?>(json['displayName']),
+      nickName: serializer.fromJson<String?>(json['nickName']),
+      avatarSvgCompressed: serializer.fromJson<i2.Uint8List?>(
+        json['avatarSvgCompressed'],
+      ),
+      senderProfileCounter: serializer.fromJson<int>(
+        json['senderProfileCounter'],
+      ),
+      accepted: serializer.fromJson<int>(json['accepted']),
+      deletedByUser: serializer.fromJson<int>(json['deletedByUser']),
+      requested: serializer.fromJson<int>(json['requested']),
+      blocked: serializer.fromJson<int>(json['blocked']),
+      verified: serializer.fromJson<int>(json['verified']),
+      accountDeleted: serializer.fromJson<int>(json['accountDeleted']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+      userDiscoveryVersion: serializer.fromJson<i2.Uint8List?>(
+        json['userDiscoveryVersion'],
+      ),
+      userDiscoveryExcluded: serializer.fromJson<int>(
+        json['userDiscoveryExcluded'],
+      ),
+      mediaSendCounter: serializer.fromJson<int>(json['mediaSendCounter']),
+      mediaReceivedCounter: serializer.fromJson<int>(
+        json['mediaReceivedCounter'],
+      ),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'userId': serializer.toJson<int>(userId),
+      'username': serializer.toJson<String>(username),
+      'displayName': serializer.toJson<String?>(displayName),
+      'nickName': serializer.toJson<String?>(nickName),
+      'avatarSvgCompressed': serializer.toJson<i2.Uint8List?>(
+        avatarSvgCompressed,
+      ),
+      'senderProfileCounter': serializer.toJson<int>(senderProfileCounter),
+      'accepted': serializer.toJson<int>(accepted),
+      'deletedByUser': serializer.toJson<int>(deletedByUser),
+      'requested': serializer.toJson<int>(requested),
+      'blocked': serializer.toJson<int>(blocked),
+      'verified': serializer.toJson<int>(verified),
+      'accountDeleted': serializer.toJson<int>(accountDeleted),
+      'createdAt': serializer.toJson<int>(createdAt),
+      'userDiscoveryVersion': serializer.toJson<i2.Uint8List?>(
+        userDiscoveryVersion,
+      ),
+      'userDiscoveryExcluded': serializer.toJson<int>(userDiscoveryExcluded),
+      'mediaSendCounter': serializer.toJson<int>(mediaSendCounter),
+      'mediaReceivedCounter': serializer.toJson<int>(mediaReceivedCounter),
+    };
+  }
+
+  ContactsData copyWith({
+    int? userId,
+    String? username,
+    Value<String?> displayName = const Value.absent(),
+    Value<String?> nickName = const Value.absent(),
+    Value<i2.Uint8List?> avatarSvgCompressed = const Value.absent(),
+    int? senderProfileCounter,
+    int? accepted,
+    int? deletedByUser,
+    int? requested,
+    int? blocked,
+    int? verified,
+    int? accountDeleted,
+    int? createdAt,
+    Value<i2.Uint8List?> userDiscoveryVersion = const Value.absent(),
+    int? userDiscoveryExcluded,
+    int? mediaSendCounter,
+    int? mediaReceivedCounter,
+  }) => ContactsData(
+    userId: userId ?? this.userId,
+    username: username ?? this.username,
+    displayName: displayName.present ? displayName.value : this.displayName,
+    nickName: nickName.present ? nickName.value : this.nickName,
+    avatarSvgCompressed: avatarSvgCompressed.present
+        ? avatarSvgCompressed.value
+        : this.avatarSvgCompressed,
+    senderProfileCounter: senderProfileCounter ?? this.senderProfileCounter,
+    accepted: accepted ?? this.accepted,
+    deletedByUser: deletedByUser ?? this.deletedByUser,
+    requested: requested ?? this.requested,
+    blocked: blocked ?? this.blocked,
+    verified: verified ?? this.verified,
+    accountDeleted: accountDeleted ?? this.accountDeleted,
+    createdAt: createdAt ?? this.createdAt,
+    userDiscoveryVersion: userDiscoveryVersion.present
+        ? userDiscoveryVersion.value
+        : this.userDiscoveryVersion,
+    userDiscoveryExcluded: userDiscoveryExcluded ?? this.userDiscoveryExcluded,
+    mediaSendCounter: mediaSendCounter ?? this.mediaSendCounter,
+    mediaReceivedCounter: mediaReceivedCounter ?? this.mediaReceivedCounter,
+  );
+  ContactsData copyWithCompanion(ContactsCompanion data) {
+    return ContactsData(
+      userId: data.userId.present ? data.userId.value : this.userId,
+      username: data.username.present ? data.username.value : this.username,
+      displayName: data.displayName.present
+          ? data.displayName.value
+          : this.displayName,
+      nickName: data.nickName.present ? data.nickName.value : this.nickName,
+      avatarSvgCompressed: data.avatarSvgCompressed.present
+          ? data.avatarSvgCompressed.value
+          : this.avatarSvgCompressed,
+      senderProfileCounter: data.senderProfileCounter.present
+          ? data.senderProfileCounter.value
+          : this.senderProfileCounter,
+      accepted: data.accepted.present ? data.accepted.value : this.accepted,
+      deletedByUser: data.deletedByUser.present
+          ? data.deletedByUser.value
+          : this.deletedByUser,
+      requested: data.requested.present ? data.requested.value : this.requested,
+      blocked: data.blocked.present ? data.blocked.value : this.blocked,
+      verified: data.verified.present ? data.verified.value : this.verified,
+      accountDeleted: data.accountDeleted.present
+          ? data.accountDeleted.value
+          : this.accountDeleted,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      userDiscoveryVersion: data.userDiscoveryVersion.present
+          ? data.userDiscoveryVersion.value
+          : this.userDiscoveryVersion,
+      userDiscoveryExcluded: data.userDiscoveryExcluded.present
+          ? data.userDiscoveryExcluded.value
+          : this.userDiscoveryExcluded,
+      mediaSendCounter: data.mediaSendCounter.present
+          ? data.mediaSendCounter.value
+          : this.mediaSendCounter,
+      mediaReceivedCounter: data.mediaReceivedCounter.present
+          ? data.mediaReceivedCounter.value
+          : this.mediaReceivedCounter,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ContactsData(')
+          ..write('userId: $userId, ')
+          ..write('username: $username, ')
+          ..write('displayName: $displayName, ')
+          ..write('nickName: $nickName, ')
+          ..write('avatarSvgCompressed: $avatarSvgCompressed, ')
+          ..write('senderProfileCounter: $senderProfileCounter, ')
+          ..write('accepted: $accepted, ')
+          ..write('deletedByUser: $deletedByUser, ')
+          ..write('requested: $requested, ')
+          ..write('blocked: $blocked, ')
+          ..write('verified: $verified, ')
+          ..write('accountDeleted: $accountDeleted, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('userDiscoveryVersion: $userDiscoveryVersion, ')
+          ..write('userDiscoveryExcluded: $userDiscoveryExcluded, ')
+          ..write('mediaSendCounter: $mediaSendCounter, ')
+          ..write('mediaReceivedCounter: $mediaReceivedCounter')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    userId,
+    username,
+    displayName,
+    nickName,
+    $driftBlobEquality.hash(avatarSvgCompressed),
+    senderProfileCounter,
+    accepted,
+    deletedByUser,
+    requested,
+    blocked,
+    verified,
+    accountDeleted,
+    createdAt,
+    $driftBlobEquality.hash(userDiscoveryVersion),
+    userDiscoveryExcluded,
+    mediaSendCounter,
+    mediaReceivedCounter,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is ContactsData &&
+          other.userId == this.userId &&
+          other.username == this.username &&
+          other.displayName == this.displayName &&
+          other.nickName == this.nickName &&
+          $driftBlobEquality.equals(
+            other.avatarSvgCompressed,
+            this.avatarSvgCompressed,
+          ) &&
+          other.senderProfileCounter == this.senderProfileCounter &&
+          other.accepted == this.accepted &&
+          other.deletedByUser == this.deletedByUser &&
+          other.requested == this.requested &&
+          other.blocked == this.blocked &&
+          other.verified == this.verified &&
+          other.accountDeleted == this.accountDeleted &&
+          other.createdAt == this.createdAt &&
+          $driftBlobEquality.equals(
+            other.userDiscoveryVersion,
+            this.userDiscoveryVersion,
+          ) &&
+          other.userDiscoveryExcluded == this.userDiscoveryExcluded &&
+          other.mediaSendCounter == this.mediaSendCounter &&
+          other.mediaReceivedCounter == this.mediaReceivedCounter);
+}
+
+class ContactsCompanion extends UpdateCompanion<ContactsData> {
+  final Value<int> userId;
+  final Value<String> username;
+  final Value<String?> displayName;
+  final Value<String?> nickName;
+  final Value<i2.Uint8List?> avatarSvgCompressed;
+  final Value<int> senderProfileCounter;
+  final Value<int> accepted;
+  final Value<int> deletedByUser;
+  final Value<int> requested;
+  final Value<int> blocked;
+  final Value<int> verified;
+  final Value<int> accountDeleted;
+  final Value<int> createdAt;
+  final Value<i2.Uint8List?> userDiscoveryVersion;
+  final Value<int> userDiscoveryExcluded;
+  final Value<int> mediaSendCounter;
+  final Value<int> mediaReceivedCounter;
+  const ContactsCompanion({
+    this.userId = const Value.absent(),
+    this.username = const Value.absent(),
+    this.displayName = const Value.absent(),
+    this.nickName = const Value.absent(),
+    this.avatarSvgCompressed = const Value.absent(),
+    this.senderProfileCounter = const Value.absent(),
+    this.accepted = const Value.absent(),
+    this.deletedByUser = const Value.absent(),
+    this.requested = const Value.absent(),
+    this.blocked = const Value.absent(),
+    this.verified = const Value.absent(),
+    this.accountDeleted = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.userDiscoveryVersion = const Value.absent(),
+    this.userDiscoveryExcluded = const Value.absent(),
+    this.mediaSendCounter = const Value.absent(),
+    this.mediaReceivedCounter = const Value.absent(),
+  });
+  ContactsCompanion.insert({
+    this.userId = const Value.absent(),
+    required String username,
+    this.displayName = const Value.absent(),
+    this.nickName = const Value.absent(),
+    this.avatarSvgCompressed = const Value.absent(),
+    this.senderProfileCounter = const Value.absent(),
+    this.accepted = const Value.absent(),
+    this.deletedByUser = const Value.absent(),
+    this.requested = const Value.absent(),
+    this.blocked = const Value.absent(),
+    this.verified = const Value.absent(),
+    this.accountDeleted = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.userDiscoveryVersion = const Value.absent(),
+    this.userDiscoveryExcluded = const Value.absent(),
+    this.mediaSendCounter = const Value.absent(),
+    this.mediaReceivedCounter = const Value.absent(),
+  }) : username = Value(username);
+  static Insertable<ContactsData> custom({
+    Expression<int>? userId,
+    Expression<String>? username,
+    Expression<String>? displayName,
+    Expression<String>? nickName,
+    Expression<i2.Uint8List>? avatarSvgCompressed,
+    Expression<int>? senderProfileCounter,
+    Expression<int>? accepted,
+    Expression<int>? deletedByUser,
+    Expression<int>? requested,
+    Expression<int>? blocked,
+    Expression<int>? verified,
+    Expression<int>? accountDeleted,
+    Expression<int>? createdAt,
+    Expression<i2.Uint8List>? userDiscoveryVersion,
+    Expression<int>? userDiscoveryExcluded,
+    Expression<int>? mediaSendCounter,
+    Expression<int>? mediaReceivedCounter,
+  }) {
+    return RawValuesInsertable({
+      if (userId != null) 'user_id': userId,
+      if (username != null) 'username': username,
+      if (displayName != null) 'display_name': displayName,
+      if (nickName != null) 'nick_name': nickName,
+      if (avatarSvgCompressed != null)
+        'avatar_svg_compressed': avatarSvgCompressed,
+      if (senderProfileCounter != null)
+        'sender_profile_counter': senderProfileCounter,
+      if (accepted != null) 'accepted': accepted,
+      if (deletedByUser != null) 'deleted_by_user': deletedByUser,
+      if (requested != null) 'requested': requested,
+      if (blocked != null) 'blocked': blocked,
+      if (verified != null) 'verified': verified,
+      if (accountDeleted != null) 'account_deleted': accountDeleted,
+      if (createdAt != null) 'created_at': createdAt,
+      if (userDiscoveryVersion != null)
+        'user_discovery_version': userDiscoveryVersion,
+      if (userDiscoveryExcluded != null)
+        'user_discovery_excluded': userDiscoveryExcluded,
+      if (mediaSendCounter != null) 'media_send_counter': mediaSendCounter,
+      if (mediaReceivedCounter != null)
+        'media_received_counter': mediaReceivedCounter,
+    });
+  }
+
+  ContactsCompanion copyWith({
+    Value<int>? userId,
+    Value<String>? username,
+    Value<String?>? displayName,
+    Value<String?>? nickName,
+    Value<i2.Uint8List?>? avatarSvgCompressed,
+    Value<int>? senderProfileCounter,
+    Value<int>? accepted,
+    Value<int>? deletedByUser,
+    Value<int>? requested,
+    Value<int>? blocked,
+    Value<int>? verified,
+    Value<int>? accountDeleted,
+    Value<int>? createdAt,
+    Value<i2.Uint8List?>? userDiscoveryVersion,
+    Value<int>? userDiscoveryExcluded,
+    Value<int>? mediaSendCounter,
+    Value<int>? mediaReceivedCounter,
+  }) {
+    return ContactsCompanion(
+      userId: userId ?? this.userId,
+      username: username ?? this.username,
+      displayName: displayName ?? this.displayName,
+      nickName: nickName ?? this.nickName,
+      avatarSvgCompressed: avatarSvgCompressed ?? this.avatarSvgCompressed,
+      senderProfileCounter: senderProfileCounter ?? this.senderProfileCounter,
+      accepted: accepted ?? this.accepted,
+      deletedByUser: deletedByUser ?? this.deletedByUser,
+      requested: requested ?? this.requested,
+      blocked: blocked ?? this.blocked,
+      verified: verified ?? this.verified,
+      accountDeleted: accountDeleted ?? this.accountDeleted,
+      createdAt: createdAt ?? this.createdAt,
+      userDiscoveryVersion: userDiscoveryVersion ?? this.userDiscoveryVersion,
+      userDiscoveryExcluded:
+          userDiscoveryExcluded ?? this.userDiscoveryExcluded,
+      mediaSendCounter: mediaSendCounter ?? this.mediaSendCounter,
+      mediaReceivedCounter: mediaReceivedCounter ?? this.mediaReceivedCounter,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (userId.present) {
+      map['user_id'] = Variable<int>(userId.value);
+    }
+    if (username.present) {
+      map['username'] = Variable<String>(username.value);
+    }
+    if (displayName.present) {
+      map['display_name'] = Variable<String>(displayName.value);
+    }
+    if (nickName.present) {
+      map['nick_name'] = Variable<String>(nickName.value);
+    }
+    if (avatarSvgCompressed.present) {
+      map['avatar_svg_compressed'] = Variable<i2.Uint8List>(
+        avatarSvgCompressed.value,
+      );
+    }
+    if (senderProfileCounter.present) {
+      map['sender_profile_counter'] = Variable<int>(senderProfileCounter.value);
+    }
+    if (accepted.present) {
+      map['accepted'] = Variable<int>(accepted.value);
+    }
+    if (deletedByUser.present) {
+      map['deleted_by_user'] = Variable<int>(deletedByUser.value);
+    }
+    if (requested.present) {
+      map['requested'] = Variable<int>(requested.value);
+    }
+    if (blocked.present) {
+      map['blocked'] = Variable<int>(blocked.value);
+    }
+    if (verified.present) {
+      map['verified'] = Variable<int>(verified.value);
+    }
+    if (accountDeleted.present) {
+      map['account_deleted'] = Variable<int>(accountDeleted.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (userDiscoveryVersion.present) {
+      map['user_discovery_version'] = Variable<i2.Uint8List>(
+        userDiscoveryVersion.value,
+      );
+    }
+    if (userDiscoveryExcluded.present) {
+      map['user_discovery_excluded'] = Variable<int>(
+        userDiscoveryExcluded.value,
+      );
+    }
+    if (mediaSendCounter.present) {
+      map['media_send_counter'] = Variable<int>(mediaSendCounter.value);
+    }
+    if (mediaReceivedCounter.present) {
+      map['media_received_counter'] = Variable<int>(mediaReceivedCounter.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ContactsCompanion(')
+          ..write('userId: $userId, ')
+          ..write('username: $username, ')
+          ..write('displayName: $displayName, ')
+          ..write('nickName: $nickName, ')
+          ..write('avatarSvgCompressed: $avatarSvgCompressed, ')
+          ..write('senderProfileCounter: $senderProfileCounter, ')
+          ..write('accepted: $accepted, ')
+          ..write('deletedByUser: $deletedByUser, ')
+          ..write('requested: $requested, ')
+          ..write('blocked: $blocked, ')
+          ..write('verified: $verified, ')
+          ..write('accountDeleted: $accountDeleted, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('userDiscoveryVersion: $userDiscoveryVersion, ')
+          ..write('userDiscoveryExcluded: $userDiscoveryExcluded, ')
+          ..write('mediaSendCounter: $mediaSendCounter, ')
+          ..write('mediaReceivedCounter: $mediaReceivedCounter')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class Groups extends Table with TableInfo<Groups, GroupsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  Groups(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> groupId = GeneratedColumn<String>(
+    'group_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> isGroupAdmin = GeneratedColumn<int>(
+    'is_group_admin',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (is_group_admin IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> isDirectChat = GeneratedColumn<int>(
+    'is_direct_chat',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (is_direct_chat IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> pinned = GeneratedColumn<int>(
+    'pinned',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (pinned IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> archived = GeneratedColumn<int>(
+    'archived',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (archived IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> joinedGroup = GeneratedColumn<int>(
+    'joined_group',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (joined_group IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> leftGroup = GeneratedColumn<int>(
+    'left_group',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (left_group IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> deletedContent = GeneratedColumn<int>(
+    'deleted_content',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (deleted_content IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> stateVersionId = GeneratedColumn<int>(
+    'state_version_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<i2.Uint8List> stateEncryptionKey =
+      GeneratedColumn<i2.Uint8List>(
+        'state_encryption_key',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<i2.Uint8List> myGroupPrivateKey =
+      GeneratedColumn<i2.Uint8List>(
+        'my_group_private_key',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<String> groupName = GeneratedColumn<String>(
+    'group_name',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> draftMessage = GeneratedColumn<String>(
+    'draft_message',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> totalMediaCounter = GeneratedColumn<int>(
+    'total_media_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> alsoBestFriend = GeneratedColumn<int>(
+    'also_best_friend',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (also_best_friend IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> deleteMessagesAfterMilliseconds =
+      GeneratedColumn<int>(
+        'delete_messages_after_milliseconds',
+        aliasedName,
+        false,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints: 'NOT NULL DEFAULT 86400000',
+        defaultValue: const CustomExpression('86400000'),
+      );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  late final GeneratedColumn<int> lastMessageSend = GeneratedColumn<int>(
+    'last_message_send',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> lastMessageReceived = GeneratedColumn<int>(
+    'last_message_received',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> lastFlameCounterChange = GeneratedColumn<int>(
+    'last_flame_counter_change',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> lastFlameSync = GeneratedColumn<int>(
+    'last_flame_sync',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> flameCounter = GeneratedColumn<int>(
+    'flame_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> maxFlameCounter = GeneratedColumn<int>(
+    'max_flame_counter',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> maxFlameCounterFrom = GeneratedColumn<int>(
+    'max_flame_counter_from',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> lastMessageExchange = GeneratedColumn<int>(
+    'last_message_exchange',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    groupId,
+    isGroupAdmin,
+    isDirectChat,
+    pinned,
+    archived,
+    joinedGroup,
+    leftGroup,
+    deletedContent,
+    stateVersionId,
+    stateEncryptionKey,
+    myGroupPrivateKey,
+    groupName,
+    draftMessage,
+    totalMediaCounter,
+    alsoBestFriend,
+    deleteMessagesAfterMilliseconds,
+    createdAt,
+    lastMessageSend,
+    lastMessageReceived,
+    lastFlameCounterChange,
+    lastFlameSync,
+    flameCounter,
+    maxFlameCounter,
+    maxFlameCounterFrom,
+    lastMessageExchange,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'groups';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {groupId};
+  @override
+  GroupsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return GroupsData(
+      groupId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}group_id'],
+      )!,
+      isGroupAdmin: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}is_group_admin'],
+      )!,
+      isDirectChat: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}is_direct_chat'],
+      )!,
+      pinned: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}pinned'],
+      )!,
+      archived: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}archived'],
+      )!,
+      joinedGroup: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}joined_group'],
+      )!,
+      leftGroup: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}left_group'],
+      )!,
+      deletedContent: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}deleted_content'],
+      )!,
+      stateVersionId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}state_version_id'],
+      )!,
+      stateEncryptionKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}state_encryption_key'],
+      ),
+      myGroupPrivateKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}my_group_private_key'],
+      ),
+      groupName: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}group_name'],
+      )!,
+      draftMessage: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}draft_message'],
+      ),
+      totalMediaCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}total_media_counter'],
+      )!,
+      alsoBestFriend: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}also_best_friend'],
+      )!,
+      deleteMessagesAfterMilliseconds: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}delete_messages_after_milliseconds'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+      lastMessageSend: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_message_send'],
+      ),
+      lastMessageReceived: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_message_received'],
+      ),
+      lastFlameCounterChange: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_flame_counter_change'],
+      ),
+      lastFlameSync: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_flame_sync'],
+      ),
+      flameCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}flame_counter'],
+      )!,
+      maxFlameCounter: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}max_flame_counter'],
+      )!,
+      maxFlameCounterFrom: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}max_flame_counter_from'],
+      ),
+      lastMessageExchange: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_message_exchange'],
+      )!,
+    );
+  }
+
+  @override
+  Groups createAlias(String alias) {
+    return Groups(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(group_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class GroupsData extends DataClass implements Insertable<GroupsData> {
+  final String groupId;
+  final int isGroupAdmin;
+  final int isDirectChat;
+  final int pinned;
+  final int archived;
+  final int joinedGroup;
+  final int leftGroup;
+  final int deletedContent;
+  final int stateVersionId;
+  final i2.Uint8List? stateEncryptionKey;
+  final i2.Uint8List? myGroupPrivateKey;
+  final String groupName;
+  final String? draftMessage;
+  final int totalMediaCounter;
+  final int alsoBestFriend;
+  final int deleteMessagesAfterMilliseconds;
+  final int createdAt;
+  final int? lastMessageSend;
+  final int? lastMessageReceived;
+  final int? lastFlameCounterChange;
+  final int? lastFlameSync;
+  final int flameCounter;
+  final int maxFlameCounter;
+  final int? maxFlameCounterFrom;
+  final int lastMessageExchange;
+  const GroupsData({
+    required this.groupId,
+    required this.isGroupAdmin,
+    required this.isDirectChat,
+    required this.pinned,
+    required this.archived,
+    required this.joinedGroup,
+    required this.leftGroup,
+    required this.deletedContent,
+    required this.stateVersionId,
+    this.stateEncryptionKey,
+    this.myGroupPrivateKey,
+    required this.groupName,
+    this.draftMessage,
+    required this.totalMediaCounter,
+    required this.alsoBestFriend,
+    required this.deleteMessagesAfterMilliseconds,
+    required this.createdAt,
+    this.lastMessageSend,
+    this.lastMessageReceived,
+    this.lastFlameCounterChange,
+    this.lastFlameSync,
+    required this.flameCounter,
+    required this.maxFlameCounter,
+    this.maxFlameCounterFrom,
+    required this.lastMessageExchange,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['group_id'] = Variable<String>(groupId);
+    map['is_group_admin'] = Variable<int>(isGroupAdmin);
+    map['is_direct_chat'] = Variable<int>(isDirectChat);
+    map['pinned'] = Variable<int>(pinned);
+    map['archived'] = Variable<int>(archived);
+    map['joined_group'] = Variable<int>(joinedGroup);
+    map['left_group'] = Variable<int>(leftGroup);
+    map['deleted_content'] = Variable<int>(deletedContent);
+    map['state_version_id'] = Variable<int>(stateVersionId);
+    if (!nullToAbsent || stateEncryptionKey != null) {
+      map['state_encryption_key'] = Variable<i2.Uint8List>(stateEncryptionKey);
+    }
+    if (!nullToAbsent || myGroupPrivateKey != null) {
+      map['my_group_private_key'] = Variable<i2.Uint8List>(myGroupPrivateKey);
+    }
+    map['group_name'] = Variable<String>(groupName);
+    if (!nullToAbsent || draftMessage != null) {
+      map['draft_message'] = Variable<String>(draftMessage);
+    }
+    map['total_media_counter'] = Variable<int>(totalMediaCounter);
+    map['also_best_friend'] = Variable<int>(alsoBestFriend);
+    map['delete_messages_after_milliseconds'] = Variable<int>(
+      deleteMessagesAfterMilliseconds,
+    );
+    map['created_at'] = Variable<int>(createdAt);
+    if (!nullToAbsent || lastMessageSend != null) {
+      map['last_message_send'] = Variable<int>(lastMessageSend);
+    }
+    if (!nullToAbsent || lastMessageReceived != null) {
+      map['last_message_received'] = Variable<int>(lastMessageReceived);
+    }
+    if (!nullToAbsent || lastFlameCounterChange != null) {
+      map['last_flame_counter_change'] = Variable<int>(lastFlameCounterChange);
+    }
+    if (!nullToAbsent || lastFlameSync != null) {
+      map['last_flame_sync'] = Variable<int>(lastFlameSync);
+    }
+    map['flame_counter'] = Variable<int>(flameCounter);
+    map['max_flame_counter'] = Variable<int>(maxFlameCounter);
+    if (!nullToAbsent || maxFlameCounterFrom != null) {
+      map['max_flame_counter_from'] = Variable<int>(maxFlameCounterFrom);
+    }
+    map['last_message_exchange'] = Variable<int>(lastMessageExchange);
+    return map;
+  }
+
+  GroupsCompanion toCompanion(bool nullToAbsent) {
+    return GroupsCompanion(
+      groupId: Value(groupId),
+      isGroupAdmin: Value(isGroupAdmin),
+      isDirectChat: Value(isDirectChat),
+      pinned: Value(pinned),
+      archived: Value(archived),
+      joinedGroup: Value(joinedGroup),
+      leftGroup: Value(leftGroup),
+      deletedContent: Value(deletedContent),
+      stateVersionId: Value(stateVersionId),
+      stateEncryptionKey: stateEncryptionKey == null && nullToAbsent
+          ? const Value.absent()
+          : Value(stateEncryptionKey),
+      myGroupPrivateKey: myGroupPrivateKey == null && nullToAbsent
+          ? const Value.absent()
+          : Value(myGroupPrivateKey),
+      groupName: Value(groupName),
+      draftMessage: draftMessage == null && nullToAbsent
+          ? const Value.absent()
+          : Value(draftMessage),
+      totalMediaCounter: Value(totalMediaCounter),
+      alsoBestFriend: Value(alsoBestFriend),
+      deleteMessagesAfterMilliseconds: Value(deleteMessagesAfterMilliseconds),
+      createdAt: Value(createdAt),
+      lastMessageSend: lastMessageSend == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastMessageSend),
+      lastMessageReceived: lastMessageReceived == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastMessageReceived),
+      lastFlameCounterChange: lastFlameCounterChange == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastFlameCounterChange),
+      lastFlameSync: lastFlameSync == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastFlameSync),
+      flameCounter: Value(flameCounter),
+      maxFlameCounter: Value(maxFlameCounter),
+      maxFlameCounterFrom: maxFlameCounterFrom == null && nullToAbsent
+          ? const Value.absent()
+          : Value(maxFlameCounterFrom),
+      lastMessageExchange: Value(lastMessageExchange),
+    );
+  }
+
+  factory GroupsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return GroupsData(
+      groupId: serializer.fromJson<String>(json['groupId']),
+      isGroupAdmin: serializer.fromJson<int>(json['isGroupAdmin']),
+      isDirectChat: serializer.fromJson<int>(json['isDirectChat']),
+      pinned: serializer.fromJson<int>(json['pinned']),
+      archived: serializer.fromJson<int>(json['archived']),
+      joinedGroup: serializer.fromJson<int>(json['joinedGroup']),
+      leftGroup: serializer.fromJson<int>(json['leftGroup']),
+      deletedContent: serializer.fromJson<int>(json['deletedContent']),
+      stateVersionId: serializer.fromJson<int>(json['stateVersionId']),
+      stateEncryptionKey: serializer.fromJson<i2.Uint8List?>(
+        json['stateEncryptionKey'],
+      ),
+      myGroupPrivateKey: serializer.fromJson<i2.Uint8List?>(
+        json['myGroupPrivateKey'],
+      ),
+      groupName: serializer.fromJson<String>(json['groupName']),
+      draftMessage: serializer.fromJson<String?>(json['draftMessage']),
+      totalMediaCounter: serializer.fromJson<int>(json['totalMediaCounter']),
+      alsoBestFriend: serializer.fromJson<int>(json['alsoBestFriend']),
+      deleteMessagesAfterMilliseconds: serializer.fromJson<int>(
+        json['deleteMessagesAfterMilliseconds'],
+      ),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+      lastMessageSend: serializer.fromJson<int?>(json['lastMessageSend']),
+      lastMessageReceived: serializer.fromJson<int?>(
+        json['lastMessageReceived'],
+      ),
+      lastFlameCounterChange: serializer.fromJson<int?>(
+        json['lastFlameCounterChange'],
+      ),
+      lastFlameSync: serializer.fromJson<int?>(json['lastFlameSync']),
+      flameCounter: serializer.fromJson<int>(json['flameCounter']),
+      maxFlameCounter: serializer.fromJson<int>(json['maxFlameCounter']),
+      maxFlameCounterFrom: serializer.fromJson<int?>(
+        json['maxFlameCounterFrom'],
+      ),
+      lastMessageExchange: serializer.fromJson<int>(
+        json['lastMessageExchange'],
+      ),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'groupId': serializer.toJson<String>(groupId),
+      'isGroupAdmin': serializer.toJson<int>(isGroupAdmin),
+      'isDirectChat': serializer.toJson<int>(isDirectChat),
+      'pinned': serializer.toJson<int>(pinned),
+      'archived': serializer.toJson<int>(archived),
+      'joinedGroup': serializer.toJson<int>(joinedGroup),
+      'leftGroup': serializer.toJson<int>(leftGroup),
+      'deletedContent': serializer.toJson<int>(deletedContent),
+      'stateVersionId': serializer.toJson<int>(stateVersionId),
+      'stateEncryptionKey': serializer.toJson<i2.Uint8List?>(
+        stateEncryptionKey,
+      ),
+      'myGroupPrivateKey': serializer.toJson<i2.Uint8List?>(myGroupPrivateKey),
+      'groupName': serializer.toJson<String>(groupName),
+      'draftMessage': serializer.toJson<String?>(draftMessage),
+      'totalMediaCounter': serializer.toJson<int>(totalMediaCounter),
+      'alsoBestFriend': serializer.toJson<int>(alsoBestFriend),
+      'deleteMessagesAfterMilliseconds': serializer.toJson<int>(
+        deleteMessagesAfterMilliseconds,
+      ),
+      'createdAt': serializer.toJson<int>(createdAt),
+      'lastMessageSend': serializer.toJson<int?>(lastMessageSend),
+      'lastMessageReceived': serializer.toJson<int?>(lastMessageReceived),
+      'lastFlameCounterChange': serializer.toJson<int?>(lastFlameCounterChange),
+      'lastFlameSync': serializer.toJson<int?>(lastFlameSync),
+      'flameCounter': serializer.toJson<int>(flameCounter),
+      'maxFlameCounter': serializer.toJson<int>(maxFlameCounter),
+      'maxFlameCounterFrom': serializer.toJson<int?>(maxFlameCounterFrom),
+      'lastMessageExchange': serializer.toJson<int>(lastMessageExchange),
+    };
+  }
+
+  GroupsData copyWith({
+    String? groupId,
+    int? isGroupAdmin,
+    int? isDirectChat,
+    int? pinned,
+    int? archived,
+    int? joinedGroup,
+    int? leftGroup,
+    int? deletedContent,
+    int? stateVersionId,
+    Value<i2.Uint8List?> stateEncryptionKey = const Value.absent(),
+    Value<i2.Uint8List?> myGroupPrivateKey = const Value.absent(),
+    String? groupName,
+    Value<String?> draftMessage = const Value.absent(),
+    int? totalMediaCounter,
+    int? alsoBestFriend,
+    int? deleteMessagesAfterMilliseconds,
+    int? createdAt,
+    Value<int?> lastMessageSend = const Value.absent(),
+    Value<int?> lastMessageReceived = const Value.absent(),
+    Value<int?> lastFlameCounterChange = const Value.absent(),
+    Value<int?> lastFlameSync = const Value.absent(),
+    int? flameCounter,
+    int? maxFlameCounter,
+    Value<int?> maxFlameCounterFrom = const Value.absent(),
+    int? lastMessageExchange,
+  }) => GroupsData(
+    groupId: groupId ?? this.groupId,
+    isGroupAdmin: isGroupAdmin ?? this.isGroupAdmin,
+    isDirectChat: isDirectChat ?? this.isDirectChat,
+    pinned: pinned ?? this.pinned,
+    archived: archived ?? this.archived,
+    joinedGroup: joinedGroup ?? this.joinedGroup,
+    leftGroup: leftGroup ?? this.leftGroup,
+    deletedContent: deletedContent ?? this.deletedContent,
+    stateVersionId: stateVersionId ?? this.stateVersionId,
+    stateEncryptionKey: stateEncryptionKey.present
+        ? stateEncryptionKey.value
+        : this.stateEncryptionKey,
+    myGroupPrivateKey: myGroupPrivateKey.present
+        ? myGroupPrivateKey.value
+        : this.myGroupPrivateKey,
+    groupName: groupName ?? this.groupName,
+    draftMessage: draftMessage.present ? draftMessage.value : this.draftMessage,
+    totalMediaCounter: totalMediaCounter ?? this.totalMediaCounter,
+    alsoBestFriend: alsoBestFriend ?? this.alsoBestFriend,
+    deleteMessagesAfterMilliseconds:
+        deleteMessagesAfterMilliseconds ?? this.deleteMessagesAfterMilliseconds,
+    createdAt: createdAt ?? this.createdAt,
+    lastMessageSend: lastMessageSend.present
+        ? lastMessageSend.value
+        : this.lastMessageSend,
+    lastMessageReceived: lastMessageReceived.present
+        ? lastMessageReceived.value
+        : this.lastMessageReceived,
+    lastFlameCounterChange: lastFlameCounterChange.present
+        ? lastFlameCounterChange.value
+        : this.lastFlameCounterChange,
+    lastFlameSync: lastFlameSync.present
+        ? lastFlameSync.value
+        : this.lastFlameSync,
+    flameCounter: flameCounter ?? this.flameCounter,
+    maxFlameCounter: maxFlameCounter ?? this.maxFlameCounter,
+    maxFlameCounterFrom: maxFlameCounterFrom.present
+        ? maxFlameCounterFrom.value
+        : this.maxFlameCounterFrom,
+    lastMessageExchange: lastMessageExchange ?? this.lastMessageExchange,
+  );
+  GroupsData copyWithCompanion(GroupsCompanion data) {
+    return GroupsData(
+      groupId: data.groupId.present ? data.groupId.value : this.groupId,
+      isGroupAdmin: data.isGroupAdmin.present
+          ? data.isGroupAdmin.value
+          : this.isGroupAdmin,
+      isDirectChat: data.isDirectChat.present
+          ? data.isDirectChat.value
+          : this.isDirectChat,
+      pinned: data.pinned.present ? data.pinned.value : this.pinned,
+      archived: data.archived.present ? data.archived.value : this.archived,
+      joinedGroup: data.joinedGroup.present
+          ? data.joinedGroup.value
+          : this.joinedGroup,
+      leftGroup: data.leftGroup.present ? data.leftGroup.value : this.leftGroup,
+      deletedContent: data.deletedContent.present
+          ? data.deletedContent.value
+          : this.deletedContent,
+      stateVersionId: data.stateVersionId.present
+          ? data.stateVersionId.value
+          : this.stateVersionId,
+      stateEncryptionKey: data.stateEncryptionKey.present
+          ? data.stateEncryptionKey.value
+          : this.stateEncryptionKey,
+      myGroupPrivateKey: data.myGroupPrivateKey.present
+          ? data.myGroupPrivateKey.value
+          : this.myGroupPrivateKey,
+      groupName: data.groupName.present ? data.groupName.value : this.groupName,
+      draftMessage: data.draftMessage.present
+          ? data.draftMessage.value
+          : this.draftMessage,
+      totalMediaCounter: data.totalMediaCounter.present
+          ? data.totalMediaCounter.value
+          : this.totalMediaCounter,
+      alsoBestFriend: data.alsoBestFriend.present
+          ? data.alsoBestFriend.value
+          : this.alsoBestFriend,
+      deleteMessagesAfterMilliseconds:
+          data.deleteMessagesAfterMilliseconds.present
+          ? data.deleteMessagesAfterMilliseconds.value
+          : this.deleteMessagesAfterMilliseconds,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      lastMessageSend: data.lastMessageSend.present
+          ? data.lastMessageSend.value
+          : this.lastMessageSend,
+      lastMessageReceived: data.lastMessageReceived.present
+          ? data.lastMessageReceived.value
+          : this.lastMessageReceived,
+      lastFlameCounterChange: data.lastFlameCounterChange.present
+          ? data.lastFlameCounterChange.value
+          : this.lastFlameCounterChange,
+      lastFlameSync: data.lastFlameSync.present
+          ? data.lastFlameSync.value
+          : this.lastFlameSync,
+      flameCounter: data.flameCounter.present
+          ? data.flameCounter.value
+          : this.flameCounter,
+      maxFlameCounter: data.maxFlameCounter.present
+          ? data.maxFlameCounter.value
+          : this.maxFlameCounter,
+      maxFlameCounterFrom: data.maxFlameCounterFrom.present
+          ? data.maxFlameCounterFrom.value
+          : this.maxFlameCounterFrom,
+      lastMessageExchange: data.lastMessageExchange.present
+          ? data.lastMessageExchange.value
+          : this.lastMessageExchange,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('GroupsData(')
+          ..write('groupId: $groupId, ')
+          ..write('isGroupAdmin: $isGroupAdmin, ')
+          ..write('isDirectChat: $isDirectChat, ')
+          ..write('pinned: $pinned, ')
+          ..write('archived: $archived, ')
+          ..write('joinedGroup: $joinedGroup, ')
+          ..write('leftGroup: $leftGroup, ')
+          ..write('deletedContent: $deletedContent, ')
+          ..write('stateVersionId: $stateVersionId, ')
+          ..write('stateEncryptionKey: $stateEncryptionKey, ')
+          ..write('myGroupPrivateKey: $myGroupPrivateKey, ')
+          ..write('groupName: $groupName, ')
+          ..write('draftMessage: $draftMessage, ')
+          ..write('totalMediaCounter: $totalMediaCounter, ')
+          ..write('alsoBestFriend: $alsoBestFriend, ')
+          ..write(
+            'deleteMessagesAfterMilliseconds: $deleteMessagesAfterMilliseconds, ',
+          )
+          ..write('createdAt: $createdAt, ')
+          ..write('lastMessageSend: $lastMessageSend, ')
+          ..write('lastMessageReceived: $lastMessageReceived, ')
+          ..write('lastFlameCounterChange: $lastFlameCounterChange, ')
+          ..write('lastFlameSync: $lastFlameSync, ')
+          ..write('flameCounter: $flameCounter, ')
+          ..write('maxFlameCounter: $maxFlameCounter, ')
+          ..write('maxFlameCounterFrom: $maxFlameCounterFrom, ')
+          ..write('lastMessageExchange: $lastMessageExchange')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hashAll([
+    groupId,
+    isGroupAdmin,
+    isDirectChat,
+    pinned,
+    archived,
+    joinedGroup,
+    leftGroup,
+    deletedContent,
+    stateVersionId,
+    $driftBlobEquality.hash(stateEncryptionKey),
+    $driftBlobEquality.hash(myGroupPrivateKey),
+    groupName,
+    draftMessage,
+    totalMediaCounter,
+    alsoBestFriend,
+    deleteMessagesAfterMilliseconds,
+    createdAt,
+    lastMessageSend,
+    lastMessageReceived,
+    lastFlameCounterChange,
+    lastFlameSync,
+    flameCounter,
+    maxFlameCounter,
+    maxFlameCounterFrom,
+    lastMessageExchange,
+  ]);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is GroupsData &&
+          other.groupId == this.groupId &&
+          other.isGroupAdmin == this.isGroupAdmin &&
+          other.isDirectChat == this.isDirectChat &&
+          other.pinned == this.pinned &&
+          other.archived == this.archived &&
+          other.joinedGroup == this.joinedGroup &&
+          other.leftGroup == this.leftGroup &&
+          other.deletedContent == this.deletedContent &&
+          other.stateVersionId == this.stateVersionId &&
+          $driftBlobEquality.equals(
+            other.stateEncryptionKey,
+            this.stateEncryptionKey,
+          ) &&
+          $driftBlobEquality.equals(
+            other.myGroupPrivateKey,
+            this.myGroupPrivateKey,
+          ) &&
+          other.groupName == this.groupName &&
+          other.draftMessage == this.draftMessage &&
+          other.totalMediaCounter == this.totalMediaCounter &&
+          other.alsoBestFriend == this.alsoBestFriend &&
+          other.deleteMessagesAfterMilliseconds ==
+              this.deleteMessagesAfterMilliseconds &&
+          other.createdAt == this.createdAt &&
+          other.lastMessageSend == this.lastMessageSend &&
+          other.lastMessageReceived == this.lastMessageReceived &&
+          other.lastFlameCounterChange == this.lastFlameCounterChange &&
+          other.lastFlameSync == this.lastFlameSync &&
+          other.flameCounter == this.flameCounter &&
+          other.maxFlameCounter == this.maxFlameCounter &&
+          other.maxFlameCounterFrom == this.maxFlameCounterFrom &&
+          other.lastMessageExchange == this.lastMessageExchange);
+}
+
+class GroupsCompanion extends UpdateCompanion<GroupsData> {
+  final Value<String> groupId;
+  final Value<int> isGroupAdmin;
+  final Value<int> isDirectChat;
+  final Value<int> pinned;
+  final Value<int> archived;
+  final Value<int> joinedGroup;
+  final Value<int> leftGroup;
+  final Value<int> deletedContent;
+  final Value<int> stateVersionId;
+  final Value<i2.Uint8List?> stateEncryptionKey;
+  final Value<i2.Uint8List?> myGroupPrivateKey;
+  final Value<String> groupName;
+  final Value<String?> draftMessage;
+  final Value<int> totalMediaCounter;
+  final Value<int> alsoBestFriend;
+  final Value<int> deleteMessagesAfterMilliseconds;
+  final Value<int> createdAt;
+  final Value<int?> lastMessageSend;
+  final Value<int?> lastMessageReceived;
+  final Value<int?> lastFlameCounterChange;
+  final Value<int?> lastFlameSync;
+  final Value<int> flameCounter;
+  final Value<int> maxFlameCounter;
+  final Value<int?> maxFlameCounterFrom;
+  final Value<int> lastMessageExchange;
+  final Value<int> rowid;
+  const GroupsCompanion({
+    this.groupId = const Value.absent(),
+    this.isGroupAdmin = const Value.absent(),
+    this.isDirectChat = const Value.absent(),
+    this.pinned = const Value.absent(),
+    this.archived = const Value.absent(),
+    this.joinedGroup = const Value.absent(),
+    this.leftGroup = const Value.absent(),
+    this.deletedContent = const Value.absent(),
+    this.stateVersionId = const Value.absent(),
+    this.stateEncryptionKey = const Value.absent(),
+    this.myGroupPrivateKey = const Value.absent(),
+    this.groupName = const Value.absent(),
+    this.draftMessage = const Value.absent(),
+    this.totalMediaCounter = const Value.absent(),
+    this.alsoBestFriend = const Value.absent(),
+    this.deleteMessagesAfterMilliseconds = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.lastMessageSend = const Value.absent(),
+    this.lastMessageReceived = const Value.absent(),
+    this.lastFlameCounterChange = const Value.absent(),
+    this.lastFlameSync = const Value.absent(),
+    this.flameCounter = const Value.absent(),
+    this.maxFlameCounter = const Value.absent(),
+    this.maxFlameCounterFrom = const Value.absent(),
+    this.lastMessageExchange = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  GroupsCompanion.insert({
+    required String groupId,
+    this.isGroupAdmin = const Value.absent(),
+    this.isDirectChat = const Value.absent(),
+    this.pinned = const Value.absent(),
+    this.archived = const Value.absent(),
+    this.joinedGroup = const Value.absent(),
+    this.leftGroup = const Value.absent(),
+    this.deletedContent = const Value.absent(),
+    this.stateVersionId = const Value.absent(),
+    this.stateEncryptionKey = const Value.absent(),
+    this.myGroupPrivateKey = const Value.absent(),
+    required String groupName,
+    this.draftMessage = const Value.absent(),
+    this.totalMediaCounter = const Value.absent(),
+    this.alsoBestFriend = const Value.absent(),
+    this.deleteMessagesAfterMilliseconds = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.lastMessageSend = const Value.absent(),
+    this.lastMessageReceived = const Value.absent(),
+    this.lastFlameCounterChange = const Value.absent(),
+    this.lastFlameSync = const Value.absent(),
+    this.flameCounter = const Value.absent(),
+    this.maxFlameCounter = const Value.absent(),
+    this.maxFlameCounterFrom = const Value.absent(),
+    this.lastMessageExchange = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : groupId = Value(groupId),
+       groupName = Value(groupName);
+  static Insertable<GroupsData> custom({
+    Expression<String>? groupId,
+    Expression<int>? isGroupAdmin,
+    Expression<int>? isDirectChat,
+    Expression<int>? pinned,
+    Expression<int>? archived,
+    Expression<int>? joinedGroup,
+    Expression<int>? leftGroup,
+    Expression<int>? deletedContent,
+    Expression<int>? stateVersionId,
+    Expression<i2.Uint8List>? stateEncryptionKey,
+    Expression<i2.Uint8List>? myGroupPrivateKey,
+    Expression<String>? groupName,
+    Expression<String>? draftMessage,
+    Expression<int>? totalMediaCounter,
+    Expression<int>? alsoBestFriend,
+    Expression<int>? deleteMessagesAfterMilliseconds,
+    Expression<int>? createdAt,
+    Expression<int>? lastMessageSend,
+    Expression<int>? lastMessageReceived,
+    Expression<int>? lastFlameCounterChange,
+    Expression<int>? lastFlameSync,
+    Expression<int>? flameCounter,
+    Expression<int>? maxFlameCounter,
+    Expression<int>? maxFlameCounterFrom,
+    Expression<int>? lastMessageExchange,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (groupId != null) 'group_id': groupId,
+      if (isGroupAdmin != null) 'is_group_admin': isGroupAdmin,
+      if (isDirectChat != null) 'is_direct_chat': isDirectChat,
+      if (pinned != null) 'pinned': pinned,
+      if (archived != null) 'archived': archived,
+      if (joinedGroup != null) 'joined_group': joinedGroup,
+      if (leftGroup != null) 'left_group': leftGroup,
+      if (deletedContent != null) 'deleted_content': deletedContent,
+      if (stateVersionId != null) 'state_version_id': stateVersionId,
+      if (stateEncryptionKey != null)
+        'state_encryption_key': stateEncryptionKey,
+      if (myGroupPrivateKey != null) 'my_group_private_key': myGroupPrivateKey,
+      if (groupName != null) 'group_name': groupName,
+      if (draftMessage != null) 'draft_message': draftMessage,
+      if (totalMediaCounter != null) 'total_media_counter': totalMediaCounter,
+      if (alsoBestFriend != null) 'also_best_friend': alsoBestFriend,
+      if (deleteMessagesAfterMilliseconds != null)
+        'delete_messages_after_milliseconds': deleteMessagesAfterMilliseconds,
+      if (createdAt != null) 'created_at': createdAt,
+      if (lastMessageSend != null) 'last_message_send': lastMessageSend,
+      if (lastMessageReceived != null)
+        'last_message_received': lastMessageReceived,
+      if (lastFlameCounterChange != null)
+        'last_flame_counter_change': lastFlameCounterChange,
+      if (lastFlameSync != null) 'last_flame_sync': lastFlameSync,
+      if (flameCounter != null) 'flame_counter': flameCounter,
+      if (maxFlameCounter != null) 'max_flame_counter': maxFlameCounter,
+      if (maxFlameCounterFrom != null)
+        'max_flame_counter_from': maxFlameCounterFrom,
+      if (lastMessageExchange != null)
+        'last_message_exchange': lastMessageExchange,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  GroupsCompanion copyWith({
+    Value<String>? groupId,
+    Value<int>? isGroupAdmin,
+    Value<int>? isDirectChat,
+    Value<int>? pinned,
+    Value<int>? archived,
+    Value<int>? joinedGroup,
+    Value<int>? leftGroup,
+    Value<int>? deletedContent,
+    Value<int>? stateVersionId,
+    Value<i2.Uint8List?>? stateEncryptionKey,
+    Value<i2.Uint8List?>? myGroupPrivateKey,
+    Value<String>? groupName,
+    Value<String?>? draftMessage,
+    Value<int>? totalMediaCounter,
+    Value<int>? alsoBestFriend,
+    Value<int>? deleteMessagesAfterMilliseconds,
+    Value<int>? createdAt,
+    Value<int?>? lastMessageSend,
+    Value<int?>? lastMessageReceived,
+    Value<int?>? lastFlameCounterChange,
+    Value<int?>? lastFlameSync,
+    Value<int>? flameCounter,
+    Value<int>? maxFlameCounter,
+    Value<int?>? maxFlameCounterFrom,
+    Value<int>? lastMessageExchange,
+    Value<int>? rowid,
+  }) {
+    return GroupsCompanion(
+      groupId: groupId ?? this.groupId,
+      isGroupAdmin: isGroupAdmin ?? this.isGroupAdmin,
+      isDirectChat: isDirectChat ?? this.isDirectChat,
+      pinned: pinned ?? this.pinned,
+      archived: archived ?? this.archived,
+      joinedGroup: joinedGroup ?? this.joinedGroup,
+      leftGroup: leftGroup ?? this.leftGroup,
+      deletedContent: deletedContent ?? this.deletedContent,
+      stateVersionId: stateVersionId ?? this.stateVersionId,
+      stateEncryptionKey: stateEncryptionKey ?? this.stateEncryptionKey,
+      myGroupPrivateKey: myGroupPrivateKey ?? this.myGroupPrivateKey,
+      groupName: groupName ?? this.groupName,
+      draftMessage: draftMessage ?? this.draftMessage,
+      totalMediaCounter: totalMediaCounter ?? this.totalMediaCounter,
+      alsoBestFriend: alsoBestFriend ?? this.alsoBestFriend,
+      deleteMessagesAfterMilliseconds:
+          deleteMessagesAfterMilliseconds ??
+          this.deleteMessagesAfterMilliseconds,
+      createdAt: createdAt ?? this.createdAt,
+      lastMessageSend: lastMessageSend ?? this.lastMessageSend,
+      lastMessageReceived: lastMessageReceived ?? this.lastMessageReceived,
+      lastFlameCounterChange:
+          lastFlameCounterChange ?? this.lastFlameCounterChange,
+      lastFlameSync: lastFlameSync ?? this.lastFlameSync,
+      flameCounter: flameCounter ?? this.flameCounter,
+      maxFlameCounter: maxFlameCounter ?? this.maxFlameCounter,
+      maxFlameCounterFrom: maxFlameCounterFrom ?? this.maxFlameCounterFrom,
+      lastMessageExchange: lastMessageExchange ?? this.lastMessageExchange,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (groupId.present) {
+      map['group_id'] = Variable<String>(groupId.value);
+    }
+    if (isGroupAdmin.present) {
+      map['is_group_admin'] = Variable<int>(isGroupAdmin.value);
+    }
+    if (isDirectChat.present) {
+      map['is_direct_chat'] = Variable<int>(isDirectChat.value);
+    }
+    if (pinned.present) {
+      map['pinned'] = Variable<int>(pinned.value);
+    }
+    if (archived.present) {
+      map['archived'] = Variable<int>(archived.value);
+    }
+    if (joinedGroup.present) {
+      map['joined_group'] = Variable<int>(joinedGroup.value);
+    }
+    if (leftGroup.present) {
+      map['left_group'] = Variable<int>(leftGroup.value);
+    }
+    if (deletedContent.present) {
+      map['deleted_content'] = Variable<int>(deletedContent.value);
+    }
+    if (stateVersionId.present) {
+      map['state_version_id'] = Variable<int>(stateVersionId.value);
+    }
+    if (stateEncryptionKey.present) {
+      map['state_encryption_key'] = Variable<i2.Uint8List>(
+        stateEncryptionKey.value,
+      );
+    }
+    if (myGroupPrivateKey.present) {
+      map['my_group_private_key'] = Variable<i2.Uint8List>(
+        myGroupPrivateKey.value,
+      );
+    }
+    if (groupName.present) {
+      map['group_name'] = Variable<String>(groupName.value);
+    }
+    if (draftMessage.present) {
+      map['draft_message'] = Variable<String>(draftMessage.value);
+    }
+    if (totalMediaCounter.present) {
+      map['total_media_counter'] = Variable<int>(totalMediaCounter.value);
+    }
+    if (alsoBestFriend.present) {
+      map['also_best_friend'] = Variable<int>(alsoBestFriend.value);
+    }
+    if (deleteMessagesAfterMilliseconds.present) {
+      map['delete_messages_after_milliseconds'] = Variable<int>(
+        deleteMessagesAfterMilliseconds.value,
+      );
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (lastMessageSend.present) {
+      map['last_message_send'] = Variable<int>(lastMessageSend.value);
+    }
+    if (lastMessageReceived.present) {
+      map['last_message_received'] = Variable<int>(lastMessageReceived.value);
+    }
+    if (lastFlameCounterChange.present) {
+      map['last_flame_counter_change'] = Variable<int>(
+        lastFlameCounterChange.value,
+      );
+    }
+    if (lastFlameSync.present) {
+      map['last_flame_sync'] = Variable<int>(lastFlameSync.value);
+    }
+    if (flameCounter.present) {
+      map['flame_counter'] = Variable<int>(flameCounter.value);
+    }
+    if (maxFlameCounter.present) {
+      map['max_flame_counter'] = Variable<int>(maxFlameCounter.value);
+    }
+    if (maxFlameCounterFrom.present) {
+      map['max_flame_counter_from'] = Variable<int>(maxFlameCounterFrom.value);
+    }
+    if (lastMessageExchange.present) {
+      map['last_message_exchange'] = Variable<int>(lastMessageExchange.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('GroupsCompanion(')
+          ..write('groupId: $groupId, ')
+          ..write('isGroupAdmin: $isGroupAdmin, ')
+          ..write('isDirectChat: $isDirectChat, ')
+          ..write('pinned: $pinned, ')
+          ..write('archived: $archived, ')
+          ..write('joinedGroup: $joinedGroup, ')
+          ..write('leftGroup: $leftGroup, ')
+          ..write('deletedContent: $deletedContent, ')
+          ..write('stateVersionId: $stateVersionId, ')
+          ..write('stateEncryptionKey: $stateEncryptionKey, ')
+          ..write('myGroupPrivateKey: $myGroupPrivateKey, ')
+          ..write('groupName: $groupName, ')
+          ..write('draftMessage: $draftMessage, ')
+          ..write('totalMediaCounter: $totalMediaCounter, ')
+          ..write('alsoBestFriend: $alsoBestFriend, ')
+          ..write(
+            'deleteMessagesAfterMilliseconds: $deleteMessagesAfterMilliseconds, ',
+          )
+          ..write('createdAt: $createdAt, ')
+          ..write('lastMessageSend: $lastMessageSend, ')
+          ..write('lastMessageReceived: $lastMessageReceived, ')
+          ..write('lastFlameCounterChange: $lastFlameCounterChange, ')
+          ..write('lastFlameSync: $lastFlameSync, ')
+          ..write('flameCounter: $flameCounter, ')
+          ..write('maxFlameCounter: $maxFlameCounter, ')
+          ..write('maxFlameCounterFrom: $maxFlameCounterFrom, ')
+          ..write('lastMessageExchange: $lastMessageExchange, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class MediaFiles extends Table with TableInfo<MediaFiles, MediaFilesData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  MediaFiles(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> mediaId = GeneratedColumn<String>(
+    'media_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> type = GeneratedColumn<String>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> uploadState = GeneratedColumn<String>(
+    'upload_state',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<String> downloadState = GeneratedColumn<String>(
+    'download_state',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> requiresAuthentication = GeneratedColumn<int>(
+    'requires_authentication',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT 0 CHECK (requires_authentication IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> stored = GeneratedColumn<int>(
+    'stored',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK ("stored" IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> isDraftMedia = GeneratedColumn<int>(
+    'is_draft_media',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (is_draft_media IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> preProgressingProcess = GeneratedColumn<int>(
+    'pre_progressing_process',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<String> reuploadRequestedBy =
+      GeneratedColumn<String>(
+        'reupload_requested_by',
+        aliasedName,
+        true,
+        type: DriftSqlType.string,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> displayLimitInMilliseconds =
+      GeneratedColumn<int>(
+        'display_limit_in_milliseconds',
+        aliasedName,
+        true,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> removeAudio = GeneratedColumn<int>(
+    'remove_audio',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL CHECK (remove_audio IN (0, 1))',
+  );
+  late final GeneratedColumn<i2.Uint8List> downloadToken =
+      GeneratedColumn<i2.Uint8List>(
+        'download_token',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<i2.Uint8List> encryptionKey =
+      GeneratedColumn<i2.Uint8List>(
+        'encryption_key',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<i2.Uint8List> encryptionMac =
+      GeneratedColumn<i2.Uint8List>(
+        'encryption_mac',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<i2.Uint8List> encryptionNonce =
+      GeneratedColumn<i2.Uint8List>(
+        'encryption_nonce',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<i2.Uint8List> storedFileHash =
+      GeneratedColumn<i2.Uint8List>(
+        'stored_file_hash',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    mediaId,
+    type,
+    uploadState,
+    downloadState,
+    requiresAuthentication,
+    stored,
+    isDraftMedia,
+    preProgressingProcess,
+    reuploadRequestedBy,
+    displayLimitInMilliseconds,
+    removeAudio,
+    downloadToken,
+    encryptionKey,
+    encryptionMac,
+    encryptionNonce,
+    storedFileHash,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'media_files';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {mediaId};
+  @override
+  MediaFilesData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return MediaFilesData(
+      mediaId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}media_id'],
+      )!,
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}type'],
+      )!,
+      uploadState: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}upload_state'],
+      ),
+      downloadState: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}download_state'],
+      ),
+      requiresAuthentication: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}requires_authentication'],
+      )!,
+      stored: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}stored'],
+      )!,
+      isDraftMedia: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}is_draft_media'],
+      )!,
+      preProgressingProcess: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}pre_progressing_process'],
+      ),
+      reuploadRequestedBy: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}reupload_requested_by'],
+      ),
+      displayLimitInMilliseconds: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}display_limit_in_milliseconds'],
+      ),
+      removeAudio: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}remove_audio'],
+      ),
+      downloadToken: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}download_token'],
+      ),
+      encryptionKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}encryption_key'],
+      ),
+      encryptionMac: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}encryption_mac'],
+      ),
+      encryptionNonce: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}encryption_nonce'],
+      ),
+      storedFileHash: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}stored_file_hash'],
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  MediaFiles createAlias(String alias) {
+    return MediaFiles(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(media_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class MediaFilesData extends DataClass implements Insertable<MediaFilesData> {
+  final String mediaId;
+  final String type;
+  final String? uploadState;
+  final String? downloadState;
+  final int requiresAuthentication;
+  final int stored;
+  final int isDraftMedia;
+  final int? preProgressingProcess;
+  final String? reuploadRequestedBy;
+  final int? displayLimitInMilliseconds;
+  final int? removeAudio;
+  final i2.Uint8List? downloadToken;
+  final i2.Uint8List? encryptionKey;
+  final i2.Uint8List? encryptionMac;
+  final i2.Uint8List? encryptionNonce;
+  final i2.Uint8List? storedFileHash;
+  final int createdAt;
+  const MediaFilesData({
+    required this.mediaId,
+    required this.type,
+    this.uploadState,
+    this.downloadState,
+    required this.requiresAuthentication,
+    required this.stored,
+    required this.isDraftMedia,
+    this.preProgressingProcess,
+    this.reuploadRequestedBy,
+    this.displayLimitInMilliseconds,
+    this.removeAudio,
+    this.downloadToken,
+    this.encryptionKey,
+    this.encryptionMac,
+    this.encryptionNonce,
+    this.storedFileHash,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['media_id'] = Variable<String>(mediaId);
+    map['type'] = Variable<String>(type);
+    if (!nullToAbsent || uploadState != null) {
+      map['upload_state'] = Variable<String>(uploadState);
+    }
+    if (!nullToAbsent || downloadState != null) {
+      map['download_state'] = Variable<String>(downloadState);
+    }
+    map['requires_authentication'] = Variable<int>(requiresAuthentication);
+    map['stored'] = Variable<int>(stored);
+    map['is_draft_media'] = Variable<int>(isDraftMedia);
+    if (!nullToAbsent || preProgressingProcess != null) {
+      map['pre_progressing_process'] = Variable<int>(preProgressingProcess);
+    }
+    if (!nullToAbsent || reuploadRequestedBy != null) {
+      map['reupload_requested_by'] = Variable<String>(reuploadRequestedBy);
+    }
+    if (!nullToAbsent || displayLimitInMilliseconds != null) {
+      map['display_limit_in_milliseconds'] = Variable<int>(
+        displayLimitInMilliseconds,
+      );
+    }
+    if (!nullToAbsent || removeAudio != null) {
+      map['remove_audio'] = Variable<int>(removeAudio);
+    }
+    if (!nullToAbsent || downloadToken != null) {
+      map['download_token'] = Variable<i2.Uint8List>(downloadToken);
+    }
+    if (!nullToAbsent || encryptionKey != null) {
+      map['encryption_key'] = Variable<i2.Uint8List>(encryptionKey);
+    }
+    if (!nullToAbsent || encryptionMac != null) {
+      map['encryption_mac'] = Variable<i2.Uint8List>(encryptionMac);
+    }
+    if (!nullToAbsent || encryptionNonce != null) {
+      map['encryption_nonce'] = Variable<i2.Uint8List>(encryptionNonce);
+    }
+    if (!nullToAbsent || storedFileHash != null) {
+      map['stored_file_hash'] = Variable<i2.Uint8List>(storedFileHash);
+    }
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  MediaFilesCompanion toCompanion(bool nullToAbsent) {
+    return MediaFilesCompanion(
+      mediaId: Value(mediaId),
+      type: Value(type),
+      uploadState: uploadState == null && nullToAbsent
+          ? const Value.absent()
+          : Value(uploadState),
+      downloadState: downloadState == null && nullToAbsent
+          ? const Value.absent()
+          : Value(downloadState),
+      requiresAuthentication: Value(requiresAuthentication),
+      stored: Value(stored),
+      isDraftMedia: Value(isDraftMedia),
+      preProgressingProcess: preProgressingProcess == null && nullToAbsent
+          ? const Value.absent()
+          : Value(preProgressingProcess),
+      reuploadRequestedBy: reuploadRequestedBy == null && nullToAbsent
+          ? const Value.absent()
+          : Value(reuploadRequestedBy),
+      displayLimitInMilliseconds:
+          displayLimitInMilliseconds == null && nullToAbsent
+          ? const Value.absent()
+          : Value(displayLimitInMilliseconds),
+      removeAudio: removeAudio == null && nullToAbsent
+          ? const Value.absent()
+          : Value(removeAudio),
+      downloadToken: downloadToken == null && nullToAbsent
+          ? const Value.absent()
+          : Value(downloadToken),
+      encryptionKey: encryptionKey == null && nullToAbsent
+          ? const Value.absent()
+          : Value(encryptionKey),
+      encryptionMac: encryptionMac == null && nullToAbsent
+          ? const Value.absent()
+          : Value(encryptionMac),
+      encryptionNonce: encryptionNonce == null && nullToAbsent
+          ? const Value.absent()
+          : Value(encryptionNonce),
+      storedFileHash: storedFileHash == null && nullToAbsent
+          ? const Value.absent()
+          : Value(storedFileHash),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory MediaFilesData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return MediaFilesData(
+      mediaId: serializer.fromJson<String>(json['mediaId']),
+      type: serializer.fromJson<String>(json['type']),
+      uploadState: serializer.fromJson<String?>(json['uploadState']),
+      downloadState: serializer.fromJson<String?>(json['downloadState']),
+      requiresAuthentication: serializer.fromJson<int>(
+        json['requiresAuthentication'],
+      ),
+      stored: serializer.fromJson<int>(json['stored']),
+      isDraftMedia: serializer.fromJson<int>(json['isDraftMedia']),
+      preProgressingProcess: serializer.fromJson<int?>(
+        json['preProgressingProcess'],
+      ),
+      reuploadRequestedBy: serializer.fromJson<String?>(
+        json['reuploadRequestedBy'],
+      ),
+      displayLimitInMilliseconds: serializer.fromJson<int?>(
+        json['displayLimitInMilliseconds'],
+      ),
+      removeAudio: serializer.fromJson<int?>(json['removeAudio']),
+      downloadToken: serializer.fromJson<i2.Uint8List?>(json['downloadToken']),
+      encryptionKey: serializer.fromJson<i2.Uint8List?>(json['encryptionKey']),
+      encryptionMac: serializer.fromJson<i2.Uint8List?>(json['encryptionMac']),
+      encryptionNonce: serializer.fromJson<i2.Uint8List?>(
+        json['encryptionNonce'],
+      ),
+      storedFileHash: serializer.fromJson<i2.Uint8List?>(
+        json['storedFileHash'],
+      ),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'mediaId': serializer.toJson<String>(mediaId),
+      'type': serializer.toJson<String>(type),
+      'uploadState': serializer.toJson<String?>(uploadState),
+      'downloadState': serializer.toJson<String?>(downloadState),
+      'requiresAuthentication': serializer.toJson<int>(requiresAuthentication),
+      'stored': serializer.toJson<int>(stored),
+      'isDraftMedia': serializer.toJson<int>(isDraftMedia),
+      'preProgressingProcess': serializer.toJson<int?>(preProgressingProcess),
+      'reuploadRequestedBy': serializer.toJson<String?>(reuploadRequestedBy),
+      'displayLimitInMilliseconds': serializer.toJson<int?>(
+        displayLimitInMilliseconds,
+      ),
+      'removeAudio': serializer.toJson<int?>(removeAudio),
+      'downloadToken': serializer.toJson<i2.Uint8List?>(downloadToken),
+      'encryptionKey': serializer.toJson<i2.Uint8List?>(encryptionKey),
+      'encryptionMac': serializer.toJson<i2.Uint8List?>(encryptionMac),
+      'encryptionNonce': serializer.toJson<i2.Uint8List?>(encryptionNonce),
+      'storedFileHash': serializer.toJson<i2.Uint8List?>(storedFileHash),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  MediaFilesData copyWith({
+    String? mediaId,
+    String? type,
+    Value<String?> uploadState = const Value.absent(),
+    Value<String?> downloadState = const Value.absent(),
+    int? requiresAuthentication,
+    int? stored,
+    int? isDraftMedia,
+    Value<int?> preProgressingProcess = const Value.absent(),
+    Value<String?> reuploadRequestedBy = const Value.absent(),
+    Value<int?> displayLimitInMilliseconds = const Value.absent(),
+    Value<int?> removeAudio = const Value.absent(),
+    Value<i2.Uint8List?> downloadToken = const Value.absent(),
+    Value<i2.Uint8List?> encryptionKey = const Value.absent(),
+    Value<i2.Uint8List?> encryptionMac = const Value.absent(),
+    Value<i2.Uint8List?> encryptionNonce = const Value.absent(),
+    Value<i2.Uint8List?> storedFileHash = const Value.absent(),
+    int? createdAt,
+  }) => MediaFilesData(
+    mediaId: mediaId ?? this.mediaId,
+    type: type ?? this.type,
+    uploadState: uploadState.present ? uploadState.value : this.uploadState,
+    downloadState: downloadState.present
+        ? downloadState.value
+        : this.downloadState,
+    requiresAuthentication:
+        requiresAuthentication ?? this.requiresAuthentication,
+    stored: stored ?? this.stored,
+    isDraftMedia: isDraftMedia ?? this.isDraftMedia,
+    preProgressingProcess: preProgressingProcess.present
+        ? preProgressingProcess.value
+        : this.preProgressingProcess,
+    reuploadRequestedBy: reuploadRequestedBy.present
+        ? reuploadRequestedBy.value
+        : this.reuploadRequestedBy,
+    displayLimitInMilliseconds: displayLimitInMilliseconds.present
+        ? displayLimitInMilliseconds.value
+        : this.displayLimitInMilliseconds,
+    removeAudio: removeAudio.present ? removeAudio.value : this.removeAudio,
+    downloadToken: downloadToken.present
+        ? downloadToken.value
+        : this.downloadToken,
+    encryptionKey: encryptionKey.present
+        ? encryptionKey.value
+        : this.encryptionKey,
+    encryptionMac: encryptionMac.present
+        ? encryptionMac.value
+        : this.encryptionMac,
+    encryptionNonce: encryptionNonce.present
+        ? encryptionNonce.value
+        : this.encryptionNonce,
+    storedFileHash: storedFileHash.present
+        ? storedFileHash.value
+        : this.storedFileHash,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  MediaFilesData copyWithCompanion(MediaFilesCompanion data) {
+    return MediaFilesData(
+      mediaId: data.mediaId.present ? data.mediaId.value : this.mediaId,
+      type: data.type.present ? data.type.value : this.type,
+      uploadState: data.uploadState.present
+          ? data.uploadState.value
+          : this.uploadState,
+      downloadState: data.downloadState.present
+          ? data.downloadState.value
+          : this.downloadState,
+      requiresAuthentication: data.requiresAuthentication.present
+          ? data.requiresAuthentication.value
+          : this.requiresAuthentication,
+      stored: data.stored.present ? data.stored.value : this.stored,
+      isDraftMedia: data.isDraftMedia.present
+          ? data.isDraftMedia.value
+          : this.isDraftMedia,
+      preProgressingProcess: data.preProgressingProcess.present
+          ? data.preProgressingProcess.value
+          : this.preProgressingProcess,
+      reuploadRequestedBy: data.reuploadRequestedBy.present
+          ? data.reuploadRequestedBy.value
+          : this.reuploadRequestedBy,
+      displayLimitInMilliseconds: data.displayLimitInMilliseconds.present
+          ? data.displayLimitInMilliseconds.value
+          : this.displayLimitInMilliseconds,
+      removeAudio: data.removeAudio.present
+          ? data.removeAudio.value
+          : this.removeAudio,
+      downloadToken: data.downloadToken.present
+          ? data.downloadToken.value
+          : this.downloadToken,
+      encryptionKey: data.encryptionKey.present
+          ? data.encryptionKey.value
+          : this.encryptionKey,
+      encryptionMac: data.encryptionMac.present
+          ? data.encryptionMac.value
+          : this.encryptionMac,
+      encryptionNonce: data.encryptionNonce.present
+          ? data.encryptionNonce.value
+          : this.encryptionNonce,
+      storedFileHash: data.storedFileHash.present
+          ? data.storedFileHash.value
+          : this.storedFileHash,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MediaFilesData(')
+          ..write('mediaId: $mediaId, ')
+          ..write('type: $type, ')
+          ..write('uploadState: $uploadState, ')
+          ..write('downloadState: $downloadState, ')
+          ..write('requiresAuthentication: $requiresAuthentication, ')
+          ..write('stored: $stored, ')
+          ..write('isDraftMedia: $isDraftMedia, ')
+          ..write('preProgressingProcess: $preProgressingProcess, ')
+          ..write('reuploadRequestedBy: $reuploadRequestedBy, ')
+          ..write('displayLimitInMilliseconds: $displayLimitInMilliseconds, ')
+          ..write('removeAudio: $removeAudio, ')
+          ..write('downloadToken: $downloadToken, ')
+          ..write('encryptionKey: $encryptionKey, ')
+          ..write('encryptionMac: $encryptionMac, ')
+          ..write('encryptionNonce: $encryptionNonce, ')
+          ..write('storedFileHash: $storedFileHash, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    mediaId,
+    type,
+    uploadState,
+    downloadState,
+    requiresAuthentication,
+    stored,
+    isDraftMedia,
+    preProgressingProcess,
+    reuploadRequestedBy,
+    displayLimitInMilliseconds,
+    removeAudio,
+    $driftBlobEquality.hash(downloadToken),
+    $driftBlobEquality.hash(encryptionKey),
+    $driftBlobEquality.hash(encryptionMac),
+    $driftBlobEquality.hash(encryptionNonce),
+    $driftBlobEquality.hash(storedFileHash),
+    createdAt,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is MediaFilesData &&
+          other.mediaId == this.mediaId &&
+          other.type == this.type &&
+          other.uploadState == this.uploadState &&
+          other.downloadState == this.downloadState &&
+          other.requiresAuthentication == this.requiresAuthentication &&
+          other.stored == this.stored &&
+          other.isDraftMedia == this.isDraftMedia &&
+          other.preProgressingProcess == this.preProgressingProcess &&
+          other.reuploadRequestedBy == this.reuploadRequestedBy &&
+          other.displayLimitInMilliseconds == this.displayLimitInMilliseconds &&
+          other.removeAudio == this.removeAudio &&
+          $driftBlobEquality.equals(other.downloadToken, this.downloadToken) &&
+          $driftBlobEquality.equals(other.encryptionKey, this.encryptionKey) &&
+          $driftBlobEquality.equals(other.encryptionMac, this.encryptionMac) &&
+          $driftBlobEquality.equals(
+            other.encryptionNonce,
+            this.encryptionNonce,
+          ) &&
+          $driftBlobEquality.equals(
+            other.storedFileHash,
+            this.storedFileHash,
+          ) &&
+          other.createdAt == this.createdAt);
+}
+
+class MediaFilesCompanion extends UpdateCompanion<MediaFilesData> {
+  final Value<String> mediaId;
+  final Value<String> type;
+  final Value<String?> uploadState;
+  final Value<String?> downloadState;
+  final Value<int> requiresAuthentication;
+  final Value<int> stored;
+  final Value<int> isDraftMedia;
+  final Value<int?> preProgressingProcess;
+  final Value<String?> reuploadRequestedBy;
+  final Value<int?> displayLimitInMilliseconds;
+  final Value<int?> removeAudio;
+  final Value<i2.Uint8List?> downloadToken;
+  final Value<i2.Uint8List?> encryptionKey;
+  final Value<i2.Uint8List?> encryptionMac;
+  final Value<i2.Uint8List?> encryptionNonce;
+  final Value<i2.Uint8List?> storedFileHash;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const MediaFilesCompanion({
+    this.mediaId = const Value.absent(),
+    this.type = const Value.absent(),
+    this.uploadState = const Value.absent(),
+    this.downloadState = const Value.absent(),
+    this.requiresAuthentication = const Value.absent(),
+    this.stored = const Value.absent(),
+    this.isDraftMedia = const Value.absent(),
+    this.preProgressingProcess = const Value.absent(),
+    this.reuploadRequestedBy = const Value.absent(),
+    this.displayLimitInMilliseconds = const Value.absent(),
+    this.removeAudio = const Value.absent(),
+    this.downloadToken = const Value.absent(),
+    this.encryptionKey = const Value.absent(),
+    this.encryptionMac = const Value.absent(),
+    this.encryptionNonce = const Value.absent(),
+    this.storedFileHash = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  MediaFilesCompanion.insert({
+    required String mediaId,
+    required String type,
+    this.uploadState = const Value.absent(),
+    this.downloadState = const Value.absent(),
+    this.requiresAuthentication = const Value.absent(),
+    this.stored = const Value.absent(),
+    this.isDraftMedia = const Value.absent(),
+    this.preProgressingProcess = const Value.absent(),
+    this.reuploadRequestedBy = const Value.absent(),
+    this.displayLimitInMilliseconds = const Value.absent(),
+    this.removeAudio = const Value.absent(),
+    this.downloadToken = const Value.absent(),
+    this.encryptionKey = const Value.absent(),
+    this.encryptionMac = const Value.absent(),
+    this.encryptionNonce = const Value.absent(),
+    this.storedFileHash = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : mediaId = Value(mediaId),
+       type = Value(type);
+  static Insertable<MediaFilesData> custom({
+    Expression<String>? mediaId,
+    Expression<String>? type,
+    Expression<String>? uploadState,
+    Expression<String>? downloadState,
+    Expression<int>? requiresAuthentication,
+    Expression<int>? stored,
+    Expression<int>? isDraftMedia,
+    Expression<int>? preProgressingProcess,
+    Expression<String>? reuploadRequestedBy,
+    Expression<int>? displayLimitInMilliseconds,
+    Expression<int>? removeAudio,
+    Expression<i2.Uint8List>? downloadToken,
+    Expression<i2.Uint8List>? encryptionKey,
+    Expression<i2.Uint8List>? encryptionMac,
+    Expression<i2.Uint8List>? encryptionNonce,
+    Expression<i2.Uint8List>? storedFileHash,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (mediaId != null) 'media_id': mediaId,
+      if (type != null) 'type': type,
+      if (uploadState != null) 'upload_state': uploadState,
+      if (downloadState != null) 'download_state': downloadState,
+      if (requiresAuthentication != null)
+        'requires_authentication': requiresAuthentication,
+      if (stored != null) 'stored': stored,
+      if (isDraftMedia != null) 'is_draft_media': isDraftMedia,
+      if (preProgressingProcess != null)
+        'pre_progressing_process': preProgressingProcess,
+      if (reuploadRequestedBy != null)
+        'reupload_requested_by': reuploadRequestedBy,
+      if (displayLimitInMilliseconds != null)
+        'display_limit_in_milliseconds': displayLimitInMilliseconds,
+      if (removeAudio != null) 'remove_audio': removeAudio,
+      if (downloadToken != null) 'download_token': downloadToken,
+      if (encryptionKey != null) 'encryption_key': encryptionKey,
+      if (encryptionMac != null) 'encryption_mac': encryptionMac,
+      if (encryptionNonce != null) 'encryption_nonce': encryptionNonce,
+      if (storedFileHash != null) 'stored_file_hash': storedFileHash,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  MediaFilesCompanion copyWith({
+    Value<String>? mediaId,
+    Value<String>? type,
+    Value<String?>? uploadState,
+    Value<String?>? downloadState,
+    Value<int>? requiresAuthentication,
+    Value<int>? stored,
+    Value<int>? isDraftMedia,
+    Value<int?>? preProgressingProcess,
+    Value<String?>? reuploadRequestedBy,
+    Value<int?>? displayLimitInMilliseconds,
+    Value<int?>? removeAudio,
+    Value<i2.Uint8List?>? downloadToken,
+    Value<i2.Uint8List?>? encryptionKey,
+    Value<i2.Uint8List?>? encryptionMac,
+    Value<i2.Uint8List?>? encryptionNonce,
+    Value<i2.Uint8List?>? storedFileHash,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return MediaFilesCompanion(
+      mediaId: mediaId ?? this.mediaId,
+      type: type ?? this.type,
+      uploadState: uploadState ?? this.uploadState,
+      downloadState: downloadState ?? this.downloadState,
+      requiresAuthentication:
+          requiresAuthentication ?? this.requiresAuthentication,
+      stored: stored ?? this.stored,
+      isDraftMedia: isDraftMedia ?? this.isDraftMedia,
+      preProgressingProcess:
+          preProgressingProcess ?? this.preProgressingProcess,
+      reuploadRequestedBy: reuploadRequestedBy ?? this.reuploadRequestedBy,
+      displayLimitInMilliseconds:
+          displayLimitInMilliseconds ?? this.displayLimitInMilliseconds,
+      removeAudio: removeAudio ?? this.removeAudio,
+      downloadToken: downloadToken ?? this.downloadToken,
+      encryptionKey: encryptionKey ?? this.encryptionKey,
+      encryptionMac: encryptionMac ?? this.encryptionMac,
+      encryptionNonce: encryptionNonce ?? this.encryptionNonce,
+      storedFileHash: storedFileHash ?? this.storedFileHash,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (mediaId.present) {
+      map['media_id'] = Variable<String>(mediaId.value);
+    }
+    if (type.present) {
+      map['type'] = Variable<String>(type.value);
+    }
+    if (uploadState.present) {
+      map['upload_state'] = Variable<String>(uploadState.value);
+    }
+    if (downloadState.present) {
+      map['download_state'] = Variable<String>(downloadState.value);
+    }
+    if (requiresAuthentication.present) {
+      map['requires_authentication'] = Variable<int>(
+        requiresAuthentication.value,
+      );
+    }
+    if (stored.present) {
+      map['stored'] = Variable<int>(stored.value);
+    }
+    if (isDraftMedia.present) {
+      map['is_draft_media'] = Variable<int>(isDraftMedia.value);
+    }
+    if (preProgressingProcess.present) {
+      map['pre_progressing_process'] = Variable<int>(
+        preProgressingProcess.value,
+      );
+    }
+    if (reuploadRequestedBy.present) {
+      map['reupload_requested_by'] = Variable<String>(
+        reuploadRequestedBy.value,
+      );
+    }
+    if (displayLimitInMilliseconds.present) {
+      map['display_limit_in_milliseconds'] = Variable<int>(
+        displayLimitInMilliseconds.value,
+      );
+    }
+    if (removeAudio.present) {
+      map['remove_audio'] = Variable<int>(removeAudio.value);
+    }
+    if (downloadToken.present) {
+      map['download_token'] = Variable<i2.Uint8List>(downloadToken.value);
+    }
+    if (encryptionKey.present) {
+      map['encryption_key'] = Variable<i2.Uint8List>(encryptionKey.value);
+    }
+    if (encryptionMac.present) {
+      map['encryption_mac'] = Variable<i2.Uint8List>(encryptionMac.value);
+    }
+    if (encryptionNonce.present) {
+      map['encryption_nonce'] = Variable<i2.Uint8List>(encryptionNonce.value);
+    }
+    if (storedFileHash.present) {
+      map['stored_file_hash'] = Variable<i2.Uint8List>(storedFileHash.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MediaFilesCompanion(')
+          ..write('mediaId: $mediaId, ')
+          ..write('type: $type, ')
+          ..write('uploadState: $uploadState, ')
+          ..write('downloadState: $downloadState, ')
+          ..write('requiresAuthentication: $requiresAuthentication, ')
+          ..write('stored: $stored, ')
+          ..write('isDraftMedia: $isDraftMedia, ')
+          ..write('preProgressingProcess: $preProgressingProcess, ')
+          ..write('reuploadRequestedBy: $reuploadRequestedBy, ')
+          ..write('displayLimitInMilliseconds: $displayLimitInMilliseconds, ')
+          ..write('removeAudio: $removeAudio, ')
+          ..write('downloadToken: $downloadToken, ')
+          ..write('encryptionKey: $encryptionKey, ')
+          ..write('encryptionMac: $encryptionMac, ')
+          ..write('encryptionNonce: $encryptionNonce, ')
+          ..write('storedFileHash: $storedFileHash, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class Messages extends Table with TableInfo<Messages, MessagesData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  Messages(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> groupId = GeneratedColumn<String>(
+    'group_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES "groups"(group_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<String> messageId = GeneratedColumn<String>(
+    'message_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> senderId = GeneratedColumn<int>(
+    'sender_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL REFERENCES contacts(user_id)',
+  );
+  late final GeneratedColumn<String> type = GeneratedColumn<String>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> content = GeneratedColumn<String>(
+    'content',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<String> mediaId = GeneratedColumn<String>(
+    'media_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NULL REFERENCES media_files(media_id)ON DELETE SET NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> additionalMessageData =
+      GeneratedColumn<i2.Uint8List>(
+        'additional_message_data',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> mediaStored = GeneratedColumn<int>(
+    'media_stored',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (media_stored IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> mediaReopened = GeneratedColumn<int>(
+    'media_reopened',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (media_reopened IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<i2.Uint8List> downloadToken =
+      GeneratedColumn<i2.Uint8List>(
+        'download_token',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<String> quotesMessageId = GeneratedColumn<String>(
+    'quotes_message_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> isDeletedFromSender = GeneratedColumn<int>(
+    'is_deleted_from_sender',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT 0 CHECK (is_deleted_from_sender IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> openedAt = GeneratedColumn<int>(
+    'opened_at',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> openedByAll = GeneratedColumn<int>(
+    'opened_by_all',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  late final GeneratedColumn<int> modifiedAt = GeneratedColumn<int>(
+    'modified_at',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> ackByUser = GeneratedColumn<int>(
+    'ack_by_user',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> ackByServer = GeneratedColumn<int>(
+    'ack_by_server',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    groupId,
+    messageId,
+    senderId,
+    type,
+    content,
+    mediaId,
+    additionalMessageData,
+    mediaStored,
+    mediaReopened,
+    downloadToken,
+    quotesMessageId,
+    isDeletedFromSender,
+    openedAt,
+    openedByAll,
+    createdAt,
+    modifiedAt,
+    ackByUser,
+    ackByServer,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'messages';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {messageId};
+  @override
+  MessagesData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return MessagesData(
+      groupId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}group_id'],
+      )!,
+      messageId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}message_id'],
+      )!,
+      senderId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}sender_id'],
+      ),
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}type'],
+      )!,
+      content: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}content'],
+      ),
+      mediaId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}media_id'],
+      ),
+      additionalMessageData: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}additional_message_data'],
+      ),
+      mediaStored: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}media_stored'],
+      )!,
+      mediaReopened: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}media_reopened'],
+      )!,
+      downloadToken: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}download_token'],
+      ),
+      quotesMessageId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}quotes_message_id'],
+      ),
+      isDeletedFromSender: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}is_deleted_from_sender'],
+      )!,
+      openedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}opened_at'],
+      ),
+      openedByAll: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}opened_by_all'],
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+      modifiedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}modified_at'],
+      ),
+      ackByUser: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}ack_by_user'],
+      ),
+      ackByServer: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}ack_by_server'],
+      ),
+    );
+  }
+
+  @override
+  Messages createAlias(String alias) {
+    return Messages(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(message_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class MessagesData extends DataClass implements Insertable<MessagesData> {
+  final String groupId;
+  final String messageId;
+  final int? senderId;
+  final String type;
+  final String? content;
+  final String? mediaId;
+  final i2.Uint8List? additionalMessageData;
+  final int mediaStored;
+  final int mediaReopened;
+  final i2.Uint8List? downloadToken;
+  final String? quotesMessageId;
+  final int isDeletedFromSender;
+  final int? openedAt;
+  final int? openedByAll;
+  final int createdAt;
+  final int? modifiedAt;
+  final int? ackByUser;
+  final int? ackByServer;
+  const MessagesData({
+    required this.groupId,
+    required this.messageId,
+    this.senderId,
+    required this.type,
+    this.content,
+    this.mediaId,
+    this.additionalMessageData,
+    required this.mediaStored,
+    required this.mediaReopened,
+    this.downloadToken,
+    this.quotesMessageId,
+    required this.isDeletedFromSender,
+    this.openedAt,
+    this.openedByAll,
+    required this.createdAt,
+    this.modifiedAt,
+    this.ackByUser,
+    this.ackByServer,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['group_id'] = Variable<String>(groupId);
+    map['message_id'] = Variable<String>(messageId);
+    if (!nullToAbsent || senderId != null) {
+      map['sender_id'] = Variable<int>(senderId);
+    }
+    map['type'] = Variable<String>(type);
+    if (!nullToAbsent || content != null) {
+      map['content'] = Variable<String>(content);
+    }
+    if (!nullToAbsent || mediaId != null) {
+      map['media_id'] = Variable<String>(mediaId);
+    }
+    if (!nullToAbsent || additionalMessageData != null) {
+      map['additional_message_data'] = Variable<i2.Uint8List>(
+        additionalMessageData,
+      );
+    }
+    map['media_stored'] = Variable<int>(mediaStored);
+    map['media_reopened'] = Variable<int>(mediaReopened);
+    if (!nullToAbsent || downloadToken != null) {
+      map['download_token'] = Variable<i2.Uint8List>(downloadToken);
+    }
+    if (!nullToAbsent || quotesMessageId != null) {
+      map['quotes_message_id'] = Variable<String>(quotesMessageId);
+    }
+    map['is_deleted_from_sender'] = Variable<int>(isDeletedFromSender);
+    if (!nullToAbsent || openedAt != null) {
+      map['opened_at'] = Variable<int>(openedAt);
+    }
+    if (!nullToAbsent || openedByAll != null) {
+      map['opened_by_all'] = Variable<int>(openedByAll);
+    }
+    map['created_at'] = Variable<int>(createdAt);
+    if (!nullToAbsent || modifiedAt != null) {
+      map['modified_at'] = Variable<int>(modifiedAt);
+    }
+    if (!nullToAbsent || ackByUser != null) {
+      map['ack_by_user'] = Variable<int>(ackByUser);
+    }
+    if (!nullToAbsent || ackByServer != null) {
+      map['ack_by_server'] = Variable<int>(ackByServer);
+    }
+    return map;
+  }
+
+  MessagesCompanion toCompanion(bool nullToAbsent) {
+    return MessagesCompanion(
+      groupId: Value(groupId),
+      messageId: Value(messageId),
+      senderId: senderId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(senderId),
+      type: Value(type),
+      content: content == null && nullToAbsent
+          ? const Value.absent()
+          : Value(content),
+      mediaId: mediaId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(mediaId),
+      additionalMessageData: additionalMessageData == null && nullToAbsent
+          ? const Value.absent()
+          : Value(additionalMessageData),
+      mediaStored: Value(mediaStored),
+      mediaReopened: Value(mediaReopened),
+      downloadToken: downloadToken == null && nullToAbsent
+          ? const Value.absent()
+          : Value(downloadToken),
+      quotesMessageId: quotesMessageId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(quotesMessageId),
+      isDeletedFromSender: Value(isDeletedFromSender),
+      openedAt: openedAt == null && nullToAbsent
+          ? const Value.absent()
+          : Value(openedAt),
+      openedByAll: openedByAll == null && nullToAbsent
+          ? const Value.absent()
+          : Value(openedByAll),
+      createdAt: Value(createdAt),
+      modifiedAt: modifiedAt == null && nullToAbsent
+          ? const Value.absent()
+          : Value(modifiedAt),
+      ackByUser: ackByUser == null && nullToAbsent
+          ? const Value.absent()
+          : Value(ackByUser),
+      ackByServer: ackByServer == null && nullToAbsent
+          ? const Value.absent()
+          : Value(ackByServer),
+    );
+  }
+
+  factory MessagesData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return MessagesData(
+      groupId: serializer.fromJson<String>(json['groupId']),
+      messageId: serializer.fromJson<String>(json['messageId']),
+      senderId: serializer.fromJson<int?>(json['senderId']),
+      type: serializer.fromJson<String>(json['type']),
+      content: serializer.fromJson<String?>(json['content']),
+      mediaId: serializer.fromJson<String?>(json['mediaId']),
+      additionalMessageData: serializer.fromJson<i2.Uint8List?>(
+        json['additionalMessageData'],
+      ),
+      mediaStored: serializer.fromJson<int>(json['mediaStored']),
+      mediaReopened: serializer.fromJson<int>(json['mediaReopened']),
+      downloadToken: serializer.fromJson<i2.Uint8List?>(json['downloadToken']),
+      quotesMessageId: serializer.fromJson<String?>(json['quotesMessageId']),
+      isDeletedFromSender: serializer.fromJson<int>(
+        json['isDeletedFromSender'],
+      ),
+      openedAt: serializer.fromJson<int?>(json['openedAt']),
+      openedByAll: serializer.fromJson<int?>(json['openedByAll']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+      modifiedAt: serializer.fromJson<int?>(json['modifiedAt']),
+      ackByUser: serializer.fromJson<int?>(json['ackByUser']),
+      ackByServer: serializer.fromJson<int?>(json['ackByServer']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'groupId': serializer.toJson<String>(groupId),
+      'messageId': serializer.toJson<String>(messageId),
+      'senderId': serializer.toJson<int?>(senderId),
+      'type': serializer.toJson<String>(type),
+      'content': serializer.toJson<String?>(content),
+      'mediaId': serializer.toJson<String?>(mediaId),
+      'additionalMessageData': serializer.toJson<i2.Uint8List?>(
+        additionalMessageData,
+      ),
+      'mediaStored': serializer.toJson<int>(mediaStored),
+      'mediaReopened': serializer.toJson<int>(mediaReopened),
+      'downloadToken': serializer.toJson<i2.Uint8List?>(downloadToken),
+      'quotesMessageId': serializer.toJson<String?>(quotesMessageId),
+      'isDeletedFromSender': serializer.toJson<int>(isDeletedFromSender),
+      'openedAt': serializer.toJson<int?>(openedAt),
+      'openedByAll': serializer.toJson<int?>(openedByAll),
+      'createdAt': serializer.toJson<int>(createdAt),
+      'modifiedAt': serializer.toJson<int?>(modifiedAt),
+      'ackByUser': serializer.toJson<int?>(ackByUser),
+      'ackByServer': serializer.toJson<int?>(ackByServer),
+    };
+  }
+
+  MessagesData copyWith({
+    String? groupId,
+    String? messageId,
+    Value<int?> senderId = const Value.absent(),
+    String? type,
+    Value<String?> content = const Value.absent(),
+    Value<String?> mediaId = const Value.absent(),
+    Value<i2.Uint8List?> additionalMessageData = const Value.absent(),
+    int? mediaStored,
+    int? mediaReopened,
+    Value<i2.Uint8List?> downloadToken = const Value.absent(),
+    Value<String?> quotesMessageId = const Value.absent(),
+    int? isDeletedFromSender,
+    Value<int?> openedAt = const Value.absent(),
+    Value<int?> openedByAll = const Value.absent(),
+    int? createdAt,
+    Value<int?> modifiedAt = const Value.absent(),
+    Value<int?> ackByUser = const Value.absent(),
+    Value<int?> ackByServer = const Value.absent(),
+  }) => MessagesData(
+    groupId: groupId ?? this.groupId,
+    messageId: messageId ?? this.messageId,
+    senderId: senderId.present ? senderId.value : this.senderId,
+    type: type ?? this.type,
+    content: content.present ? content.value : this.content,
+    mediaId: mediaId.present ? mediaId.value : this.mediaId,
+    additionalMessageData: additionalMessageData.present
+        ? additionalMessageData.value
+        : this.additionalMessageData,
+    mediaStored: mediaStored ?? this.mediaStored,
+    mediaReopened: mediaReopened ?? this.mediaReopened,
+    downloadToken: downloadToken.present
+        ? downloadToken.value
+        : this.downloadToken,
+    quotesMessageId: quotesMessageId.present
+        ? quotesMessageId.value
+        : this.quotesMessageId,
+    isDeletedFromSender: isDeletedFromSender ?? this.isDeletedFromSender,
+    openedAt: openedAt.present ? openedAt.value : this.openedAt,
+    openedByAll: openedByAll.present ? openedByAll.value : this.openedByAll,
+    createdAt: createdAt ?? this.createdAt,
+    modifiedAt: modifiedAt.present ? modifiedAt.value : this.modifiedAt,
+    ackByUser: ackByUser.present ? ackByUser.value : this.ackByUser,
+    ackByServer: ackByServer.present ? ackByServer.value : this.ackByServer,
+  );
+  MessagesData copyWithCompanion(MessagesCompanion data) {
+    return MessagesData(
+      groupId: data.groupId.present ? data.groupId.value : this.groupId,
+      messageId: data.messageId.present ? data.messageId.value : this.messageId,
+      senderId: data.senderId.present ? data.senderId.value : this.senderId,
+      type: data.type.present ? data.type.value : this.type,
+      content: data.content.present ? data.content.value : this.content,
+      mediaId: data.mediaId.present ? data.mediaId.value : this.mediaId,
+      additionalMessageData: data.additionalMessageData.present
+          ? data.additionalMessageData.value
+          : this.additionalMessageData,
+      mediaStored: data.mediaStored.present
+          ? data.mediaStored.value
+          : this.mediaStored,
+      mediaReopened: data.mediaReopened.present
+          ? data.mediaReopened.value
+          : this.mediaReopened,
+      downloadToken: data.downloadToken.present
+          ? data.downloadToken.value
+          : this.downloadToken,
+      quotesMessageId: data.quotesMessageId.present
+          ? data.quotesMessageId.value
+          : this.quotesMessageId,
+      isDeletedFromSender: data.isDeletedFromSender.present
+          ? data.isDeletedFromSender.value
+          : this.isDeletedFromSender,
+      openedAt: data.openedAt.present ? data.openedAt.value : this.openedAt,
+      openedByAll: data.openedByAll.present
+          ? data.openedByAll.value
+          : this.openedByAll,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      modifiedAt: data.modifiedAt.present
+          ? data.modifiedAt.value
+          : this.modifiedAt,
+      ackByUser: data.ackByUser.present ? data.ackByUser.value : this.ackByUser,
+      ackByServer: data.ackByServer.present
+          ? data.ackByServer.value
+          : this.ackByServer,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MessagesData(')
+          ..write('groupId: $groupId, ')
+          ..write('messageId: $messageId, ')
+          ..write('senderId: $senderId, ')
+          ..write('type: $type, ')
+          ..write('content: $content, ')
+          ..write('mediaId: $mediaId, ')
+          ..write('additionalMessageData: $additionalMessageData, ')
+          ..write('mediaStored: $mediaStored, ')
+          ..write('mediaReopened: $mediaReopened, ')
+          ..write('downloadToken: $downloadToken, ')
+          ..write('quotesMessageId: $quotesMessageId, ')
+          ..write('isDeletedFromSender: $isDeletedFromSender, ')
+          ..write('openedAt: $openedAt, ')
+          ..write('openedByAll: $openedByAll, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('modifiedAt: $modifiedAt, ')
+          ..write('ackByUser: $ackByUser, ')
+          ..write('ackByServer: $ackByServer')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    groupId,
+    messageId,
+    senderId,
+    type,
+    content,
+    mediaId,
+    $driftBlobEquality.hash(additionalMessageData),
+    mediaStored,
+    mediaReopened,
+    $driftBlobEquality.hash(downloadToken),
+    quotesMessageId,
+    isDeletedFromSender,
+    openedAt,
+    openedByAll,
+    createdAt,
+    modifiedAt,
+    ackByUser,
+    ackByServer,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is MessagesData &&
+          other.groupId == this.groupId &&
+          other.messageId == this.messageId &&
+          other.senderId == this.senderId &&
+          other.type == this.type &&
+          other.content == this.content &&
+          other.mediaId == this.mediaId &&
+          $driftBlobEquality.equals(
+            other.additionalMessageData,
+            this.additionalMessageData,
+          ) &&
+          other.mediaStored == this.mediaStored &&
+          other.mediaReopened == this.mediaReopened &&
+          $driftBlobEquality.equals(other.downloadToken, this.downloadToken) &&
+          other.quotesMessageId == this.quotesMessageId &&
+          other.isDeletedFromSender == this.isDeletedFromSender &&
+          other.openedAt == this.openedAt &&
+          other.openedByAll == this.openedByAll &&
+          other.createdAt == this.createdAt &&
+          other.modifiedAt == this.modifiedAt &&
+          other.ackByUser == this.ackByUser &&
+          other.ackByServer == this.ackByServer);
+}
+
+class MessagesCompanion extends UpdateCompanion<MessagesData> {
+  final Value<String> groupId;
+  final Value<String> messageId;
+  final Value<int?> senderId;
+  final Value<String> type;
+  final Value<String?> content;
+  final Value<String?> mediaId;
+  final Value<i2.Uint8List?> additionalMessageData;
+  final Value<int> mediaStored;
+  final Value<int> mediaReopened;
+  final Value<i2.Uint8List?> downloadToken;
+  final Value<String?> quotesMessageId;
+  final Value<int> isDeletedFromSender;
+  final Value<int?> openedAt;
+  final Value<int?> openedByAll;
+  final Value<int> createdAt;
+  final Value<int?> modifiedAt;
+  final Value<int?> ackByUser;
+  final Value<int?> ackByServer;
+  final Value<int> rowid;
+  const MessagesCompanion({
+    this.groupId = const Value.absent(),
+    this.messageId = const Value.absent(),
+    this.senderId = const Value.absent(),
+    this.type = const Value.absent(),
+    this.content = const Value.absent(),
+    this.mediaId = const Value.absent(),
+    this.additionalMessageData = const Value.absent(),
+    this.mediaStored = const Value.absent(),
+    this.mediaReopened = const Value.absent(),
+    this.downloadToken = const Value.absent(),
+    this.quotesMessageId = const Value.absent(),
+    this.isDeletedFromSender = const Value.absent(),
+    this.openedAt = const Value.absent(),
+    this.openedByAll = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.modifiedAt = const Value.absent(),
+    this.ackByUser = const Value.absent(),
+    this.ackByServer = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  MessagesCompanion.insert({
+    required String groupId,
+    required String messageId,
+    this.senderId = const Value.absent(),
+    required String type,
+    this.content = const Value.absent(),
+    this.mediaId = const Value.absent(),
+    this.additionalMessageData = const Value.absent(),
+    this.mediaStored = const Value.absent(),
+    this.mediaReopened = const Value.absent(),
+    this.downloadToken = const Value.absent(),
+    this.quotesMessageId = const Value.absent(),
+    this.isDeletedFromSender = const Value.absent(),
+    this.openedAt = const Value.absent(),
+    this.openedByAll = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.modifiedAt = const Value.absent(),
+    this.ackByUser = const Value.absent(),
+    this.ackByServer = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : groupId = Value(groupId),
+       messageId = Value(messageId),
+       type = Value(type);
+  static Insertable<MessagesData> custom({
+    Expression<String>? groupId,
+    Expression<String>? messageId,
+    Expression<int>? senderId,
+    Expression<String>? type,
+    Expression<String>? content,
+    Expression<String>? mediaId,
+    Expression<i2.Uint8List>? additionalMessageData,
+    Expression<int>? mediaStored,
+    Expression<int>? mediaReopened,
+    Expression<i2.Uint8List>? downloadToken,
+    Expression<String>? quotesMessageId,
+    Expression<int>? isDeletedFromSender,
+    Expression<int>? openedAt,
+    Expression<int>? openedByAll,
+    Expression<int>? createdAt,
+    Expression<int>? modifiedAt,
+    Expression<int>? ackByUser,
+    Expression<int>? ackByServer,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (groupId != null) 'group_id': groupId,
+      if (messageId != null) 'message_id': messageId,
+      if (senderId != null) 'sender_id': senderId,
+      if (type != null) 'type': type,
+      if (content != null) 'content': content,
+      if (mediaId != null) 'media_id': mediaId,
+      if (additionalMessageData != null)
+        'additional_message_data': additionalMessageData,
+      if (mediaStored != null) 'media_stored': mediaStored,
+      if (mediaReopened != null) 'media_reopened': mediaReopened,
+      if (downloadToken != null) 'download_token': downloadToken,
+      if (quotesMessageId != null) 'quotes_message_id': quotesMessageId,
+      if (isDeletedFromSender != null)
+        'is_deleted_from_sender': isDeletedFromSender,
+      if (openedAt != null) 'opened_at': openedAt,
+      if (openedByAll != null) 'opened_by_all': openedByAll,
+      if (createdAt != null) 'created_at': createdAt,
+      if (modifiedAt != null) 'modified_at': modifiedAt,
+      if (ackByUser != null) 'ack_by_user': ackByUser,
+      if (ackByServer != null) 'ack_by_server': ackByServer,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  MessagesCompanion copyWith({
+    Value<String>? groupId,
+    Value<String>? messageId,
+    Value<int?>? senderId,
+    Value<String>? type,
+    Value<String?>? content,
+    Value<String?>? mediaId,
+    Value<i2.Uint8List?>? additionalMessageData,
+    Value<int>? mediaStored,
+    Value<int>? mediaReopened,
+    Value<i2.Uint8List?>? downloadToken,
+    Value<String?>? quotesMessageId,
+    Value<int>? isDeletedFromSender,
+    Value<int?>? openedAt,
+    Value<int?>? openedByAll,
+    Value<int>? createdAt,
+    Value<int?>? modifiedAt,
+    Value<int?>? ackByUser,
+    Value<int?>? ackByServer,
+    Value<int>? rowid,
+  }) {
+    return MessagesCompanion(
+      groupId: groupId ?? this.groupId,
+      messageId: messageId ?? this.messageId,
+      senderId: senderId ?? this.senderId,
+      type: type ?? this.type,
+      content: content ?? this.content,
+      mediaId: mediaId ?? this.mediaId,
+      additionalMessageData:
+          additionalMessageData ?? this.additionalMessageData,
+      mediaStored: mediaStored ?? this.mediaStored,
+      mediaReopened: mediaReopened ?? this.mediaReopened,
+      downloadToken: downloadToken ?? this.downloadToken,
+      quotesMessageId: quotesMessageId ?? this.quotesMessageId,
+      isDeletedFromSender: isDeletedFromSender ?? this.isDeletedFromSender,
+      openedAt: openedAt ?? this.openedAt,
+      openedByAll: openedByAll ?? this.openedByAll,
+      createdAt: createdAt ?? this.createdAt,
+      modifiedAt: modifiedAt ?? this.modifiedAt,
+      ackByUser: ackByUser ?? this.ackByUser,
+      ackByServer: ackByServer ?? this.ackByServer,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (groupId.present) {
+      map['group_id'] = Variable<String>(groupId.value);
+    }
+    if (messageId.present) {
+      map['message_id'] = Variable<String>(messageId.value);
+    }
+    if (senderId.present) {
+      map['sender_id'] = Variable<int>(senderId.value);
+    }
+    if (type.present) {
+      map['type'] = Variable<String>(type.value);
+    }
+    if (content.present) {
+      map['content'] = Variable<String>(content.value);
+    }
+    if (mediaId.present) {
+      map['media_id'] = Variable<String>(mediaId.value);
+    }
+    if (additionalMessageData.present) {
+      map['additional_message_data'] = Variable<i2.Uint8List>(
+        additionalMessageData.value,
+      );
+    }
+    if (mediaStored.present) {
+      map['media_stored'] = Variable<int>(mediaStored.value);
+    }
+    if (mediaReopened.present) {
+      map['media_reopened'] = Variable<int>(mediaReopened.value);
+    }
+    if (downloadToken.present) {
+      map['download_token'] = Variable<i2.Uint8List>(downloadToken.value);
+    }
+    if (quotesMessageId.present) {
+      map['quotes_message_id'] = Variable<String>(quotesMessageId.value);
+    }
+    if (isDeletedFromSender.present) {
+      map['is_deleted_from_sender'] = Variable<int>(isDeletedFromSender.value);
+    }
+    if (openedAt.present) {
+      map['opened_at'] = Variable<int>(openedAt.value);
+    }
+    if (openedByAll.present) {
+      map['opened_by_all'] = Variable<int>(openedByAll.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (modifiedAt.present) {
+      map['modified_at'] = Variable<int>(modifiedAt.value);
+    }
+    if (ackByUser.present) {
+      map['ack_by_user'] = Variable<int>(ackByUser.value);
+    }
+    if (ackByServer.present) {
+      map['ack_by_server'] = Variable<int>(ackByServer.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MessagesCompanion(')
+          ..write('groupId: $groupId, ')
+          ..write('messageId: $messageId, ')
+          ..write('senderId: $senderId, ')
+          ..write('type: $type, ')
+          ..write('content: $content, ')
+          ..write('mediaId: $mediaId, ')
+          ..write('additionalMessageData: $additionalMessageData, ')
+          ..write('mediaStored: $mediaStored, ')
+          ..write('mediaReopened: $mediaReopened, ')
+          ..write('downloadToken: $downloadToken, ')
+          ..write('quotesMessageId: $quotesMessageId, ')
+          ..write('isDeletedFromSender: $isDeletedFromSender, ')
+          ..write('openedAt: $openedAt, ')
+          ..write('openedByAll: $openedByAll, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('modifiedAt: $modifiedAt, ')
+          ..write('ackByUser: $ackByUser, ')
+          ..write('ackByServer: $ackByServer, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class MessageHistories extends Table
+    with TableInfo<MessageHistories, MessageHistoriesData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  MessageHistories(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> id = GeneratedColumn<int>(
+    'id',
+    aliasedName,
+    false,
+    hasAutoIncrement: true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL PRIMARY KEY AUTOINCREMENT',
+  );
+  late final GeneratedColumn<String> messageId = GeneratedColumn<String>(
+    'message_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES messages(message_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<String> content = GeneratedColumn<String>(
+    'content',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    id,
+    messageId,
+    contactId,
+    content,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'message_histories';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {id};
+  @override
+  MessageHistoriesData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return MessageHistoriesData(
+      id: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}id'],
+      )!,
+      messageId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}message_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      ),
+      content: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}content'],
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  MessageHistories createAlias(String alias) {
+    return MessageHistories(attachedDatabase, alias);
+  }
+
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class MessageHistoriesData extends DataClass
+    implements Insertable<MessageHistoriesData> {
+  final int id;
+  final String messageId;
+  final int? contactId;
+  final String? content;
+  final int createdAt;
+  const MessageHistoriesData({
+    required this.id,
+    required this.messageId,
+    this.contactId,
+    this.content,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['id'] = Variable<int>(id);
+    map['message_id'] = Variable<String>(messageId);
+    if (!nullToAbsent || contactId != null) {
+      map['contact_id'] = Variable<int>(contactId);
+    }
+    if (!nullToAbsent || content != null) {
+      map['content'] = Variable<String>(content);
+    }
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  MessageHistoriesCompanion toCompanion(bool nullToAbsent) {
+    return MessageHistoriesCompanion(
+      id: Value(id),
+      messageId: Value(messageId),
+      contactId: contactId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(contactId),
+      content: content == null && nullToAbsent
+          ? const Value.absent()
+          : Value(content),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory MessageHistoriesData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return MessageHistoriesData(
+      id: serializer.fromJson<int>(json['id']),
+      messageId: serializer.fromJson<String>(json['messageId']),
+      contactId: serializer.fromJson<int?>(json['contactId']),
+      content: serializer.fromJson<String?>(json['content']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<int>(id),
+      'messageId': serializer.toJson<String>(messageId),
+      'contactId': serializer.toJson<int?>(contactId),
+      'content': serializer.toJson<String?>(content),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  MessageHistoriesData copyWith({
+    int? id,
+    String? messageId,
+    Value<int?> contactId = const Value.absent(),
+    Value<String?> content = const Value.absent(),
+    int? createdAt,
+  }) => MessageHistoriesData(
+    id: id ?? this.id,
+    messageId: messageId ?? this.messageId,
+    contactId: contactId.present ? contactId.value : this.contactId,
+    content: content.present ? content.value : this.content,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  MessageHistoriesData copyWithCompanion(MessageHistoriesCompanion data) {
+    return MessageHistoriesData(
+      id: data.id.present ? data.id.value : this.id,
+      messageId: data.messageId.present ? data.messageId.value : this.messageId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      content: data.content.present ? data.content.value : this.content,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MessageHistoriesData(')
+          ..write('id: $id, ')
+          ..write('messageId: $messageId, ')
+          ..write('contactId: $contactId, ')
+          ..write('content: $content, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(id, messageId, contactId, content, createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is MessageHistoriesData &&
+          other.id == this.id &&
+          other.messageId == this.messageId &&
+          other.contactId == this.contactId &&
+          other.content == this.content &&
+          other.createdAt == this.createdAt);
+}
+
+class MessageHistoriesCompanion extends UpdateCompanion<MessageHistoriesData> {
+  final Value<int> id;
+  final Value<String> messageId;
+  final Value<int?> contactId;
+  final Value<String?> content;
+  final Value<int> createdAt;
+  const MessageHistoriesCompanion({
+    this.id = const Value.absent(),
+    this.messageId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.content = const Value.absent(),
+    this.createdAt = const Value.absent(),
+  });
+  MessageHistoriesCompanion.insert({
+    this.id = const Value.absent(),
+    required String messageId,
+    this.contactId = const Value.absent(),
+    this.content = const Value.absent(),
+    this.createdAt = const Value.absent(),
+  }) : messageId = Value(messageId);
+  static Insertable<MessageHistoriesData> custom({
+    Expression<int>? id,
+    Expression<String>? messageId,
+    Expression<int>? contactId,
+    Expression<String>? content,
+    Expression<int>? createdAt,
+  }) {
+    return RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (messageId != null) 'message_id': messageId,
+      if (contactId != null) 'contact_id': contactId,
+      if (content != null) 'content': content,
+      if (createdAt != null) 'created_at': createdAt,
+    });
+  }
+
+  MessageHistoriesCompanion copyWith({
+    Value<int>? id,
+    Value<String>? messageId,
+    Value<int?>? contactId,
+    Value<String?>? content,
+    Value<int>? createdAt,
+  }) {
+    return MessageHistoriesCompanion(
+      id: id ?? this.id,
+      messageId: messageId ?? this.messageId,
+      contactId: contactId ?? this.contactId,
+      content: content ?? this.content,
+      createdAt: createdAt ?? this.createdAt,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<int>(id.value);
+    }
+    if (messageId.present) {
+      map['message_id'] = Variable<String>(messageId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (content.present) {
+      map['content'] = Variable<String>(content.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MessageHistoriesCompanion(')
+          ..write('id: $id, ')
+          ..write('messageId: $messageId, ')
+          ..write('contactId: $contactId, ')
+          ..write('content: $content, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class Reactions extends Table with TableInfo<Reactions, ReactionsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  Reactions(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> messageId = GeneratedColumn<String>(
+    'message_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES messages(message_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<String> emoji = GeneratedColumn<String>(
+    'emoji',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> senderId = GeneratedColumn<int>(
+    'sender_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [messageId, emoji, senderId, createdAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'reactions';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {messageId, senderId, emoji};
+  @override
+  ReactionsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return ReactionsData(
+      messageId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}message_id'],
+      )!,
+      emoji: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}emoji'],
+      )!,
+      senderId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}sender_id'],
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  Reactions createAlias(String alias) {
+    return Reactions(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const [
+    'PRIMARY KEY(message_id, sender_id, emoji)',
+  ];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class ReactionsData extends DataClass implements Insertable<ReactionsData> {
+  final String messageId;
+  final String emoji;
+  final int? senderId;
+  final int createdAt;
+  const ReactionsData({
+    required this.messageId,
+    required this.emoji,
+    this.senderId,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['message_id'] = Variable<String>(messageId);
+    map['emoji'] = Variable<String>(emoji);
+    if (!nullToAbsent || senderId != null) {
+      map['sender_id'] = Variable<int>(senderId);
+    }
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  ReactionsCompanion toCompanion(bool nullToAbsent) {
+    return ReactionsCompanion(
+      messageId: Value(messageId),
+      emoji: Value(emoji),
+      senderId: senderId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(senderId),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory ReactionsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return ReactionsData(
+      messageId: serializer.fromJson<String>(json['messageId']),
+      emoji: serializer.fromJson<String>(json['emoji']),
+      senderId: serializer.fromJson<int?>(json['senderId']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'messageId': serializer.toJson<String>(messageId),
+      'emoji': serializer.toJson<String>(emoji),
+      'senderId': serializer.toJson<int?>(senderId),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  ReactionsData copyWith({
+    String? messageId,
+    String? emoji,
+    Value<int?> senderId = const Value.absent(),
+    int? createdAt,
+  }) => ReactionsData(
+    messageId: messageId ?? this.messageId,
+    emoji: emoji ?? this.emoji,
+    senderId: senderId.present ? senderId.value : this.senderId,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  ReactionsData copyWithCompanion(ReactionsCompanion data) {
+    return ReactionsData(
+      messageId: data.messageId.present ? data.messageId.value : this.messageId,
+      emoji: data.emoji.present ? data.emoji.value : this.emoji,
+      senderId: data.senderId.present ? data.senderId.value : this.senderId,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ReactionsData(')
+          ..write('messageId: $messageId, ')
+          ..write('emoji: $emoji, ')
+          ..write('senderId: $senderId, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(messageId, emoji, senderId, createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is ReactionsData &&
+          other.messageId == this.messageId &&
+          other.emoji == this.emoji &&
+          other.senderId == this.senderId &&
+          other.createdAt == this.createdAt);
+}
+
+class ReactionsCompanion extends UpdateCompanion<ReactionsData> {
+  final Value<String> messageId;
+  final Value<String> emoji;
+  final Value<int?> senderId;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const ReactionsCompanion({
+    this.messageId = const Value.absent(),
+    this.emoji = const Value.absent(),
+    this.senderId = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  ReactionsCompanion.insert({
+    required String messageId,
+    required String emoji,
+    this.senderId = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : messageId = Value(messageId),
+       emoji = Value(emoji);
+  static Insertable<ReactionsData> custom({
+    Expression<String>? messageId,
+    Expression<String>? emoji,
+    Expression<int>? senderId,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (messageId != null) 'message_id': messageId,
+      if (emoji != null) 'emoji': emoji,
+      if (senderId != null) 'sender_id': senderId,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  ReactionsCompanion copyWith({
+    Value<String>? messageId,
+    Value<String>? emoji,
+    Value<int?>? senderId,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return ReactionsCompanion(
+      messageId: messageId ?? this.messageId,
+      emoji: emoji ?? this.emoji,
+      senderId: senderId ?? this.senderId,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (messageId.present) {
+      map['message_id'] = Variable<String>(messageId.value);
+    }
+    if (emoji.present) {
+      map['emoji'] = Variable<String>(emoji.value);
+    }
+    if (senderId.present) {
+      map['sender_id'] = Variable<int>(senderId.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ReactionsCompanion(')
+          ..write('messageId: $messageId, ')
+          ..write('emoji: $emoji, ')
+          ..write('senderId: $senderId, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class GroupMembers extends Table
+    with TableInfo<GroupMembers, GroupMembersData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  GroupMembers(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> groupId = GeneratedColumn<String>(
+    'group_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES "groups"(group_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL REFERENCES contacts(user_id)',
+  );
+  late final GeneratedColumn<String> memberState = GeneratedColumn<String>(
+    'member_state',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> groupPublicKey =
+      GeneratedColumn<i2.Uint8List>(
+        'group_public_key',
+        aliasedName,
+        true,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> lastChatOpened = GeneratedColumn<int>(
+    'last_chat_opened',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> lastTypeIndicator = GeneratedColumn<int>(
+    'last_type_indicator',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> lastMessage = GeneratedColumn<int>(
+    'last_message',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    groupId,
+    contactId,
+    memberState,
+    groupPublicKey,
+    lastChatOpened,
+    lastTypeIndicator,
+    lastMessage,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'group_members';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {groupId, contactId};
+  @override
+  GroupMembersData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return GroupMembersData(
+      groupId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}group_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      )!,
+      memberState: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}member_state'],
+      ),
+      groupPublicKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}group_public_key'],
+      ),
+      lastChatOpened: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_chat_opened'],
+      ),
+      lastTypeIndicator: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_type_indicator'],
+      ),
+      lastMessage: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_message'],
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  GroupMembers createAlias(String alias) {
+    return GroupMembers(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const [
+    'PRIMARY KEY(group_id, contact_id)',
+  ];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class GroupMembersData extends DataClass
+    implements Insertable<GroupMembersData> {
+  final String groupId;
+  final int contactId;
+  final String? memberState;
+  final i2.Uint8List? groupPublicKey;
+  final int? lastChatOpened;
+  final int? lastTypeIndicator;
+  final int? lastMessage;
+  final int createdAt;
+  const GroupMembersData({
+    required this.groupId,
+    required this.contactId,
+    this.memberState,
+    this.groupPublicKey,
+    this.lastChatOpened,
+    this.lastTypeIndicator,
+    this.lastMessage,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['group_id'] = Variable<String>(groupId);
+    map['contact_id'] = Variable<int>(contactId);
+    if (!nullToAbsent || memberState != null) {
+      map['member_state'] = Variable<String>(memberState);
+    }
+    if (!nullToAbsent || groupPublicKey != null) {
+      map['group_public_key'] = Variable<i2.Uint8List>(groupPublicKey);
+    }
+    if (!nullToAbsent || lastChatOpened != null) {
+      map['last_chat_opened'] = Variable<int>(lastChatOpened);
+    }
+    if (!nullToAbsent || lastTypeIndicator != null) {
+      map['last_type_indicator'] = Variable<int>(lastTypeIndicator);
+    }
+    if (!nullToAbsent || lastMessage != null) {
+      map['last_message'] = Variable<int>(lastMessage);
+    }
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  GroupMembersCompanion toCompanion(bool nullToAbsent) {
+    return GroupMembersCompanion(
+      groupId: Value(groupId),
+      contactId: Value(contactId),
+      memberState: memberState == null && nullToAbsent
+          ? const Value.absent()
+          : Value(memberState),
+      groupPublicKey: groupPublicKey == null && nullToAbsent
+          ? const Value.absent()
+          : Value(groupPublicKey),
+      lastChatOpened: lastChatOpened == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastChatOpened),
+      lastTypeIndicator: lastTypeIndicator == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastTypeIndicator),
+      lastMessage: lastMessage == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastMessage),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory GroupMembersData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return GroupMembersData(
+      groupId: serializer.fromJson<String>(json['groupId']),
+      contactId: serializer.fromJson<int>(json['contactId']),
+      memberState: serializer.fromJson<String?>(json['memberState']),
+      groupPublicKey: serializer.fromJson<i2.Uint8List?>(
+        json['groupPublicKey'],
+      ),
+      lastChatOpened: serializer.fromJson<int?>(json['lastChatOpened']),
+      lastTypeIndicator: serializer.fromJson<int?>(json['lastTypeIndicator']),
+      lastMessage: serializer.fromJson<int?>(json['lastMessage']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'groupId': serializer.toJson<String>(groupId),
+      'contactId': serializer.toJson<int>(contactId),
+      'memberState': serializer.toJson<String?>(memberState),
+      'groupPublicKey': serializer.toJson<i2.Uint8List?>(groupPublicKey),
+      'lastChatOpened': serializer.toJson<int?>(lastChatOpened),
+      'lastTypeIndicator': serializer.toJson<int?>(lastTypeIndicator),
+      'lastMessage': serializer.toJson<int?>(lastMessage),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  GroupMembersData copyWith({
+    String? groupId,
+    int? contactId,
+    Value<String?> memberState = const Value.absent(),
+    Value<i2.Uint8List?> groupPublicKey = const Value.absent(),
+    Value<int?> lastChatOpened = const Value.absent(),
+    Value<int?> lastTypeIndicator = const Value.absent(),
+    Value<int?> lastMessage = const Value.absent(),
+    int? createdAt,
+  }) => GroupMembersData(
+    groupId: groupId ?? this.groupId,
+    contactId: contactId ?? this.contactId,
+    memberState: memberState.present ? memberState.value : this.memberState,
+    groupPublicKey: groupPublicKey.present
+        ? groupPublicKey.value
+        : this.groupPublicKey,
+    lastChatOpened: lastChatOpened.present
+        ? lastChatOpened.value
+        : this.lastChatOpened,
+    lastTypeIndicator: lastTypeIndicator.present
+        ? lastTypeIndicator.value
+        : this.lastTypeIndicator,
+    lastMessage: lastMessage.present ? lastMessage.value : this.lastMessage,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  GroupMembersData copyWithCompanion(GroupMembersCompanion data) {
+    return GroupMembersData(
+      groupId: data.groupId.present ? data.groupId.value : this.groupId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      memberState: data.memberState.present
+          ? data.memberState.value
+          : this.memberState,
+      groupPublicKey: data.groupPublicKey.present
+          ? data.groupPublicKey.value
+          : this.groupPublicKey,
+      lastChatOpened: data.lastChatOpened.present
+          ? data.lastChatOpened.value
+          : this.lastChatOpened,
+      lastTypeIndicator: data.lastTypeIndicator.present
+          ? data.lastTypeIndicator.value
+          : this.lastTypeIndicator,
+      lastMessage: data.lastMessage.present
+          ? data.lastMessage.value
+          : this.lastMessage,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('GroupMembersData(')
+          ..write('groupId: $groupId, ')
+          ..write('contactId: $contactId, ')
+          ..write('memberState: $memberState, ')
+          ..write('groupPublicKey: $groupPublicKey, ')
+          ..write('lastChatOpened: $lastChatOpened, ')
+          ..write('lastTypeIndicator: $lastTypeIndicator, ')
+          ..write('lastMessage: $lastMessage, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    groupId,
+    contactId,
+    memberState,
+    $driftBlobEquality.hash(groupPublicKey),
+    lastChatOpened,
+    lastTypeIndicator,
+    lastMessage,
+    createdAt,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is GroupMembersData &&
+          other.groupId == this.groupId &&
+          other.contactId == this.contactId &&
+          other.memberState == this.memberState &&
+          $driftBlobEquality.equals(
+            other.groupPublicKey,
+            this.groupPublicKey,
+          ) &&
+          other.lastChatOpened == this.lastChatOpened &&
+          other.lastTypeIndicator == this.lastTypeIndicator &&
+          other.lastMessage == this.lastMessage &&
+          other.createdAt == this.createdAt);
+}
+
+class GroupMembersCompanion extends UpdateCompanion<GroupMembersData> {
+  final Value<String> groupId;
+  final Value<int> contactId;
+  final Value<String?> memberState;
+  final Value<i2.Uint8List?> groupPublicKey;
+  final Value<int?> lastChatOpened;
+  final Value<int?> lastTypeIndicator;
+  final Value<int?> lastMessage;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const GroupMembersCompanion({
+    this.groupId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.memberState = const Value.absent(),
+    this.groupPublicKey = const Value.absent(),
+    this.lastChatOpened = const Value.absent(),
+    this.lastTypeIndicator = const Value.absent(),
+    this.lastMessage = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  GroupMembersCompanion.insert({
+    required String groupId,
+    required int contactId,
+    this.memberState = const Value.absent(),
+    this.groupPublicKey = const Value.absent(),
+    this.lastChatOpened = const Value.absent(),
+    this.lastTypeIndicator = const Value.absent(),
+    this.lastMessage = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : groupId = Value(groupId),
+       contactId = Value(contactId);
+  static Insertable<GroupMembersData> custom({
+    Expression<String>? groupId,
+    Expression<int>? contactId,
+    Expression<String>? memberState,
+    Expression<i2.Uint8List>? groupPublicKey,
+    Expression<int>? lastChatOpened,
+    Expression<int>? lastTypeIndicator,
+    Expression<int>? lastMessage,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (groupId != null) 'group_id': groupId,
+      if (contactId != null) 'contact_id': contactId,
+      if (memberState != null) 'member_state': memberState,
+      if (groupPublicKey != null) 'group_public_key': groupPublicKey,
+      if (lastChatOpened != null) 'last_chat_opened': lastChatOpened,
+      if (lastTypeIndicator != null) 'last_type_indicator': lastTypeIndicator,
+      if (lastMessage != null) 'last_message': lastMessage,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  GroupMembersCompanion copyWith({
+    Value<String>? groupId,
+    Value<int>? contactId,
+    Value<String?>? memberState,
+    Value<i2.Uint8List?>? groupPublicKey,
+    Value<int?>? lastChatOpened,
+    Value<int?>? lastTypeIndicator,
+    Value<int?>? lastMessage,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return GroupMembersCompanion(
+      groupId: groupId ?? this.groupId,
+      contactId: contactId ?? this.contactId,
+      memberState: memberState ?? this.memberState,
+      groupPublicKey: groupPublicKey ?? this.groupPublicKey,
+      lastChatOpened: lastChatOpened ?? this.lastChatOpened,
+      lastTypeIndicator: lastTypeIndicator ?? this.lastTypeIndicator,
+      lastMessage: lastMessage ?? this.lastMessage,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (groupId.present) {
+      map['group_id'] = Variable<String>(groupId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (memberState.present) {
+      map['member_state'] = Variable<String>(memberState.value);
+    }
+    if (groupPublicKey.present) {
+      map['group_public_key'] = Variable<i2.Uint8List>(groupPublicKey.value);
+    }
+    if (lastChatOpened.present) {
+      map['last_chat_opened'] = Variable<int>(lastChatOpened.value);
+    }
+    if (lastTypeIndicator.present) {
+      map['last_type_indicator'] = Variable<int>(lastTypeIndicator.value);
+    }
+    if (lastMessage.present) {
+      map['last_message'] = Variable<int>(lastMessage.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('GroupMembersCompanion(')
+          ..write('groupId: $groupId, ')
+          ..write('contactId: $contactId, ')
+          ..write('memberState: $memberState, ')
+          ..write('groupPublicKey: $groupPublicKey, ')
+          ..write('lastChatOpened: $lastChatOpened, ')
+          ..write('lastTypeIndicator: $lastTypeIndicator, ')
+          ..write('lastMessage: $lastMessage, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class Receipts extends Table with TableInfo<Receipts, ReceiptsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  Receipts(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> receiptId = GeneratedColumn<String>(
+    'receipt_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<String> messageId = GeneratedColumn<String>(
+    'message_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL REFERENCES messages(message_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<i2.Uint8List> message =
+      GeneratedColumn<i2.Uint8List>(
+        'message',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> contactWillSendsReceipt =
+      GeneratedColumn<int>(
+        'contact_will_sends_receipt',
+        aliasedName,
+        false,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints:
+            'NOT NULL DEFAULT 1 CHECK (contact_will_sends_receipt IN (0, 1))',
+        defaultValue: const CustomExpression('1'),
+      );
+  late final GeneratedColumn<int>
+  willBeRetriedByMediaUpload = GeneratedColumn<int>(
+    'will_be_retried_by_media_upload',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT 0 CHECK (will_be_retried_by_media_upload IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> markForRetry = GeneratedColumn<int>(
+    'mark_for_retry',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> markForRetryAfterAccepted =
+      GeneratedColumn<int>(
+        'mark_for_retry_after_accepted',
+        aliasedName,
+        true,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<int> ackByServerAt = GeneratedColumn<int>(
+    'ack_by_server_at',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> retryCount = GeneratedColumn<int>(
+    'retry_count',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> lastRetry = GeneratedColumn<int>(
+    'last_retry',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    receiptId,
+    contactId,
+    messageId,
+    message,
+    contactWillSendsReceipt,
+    willBeRetriedByMediaUpload,
+    markForRetry,
+    markForRetryAfterAccepted,
+    ackByServerAt,
+    retryCount,
+    lastRetry,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'receipts';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {receiptId};
+  @override
+  ReceiptsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return ReceiptsData(
+      receiptId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}receipt_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      )!,
+      messageId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}message_id'],
+      ),
+      message: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}message'],
+      )!,
+      contactWillSendsReceipt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_will_sends_receipt'],
+      )!,
+      willBeRetriedByMediaUpload: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}will_be_retried_by_media_upload'],
+      )!,
+      markForRetry: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}mark_for_retry'],
+      ),
+      markForRetryAfterAccepted: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}mark_for_retry_after_accepted'],
+      ),
+      ackByServerAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}ack_by_server_at'],
+      ),
+      retryCount: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}retry_count'],
+      )!,
+      lastRetry: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}last_retry'],
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  Receipts createAlias(String alias) {
+    return Receipts(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(receipt_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class ReceiptsData extends DataClass implements Insertable<ReceiptsData> {
+  final String receiptId;
+  final int contactId;
+  final String? messageId;
+  final i2.Uint8List message;
+  final int contactWillSendsReceipt;
+  final int willBeRetriedByMediaUpload;
+  final int? markForRetry;
+  final int? markForRetryAfterAccepted;
+  final int? ackByServerAt;
+  final int retryCount;
+  final int? lastRetry;
+  final int createdAt;
+  const ReceiptsData({
+    required this.receiptId,
+    required this.contactId,
+    this.messageId,
+    required this.message,
+    required this.contactWillSendsReceipt,
+    required this.willBeRetriedByMediaUpload,
+    this.markForRetry,
+    this.markForRetryAfterAccepted,
+    this.ackByServerAt,
+    required this.retryCount,
+    this.lastRetry,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['receipt_id'] = Variable<String>(receiptId);
+    map['contact_id'] = Variable<int>(contactId);
+    if (!nullToAbsent || messageId != null) {
+      map['message_id'] = Variable<String>(messageId);
+    }
+    map['message'] = Variable<i2.Uint8List>(message);
+    map['contact_will_sends_receipt'] = Variable<int>(contactWillSendsReceipt);
+    map['will_be_retried_by_media_upload'] = Variable<int>(
+      willBeRetriedByMediaUpload,
+    );
+    if (!nullToAbsent || markForRetry != null) {
+      map['mark_for_retry'] = Variable<int>(markForRetry);
+    }
+    if (!nullToAbsent || markForRetryAfterAccepted != null) {
+      map['mark_for_retry_after_accepted'] = Variable<int>(
+        markForRetryAfterAccepted,
+      );
+    }
+    if (!nullToAbsent || ackByServerAt != null) {
+      map['ack_by_server_at'] = Variable<int>(ackByServerAt);
+    }
+    map['retry_count'] = Variable<int>(retryCount);
+    if (!nullToAbsent || lastRetry != null) {
+      map['last_retry'] = Variable<int>(lastRetry);
+    }
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  ReceiptsCompanion toCompanion(bool nullToAbsent) {
+    return ReceiptsCompanion(
+      receiptId: Value(receiptId),
+      contactId: Value(contactId),
+      messageId: messageId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(messageId),
+      message: Value(message),
+      contactWillSendsReceipt: Value(contactWillSendsReceipt),
+      willBeRetriedByMediaUpload: Value(willBeRetriedByMediaUpload),
+      markForRetry: markForRetry == null && nullToAbsent
+          ? const Value.absent()
+          : Value(markForRetry),
+      markForRetryAfterAccepted:
+          markForRetryAfterAccepted == null && nullToAbsent
+          ? const Value.absent()
+          : Value(markForRetryAfterAccepted),
+      ackByServerAt: ackByServerAt == null && nullToAbsent
+          ? const Value.absent()
+          : Value(ackByServerAt),
+      retryCount: Value(retryCount),
+      lastRetry: lastRetry == null && nullToAbsent
+          ? const Value.absent()
+          : Value(lastRetry),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory ReceiptsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return ReceiptsData(
+      receiptId: serializer.fromJson<String>(json['receiptId']),
+      contactId: serializer.fromJson<int>(json['contactId']),
+      messageId: serializer.fromJson<String?>(json['messageId']),
+      message: serializer.fromJson<i2.Uint8List>(json['message']),
+      contactWillSendsReceipt: serializer.fromJson<int>(
+        json['contactWillSendsReceipt'],
+      ),
+      willBeRetriedByMediaUpload: serializer.fromJson<int>(
+        json['willBeRetriedByMediaUpload'],
+      ),
+      markForRetry: serializer.fromJson<int?>(json['markForRetry']),
+      markForRetryAfterAccepted: serializer.fromJson<int?>(
+        json['markForRetryAfterAccepted'],
+      ),
+      ackByServerAt: serializer.fromJson<int?>(json['ackByServerAt']),
+      retryCount: serializer.fromJson<int>(json['retryCount']),
+      lastRetry: serializer.fromJson<int?>(json['lastRetry']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'receiptId': serializer.toJson<String>(receiptId),
+      'contactId': serializer.toJson<int>(contactId),
+      'messageId': serializer.toJson<String?>(messageId),
+      'message': serializer.toJson<i2.Uint8List>(message),
+      'contactWillSendsReceipt': serializer.toJson<int>(
+        contactWillSendsReceipt,
+      ),
+      'willBeRetriedByMediaUpload': serializer.toJson<int>(
+        willBeRetriedByMediaUpload,
+      ),
+      'markForRetry': serializer.toJson<int?>(markForRetry),
+      'markForRetryAfterAccepted': serializer.toJson<int?>(
+        markForRetryAfterAccepted,
+      ),
+      'ackByServerAt': serializer.toJson<int?>(ackByServerAt),
+      'retryCount': serializer.toJson<int>(retryCount),
+      'lastRetry': serializer.toJson<int?>(lastRetry),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  ReceiptsData copyWith({
+    String? receiptId,
+    int? contactId,
+    Value<String?> messageId = const Value.absent(),
+    i2.Uint8List? message,
+    int? contactWillSendsReceipt,
+    int? willBeRetriedByMediaUpload,
+    Value<int?> markForRetry = const Value.absent(),
+    Value<int?> markForRetryAfterAccepted = const Value.absent(),
+    Value<int?> ackByServerAt = const Value.absent(),
+    int? retryCount,
+    Value<int?> lastRetry = const Value.absent(),
+    int? createdAt,
+  }) => ReceiptsData(
+    receiptId: receiptId ?? this.receiptId,
+    contactId: contactId ?? this.contactId,
+    messageId: messageId.present ? messageId.value : this.messageId,
+    message: message ?? this.message,
+    contactWillSendsReceipt:
+        contactWillSendsReceipt ?? this.contactWillSendsReceipt,
+    willBeRetriedByMediaUpload:
+        willBeRetriedByMediaUpload ?? this.willBeRetriedByMediaUpload,
+    markForRetry: markForRetry.present ? markForRetry.value : this.markForRetry,
+    markForRetryAfterAccepted: markForRetryAfterAccepted.present
+        ? markForRetryAfterAccepted.value
+        : this.markForRetryAfterAccepted,
+    ackByServerAt: ackByServerAt.present
+        ? ackByServerAt.value
+        : this.ackByServerAt,
+    retryCount: retryCount ?? this.retryCount,
+    lastRetry: lastRetry.present ? lastRetry.value : this.lastRetry,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  ReceiptsData copyWithCompanion(ReceiptsCompanion data) {
+    return ReceiptsData(
+      receiptId: data.receiptId.present ? data.receiptId.value : this.receiptId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      messageId: data.messageId.present ? data.messageId.value : this.messageId,
+      message: data.message.present ? data.message.value : this.message,
+      contactWillSendsReceipt: data.contactWillSendsReceipt.present
+          ? data.contactWillSendsReceipt.value
+          : this.contactWillSendsReceipt,
+      willBeRetriedByMediaUpload: data.willBeRetriedByMediaUpload.present
+          ? data.willBeRetriedByMediaUpload.value
+          : this.willBeRetriedByMediaUpload,
+      markForRetry: data.markForRetry.present
+          ? data.markForRetry.value
+          : this.markForRetry,
+      markForRetryAfterAccepted: data.markForRetryAfterAccepted.present
+          ? data.markForRetryAfterAccepted.value
+          : this.markForRetryAfterAccepted,
+      ackByServerAt: data.ackByServerAt.present
+          ? data.ackByServerAt.value
+          : this.ackByServerAt,
+      retryCount: data.retryCount.present
+          ? data.retryCount.value
+          : this.retryCount,
+      lastRetry: data.lastRetry.present ? data.lastRetry.value : this.lastRetry,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ReceiptsData(')
+          ..write('receiptId: $receiptId, ')
+          ..write('contactId: $contactId, ')
+          ..write('messageId: $messageId, ')
+          ..write('message: $message, ')
+          ..write('contactWillSendsReceipt: $contactWillSendsReceipt, ')
+          ..write('willBeRetriedByMediaUpload: $willBeRetriedByMediaUpload, ')
+          ..write('markForRetry: $markForRetry, ')
+          ..write('markForRetryAfterAccepted: $markForRetryAfterAccepted, ')
+          ..write('ackByServerAt: $ackByServerAt, ')
+          ..write('retryCount: $retryCount, ')
+          ..write('lastRetry: $lastRetry, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    receiptId,
+    contactId,
+    messageId,
+    $driftBlobEquality.hash(message),
+    contactWillSendsReceipt,
+    willBeRetriedByMediaUpload,
+    markForRetry,
+    markForRetryAfterAccepted,
+    ackByServerAt,
+    retryCount,
+    lastRetry,
+    createdAt,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is ReceiptsData &&
+          other.receiptId == this.receiptId &&
+          other.contactId == this.contactId &&
+          other.messageId == this.messageId &&
+          $driftBlobEquality.equals(other.message, this.message) &&
+          other.contactWillSendsReceipt == this.contactWillSendsReceipt &&
+          other.willBeRetriedByMediaUpload == this.willBeRetriedByMediaUpload &&
+          other.markForRetry == this.markForRetry &&
+          other.markForRetryAfterAccepted == this.markForRetryAfterAccepted &&
+          other.ackByServerAt == this.ackByServerAt &&
+          other.retryCount == this.retryCount &&
+          other.lastRetry == this.lastRetry &&
+          other.createdAt == this.createdAt);
+}
+
+class ReceiptsCompanion extends UpdateCompanion<ReceiptsData> {
+  final Value<String> receiptId;
+  final Value<int> contactId;
+  final Value<String?> messageId;
+  final Value<i2.Uint8List> message;
+  final Value<int> contactWillSendsReceipt;
+  final Value<int> willBeRetriedByMediaUpload;
+  final Value<int?> markForRetry;
+  final Value<int?> markForRetryAfterAccepted;
+  final Value<int?> ackByServerAt;
+  final Value<int> retryCount;
+  final Value<int?> lastRetry;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const ReceiptsCompanion({
+    this.receiptId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.messageId = const Value.absent(),
+    this.message = const Value.absent(),
+    this.contactWillSendsReceipt = const Value.absent(),
+    this.willBeRetriedByMediaUpload = const Value.absent(),
+    this.markForRetry = const Value.absent(),
+    this.markForRetryAfterAccepted = const Value.absent(),
+    this.ackByServerAt = const Value.absent(),
+    this.retryCount = const Value.absent(),
+    this.lastRetry = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  ReceiptsCompanion.insert({
+    required String receiptId,
+    required int contactId,
+    this.messageId = const Value.absent(),
+    required i2.Uint8List message,
+    this.contactWillSendsReceipt = const Value.absent(),
+    this.willBeRetriedByMediaUpload = const Value.absent(),
+    this.markForRetry = const Value.absent(),
+    this.markForRetryAfterAccepted = const Value.absent(),
+    this.ackByServerAt = const Value.absent(),
+    this.retryCount = const Value.absent(),
+    this.lastRetry = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : receiptId = Value(receiptId),
+       contactId = Value(contactId),
+       message = Value(message);
+  static Insertable<ReceiptsData> custom({
+    Expression<String>? receiptId,
+    Expression<int>? contactId,
+    Expression<String>? messageId,
+    Expression<i2.Uint8List>? message,
+    Expression<int>? contactWillSendsReceipt,
+    Expression<int>? willBeRetriedByMediaUpload,
+    Expression<int>? markForRetry,
+    Expression<int>? markForRetryAfterAccepted,
+    Expression<int>? ackByServerAt,
+    Expression<int>? retryCount,
+    Expression<int>? lastRetry,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (receiptId != null) 'receipt_id': receiptId,
+      if (contactId != null) 'contact_id': contactId,
+      if (messageId != null) 'message_id': messageId,
+      if (message != null) 'message': message,
+      if (contactWillSendsReceipt != null)
+        'contact_will_sends_receipt': contactWillSendsReceipt,
+      if (willBeRetriedByMediaUpload != null)
+        'will_be_retried_by_media_upload': willBeRetriedByMediaUpload,
+      if (markForRetry != null) 'mark_for_retry': markForRetry,
+      if (markForRetryAfterAccepted != null)
+        'mark_for_retry_after_accepted': markForRetryAfterAccepted,
+      if (ackByServerAt != null) 'ack_by_server_at': ackByServerAt,
+      if (retryCount != null) 'retry_count': retryCount,
+      if (lastRetry != null) 'last_retry': lastRetry,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  ReceiptsCompanion copyWith({
+    Value<String>? receiptId,
+    Value<int>? contactId,
+    Value<String?>? messageId,
+    Value<i2.Uint8List>? message,
+    Value<int>? contactWillSendsReceipt,
+    Value<int>? willBeRetriedByMediaUpload,
+    Value<int?>? markForRetry,
+    Value<int?>? markForRetryAfterAccepted,
+    Value<int?>? ackByServerAt,
+    Value<int>? retryCount,
+    Value<int?>? lastRetry,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return ReceiptsCompanion(
+      receiptId: receiptId ?? this.receiptId,
+      contactId: contactId ?? this.contactId,
+      messageId: messageId ?? this.messageId,
+      message: message ?? this.message,
+      contactWillSendsReceipt:
+          contactWillSendsReceipt ?? this.contactWillSendsReceipt,
+      willBeRetriedByMediaUpload:
+          willBeRetriedByMediaUpload ?? this.willBeRetriedByMediaUpload,
+      markForRetry: markForRetry ?? this.markForRetry,
+      markForRetryAfterAccepted:
+          markForRetryAfterAccepted ?? this.markForRetryAfterAccepted,
+      ackByServerAt: ackByServerAt ?? this.ackByServerAt,
+      retryCount: retryCount ?? this.retryCount,
+      lastRetry: lastRetry ?? this.lastRetry,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (receiptId.present) {
+      map['receipt_id'] = Variable<String>(receiptId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (messageId.present) {
+      map['message_id'] = Variable<String>(messageId.value);
+    }
+    if (message.present) {
+      map['message'] = Variable<i2.Uint8List>(message.value);
+    }
+    if (contactWillSendsReceipt.present) {
+      map['contact_will_sends_receipt'] = Variable<int>(
+        contactWillSendsReceipt.value,
+      );
+    }
+    if (willBeRetriedByMediaUpload.present) {
+      map['will_be_retried_by_media_upload'] = Variable<int>(
+        willBeRetriedByMediaUpload.value,
+      );
+    }
+    if (markForRetry.present) {
+      map['mark_for_retry'] = Variable<int>(markForRetry.value);
+    }
+    if (markForRetryAfterAccepted.present) {
+      map['mark_for_retry_after_accepted'] = Variable<int>(
+        markForRetryAfterAccepted.value,
+      );
+    }
+    if (ackByServerAt.present) {
+      map['ack_by_server_at'] = Variable<int>(ackByServerAt.value);
+    }
+    if (retryCount.present) {
+      map['retry_count'] = Variable<int>(retryCount.value);
+    }
+    if (lastRetry.present) {
+      map['last_retry'] = Variable<int>(lastRetry.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ReceiptsCompanion(')
+          ..write('receiptId: $receiptId, ')
+          ..write('contactId: $contactId, ')
+          ..write('messageId: $messageId, ')
+          ..write('message: $message, ')
+          ..write('contactWillSendsReceipt: $contactWillSendsReceipt, ')
+          ..write('willBeRetriedByMediaUpload: $willBeRetriedByMediaUpload, ')
+          ..write('markForRetry: $markForRetry, ')
+          ..write('markForRetryAfterAccepted: $markForRetryAfterAccepted, ')
+          ..write('ackByServerAt: $ackByServerAt, ')
+          ..write('retryCount: $retryCount, ')
+          ..write('lastRetry: $lastRetry, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class ReceivedReceipts extends Table
+    with TableInfo<ReceivedReceipts, ReceivedReceiptsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  ReceivedReceipts(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> receiptId = GeneratedColumn<String>(
+    'receipt_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [receiptId, createdAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'received_receipts';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {receiptId};
+  @override
+  ReceivedReceiptsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return ReceivedReceiptsData(
+      receiptId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}receipt_id'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  ReceivedReceipts createAlias(String alias) {
+    return ReceivedReceipts(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(receipt_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class ReceivedReceiptsData extends DataClass
+    implements Insertable<ReceivedReceiptsData> {
+  final String receiptId;
+  final int createdAt;
+  const ReceivedReceiptsData({
+    required this.receiptId,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['receipt_id'] = Variable<String>(receiptId);
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  ReceivedReceiptsCompanion toCompanion(bool nullToAbsent) {
+    return ReceivedReceiptsCompanion(
+      receiptId: Value(receiptId),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory ReceivedReceiptsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return ReceivedReceiptsData(
+      receiptId: serializer.fromJson<String>(json['receiptId']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'receiptId': serializer.toJson<String>(receiptId),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  ReceivedReceiptsData copyWith({String? receiptId, int? createdAt}) =>
+      ReceivedReceiptsData(
+        receiptId: receiptId ?? this.receiptId,
+        createdAt: createdAt ?? this.createdAt,
+      );
+  ReceivedReceiptsData copyWithCompanion(ReceivedReceiptsCompanion data) {
+    return ReceivedReceiptsData(
+      receiptId: data.receiptId.present ? data.receiptId.value : this.receiptId,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ReceivedReceiptsData(')
+          ..write('receiptId: $receiptId, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(receiptId, createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is ReceivedReceiptsData &&
+          other.receiptId == this.receiptId &&
+          other.createdAt == this.createdAt);
+}
+
+class ReceivedReceiptsCompanion extends UpdateCompanion<ReceivedReceiptsData> {
+  final Value<String> receiptId;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const ReceivedReceiptsCompanion({
+    this.receiptId = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  ReceivedReceiptsCompanion.insert({
+    required String receiptId,
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : receiptId = Value(receiptId);
+  static Insertable<ReceivedReceiptsData> custom({
+    Expression<String>? receiptId,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (receiptId != null) 'receipt_id': receiptId,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  ReceivedReceiptsCompanion copyWith({
+    Value<String>? receiptId,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return ReceivedReceiptsCompanion(
+      receiptId: receiptId ?? this.receiptId,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (receiptId.present) {
+      map['receipt_id'] = Variable<String>(receiptId.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('ReceivedReceiptsCompanion(')
+          ..write('receiptId: $receiptId, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class SignalIdentityKeyStores extends Table
+    with TableInfo<SignalIdentityKeyStores, SignalIdentityKeyStoresData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  SignalIdentityKeyStores(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> deviceId = GeneratedColumn<int>(
+    'device_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> name = GeneratedColumn<String>(
+    'name',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> identityKey =
+      GeneratedColumn<i2.Uint8List>(
+        'identity_key',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    deviceId,
+    name,
+    identityKey,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'signal_identity_key_stores';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {deviceId, name};
+  @override
+  SignalIdentityKeyStoresData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return SignalIdentityKeyStoresData(
+      deviceId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}device_id'],
+      )!,
+      name: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}name'],
+      )!,
+      identityKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}identity_key'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  SignalIdentityKeyStores createAlias(String alias) {
+    return SignalIdentityKeyStores(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(device_id, name)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class SignalIdentityKeyStoresData extends DataClass
+    implements Insertable<SignalIdentityKeyStoresData> {
+  final int deviceId;
+  final String name;
+  final i2.Uint8List identityKey;
+  final int createdAt;
+  const SignalIdentityKeyStoresData({
+    required this.deviceId,
+    required this.name,
+    required this.identityKey,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['device_id'] = Variable<int>(deviceId);
+    map['name'] = Variable<String>(name);
+    map['identity_key'] = Variable<i2.Uint8List>(identityKey);
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  SignalIdentityKeyStoresCompanion toCompanion(bool nullToAbsent) {
+    return SignalIdentityKeyStoresCompanion(
+      deviceId: Value(deviceId),
+      name: Value(name),
+      identityKey: Value(identityKey),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory SignalIdentityKeyStoresData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return SignalIdentityKeyStoresData(
+      deviceId: serializer.fromJson<int>(json['deviceId']),
+      name: serializer.fromJson<String>(json['name']),
+      identityKey: serializer.fromJson<i2.Uint8List>(json['identityKey']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'deviceId': serializer.toJson<int>(deviceId),
+      'name': serializer.toJson<String>(name),
+      'identityKey': serializer.toJson<i2.Uint8List>(identityKey),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  SignalIdentityKeyStoresData copyWith({
+    int? deviceId,
+    String? name,
+    i2.Uint8List? identityKey,
+    int? createdAt,
+  }) => SignalIdentityKeyStoresData(
+    deviceId: deviceId ?? this.deviceId,
+    name: name ?? this.name,
+    identityKey: identityKey ?? this.identityKey,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  SignalIdentityKeyStoresData copyWithCompanion(
+    SignalIdentityKeyStoresCompanion data,
+  ) {
+    return SignalIdentityKeyStoresData(
+      deviceId: data.deviceId.present ? data.deviceId.value : this.deviceId,
+      name: data.name.present ? data.name.value : this.name,
+      identityKey: data.identityKey.present
+          ? data.identityKey.value
+          : this.identityKey,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalIdentityKeyStoresData(')
+          ..write('deviceId: $deviceId, ')
+          ..write('name: $name, ')
+          ..write('identityKey: $identityKey, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    deviceId,
+    name,
+    $driftBlobEquality.hash(identityKey),
+    createdAt,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is SignalIdentityKeyStoresData &&
+          other.deviceId == this.deviceId &&
+          other.name == this.name &&
+          $driftBlobEquality.equals(other.identityKey, this.identityKey) &&
+          other.createdAt == this.createdAt);
+}
+
+class SignalIdentityKeyStoresCompanion
+    extends UpdateCompanion<SignalIdentityKeyStoresData> {
+  final Value<int> deviceId;
+  final Value<String> name;
+  final Value<i2.Uint8List> identityKey;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const SignalIdentityKeyStoresCompanion({
+    this.deviceId = const Value.absent(),
+    this.name = const Value.absent(),
+    this.identityKey = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  SignalIdentityKeyStoresCompanion.insert({
+    required int deviceId,
+    required String name,
+    required i2.Uint8List identityKey,
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : deviceId = Value(deviceId),
+       name = Value(name),
+       identityKey = Value(identityKey);
+  static Insertable<SignalIdentityKeyStoresData> custom({
+    Expression<int>? deviceId,
+    Expression<String>? name,
+    Expression<i2.Uint8List>? identityKey,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (deviceId != null) 'device_id': deviceId,
+      if (name != null) 'name': name,
+      if (identityKey != null) 'identity_key': identityKey,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  SignalIdentityKeyStoresCompanion copyWith({
+    Value<int>? deviceId,
+    Value<String>? name,
+    Value<i2.Uint8List>? identityKey,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return SignalIdentityKeyStoresCompanion(
+      deviceId: deviceId ?? this.deviceId,
+      name: name ?? this.name,
+      identityKey: identityKey ?? this.identityKey,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (deviceId.present) {
+      map['device_id'] = Variable<int>(deviceId.value);
+    }
+    if (name.present) {
+      map['name'] = Variable<String>(name.value);
+    }
+    if (identityKey.present) {
+      map['identity_key'] = Variable<i2.Uint8List>(identityKey.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalIdentityKeyStoresCompanion(')
+          ..write('deviceId: $deviceId, ')
+          ..write('name: $name, ')
+          ..write('identityKey: $identityKey, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class SignalPreKeyStores extends Table
+    with TableInfo<SignalPreKeyStores, SignalPreKeyStoresData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  SignalPreKeyStores(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> preKeyId = GeneratedColumn<int>(
+    'pre_key_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> preKey =
+      GeneratedColumn<i2.Uint8List>(
+        'pre_key',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [preKeyId, preKey, createdAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'signal_pre_key_stores';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {preKeyId};
+  @override
+  SignalPreKeyStoresData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return SignalPreKeyStoresData(
+      preKeyId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}pre_key_id'],
+      )!,
+      preKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}pre_key'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  SignalPreKeyStores createAlias(String alias) {
+    return SignalPreKeyStores(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(pre_key_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class SignalPreKeyStoresData extends DataClass
+    implements Insertable<SignalPreKeyStoresData> {
+  final int preKeyId;
+  final i2.Uint8List preKey;
+  final int createdAt;
+  const SignalPreKeyStoresData({
+    required this.preKeyId,
+    required this.preKey,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['pre_key_id'] = Variable<int>(preKeyId);
+    map['pre_key'] = Variable<i2.Uint8List>(preKey);
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  SignalPreKeyStoresCompanion toCompanion(bool nullToAbsent) {
+    return SignalPreKeyStoresCompanion(
+      preKeyId: Value(preKeyId),
+      preKey: Value(preKey),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory SignalPreKeyStoresData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return SignalPreKeyStoresData(
+      preKeyId: serializer.fromJson<int>(json['preKeyId']),
+      preKey: serializer.fromJson<i2.Uint8List>(json['preKey']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'preKeyId': serializer.toJson<int>(preKeyId),
+      'preKey': serializer.toJson<i2.Uint8List>(preKey),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  SignalPreKeyStoresData copyWith({
+    int? preKeyId,
+    i2.Uint8List? preKey,
+    int? createdAt,
+  }) => SignalPreKeyStoresData(
+    preKeyId: preKeyId ?? this.preKeyId,
+    preKey: preKey ?? this.preKey,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  SignalPreKeyStoresData copyWithCompanion(SignalPreKeyStoresCompanion data) {
+    return SignalPreKeyStoresData(
+      preKeyId: data.preKeyId.present ? data.preKeyId.value : this.preKeyId,
+      preKey: data.preKey.present ? data.preKey.value : this.preKey,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalPreKeyStoresData(')
+          ..write('preKeyId: $preKeyId, ')
+          ..write('preKey: $preKey, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(preKeyId, $driftBlobEquality.hash(preKey), createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is SignalPreKeyStoresData &&
+          other.preKeyId == this.preKeyId &&
+          $driftBlobEquality.equals(other.preKey, this.preKey) &&
+          other.createdAt == this.createdAt);
+}
+
+class SignalPreKeyStoresCompanion
+    extends UpdateCompanion<SignalPreKeyStoresData> {
+  final Value<int> preKeyId;
+  final Value<i2.Uint8List> preKey;
+  final Value<int> createdAt;
+  const SignalPreKeyStoresCompanion({
+    this.preKeyId = const Value.absent(),
+    this.preKey = const Value.absent(),
+    this.createdAt = const Value.absent(),
+  });
+  SignalPreKeyStoresCompanion.insert({
+    this.preKeyId = const Value.absent(),
+    required i2.Uint8List preKey,
+    this.createdAt = const Value.absent(),
+  }) : preKey = Value(preKey);
+  static Insertable<SignalPreKeyStoresData> custom({
+    Expression<int>? preKeyId,
+    Expression<i2.Uint8List>? preKey,
+    Expression<int>? createdAt,
+  }) {
+    return RawValuesInsertable({
+      if (preKeyId != null) 'pre_key_id': preKeyId,
+      if (preKey != null) 'pre_key': preKey,
+      if (createdAt != null) 'created_at': createdAt,
+    });
+  }
+
+  SignalPreKeyStoresCompanion copyWith({
+    Value<int>? preKeyId,
+    Value<i2.Uint8List>? preKey,
+    Value<int>? createdAt,
+  }) {
+    return SignalPreKeyStoresCompanion(
+      preKeyId: preKeyId ?? this.preKeyId,
+      preKey: preKey ?? this.preKey,
+      createdAt: createdAt ?? this.createdAt,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (preKeyId.present) {
+      map['pre_key_id'] = Variable<int>(preKeyId.value);
+    }
+    if (preKey.present) {
+      map['pre_key'] = Variable<i2.Uint8List>(preKey.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalPreKeyStoresCompanion(')
+          ..write('preKeyId: $preKeyId, ')
+          ..write('preKey: $preKey, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class SignalSenderKeyStores extends Table
+    with TableInfo<SignalSenderKeyStores, SignalSenderKeyStoresData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  SignalSenderKeyStores(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> senderKeyName = GeneratedColumn<String>(
+    'sender_key_name',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> senderKey =
+      GeneratedColumn<i2.Uint8List>(
+        'sender_key',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  @override
+  List<GeneratedColumn> get $columns => [senderKeyName, senderKey];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'signal_sender_key_stores';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {senderKeyName};
+  @override
+  SignalSenderKeyStoresData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return SignalSenderKeyStoresData(
+      senderKeyName: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}sender_key_name'],
+      )!,
+      senderKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}sender_key'],
+      )!,
+    );
+  }
+
+  @override
+  SignalSenderKeyStores createAlias(String alias) {
+    return SignalSenderKeyStores(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(sender_key_name)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class SignalSenderKeyStoresData extends DataClass
+    implements Insertable<SignalSenderKeyStoresData> {
+  final String senderKeyName;
+  final i2.Uint8List senderKey;
+  const SignalSenderKeyStoresData({
+    required this.senderKeyName,
+    required this.senderKey,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['sender_key_name'] = Variable<String>(senderKeyName);
+    map['sender_key'] = Variable<i2.Uint8List>(senderKey);
+    return map;
+  }
+
+  SignalSenderKeyStoresCompanion toCompanion(bool nullToAbsent) {
+    return SignalSenderKeyStoresCompanion(
+      senderKeyName: Value(senderKeyName),
+      senderKey: Value(senderKey),
+    );
+  }
+
+  factory SignalSenderKeyStoresData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return SignalSenderKeyStoresData(
+      senderKeyName: serializer.fromJson<String>(json['senderKeyName']),
+      senderKey: serializer.fromJson<i2.Uint8List>(json['senderKey']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'senderKeyName': serializer.toJson<String>(senderKeyName),
+      'senderKey': serializer.toJson<i2.Uint8List>(senderKey),
+    };
+  }
+
+  SignalSenderKeyStoresData copyWith({
+    String? senderKeyName,
+    i2.Uint8List? senderKey,
+  }) => SignalSenderKeyStoresData(
+    senderKeyName: senderKeyName ?? this.senderKeyName,
+    senderKey: senderKey ?? this.senderKey,
+  );
+  SignalSenderKeyStoresData copyWithCompanion(
+    SignalSenderKeyStoresCompanion data,
+  ) {
+    return SignalSenderKeyStoresData(
+      senderKeyName: data.senderKeyName.present
+          ? data.senderKeyName.value
+          : this.senderKeyName,
+      senderKey: data.senderKey.present ? data.senderKey.value : this.senderKey,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalSenderKeyStoresData(')
+          ..write('senderKeyName: $senderKeyName, ')
+          ..write('senderKey: $senderKey')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(senderKeyName, $driftBlobEquality.hash(senderKey));
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is SignalSenderKeyStoresData &&
+          other.senderKeyName == this.senderKeyName &&
+          $driftBlobEquality.equals(other.senderKey, this.senderKey));
+}
+
+class SignalSenderKeyStoresCompanion
+    extends UpdateCompanion<SignalSenderKeyStoresData> {
+  final Value<String> senderKeyName;
+  final Value<i2.Uint8List> senderKey;
+  final Value<int> rowid;
+  const SignalSenderKeyStoresCompanion({
+    this.senderKeyName = const Value.absent(),
+    this.senderKey = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  SignalSenderKeyStoresCompanion.insert({
+    required String senderKeyName,
+    required i2.Uint8List senderKey,
+    this.rowid = const Value.absent(),
+  }) : senderKeyName = Value(senderKeyName),
+       senderKey = Value(senderKey);
+  static Insertable<SignalSenderKeyStoresData> custom({
+    Expression<String>? senderKeyName,
+    Expression<i2.Uint8List>? senderKey,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (senderKeyName != null) 'sender_key_name': senderKeyName,
+      if (senderKey != null) 'sender_key': senderKey,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  SignalSenderKeyStoresCompanion copyWith({
+    Value<String>? senderKeyName,
+    Value<i2.Uint8List>? senderKey,
+    Value<int>? rowid,
+  }) {
+    return SignalSenderKeyStoresCompanion(
+      senderKeyName: senderKeyName ?? this.senderKeyName,
+      senderKey: senderKey ?? this.senderKey,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (senderKeyName.present) {
+      map['sender_key_name'] = Variable<String>(senderKeyName.value);
+    }
+    if (senderKey.present) {
+      map['sender_key'] = Variable<i2.Uint8List>(senderKey.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalSenderKeyStoresCompanion(')
+          ..write('senderKeyName: $senderKeyName, ')
+          ..write('senderKey: $senderKey, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class SignalSessionStores extends Table
+    with TableInfo<SignalSessionStores, SignalSessionStoresData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  SignalSessionStores(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> deviceId = GeneratedColumn<int>(
+    'device_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> name = GeneratedColumn<String>(
+    'name',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> sessionRecord =
+      GeneratedColumn<i2.Uint8List>(
+        'session_record',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    deviceId,
+    name,
+    sessionRecord,
+    createdAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'signal_session_stores';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {deviceId, name};
+  @override
+  SignalSessionStoresData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return SignalSessionStoresData(
+      deviceId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}device_id'],
+      )!,
+      name: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}name'],
+      )!,
+      sessionRecord: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}session_record'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  SignalSessionStores createAlias(String alias) {
+    return SignalSessionStores(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(device_id, name)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class SignalSessionStoresData extends DataClass
+    implements Insertable<SignalSessionStoresData> {
+  final int deviceId;
+  final String name;
+  final i2.Uint8List sessionRecord;
+  final int createdAt;
+  const SignalSessionStoresData({
+    required this.deviceId,
+    required this.name,
+    required this.sessionRecord,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['device_id'] = Variable<int>(deviceId);
+    map['name'] = Variable<String>(name);
+    map['session_record'] = Variable<i2.Uint8List>(sessionRecord);
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  SignalSessionStoresCompanion toCompanion(bool nullToAbsent) {
+    return SignalSessionStoresCompanion(
+      deviceId: Value(deviceId),
+      name: Value(name),
+      sessionRecord: Value(sessionRecord),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory SignalSessionStoresData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return SignalSessionStoresData(
+      deviceId: serializer.fromJson<int>(json['deviceId']),
+      name: serializer.fromJson<String>(json['name']),
+      sessionRecord: serializer.fromJson<i2.Uint8List>(json['sessionRecord']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'deviceId': serializer.toJson<int>(deviceId),
+      'name': serializer.toJson<String>(name),
+      'sessionRecord': serializer.toJson<i2.Uint8List>(sessionRecord),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  SignalSessionStoresData copyWith({
+    int? deviceId,
+    String? name,
+    i2.Uint8List? sessionRecord,
+    int? createdAt,
+  }) => SignalSessionStoresData(
+    deviceId: deviceId ?? this.deviceId,
+    name: name ?? this.name,
+    sessionRecord: sessionRecord ?? this.sessionRecord,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  SignalSessionStoresData copyWithCompanion(SignalSessionStoresCompanion data) {
+    return SignalSessionStoresData(
+      deviceId: data.deviceId.present ? data.deviceId.value : this.deviceId,
+      name: data.name.present ? data.name.value : this.name,
+      sessionRecord: data.sessionRecord.present
+          ? data.sessionRecord.value
+          : this.sessionRecord,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalSessionStoresData(')
+          ..write('deviceId: $deviceId, ')
+          ..write('name: $name, ')
+          ..write('sessionRecord: $sessionRecord, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    deviceId,
+    name,
+    $driftBlobEquality.hash(sessionRecord),
+    createdAt,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is SignalSessionStoresData &&
+          other.deviceId == this.deviceId &&
+          other.name == this.name &&
+          $driftBlobEquality.equals(other.sessionRecord, this.sessionRecord) &&
+          other.createdAt == this.createdAt);
+}
+
+class SignalSessionStoresCompanion
+    extends UpdateCompanion<SignalSessionStoresData> {
+  final Value<int> deviceId;
+  final Value<String> name;
+  final Value<i2.Uint8List> sessionRecord;
+  final Value<int> createdAt;
+  final Value<int> rowid;
+  const SignalSessionStoresCompanion({
+    this.deviceId = const Value.absent(),
+    this.name = const Value.absent(),
+    this.sessionRecord = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  SignalSessionStoresCompanion.insert({
+    required int deviceId,
+    required String name,
+    required i2.Uint8List sessionRecord,
+    this.createdAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : deviceId = Value(deviceId),
+       name = Value(name),
+       sessionRecord = Value(sessionRecord);
+  static Insertable<SignalSessionStoresData> custom({
+    Expression<int>? deviceId,
+    Expression<String>? name,
+    Expression<i2.Uint8List>? sessionRecord,
+    Expression<int>? createdAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (deviceId != null) 'device_id': deviceId,
+      if (name != null) 'name': name,
+      if (sessionRecord != null) 'session_record': sessionRecord,
+      if (createdAt != null) 'created_at': createdAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  SignalSessionStoresCompanion copyWith({
+    Value<int>? deviceId,
+    Value<String>? name,
+    Value<i2.Uint8List>? sessionRecord,
+    Value<int>? createdAt,
+    Value<int>? rowid,
+  }) {
+    return SignalSessionStoresCompanion(
+      deviceId: deviceId ?? this.deviceId,
+      name: name ?? this.name,
+      sessionRecord: sessionRecord ?? this.sessionRecord,
+      createdAt: createdAt ?? this.createdAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (deviceId.present) {
+      map['device_id'] = Variable<int>(deviceId.value);
+    }
+    if (name.present) {
+      map['name'] = Variable<String>(name.value);
+    }
+    if (sessionRecord.present) {
+      map['session_record'] = Variable<i2.Uint8List>(sessionRecord.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SignalSessionStoresCompanion(')
+          ..write('deviceId: $deviceId, ')
+          ..write('name: $name, ')
+          ..write('sessionRecord: $sessionRecord, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class MessageActions extends Table
+    with TableInfo<MessageActions, MessageActionsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  MessageActions(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> messageId = GeneratedColumn<String>(
+    'message_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES messages(message_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<String> type = GeneratedColumn<String>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> actionAt = GeneratedColumn<int>(
+    'action_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [messageId, contactId, type, actionAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'message_actions';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {messageId, contactId, type};
+  @override
+  MessageActionsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return MessageActionsData(
+      messageId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}message_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      )!,
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}type'],
+      )!,
+      actionAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}action_at'],
+      )!,
+    );
+  }
+
+  @override
+  MessageActions createAlias(String alias) {
+    return MessageActions(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const [
+    'PRIMARY KEY(message_id, contact_id, type)',
+  ];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class MessageActionsData extends DataClass
+    implements Insertable<MessageActionsData> {
+  final String messageId;
+  final int contactId;
+  final String type;
+  final int actionAt;
+  const MessageActionsData({
+    required this.messageId,
+    required this.contactId,
+    required this.type,
+    required this.actionAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['message_id'] = Variable<String>(messageId);
+    map['contact_id'] = Variable<int>(contactId);
+    map['type'] = Variable<String>(type);
+    map['action_at'] = Variable<int>(actionAt);
+    return map;
+  }
+
+  MessageActionsCompanion toCompanion(bool nullToAbsent) {
+    return MessageActionsCompanion(
+      messageId: Value(messageId),
+      contactId: Value(contactId),
+      type: Value(type),
+      actionAt: Value(actionAt),
+    );
+  }
+
+  factory MessageActionsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return MessageActionsData(
+      messageId: serializer.fromJson<String>(json['messageId']),
+      contactId: serializer.fromJson<int>(json['contactId']),
+      type: serializer.fromJson<String>(json['type']),
+      actionAt: serializer.fromJson<int>(json['actionAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'messageId': serializer.toJson<String>(messageId),
+      'contactId': serializer.toJson<int>(contactId),
+      'type': serializer.toJson<String>(type),
+      'actionAt': serializer.toJson<int>(actionAt),
+    };
+  }
+
+  MessageActionsData copyWith({
+    String? messageId,
+    int? contactId,
+    String? type,
+    int? actionAt,
+  }) => MessageActionsData(
+    messageId: messageId ?? this.messageId,
+    contactId: contactId ?? this.contactId,
+    type: type ?? this.type,
+    actionAt: actionAt ?? this.actionAt,
+  );
+  MessageActionsData copyWithCompanion(MessageActionsCompanion data) {
+    return MessageActionsData(
+      messageId: data.messageId.present ? data.messageId.value : this.messageId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      type: data.type.present ? data.type.value : this.type,
+      actionAt: data.actionAt.present ? data.actionAt.value : this.actionAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MessageActionsData(')
+          ..write('messageId: $messageId, ')
+          ..write('contactId: $contactId, ')
+          ..write('type: $type, ')
+          ..write('actionAt: $actionAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(messageId, contactId, type, actionAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is MessageActionsData &&
+          other.messageId == this.messageId &&
+          other.contactId == this.contactId &&
+          other.type == this.type &&
+          other.actionAt == this.actionAt);
+}
+
+class MessageActionsCompanion extends UpdateCompanion<MessageActionsData> {
+  final Value<String> messageId;
+  final Value<int> contactId;
+  final Value<String> type;
+  final Value<int> actionAt;
+  final Value<int> rowid;
+  const MessageActionsCompanion({
+    this.messageId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.type = const Value.absent(),
+    this.actionAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  MessageActionsCompanion.insert({
+    required String messageId,
+    required int contactId,
+    required String type,
+    this.actionAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : messageId = Value(messageId),
+       contactId = Value(contactId),
+       type = Value(type);
+  static Insertable<MessageActionsData> custom({
+    Expression<String>? messageId,
+    Expression<int>? contactId,
+    Expression<String>? type,
+    Expression<int>? actionAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (messageId != null) 'message_id': messageId,
+      if (contactId != null) 'contact_id': contactId,
+      if (type != null) 'type': type,
+      if (actionAt != null) 'action_at': actionAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  MessageActionsCompanion copyWith({
+    Value<String>? messageId,
+    Value<int>? contactId,
+    Value<String>? type,
+    Value<int>? actionAt,
+    Value<int>? rowid,
+  }) {
+    return MessageActionsCompanion(
+      messageId: messageId ?? this.messageId,
+      contactId: contactId ?? this.contactId,
+      type: type ?? this.type,
+      actionAt: actionAt ?? this.actionAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (messageId.present) {
+      map['message_id'] = Variable<String>(messageId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (type.present) {
+      map['type'] = Variable<String>(type.value);
+    }
+    if (actionAt.present) {
+      map['action_at'] = Variable<int>(actionAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MessageActionsCompanion(')
+          ..write('messageId: $messageId, ')
+          ..write('contactId: $contactId, ')
+          ..write('type: $type, ')
+          ..write('actionAt: $actionAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class GroupHistories extends Table
+    with TableInfo<GroupHistories, GroupHistoriesData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  GroupHistories(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> groupHistoryId = GeneratedColumn<String>(
+    'group_history_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<String> groupId = GeneratedColumn<String>(
+    'group_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES "groups"(group_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL REFERENCES contacts(user_id)',
+  );
+  late final GeneratedColumn<int> affectedContactId = GeneratedColumn<int>(
+    'affected_contact_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<String> oldGroupName = GeneratedColumn<String>(
+    'old_group_name',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<String> newGroupName = GeneratedColumn<String>(
+    'new_group_name',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> newDeleteMessagesAfterMilliseconds =
+      GeneratedColumn<int>(
+        'new_delete_messages_after_milliseconds',
+        aliasedName,
+        true,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  late final GeneratedColumn<String> type = GeneratedColumn<String>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> actionAt = GeneratedColumn<int>(
+    'action_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    groupHistoryId,
+    groupId,
+    contactId,
+    affectedContactId,
+    oldGroupName,
+    newGroupName,
+    newDeleteMessagesAfterMilliseconds,
+    type,
+    actionAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'group_histories';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {groupHistoryId};
+  @override
+  GroupHistoriesData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return GroupHistoriesData(
+      groupHistoryId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}group_history_id'],
+      )!,
+      groupId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}group_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      ),
+      affectedContactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}affected_contact_id'],
+      ),
+      oldGroupName: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}old_group_name'],
+      ),
+      newGroupName: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}new_group_name'],
+      ),
+      newDeleteMessagesAfterMilliseconds: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}new_delete_messages_after_milliseconds'],
+      ),
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}type'],
+      )!,
+      actionAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}action_at'],
+      )!,
+    );
+  }
+
+  @override
+  GroupHistories createAlias(String alias) {
+    return GroupHistories(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(group_history_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class GroupHistoriesData extends DataClass
+    implements Insertable<GroupHistoriesData> {
+  final String groupHistoryId;
+  final String groupId;
+  final int? contactId;
+  final int? affectedContactId;
+  final String? oldGroupName;
+  final String? newGroupName;
+  final int? newDeleteMessagesAfterMilliseconds;
+  final String type;
+  final int actionAt;
+  const GroupHistoriesData({
+    required this.groupHistoryId,
+    required this.groupId,
+    this.contactId,
+    this.affectedContactId,
+    this.oldGroupName,
+    this.newGroupName,
+    this.newDeleteMessagesAfterMilliseconds,
+    required this.type,
+    required this.actionAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['group_history_id'] = Variable<String>(groupHistoryId);
+    map['group_id'] = Variable<String>(groupId);
+    if (!nullToAbsent || contactId != null) {
+      map['contact_id'] = Variable<int>(contactId);
+    }
+    if (!nullToAbsent || affectedContactId != null) {
+      map['affected_contact_id'] = Variable<int>(affectedContactId);
+    }
+    if (!nullToAbsent || oldGroupName != null) {
+      map['old_group_name'] = Variable<String>(oldGroupName);
+    }
+    if (!nullToAbsent || newGroupName != null) {
+      map['new_group_name'] = Variable<String>(newGroupName);
+    }
+    if (!nullToAbsent || newDeleteMessagesAfterMilliseconds != null) {
+      map['new_delete_messages_after_milliseconds'] = Variable<int>(
+        newDeleteMessagesAfterMilliseconds,
+      );
+    }
+    map['type'] = Variable<String>(type);
+    map['action_at'] = Variable<int>(actionAt);
+    return map;
+  }
+
+  GroupHistoriesCompanion toCompanion(bool nullToAbsent) {
+    return GroupHistoriesCompanion(
+      groupHistoryId: Value(groupHistoryId),
+      groupId: Value(groupId),
+      contactId: contactId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(contactId),
+      affectedContactId: affectedContactId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(affectedContactId),
+      oldGroupName: oldGroupName == null && nullToAbsent
+          ? const Value.absent()
+          : Value(oldGroupName),
+      newGroupName: newGroupName == null && nullToAbsent
+          ? const Value.absent()
+          : Value(newGroupName),
+      newDeleteMessagesAfterMilliseconds:
+          newDeleteMessagesAfterMilliseconds == null && nullToAbsent
+          ? const Value.absent()
+          : Value(newDeleteMessagesAfterMilliseconds),
+      type: Value(type),
+      actionAt: Value(actionAt),
+    );
+  }
+
+  factory GroupHistoriesData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return GroupHistoriesData(
+      groupHistoryId: serializer.fromJson<String>(json['groupHistoryId']),
+      groupId: serializer.fromJson<String>(json['groupId']),
+      contactId: serializer.fromJson<int?>(json['contactId']),
+      affectedContactId: serializer.fromJson<int?>(json['affectedContactId']),
+      oldGroupName: serializer.fromJson<String?>(json['oldGroupName']),
+      newGroupName: serializer.fromJson<String?>(json['newGroupName']),
+      newDeleteMessagesAfterMilliseconds: serializer.fromJson<int?>(
+        json['newDeleteMessagesAfterMilliseconds'],
+      ),
+      type: serializer.fromJson<String>(json['type']),
+      actionAt: serializer.fromJson<int>(json['actionAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'groupHistoryId': serializer.toJson<String>(groupHistoryId),
+      'groupId': serializer.toJson<String>(groupId),
+      'contactId': serializer.toJson<int?>(contactId),
+      'affectedContactId': serializer.toJson<int?>(affectedContactId),
+      'oldGroupName': serializer.toJson<String?>(oldGroupName),
+      'newGroupName': serializer.toJson<String?>(newGroupName),
+      'newDeleteMessagesAfterMilliseconds': serializer.toJson<int?>(
+        newDeleteMessagesAfterMilliseconds,
+      ),
+      'type': serializer.toJson<String>(type),
+      'actionAt': serializer.toJson<int>(actionAt),
+    };
+  }
+
+  GroupHistoriesData copyWith({
+    String? groupHistoryId,
+    String? groupId,
+    Value<int?> contactId = const Value.absent(),
+    Value<int?> affectedContactId = const Value.absent(),
+    Value<String?> oldGroupName = const Value.absent(),
+    Value<String?> newGroupName = const Value.absent(),
+    Value<int?> newDeleteMessagesAfterMilliseconds = const Value.absent(),
+    String? type,
+    int? actionAt,
+  }) => GroupHistoriesData(
+    groupHistoryId: groupHistoryId ?? this.groupHistoryId,
+    groupId: groupId ?? this.groupId,
+    contactId: contactId.present ? contactId.value : this.contactId,
+    affectedContactId: affectedContactId.present
+        ? affectedContactId.value
+        : this.affectedContactId,
+    oldGroupName: oldGroupName.present ? oldGroupName.value : this.oldGroupName,
+    newGroupName: newGroupName.present ? newGroupName.value : this.newGroupName,
+    newDeleteMessagesAfterMilliseconds:
+        newDeleteMessagesAfterMilliseconds.present
+        ? newDeleteMessagesAfterMilliseconds.value
+        : this.newDeleteMessagesAfterMilliseconds,
+    type: type ?? this.type,
+    actionAt: actionAt ?? this.actionAt,
+  );
+  GroupHistoriesData copyWithCompanion(GroupHistoriesCompanion data) {
+    return GroupHistoriesData(
+      groupHistoryId: data.groupHistoryId.present
+          ? data.groupHistoryId.value
+          : this.groupHistoryId,
+      groupId: data.groupId.present ? data.groupId.value : this.groupId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      affectedContactId: data.affectedContactId.present
+          ? data.affectedContactId.value
+          : this.affectedContactId,
+      oldGroupName: data.oldGroupName.present
+          ? data.oldGroupName.value
+          : this.oldGroupName,
+      newGroupName: data.newGroupName.present
+          ? data.newGroupName.value
+          : this.newGroupName,
+      newDeleteMessagesAfterMilliseconds:
+          data.newDeleteMessagesAfterMilliseconds.present
+          ? data.newDeleteMessagesAfterMilliseconds.value
+          : this.newDeleteMessagesAfterMilliseconds,
+      type: data.type.present ? data.type.value : this.type,
+      actionAt: data.actionAt.present ? data.actionAt.value : this.actionAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('GroupHistoriesData(')
+          ..write('groupHistoryId: $groupHistoryId, ')
+          ..write('groupId: $groupId, ')
+          ..write('contactId: $contactId, ')
+          ..write('affectedContactId: $affectedContactId, ')
+          ..write('oldGroupName: $oldGroupName, ')
+          ..write('newGroupName: $newGroupName, ')
+          ..write(
+            'newDeleteMessagesAfterMilliseconds: $newDeleteMessagesAfterMilliseconds, ',
+          )
+          ..write('type: $type, ')
+          ..write('actionAt: $actionAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    groupHistoryId,
+    groupId,
+    contactId,
+    affectedContactId,
+    oldGroupName,
+    newGroupName,
+    newDeleteMessagesAfterMilliseconds,
+    type,
+    actionAt,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is GroupHistoriesData &&
+          other.groupHistoryId == this.groupHistoryId &&
+          other.groupId == this.groupId &&
+          other.contactId == this.contactId &&
+          other.affectedContactId == this.affectedContactId &&
+          other.oldGroupName == this.oldGroupName &&
+          other.newGroupName == this.newGroupName &&
+          other.newDeleteMessagesAfterMilliseconds ==
+              this.newDeleteMessagesAfterMilliseconds &&
+          other.type == this.type &&
+          other.actionAt == this.actionAt);
+}
+
+class GroupHistoriesCompanion extends UpdateCompanion<GroupHistoriesData> {
+  final Value<String> groupHistoryId;
+  final Value<String> groupId;
+  final Value<int?> contactId;
+  final Value<int?> affectedContactId;
+  final Value<String?> oldGroupName;
+  final Value<String?> newGroupName;
+  final Value<int?> newDeleteMessagesAfterMilliseconds;
+  final Value<String> type;
+  final Value<int> actionAt;
+  final Value<int> rowid;
+  const GroupHistoriesCompanion({
+    this.groupHistoryId = const Value.absent(),
+    this.groupId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.affectedContactId = const Value.absent(),
+    this.oldGroupName = const Value.absent(),
+    this.newGroupName = const Value.absent(),
+    this.newDeleteMessagesAfterMilliseconds = const Value.absent(),
+    this.type = const Value.absent(),
+    this.actionAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  GroupHistoriesCompanion.insert({
+    required String groupHistoryId,
+    required String groupId,
+    this.contactId = const Value.absent(),
+    this.affectedContactId = const Value.absent(),
+    this.oldGroupName = const Value.absent(),
+    this.newGroupName = const Value.absent(),
+    this.newDeleteMessagesAfterMilliseconds = const Value.absent(),
+    required String type,
+    this.actionAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : groupHistoryId = Value(groupHistoryId),
+       groupId = Value(groupId),
+       type = Value(type);
+  static Insertable<GroupHistoriesData> custom({
+    Expression<String>? groupHistoryId,
+    Expression<String>? groupId,
+    Expression<int>? contactId,
+    Expression<int>? affectedContactId,
+    Expression<String>? oldGroupName,
+    Expression<String>? newGroupName,
+    Expression<int>? newDeleteMessagesAfterMilliseconds,
+    Expression<String>? type,
+    Expression<int>? actionAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (groupHistoryId != null) 'group_history_id': groupHistoryId,
+      if (groupId != null) 'group_id': groupId,
+      if (contactId != null) 'contact_id': contactId,
+      if (affectedContactId != null) 'affected_contact_id': affectedContactId,
+      if (oldGroupName != null) 'old_group_name': oldGroupName,
+      if (newGroupName != null) 'new_group_name': newGroupName,
+      if (newDeleteMessagesAfterMilliseconds != null)
+        'new_delete_messages_after_milliseconds':
+            newDeleteMessagesAfterMilliseconds,
+      if (type != null) 'type': type,
+      if (actionAt != null) 'action_at': actionAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  GroupHistoriesCompanion copyWith({
+    Value<String>? groupHistoryId,
+    Value<String>? groupId,
+    Value<int?>? contactId,
+    Value<int?>? affectedContactId,
+    Value<String?>? oldGroupName,
+    Value<String?>? newGroupName,
+    Value<int?>? newDeleteMessagesAfterMilliseconds,
+    Value<String>? type,
+    Value<int>? actionAt,
+    Value<int>? rowid,
+  }) {
+    return GroupHistoriesCompanion(
+      groupHistoryId: groupHistoryId ?? this.groupHistoryId,
+      groupId: groupId ?? this.groupId,
+      contactId: contactId ?? this.contactId,
+      affectedContactId: affectedContactId ?? this.affectedContactId,
+      oldGroupName: oldGroupName ?? this.oldGroupName,
+      newGroupName: newGroupName ?? this.newGroupName,
+      newDeleteMessagesAfterMilliseconds:
+          newDeleteMessagesAfterMilliseconds ??
+          this.newDeleteMessagesAfterMilliseconds,
+      type: type ?? this.type,
+      actionAt: actionAt ?? this.actionAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (groupHistoryId.present) {
+      map['group_history_id'] = Variable<String>(groupHistoryId.value);
+    }
+    if (groupId.present) {
+      map['group_id'] = Variable<String>(groupId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (affectedContactId.present) {
+      map['affected_contact_id'] = Variable<int>(affectedContactId.value);
+    }
+    if (oldGroupName.present) {
+      map['old_group_name'] = Variable<String>(oldGroupName.value);
+    }
+    if (newGroupName.present) {
+      map['new_group_name'] = Variable<String>(newGroupName.value);
+    }
+    if (newDeleteMessagesAfterMilliseconds.present) {
+      map['new_delete_messages_after_milliseconds'] = Variable<int>(
+        newDeleteMessagesAfterMilliseconds.value,
+      );
+    }
+    if (type.present) {
+      map['type'] = Variable<String>(type.value);
+    }
+    if (actionAt.present) {
+      map['action_at'] = Variable<int>(actionAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('GroupHistoriesCompanion(')
+          ..write('groupHistoryId: $groupHistoryId, ')
+          ..write('groupId: $groupId, ')
+          ..write('contactId: $contactId, ')
+          ..write('affectedContactId: $affectedContactId, ')
+          ..write('oldGroupName: $oldGroupName, ')
+          ..write('newGroupName: $newGroupName, ')
+          ..write(
+            'newDeleteMessagesAfterMilliseconds: $newDeleteMessagesAfterMilliseconds, ',
+          )
+          ..write('type: $type, ')
+          ..write('actionAt: $actionAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class KeyVerifications extends Table
+    with TableInfo<KeyVerifications, KeyVerificationsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  KeyVerifications(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<String> type = GeneratedColumn<String>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [contactId, type, createdAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'key_verifications';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {contactId};
+  @override
+  KeyVerificationsData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return KeyVerificationsData(
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      )!,
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}type'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  KeyVerifications createAlias(String alias) {
+    return KeyVerifications(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const ['PRIMARY KEY(contact_id)'];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class KeyVerificationsData extends DataClass
+    implements Insertable<KeyVerificationsData> {
+  final int contactId;
+  final String type;
+  final int createdAt;
+  const KeyVerificationsData({
+    required this.contactId,
+    required this.type,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['contact_id'] = Variable<int>(contactId);
+    map['type'] = Variable<String>(type);
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  KeyVerificationsCompanion toCompanion(bool nullToAbsent) {
+    return KeyVerificationsCompanion(
+      contactId: Value(contactId),
+      type: Value(type),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory KeyVerificationsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return KeyVerificationsData(
+      contactId: serializer.fromJson<int>(json['contactId']),
+      type: serializer.fromJson<String>(json['type']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'contactId': serializer.toJson<int>(contactId),
+      'type': serializer.toJson<String>(type),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  KeyVerificationsData copyWith({
+    int? contactId,
+    String? type,
+    int? createdAt,
+  }) => KeyVerificationsData(
+    contactId: contactId ?? this.contactId,
+    type: type ?? this.type,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  KeyVerificationsData copyWithCompanion(KeyVerificationsCompanion data) {
+    return KeyVerificationsData(
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      type: data.type.present ? data.type.value : this.type,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('KeyVerificationsData(')
+          ..write('contactId: $contactId, ')
+          ..write('type: $type, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(contactId, type, createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is KeyVerificationsData &&
+          other.contactId == this.contactId &&
+          other.type == this.type &&
+          other.createdAt == this.createdAt);
+}
+
+class KeyVerificationsCompanion extends UpdateCompanion<KeyVerificationsData> {
+  final Value<int> contactId;
+  final Value<String> type;
+  final Value<int> createdAt;
+  const KeyVerificationsCompanion({
+    this.contactId = const Value.absent(),
+    this.type = const Value.absent(),
+    this.createdAt = const Value.absent(),
+  });
+  KeyVerificationsCompanion.insert({
+    this.contactId = const Value.absent(),
+    required String type,
+    this.createdAt = const Value.absent(),
+  }) : type = Value(type);
+  static Insertable<KeyVerificationsData> custom({
+    Expression<int>? contactId,
+    Expression<String>? type,
+    Expression<int>? createdAt,
+  }) {
+    return RawValuesInsertable({
+      if (contactId != null) 'contact_id': contactId,
+      if (type != null) 'type': type,
+      if (createdAt != null) 'created_at': createdAt,
+    });
+  }
+
+  KeyVerificationsCompanion copyWith({
+    Value<int>? contactId,
+    Value<String>? type,
+    Value<int>? createdAt,
+  }) {
+    return KeyVerificationsCompanion(
+      contactId: contactId ?? this.contactId,
+      type: type ?? this.type,
+      createdAt: createdAt ?? this.createdAt,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (type.present) {
+      map['type'] = Variable<String>(type.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('KeyVerificationsCompanion(')
+          ..write('contactId: $contactId, ')
+          ..write('type: $type, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class VerificationTokens extends Table
+    with TableInfo<VerificationTokens, VerificationTokensData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  VerificationTokens(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> tokenId = GeneratedColumn<int>(
+    'token_id',
+    aliasedName,
+    false,
+    hasAutoIncrement: true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL PRIMARY KEY AUTOINCREMENT',
+  );
+  late final GeneratedColumn<i2.Uint8List> token =
+      GeneratedColumn<i2.Uint8List>(
+        'token',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT (CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER))',
+    defaultValue: const CustomExpression(
+      'CAST(strftime(\'%s\', CURRENT_TIMESTAMP) AS INTEGER)',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [tokenId, token, createdAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'verification_tokens';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {tokenId};
+  @override
+  VerificationTokensData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return VerificationTokensData(
+      tokenId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}token_id'],
+      )!,
+      token: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}token'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}created_at'],
+      )!,
+    );
+  }
+
+  @override
+  VerificationTokens createAlias(String alias) {
+    return VerificationTokens(attachedDatabase, alias);
+  }
+
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class VerificationTokensData extends DataClass
+    implements Insertable<VerificationTokensData> {
+  final int tokenId;
+  final i2.Uint8List token;
+  final int createdAt;
+  const VerificationTokensData({
+    required this.tokenId,
+    required this.token,
+    required this.createdAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['token_id'] = Variable<int>(tokenId);
+    map['token'] = Variable<i2.Uint8List>(token);
+    map['created_at'] = Variable<int>(createdAt);
+    return map;
+  }
+
+  VerificationTokensCompanion toCompanion(bool nullToAbsent) {
+    return VerificationTokensCompanion(
+      tokenId: Value(tokenId),
+      token: Value(token),
+      createdAt: Value(createdAt),
+    );
+  }
+
+  factory VerificationTokensData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return VerificationTokensData(
+      tokenId: serializer.fromJson<int>(json['tokenId']),
+      token: serializer.fromJson<i2.Uint8List>(json['token']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'tokenId': serializer.toJson<int>(tokenId),
+      'token': serializer.toJson<i2.Uint8List>(token),
+      'createdAt': serializer.toJson<int>(createdAt),
+    };
+  }
+
+  VerificationTokensData copyWith({
+    int? tokenId,
+    i2.Uint8List? token,
+    int? createdAt,
+  }) => VerificationTokensData(
+    tokenId: tokenId ?? this.tokenId,
+    token: token ?? this.token,
+    createdAt: createdAt ?? this.createdAt,
+  );
+  VerificationTokensData copyWithCompanion(VerificationTokensCompanion data) {
+    return VerificationTokensData(
+      tokenId: data.tokenId.present ? data.tokenId.value : this.tokenId,
+      token: data.token.present ? data.token.value : this.token,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('VerificationTokensData(')
+          ..write('tokenId: $tokenId, ')
+          ..write('token: $token, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(tokenId, $driftBlobEquality.hash(token), createdAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is VerificationTokensData &&
+          other.tokenId == this.tokenId &&
+          $driftBlobEquality.equals(other.token, this.token) &&
+          other.createdAt == this.createdAt);
+}
+
+class VerificationTokensCompanion
+    extends UpdateCompanion<VerificationTokensData> {
+  final Value<int> tokenId;
+  final Value<i2.Uint8List> token;
+  final Value<int> createdAt;
+  const VerificationTokensCompanion({
+    this.tokenId = const Value.absent(),
+    this.token = const Value.absent(),
+    this.createdAt = const Value.absent(),
+  });
+  VerificationTokensCompanion.insert({
+    this.tokenId = const Value.absent(),
+    required i2.Uint8List token,
+    this.createdAt = const Value.absent(),
+  }) : token = Value(token);
+  static Insertable<VerificationTokensData> custom({
+    Expression<int>? tokenId,
+    Expression<i2.Uint8List>? token,
+    Expression<int>? createdAt,
+  }) {
+    return RawValuesInsertable({
+      if (tokenId != null) 'token_id': tokenId,
+      if (token != null) 'token': token,
+      if (createdAt != null) 'created_at': createdAt,
+    });
+  }
+
+  VerificationTokensCompanion copyWith({
+    Value<int>? tokenId,
+    Value<i2.Uint8List>? token,
+    Value<int>? createdAt,
+  }) {
+    return VerificationTokensCompanion(
+      tokenId: tokenId ?? this.tokenId,
+      token: token ?? this.token,
+      createdAt: createdAt ?? this.createdAt,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (tokenId.present) {
+      map['token_id'] = Variable<int>(tokenId.value);
+    }
+    if (token.present) {
+      map['token'] = Variable<i2.Uint8List>(token.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('VerificationTokensCompanion(')
+          ..write('tokenId: $tokenId, ')
+          ..write('token: $token, ')
+          ..write('createdAt: $createdAt')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class UserDiscoveryAnnouncedUsers extends Table
+    with
+        TableInfo<
+          UserDiscoveryAnnouncedUsers,
+          UserDiscoveryAnnouncedUsersData
+        > {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  UserDiscoveryAnnouncedUsers(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> announcedUserId = GeneratedColumn<int>(
+    'announced_user_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> announcedPublicKey =
+      GeneratedColumn<i2.Uint8List>(
+        'announced_public_key',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> publicId = GeneratedColumn<int>(
+    'public_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL UNIQUE',
+  );
+  late final GeneratedColumn<String> username = GeneratedColumn<String>(
+    'username',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL',
+  );
+  late final GeneratedColumn<int> wasShownToTheUser = GeneratedColumn<int>(
+    'was_shown_to_the_user',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints:
+        'NOT NULL DEFAULT 0 CHECK (was_shown_to_the_user IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> isHidden = GeneratedColumn<int>(
+    'is_hidden',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL DEFAULT 0 CHECK (is_hidden IN (0, 1))',
+    defaultValue: const CustomExpression('0'),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    announcedUserId,
+    announcedPublicKey,
+    publicId,
+    username,
+    wasShownToTheUser,
+    isHidden,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_discovery_announced_users';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {announcedUserId};
+  @override
+  UserDiscoveryAnnouncedUsersData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserDiscoveryAnnouncedUsersData(
+      announcedUserId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}announced_user_id'],
+      )!,
+      announcedPublicKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}announced_public_key'],
+      )!,
+      publicId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}public_id'],
+      )!,
+      username: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}username'],
+      ),
+      wasShownToTheUser: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}was_shown_to_the_user'],
+      )!,
+      isHidden: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}is_hidden'],
+      )!,
+    );
+  }
+
+  @override
+  UserDiscoveryAnnouncedUsers createAlias(String alias) {
+    return UserDiscoveryAnnouncedUsers(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const [
+    'PRIMARY KEY(announced_user_id)',
+  ];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class UserDiscoveryAnnouncedUsersData extends DataClass
+    implements Insertable<UserDiscoveryAnnouncedUsersData> {
+  final int announcedUserId;
+  final i2.Uint8List announcedPublicKey;
+  final int publicId;
+  final String? username;
+  final int wasShownToTheUser;
+  final int isHidden;
+  const UserDiscoveryAnnouncedUsersData({
+    required this.announcedUserId,
+    required this.announcedPublicKey,
+    required this.publicId,
+    this.username,
+    required this.wasShownToTheUser,
+    required this.isHidden,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['announced_user_id'] = Variable<int>(announcedUserId);
+    map['announced_public_key'] = Variable<i2.Uint8List>(announcedPublicKey);
+    map['public_id'] = Variable<int>(publicId);
+    if (!nullToAbsent || username != null) {
+      map['username'] = Variable<String>(username);
+    }
+    map['was_shown_to_the_user'] = Variable<int>(wasShownToTheUser);
+    map['is_hidden'] = Variable<int>(isHidden);
+    return map;
+  }
+
+  UserDiscoveryAnnouncedUsersCompanion toCompanion(bool nullToAbsent) {
+    return UserDiscoveryAnnouncedUsersCompanion(
+      announcedUserId: Value(announcedUserId),
+      announcedPublicKey: Value(announcedPublicKey),
+      publicId: Value(publicId),
+      username: username == null && nullToAbsent
+          ? const Value.absent()
+          : Value(username),
+      wasShownToTheUser: Value(wasShownToTheUser),
+      isHidden: Value(isHidden),
+    );
+  }
+
+  factory UserDiscoveryAnnouncedUsersData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserDiscoveryAnnouncedUsersData(
+      announcedUserId: serializer.fromJson<int>(json['announcedUserId']),
+      announcedPublicKey: serializer.fromJson<i2.Uint8List>(
+        json['announcedPublicKey'],
+      ),
+      publicId: serializer.fromJson<int>(json['publicId']),
+      username: serializer.fromJson<String?>(json['username']),
+      wasShownToTheUser: serializer.fromJson<int>(json['wasShownToTheUser']),
+      isHidden: serializer.fromJson<int>(json['isHidden']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'announcedUserId': serializer.toJson<int>(announcedUserId),
+      'announcedPublicKey': serializer.toJson<i2.Uint8List>(announcedPublicKey),
+      'publicId': serializer.toJson<int>(publicId),
+      'username': serializer.toJson<String?>(username),
+      'wasShownToTheUser': serializer.toJson<int>(wasShownToTheUser),
+      'isHidden': serializer.toJson<int>(isHidden),
+    };
+  }
+
+  UserDiscoveryAnnouncedUsersData copyWith({
+    int? announcedUserId,
+    i2.Uint8List? announcedPublicKey,
+    int? publicId,
+    Value<String?> username = const Value.absent(),
+    int? wasShownToTheUser,
+    int? isHidden,
+  }) => UserDiscoveryAnnouncedUsersData(
+    announcedUserId: announcedUserId ?? this.announcedUserId,
+    announcedPublicKey: announcedPublicKey ?? this.announcedPublicKey,
+    publicId: publicId ?? this.publicId,
+    username: username.present ? username.value : this.username,
+    wasShownToTheUser: wasShownToTheUser ?? this.wasShownToTheUser,
+    isHidden: isHidden ?? this.isHidden,
+  );
+  UserDiscoveryAnnouncedUsersData copyWithCompanion(
+    UserDiscoveryAnnouncedUsersCompanion data,
+  ) {
+    return UserDiscoveryAnnouncedUsersData(
+      announcedUserId: data.announcedUserId.present
+          ? data.announcedUserId.value
+          : this.announcedUserId,
+      announcedPublicKey: data.announcedPublicKey.present
+          ? data.announcedPublicKey.value
+          : this.announcedPublicKey,
+      publicId: data.publicId.present ? data.publicId.value : this.publicId,
+      username: data.username.present ? data.username.value : this.username,
+      wasShownToTheUser: data.wasShownToTheUser.present
+          ? data.wasShownToTheUser.value
+          : this.wasShownToTheUser,
+      isHidden: data.isHidden.present ? data.isHidden.value : this.isHidden,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryAnnouncedUsersData(')
+          ..write('announcedUserId: $announcedUserId, ')
+          ..write('announcedPublicKey: $announcedPublicKey, ')
+          ..write('publicId: $publicId, ')
+          ..write('username: $username, ')
+          ..write('wasShownToTheUser: $wasShownToTheUser, ')
+          ..write('isHidden: $isHidden')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    announcedUserId,
+    $driftBlobEquality.hash(announcedPublicKey),
+    publicId,
+    username,
+    wasShownToTheUser,
+    isHidden,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserDiscoveryAnnouncedUsersData &&
+          other.announcedUserId == this.announcedUserId &&
+          $driftBlobEquality.equals(
+            other.announcedPublicKey,
+            this.announcedPublicKey,
+          ) &&
+          other.publicId == this.publicId &&
+          other.username == this.username &&
+          other.wasShownToTheUser == this.wasShownToTheUser &&
+          other.isHidden == this.isHidden);
+}
+
+class UserDiscoveryAnnouncedUsersCompanion
+    extends UpdateCompanion<UserDiscoveryAnnouncedUsersData> {
+  final Value<int> announcedUserId;
+  final Value<i2.Uint8List> announcedPublicKey;
+  final Value<int> publicId;
+  final Value<String?> username;
+  final Value<int> wasShownToTheUser;
+  final Value<int> isHidden;
+  const UserDiscoveryAnnouncedUsersCompanion({
+    this.announcedUserId = const Value.absent(),
+    this.announcedPublicKey = const Value.absent(),
+    this.publicId = const Value.absent(),
+    this.username = const Value.absent(),
+    this.wasShownToTheUser = const Value.absent(),
+    this.isHidden = const Value.absent(),
+  });
+  UserDiscoveryAnnouncedUsersCompanion.insert({
+    this.announcedUserId = const Value.absent(),
+    required i2.Uint8List announcedPublicKey,
+    required int publicId,
+    this.username = const Value.absent(),
+    this.wasShownToTheUser = const Value.absent(),
+    this.isHidden = const Value.absent(),
+  }) : announcedPublicKey = Value(announcedPublicKey),
+       publicId = Value(publicId);
+  static Insertable<UserDiscoveryAnnouncedUsersData> custom({
+    Expression<int>? announcedUserId,
+    Expression<i2.Uint8List>? announcedPublicKey,
+    Expression<int>? publicId,
+    Expression<String>? username,
+    Expression<int>? wasShownToTheUser,
+    Expression<int>? isHidden,
+  }) {
+    return RawValuesInsertable({
+      if (announcedUserId != null) 'announced_user_id': announcedUserId,
+      if (announcedPublicKey != null)
+        'announced_public_key': announcedPublicKey,
+      if (publicId != null) 'public_id': publicId,
+      if (username != null) 'username': username,
+      if (wasShownToTheUser != null) 'was_shown_to_the_user': wasShownToTheUser,
+      if (isHidden != null) 'is_hidden': isHidden,
+    });
+  }
+
+  UserDiscoveryAnnouncedUsersCompanion copyWith({
+    Value<int>? announcedUserId,
+    Value<i2.Uint8List>? announcedPublicKey,
+    Value<int>? publicId,
+    Value<String?>? username,
+    Value<int>? wasShownToTheUser,
+    Value<int>? isHidden,
+  }) {
+    return UserDiscoveryAnnouncedUsersCompanion(
+      announcedUserId: announcedUserId ?? this.announcedUserId,
+      announcedPublicKey: announcedPublicKey ?? this.announcedPublicKey,
+      publicId: publicId ?? this.publicId,
+      username: username ?? this.username,
+      wasShownToTheUser: wasShownToTheUser ?? this.wasShownToTheUser,
+      isHidden: isHidden ?? this.isHidden,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (announcedUserId.present) {
+      map['announced_user_id'] = Variable<int>(announcedUserId.value);
+    }
+    if (announcedPublicKey.present) {
+      map['announced_public_key'] = Variable<i2.Uint8List>(
+        announcedPublicKey.value,
+      );
+    }
+    if (publicId.present) {
+      map['public_id'] = Variable<int>(publicId.value);
+    }
+    if (username.present) {
+      map['username'] = Variable<String>(username.value);
+    }
+    if (wasShownToTheUser.present) {
+      map['was_shown_to_the_user'] = Variable<int>(wasShownToTheUser.value);
+    }
+    if (isHidden.present) {
+      map['is_hidden'] = Variable<int>(isHidden.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryAnnouncedUsersCompanion(')
+          ..write('announcedUserId: $announcedUserId, ')
+          ..write('announcedPublicKey: $announcedPublicKey, ')
+          ..write('publicId: $publicId, ')
+          ..write('username: $username, ')
+          ..write('wasShownToTheUser: $wasShownToTheUser, ')
+          ..write('isHidden: $isHidden')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class UserDiscoveryUserRelations extends Table
+    with TableInfo<UserDiscoveryUserRelations, UserDiscoveryUserRelationsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  UserDiscoveryUserRelations(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> announcedUserId = GeneratedColumn<int>(
+    'announced_user_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES user_discovery_announced_users(announced_user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> fromContactId = GeneratedColumn<int>(
+    'from_contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> publicKeyVerifiedTimestamp =
+      GeneratedColumn<int>(
+        'public_key_verified_timestamp',
+        aliasedName,
+        true,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  @override
+  List<GeneratedColumn> get $columns => [
+    announcedUserId,
+    fromContactId,
+    publicKeyVerifiedTimestamp,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_discovery_user_relations';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {announcedUserId, fromContactId};
+  @override
+  UserDiscoveryUserRelationsData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserDiscoveryUserRelationsData(
+      announcedUserId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}announced_user_id'],
+      )!,
+      fromContactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}from_contact_id'],
+      )!,
+      publicKeyVerifiedTimestamp: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}public_key_verified_timestamp'],
+      ),
+    );
+  }
+
+  @override
+  UserDiscoveryUserRelations createAlias(String alias) {
+    return UserDiscoveryUserRelations(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const [
+    'PRIMARY KEY(announced_user_id, from_contact_id)',
+  ];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class UserDiscoveryUserRelationsData extends DataClass
+    implements Insertable<UserDiscoveryUserRelationsData> {
+  final int announcedUserId;
+  final int fromContactId;
+  final int? publicKeyVerifiedTimestamp;
+  const UserDiscoveryUserRelationsData({
+    required this.announcedUserId,
+    required this.fromContactId,
+    this.publicKeyVerifiedTimestamp,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['announced_user_id'] = Variable<int>(announcedUserId);
+    map['from_contact_id'] = Variable<int>(fromContactId);
+    if (!nullToAbsent || publicKeyVerifiedTimestamp != null) {
+      map['public_key_verified_timestamp'] = Variable<int>(
+        publicKeyVerifiedTimestamp,
+      );
+    }
+    return map;
+  }
+
+  UserDiscoveryUserRelationsCompanion toCompanion(bool nullToAbsent) {
+    return UserDiscoveryUserRelationsCompanion(
+      announcedUserId: Value(announcedUserId),
+      fromContactId: Value(fromContactId),
+      publicKeyVerifiedTimestamp:
+          publicKeyVerifiedTimestamp == null && nullToAbsent
+          ? const Value.absent()
+          : Value(publicKeyVerifiedTimestamp),
+    );
+  }
+
+  factory UserDiscoveryUserRelationsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserDiscoveryUserRelationsData(
+      announcedUserId: serializer.fromJson<int>(json['announcedUserId']),
+      fromContactId: serializer.fromJson<int>(json['fromContactId']),
+      publicKeyVerifiedTimestamp: serializer.fromJson<int?>(
+        json['publicKeyVerifiedTimestamp'],
+      ),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'announcedUserId': serializer.toJson<int>(announcedUserId),
+      'fromContactId': serializer.toJson<int>(fromContactId),
+      'publicKeyVerifiedTimestamp': serializer.toJson<int?>(
+        publicKeyVerifiedTimestamp,
+      ),
+    };
+  }
+
+  UserDiscoveryUserRelationsData copyWith({
+    int? announcedUserId,
+    int? fromContactId,
+    Value<int?> publicKeyVerifiedTimestamp = const Value.absent(),
+  }) => UserDiscoveryUserRelationsData(
+    announcedUserId: announcedUserId ?? this.announcedUserId,
+    fromContactId: fromContactId ?? this.fromContactId,
+    publicKeyVerifiedTimestamp: publicKeyVerifiedTimestamp.present
+        ? publicKeyVerifiedTimestamp.value
+        : this.publicKeyVerifiedTimestamp,
+  );
+  UserDiscoveryUserRelationsData copyWithCompanion(
+    UserDiscoveryUserRelationsCompanion data,
+  ) {
+    return UserDiscoveryUserRelationsData(
+      announcedUserId: data.announcedUserId.present
+          ? data.announcedUserId.value
+          : this.announcedUserId,
+      fromContactId: data.fromContactId.present
+          ? data.fromContactId.value
+          : this.fromContactId,
+      publicKeyVerifiedTimestamp: data.publicKeyVerifiedTimestamp.present
+          ? data.publicKeyVerifiedTimestamp.value
+          : this.publicKeyVerifiedTimestamp,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryUserRelationsData(')
+          ..write('announcedUserId: $announcedUserId, ')
+          ..write('fromContactId: $fromContactId, ')
+          ..write('publicKeyVerifiedTimestamp: $publicKeyVerifiedTimestamp')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(announcedUserId, fromContactId, publicKeyVerifiedTimestamp);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserDiscoveryUserRelationsData &&
+          other.announcedUserId == this.announcedUserId &&
+          other.fromContactId == this.fromContactId &&
+          other.publicKeyVerifiedTimestamp == this.publicKeyVerifiedTimestamp);
+}
+
+class UserDiscoveryUserRelationsCompanion
+    extends UpdateCompanion<UserDiscoveryUserRelationsData> {
+  final Value<int> announcedUserId;
+  final Value<int> fromContactId;
+  final Value<int?> publicKeyVerifiedTimestamp;
+  final Value<int> rowid;
+  const UserDiscoveryUserRelationsCompanion({
+    this.announcedUserId = const Value.absent(),
+    this.fromContactId = const Value.absent(),
+    this.publicKeyVerifiedTimestamp = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  UserDiscoveryUserRelationsCompanion.insert({
+    required int announcedUserId,
+    required int fromContactId,
+    this.publicKeyVerifiedTimestamp = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : announcedUserId = Value(announcedUserId),
+       fromContactId = Value(fromContactId);
+  static Insertable<UserDiscoveryUserRelationsData> custom({
+    Expression<int>? announcedUserId,
+    Expression<int>? fromContactId,
+    Expression<int>? publicKeyVerifiedTimestamp,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (announcedUserId != null) 'announced_user_id': announcedUserId,
+      if (fromContactId != null) 'from_contact_id': fromContactId,
+      if (publicKeyVerifiedTimestamp != null)
+        'public_key_verified_timestamp': publicKeyVerifiedTimestamp,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  UserDiscoveryUserRelationsCompanion copyWith({
+    Value<int>? announcedUserId,
+    Value<int>? fromContactId,
+    Value<int?>? publicKeyVerifiedTimestamp,
+    Value<int>? rowid,
+  }) {
+    return UserDiscoveryUserRelationsCompanion(
+      announcedUserId: announcedUserId ?? this.announcedUserId,
+      fromContactId: fromContactId ?? this.fromContactId,
+      publicKeyVerifiedTimestamp:
+          publicKeyVerifiedTimestamp ?? this.publicKeyVerifiedTimestamp,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (announcedUserId.present) {
+      map['announced_user_id'] = Variable<int>(announcedUserId.value);
+    }
+    if (fromContactId.present) {
+      map['from_contact_id'] = Variable<int>(fromContactId.value);
+    }
+    if (publicKeyVerifiedTimestamp.present) {
+      map['public_key_verified_timestamp'] = Variable<int>(
+        publicKeyVerifiedTimestamp.value,
+      );
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryUserRelationsCompanion(')
+          ..write('announcedUserId: $announcedUserId, ')
+          ..write('fromContactId: $fromContactId, ')
+          ..write('publicKeyVerifiedTimestamp: $publicKeyVerifiedTimestamp, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class UserDiscoveryOtherPromotions extends Table
+    with
+        TableInfo<
+          UserDiscoveryOtherPromotions,
+          UserDiscoveryOtherPromotionsData
+        > {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  UserDiscoveryOtherPromotions(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> fromContactId = GeneratedColumn<int>(
+    'from_contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<int> promotionId = GeneratedColumn<int>(
+    'promotion_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> publicId = GeneratedColumn<int>(
+    'public_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<int> threshold = GeneratedColumn<int>(
+    'threshold',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints: 'NOT NULL',
+  );
+  late final GeneratedColumn<i2.Uint8List> announcementShare =
+      GeneratedColumn<i2.Uint8List>(
+        'announcement_share',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> publicKeyVerifiedTimestamp =
+      GeneratedColumn<int>(
+        'public_key_verified_timestamp',
+        aliasedName,
+        true,
+        type: DriftSqlType.int,
+        requiredDuringInsert: false,
+        $customConstraints: 'NULL',
+      );
+  @override
+  List<GeneratedColumn> get $columns => [
+    fromContactId,
+    promotionId,
+    publicId,
+    threshold,
+    announcementShare,
+    publicKeyVerifiedTimestamp,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_discovery_other_promotions';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {fromContactId, promotionId};
+  @override
+  UserDiscoveryOtherPromotionsData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserDiscoveryOtherPromotionsData(
+      fromContactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}from_contact_id'],
+      )!,
+      promotionId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}promotion_id'],
+      )!,
+      publicId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}public_id'],
+      )!,
+      threshold: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}threshold'],
+      )!,
+      announcementShare: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}announcement_share'],
+      )!,
+      publicKeyVerifiedTimestamp: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}public_key_verified_timestamp'],
+      ),
+    );
+  }
+
+  @override
+  UserDiscoveryOtherPromotions createAlias(String alias) {
+    return UserDiscoveryOtherPromotions(attachedDatabase, alias);
+  }
+
+  @override
+  List<String> get customConstraints => const [
+    'PRIMARY KEY(from_contact_id, promotion_id)',
+  ];
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class UserDiscoveryOtherPromotionsData extends DataClass
+    implements Insertable<UserDiscoveryOtherPromotionsData> {
+  final int fromContactId;
+  final int promotionId;
+  final int publicId;
+  final int threshold;
+  final i2.Uint8List announcementShare;
+  final int? publicKeyVerifiedTimestamp;
+  const UserDiscoveryOtherPromotionsData({
+    required this.fromContactId,
+    required this.promotionId,
+    required this.publicId,
+    required this.threshold,
+    required this.announcementShare,
+    this.publicKeyVerifiedTimestamp,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['from_contact_id'] = Variable<int>(fromContactId);
+    map['promotion_id'] = Variable<int>(promotionId);
+    map['public_id'] = Variable<int>(publicId);
+    map['threshold'] = Variable<int>(threshold);
+    map['announcement_share'] = Variable<i2.Uint8List>(announcementShare);
+    if (!nullToAbsent || publicKeyVerifiedTimestamp != null) {
+      map['public_key_verified_timestamp'] = Variable<int>(
+        publicKeyVerifiedTimestamp,
+      );
+    }
+    return map;
+  }
+
+  UserDiscoveryOtherPromotionsCompanion toCompanion(bool nullToAbsent) {
+    return UserDiscoveryOtherPromotionsCompanion(
+      fromContactId: Value(fromContactId),
+      promotionId: Value(promotionId),
+      publicId: Value(publicId),
+      threshold: Value(threshold),
+      announcementShare: Value(announcementShare),
+      publicKeyVerifiedTimestamp:
+          publicKeyVerifiedTimestamp == null && nullToAbsent
+          ? const Value.absent()
+          : Value(publicKeyVerifiedTimestamp),
+    );
+  }
+
+  factory UserDiscoveryOtherPromotionsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserDiscoveryOtherPromotionsData(
+      fromContactId: serializer.fromJson<int>(json['fromContactId']),
+      promotionId: serializer.fromJson<int>(json['promotionId']),
+      publicId: serializer.fromJson<int>(json['publicId']),
+      threshold: serializer.fromJson<int>(json['threshold']),
+      announcementShare: serializer.fromJson<i2.Uint8List>(
+        json['announcementShare'],
+      ),
+      publicKeyVerifiedTimestamp: serializer.fromJson<int?>(
+        json['publicKeyVerifiedTimestamp'],
+      ),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'fromContactId': serializer.toJson<int>(fromContactId),
+      'promotionId': serializer.toJson<int>(promotionId),
+      'publicId': serializer.toJson<int>(publicId),
+      'threshold': serializer.toJson<int>(threshold),
+      'announcementShare': serializer.toJson<i2.Uint8List>(announcementShare),
+      'publicKeyVerifiedTimestamp': serializer.toJson<int?>(
+        publicKeyVerifiedTimestamp,
+      ),
+    };
+  }
+
+  UserDiscoveryOtherPromotionsData copyWith({
+    int? fromContactId,
+    int? promotionId,
+    int? publicId,
+    int? threshold,
+    i2.Uint8List? announcementShare,
+    Value<int?> publicKeyVerifiedTimestamp = const Value.absent(),
+  }) => UserDiscoveryOtherPromotionsData(
+    fromContactId: fromContactId ?? this.fromContactId,
+    promotionId: promotionId ?? this.promotionId,
+    publicId: publicId ?? this.publicId,
+    threshold: threshold ?? this.threshold,
+    announcementShare: announcementShare ?? this.announcementShare,
+    publicKeyVerifiedTimestamp: publicKeyVerifiedTimestamp.present
+        ? publicKeyVerifiedTimestamp.value
+        : this.publicKeyVerifiedTimestamp,
+  );
+  UserDiscoveryOtherPromotionsData copyWithCompanion(
+    UserDiscoveryOtherPromotionsCompanion data,
+  ) {
+    return UserDiscoveryOtherPromotionsData(
+      fromContactId: data.fromContactId.present
+          ? data.fromContactId.value
+          : this.fromContactId,
+      promotionId: data.promotionId.present
+          ? data.promotionId.value
+          : this.promotionId,
+      publicId: data.publicId.present ? data.publicId.value : this.publicId,
+      threshold: data.threshold.present ? data.threshold.value : this.threshold,
+      announcementShare: data.announcementShare.present
+          ? data.announcementShare.value
+          : this.announcementShare,
+      publicKeyVerifiedTimestamp: data.publicKeyVerifiedTimestamp.present
+          ? data.publicKeyVerifiedTimestamp.value
+          : this.publicKeyVerifiedTimestamp,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryOtherPromotionsData(')
+          ..write('fromContactId: $fromContactId, ')
+          ..write('promotionId: $promotionId, ')
+          ..write('publicId: $publicId, ')
+          ..write('threshold: $threshold, ')
+          ..write('announcementShare: $announcementShare, ')
+          ..write('publicKeyVerifiedTimestamp: $publicKeyVerifiedTimestamp')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    fromContactId,
+    promotionId,
+    publicId,
+    threshold,
+    $driftBlobEquality.hash(announcementShare),
+    publicKeyVerifiedTimestamp,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserDiscoveryOtherPromotionsData &&
+          other.fromContactId == this.fromContactId &&
+          other.promotionId == this.promotionId &&
+          other.publicId == this.publicId &&
+          other.threshold == this.threshold &&
+          $driftBlobEquality.equals(
+            other.announcementShare,
+            this.announcementShare,
+          ) &&
+          other.publicKeyVerifiedTimestamp == this.publicKeyVerifiedTimestamp);
+}
+
+class UserDiscoveryOtherPromotionsCompanion
+    extends UpdateCompanion<UserDiscoveryOtherPromotionsData> {
+  final Value<int> fromContactId;
+  final Value<int> promotionId;
+  final Value<int> publicId;
+  final Value<int> threshold;
+  final Value<i2.Uint8List> announcementShare;
+  final Value<int?> publicKeyVerifiedTimestamp;
+  final Value<int> rowid;
+  const UserDiscoveryOtherPromotionsCompanion({
+    this.fromContactId = const Value.absent(),
+    this.promotionId = const Value.absent(),
+    this.publicId = const Value.absent(),
+    this.threshold = const Value.absent(),
+    this.announcementShare = const Value.absent(),
+    this.publicKeyVerifiedTimestamp = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  UserDiscoveryOtherPromotionsCompanion.insert({
+    required int fromContactId,
+    required int promotionId,
+    required int publicId,
+    required int threshold,
+    required i2.Uint8List announcementShare,
+    this.publicKeyVerifiedTimestamp = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : fromContactId = Value(fromContactId),
+       promotionId = Value(promotionId),
+       publicId = Value(publicId),
+       threshold = Value(threshold),
+       announcementShare = Value(announcementShare);
+  static Insertable<UserDiscoveryOtherPromotionsData> custom({
+    Expression<int>? fromContactId,
+    Expression<int>? promotionId,
+    Expression<int>? publicId,
+    Expression<int>? threshold,
+    Expression<i2.Uint8List>? announcementShare,
+    Expression<int>? publicKeyVerifiedTimestamp,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (fromContactId != null) 'from_contact_id': fromContactId,
+      if (promotionId != null) 'promotion_id': promotionId,
+      if (publicId != null) 'public_id': publicId,
+      if (threshold != null) 'threshold': threshold,
+      if (announcementShare != null) 'announcement_share': announcementShare,
+      if (publicKeyVerifiedTimestamp != null)
+        'public_key_verified_timestamp': publicKeyVerifiedTimestamp,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  UserDiscoveryOtherPromotionsCompanion copyWith({
+    Value<int>? fromContactId,
+    Value<int>? promotionId,
+    Value<int>? publicId,
+    Value<int>? threshold,
+    Value<i2.Uint8List>? announcementShare,
+    Value<int?>? publicKeyVerifiedTimestamp,
+    Value<int>? rowid,
+  }) {
+    return UserDiscoveryOtherPromotionsCompanion(
+      fromContactId: fromContactId ?? this.fromContactId,
+      promotionId: promotionId ?? this.promotionId,
+      publicId: publicId ?? this.publicId,
+      threshold: threshold ?? this.threshold,
+      announcementShare: announcementShare ?? this.announcementShare,
+      publicKeyVerifiedTimestamp:
+          publicKeyVerifiedTimestamp ?? this.publicKeyVerifiedTimestamp,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (fromContactId.present) {
+      map['from_contact_id'] = Variable<int>(fromContactId.value);
+    }
+    if (promotionId.present) {
+      map['promotion_id'] = Variable<int>(promotionId.value);
+    }
+    if (publicId.present) {
+      map['public_id'] = Variable<int>(publicId.value);
+    }
+    if (threshold.present) {
+      map['threshold'] = Variable<int>(threshold.value);
+    }
+    if (announcementShare.present) {
+      map['announcement_share'] = Variable<i2.Uint8List>(
+        announcementShare.value,
+      );
+    }
+    if (publicKeyVerifiedTimestamp.present) {
+      map['public_key_verified_timestamp'] = Variable<int>(
+        publicKeyVerifiedTimestamp.value,
+      );
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryOtherPromotionsCompanion(')
+          ..write('fromContactId: $fromContactId, ')
+          ..write('promotionId: $promotionId, ')
+          ..write('publicId: $publicId, ')
+          ..write('threshold: $threshold, ')
+          ..write('announcementShare: $announcementShare, ')
+          ..write('publicKeyVerifiedTimestamp: $publicKeyVerifiedTimestamp, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class UserDiscoveryOwnPromotions extends Table
+    with TableInfo<UserDiscoveryOwnPromotions, UserDiscoveryOwnPromotionsData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  UserDiscoveryOwnPromotions(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> versionId = GeneratedColumn<int>(
+    'version_id',
+    aliasedName,
+    false,
+    hasAutoIncrement: true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL PRIMARY KEY AUTOINCREMENT',
+  );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+    $customConstraints:
+        'NOT NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  late final GeneratedColumn<i2.Uint8List> promotion =
+      GeneratedColumn<i2.Uint8List>(
+        'promotion',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  @override
+  List<GeneratedColumn> get $columns => [versionId, contactId, promotion];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_discovery_own_promotions';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {versionId};
+  @override
+  UserDiscoveryOwnPromotionsData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserDiscoveryOwnPromotionsData(
+      versionId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}version_id'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      )!,
+      promotion: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}promotion'],
+      )!,
+    );
+  }
+
+  @override
+  UserDiscoveryOwnPromotions createAlias(String alias) {
+    return UserDiscoveryOwnPromotions(attachedDatabase, alias);
+  }
+
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class UserDiscoveryOwnPromotionsData extends DataClass
+    implements Insertable<UserDiscoveryOwnPromotionsData> {
+  final int versionId;
+  final int contactId;
+  final i2.Uint8List promotion;
+  const UserDiscoveryOwnPromotionsData({
+    required this.versionId,
+    required this.contactId,
+    required this.promotion,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['version_id'] = Variable<int>(versionId);
+    map['contact_id'] = Variable<int>(contactId);
+    map['promotion'] = Variable<i2.Uint8List>(promotion);
+    return map;
+  }
+
+  UserDiscoveryOwnPromotionsCompanion toCompanion(bool nullToAbsent) {
+    return UserDiscoveryOwnPromotionsCompanion(
+      versionId: Value(versionId),
+      contactId: Value(contactId),
+      promotion: Value(promotion),
+    );
+  }
+
+  factory UserDiscoveryOwnPromotionsData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserDiscoveryOwnPromotionsData(
+      versionId: serializer.fromJson<int>(json['versionId']),
+      contactId: serializer.fromJson<int>(json['contactId']),
+      promotion: serializer.fromJson<i2.Uint8List>(json['promotion']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'versionId': serializer.toJson<int>(versionId),
+      'contactId': serializer.toJson<int>(contactId),
+      'promotion': serializer.toJson<i2.Uint8List>(promotion),
+    };
+  }
+
+  UserDiscoveryOwnPromotionsData copyWith({
+    int? versionId,
+    int? contactId,
+    i2.Uint8List? promotion,
+  }) => UserDiscoveryOwnPromotionsData(
+    versionId: versionId ?? this.versionId,
+    contactId: contactId ?? this.contactId,
+    promotion: promotion ?? this.promotion,
+  );
+  UserDiscoveryOwnPromotionsData copyWithCompanion(
+    UserDiscoveryOwnPromotionsCompanion data,
+  ) {
+    return UserDiscoveryOwnPromotionsData(
+      versionId: data.versionId.present ? data.versionId.value : this.versionId,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+      promotion: data.promotion.present ? data.promotion.value : this.promotion,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryOwnPromotionsData(')
+          ..write('versionId: $versionId, ')
+          ..write('contactId: $contactId, ')
+          ..write('promotion: $promotion')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(versionId, contactId, $driftBlobEquality.hash(promotion));
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserDiscoveryOwnPromotionsData &&
+          other.versionId == this.versionId &&
+          other.contactId == this.contactId &&
+          $driftBlobEquality.equals(other.promotion, this.promotion));
+}
+
+class UserDiscoveryOwnPromotionsCompanion
+    extends UpdateCompanion<UserDiscoveryOwnPromotionsData> {
+  final Value<int> versionId;
+  final Value<int> contactId;
+  final Value<i2.Uint8List> promotion;
+  const UserDiscoveryOwnPromotionsCompanion({
+    this.versionId = const Value.absent(),
+    this.contactId = const Value.absent(),
+    this.promotion = const Value.absent(),
+  });
+  UserDiscoveryOwnPromotionsCompanion.insert({
+    this.versionId = const Value.absent(),
+    required int contactId,
+    required i2.Uint8List promotion,
+  }) : contactId = Value(contactId),
+       promotion = Value(promotion);
+  static Insertable<UserDiscoveryOwnPromotionsData> custom({
+    Expression<int>? versionId,
+    Expression<int>? contactId,
+    Expression<i2.Uint8List>? promotion,
+  }) {
+    return RawValuesInsertable({
+      if (versionId != null) 'version_id': versionId,
+      if (contactId != null) 'contact_id': contactId,
+      if (promotion != null) 'promotion': promotion,
+    });
+  }
+
+  UserDiscoveryOwnPromotionsCompanion copyWith({
+    Value<int>? versionId,
+    Value<int>? contactId,
+    Value<i2.Uint8List>? promotion,
+  }) {
+    return UserDiscoveryOwnPromotionsCompanion(
+      versionId: versionId ?? this.versionId,
+      contactId: contactId ?? this.contactId,
+      promotion: promotion ?? this.promotion,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (versionId.present) {
+      map['version_id'] = Variable<int>(versionId.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    if (promotion.present) {
+      map['promotion'] = Variable<i2.Uint8List>(promotion.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoveryOwnPromotionsCompanion(')
+          ..write('versionId: $versionId, ')
+          ..write('contactId: $contactId, ')
+          ..write('promotion: $promotion')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class UserDiscoveryShares extends Table
+    with TableInfo<UserDiscoveryShares, UserDiscoverySharesData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  UserDiscoveryShares(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> shareId = GeneratedColumn<int>(
+    'share_id',
+    aliasedName,
+    false,
+    hasAutoIncrement: true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NOT NULL PRIMARY KEY AUTOINCREMENT',
+  );
+  late final GeneratedColumn<i2.Uint8List> share =
+      GeneratedColumn<i2.Uint8List>(
+        'share',
+        aliasedName,
+        false,
+        type: DriftSqlType.blob,
+        requiredDuringInsert: true,
+        $customConstraints: 'NOT NULL',
+      );
+  late final GeneratedColumn<int> contactId = GeneratedColumn<int>(
+    'contact_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    $customConstraints: 'NULL REFERENCES contacts(user_id)ON DELETE CASCADE',
+  );
+  @override
+  List<GeneratedColumn> get $columns => [shareId, share, contactId];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_discovery_shares';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {shareId};
+  @override
+  UserDiscoverySharesData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserDiscoverySharesData(
+      shareId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}share_id'],
+      )!,
+      share: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}share'],
+      )!,
+      contactId: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}contact_id'],
+      ),
+    );
+  }
+
+  @override
+  UserDiscoveryShares createAlias(String alias) {
+    return UserDiscoveryShares(attachedDatabase, alias);
+  }
+
+  @override
+  bool get dontWriteConstraints => true;
+}
+
+class UserDiscoverySharesData extends DataClass
+    implements Insertable<UserDiscoverySharesData> {
+  final int shareId;
+  final i2.Uint8List share;
+  final int? contactId;
+  const UserDiscoverySharesData({
+    required this.shareId,
+    required this.share,
+    this.contactId,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['share_id'] = Variable<int>(shareId);
+    map['share'] = Variable<i2.Uint8List>(share);
+    if (!nullToAbsent || contactId != null) {
+      map['contact_id'] = Variable<int>(contactId);
+    }
+    return map;
+  }
+
+  UserDiscoverySharesCompanion toCompanion(bool nullToAbsent) {
+    return UserDiscoverySharesCompanion(
+      shareId: Value(shareId),
+      share: Value(share),
+      contactId: contactId == null && nullToAbsent
+          ? const Value.absent()
+          : Value(contactId),
+    );
+  }
+
+  factory UserDiscoverySharesData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserDiscoverySharesData(
+      shareId: serializer.fromJson<int>(json['shareId']),
+      share: serializer.fromJson<i2.Uint8List>(json['share']),
+      contactId: serializer.fromJson<int?>(json['contactId']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'shareId': serializer.toJson<int>(shareId),
+      'share': serializer.toJson<i2.Uint8List>(share),
+      'contactId': serializer.toJson<int?>(contactId),
+    };
+  }
+
+  UserDiscoverySharesData copyWith({
+    int? shareId,
+    i2.Uint8List? share,
+    Value<int?> contactId = const Value.absent(),
+  }) => UserDiscoverySharesData(
+    shareId: shareId ?? this.shareId,
+    share: share ?? this.share,
+    contactId: contactId.present ? contactId.value : this.contactId,
+  );
+  UserDiscoverySharesData copyWithCompanion(UserDiscoverySharesCompanion data) {
+    return UserDiscoverySharesData(
+      shareId: data.shareId.present ? data.shareId.value : this.shareId,
+      share: data.share.present ? data.share.value : this.share,
+      contactId: data.contactId.present ? data.contactId.value : this.contactId,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoverySharesData(')
+          ..write('shareId: $shareId, ')
+          ..write('share: $share, ')
+          ..write('contactId: $contactId')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(shareId, $driftBlobEquality.hash(share), contactId);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserDiscoverySharesData &&
+          other.shareId == this.shareId &&
+          $driftBlobEquality.equals(other.share, this.share) &&
+          other.contactId == this.contactId);
+}
+
+class UserDiscoverySharesCompanion
+    extends UpdateCompanion<UserDiscoverySharesData> {
+  final Value<int> shareId;
+  final Value<i2.Uint8List> share;
+  final Value<int?> contactId;
+  const UserDiscoverySharesCompanion({
+    this.shareId = const Value.absent(),
+    this.share = const Value.absent(),
+    this.contactId = const Value.absent(),
+  });
+  UserDiscoverySharesCompanion.insert({
+    this.shareId = const Value.absent(),
+    required i2.Uint8List share,
+    this.contactId = const Value.absent(),
+  }) : share = Value(share);
+  static Insertable<UserDiscoverySharesData> custom({
+    Expression<int>? shareId,
+    Expression<i2.Uint8List>? share,
+    Expression<int>? contactId,
+  }) {
+    return RawValuesInsertable({
+      if (shareId != null) 'share_id': shareId,
+      if (share != null) 'share': share,
+      if (contactId != null) 'contact_id': contactId,
+    });
+  }
+
+  UserDiscoverySharesCompanion copyWith({
+    Value<int>? shareId,
+    Value<i2.Uint8List>? share,
+    Value<int?>? contactId,
+  }) {
+    return UserDiscoverySharesCompanion(
+      shareId: shareId ?? this.shareId,
+      share: share ?? this.share,
+      contactId: contactId ?? this.contactId,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (shareId.present) {
+      map['share_id'] = Variable<int>(shareId.value);
+    }
+    if (share.present) {
+      map['share'] = Variable<i2.Uint8List>(share.value);
+    }
+    if (contactId.present) {
+      map['contact_id'] = Variable<int>(contactId.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserDiscoverySharesCompanion(')
+          ..write('shareId: $shareId, ')
+          ..write('share: $share, ')
+          ..write('contactId: $contactId')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class DatabaseAtV15 extends GeneratedDatabase {
+  DatabaseAtV15(QueryExecutor e) : super(e);
+  late final Contacts contacts = Contacts(this);
+  late final Groups groups = Groups(this);
+  late final MediaFiles mediaFiles = MediaFiles(this);
+  late final Messages messages = Messages(this);
+  late final MessageHistories messageHistories = MessageHistories(this);
+  late final Reactions reactions = Reactions(this);
+  late final GroupMembers groupMembers = GroupMembers(this);
+  late final Receipts receipts = Receipts(this);
+  late final ReceivedReceipts receivedReceipts = ReceivedReceipts(this);
+  late final SignalIdentityKeyStores signalIdentityKeyStores =
+      SignalIdentityKeyStores(this);
+  late final SignalPreKeyStores signalPreKeyStores = SignalPreKeyStores(this);
+  late final SignalSenderKeyStores signalSenderKeyStores =
+      SignalSenderKeyStores(this);
+  late final SignalSessionStores signalSessionStores = SignalSessionStores(
+    this,
+  );
+  late final MessageActions messageActions = MessageActions(this);
+  late final GroupHistories groupHistories = GroupHistories(this);
+  late final KeyVerifications keyVerifications = KeyVerifications(this);
+  late final VerificationTokens verificationTokens = VerificationTokens(this);
+  late final UserDiscoveryAnnouncedUsers userDiscoveryAnnouncedUsers =
+      UserDiscoveryAnnouncedUsers(this);
+  late final UserDiscoveryUserRelations userDiscoveryUserRelations =
+      UserDiscoveryUserRelations(this);
+  late final UserDiscoveryOtherPromotions userDiscoveryOtherPromotions =
+      UserDiscoveryOtherPromotions(this);
+  late final UserDiscoveryOwnPromotions userDiscoveryOwnPromotions =
+      UserDiscoveryOwnPromotions(this);
+  late final UserDiscoveryShares userDiscoveryShares = UserDiscoveryShares(
+    this,
+  );
+  @override
+  Iterable<TableInfo<Table, Object?>> get allTables =>
+      allSchemaEntities.whereType<TableInfo<Table, Object?>>();
+  @override
+  List<DatabaseSchemaEntity> get allSchemaEntities => [
+    contacts,
+    groups,
+    mediaFiles,
+    messages,
+    messageHistories,
+    reactions,
+    groupMembers,
+    receipts,
+    receivedReceipts,
+    signalIdentityKeyStores,
+    signalPreKeyStores,
+    signalSenderKeyStores,
+    signalSessionStores,
+    messageActions,
+    groupHistories,
+    keyVerifications,
+    verificationTokens,
+    userDiscoveryAnnouncedUsers,
+    userDiscoveryUserRelations,
+    userDiscoveryOtherPromotions,
+    userDiscoveryOwnPromotions,
+    userDiscoveryShares,
+  ];
+  @override
+  StreamQueryUpdateRules get streamUpdateRules => const StreamQueryUpdateRules([
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'groups',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('messages', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'media_files',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('messages', kind: UpdateKind.update)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'messages',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('message_histories', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('message_histories', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'messages',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('reactions', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('reactions', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'groups',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('group_members', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('receipts', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'messages',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('receipts', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'messages',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('message_actions', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('message_actions', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'groups',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('group_histories', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('key_verifications', kind: UpdateKind.delete)],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'user_discovery_announced_users',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [
+        TableUpdate('user_discovery_user_relations', kind: UpdateKind.delete),
+      ],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [
+        TableUpdate('user_discovery_user_relations', kind: UpdateKind.delete),
+      ],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [
+        TableUpdate('user_discovery_other_promotions', kind: UpdateKind.delete),
+      ],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [
+        TableUpdate('user_discovery_own_promotions', kind: UpdateKind.delete),
+      ],
+    ),
+    WritePropagation(
+      on: TableUpdateQuery.onTableName(
+        'contacts',
+        limitUpdateKind: UpdateKind.delete,
+      ),
+      result: [TableUpdate('user_discovery_shares', kind: UpdateKind.delete)],
+    ),
+  ]);
+  @override
+  int get schemaVersion => 15;
+}
diff --git a/test/drift/twonly_db/migration_test.dart b/test/drift/twonly_db/migration_test.dart
index 3aa5929e..91310457 100644
--- a/test/drift/twonly_db/migration_test.dart
+++ b/test/drift/twonly_db/migration_test.dart
@@ -120,52 +120,92 @@ void main() {
         batch.insertAll(oldDb.receipts, oldReceiptsData);
         batch.insertAll(oldDb.receivedReceipts, oldReceivedReceiptsData);
         batch.insertAll(
-            oldDb.signalIdentityKeyStores, oldSignalIdentityKeyStoresData);
+          oldDb.signalIdentityKeyStores,
+          oldSignalIdentityKeyStoresData,
+        );
         batch.insertAll(oldDb.signalPreKeyStores, oldSignalPreKeyStoresData);
         batch.insertAll(
-            oldDb.signalSenderKeyStores, oldSignalSenderKeyStoresData);
+          oldDb.signalSenderKeyStores,
+          oldSignalSenderKeyStoresData,
+        );
         batch.insertAll(oldDb.signalSessionStores, oldSignalSessionStoresData);
         batch.insertAll(
-            oldDb.signalContactPreKeys, oldSignalContactPreKeysData);
-        batch.insertAll(oldDb.signalContactSignedPreKeys,
-            oldSignalContactSignedPreKeysData);
+          oldDb.signalContactPreKeys,
+          oldSignalContactPreKeysData,
+        );
+        batch.insertAll(
+          oldDb.signalContactSignedPreKeys,
+          oldSignalContactSignedPreKeysData,
+        );
         batch.insertAll(oldDb.messageActions, oldMessageActionsData);
         batch.insertAll(oldDb.groupHistories, oldGroupHistoriesData);
       },
       validateItems: (newDb) async {
         expect(
-            expectedNewContactsData, await newDb.select(newDb.contacts).get());
+          expectedNewContactsData,
+          await newDb.select(newDb.contacts).get(),
+        );
         expect(expectedNewGroupsData, await newDb.select(newDb.groups).get());
-        expect(expectedNewMediaFilesData,
-            await newDb.select(newDb.mediaFiles).get());
         expect(
-            expectedNewMessagesData, await newDb.select(newDb.messages).get());
-        expect(expectedNewMessageHistoriesData,
-            await newDb.select(newDb.messageHistories).get());
-        expect(expectedNewReactionsData,
-            await newDb.select(newDb.reactions).get());
-        expect(expectedNewGroupMembersData,
-            await newDb.select(newDb.groupMembers).get());
+          expectedNewMediaFilesData,
+          await newDb.select(newDb.mediaFiles).get(),
+        );
         expect(
-            expectedNewReceiptsData, await newDb.select(newDb.receipts).get());
-        expect(expectedNewReceivedReceiptsData,
-            await newDb.select(newDb.receivedReceipts).get());
-        expect(expectedNewSignalIdentityKeyStoresData,
-            await newDb.select(newDb.signalIdentityKeyStores).get());
-        expect(expectedNewSignalPreKeyStoresData,
-            await newDb.select(newDb.signalPreKeyStores).get());
-        expect(expectedNewSignalSenderKeyStoresData,
-            await newDb.select(newDb.signalSenderKeyStores).get());
-        expect(expectedNewSignalSessionStoresData,
-            await newDb.select(newDb.signalSessionStores).get());
-        expect(expectedNewSignalContactPreKeysData,
-            await newDb.select(newDb.signalContactPreKeys).get());
-        expect(expectedNewSignalContactSignedPreKeysData,
-            await newDb.select(newDb.signalContactSignedPreKeys).get());
-        expect(expectedNewMessageActionsData,
-            await newDb.select(newDb.messageActions).get());
-        expect(expectedNewGroupHistoriesData,
-            await newDb.select(newDb.groupHistories).get());
+          expectedNewMessagesData,
+          await newDb.select(newDb.messages).get(),
+        );
+        expect(
+          expectedNewMessageHistoriesData,
+          await newDb.select(newDb.messageHistories).get(),
+        );
+        expect(
+          expectedNewReactionsData,
+          await newDb.select(newDb.reactions).get(),
+        );
+        expect(
+          expectedNewGroupMembersData,
+          await newDb.select(newDb.groupMembers).get(),
+        );
+        expect(
+          expectedNewReceiptsData,
+          await newDb.select(newDb.receipts).get(),
+        );
+        expect(
+          expectedNewReceivedReceiptsData,
+          await newDb.select(newDb.receivedReceipts).get(),
+        );
+        expect(
+          expectedNewSignalIdentityKeyStoresData,
+          await newDb.select(newDb.signalIdentityKeyStores).get(),
+        );
+        expect(
+          expectedNewSignalPreKeyStoresData,
+          await newDb.select(newDb.signalPreKeyStores).get(),
+        );
+        expect(
+          expectedNewSignalSenderKeyStoresData,
+          await newDb.select(newDb.signalSenderKeyStores).get(),
+        );
+        expect(
+          expectedNewSignalSessionStoresData,
+          await newDb.select(newDb.signalSessionStores).get(),
+        );
+        expect(
+          expectedNewSignalContactPreKeysData,
+          await newDb.select(newDb.signalContactPreKeys).get(),
+        );
+        expect(
+          expectedNewSignalContactSignedPreKeysData,
+          await newDb.select(newDb.signalContactSignedPreKeys).get(),
+        );
+        expect(
+          expectedNewMessageActionsData,
+          await newDb.select(newDb.messageActions).get(),
+        );
+        expect(
+          expectedNewGroupHistoriesData,
+          await newDb.select(newDb.groupHistories).get(),
+        );
       },
     );
   });
diff --git a/test/features/flame_counter_test.dart b/test/features/flame_counter_test.dart
index 574f8638..4f597547 100644
--- a/test/features/flame_counter_test.dart
+++ b/test/features/flame_counter_test.dart
@@ -3,11 +3,12 @@ import 'package:drift/drift.dart';
 import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mutex/mutex.dart';
-import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
 import 'package:twonly/src/database/daos/contacts.dao.dart';
 import 'package:twonly/src/database/twonly.db.dart';
-import 'package:twonly/src/model/json/userdata.dart';
+import 'package:twonly/src/model/json/userdata.model.dart';
 import 'package:twonly/src/services/flame.service.dart';
+import 'package:twonly/src/services/user.service.dart';
 
 Future<void> expectFlame(DateTime time, String groupId, int counter) async {
   await withClock(
@@ -15,7 +16,7 @@ Future<void> expectFlame(DateTime time, String groupId, int counter) async {
     () async {
       final group = (await twonlyDB.groupsDao.getGroup(groupId))!;
       expect(
-        getFlameCounterFromGroup(group),
+        getFlameCounterFromGroup(group).counter,
         counter,
         reason: StackTrace.current.toString(),
       );
@@ -23,6 +24,31 @@ Future<void> expectFlame(DateTime time, String groupId, int counter) async {
   );
 }
 
+Future<void> expectFlameExpiring(
+  DateTime time,
+  String groupId, {
+  required int counter,
+  required bool isExpiring,
+}) async {
+  await withClock(
+    Clock.fixed(time),
+    () async {
+      final group = (await twonlyDB.groupsDao.getGroup(groupId))!;
+      final result = getFlameCounterFromGroup(group);
+      expect(
+        result.counter,
+        counter,
+        reason: 'counter mismatch — ${StackTrace.current}',
+      );
+      expect(
+        result.isExpiring,
+        isExpiring,
+        reason: 'isExpiring mismatch — ${StackTrace.current}',
+      );
+    },
+  );
+}
+
 void main() {
   final mutex = Mutex();
   var usedUserIds = 0;
@@ -38,19 +64,25 @@ void main() {
   }
 
   setUp(() async {
-    twonlyDB = TwonlyDB.forTesting(
-      DatabaseConnection(
-        NativeDatabase.memory(),
-        // Recommended for widget tests to avoid test errors.
-        closeStreamsSynchronously: true,
-      ),
-    );
+    await locator.reset();
+    locator
+      ..registerSingleton<TwonlyDB>(
+        TwonlyDB.forTesting(
+          DatabaseConnection(
+            NativeDatabase.memory(),
+            // Recommended for widget tests to avoid test errors.
+            closeStreamsSynchronously: true,
+          ),
+        ),
+      )
+      ..registerSingleton<UserService>(UserService());
 
-    gUser = UserData(
+    userService.currentUser = UserData(
       userId: 0x133337,
       username: 'test_user',
       displayName: 'Test User',
       subscriptionPlan: 'Free',
+      currentSetupPage: null,
     )..appVersion = 62;
   });
 
@@ -104,6 +136,52 @@ void main() {
     await expectFlame(DateTime(2026, 2, 6, 19), group.groupId, 2);
     await expectFlame(DateTime(2026, 3, 1, 19), group.groupId, 0);
 
+    // ── isExpiring tests ──────────────────────────────────────────────────────
+    // After the Feb-5/Feb-6 exchanges the flame is 2.
+    // On Feb-7 no exchange has happened yet → isExpiring should be true.
+    await expectFlameExpiring(
+      DateTime(2026, 2, 7, 10),
+      group.groupId,
+      counter: 2,
+      isExpiring: false,
+    );
+    // Once both sides exchange on Feb-7, isExpiring becomes false.
+    await withClock(
+      Clock.fixed(DateTime(2026, 2, 7, 12)),
+      () async {
+        await incFlameCounter(group.groupId, true, DateTime(2026, 2, 7, 10));
+        await incFlameCounter(group.groupId, false, DateTime(2026, 2, 7, 11));
+      },
+    );
+    await expectFlameExpiring(
+      DateTime(2026, 2, 7, 13),
+      group.groupId,
+      counter: 3,
+      isExpiring: false,
+    );
+    // On Feb-8, before any exchange, isExpiring is true again.
+    await expectFlameExpiring(
+      DateTime(2026, 2, 8, 9),
+      group.groupId,
+      counter: 3,
+      isExpiring: false,
+    );
+    // On Feb-9, last exchange was Feb-7 — still within the two-day window,
+    // so the flame is still alive but expiring.
+    await expectFlameExpiring(
+      DateTime(2026, 2, 9, 9),
+      group.groupId,
+      counter: 3,
+      isExpiring: true,
+    );
+    // On Feb-10, last exchange (Feb-7) is now before twoDaysAgo → flame is gone.
+    await expectFlameExpiring(
+      DateTime(2026, 2, 10, 9),
+      group.groupId,
+      counter: 0,
+      isExpiring: false,
+    );
+
     for (var i = 1; i <= 20; i++) {
       await withClock(
         Clock.fixed(DateTime(2026, 3, i, 1)),
diff --git a/test/features/link_parser_test.dart b/test/features/link_parser_test.dart
index d5f3c210..74cac06b 100644
--- a/test/features/link_parser_test.dart
+++ b/test/features/link_parser_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/parse_link.dart';
-import 'package:twonly/src/views/camera/share_image_editor/layers/link_preview/parser/base.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/parse_link.dart';
+import 'package:twonly/src/visual/views/camera/share_image_editor_components/layers/link_preview/parser/base.dart';
 
 class LinkParserTest {
   LinkParserTest({
diff --git a/test/rust/create_db_for_rust_testing.dart b/test/rust/create_db_for_rust_testing.dart
new file mode 100644
index 00000000..a9c308f6
--- /dev/null
+++ b/test/rust/create_db_for_rust_testing.dart
@@ -0,0 +1,56 @@
+import 'dart:io';
+import 'package:drift/drift.dart' show Value;
+import 'package:drift/native.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:twonly/src/database/twonly.db.dart';
+
+void main() {
+  if (!Platform.isMacOS) return;
+  late TwonlyDB database;
+  late File dbFile;
+
+  setUp(() {
+    dbFile = File('rust/tests/testing.db');
+    if (dbFile.existsSync()) {
+      dbFile.deleteSync();
+    }
+    database = TwonlyDB(NativeDatabase(dbFile));
+  });
+
+  tearDown(() async {
+    await database.close();
+  });
+
+  test('Database successfully writes to the physical file system', () async {
+    final users = [
+      'alice',
+      'bob',
+      'charlie',
+      'david',
+      'frank',
+    ];
+
+    for (var i = 0; i < users.length; i++) {
+      await database.contactsDao.insertContact(
+        ContactsCompanion(userId: Value(i), username: Value(users[i])),
+      );
+    }
+
+    expect(
+      dbFile.existsSync(),
+      isTrue,
+      reason: 'The SQLite file was not created on disk.',
+    );
+
+    expect(
+      dbFile.lengthSync(),
+      greaterThan(0),
+      reason: 'The SQLite file is completely empty.',
+    );
+
+    if (kDebugMode) {
+      print('Test passed! Database written to: ${dbFile.absolute.path}');
+    }
+  });
+}
diff --git a/test/services/group_services_test.dart b/test/services/group_services_test.dart
new file mode 100644
index 00000000..ffe8f65f
--- /dev/null
+++ b/test/services/group_services_test.dart
@@ -0,0 +1,147 @@
+import 'dart:io';
+
+import 'package:drift/drift.dart' hide isNotNull, isNull;
+import 'package:drift/native.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
+import 'package:twonly/globals.dart';
+import 'package:twonly/locator.dart';
+import 'package:twonly/src/database/tables/groups.table.dart';
+import 'package:twonly/src/database/twonly.db.dart';
+import 'package:twonly/src/model/json/userdata.model.dart';
+import 'package:twonly/src/services/api.service.dart';
+import 'package:twonly/src/services/group.services.dart';
+import 'package:twonly/src/services/user.service.dart';
+
+class RealHttpOverrides extends HttpOverrides {
+  @override
+  HttpClient createHttpClient(SecurityContext? context) {
+    return super.createHttpClient(context)
+      ..badCertificateCallback = (cert, host, port) => true;
+  }
+}
+
+void main() {
+  if (!Platform.isMacOS) {
+    return;
+  }
+
+  TestWidgetsFlutterBinding.ensureInitialized();
+  HttpOverrides.global = RealHttpOverrides();
+
+  setUp(() async {
+    await locator.reset();
+    locator
+      ..registerSingleton<TwonlyDB>(
+        TwonlyDB.forTesting(
+          DatabaseConnection(
+            NativeDatabase.memory(),
+            closeStreamsSynchronously: true,
+          ),
+        ),
+      )
+      ..registerSingleton<UserService>(UserService())
+      ..registerSingleton<ApiService>(ApiService());
+
+    userService.currentUser = UserData(
+      userId: 1,
+      username: 'test_user',
+      displayName: 'Test User',
+      subscriptionPlan: 'Free',
+      currentSetupPage: null,
+    )..appVersion = 100;
+    userService.isUserCreated = true;
+    AppEnvironment.initTesting();
+    // Log.init();
+
+    expect(apiService.apiHost, 'dev-api.twonly.eu');
+  });
+
+  tearDown(() async {
+    await twonlyDB.close();
+  });
+
+  group('GroupServices Tests', () {
+    Future<Group> createTestGroup() async {
+      await twonlyDB.contactsDao.insertContact(
+        ContactsCompanion.insert(
+          userId: const Value(2),
+          username: 'user2',
+        ),
+      );
+      final members = <Contact>[
+        (await twonlyDB.contactsDao.getContactById(2))!,
+      ];
+      final result = await createNewGroup('Test Group', members);
+      expect(result, true);
+      return (await twonlyDB.groupsDao.getAllGroups()).first;
+    }
+
+    test('Full Group Life Cycle', () async {
+      late bool success;
+      // 1. Create Group
+      var group = await createTestGroup();
+
+      // 2. Add New Member
+      await twonlyDB.contactsDao.insertContact(
+        ContactsCompanion.insert(
+          userId: const Value(3),
+          username: 'user3',
+        ),
+      );
+      success = await addNewGroupMembers(group, [3]);
+      expect(success, true);
+
+      // 3. Upgrade to Admin
+      // Generate a real-looking key
+      group = (await twonlyDB.groupsDao.getGroup(group.groupId))!;
+      final dummyPubKey = Curve.generateKeyPair().publicKey.serialize();
+      success = await manageAdminState(group, dummyPubKey, 2, false);
+      expect(success, true);
+
+      // 4. Change Time
+      group = (await twonlyDB.groupsDao.getGroup(group.groupId))!;
+      success = await updateChatDeletionTime(group, 7200000);
+      expect(success, true);
+
+      // 5. Remove Member 3
+      group = (await twonlyDB.groupsDao.getGroup(group.groupId))!;
+      success = await removeMemberFromGroup(group, dummyPubKey, 3);
+      expect(success, true);
+
+      // 6. Remove Member 2
+      group = (await twonlyDB.groupsDao.getGroup(group.groupId))!;
+      success = await removeMemberFromGroup(group, dummyPubKey, 2);
+      expect(success, true);
+
+      // 7. Leave Group (Myself)
+      final keyPair = IdentityKeyPair.fromSerialized(
+        group.myGroupPrivateKey!,
+      );
+      group = (await twonlyDB.groupsDao.getGroup(group.groupId))!;
+      success = await removeMemberFromGroup(
+        group,
+        keyPair.getPublicKey().serialize(),
+        userService.currentUser.userId,
+      );
+      expect(success, false);
+
+      // Final verification of DB state
+      final finalGroup = await twonlyDB.groupsDao.getGroup(group.groupId);
+      expect(finalGroup, isNotNull);
+
+      final history = await twonlyDB.groupsDao
+          .watchGroupActions(group.groupId)
+          .first;
+
+      expect(history.length, 7);
+      expect(history[0].type, GroupActionType.createdGroup);
+      expect(history[1].type, GroupActionType.addMember);
+      expect(history[2].type, GroupActionType.promoteToAdmin);
+      expect(history[3].type, GroupActionType.changeDisplayMaxTime);
+      expect(history[4].type, GroupActionType.removedMember);
+      expect(history[5].type, GroupActionType.removedMember);
+      expect(history[6].type, GroupActionType.removedMember);
+    });
+  });
+}
diff --git a/test/unit_test.dart b/test/unit_test.dart
index 80a4db4a..73032a8c 100644
--- a/test/unit_test.dart
+++ b/test/unit_test.dart
@@ -1,9 +1,10 @@
 import 'dart:typed_data';
+
 import 'package:flutter_test/flutter_test.dart';
 import 'package:hashlib/random.dart';
 import 'package:twonly/src/utils/misc.dart';
 import 'package:twonly/src/utils/pow.dart';
-import 'package:twonly/src/views/components/animate_icon.dart';
+import 'package:twonly/src/visual/components/animate_icon.comp.dart';
 
 void main() {
   group('testing utils', () {
diff --git a/test_driver/integration_test.dart b/test_driver/integration_test.dart
new file mode 100644
index 00000000..b38629cc
--- /dev/null
+++ b/test_driver/integration_test.dart
@@ -0,0 +1,3 @@
+import 'package:integration_test/integration_test_driver.dart';
+
+Future<void> main() => integrationDriver();