Skip to content

Commit

Permalink
fix: title loading
Browse files Browse the repository at this point in the history
  • Loading branch information
PhearZero committed Nov 12, 2024
1 parent 159688b commit 76974dd
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 17 deletions.
18 changes: 2 additions & 16 deletions ui/modal/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,36 +90,22 @@ func (m ViewModel) HandleMessage(msg tea.Msg) (*ViewModel, tea.Cmd) {
cmds = append(cmds, cmd)
return &m, tea.Batch(cmds...)
}

m.SetPage(m.Page)
// Only trigger modal commands when they are active
switch m.Page {
case ExceptionModal:
m.exceptionModal, cmd = m.exceptionModal.HandleMessage(msg)
m.title = m.exceptionModal.Title
m.controls = m.exceptionModal.Controls
m.borderColor = m.exceptionModal.BorderColor
case InfoModal:
m.infoModal, cmd = m.infoModal.HandleMessage(msg)
m.title = m.infoModal.Title
m.controls = m.infoModal.Controls
m.borderColor = m.infoModal.BorderColor
case TransactionModal:
m.transactionModal, cmd = m.transactionModal.HandleMessage(msg)
m.title = m.transactionModal.Title
m.controls = m.transactionModal.Controls
m.borderColor = m.transactionModal.BorderColor
case ConfirmModal:
m.confirmModal, cmd = m.confirmModal.HandleMessage(msg)
m.title = m.confirmModal.Title
m.controls = m.confirmModal.Controls
m.borderColor = m.confirmModal.BorderColor
case GenerateModal:
m.generateModal, cmd = m.generateModal.HandleMessage(msg)
m.title = m.generateModal.Title
m.controls = m.generateModal.Controls
m.borderColor = m.generateModal.BorderColor
}
cmds = append(cmds, cmd)

return &m, tea.Batch(cmds...)
}
func (m ViewModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
Expand Down
27 changes: 27 additions & 0 deletions ui/modal/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,33 @@ func (m ViewModel) SetKey(key *api.ParticipationKey) {
m.confirmModal.ActiveKey = key
m.transactionModal.ActiveKey = key
}

func (m *ViewModel) SetPage(page Page) {
m.Page = page
switch page {
case InfoModal:
m.title = m.infoModal.Title
m.controls = m.infoModal.Controls
m.borderColor = m.infoModal.BorderColor
case ConfirmModal:
m.title = m.confirmModal.Title
m.controls = m.confirmModal.Controls
m.borderColor = m.confirmModal.BorderColor
case GenerateModal:
m.title = m.generateModal.Title
m.controls = m.generateModal.Controls
m.borderColor = m.generateModal.BorderColor
case TransactionModal:
m.title = m.transactionModal.Title
m.controls = m.transactionModal.Controls
m.borderColor = m.transactionModal.BorderColor
case ExceptionModal:
m.title = m.exceptionModal.Title
m.controls = m.exceptionModal.Controls
m.borderColor = m.exceptionModal.BorderColor
}
}

func New(parent string, open bool, state *internal.StateModel) *ViewModel {
return &ViewModel{
Parent: parent,
Expand Down
2 changes: 1 addition & 1 deletion ui/viewport.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ func (m ViewportViewModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
if !m.modal.Open {
m.modal.Open = true
m.modal.SetAddress(m.accountsPage.SelectedAccount().Address)
m.modal.Page = modal.GenerateModal
m.modal.SetPage(modal.GenerateModal)
return m, cmd
}

Expand Down

0 comments on commit 76974dd

Please sign in to comment.