Use extended identity data for identity update

1 files changed, 8 insertions, 9 deletions

diff --git a/main/State.hs b/main/State.hs
index d357844..150178e 100644
--- a/main/State.hs
+++ b/main/State.hs
@@ -58,9 +58,8 @@ updateSharedIdentity term = updateLocalState_ $ updateSharedState_ $ \case
     Nothing -> throwOtherError "no existing shared identity"
 
 interactiveIdentityUpdate :: (Foldable f, MonadStorage m, MonadIO m, MonadError e m, FromErebosError e) => Terminal -> Identity f -> m UnifiedIdentity
-interactiveIdentityUpdate term identity = do
-    let public = idKeyIdentity identity
-
+interactiveIdentityUpdate term fidentity = do
+    identity <- mergeIdentity fidentity
     name <- liftIO $ do
         setPrompt term $ T.unpack $ T.concat $ concat
             [ [ T.pack "Name" ]
@@ -71,11 +70,11 @@ interactiveIdentityUpdate term identity = do
             ]
         getInputLine term $ KeepPrompt . maybe T.empty T.pack
 
-    if  | T.null name -> mergeIdentity identity
+    if  | T.null name -> return identity
         | otherwise -> do
-            secret <- loadKey public
-            maybe (throwOtherError "created invalid identity") return . validateIdentity =<<
-                mstore =<< sign secret =<< mstore (emptyIdentityData public)
-                { iddPrev = toList $ idDataF identity
-                , iddName = Just name
+            secret <- loadKey $ idKeyIdentity identity
+            maybe (throwOtherError "created invalid identity") return . validateExtendedIdentity =<<
+                mstore =<< sign secret =<< mstore . ExtendedIdentityData =<< return (emptyIdentityExtension $ idData identity)
+                { idePrev = toList $ idExtDataF identity
+                , ideName = Just name
                 }