Merge pull request #2265 from DistributedCollective/development

Release 2022-06-16

.github/workflows/deploy-staging.yml

@@ -37,6 +37,8 @@ jobs:
           REACT_APP_BYPASS_MAINTENANCE: 'true'
           REACT_APP_ESTIMATOR_URI: 'https://simulator.sovryn.app'
           REACT_APP_INTERCOM_ID: 'zxxit1rp'
+          REACT_APP_GRAPH_RSK: 'https://subgraph.sovryn.app/subgraphs/name/DistributedCollective/sovryn-subgraph'
+
 
       - name: Deploy to S3
         uses: raulanatol/aws-s3-docker-action@master

.storybook/webpack.config.js

@@ -11,6 +11,8 @@ const upgradePostCssLoaderEntry = entry => {
           postcssOptions: {
             ident: 'postcss',
             plugins: [
+              require('postcss-import'),
+              require('postcss-nested'),
               require('tailwindcss'),
               require('autoprefixer'),
               require('postcss-flexbugs-fixes'),

package.json

@@ -8,17 +8,17 @@
     "@babel/core": "7.9.0",
     "@blueprintjs/core": "3.42.0",
     "@blueprintjs/select": "3.13.7",
-    "@fortawesome/fontawesome-svg-core": "1.2.30",
-    "@fortawesome/free-solid-svg-icons": "5.14.0",
-    "@fortawesome/react-fontawesome": "0.1.11",
+    "@fortawesome/fontawesome-svg-core": "6.1.1",
+    "@fortawesome/free-solid-svg-icons": "6.1.1",
+    "@fortawesome/react-fontawesome": "0.1.18",
     "@hookstate/core": "3.0.6",
     "@opengsn/provider": "2.2.5",
     "@redux-saga/delay-p": "1.1.2",
     "@reduxjs/toolkit": "1.5.1",
     "@rsksmart/rsk3": "0.3.4",
     "@sovryn/charting-library": "1.0.0",
-    "@sovryn/react-wallet": "2.2.4",
-    "@sovryn/perpetual-swap": "3.0.0",
+    "@sovryn/perpetual-swap": "3.0.5",
+    "@sovryn/react-wallet": "2.2.5",
     "@svgr/webpack": "4.3.3",
     "@testing-library/jest-dom": "5.1.1",
     "@testing-library/react": "10.0.1",

public/index.html

@@ -94,21 +94,68 @@
       })();
     </script>
     <!-- End Matomo Code -->
+    <% } %> <% if (process.env.REACT_APP_INTERCOM_ID) { %>
+    <!-- Intercom Code -->
+    <script type="text/javascript">
+      window.intercomSettings = {
+        api_base: 'https://api-iam.intercom.io',
+        app_id: '%REACT_APP_INTERCOM_ID%',
+        Environment: '%REACT_APP_NETWORK%',
+      };
+    </script>
+    <script type="text/javascript">
+      (function () {
+        var w = window;
+        var ic = w.Intercom;
+        if (typeof ic === 'function') {
+          ic('reattach_activator');
+          ic('update', w.intercomSettings);
+        } else {
+          var d = document;
+          var i = function () {
+            i.c(arguments);
+          };
+          i.q = [];
+          i.c = function (args) {
+            i.q.push(args);
+          };
+          w.Intercom = i;
+          var l = function () {
+            var s = d.createElement('script');
+            s.type = 'text/javascript';
+            s.async = true;
+            s.src = 'https://widget.intercom.io/widget/%REACT_APP_INTERCOM_ID%';
+            var x = d.getElementsByTagName('script')[0];
+            x.parentNode.insertBefore(s, x);
+          };
+          if (document.readyState === 'complete') {
+            l();
+          } else if (w.attachEvent) {
+            w.attachEvent('onload', l);
+          } else {
+            w.addEventListener('load', l, false);
+          }
+        }
+      })();
+    </script>
+    <!-- End Intercom Code -->
     <% } %>
-    <% if (process.env.REACT_APP_INTERCOM_ID) { %>
-      <!-- Intercom Code -->
-      <script type="text/javascript">
-        window.intercomSettings = {
-          api_base: "https://api-iam.intercom.io",
-          app_id: "%REACT_APP_INTERCOM_ID%",
-          Environment: "%REACT_APP_NETWORK%"
-        };
-      </script>
-      <script type="text/javascript">
-        (function(){var w=window;var ic=w.Intercom;if(typeof ic==="function"){ic('reattach_activator');ic('update',w.intercomSettings);}else{var d=document;var i=function(){i.c(arguments);};i.q=[];i.c=function(args){i.q.push(args);};w.Intercom=i;var l=function(){var s=d.createElement('script');s.type='text/javascript';s.async=true;s.src='https://widget.intercom.io/widget/%REACT_APP_INTERCOM_ID%';var x=d.getElementsByTagName('script')[0];x.parentNode.insertBefore(s,x);};if(document.readyState==='complete'){l();}else if(w.attachEvent){w.attachEvent('onload',l);}else{w.addEventListener('load',l,false);}}})();
-        </script>
-      <!-- End Intercom Code -->
-      <% } %>
+    <!-- Perpetuals Competition Info Popup -->
+    <script type="text/javascript">
+      (function (d, t) {
+        if (
+          window.location.hash != '#gleam' &&
+          ('' + document.cookie).match(/(^|;)\s*GleamVBcR5=X($|;)/)
+        ) {
+          return;
+        }
+        var g = d.createElement(t),
+          s = d.getElementsByTagName(t)[0];
+        g.src = 'https://widget.gleamjs.io/VBcR5/ol.js';
+        s.parentNode.insertBefore(g, s);
+      })(document, 'script');
+    </script>
+    <!-- End Perpetuals Competition Info Popup -->
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

src/app/components/AssetValue/types.ts

@@ -19,6 +19,9 @@ export const AssetDecimals: { [key in Asset]: number } = {
   RIF: 2,
   MYNT: 2,
   TRADING: 1,
+  ZUSD: 2,
+  /** @deprecated */
+  XUSD_legacy: 2,
 };
 
 export enum AssetValueMode {

src/app/components/Checkbox/index.tsx

@@ -53,6 +53,7 @@ export const Checkbox: React.FC<CheckboxProps> = ({
           className={styles.hiddenInput}
           checked={checked}
           onChange={onChange}
+          disabled={disabled}
         />
         <span
           className={classNames(styles.checkbox, {

src/app/components/Form/AmountInput/index.tsx

@@ -189,21 +189,31 @@ export const AmountSelectorInner: React.FC<IAmountSelectorProps> = ({
   );
 };
 
+export enum AmountSelectorButtonPadding {
+  md = 'tw-px-4',
+  sm = 'tw-px-2',
+}
+
 interface IAmountButtonProps {
   text?: string;
   onClick?: () => void;
   dataActionId?: string;
+  padding?: AmountSelectorButtonPadding;
 }
 
 export const AmountSelectorButton: React.FC<IAmountButtonProps> = ({
   text,
   onClick,
   dataActionId,
+  padding = AmountSelectorButtonPadding.md,
 }) => {
   return (
     <button
       onClick={onClick}
-      className="tw-text-secondary tw-bg-secondary tw-bg-opacity-0 tw-font-medium tw-text-xs tw-leading-none tw-px-4 tw-py-1 tw-text-center tw-w-full tw-transition hover:tw-bg-opacity-25"
+      className={classNames(
+        'tw-text-secondary tw-bg-secondary tw-bg-opacity-0 tw-font-medium tw-text-xs tw-leading-none tw-py-1 tw-text-center tw-w-full tw-transition hover:tw-bg-opacity-25',
+        padding,
+      )}
       data-action-id={`${dataActionId}-amountSelectorButton-${text}`}
     >
       {text}