diff --git a/mon-entreprise/source/locales/ui-en.yaml b/mon-entreprise/source/locales/ui-en.yaml index c27b517a1..b4b2371d4 100644 --- a/mon-entreprise/source/locales/ui-en.yaml +++ b/mon-entreprise/source/locales/ui-en.yaml @@ -1615,18 +1615,6 @@ simulateurs: explanation: CNAPL: It recovers contributions related to your retirement and disability/death plan. - aides covid: - deduction: <0>Deduction of turnover<1>The terms and conditions of the - "covid" discount are presented on the Urssaf - website.<2><0>{emoji('▶')} More information - portail: <0>Government assistance<1>The Ministry of the Economy offers a - portal listing business support measures.<2><0>{emoji('▶')} - Support measures - reduction: <0>Contribution reduction<1>You can benefit from a reduction in - your final contributions for the year 2020.<2><0> - soutien: <0>Listening and support<1>An <2>initial listening and - psychological support unit has been set up for company directors - weakened by the crisis.<2><0>{emoji('📞')} 08 05 65 50 50 institutions: cpam: As a health professional under agreement, you benefit from a part of your contributions being covered by the Health Insurance. diff --git a/publicodes/site/components/Studio.tsx b/publicodes/site/components/Studio.tsx index 8a7dbcee5..9fb0a9c46 100644 --- a/publicodes/site/components/Studio.tsx +++ b/publicodes/site/components/Studio.tsx @@ -166,7 +166,7 @@ export const Results = ({ onClickShare, rules }: ResultsProps) => {
diff --git a/publicodes/site/components/markdown.tsx b/publicodes/site/components/markdown.tsx index 28adc3078..3444f07f9 100644 --- a/publicodes/site/components/markdown.tsx +++ b/publicodes/site/components/markdown.tsx @@ -56,9 +56,7 @@ export function LinkRenderer({ ) } -const TextRenderer = ({ children }: { children: string }) => ( - <>{emoji(children)} -) +const TextRenderer = ({ children }: { children: string }) => <>{children} type MarkdownProps = ReactMarkdownProps & { source: string | undefined @@ -93,7 +91,7 @@ const CodeBlock = ({ target="_blank" css="position: absolute; bottom: 5px; right: 10px; color: white !important;" > - {emoji('⚡')} Lancer le calcul + ⚡ Lancer le calcul )} diff --git a/publicodes/ui-react/package.json b/publicodes/ui-react/package.json index cee3b19e1..83c8bfffc 100644 --- a/publicodes/ui-react/package.json +++ b/publicodes/ui-react/package.json @@ -19,7 +19,6 @@ "classnames": "^2.2.6", "focus-trap-react": "^3.1.2", "ramda": "^0.27.0", - "react-easy-emoji": "^1.4.0", "react-helmet": "^6.1.0", "react-markdown": "^4.3.1", "react-router-hash-link": "^2.4.3", diff --git a/publicodes/ui-react/source/Markdown.tsx b/publicodes/ui-react/source/Markdown.tsx index e7a016771..f3ace25b2 100644 --- a/publicodes/ui-react/source/Markdown.tsx +++ b/publicodes/ui-react/source/Markdown.tsx @@ -48,9 +48,7 @@ const CodeBlock = ({ value, language }: { value: string; language: string }) => ) -const TextRenderer = ({ children }: { children: string }) => ( - <>{emoji(children)} -) +const TextRenderer = ({ children }: { children: string }) => <>{children} type MarkdownProps = ReactMarkdownProps & { source: string | undefined diff --git a/publicodes/ui-react/source/PublicodesBlock.tsx b/publicodes/ui-react/source/PublicodesBlock.tsx index 95d37f36e..636e39242 100644 --- a/publicodes/ui-react/source/PublicodesBlock.tsx +++ b/publicodes/ui-react/source/PublicodesBlock.tsx @@ -17,7 +17,7 @@ export default function PublicodesBlock({ source }: { source: string }) { href={`${baseURL}/studio?code=${encodeURIComponent(source)}`} target="_blank" > - {emoji('⚡')} Lancer le calcul + ⚡ Lancer le calcul ) diff --git a/publicodes/ui-react/source/RuleLink.tsx b/publicodes/ui-react/source/RuleLink.tsx index 3e68a3f6b..841821b3c 100644 --- a/publicodes/ui-react/source/RuleLink.tsx +++ b/publicodes/ui-react/source/RuleLink.tsx @@ -63,9 +63,7 @@ export function RuleLink({ {...props} > {children || rule.title}{' '} - {displayIcon && rule.rawNode.icônes && ( - {emoji(rule.rawNode.icônes)} - )} + {displayIcon && rule.rawNode.icônes && {rule.rawNode.icônes}} ) } diff --git a/publicodes/ui-react/source/mecanisms/Replacement.tsx b/publicodes/ui-react/source/mecanisms/Replacement.tsx index c1b88e7aa..09b967b3c 100644 --- a/publicodes/ui-react/source/mecanisms/Replacement.tsx +++ b/publicodes/ui-react/source/mecanisms/Replacement.tsx @@ -24,7 +24,7 @@ export default function Replacement(node: VariationNode & EvaluatedNode) { onClick={() => changeDisplayReplacement(true)} className="ui__ simple small button" > - {emoji('🔄')} + 🔄 {displayReplacements && ( changeDisplayReplacement(false)}> diff --git a/publicodes/ui-react/source/mecanisms/Variations.tsx b/publicodes/ui-react/source/mecanisms/Variations.tsx index e95b1cef9..2b0eb5992 100644 --- a/publicodes/ui-react/source/mecanisms/Variations.tsx +++ b/publicodes/ui-react/source/mecanisms/Variations.tsx @@ -47,14 +47,14 @@ export default function Variations({ className="ui__ link-button" onClick={() => toggleVariation(i)} > - détails {emoji('▶️')} + détails ▶️ ) : ( )} diff --git a/publicodes/ui-react/source/rule/RuleSource.tsx b/publicodes/ui-react/source/rule/RuleSource.tsx index 88e3e52ac..db4263db5 100644 --- a/publicodes/ui-react/source/rule/RuleSource.tsx +++ b/publicodes/ui-react/source/rule/RuleSource.tsx @@ -87,7 +87,7 @@ export default function RuleSource({ engine, dottedName }: Props) { dottedName )}?code=${encodeURIComponent(source)}`} > - {emoji('✍️')} Voir la règle dans le bac à sable Publicodes + ✍️ Voir la règle dans le bac à sable Publicodes ) diff --git a/publicodes/yarn.lock b/publicodes/yarn.lock index 9787da045..fe03688cb 100644 --- a/publicodes/yarn.lock +++ b/publicodes/yarn.lock @@ -2168,13 +2168,6 @@ intl@^1.2.5: resolved "https://registry.yarnpkg.com/intl/-/intl-1.2.5.tgz#82244a2190c4e419f8371f5aa34daa3420e2abde" integrity sha1-giRKIZDE5Bn4Nx9ao02qNCDiq94= -invariant@^2.2.1: - version "2.2.4" - resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" - integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== - dependencies: - loose-envify "^1.0.0" - is-alphabetical@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d" @@ -2397,11 +2390,6 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" -lodash.assign@^4.0.8: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" - integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc= - lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" @@ -2412,16 +2400,6 @@ lodash.debounce@^4.0.8: resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= -lodash.flatten@^4.2.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" - integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= - -lodash.isstring@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" - integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE= - lodash@^4.17.11, lodash@^4.17.15: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" @@ -2435,7 +2413,7 @@ log-symbols@4.1.0: chalk "^4.1.0" is-unicode-supported "^0.1.0" -loose-envify@^1.0.0, loose-envify@^1.4.0: +loose-envify@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== @@ -2834,14 +2812,6 @@ randombytes@^2.1.0: dependencies: safe-buffer "^5.1.0" -react-easy-emoji@^1.4.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/react-easy-emoji/-/react-easy-emoji-1.5.0.tgz#fe81e6c8b1df4e4305a47f3df1187b6db6663ae8" - integrity sha512-yBlctvcglxKpEYijPJ1YHAe26ce6wxfNxERF/X3RUy3EPM1RKW0+Kn7Nm2rccYg4ReE4htOAsJB8FhMwNk2sAw== - dependencies: - lodash.assign "^4.0.8" - string-replace-to-array "^1.0.1" - react-fast-compare@^3.1.1: version "3.2.0" resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb" @@ -3172,15 +3142,6 @@ state-toggle@^1.0.0: resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe" integrity sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ== -string-replace-to-array@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/string-replace-to-array/-/string-replace-to-array-1.0.3.tgz#c93eba999a5ee24d731aebbaf5aba36b5f18f7bf" - integrity sha1-yT66mZpe4k1zGuu69auja18Y978= - dependencies: - invariant "^2.2.1" - lodash.flatten "^4.2.0" - lodash.isstring "^4.0.1" - "string-width@^1.0.2 || 2": version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"