diff --git a/.env b/.env index 59d5fdd..f5b364e 100644 Binary files a/.env and b/.env differ diff --git a/integration_test/scenarios/cert_state.dart b/integration_test/scenarios/cert_state.dart index 01cce73..277c67c 100644 --- a/integration_test/scenarios/cert_state.dart +++ b/integration_test/scenarios/cert_state.dart @@ -1,5 +1,4 @@ import 'package:easy_localization/easy_localization.dart'; -import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:gecko/models/widgets_keys.dart'; import 'package:integration_test/integration_test.dart'; @@ -8,7 +7,7 @@ import '../utility/tests_utility.dart'; void main() async { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); - await dotenv.load(); + // await dotenv.load(); testWidgets('Certifications state', (testerLoc) async { tester = testerLoc; diff --git a/integration_test/scenarios/gecko_complete.dart b/integration_test/scenarios/gecko_complete.dart index ebf1fb2..2502ae2 100644 --- a/integration_test/scenarios/gecko_complete.dart +++ b/integration_test/scenarios/gecko_complete.dart @@ -1,5 +1,4 @@ import 'package:easy_localization/easy_localization.dart'; -import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:gecko/models/widgets_keys.dart'; import 'package:integration_test/integration_test.dart'; @@ -8,7 +7,7 @@ import '../utility/tests_utility.dart'; void main() async { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); - await dotenv.load(); + // await dotenv.load(); testWidgets('Gecko complete', (testerLoc) async { // Share WidgetTester to test provider diff --git a/integration_test/scenarios/identity_revocation.dart b/integration_test/scenarios/identity_revocation.dart index 0d0ddf1..ee3f1a5 100644 --- a/integration_test/scenarios/identity_revocation.dart +++ b/integration_test/scenarios/identity_revocation.dart @@ -1,5 +1,4 @@ import 'package:easy_localization/easy_localization.dart'; -import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:gecko/models/widgets_keys.dart'; import 'package:integration_test/integration_test.dart'; @@ -8,7 +7,7 @@ import '../utility/tests_utility.dart'; void main() async { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); - await dotenv.load(); + // await dotenv.load(); testWidgets('Identity revocation', (testerLoc) async { tester = testerLoc; diff --git a/integration_test/scenarios/migrate_cesium_identity.dart b/integration_test/scenarios/migrate_cesium_identity.dart index e6b436f..8645ef8 100644 --- a/integration_test/scenarios/migrate_cesium_identity.dart +++ b/integration_test/scenarios/migrate_cesium_identity.dart @@ -1,6 +1,5 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:gecko/models/widgets_keys.dart'; import 'package:integration_test/integration_test.dart'; @@ -9,7 +8,7 @@ import '../utility/tests_utility.dart'; void main() async { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); - await dotenv.load(); + // await dotenv.load(); testWidgets('Migrate Cesium identity and balance', (testerLoc) async { tester = testerLoc; diff --git a/integration_test/scenarios/multi_chests.dart b/integration_test/scenarios/multi_chests.dart index ff0e77d..49ab08e 100644 --- a/integration_test/scenarios/multi_chests.dart +++ b/integration_test/scenarios/multi_chests.dart @@ -1,4 +1,3 @@ -import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; import '../utility/general_actions.dart'; @@ -6,7 +5,7 @@ import '../utility/tests_utility.dart'; void main() async { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); - await dotenv.load(); + // await dotenv.load(); testWidgets('Onboarding and multi chest', (testerLoc) async { tester = testerLoc; diff --git a/integration_test/scenarios/ud_creation_state.dart b/integration_test/scenarios/ud_creation_state.dart index f562dae..5adfa62 100644 --- a/integration_test/scenarios/ud_creation_state.dart +++ b/integration_test/scenarios/ud_creation_state.dart @@ -1,4 +1,3 @@ -import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:gecko/models/widgets_keys.dart'; import 'package:integration_test/integration_test.dart'; @@ -7,7 +6,7 @@ import '../utility/tests_utility.dart'; void main() async { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); - await dotenv.load(); + // await dotenv.load(); testWidgets('UDs creation state', (testerLoc) async { tester = testerLoc; diff --git a/integration_test/utility/tests_utility.dart b/integration_test/utility/tests_utility.dart index b089f92..a2875e4 100644 --- a/integration_test/utility/tests_utility.dart +++ b/integration_test/utility/tests_utility.dart @@ -1,8 +1,6 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; - -import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:gecko/globals.dart'; import 'package:gecko/models/wallet_data.dart'; @@ -13,8 +11,9 @@ import 'package:provider/provider.dart'; import 'dart:io' as io; import 'package:gecko/main.dart' as app; -final bool isHumanReading = - dotenv.env['isHumanReading'] == 'true' ? true : false; +const bool isHumanReading = false; +// final bool isHumanReading = +// dotenv.env['isHumanReading'] == 'true' ? true : false; Timeout testTimeout([int seconds = 120]) => Timeout(Duration(seconds: isHumanReading ? 600 : seconds)); final sub = Provider.of(homeContext, listen: false); diff --git a/lib/main.dart b/lib/main.dart index e364d93..6f3147e 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -16,7 +16,6 @@ import 'dart:async'; import 'dart:io'; import 'package:flutter/services.dart'; -import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:gecko/globals.dart'; import 'package:gecko/models/chest_data.dart'; import 'package:gecko/models/g1_wallets_list.dart'; @@ -51,9 +50,9 @@ Future main() async { WidgetsFlutterBinding.ensureInitialized(); await EasyLocalization.ensureInitialized(); - if (kDebugMode) { - await dotenv.load(); - } + // if (kDebugMode) { + // await dotenv.load(); + // } HomeProvider homeProvider = HomeProvider(); // DuniterIndexer _duniterIndexer = DuniterIndexer(); diff --git a/pubspec.lock b/pubspec.lock index 52f540e..3528390 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -77,10 +77,10 @@ packages: dependency: "direct main" description: name: barcode_scan2 - sha256: f9af9252b8f3f5fa446f5456fd45f8871d09f883d8389a1d608b39231bfbc3fa + sha256: "0b0625d27841a21e36e896195d86b2aada335e3c486f63647cce701495718e16" url: "https://pub.dev" source: hosted - version: "4.2.3" + version: "4.2.4" bidi: dependency: transitive description: @@ -205,10 +205,10 @@ packages: dependency: transitive description: name: built_value - sha256: "169565c8ad06adb760c3645bf71f00bff161b00002cace266cad42c5d22a7725" + sha256: "31b7c748fd4b9adf8d25d72a4c4a59ef119f12876cf414f94f8af5131d5fa2b0" url: "https://pub.dev" source: hosted - version: "8.4.3" + version: "8.4.4" carousel_slider: dependency: "direct main" description: @@ -325,18 +325,18 @@ packages: dependency: transitive description: name: dart_code_metrics_presets - sha256: "09cba116b99202b95cacd1e32817dbb1cbfb28e3896f5f60de59b09c63c74078" + sha256: d3c36f97470f478c8432cee163058750db3d167c0a7af9bf291f48dd86c75086 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.1" dart_style: dependency: transitive description: name: dart_style - sha256: "7a03456c3490394c8e7665890333e91ae8a49be43542b616e414449ac358acd4" + sha256: "5be16bf1707658e4c03078d4a9b90208ded217fb02c163e207d334082412f2fb" url: "https://pub.dev" source: hosted - version: "2.2.4" + version: "2.2.5" dbus: dependency: transitive description: @@ -357,10 +357,10 @@ packages: dependency: "direct main" description: name: dio - sha256: "3709d74615bba5e443eb141f6a7f4bcc4788f8fae6f743edadfb79c2a8e6287e" + sha256: "2644a9e0965a7aa3deb09cb8ce4081db4450c178f472818c8cd34216a3070d7b" url: "https://pub.dev" source: hosted - version: "5.0.1" + version: "5.0.2" dots_indicator: dependency: "direct main" description: @@ -532,18 +532,18 @@ packages: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: "4bef634684b2c7f3468c77c766c831229af829a0cd2d4ee6c1b99558bd14e5d2" + sha256: c224ac897bed083dabf11f238dd11a239809b446740be0c2044608c50029ffdf url: "https://pub.dev" source: hosted - version: "2.0.8" + version: "2.0.9" flutter_svg: dependency: "direct main" description: name: flutter_svg - sha256: "97c5b291b4fd34ae4f55d6a4c05841d4d0ed94952e033c5a6529e1b47b4d2a29" + sha256: "017cb37b3e9bee44cc800e35469f295d537484602f02ce6ceb5876236cc7e1fe" url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.0.3" flutter_test: dependency: "direct dev" description: flutter @@ -707,10 +707,10 @@ packages: dependency: transitive description: name: html - sha256: d9793e10dbe0e6c364f4c59bf3e01fb33a9b2a674bc7a1081693dba0614b6269 + sha256: "79d498e6d6761925a34ee5ea8fa6dfef38607781d2fa91e37523474282af55cb" url: "https://pub.dev" source: hosted - version: "0.15.1" + version: "0.15.2" http: dependency: transitive description: @@ -779,34 +779,34 @@ packages: dependency: "direct main" description: name: image_picker - sha256: "22207768556b82d55ec70166824350fee32298732d5efa4d6e756f848f51f66a" + sha256: "64b21d9f0e065f9ab0e4dde458076226c97382cc0c6949144cb874c62bf8e9f8" url: "https://pub.dev" source: hosted - version: "0.8.6+3" + version: "0.8.7" image_picker_android: dependency: transitive description: name: image_picker_android - sha256: "68d067baf7f6e401b1124ee83dd6967e67847314250fd68012aab34a69beb344" + sha256: "1f5a4b38eb742422d89c1a01d9db6077c3c9496f551bc9da74649e338a2b5101" url: "https://pub.dev" source: hosted - version: "0.8.5+7" + version: "0.8.6" image_picker_for_web: dependency: transitive description: name: image_picker_for_web - sha256: "66fc6e3877bbde82c33d122f3588777c3784ac5bd7d1cdd79213ef7aecb85b34" + sha256: "98f50d6b9f294c8ba35e25cc0d13b04bfddd25dbc8d32fa9d566a6572f2c081c" url: "https://pub.dev" source: hosted - version: "2.1.11" + version: "2.1.12" image_picker_ios: dependency: transitive description: name: image_picker_ios - sha256: "39aa70b5f1e5e7c94585b9738632d5fdb764a5655e40cd9e7b95fbd2fc50c519" + sha256: "50e882fe0a06bf0c8f7f5bce78d30975f279213293afc9471dc35f05617c50ff" url: "https://pub.dev" source: hosted - version: "0.8.6+9" + version: "0.8.7+1" image_picker_platform_interface: dependency: transitive description: @@ -1016,26 +1016,26 @@ packages: dependency: transitive description: name: path_provider_android - sha256: "7623b7d4be0f0f7d9a8b5ee6879fc13e4522d4c875ab86801dee4af32b54b83e" + sha256: "019f18c9c10ae370b08dce1f3e3b73bc9f58e7f087bb5e921f06529438ac0ae7" url: "https://pub.dev" source: hosted - version: "2.0.23" + version: "2.0.24" path_provider_foundation: dependency: transitive description: name: path_provider_foundation - sha256: eec003594f19fe2456ea965ae36b3fc967bc5005f508890aafe31fa75e41d972 + sha256: "026b97a6c29da75181a37aae2eba9227f5fe13cb2838c6b975ce209328b8ab4e" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" path_provider_linux: dependency: transitive description: name: path_provider_linux - sha256: "525ad5e07622d19447ad740b1ed5070031f7a5437f44355ae915ff56e986429a" + sha256: "2ae08f2216225427e64ad224a24354221c2c7907e448e6e0e8b57b1eb9f10ad1" url: "https://pub.dev" source: hosted - version: "2.1.9" + version: "2.1.10" path_provider_platform_interface: dependency: transitive description: @@ -1048,10 +1048,10 @@ packages: dependency: transitive description: name: path_provider_windows - sha256: "642ddf65fde5404f83267e8459ddb4556316d3ee6d511ed193357e25caa3632d" + sha256: f53720498d5a543f9607db4b0e997c4b5438884de25b0f73098cc2671a51b130 url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" pdf: dependency: "direct main" description: @@ -1152,7 +1152,7 @@ packages: dependency: "direct main" description: path: "." - ref: gecko-fixes + ref: "2e42824adf778c118248ba559be32208e9d9a650" resolved-ref: "2e42824adf778c118248ba559be32208e9d9a650" url: "https://github.com/poka-IT/sdk.git" source: git @@ -1258,10 +1258,10 @@ packages: dependency: "direct main" description: name: riverpod - sha256: "59a48de9c757aa61aa28e9fd625ffb360d43b6b54606f12536622c55be9e8c4b" + sha256: "7da5a0febdb7fd0e4340f7b7023cb8f17cf7acd405b1e67a0e98bf574085bfa5" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.3.1" rxdart: dependency: transitive description: @@ -1282,26 +1282,26 @@ packages: dependency: transitive description: name: sec - sha256: "78e2ed80b8782fe03496ff3c626d5f6139efbe00c577327c613ad8540ea4b14a" + sha256: "8bbd56df884502192a441b5f5d667265498f2f8728a282beccd9db79e215f379" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.1.0" sentry: dependency: transitive description: name: sentry - sha256: "81c1f32496ff04476d6ddfe5894215b1034d185301d2e3dffd272853392c5ea7" + sha256: a1529c545fcbc899e5dcc7c94ff1c6ad0c334dfc99a3cda366b1da98af7c5678 url: "https://pub.dev" source: hosted - version: "6.20.1" + version: "6.22.0" sentry_flutter: dependency: "direct main" description: name: sentry_flutter - sha256: "5ca2c8d86c220f7ad3109bedceb2c51b0e90bac5218e732be98ea2cba8006461" + sha256: cab07e99a8f27af94f399cabceaff6968011660505b30a0e2286728a81bc476c url: "https://pub.dev" source: hosted - version: "6.20.1" + version: "6.22.0" shared_preferences: dependency: "direct main" description: @@ -1314,26 +1314,26 @@ packages: dependency: transitive description: name: shared_preferences_android - sha256: a51a4f9375097f94df1c6e0a49c0374440d31ab026b59d58a7e7660675879db4 + sha256: ad423a80fe7b4e48b50d6111b3ea1027af0e959e49d485712e134863d9c1c521 url: "https://pub.dev" source: hosted - version: "2.0.16" + version: "2.0.17" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: "6b84fdf06b32bb336f972d373cd38b63734f3461ba56ac2ba01b56d052796259" + sha256: "1e755f8583229f185cfca61b1d80fb2344c9d660e1c69ede5450d8f478fa5310" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - sha256: d7fb71e6e20cd3dfffcc823a28da3539b392e53ed5fc5c2b90b55fdaa8a7e8fa + sha256: "3a59ed10890a8409ad0faad7bb2957dab4b92b8fbe553257b05d30ed8af2c707" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" shared_preferences_platform_interface: dependency: transitive description: @@ -1346,18 +1346,18 @@ packages: dependency: transitive description: name: shared_preferences_web - sha256: "6737b757e49ba93de2a233df229d0b6a87728cea1684da828cbc718b65dcf9d7" + sha256: "0dc2633f215a3d4aa3184c9b2c5766f4711e4e5a6b256e62aafee41f89f1bfb8" url: "https://pub.dev" source: hosted - version: "2.0.5" + version: "2.0.6" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - sha256: bd014168e8484837c39ef21065b78f305810ceabc1d4f90be6e3b392ce81b46d + sha256: "71bcd669bb9cdb6b39f22c4a7728b6d49e934f6cba73157ffa5a54f1eed67436" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" shelf: dependency: transitive description: @@ -1527,34 +1527,34 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: "1f4d9ebe86f333c15d318f81dcdc08b01d45da44af74552608455ebdc08d9732" + sha256: "845530e5e05db5500c1a4c1446785d60cbd8f9bd45e21e7dd643a3273bb4bbd1" url: "https://pub.dev" source: hosted - version: "6.0.24" + version: "6.0.25" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: c9cd648d2f7ab56968e049d4e9116f96a85517f1dd806b96a86ea1018a3a82e5 + sha256: "7ab1e5b646623d6a2537aa59d5d039f90eebef75a7c25e105f6f75de1f7750c3" url: "https://pub.dev" source: hosted - version: "6.1.1" + version: "6.1.2" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: e29039160ab3730e42f3d811dc2a6d5f2864b90a70fb765ea60144b03307f682 + sha256: "206fb8334a700ef7754d6a9ed119e7349bc830448098f21a69bf1b4ed038cabc" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.4" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: "2dddb3291a57b074dade66b5e07e64401dd2487caefd4e9e2f467138d8c7eb06" + sha256: "0ef2b4f97942a16523e51256b799e9aa1843da6c60c55eefbfa9dbc2dcb8331a" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.4" url_launcher_platform_interface: dependency: transitive description: @@ -1567,18 +1567,18 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "574cfbe2390666003c3a1d129bdc4574aaa6728f0c00a4829a81c316de69dd9b" + sha256: "81fe91b6c4f84f222d186a9d23c73157dc4c8e1c71489c4d08be1ad3b228f1aa" url: "https://pub.dev" source: hosted - version: "2.0.15" + version: "2.0.16" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: "97c9067950a0d09cbd93e2e3f0383d1403989362b97102fbf446473a48079a4b" + sha256: a83ba3607a507758669cfafb03f9de09bf6e6280c14d9b9cb18f013e406dcacd url: "https://pub.dev" source: hosted - version: "3.0.4" + version: "3.0.5" uuid: dependency: transitive description: @@ -1591,26 +1591,26 @@ packages: dependency: transitive description: name: vector_graphics - sha256: "254348b40251c995cf8301ac715486c8cfa0a93b7fdc4dbd495a30f04db1fb44" + sha256: "2f317d969a9f1eb59d1890643107da749698b7c08c4b0532fc95c8a7130d2803" url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.3" vector_graphics_codec: dependency: transitive description: name: vector_graphics_codec - sha256: "143c290b762646c696c63be5d976bde7379ea892cb6868ddc5a17cbc56e71411" + sha256: "13cccfda2dd61232a19dfb769b7a907e2ab23aabfebb9053c81e29c6c11b1766" url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.3" vector_graphics_compiler: dependency: transitive description: name: vector_graphics_compiler - sha256: "3190cc26d9ebda686bafb9721bb6a74c6d358700f4fc978a0f2cba6912daff86" + sha256: "524c9889a1327401124fe068840a8867f0d57987c1219a2a696ade629ec2bec3" url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.3" vector_math: dependency: transitive description: @@ -1631,10 +1631,10 @@ packages: dependency: transitive description: name: wallet - sha256: "2133715575991c018e5bafc309adce75c6bbbd39527390604ff1c5e4a41b837c" + sha256: "569c91c2af13a9e1119c001f9c09218eccf3f383eb8d15ba13a5b558010c1bc0" url: "https://pub.dev" source: hosted - version: "0.0.10" + version: "0.0.12+1" watcher: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 9f0296d..826bca3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ description: Pay with G1. # pub.dev using `pub publish`. This is preferred for private packages. publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 0.1.0+55 +version: 0.1.0+56 environment: sdk: '>=2.12.0 <3.0.0' @@ -27,7 +27,7 @@ dependencies: pdf: ^3.7.1 permission_handler: ^10.0.0 pin_code_fields: ^7.4.0 - printing: ^5.9.3 + printing: ^5.10.1 provider: ^6.0.1 barcode_scan2: ^4.2.1 qr_flutter: #^4.0.0 @@ -47,7 +47,8 @@ dependencies: # url: https://github.com/polkawallet-io/sdk.git # ref: develop url: https://github.com/poka-IT/sdk.git - ref: gecko-fixes + # ref: gecko-fixes + ref: 2e42824adf778c118248ba559be32208e9d9a650 dots_indicator: ^2.1.0 connectivity_plus: ^3.0.2 image_cropper: ^3.0.0