Merge pull request #77 from burnable-tech/new-new-create

Don't freak out so much if commPubkey is set twice
team-toast · Sep 20, 2019 · f3578fb · f3578fb
2 parents cddcc2b + ca07072
commit f3578fb
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/docs/404.html b/docs/404.html
@@ -29,6 +29,6 @@
 
 <body>
     <div id='elm'></div>
-<script type="text/javascript" src="/DAIHard/static/js/main-9806d396881bb1e0c476.js"></script></body>
+<script type="text/javascript" src="/DAIHard/static/js/main-f00bf12f5b428b34fa4f.js"></script></body>
 
 </html>
diff --git a/docs/index.html b/docs/index.html
@@ -29,6 +29,6 @@
 
 <body>
     <div id='elm'></div>
-<script type="text/javascript" src="/DAIHard/static/js/main-9806d396881bb1e0c476.js"></script></body>
+<script type="text/javascript" src="/DAIHard/static/js/main-f00bf12f5b428b34fa4f.js"></script></body>
 
 </html>
diff --git a/docs/static/js/main-9806d396881bb1e0c476.js → docs/static/js/main-f00bf12f5b428b34fa4f.js b/docs/static/js/main-9806d396881bb1e0c476.js → docs/static/js/main-f00bf12f5b428b34fa4f.js
diff --git a/src/State.elm b/src/State.elm
@@ -278,6 +278,18 @@ update msg model =
                             , Cmd.none
                             )
 
+                        ( _, Wallet.Active userInfo ) ->
+                            let
+                                _ =
+                                    Debug.log "User pubkey set, but there's already an active userInfo! Overwriting commpubkey." userInfo
+
+                                wallet =
+                                    Wallet.Active
+                                        { userInfo | commPubkey = commPubkey }
+                            in
+                            { model | wallet = wallet }
+                                |> runCmdDown (CmdDown.UpdateWallet wallet)
+
                         ( _, _ ) ->
                             ( model
                                 |> addUserNotice