@gamelearn/arcade-components 1.3.4 → 1.3.5-hotfix-login-GAT-4291

package/dist/components/cards-selector-puzzle-component/components/CardsSelectorPuzzleComponent.js

@@ -46,7 +46,7 @@ var CardsSelectorPuzzleComponent = function CardsSelectorPuzzleComponent(_ref) {
       disableExit = _ref.disableExit,
       setResolveAction = _ref.setResolveAction,
       soundActions = _ref.soundActions,
-      setShowPoints = _ref.setShowPoints;
+      backgroundImage = _ref.backgroundImage;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -100,8 +100,13 @@ var CardsSelectorPuzzleComponent = function CardsSelectorPuzzleComponent(_ref) {
       type: 'hidePuzzleButtons',
       payload: false
     });
-    setShowPoints(rewardsData);
-  }, [emitEvent, setShowPoints]);
+    emitEvent({
+      type: 'addPoints',
+      complex: true,
+      finish: true,
+      payload: rewardsData
+    });
+  }, [emitEvent]);
 
   var _endPuzzle = function endPuzzle() {
     emitEvent({
@@ -142,6 +147,8 @@ var CardsSelectorPuzzleComponent = function CardsSelectorPuzzleComponent(_ref) {
         payload: false
       });
     }
+
+    setFeedBackText('');
   };
 
   var _handleError = function handleError() {
@@ -187,9 +194,14 @@ var CardsSelectorPuzzleComponent = function CardsSelectorPuzzleComponent(_ref) {
         closeFeedbackAndShowPoints(rewardsData);
       }, 2000);
     });
-  }, [setResolveAction, disableExit, accRewards, info.resolve.rewards, emitEvent, setShowPoints, closeFeedbackAndShowPoints]);
+  }, [setResolveAction, disableExit, accRewards, info.resolve.rewards, emitEvent, closeFeedbackAndShowPoints]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
-    className: "cards-selector"
+    className: "cards-selector",
+    style: backgroundImage !== null && backgroundImage !== void 0 && backgroundImage.url ? {
+      backgroundImage: "url(".concat(backgroundImage.url, ")"),
+      backgroundRepeat: 'no-repeat',
+      backgroundSize: 'cover'
+    } : {}
   }, /*#__PURE__*/_react.default.createElement(_Board.default, {
     setCurrentOrder: setCurrentOrder,
     currentOrder: currentOrder,
@@ -214,7 +226,10 @@ var CardsSelectorPuzzleComponent = function CardsSelectorPuzzleComponent(_ref) {
 
 CardsSelectorPuzzleComponent.defaultProps = {
   cards: [],
-  info: {}
+  info: {},
+  backgroundImage: {
+    url: ''
+  }
 };
 var _default = CardsSelectorPuzzleComponent;
 exports.default = _default;

package/dist/components/cards-selector-puzzle-component/mocks/mockForStory.js

@@ -3,15 +3,19 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.mockProps4 = exports.mockProps3 = exports.mockProps2 = exports.mockProps = void 0;
+exports.mockProps5 = exports.mockProps4 = exports.mockProps3 = exports.mockProps2 = exports.mockProps = void 0;
 
 var _mocker = require("helpers/mocker");
 
-/* eslint-disable max-len */
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 var mockProps = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   disableExit: function disableExit() {},
   setResolveAction: function setResolveAction() {},
   cards: [{
@@ -88,7 +92,6 @@ exports.mockProps = mockProps;
 var mockProps2 = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   disableExit: function disableExit() {},
   setResolveAction: function setResolveAction() {},
   cards: [{
@@ -165,7 +168,6 @@ exports.mockProps2 = mockProps2;
 var mockProps3 = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   disableExit: function disableExit() {},
   setResolveAction: function setResolveAction() {},
   cards: [{
@@ -270,7 +272,6 @@ exports.mockProps3 = mockProps3;
 var mockProps4 = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   disableExit: function disableExit() {},
   setResolveAction: function setResolveAction() {},
   cards: [{
@@ -343,4 +344,12 @@ var mockProps4 = {
     }
   }
 };
-exports.mockProps4 = mockProps4;
+exports.mockProps4 = mockProps4;
+
+var mockProps5 = _objectSpread(_objectSpread({}, mockProps), {}, {
+  backgroundImage: {
+    url: 'https://i.imgur.com/DTFfovW.jpeg'
+  }
+});
+
+exports.mockProps5 = mockProps5;

package/dist/components/chained-image-click-puzzle-component/components/ChainedImageClickPuzzleComponent.js

@@ -38,8 +38,7 @@ var ChainedImageClickPuzzleComponent = function ChainedImageClickPuzzleComponent
       soundActions = props.soundActions,
       showFrames = props.showFrames,
       disableExit = props.disableExit,
-      setResolveAction = props.setResolveAction,
-      setShowPoints = props.setShowPoints;
+      setResolveAction = props.setResolveAction;
 
   var _useState = (0, _react.useState)(0),
       _useState2 = _slicedToArray(_useState, 2),
@@ -56,8 +55,7 @@ var ChainedImageClickPuzzleComponent = function ChainedImageClickPuzzleComponent
     soundActions: soundActions,
     setInfo: setInfo,
     setSelected: setSelected,
-    selected: selected,
-    setShowPoints: setShowPoints
+    selected: selected
   };
   var totalCorrects = list.reduce(function (acc, current) {
     return acc + current.areas.length;

package/dist/components/chained-image-click-puzzle-component/components/CurrentImagePuzzle.js

@@ -55,8 +55,7 @@ var CurrentImageClickPuzzle = function CurrentImageClickPuzzle(_ref) {
       setResolveAction = _ref.setResolveAction,
       soundActions = _ref.soundActions,
       setSelected = _ref.setSelected,
-      selected = _ref.selected,
-      setShowPoints = _ref.setShowPoints;
+      selected = _ref.selected;
   var accRewards = (0, _react.useRef)([]);
   var correctClicked = (0, _react.useRef)(0);
 
@@ -87,8 +86,13 @@ var CurrentImageClickPuzzle = function CurrentImageClickPuzzle(_ref) {
       type: 'hidePuzzleButtons',
       payload: false
     });
-    setShowPoints([].concat(_toConsumableArray(accRewards.current), _toConsumableArray(rewards)));
-  }, [playSound, emitEvent, setShowPoints]);
+    emitEvent({
+      type: 'addPoints',
+      complex: true,
+      finish: true,
+      payload: [].concat(_toConsumableArray(accRewards.current), _toConsumableArray(rewards))
+    });
+  }, [playSound, emitEvent]);
   var currentImageProps = list[index];
   var info = currentImageProps.info,
       specificFeedbacks = currentImageProps.specificFeedbacks;

package/dist/components/chained-image-click-puzzle-component/mocks/mockForStory.js

@@ -13,7 +13,6 @@ var mockProps = {
   description: 'Dale al arma',
   showFrames: true,
   setInfo: function setInfo() {},
-  setShowPoints: _mocker.setShowPoints,
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
   disableExit: function disableExit() {},
@@ -170,7 +169,6 @@ var mockProps2 = {
   soundActions: _mocker.soundActions,
   disableExit: function disableExit() {},
   setResolveAction: function setResolveAction() {},
-  setShowPoints: _mocker.setShowPoints,
   list: [{
     info: {
       hint: {

package/dist/components/comic-component/mocks/mockForStory.js

@@ -11,7 +11,6 @@ var _mocker = require("helpers/mocker");
 var comicProps = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   slides: [{
     slideOrder: 1,
     transitionEffects: null,

package/dist/components/conversational-pro-component/components/ConversationalProComponent.js

@@ -43,7 +43,6 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-// Remove emitRef after sounds fix
 var ConversationProViewer = function ConversationProViewer(_ref) {
   var _background$img, _currentLineData$slot;
 
@@ -75,13 +74,12 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
   var voiceOver = currentLineData.voiceOver,
       decision = currentLineData.decision;
   var isFlex = currentLineData.flex;
-  var emitRef = (0, _react.useRef)(emitEvent);
   var translate = (0, _react.useCallback)(function (id) {
-    return emitRef.current({
+    return emitEvent({
       type: 'translate',
       payload: id
     });
-  }, []);
+  }, [emitEvent]);
   var getCurrentMessage = (0, _react.useCallback)(function () {
     if (voiceOver) {
       return currentLineData;
@@ -144,14 +142,14 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
             }
 
             _context.next = 5;
-            return emitRef.current({
-              type: 'playSpeech',
+            return emitEvent({
+              type: 'getSpeech',
               payload: payload
             });
 
           case 5:
             url = _context.sent;
-            playSound(url);
+            playSound(url, 'tts');
 
           case 7:
           case "end":
@@ -159,7 +157,7 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
         }
       }
     }, _callee);
-  })), [currentLineData.voice, currentMessage, getVoice, playSound]); // Recupera la antigua linea de la conversacion para conservar los personajes en voice-over
+  })), [currentLineData.voice, currentMessage, emitEvent, getVoice, playSound]); // Recupera la antigua linea de la conversacion para conservar los personajes en voice-over
 
   var leftWithSlots = lines.slice(0, currentLine + 1).reverse().find(function (line) {
     return line.slots;
@@ -245,7 +243,7 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
       setCurrentLine(line + 1);
     } else {
       setFinished(true);
-      emitRef.current({
+      emitEvent({
         type: 'success'
       });
     }
@@ -267,17 +265,22 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
     } else if (currentLineData !== null && currentLineData !== void 0 && (_currentLineData$audi = currentLineData.audio) !== null && _currentLineData$audi !== void 0 && _currentLineData$audi.url) {
       var _currentLineData$audi2;
 
-      playSound(currentLineData === null || currentLineData === void 0 ? void 0 : (_currentLineData$audi2 = currentLineData.audio) === null || _currentLineData$audi2 === void 0 ? void 0 : _currentLineData$audi2.url);
+      playSound(currentLineData === null || currentLineData === void 0 ? void 0 : (_currentLineData$audi2 = currentLineData.audio) === null || _currentLineData$audi2 === void 0 ? void 0 : _currentLineData$audi2.url, 'tts');
     }
 
     return function () {
-      stop();
+      stop('tts');
     };
   }, [currentLineData, currentMessage, finished, lines, playSound, playSpeech, stop]);
+  (0, _react.useEffect)(function () {
+    return function () {
+      stop('tts');
+    };
+  }, [stop]);
 
   var decisionPayload = _objectSpread(_objectSpread({}, currentLineData.payload), {}, {
     onFinish: handleClickNext,
-    emitEvent: emitRef.current,
+    emitEvent: emitEvent,
     soundActions: soundActions,
     inheritProps: {
       characters: currentCharacters,

package/dist/components/conversational-pro-component/components/scene/Panel.js

@@ -21,12 +21,15 @@ var _helpers = require("../../../../helpers");
 
 var _LightSet = _interopRequireDefault(require("../../../../helpers/LightSet"));
 
+var _deviceDetection = require("../../../../helpers/deviceDetection");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+var isMobile = (0, _deviceDetection.DeviceDetection)();
 var defaultCamPos = [0, 14.63, 16];
 
 function Panel(_ref) {
@@ -91,7 +94,7 @@ function Panel(_ref) {
           left: child.left - parent.left,
           bottom: child.bottom - parent.bottom
         };
-        var paddingBottom = 40;
+        var paddingBottom = isMobile ? 24 : 40;
         relativePos.bottom += active ? -paddingBottom : paddingBottom;
         gl.setViewport(relativePos.left, relativePos.bottom, width, height);
         gl.setScissor(relativePos.left, relativePos.bottom, width, height);

package/dist/components/conversational-pro-component/mocks/mockForStory.js

@@ -22,7 +22,6 @@ var animations = {
 var converOld = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   messages: [{
     character: 'Puerta',
     emotion: 'neutral',
@@ -77,7 +76,6 @@ exports.converOld = converOld;
 var conversationProps = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   lines: [{
     flex: true,
     slots: [{
@@ -344,7 +342,6 @@ exports.conversationProps = conversationProps;
 var voiceOverProps = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   lines: [{
     flex: false,
     slots: [{
@@ -478,7 +475,6 @@ exports.voiceOverProps = voiceOverProps;
 var withoutBackground = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   lines: [{
     flex: false,
     slots: [{
@@ -608,7 +604,6 @@ exports.withoutBackground = withoutBackground;
 var conversationPropsNoFeedbackNoRewards = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   lines: [{
     flex: true,
     slots: [{
@@ -869,7 +864,6 @@ exports.conversationPropsNoFeedbackNoRewards = conversationPropsNoFeedbackNoRewa
 var conversationPropsLodSettings = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   lodSettings: {
     currentLOD: 'original',
     rgbSimulation: true,

package/dist/components/cracker-puzzle-component/components/CrackerPuzzleComponent.js

@@ -74,8 +74,7 @@ var CrackerPuzzleComponent = function CrackerPuzzleComponent(_ref) {
       password = _ref.password,
       disableExit = _ref.disableExit,
       difficulty = _ref.difficulty,
-      setResolveAction = _ref.setResolveAction,
-      setShowPoints = _ref.setShowPoints;
+      setResolveAction = _ref.setResolveAction;
 
   var _soundActions = _slicedToArray(soundActions, 1),
       playSound = _soundActions[0];
@@ -147,7 +146,12 @@ var CrackerPuzzleComponent = function CrackerPuzzleComponent(_ref) {
           type: 'hidePuzzleButtons',
           payload: false
         });
-        setShowPoints(info.resolve.rewards);
+        emitEvent({
+          type: 'addPoints',
+          complex: true,
+          finish: true,
+          payload: info.resolve.rewards
+        });
       }, 0);
     });
   }, [setResolveAction, playSound]);
@@ -155,7 +159,12 @@ var CrackerPuzzleComponent = function CrackerPuzzleComponent(_ref) {
   var handleFinish = function handleFinish() {
     playSound('click-ui');
     var rewards = solution.right.rewards;
-    setShowPoints(rewards);
+    emitEvent({
+      type: 'addPoints',
+      complex: true,
+      finish: true,
+      payload: rewards
+    });
   };
 
   var generatePasswordPositions = function generatePasswordPositions() {

package/dist/components/cracker-puzzle-component/mocks/mockForStory.js

@@ -10,7 +10,6 @@ var _mocker = require("helpers/mocker");
 var mockProps = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   disableExit: function disableExit() {},
   setResolveAction: function setResolveAction() {},
   velocity: 'slow',
@@ -64,7 +63,6 @@ exports.mockProps = mockProps;
 var mockProps2 = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   disableExit: function disableExit() {},
   setResolveAction: function setResolveAction() {},
   velocity: 'fast',
@@ -118,7 +116,6 @@ exports.mockProps2 = mockProps2;
 var mockProps3 = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   disableExit: function disableExit() {},
   setResolveAction: function setResolveAction() {},
   velocity: 'fastest',
@@ -172,7 +169,6 @@ exports.mockProps3 = mockProps3;
 var mockProps4 = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   disableExit: function disableExit() {},
   setResolveAction: function setResolveAction() {},
   velocity: 'fastest',
@@ -226,7 +222,6 @@ exports.mockProps4 = mockProps4;
 var mockProps5 = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   disableExit: function disableExit() {},
   setResolveAction: function setResolveAction() {},
   velocity: 'slow',

package/dist/components/decision-component/components/DecisionBody.js

@@ -65,9 +65,7 @@ var DecisionBody = function DecisionBody(_ref) {
     selectedChoice: selectedChoice,
     selectChoice: !showingResults || inherited && failed ? choose : noop,
     options: options,
-    showingResults: showingResults,
-    hasFeedbackDefinedInEditor: currentSelectedChoice.feedback,
-    hasRewards: hasRewards
+    showingResults: showingResults
   };
 
   var BasicDecision = function BasicDecision(_ref2) {
@@ -78,7 +76,9 @@ var DecisionBody = function DecisionBody(_ref) {
       className: "popup--info"
     }, showingResults ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, defaultChildren, !currentSelectedChoice.feedback && hasRewards.length === 0 && /*#__PURE__*/_react.default.createElement("span", {
       className: "popup--info__title"
-    }, question !== '' && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, question))) : /*#__PURE__*/_react.default.createElement("span", {
+    }, question !== '' && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, question)), !currentSelectedChoice.feedback && hasRewards.length > 0 && /*#__PURE__*/_react.default.createElement("span", {
+      className: "popup--info__title"
+    }, question)) : /*#__PURE__*/_react.default.createElement("span", {
       className: "popup--info__title"
     }, question)), /*#__PURE__*/_react.default.createElement("div", {
       className: "popup__questions"

package/dist/components/decision-component/components/DecisionComponent.js

@@ -23,14 +23,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -71,15 +63,10 @@ var DecisionComponent = function DecisionComponent(_ref) {
       selectedView = _useState2[0],
       selectView = _useState2[1];
 
-  var _useState3 = (0, _react.useState)([]),
+  var _useState3 = (0, _react.useState)({}),
       _useState4 = _slicedToArray(_useState3, 2),
-      rewards = _useState4[0],
-      addReward = _useState4[1];
-
-  var _useState5 = (0, _react.useState)({}),
-      _useState6 = _slicedToArray(_useState5, 2),
-      resultChoice = _useState6[0],
-      setResultChoice = _useState6[1];
+      resultChoice = _useState4[0],
+      setResultChoice = _useState4[1];
 
   var _soundActions = _slicedToArray(soundActions, 1),
       playSound = _soundActions[0];
@@ -140,38 +127,37 @@ var DecisionComponent = function DecisionComponent(_ref) {
       playSound('click-ui');
 
       if (!failed && selectedView === 'results') {
+        setResultChoice({});
+        selectView('options');
         emitEvent({
           type: 'addPoints',
-          payload: rewards,
-          finish: !onFinish
+          payload: choice.rewards,
+          finish: true,
+          complex: true,
+          onFinish: onFinish
         });
-        setResultChoice({});
-        selectView('options');
-
-        if (onFinish) {
-          onFinish();
-        }
       } else if (Object.keys(choice).length > 0) {
-        var currentRewards = [].concat(_toConsumableArray(rewards), _toConsumableArray(choice.rewards));
-
         if (choice.right) {
           playSound('score');
         } else {
           playSound('fail');
+          emitEvent({
+            type: 'addPoints',
+            payload: choice.rewards,
+            finish: false,
+            complex: true
+          });
         }
 
         setResultChoice(choice);
-        addReward(currentRewards);
         playCurrentAudio(choice);
         selectView('results');
       }
     },
-    onExit: function onExit() {
-      playSound('click-ui');
-      emitEvent({
-        type: 'success'
-      });
-    },
+    // onExit: () => {
+    //   playSound('click-ui');
+    //   emitEvent({ type: 'success' });
+    // },
     translate: function translate(id) {
       return emitEvent({
         type: 'translate',
@@ -214,7 +200,7 @@ var DecisionComponent = function DecisionComponent(_ref) {
   };
 
   var Body = function Body() {
-    return inherited ? /*#__PURE__*/_react.default.createElement(CharactersWrapper, null, selectedView === 'results' ? /*#__PURE__*/_react.default.createElement(_Feedback.default, {
+    return inherited ? /*#__PURE__*/_react.default.createElement(CharactersWrapper, null, selectedView === 'results' && resultChoice.feedback ? /*#__PURE__*/_react.default.createElement(_Feedback.default, {
       question: question,
       soundActions: soundActions,
       inherited: inherited,

package/dist/components/decision-component/components/Feedback.js

@@ -7,16 +7,11 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _RewardsComponent = _interopRequireDefault(require("../../rewards-component/components/RewardsComponent"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var FeedBack = function FeedBack(_ref) {
   var choice = _ref.choice,
-      inherited = _ref.inherited,
-      rewards = _ref.rewards,
-      emitEvent = _ref.emitEvent,
-      soundActions = _ref.soundActions;
+      inherited = _ref.inherited;
 
   var Wrapper = function Wrapper(_ref2) {
     var children = _ref2.children;
@@ -36,10 +31,7 @@ var FeedBack = function FeedBack(_ref) {
     return children;
   };
 
-  var noRewards = rewards.filter(function (reward) {
-    return reward.type !== 'grade';
-  }).length === 0;
-  if (!choice.feedback && noRewards) return null;
+  if (!choice.feedback) return null;
   return /*#__PURE__*/_react.default.createElement(Wrapper, null, choice.feedback ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: "conversation--feedback__title"
   }, "Feedback"), /*#__PURE__*/_react.default.createElement("div", {
@@ -48,11 +40,7 @@ var FeedBack = function FeedBack(_ref) {
     className: "icon-check-circle-black color--success"
   }) : /*#__PURE__*/_react.default.createElement("span", {
     className: "icon-error-circle-black color--error"
-  }), /*#__PURE__*/_react.default.createElement("p", null, choice.feedback))) : null, !noRewards ? /*#__PURE__*/_react.default.createElement(_RewardsComponent.default, {
-    soundActions: soundActions,
-    rewards: choice.right ? rewards : choice.rewards,
-    emitEvent: emitEvent
-  }) : null);
+  }), /*#__PURE__*/_react.default.createElement("p", null, choice.feedback))) : null);
 };
 
 var _default = FeedBack;

package/dist/components/decision-component/components/Options.js

@@ -14,9 +14,7 @@ var Options = function Options(_ref) {
       options = _ref.options,
       selectedChoice = _ref.selectedChoice,
       selectChoice = _ref.selectChoice,
-      showingResults = _ref.showingResults,
-      hasFeedbackDefinedInEditor = _ref.hasFeedbackDefinedInEditor,
-      hasRewards = _ref.hasRewards;
+      showingResults = _ref.showingResults;
   return options.filter(function (option) {
     return option.text;
   }).map(function (option) {
@@ -28,7 +26,7 @@ var Options = function Options(_ref) {
       name: option.id,
       defaultChecked: selectedChoice.id === option.id
     }), showingResults ? /*#__PURE__*/_react.default.createElement("label", {
-      className: "".concat(option.right ? "radio-text-success ".concat(!hasFeedbackDefinedInEditor && hasRewards.length === 0 ? 'radio-icon-success' : '') : "radio-text-fail ".concat(!hasFeedbackDefinedInEditor && hasRewards.length === 0 ? 'radio-icon-fail' : '')),
+      className: "".concat(option.right ? 'radio-text-success' : 'radio-text-fail'),
       htmlFor: option.id,
       onClick: function onClick() {
         selectChoice(option);

package/dist/components/decision-component/mocks/mockForStory.js

@@ -10,7 +10,6 @@ var _mocker = require("helpers/mocker");
 var decisionProps = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   onFinish: function onFinish() {
     return (0, _mocker.onFinish)('decision-component');
   },
@@ -129,7 +128,6 @@ exports.decisionProps = decisionProps;
 var decisionPropsWithRadios = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   options: [{
     id: 0,
     right: false,