Merge pull request #256 from Topl/dev

Dev into main

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
  - name: Setup Flutter
  uses: subosito/flutter-action@v2
  with:
- flutter-version: '3.0.1'
+ flutter-version: '3.3.10'
  channel: 'stable'
  - name: Flutter version
  run: flutter --version
@@ -35,7 +35,7 @@ jobs:
  - name: Setup Flutter
  uses: subosito/flutter-action@v2
  with:
- flutter-version: '3.0.1'
+ flutter-version: '3.3.10'
  channel: 'stable'
  - name: Install dependencies
  run: flutter pub get
@@ -54,7 +54,7 @@ jobs:
  - name: Setup Flutter
  uses: subosito/flutter-action@v2
  with:
- flutter-version: '3.0.1'
+ flutter-version: '3.3.10'
  channel: 'stable'
  - name: Install Flutter dependencies
  run: flutter pub get
@@ -79,7 +79,7 @@ jobs:
  - name: Setup Flutter
  uses: subosito/flutter-action@v2
  with:
- flutter-version: '3.0.1'
+ flutter-version: '3.3.10'
  channel: 'stable'
  - name: Install Flutter dependencies
  run: flutter pub get
@@ -106,7 +106,7 @@ jobs:
  - name: Setup Flutter
  uses: subosito/flutter-action@v2
  with:
- flutter-version: '3.0.1'
+ flutter-version: '3.3.10'
  channel: 'stable'
  - name: Install Flutter dependencies
  run: flutter pub get
@@ -121,4 +121,4 @@ jobs:
  uses: actions/upload-artifact@v3
  with:
  name: ribn_chrome_ext.zip
- path: ribn_chrome_ext.zip
+ path: ribn_chrome_ext.zip

.gitignore

@@ -1,14 +1,18 @@
 node_modules/
 dist/
 mock/
+pubspec.lock
 
 # Ignore secrets
-*.jks
 key.properties
 service_account_key.json
 android_keys.zip
 *.p8
 
+
+# Obfuscation related
+app.*.map.json
+
 # Miscellaneous
 *.class
 *.log
@@ -20,37 +24,111 @@ android_keys.zip
 .history
 .svn/
 
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
+
 # 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/
+# Visual Studio Code related
+.classpath
+.project
+.settings/
+.vscode/
+
+# packages file containing multi-root paths
+.packages.generated
 
 # Flutter/Dart/Pub related
 **/doc/api/
-**/ios/Flutter/.last_build_id
 .dart_tool/
 .flutter-plugins
 .flutter-plugins-dependencies
+**/generated_plugin_registrant.dart
 .packages
 .pub-cache/
 .pub/
-/build/
+build/
+flutter_*.png
+linked_*.ds
+unlinked.ds
+unlinked_spec.ds
 
-# Web related
+# Android related
+**/android/**/gradle-wrapper.jar
+.gradle/
+**/android/captures/
+**/android/gradlew
+**/android/gradlew.bat
+**/android/local.properties
+**/android/**/GeneratedPluginRegistrant.java
+**/android/key.properties
+*.jks
 
-# Symbolication related
-app.*.symbols
 
-# Obfuscation related
-app.*.map.json
+# iOS/XCode related
+**/ios/**/*.mode1v3
+**/ios/**/*.mode2v3
+**/ios/**/*.moved-aside
+**/ios/**/*.pbxuser
+**/ios/**/*.perspectivev3
+**/ios/**/*sync/
+**/ios/**/.sconsign.dblite
+**/ios/**/.tags*
+**/ios/**/.vagrant/
+**/ios/**/DerivedData/
+**/ios/**/Icon?
+**/ios/**/Pods/
+**/ios/**/.symlinks/
+**/ios/**/profile
+**/ios/**/xcuserdata
+**/ios/.generated/
+**/ios/Flutter/.last_build_id
+**/ios/Flutter/App.framework
+**/ios/Flutter/Flutter.framework
+**/ios/Flutter/Flutter.podspec
+**/ios/Flutter/Generated.xcconfig
+**/ios/Flutter/ephemeral
+**/ios/Flutter/app.flx
+**/ios/Flutter/app.zip
+**/ios/Flutter/flutter_assets/
+**/ios/Flutter/flutter_export_environment.sh
+**/ios/ServiceDefinitions.json
+**/ios/Runner/GeneratedPluginRegistrant.*
 
-# Android Studio will place build artifacts here
-/android/app/debug
-/android/app/profile
-/android/app/release
+
+# macOS
+**/Flutter/ephemeral/
+**/Pods/
+**/macos/Flutter/GeneratedPluginRegistrant.swift
+**/macos/Flutter/ephemeral
+**/xcuserdata/
+
+# Windows
+**/windows/flutter/generated_plugin_registrant.cc
+**/windows/flutter/generated_plugin_registrant.h
+
+# Linux
+**/linux/flutter/generated_plugin_registrant.cc
+**/linux/flutter/generated_plugin_registrant.h
+
+
+# Coverage
+coverage/
+
+# Symbols
+app.*.symbols
+
+# Exceptions to above rules.
+!**/ios/**/default.mode1v3
+!**/ios/**/default.mode2v3
+!**/ios/**/default.pbxuser
+!**/ios/**/default.perspectivev3
+!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+!/dev/ci/**/Gemfile.lock

.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled.
 
 version:
- revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268
+ revision: 135454af32477f815a7525073027a3ff9eff1bfd
  channel: stable
 
 project_type: app
@@ -13,11 +13,11 @@ project_type: app
 migration:
  platforms:
  - platform: root
- create_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268
- base_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268
+ create_revision: 135454af32477f815a7525073027a3ff9eff1bfd
+ base_revision: 135454af32477f815a7525073027a3ff9eff1bfd
  - platform: macos
- create_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268
- base_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268
+ create_revision: 135454af32477f815a7525073027a3ff9eff1bfd
+ base_revision: 135454af32477f815a7525073027a3ff9eff1bfd
 
  # User provided section
 

Makefile

@@ -47,7 +47,7 @@ format: ## Formats the code
  @echo "╠ Formatting the code"
  @dart format lib .
  @flutter pub run import_sorter:main
- @flutter format lib
+ @dart format .
 
 lint: ## Lints the code
  @echo "╠ Verifying code..."

README.md

@@ -27,6 +27,10 @@ Ribn allows users to:
 * Navigate to and select the directory with path `ribn/build/web/`
 * The app should be loaded and you should be able to open it like you would any other extension 
 
+## Using Test Credentials
+* Change `Line 28` in `main.dart` to: `await Redux.initStore(initTestStore: true);`
+* PW is Topl1234
+* Seed phrase can be found in `test_data.dart`
 
 ## Feature requests and bugs
 Please file feature requests and bugs at the [issue tracker](https://github.com/Topl/ribn/issues). If you want to contribute to this library, please submit a Pull Request.

analysis_options.yaml

@@ -36,49 +36,49 @@ linter:
  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
  # producing the lint.
  rules:
- - annotate_overrides
- - require_trailing_commas
- - avoid_unused_constructor_parameters
- - await_only_futures
- - camel_case_types
- - cancel_subscriptions
- - directives_ordering
- - empty_catches
- - empty_statements
- - hash_and_equals
- - iterable_contains_unrelated_type
- - list_remove_unrelated_type
- - no_adjacent_strings_in_list
- - no_duplicate_case_values
- - non_constant_identifier_names
- - only_throw_errors
- - overridden_fields
- - prefer_collection_literals
- - prefer_conditional_assignment
- - prefer_contains
- - prefer_final_fields
- - prefer_final_locals
- - prefer_initializing_formals
- - prefer_interpolation_to_compose_strings
- - prefer_is_empty
- - prefer_is_not_empty
- - prefer_single_quotes
- - prefer_typing_uninitialized_variables
- - recursive_getters
- - slash_for_doc_comments
- - test_types_in_equals
- - throw_in_finally
- - type_init_formals
- - unawaited_futures
- - unnecessary_brace_in_string_interps
- - unnecessary_getters_setters
- - unnecessary_lambdas
- - unnecessary_new
- - unnecessary_null_aware_assignments
- - unnecessary_statements
- - unnecessary_this
- - unrelated_type_equality_checks
- - use_rethrow_when_possible
- - valid_regexps
+ annotate_overrides
+ require_trailing_commas:true
+ avoid_unused_constructor_parameters:true
+ await_only_futures:true
+ camel_case_types:true
+ cancel_subscriptions:true
+ directives_ordering:true
+ empty_catches:true
+ empty_statements:true
+ hash_and_equals:true
+ iterable_contains_unrelated_type:true
+ list_remove_unrelated_type:true
+ no_adjacent_strings_in_list:true
+ no_duplicate_case_values:true
+ non_constant_identifier_names:true
+ only_throw_errors:true
+ overridden_fields:true
+ prefer_collection_literals:true
+ prefer_conditional_assignment:true
+ prefer_contains:true
+ prefer_final_fields:true
+ prefer_final_locals:true
+ prefer_initializing_formals:true
+ prefer_interpolation_to_compose_strings:true
+ prefer_is_empty:true
+ prefer_is_not_empty:true
+ prefer_single_quotes:true
+ prefer_typing_uninitialized_variables:true
+ recursive_getters:true
+ slash_for_doc_comments:true
+ test_types_in_equals:true
+ throw_in_finally:true
+ type_init_formals:true
+ unawaited_futures:true
+ unnecessary_brace_in_string_interps:true
+ unnecessary_getters_setters:true
+ unnecessary_lambdas:true
+ unnecessary_new:true
+ unnecessary_null_aware_assignments:true
+ unnecessary_statements:true
+ unnecessary_this:true
+ unrelated_type_equality_checks:true
+ use_rethrow_when_possible:true
+ valid_regexps:true
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options

android/app/build.gradle

@@ -33,7 +33,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 
 android {
- compileSdkVersion 32
+ compileSdkVersion 33
 
  compileOptions {
  sourceCompatibility JavaVersion.VERSION_1_8
@@ -71,6 +71,7 @@ android {
  signingConfig signingConfigs.release
  }
  }
+ namespace 'co.topl.ribn'
 }
 
 flutter {

android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="co.topl.ribn">
+  package="co.topl.ribn">
  <!-- Flutter needs it to communicate with the running application
  to allow setting breakpoints, to provide hot reload, etc.
  -->

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="co.topl.ribn">
+  package="co.topl.ribn">
  <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
  <uses-permission android:name="android.permission.INTERNET"/>
  <application

android/app/src/profile/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="co.topl.ribn">
+  package="co.topl.ribn">
  <!-- Flutter needs it to communicate with the running application
  to allow setting breakpoints, to provide hot reload, etc.
  -->

android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
  }
 
  dependencies {
- classpath 'com.android.tools.build:gradle:4.1.0'
+ classpath 'com.android.tools.build:gradle:7.2.0'
  classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
  }
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -4,4 +4,4 @@ distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 # https://docs.gradle.org/current/userguide/compatibility.html
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip