update layout and logic for send page

JustinBeBoy · Dec 29, 2023 · 86cf69a · 86cf69a
1 parent c2ef4b1
commit 86cf69a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/ui/cryptomaterial/dropdown.go b/ui/cryptomaterial/dropdown.go
@@ -31,6 +31,7 @@ type DropDown struct {
 	dropdownIcon   *widget.Icon
 	navigationIcon *widget.Icon
 	clickable      *Clickable
+	maxTextLeng    int
 
 	group                    uint
 	closeAllDropdown         func(group uint)
@@ -223,8 +224,15 @@ func (d *DropDown) Reversed() bool {
 	return d.revs
 }
 
+func (d *DropDown) SetMaxTextLeng(leng int) {
+	d.maxTextLeng = leng
+}
+
 func (d *DropDown) Layout(gtx C) D {
 	d.handleEvents()
+	if d.maxTextLeng == 0 {
+		d.maxTextLeng = maxDropdownItemTextLen
+	}
 
 	if d.MakeCollapsedLayoutVisibleWhenExpanded {
 		return d.collapsedAndExpandedLayout(gtx)
@@ -351,8 +359,8 @@ func (d *DropDown) itemLayout(gtx C, index int, clickable *Clickable, item *Drop
 
 			return bodyLayout.Layout2(gtx, func(gtx C) D {
 				lbl := d.theme.Body2(item.Text)
-				if !d.expanded && len(item.Text) > maxDropdownItemTextLen {
-					lbl.Text = item.Text[:maxDropdownItemTextLen-3 /* subtract space for the ellipsis */] + "..."
+				if !d.expanded && len(item.Text) > d.maxTextLeng {
+					lbl.Text = item.Text[:d.maxTextLeng-3 /* subtract space for the ellipsis */] + "..."
 				}
 				lbl.Font.Weight = d.FontWeight
 				lbl.TextSize = d.getTextSize(values.TextSize14)

diff --git a/ui/page/components/fee_rate_selector.go b/ui/page/components/fee_rate_selector.go
@@ -229,6 +229,7 @@ func (fs *FeeRateSelector) UpdatedFeeRate(selectedWallet sharedW.Asset) {
 	fs.fetchedRatesDropDown.ExpandedLayoutInset = layout.Inset{Top: values.MarginPadding35}
 	fs.fetchedRatesDropDown.MakeCollapsedLayoutVisibleWhenExpanded = true
 	fs.fetchedRatesDropDown.Background = &fs.Theme.Color.Gray4
+	fs.fetchedRatesDropDown.SetMaxTextLeng(30)
 }
 
 // OnEditRateCliked is called when the edit feerate button is clicked.

diff --git a/ui/page/send/manual_coin_selection.go b/ui/page/send/manual_coin_selection.go
@@ -278,7 +278,11 @@ func (pg *ManualCoinSelectionPage) HandleUserInteractions() {
 	}
 
 	if pg.fromCoinSelection.Clicked() {
-		pg.ParentNavigator().Display(pg.sendPage)
+		if pg.modalLayout != nil {
+			pg.modalLayout.Dismiss()
+		} else {
+			pg.ParentNavigator().Display(pg.sendPage)
+		}
 	}
 
 	if pg.clearButton.Clicked() {