Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: send asset improvements #131

Merged
merged 3 commits into from
Aug 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/icons/icon_button_internet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class NftItem extends StatelessWidget {
children: [
Padding(
padding: EdgeInsets.only(right: 5.0.s),
child: Assets.images.wallet.walletEth.icon(size: 16.0.s),
child: Assets.images.wallet.walletEth.icon(size: 12.0.s),
),
Padding(
padding: EdgeInsets.only(right: 4.0.s),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ class ConfirmationSheet extends ConsumerWidget {
Button(
label: Text('${locale.button_confirm} - \$351.35'),
mainAxisSize: MainAxisSize.max,
onPressed: () => TransactionResultRoute().go(context),
onPressed: () =>
CoinTransactionResultRoute($extra: CryptoAssetType.coin).go(context),
),
SizedBox(height: 16.0.s),
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:ice/app/components/button/button.dart';
import 'package:ice/app/components/screen_offset/screen_side_offset.dart';
import 'package:ice/app/extensions/extensions.dart';
import 'package:ice/app/features/wallet/components/nft_item/nft_item.dart';
import 'package:ice/app/features/wallet/model/network_type.dart';
import 'package:ice/app/features/wallet/providers/mock_data/wallet_assets_mock_data.dart';
import 'package:ice/app/features/wallet/views/pages/coins_flow/providers/send_asset_form_provider.dart';
Expand All @@ -12,19 +13,22 @@ import 'package:ice/app/router/components/sheet_content/sheet_content.dart';
import 'package:ice/generated/assets.gen.dart';

class TransactionResultSheet extends ConsumerWidget {
const TransactionResultSheet({super.key});
const TransactionResultSheet({super.key, required this.type});

final CryptoAssetType type;

static const networkTypeValues = NetworkType.values;

@override
Widget build(BuildContext context, WidgetRef ref) {
final controller = ref.watch(sendAssetFormControllerProvider(type: type).notifier);
final formData = ref.watch(sendAssetFormControllerProvider(type: type));

final colors = context.theme.appColors;
final textTheme = context.theme.appTextThemes;
final locale = context.i18n;
final icons = Assets.images.icons;

final formData = ref.watch(sendAssetFormControllerProvider());

return SheetContent(
body: ScreenSideOffset.small(
child: Column(
Expand All @@ -43,10 +47,20 @@ class TransactionResultSheet extends ConsumerWidget {
),
),
SizedBox(height: 36.0.s),
if (formData.usdtAmount != null)
if (type == CryptoAssetType.nft)
Padding(
padding: EdgeInsets.symmetric(
horizontal: 52.0.s,
),
child: NftItem(
nftData: formData.selectedNft!,
backgroundColor: Colors.transparent,
),
),
if (type == CryptoAssetType.coin)
TransactionAmountSummary(
usdtAmount: formData.usdtAmount!,
usdAmount: formData.usdtAmount! * 0.999,
usdtAmount: controller.getUsdtAmount(),
usdAmount: controller.getUsdtAmount() * 0.999,
icon: mockedCoinsDataArray[3].iconUrl.icon(),
),
SizedBox(height: 31.0.s),
Expand All @@ -55,7 +69,7 @@ class TransactionResultSheet extends ConsumerWidget {
leadingIcon: icons.iconButtonDetails.icon(),
mainAxisSize: MainAxisSize.max,
onPressed: () {
CoinTransactionDetailsRoute($extra: CryptoAssetType.coin).push<void>(context);
CoinTransactionDetailsRoute($extra: type).push<void>(context);
},
),
SizedBox(height: 12.0.s),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class SendNftConfirmPage extends ConsumerWidget {
context.i18n.button_confirm,
),
onPressed: () {
NftTransactionDetailsRoute($extra: CryptoAssetType.nft).push<void>(context);
CoinTransactionResultRoute($extra: CryptoAssetType.nft).go(context);
},
),
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import 'package:ice/app/features/wallet/components/timeline/timeline.dart';
import 'package:ice/app/features/wallet/providers/mock_data/wallet_assets_mock_data.dart';
import 'package:ice/app/features/wallet/views/pages/coins_flow/providers/send_asset_form_provider.dart';
import 'package:ice/app/features/wallet/views/pages/coins_flow/send_coins/components/confirmation/transaction_amount_summary.dart';
import 'package:ice/app/features/wallet/views/pages/transaction_details/transaction_details_actions.dart';
import 'package:ice/app/router/components/navigation_app_bar/navigation_app_bar.dart';
import 'package:ice/app/router/components/navigation_app_bar/navigation_close_button.dart';
import 'package:ice/app/router/components/sheet_content/sheet_content.dart';
Expand All @@ -25,7 +26,6 @@ class TransactionDetailsPage extends ConsumerWidget {

final controller = ref.watch(sendAssetFormControllerProvider(type: type).notifier);
final formData = ref.watch(sendAssetFormControllerProvider(type: type));
final isNft = type == CryptoAssetType.nft;

return SheetContent(
body: Column(
Expand All @@ -41,7 +41,7 @@ class TransactionDetailsPage extends ConsumerWidget {
padding: EdgeInsets.only(top: 10.0.s),
child: Column(
children: [
if (isNft && formData.selectedNft != null)
if (type == CryptoAssetType.nft)
Padding(
padding: EdgeInsets.symmetric(
horizontal: 52.0.s,
Expand All @@ -51,7 +51,7 @@ class TransactionDetailsPage extends ConsumerWidget {
backgroundColor: Colors.transparent,
),
),
if (!isNft && formData.selectedCoin != null)
if (type == CryptoAssetType.coin)
TransactionAmountSummary(
usdtAmount: controller.getUsdtAmount(),
usdAmount: controller.getUsdtAmount() * 0.999,
Expand Down Expand Up @@ -123,7 +123,12 @@ class TransactionDetailsPage extends ConsumerWidget {
size: 16.0.s,
),
),
SizedBox(height: 12.0.s),
SizedBox(height: 15.0.s),
TransactionDetailsActions(
onViewOnExplorer: () {},
onShare: () {},
),
SizedBox(height: 8.0.s),
],
),
),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import 'package:flutter/material.dart';
import 'package:ice/app/components/button/button.dart';
import 'package:ice/app/extensions/extensions.dart';
import 'package:ice/generated/assets.gen.dart';

class TransactionDetailsActions extends StatelessWidget {
const TransactionDetailsActions({
required this.onViewOnExplorer,
required this.onShare,
super.key,
});

final VoidCallback onViewOnExplorer;
final VoidCallback onShare;

@override
Widget build(BuildContext context) {
return Row(
children: [
Expanded(
child: Button(
type: ButtonType.outlined,
label: Text(
context.i18n.transaction_details_view_on_explorer,
),
mainAxisSize: MainAxisSize.max,
leadingIcon: Assets.images.icons.iconButtonInternet.icon(),
onPressed: onViewOnExplorer,
backgroundColor: context.theme.appColors.tertararyBackground,
borderColor: context.theme.appColors.onTerararyFill,
),
),
SizedBox(
width: 12.0.s,
),
Button.icon(
icon: Assets.images.icons.iconButtonShare.icon(),
type: ButtonType.outlined,
onPressed: onShare,
backgroundColor: context.theme.appColors.tertararyBackground,
borderColor: context.theme.appColors.onTerararyFill,
),
],
);
}
}
21 changes: 17 additions & 4 deletions lib/app/router/wallet_routes.dart
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ class WalletRoutes {
TypedGoRoute<NftsSortingRoute>(path: 'nfts-sorting'),
TypedGoRoute<NftSendFormRoute>(path: 'nft-send'),
TypedGoRoute<SendNftConfirmRoute>(path: 'nft-confirm'),
TypedGoRoute<NftTransactionResultRoute>(path: 'nft-transaction-result'),
TypedGoRoute<NftTransactionDetailsRoute>(path: 'nft-transaction-details'),
],
),
Expand All @@ -76,7 +77,7 @@ class WalletRoutes {
),
],
),
TypedGoRoute<TransactionResultRoute>(path: 'transaction-result'),
TypedGoRoute<CoinTransactionResultRoute>(path: 'coin-transaction-result'),
TypedGoRoute<CoinTransactionDetailsRoute>(path: 'coin-transaction-details'),
];

Expand Down Expand Up @@ -209,12 +210,24 @@ class CoinsSendFormConfirmationRoute extends BaseRouteData {
);
}

class TransactionResultRoute extends BaseRouteData {
TransactionResultRoute()
class CoinTransactionResultRoute extends BaseRouteData {
CoinTransactionResultRoute({required this.$extra})
: super(
child: const TransactionResultSheet(),
child: TransactionResultSheet(type: $extra),
type: IceRouteType.bottomSheet,
);

final CryptoAssetType $extra;
}

class NftTransactionResultRoute extends BaseRouteData {
NftTransactionResultRoute({required this.$extra})
: super(
child: TransactionResultSheet(type: $extra),
type: IceRouteType.bottomSheet,
);

final CryptoAssetType $extra;
}

class CoinsDetailsRoute extends BaseRouteData {
Expand Down
3 changes: 2 additions & 1 deletion lib/l10n/app_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -234,5 +234,6 @@
"send_nft_confirm_network": "Network",
"send_nft_confirm_arrival_time": "Arrival time",
"send_nft_confirm_network_fee": "Network fee",
"transaction_details_title": "Transaction details"
"transaction_details_title": "Transaction details",
"transaction_details_view_on_explorer": "View on explorer"
}
Loading