fix cesium account import
This commit is contained in:
parent
ad601be19c
commit
92992c2f69
|
@ -178,7 +178,7 @@
|
||||||
"removeContact": "Supprimer\nce contact",
|
"removeContact": "Supprimer\nce contact",
|
||||||
"derivationsScanProgress": "Scan de l'adresse {}/{}",
|
"derivationsScanProgress": "Scan de l'adresse {}/{}",
|
||||||
"youAreOffline": "Vous êtes hors ligne...",
|
"youAreOffline": "Vous êtes hors ligne...",
|
||||||
"importG1v1": "Importer son compte G1v1",
|
"importG1v1": "Importer un ancien compte G1v1",
|
||||||
"selectDestWallet": "Sélectionnez un portefeuille cible:",
|
"selectDestWallet": "Sélectionnez un portefeuille cible:",
|
||||||
"youMustWaitBeforeCashoutThisAccount": "Vous devez attendre {} minutes\navant de pouvoir migrer ce compte",
|
"youMustWaitBeforeCashoutThisAccount": "Vous devez attendre {} minutes\navant de pouvoir migrer ce compte",
|
||||||
"thisAccountIsEmpty": "Ce compte est vide",
|
"thisAccountIsEmpty": "Ce compte est vide",
|
||||||
|
|
|
@ -60,7 +60,25 @@ class ImportG1v1 extends StatelessWidget {
|
||||||
builder: (BuildContext context, AsyncSnapshot<List> status) {
|
builder: (BuildContext context, AsyncSnapshot<List> status) {
|
||||||
// log.d(_certs.data);
|
// log.d(_certs.data);
|
||||||
|
|
||||||
final Map balance = status.data?[0] ?? 0;
|
if (status.data == null) {
|
||||||
|
return Column(children: [
|
||||||
|
const SizedBox(height: 80),
|
||||||
|
Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
children: [
|
||||||
|
SizedBox(
|
||||||
|
height: 35,
|
||||||
|
width: 35,
|
||||||
|
child: CircularProgressIndicator(
|
||||||
|
color: orangeC,
|
||||||
|
strokeWidth: 4,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
final Map balance = status.data?[0] ?? {};
|
||||||
final String idtyStatus = status.data?[1];
|
final String idtyStatus = status.data?[1];
|
||||||
final String myIdtyStatus = status.data?[2];
|
final String myIdtyStatus = status.data?[2];
|
||||||
final bool hasConsumer = status.data?[3] ?? false;
|
final bool hasConsumer = status.data?[3] ?? false;
|
||||||
|
@ -154,16 +172,16 @@ class ImportG1v1 extends StatelessWidget {
|
||||||
),
|
),
|
||||||
const SizedBox(height: 20),
|
const SizedBox(height: 20),
|
||||||
Text(
|
Text(
|
||||||
sub.g1V1NewAddress,
|
getShortPubkey(sub.g1V1NewAddress),
|
||||||
style: const TextStyle(
|
style: const TextStyle(
|
||||||
fontSize: 14.0,
|
fontSize: 18,
|
||||||
color: Colors.black,
|
color: Colors.black,
|
||||||
fontWeight: FontWeight.bold,
|
fontWeight: FontWeight.bold,
|
||||||
fontFamily: 'Monospace'),
|
fontFamily: 'Monospace'),
|
||||||
),
|
),
|
||||||
const SizedBox(height: 20),
|
const SizedBox(height: 20),
|
||||||
Text(
|
Text(
|
||||||
'$balance $currencyName',
|
'${balance['transferableBalance']} $currencyName',
|
||||||
style: const TextStyle(fontSize: 17),
|
style: const TextStyle(fontSize: 17),
|
||||||
),
|
),
|
||||||
Row(
|
Row(
|
||||||
|
@ -240,8 +258,10 @@ class ImportG1v1 extends StatelessWidget {
|
||||||
MaterialPageRoute(builder: (context) {
|
MaterialPageRoute(builder: (context) {
|
||||||
return TransactionInProgress(
|
return TransactionInProgress(
|
||||||
transType: 'identityMigration',
|
transType: 'identityMigration',
|
||||||
fromAddress: sub.g1V1NewAddress,
|
fromAddress:
|
||||||
toAddress: selectedWallet.address);
|
getShortPubkey(sub.g1V1NewAddress),
|
||||||
|
toAddress: getShortPubkey(
|
||||||
|
selectedWallet.address!));
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
resetScreen(context);
|
resetScreen(context);
|
||||||
|
|
|
@ -223,8 +223,9 @@ class MigrateIdentityScreen extends StatelessWidget {
|
||||||
MaterialPageRoute(builder: (context) {
|
MaterialPageRoute(builder: (context) {
|
||||||
return TransactionInProgress(
|
return TransactionInProgress(
|
||||||
transType: 'identityMigration',
|
transType: 'identityMigration',
|
||||||
fromAddress: fromAddress,
|
fromAddress: getShortPubkey(fromAddress),
|
||||||
toAddress: selectedWallet.address);
|
toAddress: getShortPubkey(
|
||||||
|
selectedWallet.address!));
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -78,28 +78,6 @@ class WalletsHome extends StatelessWidget {
|
||||||
BuildContext context, MyWalletsProvider myWalletProvider) {
|
BuildContext context, MyWalletsProvider myWalletProvider) {
|
||||||
return Column(children: [
|
return Column(children: [
|
||||||
const SizedBox(height: 50),
|
const SizedBox(height: 50),
|
||||||
InkWell(
|
|
||||||
key: const Key('importG1v1'),
|
|
||||||
onTap: () {
|
|
||||||
Navigator.push(
|
|
||||||
context,
|
|
||||||
MaterialPageRoute(builder: (context) {
|
|
||||||
return const ImportG1v1();
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
child: SizedBox(
|
|
||||||
width: 400,
|
|
||||||
height: 50,
|
|
||||||
child: Center(
|
|
||||||
child: Text('importG1v1'.tr(),
|
|
||||||
style: TextStyle(
|
|
||||||
fontSize: 22,
|
|
||||||
color: orangeC,
|
|
||||||
fontWeight: FontWeight.w500))),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(height: 30),
|
|
||||||
SizedBox(
|
SizedBox(
|
||||||
height: 80,
|
height: 80,
|
||||||
width: 420,
|
width: 420,
|
||||||
|
@ -129,6 +107,28 @@ class WalletsHome extends StatelessWidget {
|
||||||
),
|
),
|
||||||
)),
|
)),
|
||||||
const SizedBox(height: 30),
|
const SizedBox(height: 30),
|
||||||
|
InkWell(
|
||||||
|
key: const Key('importG1v1'),
|
||||||
|
onTap: () {
|
||||||
|
Navigator.push(
|
||||||
|
context,
|
||||||
|
MaterialPageRoute(builder: (context) {
|
||||||
|
return const ImportG1v1();
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
child: SizedBox(
|
||||||
|
width: 400,
|
||||||
|
height: 60,
|
||||||
|
child: Center(
|
||||||
|
child: Text('importG1v1'.tr(),
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 22,
|
||||||
|
color: Colors.blue[900],
|
||||||
|
fontWeight: FontWeight.w500))),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 5),
|
||||||
InkWell(
|
InkWell(
|
||||||
key: const Key('changeChest'),
|
key: const Key('changeChest'),
|
||||||
onTap: () {
|
onTap: () {
|
||||||
|
@ -141,7 +141,7 @@ class WalletsHome extends StatelessWidget {
|
||||||
},
|
},
|
||||||
child: SizedBox(
|
child: SizedBox(
|
||||||
width: 400,
|
width: 400,
|
||||||
height: 50,
|
height: 60,
|
||||||
child: Center(
|
child: Center(
|
||||||
child: Text('changeChest'.tr(),
|
child: Text('changeChest'.tr(),
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
|
|
|
@ -5,7 +5,7 @@ description: Pay with G1.
|
||||||
# pub.dev using `pub publish`. This is preferred for private packages.
|
# 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
|
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
|
||||||
|
|
||||||
version: 0.0.9+23
|
version: 0.0.9+24
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: '>=2.12.0 <3.0.0'
|
sdk: '>=2.12.0 <3.0.0'
|
||||||
|
|
Loading…
Reference in New Issue