diff --git a/lib/common/config.dart b/lib/common/config.dart index 127203c1..e4225421 100644 --- a/lib/common/config.dart +++ b/lib/common/config.dart @@ -12,10 +12,6 @@ class Config { '0x52f72a3c94a6ffca3f8caf769e14015fd040b0cd'; static const String mxcAddressEthereum = '0x5Ca381bBfb58f0092df149bD3D243b08B9a8386e'; - static const List reloadDapp = [ - "https://erc20.mxc.com", - "https://wannsee-erc20.mxc.com" - ]; static String mainnetMns(String name) => 'https://mns.mxc.com/$name.mxc/register'; diff --git a/lib/features/security/presentation/setup_enable_biometric/setup_enable_biometric_page.dart b/lib/features/security/presentation/setup_enable_biometric/setup_enable_biometric_page.dart index eb83ba03..d71eba26 100644 --- a/lib/features/security/presentation/setup_enable_biometric/setup_enable_biometric_page.dart +++ b/lib/features/security/presentation/setup_enable_biometric/setup_enable_biometric_page.dart @@ -20,27 +20,24 @@ class SetupEnableBiometricPage extends HookConsumerWidget { layout: LayoutType.column, presenter: presenter, useSplashBackground: true, - footer: Padding( - padding: const EdgeInsets.symmetric(horizontal: 24), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - MxcButton.primaryWhite( - key: const ValueKey('useBiometricButton'), - title: FlutterI18n.translate(context, 'use_biometric') - .replaceFirst( - '{0}', - FlutterI18n.translate( - context, presenter.getAppBarTitle())), - onTap: () => presenter.authenticateBiometrics(), - ), - MxcButton.plainWhite( - key: const ValueKey('createPasscodeButton'), - title: FlutterI18n.translate(context, 'create_passcode'), - onTap: () => presenter.createPasscode(), - ), - ], - ), + childrenPadding: const EdgeInsets.symmetric(horizontal: 24), + footer: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + MxcButton.primaryWhite( + key: const ValueKey('useBiometricButton'), + title: FlutterI18n.translate(context, 'use_biometric').replaceFirst( + '{0}', + FlutterI18n.translate(context, presenter.getAppBarTitle()) + .toLowerCase()), + onTap: () => presenter.authenticateBiometrics(), + ), + MxcButton.plainWhite( + key: const ValueKey('createPasscodeButton'), + title: FlutterI18n.translate(context, 'create_passcode'), + onTap: () => presenter.createPasscode(), + ), + ], ), children: [ const SizedBox(height: 75), @@ -58,8 +55,10 @@ class SetupEnableBiometricPage extends HookConsumerWidget { ), Text( FlutterI18n.translate(context, 'use_biometric_or_passcode') - .replaceFirst('{0}', - FlutterI18n.translate(context, presenter.getAppBarTitle())), + .replaceFirst( + '{0}', + FlutterI18n.translate(context, presenter.getAppBarTitle()) + .toLowerCase()), style: FontTheme.of(context).h6.white(), textAlign: TextAlign.center, ), diff --git a/lib/features/security/presentation/setup_enable_biometric/setup_enable_biometric_presenter.dart b/lib/features/security/presentation/setup_enable_biometric/setup_enable_biometric_presenter.dart index 064d9618..4168588b 100644 --- a/lib/features/security/presentation/setup_enable_biometric/setup_enable_biometric_presenter.dart +++ b/lib/features/security/presentation/setup_enable_biometric/setup_enable_biometric_presenter.dart @@ -14,13 +14,13 @@ class SetupEnableBiometricPresenter extends CompletePresenter { SetupEnableBiometricPresenter() : super(null); String getAppBarTitle() => (Platform.isAndroid) - ? 'biometrics' + ? 'fingerprint' : Biometric.iosSystemBiometric == BiometricType.face ? 'face_id' : 'touch_id'; String getSvg() => (Platform.isAndroid) - ? 'assets/svg/security/ic_face_touch_id.svg' + ? 'assets/svg/security/ic_fingerprint.svg' : Biometric.iosSystemBiometric == BiometricType.face ? 'assets/svg/security/ic_biometric.svg' : 'assets/svg/security/ic_touch_id.svg'; diff --git a/packages/shared b/packages/shared index ee3ab1ad..fa47c77f 160000 --- a/packages/shared +++ b/packages/shared @@ -1 +1 @@ -Subproject commit ee3ab1ad39d02231db265d1e38c206c403ddce64 +Subproject commit fa47c77f004e248e94a3f498e793d5805d7e5a6d