Merge pull request #177 from MXCzkEVM/pre_main_qa

New release

.github/workflows/compile.yml

@@ -8,7 +8,9 @@ on:
 jobs:
   build-apk:
     name: Build-apk
-    runs-on: ubuntu-latest
+    # This version contains CMake 3.18 but the latest contains 3.30 
+    # We will need to check CMake 3.30 compatibility and then upgrade
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout code with submodules
         uses: actions/checkout@v4
@@ -48,7 +50,6 @@ jobs:
           source-dir: build/app/outputs/flutter-apk
           destination-dir: app
 
-
   build-macos:
     name: Build-ios
     # https://github.com/actions/runner-images
@@ -79,6 +80,37 @@ jobs:
           # Try running the build locally with the build command to be sure of this path
           path: build/ios/ipa/*.ipa
 
+  build-macos-simulator:
+    name: Build-ios-simulator
+    # https://github.com/actions/runner-images
+    # https://xcodereleases.com/
+    runs-on: macos-15
+
+    steps:
+      - name: Select Xcode version 16.1
+        run: sudo xcode-select -s /Applications/Xcode_16.1.app
+
+      - name: Checkout code with submodules
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - uses: sheenhx/action-flutter-build-ios@main
+        with:
+          # always use --export-options-plist=ios/GithubActionsExportOptions.plist
+          build-cmd: flutter build ios --simulator --no-codesign --debug --dart-define=FLUTTER_BUILD_MODE=debug
+          certificate-base64: ${{ secrets.IOS_BUILD_CERTIFICATE_BASE64 }}
+          certificate-password: ${{ secrets.IOS_BUILD_CERTIFICATE_PASSWORD }}
+          provisioning-profile-base64: ${{ secrets.IOS_MOBILE_PROVISIONING_PROFILE_BASE64 }}
+          keychain-password: ${{ secrets.IOS_GITHUB_KEYCHAIN_PASSWORD }}
+
+      - name: Archive .app
+        uses: actions/upload-artifact@v4
+        with:
+          name: simulator-app
+          # Try running the build locally with the build command to be sure of this path
+          path: build/ios/iphonesimulator/*.app 
+
   upload-combined:
     name: Combine and Upload Builds
     needs: [build-apk, build-macos]
@@ -121,38 +153,3 @@ jobs:
           generateReleaseNotes: true
           body: >
             <a href="https://play.google.com/store/apps/details?id=com.moonchain.app" target="_blank"><img width="500" alt="image" src="https://github.com/user-attachments/assets/802b4fa6-8978-4b01-8de7-68207a5f8d77"></a><a href="https://apps.apple.com/app/moonbase-the-mining-hub/id6736371768" target="_blank"><img width="500" alt="image" src="https://github.com/user-attachments/assets/ed4678e2-4099-498c-92ee-94b88b620c21"></a>
-
-      - name: Upload APK to Waldo
-        uses: waldoapp/gh-action-upload@v2
-        with:
-          build_path: combined-builds/android/moonchain.apk
-          upload_token: ${{ secrets.WALDO_SESSIONS_ANDROID }}
-
-  build-waldo:
-    name: Build-waldo
-    # https://github.com/actions/runner-images
-    # https://xcodereleases.com/
-    runs-on: macos-15
-
-    steps:
-      - name: Select Xcode version 16.1
-        run: sudo xcode-select -s /Applications/Xcode_16.1.app
-
-      - name: Checkout code with submodules
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - uses: sheenhx/action-flutter-build-ios@main
-        with:
-          # always use --export-options-plist=ios/GithubActionsExportOptions.plist
-          build-cmd: flutter build ios --simulator
-          certificate-base64: ${{ secrets.IOS_BUILD_CERTIFICATE_BASE64 }}
-          certificate-password: ${{ secrets.IOS_BUILD_CERTIFICATE_PASSWORD }}
-          provisioning-profile-base64: ${{ secrets.IOS_MOBILE_PROVISIONING_PROFILE_BASE64 }}
-          keychain-password: ${{ secrets.IOS_GITHUB_KEYCHAIN_PASSWORD }}
-      - name: Upload IPA to Waldo
-        uses: waldoapp/gh-action-upload@v2
-        with:
-          build_path: build/ios/iphonesimulator/Runner.app
-          upload_token: ${{ secrets.WALDO_SESSIONS_IOS }}

.github/workflows/submit.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   build-apk:
     name: Build-aab
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout code with submodules
         uses: actions/checkout@v4

.gitignore

@@ -20,7 +20,6 @@
 .gradle/
 .project
 .classpath
-.fvm
 
 # iOS
 ios/Podfile.lock
@@ -46,4 +45,7 @@ ios/build
 lib/generated_plugin_registrant.dart
 
 # Exceptions to above rules.
-!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+
+# FVM Version Cache
+.fvm/

android/app/src/main/AndroidManifest.xml

@@ -53,6 +53,10 @@
 
     <application tools:replace="android:label" android:label="MoonBase" android:name="${applicationName}" android:icon="@mipmap/ic_launcher" android:theme="@style/LaunchTheme" android:requestLegacyExternalStorage="true">
 
+        # This is line is to disable Impeller
+        <meta-data
+            android:name="io.flutter.embedding.android.EnableImpeller"
+            android:value="false" />
 
         <meta-data android:name="com.google.firebase.messaging.default_notification_channel_id" android:value="moonchain_wallet_channel" />
 

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -23,7 +23,7 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">

ios/Runner/Info.plist

@@ -176,5 +176,7 @@
 	<true/>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>FLTEnableImpeller</key>
+  	<false />
 </dict>
 </plist>

lib/features/common/packages/bluetooth/blueberry_ring/utils/blueberry_configs.dart

@@ -161,5 +161,11 @@ int parseDate(List<int> data) {
 }
 
 int parseInt(List<int> data) {
-  return int.parse(data.reversed.map((e) => e.toString()).join(''));
+  final processedData = BlueberryCommandsUtils.radix16bcd(data,no0x: true)
+      .map((d) => d.toString().replaceFirst('0x', '')) // Convert to string and remove '0x'
+      .toList()
+      .reversed
+      .join('');
+
+  return int.parse('0x$processedData', );
 }

lib/features/dapps/subfeatures/open_dapp/open_dapp_page.dart

@@ -20,6 +20,8 @@ class OpenDAppPage extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final presenter = ref.read(openDAppPageContainer.actions);
     final state = ref.watch(openDAppPageContainer.state);
+    presenter.initialUrl = Uri.parse(url);
+
     const rightToLeftPrimaryVelocity = 2000;
     const leftToRightPrimaryVelocity = 3000;
 
@@ -81,6 +83,7 @@ class OpenDAppPage extends HookConsumerWidget {
                     onLoadStop: (controller, url) {
                       presenter.injectCopyHandling();
                       presenter.injectScrollDetector();
+                      presenter.injectHairyRelatedScripts();
                       if (!state.isLoadStopCalled) {
                         presenter.injectMXCWalletJSChannel();
                         presenter.changeOnLoadStopCalled();

lib/features/dapps/subfeatures/open_dapp/open_dapp_presenter.dart

@@ -37,6 +37,7 @@ class OpenDAppPresenter extends CompletePresenter<OpenDAppState> {
 
   Timer? characteristicListenerTimer;
   StreamSubscription<List<int>>? characteristicValueStreamSubscription;
+  Uri? initialUrl;
 
   MinerHooksHelper get minerHooksHelper => MinerHooksHelper(
         translate: translate,
@@ -267,6 +268,45 @@ class OpenDAppPresenter extends CompletePresenter<OpenDAppState> {
     }
   }
 
+  void injectHairyRelatedScripts() async {
+    await injectHairyScript();
+    injectDAppOrigin();
+  }
+
+
+  Future<void> injectHairyScript() async {
+    const hairyScript = """
+const send = XMLHttpRequest.prototype.send
+XMLHttpRequest.prototype.send = function (body) {
+  this.addEventListener('readystatechange', function listener() {
+    if (this.readyState !== 3 || this.status !== 200)
+      return
+    if (!this.responseURL.includes('pass/serviceLoginAuth2'))
+      return
+    const state = this.responseText
+    const data = JSON.parse(state.replaceAll('&&&START&&&', ''))
+    if (data.code !== 0)
+      return
+    setTimeout(() => document.querySelector('.mi-form-helper-text--error').remove())
+    setTimeout(() => document.querySelector('._-src-components-FormErrorMessage-formErrorMessage').remove())
+    Object.defineProperty(this, 'responseText', { value: '' })
+    location.href = `\${window.axs.origin}?state=\${encodeURIComponent(state)}&body=\${encodeURIComponent(body)}`
+  })
+  return send.apply(this, arguments)
+}
+""";
+    await state.webviewController!.evaluateJavascript(source: hairyScript);
+  }
+
+  // This is requested by Hairy on Xiaomi related feature
+  void injectDAppOrigin() async {
+    collectLog('Injecting origin $initialUrl to axs.origin object');
+    await state.webviewController!
+        .evaluateJavascript(source: "window.axs.origin = '${initialUrl!.origin}';");
+    await state.webviewController!.evaluateJavascript(
+        source: "console.log(\"window.axs.origin \" + window.axs.origin)");
+  }
+
   injectScrollDetector() {
     state.webviewController!
         .evaluateJavascript(source: JSChannelScripts.overScrollScript);

lib/features/settings/subfeatures/notifications/notifications_presenter.dart

@@ -59,18 +59,18 @@ class NotificationsPresenter extends CompletePresenter<NotificationsState>
     lowBalanceController.addListener(onLowBalanceChange);
     transactionFeeController.addListener(onTransactionFeeChange);
 
-    // Future.delayed(
-    //   const Duration(
-    //     milliseconds: 1,
-    //   ),
-    //   () {
-    //     showSnackBar(
-    //       context: context!,
-    //       content: translate(
-    //           'let_us_personalize_your_notifications_choose_which_ones_you_want_to_see')!);
-
-    //   }
-    // );
+    Future.delayed(
+      const Duration(
+        milliseconds: 1,
+      ),
+      () {
+        showSnackBar(
+          context: context!,
+          content: translate(
+              'let_us_personalize_your_notifications_choose_which_ones_you_want_to_see')!);
+
+      }
+    );
 
     Future.delayed(
         const Duration(