diff --git a/android/app/build.gradle b/android/app/build.gradle
index 6db61c41..d12858f7 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -38,9 +38,6 @@ android {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
-    lintOptions {
-        disable 'InvalidPackage'
-    }
 
     splits {
         abi {
@@ -100,13 +97,15 @@ android {
 //            }
         }
     }
+    namespace 'com.threedpass.wallet'
+    lint {
+        disable 'InvalidPackage'
+    }
 
     applicationVariants.configureEach { variant ->
         variant.outputs.configureEach { output ->
             def abiFilter = output.getFilter(com.android.build.OutputFile.ABI)
             def abiVariant = abiFilter != null ? abiFilter : "universal"
-//            def abiFilter = output.variantOutputConfiguration.filters.find { it.filterType == FilterConfiguration.FilterType.ABI }
-//            def abiVariant = abiFilter != null ? abiFilter.identifier : "universal"
             outputFileName = "threedpass" + "-" + versionName + "-" + abiVariant + ".apk"
         }
     }
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 99615ae3..ef0501c0 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.threedpass.wallet">
+    xmlns:tools="http://schemas.android.com/tools">
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide
diff --git a/android/build.gradle b/android/build.gradle
index 4ba30c4e..10de5a20 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -21,6 +21,24 @@ allprojects {
 
 rootProject.buildDir = '../build'
 subprojects {
+     //  fix for verifyReleaseResources https://github.com/isar/isar/issues/1662#issuecomment-2370929002
+    afterEvaluate { project ->
+        if (project.plugins.hasPlugin("com.android.application") ||
+        project.plugins.hasPlugin("com.android.library")) {
+            project.android {
+                compileSdkVersion 34
+                buildToolsVersion "34.0.0"
+            }
+        }
+        if (project.hasProperty("android")) {
+            project.android {
+                if (namespace == null) {
+                    namespace project.group
+                }
+            }
+        }
+    }
+    // ===============================
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
 subprojects {
diff --git a/lib/features/legacy_preview/3d_engine.dart b/lib/features/legacy_preview/3d_engine.dart
index 4bf5af10..39c85446 100644
--- a/lib/features/legacy_preview/3d_engine.dart
+++ b/lib/features/legacy_preview/3d_engine.dart
@@ -9,19 +9,26 @@ import 'package:vector_math/vector_math.dart' as math;
 import 'model.dart';
 import 'utils.dart';
 
+class RenderParams {
+  final bool backfaceCulling;
+
+  const RenderParams({
+    this.backfaceCulling = true,
+  });
+}
+
 class Object3D extends StatefulWidget {
   final Size size;
   final String value;
-  final double zoom;
+  // final double zoom;
   // final double scale;
   final Model model;
+  final RenderParams params;
 
   Object3D({
     required this.size,
-    // required this.path,
     required this.value,
-    required this.zoom,
-    // this.scale = 1.0,
+    this.params = const RenderParams(),
     super.key,
   }) : model = Model()
           ..loadFromString(value)
@@ -37,30 +44,24 @@ class _Object3DState extends State<Object3D> {
   double angleZ = 0.0;
   double zoom = 0.0;
 
-  /*
-   *  Load the 3D  data from a file in our /assets folder.
-   */
+  final Map<String, Color> colorCache = {};
 
   void _dragX(final Offset delta) {
-    // setState(() {
     angleX += delta.dy;
     if (angleX > 360) {
       angleX = angleX - 360;
     } else if (angleX < 0) {
       angleX = 360 - angleX;
     }
-    // });
   }
 
   void _dragY(final Offset delta) {
-    // setState(() {
     angleY += delta.dx;
     if (angleY > 360) {
       angleY = angleY - 360;
     } else if (angleY < 0) {
       angleY = 360 - angleY;
     }
-    // });
   }
 
   @override
@@ -73,10 +74,12 @@ class _Object3DState extends State<Object3D> {
           painter: _ObjectPainter(
             size: widget.size,
             model: widget.model,
+            params: widget.params,
+            colorCache: colorCache,
             angleX: angleX,
             angleY: angleY,
             angleZ: angleZ,
-            zoom: widget.zoom,
+            // zoom: widget.zoom,
           ),
           size: widget.size,
         ),
@@ -85,11 +88,11 @@ class _Object3DState extends State<Object3D> {
   }
 
   void onPointerMove(final PointerMoveEvent moveEvent) {
-    // print('D SCALE UPDATE $details');
-    // print('Delta ${moveEvent.delta}');
     setState(() {
       _dragX(moveEvent.delta);
       _dragY(moveEvent.delta);
+      // print(
+      //     'Set state. moveX: ${moveEvent.delta.dx}, moveY: ${moveEvent.delta.dy}. Diff: ${now.difference(lastUpdate).inMilliseconds}');
     });
   }
 }
@@ -100,9 +103,9 @@ class _Object3DState extends State<Object3D> {
  *  https://api.flutter.dev/flutter/rendering/CustomPainter-class.html
  */
 class _ObjectPainter extends CustomPainter {
-  final double _viewPortX;
-  final double _viewPortY;
-  final double zoom;
+  // final double _viewPortX;
+  // final double _viewPortY;
+  static const double zoom = 1.0;
 
   final math.Vector3 camera;
   final math.Vector3 light;
@@ -116,19 +119,40 @@ class _ObjectPainter extends CustomPainter {
   List<math.Vector3> verts;
 
   final Model model;
+  final RenderParams params;
+
+  // The same paint draws paths on canvas
+  final Paint reusablePaint;
+  // The same matrix to transform the vertices
+  final math.Matrix4 reusableTrans;
+
+  final Map<String, Color> colorCache;
+
+  // Camera at origin
+  static final viewDirection = math.Vector3(0, 0, 1);
+  static const color = Color.fromRGBO(127, 127, 127, 1);
 
   _ObjectPainter({
     required this.size,
     required this.model,
+    required this.params,
+    required this.colorCache,
     required this.angleX,
     required this.angleY,
     required this.angleZ,
-    required this.zoom,
+    // required this.zoom,
   })  : this.camera = math.Vector3(0.0, 0.0, 0.0),
         light = math.Vector3(0.0, 0.0, 100.0),
         verts = <math.Vector3>[],
-        _viewPortX = size.width / 2,
-        _viewPortY = size.height / 2;
+        reusablePaint = Paint()..style = PaintingStyle.fill,
+        // _viewPortX = size.width / 2,
+        // _viewPortY = size.height / 2,
+        reusableTrans =
+            math.Matrix4.translationValues(size.width / 2, size.height / 2, 1)
+              ..scale(zoom, -zoom)
+              ..rotateX(Utils.degreeToRadian(angleX))
+              ..rotateY(Utils.degreeToRadian(angleY))
+              ..rotateZ(Utils.degreeToRadian(angleZ));
 
   /*
    *  We use a 4x4 matrix to perform our rotation, translation and scaling in
@@ -136,12 +160,28 @@ class _ObjectPainter extends CustomPainter {
    *  https://www.euclideanspace.com/maths/geometry/affine/matrix4x4/index.htm
    */
   math.Vector3 _calcVertex(final math.Vector3 vertex) {
-    final trans = math.Matrix4.translationValues(_viewPortX, _viewPortY, 1);
-    trans.scale(zoom, -zoom);
-    trans.rotateX(Utils.degreeToRadian(angleX));
-    trans.rotateY(Utils.degreeToRadian(angleY));
-    trans.rotateZ(Utils.degreeToRadian(angleZ));
-    return trans.transform3(vertex);
+    return reusableTrans.transform3(vertex);
+  }
+
+  double dp(final double val, final int places) {
+    final num mod = pow(10.0, places);
+    return (val * mod).round().toDouble() / mod;
+  }
+
+  Color computeShadedColor(final Color baseColor, final double brightness) {
+    final roundedBrightness = dp(brightness, 3);
+    final key = '${baseColor.value}_${roundedBrightness}';
+    // print('Color: ${baseColor.value}');
+    final cachedColor = colorCache[key];
+    if (cachedColor != null) {
+      return cachedColor;
+    }
+    final r = (roundedBrightness * baseColor.red).toInt();
+    final g = (roundedBrightness * baseColor.green).toInt();
+    final b = (roundedBrightness * baseColor.blue).toInt();
+    final newColor = Color.fromARGB(255, r, g, b);
+    colorCache[key] = newColor;
+    return newColor;
   }
 
   /*
@@ -163,13 +203,12 @@ class _ObjectPainter extends CustomPainter {
     final brightness = normal.clamp(0.0, 1.0);
 
     // Assign a lighting color
-    final r = (brightness * color.red).toInt();
-    final g = (brightness * color.green).toInt();
-    final b = (brightness * color.blue).toInt();
-
-    final paint = Paint();
-    paint.color = Color.fromARGB(255, r, g, b);
-    paint.style = PaintingStyle.fill;
+    // final r = (brightness * color.red).toInt();
+    // final g = (brightness * color.green).toInt();
+    // final b = (brightness * color.blue).toInt();
+    // reusablePaint.color = Color.fromARGB(255, r, g, b);
+    final shadedColor = computeShadedColor(color, brightness);
+    reusablePaint.color = shadedColor;
 
     // Paint the face
     final path = Path();
@@ -178,7 +217,27 @@ class _ObjectPainter extends CustomPainter {
     path.lineTo(v3.x, v3.y);
     path.lineTo(v1.x, v1.y);
     path.close();
-    canvas.drawPath(path, paint);
+    canvas.drawPath(path, reusablePaint);
+  }
+
+  /*
+   *  Backface culling.  If the polygon is facing the camera, then it is visible
+   */
+  bool backfaceCullingSkip(
+    final math.Vector3 v1,
+    final math.Vector3 v2,
+    final math.Vector3 v3,
+  ) {
+    if (!params.backfaceCulling) {
+      return false;
+    }
+
+    // Calculate the surface normal
+    final normalVector = Utils.normalVector3(v1, v2, v3);
+
+    // Backface culling: skip if normal points away from the camera
+    final dotProduct = normalVector.dot(viewDirection);
+    return dotProduct <= 0;
   }
 
   /*
@@ -188,15 +247,23 @@ class _ObjectPainter extends CustomPainter {
   @override
   void paint(final Canvas canvas, final Size size) {
     // Rotate and translate the vertices
-    verts = <math.Vector3>[];
-    for (int i = 0; i < model.verts.length; i++) {
-      verts.add(_calcVertex(math.Vector3.copy(model.verts[i])));
-    }
+    verts = model.verts
+        .map((final v) => _calcVertex(math.Vector3.copy(v)))
+        .toList();
 
     // Sort
     final sorted = <Map<String, dynamic>>[];
     for (var i = 0; i < model.faces.length; i++) {
       final face = model.faces[i];
+      // Reference the rotated vertices
+      final v1 = verts[face[0] - 1];
+      final v2 = verts[face[1] - 1];
+      final v3 = verts[face[2] - 1];
+
+      if (backfaceCullingSkip(v1, v2, v3)) {
+        continue;
+      }
+
       sorted.add(<String, dynamic>{
         "index": i,
         "order": Utils.zIndex(
@@ -214,9 +281,11 @@ class _ObjectPainter extends CustomPainter {
     // Render
     for (int i = 0; i < sorted.length; i++) {
       final face = model.faces[sorted[i]["index"] as int];
-      final color = model.colors[sorted[i]["index"] as int];
+      // final color = model.colors[sorted[i]["index"] as int];
       _drawFace(canvas, face, color);
     }
+
+    // print(' Keys: ${colorCache.length}');
   }
 
   /*
diff --git a/lib/features/legacy_preview/model.dart b/lib/features/legacy_preview/model.dart
index 3251810e..15163f6c 100644
--- a/lib/features/legacy_preview/model.dart
+++ b/lib/features/legacy_preview/model.dart
@@ -12,8 +12,8 @@ class Model {
   final List<Vector3> verts;
   final List<List<int>> faces;
 
-  final List<Color> colors;
-  Map<String, Color> materials;
+  // final List<Color> colors;
+  // Map<String, Color> materials;
 
   /* 
    *  Converts normalised color values to a Color()
@@ -29,16 +29,16 @@ class Model {
 
   Model()
       : verts = <Vector3>[],
-        faces = <List<int>>[],
-        colors = <Color>[],
-        materials = {
-          "frontal": _toRGBA(0.848100, 0.607500, 1.000000),
-          "occipital": _toRGBA(1.000000, 0.572600, 0.392400),
-          "parietal": _toRGBA(0.379700, 0.830900, 1.000000),
-          "temporal": _toRGBA(1.000000, 0.930700, 0.468300),
-          "cerebellum": _toRGBA(0.506300, 1.000000, 0.598200),
-          "stem": _toRGBA(0.500000, 0.500000, 0.500000),
-        };
+        faces = <List<int>>[];
+  // colors = <Color>[],
+  // materials = {
+  //   "frontal": _toRGBA(0.848100, 0.607500, 1.000000),
+  //   "occipital": _toRGBA(1.000000, 0.572600, 0.392400),
+  //   "parietal": _toRGBA(0.379700, 0.830900, 1.000000),
+  //   "temporal": _toRGBA(1.000000, 0.930700, 0.468300),
+  //   "cerebellum": _toRGBA(0.506300, 1.000000, 0.598200),
+  //   "stem": _toRGBA(0.500000, 0.500000, 0.500000),
+  // };
 
   void scale(final double value) {
     double globalMaxCoord = 0.0;
@@ -88,7 +88,7 @@ class Model {
           ]),
         );
         //colors.add(materials[material]);
-        colors.add(_toRGBA(0.5, 0.5, 0.5));
+        // colors.add(_toRGBA(0.5, 0.5, 0.5));
       }
     });
   }
diff --git a/lib/features/legacy_preview/poscan_object_preview.dart b/lib/features/legacy_preview/poscan_object_preview.dart
index a5ac68b9..0ed67783 100644
--- a/lib/features/legacy_preview/poscan_object_preview.dart
+++ b/lib/features/legacy_preview/poscan_object_preview.dart
@@ -61,9 +61,7 @@ class _State extends State<PoscanObjectPreview> {
       child: isLoaded
           ? Object3D(
               size: widget.size,
-              zoom: 1.0,
               value: content,
-              // scale: (widget.size.height - 32) / 2,
             )
           : const D3pProgressIndicator(size: 24),
     );
diff --git a/lib/features/legacy_preview/preview_from_file.dart b/lib/features/legacy_preview/preview_from_file.dart
index 627d46ca..102b616d 100644
--- a/lib/features/legacy_preview/preview_from_file.dart
+++ b/lib/features/legacy_preview/preview_from_file.dart
@@ -49,8 +49,6 @@ class _State extends State<PreviewFromFile> {
           ? Object3D(
               size: widget.size,
               value: fileContent,
-              zoom: widget.zoom,
-              // scale: widget.scale,
             )
           : const D3pProgressIndicator(size: 24),
     );
diff --git a/pubspec.lock b/pubspec.lock
index f5244e2f..ad9a13f2 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -17,30 +17,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.13.0"
-  analyzer_plugin:
-    dependency: transitive
-    description:
-      name: analyzer_plugin
-      sha256: c1d5f167683de03d5ab6c3b53fc9aeefc5d59476e7810ba7bbddff50c6f4392d
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.2"
-  ansicolor:
-    dependency: transitive
-    description:
-      name: ansicolor
-      sha256: "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.3"
   app_install_date:
     dependency: "direct main"
     description:
       name: app_install_date
-      sha256: c5f8c1eb5c0418bad239f3aaf23cd55240d6ec30d0a0fd7f065f58e2125d8e0f
+      sha256: "0860b8feb129a97a2dae58e5d2dcfc274418ad803a80be35af83ad590daa4fe3"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.4"
+    version: "0.1.5"
   archive:
     dependency: transitive
     description:
@@ -289,30 +273,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.5"
-  csslib:
-    dependency: transitive
-    description:
-      name: csslib
-      sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  dart_code_metrics:
-    dependency: "direct dev"
-    description:
-      name: dart_code_metrics
-      sha256: "3dede3f7abc077a4181ec7445448a289a9ce08e2981e6a4d49a3fb5099d47e1f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.7.6"
-  dart_code_metrics_presets:
-    dependency: transitive
-    description:
-      name: dart_code_metrics_presets
-      sha256: b71eadf02a3787ebd5c887623f83f6fdc204d45c75a081bd636c4104b3fd8b73
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.8.0"
   dart_style:
     dependency: transitive
     description:
@@ -357,10 +317,10 @@ packages:
     dependency: transitive
     description:
       name: eip1559
-      sha256: de454d6321bd753eb79116e9ec4f8df20895c2e97f9a3839a032f3a728985516
+      sha256: c2b81ac85f3e0e71aaf558201dd9a4600f051ece7ebacd0c5d70065c9b458004
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.6.2"
   eip55:
     dependency: transitive
     description:
@@ -380,11 +340,12 @@ packages:
   ethers:
     dependency: transitive
     description:
-      name: ethers
-      sha256: e7f06c339a04c626c6df73f6c2559a956810a2c1b7fa32a5a6e198a78cd0c9ff
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.0.1+3"
+      path: "."
+      ref: "7defa16821fbb529cb4643ddb80481088d42f43e"
+      resolved-ref: "7defa16821fbb529cb4643ddb80481088d42f43e"
+      url: "https://github.com/L3odr0id/ethers.git"
+    source: git
+    version: "0.0.1+5"
   extra_pedantic:
     dependency: "direct dev"
     description:
@@ -489,10 +450,11 @@ packages:
   flutter_aes_ecb_pkcs5:
     dependency: transitive
     description:
-      name: flutter_aes_ecb_pkcs5
-      sha256: "86bf0646c80b5271e86870538aa04ed039e834103f157f93ab7e90e7f6f99ffc"
-      url: "https://pub.dev"
-    source: hosted
+      path: "."
+      ref: HEAD
+      resolved-ref: "5a98954213693863fa9d9c2692f3cf9e2ca23712"
+      url: "https://github.com/poka-IT/flutter_aes_ecb_pkcs5.git"
+    source: git
     version: "0.1.3"
   flutter_bloc:
     dependency: "direct main"
@@ -765,22 +727,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.1"
-  html:
-    dependency: transitive
-    description:
-      name: html
-      sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.15.4"
   http:
     dependency: transitive
     description:
       name: http
-      sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2"
+      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.6"
+    version: "1.2.2"
   http_multi_server:
     dependency: transitive
     description:
@@ -1137,8 +1091,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "1d79f05f057f3381725c40f3d014f7db16da6e3f"
-      resolved-ref: "1d79f05f057f3381725c40f3d014f7db16da6e3f"
+      ref: e1e722ee506de0397e86b246bb5968ca2e084f98
+      resolved-ref: e1e722ee506de0397e86b246bb5968ca2e084f98
       url: "https://github.com/L3odr0id/polkawallet_sdk.git"
     source: git
     version: "0.5.1"
@@ -1150,14 +1104,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.5.1"
-  process:
-    dependency: transitive
-    description:
-      name: process
-      sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.2.4"
   provider:
     dependency: transitive
     description:
@@ -1174,14 +1120,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
-  pub_updater:
-    dependency: transitive
-    description:
-      name: pub_updater
-      sha256: "05ae70703e06f7fdeb05f7f02dd680b8aad810e87c756a618f33e1794635115c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.0"
   pubspec_parse:
     dependency: transitive
     description:
@@ -1362,6 +1300,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.10.0"
+  sprintf:
+    dependency: transitive
+    description:
+      name: sprintf
+      sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.0"
   stack_trace:
     dependency: transitive
     description:
@@ -1510,10 +1456,10 @@ packages:
     dependency: transitive
     description:
       name: uuid
-      sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313"
+      sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.7"
+    version: "4.5.1"
   vector_graphics:
     dependency: transitive
     description:
@@ -1582,10 +1528,10 @@ packages:
     dependency: transitive
     description:
       name: web3dart
-      sha256: "0b96223a6b284e3146e65dc842ded139eca68a85c4ab79c5ba1a73284927d3cd"
+      sha256: "885e5e8f0cc3c87c09f160a7fce6279226ca41316806f7ece2001959c62ecced"
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.1"
+    version: "2.7.3"
   web_socket:
     dependency: transitive
     description:
@@ -1606,34 +1552,34 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter
-      sha256: "392c1d83b70fe2495de3ea2c84531268d5b8de2de3f01086a53334d8b6030a88"
+      sha256: ec81f57aa1611f8ebecf1d2259da4ef052281cb5ad624131c93546c79ccc7736
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.4"
+    version: "4.9.0"
   webview_flutter_android:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: "8b3b2450e98876c70bfcead876d9390573b34b9418c19e28168b74f6cb252dbd"
+      sha256: "47a8da40d02befda5b151a26dba71f47df471cddd91dfdb7802d0a87c5442558"
       url: "https://pub.dev"
     source: hosted
-    version: "2.10.4"
+    version: "3.16.9"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
       name: webview_flutter_platform_interface
-      sha256: "812165e4e34ca677bdfbfa58c01e33b27fd03ab5fa75b70832d4b7d4ca1fa8cf"
+      sha256: d937581d6e558908d7ae3dc1989c4f87b786891ab47bb9df7de548a151779d8d
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.5"
+    version: "2.10.0"
   webview_flutter_wkwebview:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: a5364369c758892aa487cbf59ea41d9edd10f9d9baf06a94e80f1bd1b4c7bbc0
+      sha256: f14ee08021772fed913da8daebcfdeb46be457081e521e93e9918fe6cd1ce9e8
       url: "https://pub.dev"
     source: hosted
-    version: "2.9.5"
+    version: "3.16.1"
   win32:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 59b28cf9..7fb2709c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -10,7 +10,7 @@ publish_to: 'none'
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 2.17.2+47
+version: 2.17.3+48
 
 environment:
   sdk: ">=3.0.6 <4.0.0"
@@ -26,7 +26,6 @@ dependencies:
   fluttertoast: ^8.2.2
   infinite_scroll_pagination: ^4.0.0
   shimmer: ^3.0.0
-  
   unicons: ^2.1.0
   url_launcher: ^6.1.12
   file_picker: ^8.1.2
@@ -40,14 +39,14 @@ dependencies:
   flutter_bloc: ^8.1.3
   path_provider: ^2.1.0
   hive: ^2.2.3
-  isar: 3.1.0+1
+  isar: 3.1.0+1 # TODO Move to isar 4.0.0-dev.14
   isar_flutter_libs: 3.1.0+1 # contains Isar Core
   flutter_inappwebview: ^5.7.2+3
   polkawallet_sdk: #0.5.1
     # path: ../polkawallet_sdk
     git:
         url: https://github.com/L3odr0id/polkawallet_sdk.git
-        ref: 1d79f05f057f3381725c40f3d014f7db16da6e3f # release/0.5.1 # branch name
+        ref: e1e722ee506de0397e86b246bb5968ca2e084f98 # release/0.5.1 # branch name
   decimal: ^2.3.3
   rational: ^2.2.3
   async: ^2.11.0
@@ -68,7 +67,7 @@ dependencies:
   mask_text_input_formatter: ^2.4.0
   number_text_input_formatter: ^1.0.0+8
   flutter_phoenix: ^1.1.0 # TODO REMOVE
-  app_install_date: ^0.1.3
+  app_install_date: ^0.1.5
   scrollview_observer: ^1.20.0
 
   # Child packages
@@ -103,10 +102,10 @@ dev_dependencies:
   
   ## Linters
   flutter_lints: ^4.0.0
-  dart_code_metrics: ^5.7.5 # TODO MOVE TO https://github.com/rei-codes/dart-code-metrics
+  # dart_code_metrics: # TODO Upgrade isar and import this
   #   git:
-  #     url: https://github.com/rei-codes/dart-code-metrics.git
-  #     ref: 1c38aede63e6a7d28d5dc81424e578a1e10ffc25
+  #     url: https://github.com/L3odr0id/dart-code-metrics.git
+  #     ref: af4868809f790eb6e7ea012bb78b1b762ff701eb
   extra_pedantic: ^4.0.0
 
 # The following section is specific to Flutter.