Merge pull request #2362 from input-output-hk/anemish/fix-blockly

Fix Blockly, remove account numbers
IntersectMBO · Oct 13, 2020 · 7cf840f · 7cf840f
2 parents f31d858 + dd9c562
commit 7cf840f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/marlowe-playground-client/src/MainFrame.purs b/marlowe-playground-client/src/MainFrame.purs
@@ -247,7 +247,7 @@ handleAction s (SimulationAction action) = do
   toSimulation (Simulation.handleAction s action)
   case action of
     ST.SetBlocklyCode -> do
-      mSource <- HaskellEditor.editorGetValue
+      mSource <- Simulation.editorGetValue
       for_ mSource \source -> void $ query _blocklySlot unit (Blockly.SetCode source unit)
       selectView BlocklyEditor
     ST.GistAction gistAction -> handleGistAction s gistAction

diff --git a/marlowe-playground-client/src/Marlowe/Blockly.purs b/marlowe-playground-client/src/Marlowe/Blockly.purs
@@ -404,13 +404,13 @@ toDefinition blockType@(ActionType DepositActionType) =
   BlockDefinition
     $ merge
         { type: show DepositActionType
-        , message0: "Deposit %1 by %2 the amount of %3 currency %4 into account %5 with owner %6 continue as %7 %8"
+        , message0: "Deposit %1 by %2 the amount of %3 currency %4 into account of %5 %6 continue as %7 %8"
         , args0:
           [ DummyCentre
           , Value { name: "from_party", check: "party", align: Right }
           , Value { name: "value", check: "value", align: Right }
           , Value { name: "token", check: "token", align: Right }
-          , Number { name: "account_number", value: 0.0, min: Nothing, max: Nothing, precision: Nothing }
+          , DummyLeft
           , Value { name: "party", check: "party", align: Right }
           , DummyLeft
           , Statement { name: "contract", check: (show BaseContractType), align: Right }
@@ -465,9 +465,9 @@ toDefinition blockType@(PayeeType AccountPayeeType) =
   BlockDefinition
     $ merge
         { type: show AccountPayeeType
-        , message0: "Account %1 with Owner %2"
+        , message0: "Account of %1 %2"
         , args0:
-          [ Number { name: "account_number", value: 1.0, min: Nothing, max: Nothing, precision: Nothing }
+          [ DummyLeft
           , Value { name: "party", check: "party", align: Right }
           ]
         , colour: blockColour blockType
@@ -563,13 +563,13 @@ toDefinition blockType@(ContractType PayContractType) =
   BlockDefinition
     $ merge
         { type: show PayContractType
-        , message0: "Pay %1 payee %2 the amount of %3 of currency %4 from account %5 with owner %6 continue as %7 %8"
+        , message0: "Pay %1 payee %2 the amount of %3 of currency %4 from account of %5 %6 continue as %7 %8"
         , args0:
           [ DummyCentre
           , Value { name: "payee", check: "payee", align: Right }
           , Value { name: "value", check: "value", align: Right }
           , Value { name: "token", check: "token", align: Right }
-          , Number { name: "account_number", value: 1.0, min: Nothing, max: Nothing, precision: Nothing }
+          , DummyLeft
           , Value { name: "party", check: "party", align: Right }
           , DummyLeft
           , Statement { name: "contract", check: (show BaseContractType), align: Right }
@@ -814,10 +814,10 @@ toDefinition blockType@(ValueType AvailableMoneyValueType) =
   BlockDefinition
     $ merge
         { type: show AvailableMoneyValueType
-        , message0: "Available currency %1 from account %2 %3 owner %4 %5"
+        , message0: "Available currency %1 from account of %2 %3 %4 %5"
         , args0:
           [ Value { name: "token", check: "token", align: Right }
-          , Number { name: "account_number", value: 1.0, min: Nothing, max: Nothing, precision: Nothing }
+          , DummyRight
           , DummyRight
           , Value { name: "party", check: "party", align: Right }
           , DummyRight