From bed815e370fee247169620ebe29d3570a17d2e27 Mon Sep 17 00:00:00 2001
From: Godwin Asuquo <41484542+godilite@users.noreply.github.com>
Date: Wed, 7 Sep 2022 14:58:37 +0300
Subject: [PATCH] update ui bug (#497)
---
lib/src/screens/ionia/cards/ionia_account_cards_page.dart | 1 +
lib/src/screens/ionia/cards/ionia_account_page.dart | 7 +++++--
lib/src/screens/ionia/cards/ionia_buy_gift_card.dart | 2 --
lib/src/screens/ionia/widgets/card_item.dart | 4 +++-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/lib/src/screens/ionia/cards/ionia_account_cards_page.dart b/lib/src/screens/ionia/cards/ionia_account_cards_page.dart
index bcce3bf13..5e566b8c1 100644
--- a/lib/src/screens/ionia/cards/ionia_account_cards_page.dart
+++ b/lib/src/screens/ionia/cards/ionia_account_cards_page.dart
@@ -179,6 +179,7 @@ class _IoniaCardListView extends StatelessWidget {
title: merchant.legalName,
backgroundColor: Theme.of(context).accentTextTheme.display4.backgroundColor.withOpacity(0.1),
discount: 0,
+ hideBorder: true,
discountBackground: AssetImage('assets/images/red_badge_discount.png'),
titleColor: Theme.of(context).accentTextTheme.display4.backgroundColor,
subtitleColor: Theme.of(context).hintColor,
diff --git a/lib/src/screens/ionia/cards/ionia_account_page.dart b/lib/src/screens/ionia/cards/ionia_account_page.dart
index 817f966fa..5d985fd25 100644
--- a/lib/src/screens/ionia/cards/ionia_account_page.dart
+++ b/lib/src/screens/ionia/cards/ionia_account_page.dart
@@ -169,8 +169,11 @@ class _GradiantContainer extends StatelessWidget {
borderRadius: BorderRadius.circular(15),
gradient: LinearGradient(
colors: [
- Theme.of(context).scaffoldBackgroundColor,
- Theme.of(context).accentColor,
+ Theme.of(context)
+ .primaryTextTheme
+ .subhead
+ .decorationColor,
+ Theme.of(context).primaryTextTheme.subhead.color,
],
begin: Alignment.topRight,
end: Alignment.bottomLeft,
diff --git a/lib/src/screens/ionia/cards/ionia_buy_gift_card.dart b/lib/src/screens/ionia/cards/ionia_buy_gift_card.dart
index 015ded0e8..0cd8354ef 100644
--- a/lib/src/screens/ionia/cards/ionia_buy_gift_card.dart
+++ b/lib/src/screens/ionia/cards/ionia_buy_gift_card.dart
@@ -1,4 +1,3 @@
-import 'package:cake_wallet/ionia/ionia_merchant.dart';
import 'package:cake_wallet/routes.dart';
import 'package:cake_wallet/src/screens/base_page.dart';
import 'package:cake_wallet/src/screens/ionia/widgets/card_item.dart';
@@ -8,7 +7,6 @@ import 'package:cake_wallet/src/widgets/primary_button.dart';
import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
import 'package:cake_wallet/themes/theme_base.dart';
import 'package:cake_wallet/view_model/ionia/ionia_buy_card_view_model.dart';
-import 'package:cake_wallet/view_model/ionia/ionia_purchase_merch_view_model.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
diff --git a/lib/src/screens/ionia/widgets/card_item.dart b/lib/src/screens/ionia/widgets/card_item.dart
index a180c2bdd..6c5d3a639 100644
--- a/lib/src/screens/ionia/widgets/card_item.dart
+++ b/lib/src/screens/ionia/widgets/card_item.dart
@@ -8,6 +8,7 @@ class CardItem extends StatelessWidget {
@required this.backgroundColor,
@required this.titleColor,
@required this.subtitleColor,
+ this.hideBorder = false,
this.discountBackground,
this.onTap,
this.logoUrl,
@@ -21,6 +22,7 @@ class CardItem extends StatelessWidget {
final String logoUrl;
final double discount;
final bool isAmount;
+ final bool hideBorder;
final Color backgroundColor;
final Color titleColor;
final Color subtitleColor;
@@ -38,7 +40,7 @@ class CardItem extends StatelessWidget {
decoration: BoxDecoration(
color: backgroundColor,
borderRadius: BorderRadius.circular(20),
- border: Border.all(
+ border: hideBorder ? Border.symmetric(horizontal: BorderSide.none, vertical: BorderSide.none) : Border.all(
color: Colors.white.withOpacity(0.20),
),
),