Update Governance page

libwallet/assets/dcr/consensus.go

@@ -275,10 +275,11 @@ func AllVoteAgendas(chainParams *chaincfg.Params, newestFirst bool) ([]*Agenda,
 		}
 	}
 
-	if newestFirst {
-		sort.Slice(agendas, func(i, j int) bool {
+	sort.Slice(agendas, func(i, j int) bool {
+		if newestFirst {
 			return agendas[i].StartTime > agendas[j].StartTime
-		})
-	}
+		}
+		return agendas[i].StartTime < agendas[j].StartTime
+	})
 	return agendas, nil
 }

libwallet/internal/politeia/politeia.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"strings"
 	"sync"
 
 	"decred.org/dcrwallet/v3/errors"
@@ -90,28 +91,24 @@ func (p *Politeia) saveOrOverwiteProposal(proposal *Proposal) error {
 }
 
 // GetProposalsRaw fetches and returns a proposals from the db
-func (p *Politeia) GetProposalsRaw(category int32, offset, limit int32, newestFirst bool) ([]Proposal, error) {
-	return p.getProposalsRaw(category, offset, limit, newestFirst, false)
+func (p *Politeia) GetProposalsRaw(category int32, offset, limit int32, newestFirst bool, key string) ([]Proposal, error) {
+	return p.getProposalsRaw(category, offset, limit, newestFirst, false, key)
 }
 
-func (p *Politeia) getProposalsRaw(category int32, offset, limit int32, newestFirst bool, skipAbandoned bool) ([]Proposal, error) {
-	var query storm.Query
-	switch category {
-	case ProposalCategoryAll:
-
+func (p *Politeia) getProposalsRaw(category int32, offset, limit int32, newestFirst bool, skipAbandoned bool, searchPhrase string) ([]Proposal, error) {
+	searchPhrase = strings.TrimSpace(strings.ToLower(searchPhrase))
+	matcher := q.Eq("Category", category)
+	if category == ProposalCategoryAll {
 		if skipAbandoned {
-			query = p.db.Select(
-				q.Not(q.Eq("Category", ProposalCategoryAbandoned)),
-			)
+			matcher = q.Not(q.Eq("Category", ProposalCategoryAbandoned))
 		} else {
-			query = p.db.Select(
-				q.True(),
-			)
+			matcher = q.True()
 		}
-	default:
-		query = p.db.Select(
-			q.Eq("Category", category),
-		)
+	}
+
+	query := p.db.Select(matcher)
+	if searchPhrase != "" {
+		query = p.db.Select(matcher, q.Re("Name", "(?i)"+searchPhrase))
 	}
 
 	if offset > 0 {
@@ -139,7 +136,7 @@ func (p *Politeia) getProposalsRaw(category int32, offset, limit int32, newestFi
 
 // GetProposals returns the result of GetProposalsRaw as a JSON string
 func (p *Politeia) GetProposals(category int32, offset, limit int32, newestFirst bool) (string, error) {
-	result, err := p.GetProposalsRaw(category, offset, limit, newestFirst)
+	result, err := p.GetProposalsRaw(category, offset, limit, newestFirst, "")
 	if err != nil {
 		return "", err
 	}

libwallet/internal/politeia/politeia_client.go

@@ -1,6 +1,7 @@
 package politeia
 
 import (
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -18,6 +19,12 @@ type politeiaClient struct {
 	cookies []*http.Cookie
 }
 
+type metadataProposal struct {
+	Name   string `json:"name"`
+	LinkBy int64  `json:"linkby"`
+	LinkTo string `json:"linkto"`
+}
+
 const (
 	ticketVoteAPI       = tkv1.APIRoute
 	proposalDetailsPath = "/proposals/"
@@ -104,6 +111,13 @@ func (c *politeiaClient) batchProposals(tokens []string) ([]Proposal, error) {
 			PublishedAt: proposalRecord.PublishedAt,
 		}
 
+		for _, meta := range proposalRecord.Metadata {
+			if meta.Hint == "proposalmetadata" {
+				proposal.Type = getProposalType(meta.Payload)
+				break
+			}
+		}
+
 		for _, file := range proposalRecord.Files {
 			if file.Name == "index.md" {
 				proposal.IndexFile = file.Payload
@@ -117,6 +131,28 @@ func (c *politeiaClient) batchProposals(tokens []string) ([]Proposal, error) {
 	return proposals, nil
 }
 
+func getProposalType(payload string) ProposalType {
+	decodedBytes, err := base64.StdEncoding.DecodeString(payload)
+	if err != nil {
+		fmt.Println("error decoding proposalmetadata:", err)
+		return ProposalTypeNormal
+	}
+
+	var meta metadataProposal
+	err = json.Unmarshal(decodedBytes, &meta)
+	if err != nil {
+		log.Error("error unmarshalling metadataProposal:", err)
+	}
+
+	if meta.LinkTo != "" {
+		return ProposalTypeRFPSubmission
+	} else if meta.LinkBy != 0 {
+		return ProposalTypeRFPProposal
+	} else {
+		return ProposalTypeNormal
+	}
+}
+
 func (c *politeiaClient) proposalDetails(token string) (*www.ProposalDetailsReply, error) {
 	route := proposalDetailsPath + token
 
@@ -140,6 +176,16 @@ func (c *politeiaClient) tokenInventory() (*www.TokenInventoryReply, error) {
 	return &tokenInventoryReply, nil
 }
 
+func (c *politeiaClient) getInventory() (*www.TokenInventoryReply, error) {
+	var tokenInventoryReply www.TokenInventoryReply
+	err := c.makeRequest(http.MethodGet, apiPath, tkv1.RouteInventory, nil, &tokenInventoryReply)
+	if err != nil {
+		return nil, err
+	}
+
+	return &tokenInventoryReply, nil
+}
+
 func (c *politeiaClient) voteDetails(token string) (*tkv1.DetailsReply, error) {
 	requestBody, err := json.Marshal(&tkv1.Details{Token: token})
 	if err != nil {

libwallet/internal/politeia/politeia_sync.go

@@ -114,7 +114,7 @@ func (p *Politeia) checkForUpdates() error {
 			return p.ctx.Err()
 		}
 
-		proposals, err := p.getProposalsRaw(ProposalCategoryAll, int32(offset), limit, true, true)
+		proposals, err := p.getProposalsRaw(ProposalCategoryAll, int32(offset), limit, true, true, "")
 		if err != nil && err != storm.ErrNotFound {
 			return err
 		}
@@ -132,7 +132,7 @@ func (p *Politeia) checkForUpdates() error {
 	}
 
 	// include abandoned proposals
-	allProposals, err := p.getProposalsRaw(ProposalCategoryAll, 0, 0, true, false)
+	allProposals, err := p.getProposalsRaw(ProposalCategoryAll, 0, 0, true, false, "")
 	if err != nil && err != storm.ErrNotFound {
 		return err
 	}
@@ -333,7 +333,6 @@ func (p *Politeia) fetchBatchProposals(category int32, tokens []string, broadcas
 			if p.ctx.Err() != nil {
 				return p.ctx.Err()
 			}
-
 			proposals[i].Category = category
 			if voteSummary, ok := votesSummaries[proposals[i].Token]; ok {
 				proposals[i].VoteStatus = int32(voteSummary.Status)

libwallet/internal/politeia/types.go

@@ -2,6 +2,14 @@ package politeia
 
 import "github.com/crypto-power/cryptopower/libwallet/utils"
 
+type ProposalType int
+
+const (
+	ProposalTypeNormal ProposalType = iota
+	ProposalTypeRFPProposal
+	ProposalTypeRFPSubmission
+)
+
 type Proposal struct {
 	ID               int    `storm:"id,increment"`
 	Token            string `json:"token" storm:"unique"`
@@ -24,6 +32,7 @@ type Proposal struct {
 	EligibleTickets  int32  `json:"eligibletickets"`
 	QuorumPercentage int32  `json:"quorumpercentage"`
 	PassPercentage   int32  `json:"passpercentage"`
+	Type             ProposalType
 }
 
 type ProposalOverview struct {

libwallet/politeia.go

@@ -41,6 +41,12 @@ const (
 	ProposalCategoryAbandoned = politeia.ProposalCategoryAbandoned
 )
 
+const (
+	ProposalTypeNormal        = politeia.ProposalTypeNormal
+	ProposalTypeRFPProposal   = politeia.ProposalTypeRFPProposal
+	ProposalTypeRFPSubmission = politeia.ProposalTypeRFPSubmission
+)
+
 type Proposal struct {
 	politeia.Proposal
 }

ui/cryptomaterial/dropdown.go

@@ -41,11 +41,12 @@ type DropDown struct {
 	shadow                   *Shadow
 	expandedViewAlignment    layout.Direction
 
-	noSelectedItemText string
-	FontWeight         font.Weight
-	BorderWidth        unit.Dp
-	BorderColor        *color.NRGBA
-	Background         *color.NRGBA
+	noSelectedItem DropDownItem
+
+	FontWeight  font.Weight
+	BorderWidth unit.Dp
+	BorderColor *color.NRGBA
+	Background  *color.NRGBA
 	// SelectedItemIconColor is a custom color that will be applied to the icon
 	// use in identifying selected item when this dropdown is expanded.
 	SelectedItemIconColor        *color.NRGBA
@@ -139,9 +140,9 @@ func (d *DropDown) Selected() string {
 	return d.items[d.SelectedIndex()].Text
 }
 
-func (d *DropDown) ClearSelection(text string) {
+func (d *DropDown) ClearWithSelectedItem(item DropDownItem) {
 	d.selectedIndex = -1
-	d.noSelectedItemText = text
+	d.noSelectedItem = item
 }
 
 func (d *DropDown) SelectedIndex() int {
@@ -247,8 +248,7 @@ func (d *DropDown) collapsedAndExpandedLayout(gtx C) D {
 		return display
 	})}
 
-	// No need to display expanded view when there is only one item.
-	if d.expanded && len(d.items) > 1 {
+	if d.expanded {
 		layoutContents = append(layoutContents, layout.Expanded(func(gtx layout.Context) layout.Dimensions {
 			// Adding d.ExpandedLayoutInset.Top accounts for the the extra
 			// shift in vertical space set by d.ExpandedLayoutInset.Top to
@@ -294,10 +294,7 @@ func (d *DropDown) collapsedLayout(gtx C) D {
 			if len(d.items) > 0 && d.selectedIndex > -1 {
 				selectedItem = d.items[d.selectedIndex]
 			} else {
-				selectedItem = DropDownItem{
-					Text:             d.noSelectedItemText,
-					PreventSelection: true,
-				}
+				selectedItem = d.noSelectedItem
 			}
 
 			bodyLayout := LinearLayout{
@@ -332,8 +329,7 @@ func (d *DropDown) itemLayout(gtx C, index int, clickable *Clickable, item *Drop
 			if item.Icon == nil {
 				return D{}
 			}
-
-			return item.Icon.Layout24dp(gtx)
+			return layout.Inset{Right: values.MarginPadding5}.Layout(gtx, item.Icon.Layout24dp)
 		}),
 		layout.Flexed(1, func(gtx C) D {
 			if item.DisplayFn != nil {
@@ -350,7 +346,7 @@ func (d *DropDown) itemLayout(gtx C, index int, clickable *Clickable, item *Drop
 			})
 		}),
 		layout.Rigid(func(gtx C) D {
-			if !item.PreventSelection && len(d.items) > 1 {
+			if !item.PreventSelection {
 				return d.layoutActiveIcon(gtx, index)
 			}
 			return D{}