status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix rebase conflict

This commit is contained in:
Iuri Matias 2020-05-20 07:54:52 -04:00
parent dafd11fbc0
commit 0a2c8bc86c
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/nim_status_client.nim
View File

@ -70,8 +70,12 @@ proc mainProc() =
var appState = state.newAppState() var appState = state.newAppState()
debug "Application State", title=appState.title debug "Application State", title=appState.title
var accounts = status_test.setupNewAccount() # var accounts = status_test.setupNewAccount()
debug "Accounts", accounts0 = parseJSON(accounts)[0], accounts1 = parseJSON(accounts)[1] # echo "---------"
# echo parseJSON(accounts)[0]
# echo parseJSON(accounts)[1]
# echo "---------"
# discard status_test.setupNewAccount()
events.on("node:ready") do(a: Args): events.on("node:ready") do(a: Args):
status_chat.startMessenger() status_chat.startMessenger()
@ -106,7 +110,7 @@ proc mainProc() =
# discard qmlRegisterSingletonType[LibStatusQml]("im.status.desktop.Status", 1, 0, "Status", initLibStatusQml) # discard qmlRegisterSingletonType[LibStatusQml]("im.status.desktop.Status", 1, 0, "Status", initLibStatusQml)
var profile = profile.newController() var profile = profile.newController()
profile.init(accounts) # TODO: use correct account # profile.init(accounts) # TODO: use correct account
engine.setRootContextProperty("profileModel", profile.variant) engine.setRootContextProperty("profileModel", profile.variant)
signalController.init() signalController.init()

2
src/onboarding.nim
View File

@ -137,7 +137,7 @@ QtObject:
echo "Account saved succesfully" echo "Account saved succesfully"
proc generateRandomAccountAndLogin*(self: Onboarding) {.slot.} = proc generateRandomAccountAndLogin*(self: Onboarding) {.slot.} =
status_test.setupNewAccount() discard status_test.setupNewAccount()
self.events.emit("node:ready", Args()) self.events.emit("node:ready", Args())