@@ -132,24 +132,23 @@ class _WalletAddressesViewState extends ConsumerState<WalletAddressesView> {
132132 .findAll ();
133133 }
134134
135- final labels =
136- await MainDB .instance
137- .getAddressLabels (widget.walletId)
138- .filter ()
139- .group (
140- (q) => q
141- .valueContains (term, caseSensitive: false )
142- .or ()
143- .addressStringContains (term, caseSensitive: false )
144- .or ()
145- .group (
146- (q) => q.tagsIsNotNull ().and ().tagsElementContains (
147- term,
148- caseSensitive: false ,
149- ),
150- ),
151- )
152- .findAll ();
135+ final labels = await MainDB .instance
136+ .getAddressLabels (widget.walletId)
137+ .filter ()
138+ .group (
139+ (q) => q
140+ .valueContains (term, caseSensitive: false )
141+ .or ()
142+ .addressStringContains (term, caseSensitive: false )
143+ .or ()
144+ .group (
145+ (q) => q.tagsIsNotNull ().and ().tagsElementContains (
146+ term,
147+ caseSensitive: false ,
148+ ),
149+ ),
150+ )
151+ .findAll ();
153152
154153 if (labels.isEmpty) {
155154 return [];
@@ -226,30 +225,29 @@ class _WalletAddressesViewState extends ConsumerState<WalletAddressesView> {
226225
227226 return ConditionalParent (
228227 condition: ! isDesktop,
229- builder:
230- (child) => Background (
231- child: Scaffold (
232- backgroundColor:
233- Theme .of (context).extension < StackColors > ()! .background,
234- appBar: AppBar (
235- backgroundColor:
236- Theme .of (
237- context,
238- ).extension < StackColors > ()! .backgroundAppBar,
239- leading: AppBarBackButton (
240- onPressed: () {
241- Navigator .of (context).pop ();
242- },
243- ),
244- titleSpacing: 0 ,
245- title: Text (
246- "Wallet addresses" ,
247- style: STextStyles .navBarTitle (context),
248- ),
249- ),
250- body: Padding (padding: const EdgeInsets .all (16 ), child: child),
228+ builder: (child) => Background (
229+ child: Scaffold (
230+ backgroundColor: Theme .of (
231+ context,
232+ ).extension < StackColors > ()! .background,
233+ appBar: AppBar (
234+ backgroundColor: Theme .of (
235+ context,
236+ ).extension < StackColors > ()! .backgroundAppBar,
237+ leading: AppBarBackButton (
238+ onPressed: () {
239+ Navigator .of (context).pop ();
240+ },
241+ ),
242+ titleSpacing: 0 ,
243+ title: Text (
244+ "Wallet addresses" ,
245+ style: STextStyles .navBarTitle (context),
251246 ),
252247 ),
248+ body: Padding (padding: const EdgeInsets .all (16 ), child: child),
249+ ),
250+ ),
253251 child: SafeArea (
254252 child: Column (
255253 children: [
@@ -338,21 +336,20 @@ class _WalletAddressesViewState extends ConsumerState<WalletAddressesView> {
338336 return ListView .separated (
339337 itemCount: snapshot.data! .length,
340338 separatorBuilder: (_, __) => Container (height: 10 ),
341- itemBuilder:
342- (_, index) => AddressCard (
343- walletId: widget.walletId,
344- addressId: snapshot.data! [index],
345- coin: coin,
346- onPressed: () {
347- Navigator .of (context).pushNamed (
348- AddressDetailsView .routeName,
349- arguments: Tuple2 (
350- snapshot.data! [index],
351- widget.walletId,
352- ),
353- );
354- },
355- ),
339+ itemBuilder: (_, index) => AddressCard (
340+ walletId: widget.walletId,
341+ addressId: snapshot.data! [index],
342+ coin: coin,
343+ onPressed: () {
344+ Navigator .of (context).pushNamed (
345+ AddressDetailsView .routeName,
346+ arguments: Tuple2 (
347+ snapshot.data! [index],
348+ widget.walletId,
349+ ),
350+ );
351+ },
352+ ),
356353 );
357354 } else {
358355 return const Center (
0 commit comments