mirror of
https://github.com/cypherstack/stack_wallet.git
synced 2024-11-17 09:47:37 +00:00
Fix merge conflicts with staging
This commit is contained in:
parent
d387fcc7b9
commit
45af21dc27
6 changed files with 8 additions and 1 deletions
|
@ -196,6 +196,7 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
|
|||
|
||||
case Coin.nano:
|
||||
case Coin.banano:
|
||||
case Coin.tezos:
|
||||
//TODO: check network/node
|
||||
}
|
||||
|
||||
|
|
|
@ -172,6 +172,7 @@ class _NodeDetailsViewState extends ConsumerState<NodeDetailsView> {
|
|||
|
||||
case Coin.nano:
|
||||
case Coin.banano:
|
||||
case Coin.tezos:
|
||||
//TODO: check network/node
|
||||
}
|
||||
|
||||
|
|
|
@ -336,7 +336,8 @@ class TezosWallet extends CoinServiceAPI with WalletCache, WalletDB {
|
|||
otherData: "",
|
||||
inputs: [],
|
||||
outputs: [],
|
||||
nonce: 0
|
||||
nonce: 0,
|
||||
numberOfMessages: null,
|
||||
);
|
||||
var theAddress = Address(
|
||||
walletId: walletId,
|
||||
|
|
|
@ -50,6 +50,7 @@ enum AmountUnit {
|
|||
case Coin.dogecoin:
|
||||
case Coin.eCash:
|
||||
case Coin.epicCash:
|
||||
case Coin.tezos:
|
||||
return AmountUnit.values.sublist(0, 4);
|
||||
|
||||
case Coin.monero:
|
||||
|
@ -62,6 +63,7 @@ enum AmountUnit {
|
|||
case Coin.nano:
|
||||
case Coin.banano:
|
||||
return AmountUnit.values;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -194,6 +194,7 @@ class _NodeCardState extends ConsumerState<NodeCard> {
|
|||
|
||||
case Coin.nano:
|
||||
case Coin.banano:
|
||||
case Coin.tezos:
|
||||
//TODO: check network/node
|
||||
}
|
||||
|
||||
|
|
|
@ -177,6 +177,7 @@ class NodeOptionsSheet extends ConsumerWidget {
|
|||
|
||||
case Coin.nano:
|
||||
case Coin.banano:
|
||||
case Coin.tezos:
|
||||
//TODO: check network/node
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue