Skip to content

Commit

Permalink
Merge pull request #1245 from breez/ubba-date-filter
Browse files Browse the repository at this point in the history
fix issue where date filter not showing
  • Loading branch information
ubbabeck authored Nov 3, 2023
2 parents 031cee2 + 2115a8e commit bc0262e
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ android {
targetSdkVersion 33
multiDexEnabled true
versionCode 1
versionName "0.16.5-beta"
versionName "0.16.6-beta"
}

signingConfigs {
Expand Down
2 changes: 1 addition & 1 deletion ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.16.5</string>
<string>0.16.6</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand Down
50 changes: 25 additions & 25 deletions lib/routes/home/account_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -229,34 +229,34 @@ class _FilterChip extends StatelessWidget {
final accountBloc = AppBlocsProvider.of<AccountBloc>(context);

if (filter.startDate != null && filter.endDate != null) {
return Container();
}

return ClipRRect(
borderRadius: BorderRadius.circular(5),
child: Container(
color: theme.customData[theme.themeId].paymentListBgColor,
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.only(top: 8, left: 16.0, bottom: 8),
child: Chip(
backgroundColor: Theme.of(context).bottomAppBarTheme.color,
label: Text(BreezDateUtils.formatFilterDateRange(
filter.startDate,
filter.endDate,
)),
onDeleted: () => accountBloc.paymentFilterSink.add(
PaymentFilterModel(filter.paymentType, null, null),
return ClipRRect(
borderRadius: BorderRadius.circular(5),
child: Container(
color: theme.customData[theme.themeId].paymentListBgColor,
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.only(top: 8, left: 16.0, bottom: 8),
child: Chip(
backgroundColor: Theme.of(context).bottomAppBarTheme.color,
label: Text(BreezDateUtils.formatFilterDateRange(
filter.startDate,
filter.endDate,
)),
onDeleted: () => accountBloc.paymentFilterSink.add(
PaymentFilterModel(filter.paymentType, null, null),
),
),
),
),
],
],
),
),
),
);
);
} else {
return Container();
}
}
}

Expand Down

0 comments on commit bc0262e

Please sign in to comment.