Skip to content

Feat: Deposit flow UI Update #49

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Oct 8, 2025
Merged

Feat: Deposit flow UI Update #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe17c06
feat: create yields only page for new position
RyanHolanda Oct 6, 2025
1d6cdae
ui: redesign deposit page
RyanHolanda Oct 8, 2025
2b9f73d
fix: update goldens
RyanHolanda Oct 8, 2025
16a7bf5
chore: bump version
RyanHolanda Oct 8, 2025
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
203 changes: 100 additions & 103 deletions lib/app/create/create_page_select_tokens_stage.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,114 +103,111 @@ class _CreatePageState extends State<CreatePageSelectTokensStage> with DeviceInf
alignment: Alignment.topCenter,
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 490),
child: Align(
alignment: Alignment.topLeft,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
ZupPageTitle(S.of(context).createPageTitle),
SizedBox(
height: 58,
child: Text(
S.of(context).createPageDescription,
maxLines: 3,

style: const TextStyle(fontSize: 14, color: ZupColors.gray),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
ZupPageTitle(S.of(context).createPageTitle),
SizedBox(
height: 58,
child: Text(
S.of(context).createPageDescription,
maxLines: 3,

style: const TextStyle(fontSize: 14, color: ZupColors.gray),
),
const SizedBox(height: 20),
SizedBox(
width: double.infinity,
child: Wrap(
runSpacing: 10,
verticalDirection: VerticalDirection.up,
alignment: WrapAlignment.spaceBetween,
children: [
Transform.translate(
offset: const Offset(0, 8),
child: Text(
S.of(context).token0,
style: const TextStyle(fontWeight: FontWeight.w500, fontSize: 14, color: ZupColors.gray),
),
),
const SizedBox(height: 20),
SizedBox(
width: double.infinity,
child: Wrap(
runSpacing: 10,
verticalDirection: VerticalDirection.up,
alignment: WrapAlignment.spaceBetween,
children: [
Transform.translate(
offset: const Offset(0, 8),
child: Text(
S.of(context).token0,
style: const TextStyle(fontWeight: FontWeight.w500, fontSize: 14, color: ZupColors.gray),
),
StatefulBuilder(
builder: (context, localSetState) {
return Row(
mainAxisSize: MainAxisSize.min,
children: [
const ExchangesFilterDropdownButton(),
const SizedBox(width: 10),
Badge(
alignment: const Alignment(1.05, -1.05),
smallSize: cache.getPoolSearchSettings().isDefault ? 0 : 6,
backgroundColor: ZupThemeColors.alert.themed(context.brightness),
child: ZupMiniButton(
key: const Key("pool-search-settings-button"),
onPressed: (buttonContext) => CreatePageSettingsDropdown.show(
buttonContext,
onClose: () {
if (mounted) {
WidgetsBinding.instance.addPostFrameCallback((_) => localSetState(() {}));
}
},
),
title: S.of(context).createPageSelectTokensStageSearchSettings,
icon: Assets.icons.gear.svg(height: 18),
),
StatefulBuilder(
builder: (context, localSetState) {
return Row(
mainAxisSize: MainAxisSize.min,
children: [
const ExchangesFilterDropdownButton(),
const SizedBox(width: 10),
Badge(
alignment: const Alignment(1.05, -1.05),
smallSize: cache.getPoolSearchSettings().isDefault ? 0 : 6,
backgroundColor: ZupThemeColors.alert.themed(context.brightness),
child: ZupMiniButton(
key: const Key("pool-search-settings-button"),
onPressed: (buttonContext) => CreatePageSettingsDropdown.show(
buttonContext,
onClose: () {
if (mounted) {
WidgetsBinding.instance.addPostFrameCallback((_) => localSetState(() {}));
}
},
),
title: S.of(context).createPageSelectTokensStageSearchSettings,
icon: Assets.icons.gear.svg(height: 18),
),
],
);
},
),
],
),
),
const SizedBox(height: 12),
TokenSelectorButton(key: const Key("token-a-selector"), controller: token0SelectorController),
const SizedBox(height: 10),
Text(
S.of(context).token1,
style: const TextStyle(fontWeight: FontWeight.w500, fontSize: 14, color: ZupColors.gray),
),
const SizedBox(height: 5),
TokenSelectorButton(key: const Key("token-b-selector"), controller: token1SelectorController),
const SizedBox(height: 20),
StreamBuilder(
stream: StreamGroup.mergeBroadcast([
token0SelectorController.selectionStream,
token1SelectorController.selectionStream,
]),
builder: (context, _) {
return ZupPrimaryButton(
key: const Key("search-button"),
height: 50,
fixedIcon: true,
alignCenter: true,
title: S.of(context).createPageShowMeTheMoney,
foregroundColor: ZupColors.white,
icon: Assets.icons.sparkleMagnifyingglass.svg(),
onPressed: token0SelectorController.hasSelection && token1SelectorController.hasSelection
? (buttonContext) {
return navigator.navigateToDeposit(
network: appCubit.selectedNetwork,
group0: token0SelectorController.selectedTokenGroup?.id,
group1: token1SelectorController.selectedTokenGroup?.id,
token0: (appCubit.selectedNetwork.isAllNetworks)
? token0SelectorController.selectedToken?.internalId
: token0SelectorController.selectedToken?.addresses[appCubit.currentChainId],
token1: (appCubit.selectedNetwork.isAllNetworks)
? token1SelectorController.selectedToken?.internalId
: token1SelectorController.selectedToken?.addresses[appCubit.currentChainId]!,
);
}
: null,
mainAxisSize: MainAxisSize.max,
);
},
),
],
);
},
),
],
),
],
),
),
const SizedBox(height: 12),
TokenSelectorButton(key: const Key("token-a-selector"), controller: token0SelectorController),
const SizedBox(height: 10),
Text(
S.of(context).token1,
style: const TextStyle(fontWeight: FontWeight.w500, fontSize: 14, color: ZupColors.gray),
),
const SizedBox(height: 5),
TokenSelectorButton(key: const Key("token-b-selector"), controller: token1SelectorController),
const SizedBox(height: 20),
StreamBuilder(
stream: StreamGroup.mergeBroadcast([
token0SelectorController.selectionStream,
token1SelectorController.selectionStream,
]),
builder: (context, _) {
return ZupPrimaryButton(
key: const Key("search-button"),
height: 50,
fixedIcon: true,
alignCenter: true,
title: S.of(context).createPageShowMeTheMoney,
foregroundColor: ZupColors.white,
icon: Assets.icons.sparkleMagnifyingglass.svg(),
onPressed: token0SelectorController.hasSelection && token1SelectorController.hasSelection
? (buttonContext) {
return navigator.navigateToYields(
network: appCubit.selectedNetwork,
group0: token0SelectorController.selectedTokenGroup?.id,
group1: token1SelectorController.selectedTokenGroup?.id,
token0: (appCubit.selectedNetwork.isAllNetworks)
? token0SelectorController.selectedToken?.internalId
: token0SelectorController.selectedToken?.addresses[appCubit.currentChainId],
token1: (appCubit.selectedNetwork.isAllNetworks)
? token1SelectorController.selectedToken?.internalId
: token1SelectorController.selectedToken?.addresses[appCubit.currentChainId]!,
);
}
: null,
mainAxisSize: MainAxisSize.max,
);
},
),
],
),
),
),
Expand Down
Loading