fixed missing DS tokens

Emurgo · Apr 29, 2024 · d3ba734 · d3ba734
1 parent a8b8ed5
commit d3ba734
Show file tree

Hide file tree

Showing 98 changed files with 699 additions and 393 deletions.
diff --git a/packages/yoroi-extension/app/components/buySell/BuySellDialog.js b/packages/yoroi-extension/app/components/buySell/BuySellDialog.js
@@ -5,8 +5,8 @@ import { observer } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 
-import Dialog from '../widgets/Dialog';
-import DialogCloseButton from '../widgets/DialogCloseButton';
+import Dialog from '../widgets/Dialog/Dialog';
+import DialogCloseButton from '../widgets/Dialog/DialogCloseButton';
 
 import VerticalFlexContainer from '../layout/VerticalFlexContainer';
 import LoadingSpinner from '../widgets/LoadingSpinner';
@@ -21,7 +21,7 @@ import BigNumber from 'bignumber.js';
 import adaPng from '../../assets/images/ada.png';
 import banxaPng from '../../assets/images/banxa.png';
 import { ReactComponent as InfoIcon } from '../../assets/images/info-icon-revamp.inline.svg';
-import { banxaModuleMaker } from '@yoroi/banxa'
+import { banxaModuleMaker } from '@yoroi/banxa';
 
 declare var chrome;
 
@@ -52,7 +52,8 @@ const messages = defineMessages({
   },
   disclaimerText: {
     id: 'buysell.dialog.disclaimerText',
-    defaultMessage: '!!!Yoroi uses Banxa to provide direct Fiat-ADA exchange. By clicking “Proceed,” you also acknowledge that you will be redirected to our partner’s website, where you may be asked to accept their terms and conditions. Banxa may have buy and sell limitations depending on your location and your financial institution.'
+    defaultMessage:
+      '!!!Yoroi uses Banxa to provide direct Fiat-ADA exchange. By clicking “Proceed,” you also acknowledge that you will be redirected to our partner’s website, where you may be asked to accept their terms and conditions. Banxa may have buy and sell limitations depending on your location and your financial institution.',
   },
   proceed: {
     id: 'buysell.dialog.proceed',
@@ -75,7 +76,8 @@ type State = {|
 |};
 
 const MINIMUM_BUY_ADA = new BigNumber('100');
-const BANXA_CALLBACK_URL = 'https://ramp-redirect.yoroiwallet.com/yoroi-extension-banxa-callback.html';
+const BANXA_CALLBACK_URL =
+  'https://ramp-redirect.yoroiwallet.com/yoroi-extension-banxa-callback.html';
 
 const TabItem = styled(Tab)({
   position: 'relative',
@@ -139,8 +141,10 @@ const Disclaimer = styled(Box)({
     },
   },
   borderRadius: 'var(--corner-radius-8, 8px)',
-  background: 'var(--gradient-light-green-blue, linear-gradient(270deg, #E4E8F7 0%, #C6F7ED 99.98%))',
-  padding: 'var(--spacing-12, 12px) var(--spacing-16, 16px) var(--spacing-16, 16px) var(--spacing-16, 16px)'
+  background:
+    'var(--gradient-light-green-blue, linear-gradient(270deg, #E4E8F7 0%, #C6F7ED 99.98%))',
+  padding:
+    'var(--spacing-12, 12px) var(--spacing-16, 16px) var(--spacing-16, 16px) var(--spacing-16, 16px)',
 });
 
 @observer
@@ -172,8 +176,8 @@ export default class BuySellDialog extends Component<Props, State> {
       });
 
       const self = this;
-      chrome.tabs.create({ url: url.href }, (exchangePageTab) => {
-        chrome.tabs.onRemoved.addListener((tabId) => {
+      chrome.tabs.create({ url: url.href }, exchangePageTab => {
+        chrome.tabs.onRemoved.addListener(tabId => {
           if (tabId === exchangePageTab.id) {
             self.setState({ isSubmitting: false });
           }
@@ -187,9 +191,9 @@ export default class BuySellDialog extends Component<Props, State> {
         });
       });
     }
-  }
+  };
 
-  onChangeBuyAmount: (SyntheticInputEvent<HTMLInputElement>) => void = (event) => {
+  onChangeBuyAmount: (SyntheticInputEvent<HTMLInputElement>) => void = event => {
     const { value } = event.target;
 
     if (!value.match(/^\d*$/)) {
@@ -198,9 +202,9 @@ export default class BuySellDialog extends Component<Props, State> {
 
     this.setState({
       buyAmountAda: value,
-      error: (value !== '' && MINIMUM_BUY_ADA.gt(value)) ? 'lessThanBuyMinimum' : null,
+      error: value !== '' && MINIMUM_BUY_ADA.gt(value) ? 'lessThanBuyMinimum' : null,
     });
-  }
+  };
 
   renderBuy(): Node {
     const { intl } = this.context;
@@ -209,7 +213,9 @@ export default class BuySellDialog extends Component<Props, State> {
     // set a place holder so that when it becomes an error message, the height doesn't change
     let helperText = ' ';
     if (state.error === 'lessThanBuyMinimum') {
-      helperText = intl.formatMessage(messages.lessThanBuyMinimum, { amount: MINIMUM_BUY_ADA.toString() });
+      helperText = intl.formatMessage(messages.lessThanBuyMinimum, {
+        amount: MINIMUM_BUY_ADA.toString(),
+      });
     }
 
     return (
@@ -219,16 +225,23 @@ export default class BuySellDialog extends Component<Props, State> {
           InputProps={{
             endAdornment: (
               <InputAdornment position="end">
-                <div style={{ position: 'relative' /* so that the balance line can align on the right side */ }}>
+                <div
+                  style={{
+                    position: 'relative' /* so that the balance line can align on the right side */,
+                  }}
+                >
                   <div style={{ marginBottom: '8px', color: '#000' }}>
                     <img
                       style={{ marginRight: '8px', borderRadius: '4px', verticalAlign: 'bottom' }}
                       src={adaPng}
                       alt=""
-                    />ADA
+                    />
+                    ADA
                   </div>
                   <Box sx={{ position: 'absolute', right: '0px', fontSize: '12px' }}>
-                    {intl.formatMessage(messages.currentBalance, { amount: props.currentBalanceAda })}
+                    {intl.formatMessage(messages.currentBalance, {
+                      amount: props.currentBalanceAda,
+                    })}
                   </Box>
                 </div>
               </InputAdornment>
@@ -245,27 +258,22 @@ export default class BuySellDialog extends Component<Props, State> {
         />
 
         <ProviderRow>
-          <ProviderLabel>
-            {intl.formatMessage(globalMessages.provider)}
-          </ProviderLabel>
+          <ProviderLabel>{intl.formatMessage(globalMessages.provider)}</ProviderLabel>
           <ProviderInfo>
             <img style={{ verticalAlign: 'bottom' }} src={banxaPng} alt="" />
             Banxa
           </ProviderInfo>
         </ProviderRow>
 
         <ProviderRow>
-          <ProviderLabel>
-            {intl.formatMessage(messages.providerFee)}
-          </ProviderLabel>
-          <ProviderInfo>
-            2%
-          </ProviderInfo>
+          <ProviderLabel>{intl.formatMessage(messages.providerFee)}</ProviderLabel>
+          <ProviderInfo>2%</ProviderInfo>
         </ProviderRow>
 
         <Disclaimer>
           <header>
-            <InfoIcon />{intl.formatMessage(messages.disclaimer)}
+            <InfoIcon />
+            {intl.formatMessage(messages.disclaimer)}
           </header>
           {intl.formatMessage(messages.disclaimerText)}
         </Disclaimer>
@@ -307,7 +315,7 @@ export default class BuySellDialog extends Component<Props, State> {
             disabled: state.buyAmountAda === '' || state.error !== null,
             onClick: this.onSubmit,
             isSubmitting: state.isSubmitting,
-          }
+          },
         ]}
         styleOverride={{ width: '648px', height: '688px' }}
         styleFlags={{ contentNoTopPadding: true }}

diff --git a/packages/yoroi-extension/app/components/profile/complexity-level/ComplexityLevelForm.js b/packages/yoroi-extension/app/components/profile/complexity-level/ComplexityLevelForm.js
@@ -170,7 +170,7 @@ class ComplexityLevel extends Component<Props & InjectedProps> {
                     border: 'solid 1px transparent',
                     background: theme =>
                       isSelected
-                        ? theme.palette.gradients['bg-gradient-2']
+                        ? theme.palette.gradients.bg_gradient_2
                         : 'linear-gradient( 0deg, var(--yoroi-palette-common-white), var(--yoroi-palette-common-white)), linear-gradient(180deg, #e4e8f7 0%, #c6f7f7 100%)',
                     backgroundClip: 'content-box, border-box',
                     backgroundOrigin: 'border-box',
@@ -186,7 +186,7 @@ class ComplexityLevel extends Component<Props & InjectedProps> {
                       right: '0px',
                       left: '0px',
                       bottom: '0px',
-                      background: theme => theme.palette.gradients['blue-green-bg'],
+                      background: theme => theme.palette.gradients.bg_gradient_1,
                       borderRadius: '8px',
                       zIndex: -1,
                       opacity: 0,

diff --git a/...roi-extension/app/components/settings/categories/general-setting/UnitOfAccountSettings.js b/...roi-extension/app/components/settings/categories/general-setting/UnitOfAccountSettings.js
@@ -10,7 +10,7 @@ import { defineMessages, intlShape, FormattedHTMLMessage } from 'react-intl';
 import ReactToolboxMobxForm from '../../../../utils/ReactToolboxMobxForm';
 import LocalizableError from '../../../../i18n/LocalizableError';
 import styles from './UnitOfAccountSettings.scss';
-import Dialog from '../../../widgets/Dialog';
+import Dialog from '../../../widgets/Dialog/Dialog';
 import VerticalFlexContainer from '../../../layout/VerticalFlexContainer';
 import LoadingSpinner from '../../../widgets/LoadingSpinner';
 import globalMessages from '../../../../i18n/global-messages';

diff --git a/packages/yoroi-extension/app/components/swap/CancelOrderDialog.js b/packages/yoroi-extension/app/components/swap/CancelOrderDialog.js
@@ -1,6 +1,6 @@
 //@flow
 import { Box, Button, Typography } from '@mui/material';
-import Dialog from '../widgets/Dialog';
+import Dialog from '../widgets/Dialog/Dialog';
 import AssetPair from '../common/assets/AssetPair';
 import TextField from '../common/TextField';
 import type { RemoteTokenInfo } from '../../api/ada/lib/state-fetch/types';

diff --git a/packages/yoroi-extension/app/components/swap/LimitOrderWarningDialog.js b/packages/yoroi-extension/app/components/swap/LimitOrderWarningDialog.js
@@ -2,7 +2,7 @@
 import type { Node } from 'react';
 import { Box, Button, Typography } from '@mui/material';
 import { ReactComponent as InfoIcon } from '../../assets/images/revamp/icons/info.inline.svg';
-import Dialog from '../widgets/Dialog';
+import Dialog from '../widgets/Dialog/Dialog';
 import { FormattedMarketPrice, FormattedPrice } from './PriceImpact';
 import { useSwap } from '@yoroi/swap';
 

diff --git a/packages/yoroi-extension/app/components/swap/LoadingOverlay.js b/packages/yoroi-extension/app/components/swap/LoadingOverlay.js
@@ -1,7 +1,7 @@
 // @flow
 import type { Node } from 'react';
 import { alpha, Modal } from '@mui/material';
-import { ModalContainer } from '../widgets/Dialog';
+import { ModalContainer } from '../widgets/Dialog/Dialog';
 import LoadingSpinner from '../widgets/LoadingSpinner';
 
 type Props = {|

diff --git a/packages/yoroi-extension/app/components/swap/PriceImpact.js b/packages/yoroi-extension/app/components/swap/PriceImpact.js
@@ -1,7 +1,7 @@
 // @flow
 import type { Node } from 'react';
 import { Box, Button, Typography } from '@mui/material';
-import Dialog from '../widgets/Dialog';
+import Dialog from '../widgets/Dialog/Dialog';
 import { ReactComponent as ErrorTriangleIcon } from '../../assets/images/revamp/error.triangle.svg';
 import { ReactComponent as ExclamationCircleIcon } from '../../assets/images/revamp/exclamation.circle.svg';
 import type { PriceImpact } from './types';

diff --git a/packages/yoroi-extension/app/components/swap/SelectAssetDialog.js b/packages/yoroi-extension/app/components/swap/SelectAssetDialog.js
@@ -10,7 +10,7 @@ import { ReactComponent as ArrowBottomIcon } from '../../assets/images/revamp/ic
 import { truncateAddressShort } from '../../utils/formatters';
 import adaTokenImage from '../../containers/swap/mockAssets/ada.inline.svg';
 import defaultTokenImage from '../../assets/images/revamp/asset-default.inline.svg';
-import Dialog from '../widgets/Dialog';
+import Dialog from '../widgets/Dialog/Dialog';
 import Table from '../common/table/Table';
 import { urlResolveForIpfsAndCorsproxy } from '../../coreUtils';
 import type { RemoteTokenInfo } from '../../api/ada/lib/state-fetch/types';

diff --git a/packages/yoroi-extension/app/components/swap/SelectPoolDialog.js b/packages/yoroi-extension/app/components/swap/SelectPoolDialog.js
@@ -1,6 +1,6 @@
 // @flow
 import { Box, Typography } from '@mui/material';
-import Dialog from '../widgets/Dialog';
+import Dialog from '../widgets/Dialog/Dialog';
 import Table from '../common/table/Table';
 import { getMarketPrice } from '@yoroi/swap';
 import { Quantities } from '../../utils/quantities';

diff --git a/packages/yoroi-extension/app/components/swap/SlippageDialog.js b/packages/yoroi-extension/app/components/swap/SlippageDialog.js
@@ -1,7 +1,7 @@
 // @flow
 import { useState } from 'react';
 import { Box, Button, Typography } from '@mui/material';
-import Dialog from '../widgets/Dialog';
+import Dialog from '../widgets/Dialog/Dialog';
 // <TODO:CHECK_LINT>
 // eslint-disable-next-line no-unused-vars
 import { ReactComponent as AssetDefault } from '../../assets/images/revamp/asset-default.inline.svg';

diff --git a/packages/yoroi-extension/app/components/swap/SwapDisclaimerDialog.js b/packages/yoroi-extension/app/components/swap/SwapDisclaimerDialog.js
@@ -2,7 +2,7 @@
 import type { Node } from 'react';
 import { useState } from 'react';
 import { Box, Button, Typography } from '@mui/material';
-import Dialog from '../widgets/Dialog';
+import Dialog from '../widgets/Dialog/Dialog';
 import CheckboxLabel from '../common/CheckboxLabel';
 
 type Props = {|

diff --git a/packages/yoroi-extension/app/components/topbar/WalletListDialog.js b/packages/yoroi-extension/app/components/topbar/WalletListDialog.js
@@ -15,8 +15,8 @@ import { MultiToken } from '../../api/common/lib/MultiToken';
 import { DragDropContext, Droppable } from 'react-beautiful-dnd';
 import { Box } from '@mui/system';
 import { PublicDeriver } from '../../api/ada/lib/storage/models/PublicDeriver';
-import Dialog from '../widgets/Dialog';
-import DialogCloseButton from '../widgets/DialogCloseButton';
+import Dialog from '../widgets/Dialog/Dialog';
+import DialogCloseButton from '../widgets/Dialog/DialogCloseButton';
 import styles from './WalletListDialog.scss';
 import WalletCard from './WalletCard';
 import globalMessages from '../../i18n/global-messages';

diff --git a/packages/yoroi-extension/app/components/transfer/BaseTransferPage.js b/packages/yoroi-extension/app/components/transfer/BaseTransferPage.js
@@ -5,8 +5,8 @@ import { observer } from 'mobx-react';
 import classnames from 'classnames';
 import { intlShape } from 'react-intl';
 import globalMessages from '../../i18n/global-messages';
-import DialogBackButton from '../widgets/DialogBackButton';
-import Dialog from '../widgets/Dialog';
+import DialogBackButton from '../widgets/Dialog/DialogBackButton';
+import Dialog from '../widgets/Dialog/Dialog';
 import styles from './BaseTransferPage.scss';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import LocalizableError from '../../i18n/LocalizableError';

diff --git a/packages/yoroi-extension/app/components/transfer/ErrorPage.js b/packages/yoroi-extension/app/components/transfer/ErrorPage.js
@@ -4,8 +4,8 @@ import { Component } from 'react';
 import { observer } from 'mobx-react';
 import { intlShape } from 'react-intl';
 import LocalizableError from '../../i18n/LocalizableError';
-import Dialog from '../widgets/Dialog';
-import DialogCloseButton from '../widgets/DialogCloseButton';
+import Dialog from '../widgets/Dialog/Dialog';
+import DialogCloseButton from '../widgets/Dialog/DialogCloseButton';
 import globalMessages from '../../i18n/global-messages';
 import styles from './ErrorPage.scss';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';

diff --git a/packages/yoroi-extension/app/components/transfer/SuccessPage.js b/packages/yoroi-extension/app/components/transfer/SuccessPage.js
@@ -4,8 +4,8 @@ import { Component } from 'react';
 import { observer } from 'mobx-react';
 import { intlShape } from 'react-intl';
 import styles from './SuccessPage.scss';
-import Dialog from '../widgets/Dialog';
-import DialogCloseButton from '../widgets/DialogCloseButton';
+import Dialog from '../widgets/Dialog/Dialog';
+import DialogCloseButton from '../widgets/Dialog/DialogCloseButton';
 import LoadingSpinner from '../widgets/LoadingSpinner';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import { Typography } from '@mui/material';

diff --git a/packages/yoroi-extension/app/components/transfer/SuccessPageRevamp.js b/packages/yoroi-extension/app/components/transfer/SuccessPageRevamp.js
@@ -3,11 +3,11 @@
 import { observer } from 'mobx-react';
 import { Component } from 'react';
 import type { Node } from 'react';
-import DialogCloseButton from '../widgets/DialogCloseButton';
+import DialogCloseButton from '../widgets/Dialog/DialogCloseButton';
 import LoadingSpinner from '../widgets/LoadingSpinner';
 import { Box, Typography } from '@mui/material';
 import { ReactComponent as SuccessImg } from '../../assets/images/transfer-success.inline.svg';
-import Dialog from '../widgets/Dialog';
+import Dialog from '../widgets/Dialog/Dialog';
 
 type Props = {|
   +title: string,

diff --git a/packages/yoroi-extension/app/components/transfer/TransferSummaryPage.js b/packages/yoroi-extension/app/components/transfer/TransferSummaryPage.js
@@ -7,8 +7,8 @@ import { defineMessages, intlShape } from 'react-intl';
 import styles from './TransferSummaryPage.scss';
 import LocalizableError from '../../i18n/LocalizableError';
 import RawHash from '../widgets/hashWrappers/RawHash';
-import DialogCloseButton from '../widgets/DialogCloseButton';
-import Dialog from '../widgets/Dialog';
+import DialogCloseButton from '../widgets/Dialog/DialogCloseButton';
+import Dialog from '../widgets/Dialog/Dialog';
 import ExplorableHashContainer from '../../containers/widgets/ExplorableHashContainer';
 import type { UnitOfAccountSettingType } from '../../types/unitOfAccountType';
 import { calculateAndFormatValue } from '../../utils/unit-of-account';

diff --git a/packages/yoroi-extension/app/components/uri/URIDisplayDialog.js b/packages/yoroi-extension/app/components/uri/URIDisplayDialog.js
@@ -9,9 +9,9 @@ import { buildURI } from '../../utils/URIHandling';
 import { ReactComponent as InfoIcon } from '../../assets/images/revamp/icons/info.inline.svg';
 import { Box, Typography } from '@mui/material';
 import classnames from 'classnames';
-import Dialog from '../widgets/Dialog';
-import DialogBackButton from '../widgets/DialogBackButton';
-import DialogCloseButton from '../widgets/DialogCloseButton';
+import Dialog from '../widgets/Dialog/Dialog';
+import DialogBackButton from '../widgets/Dialog/DialogBackButton';
+import DialogCloseButton from '../widgets/Dialog/DialogCloseButton';
 import QrCodeWrapper from '../widgets/QrCodeWrapper';
 import CopyableAddress from '../widgets/CopyableAddress';
 import BigNumber from 'bignumber.js';

diff --git a/packages/yoroi-extension/app/components/uri/URIGenerateDialog.js b/packages/yoroi-extension/app/components/uri/URIGenerateDialog.js
@@ -7,7 +7,7 @@ import { defineMessages, intlShape } from 'react-intl';
 import ReactToolboxMobxForm from '../../utils/ReactToolboxMobxForm';
 import vjf from 'mobx-react-form/lib/validators/VJF';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
-import DialogCloseButton from '../widgets/DialogCloseButton';
+import DialogCloseButton from '../widgets/Dialog/DialogCloseButton';
 import NumericInputRP from '../common/NumericInputRP';
 import globalMessages from '../../i18n/global-messages';
 import type { TokenRow } from '../../api/ada/lib/storage/database/primitives/tables';
@@ -23,7 +23,7 @@ import BigNumber from 'bignumber.js';
 
 import styles from './URIGenerateDialog.scss';
 // import ThemedDialog from '../widgets/ThemedDialog';
-import Dialog from '../widgets/Dialog';
+import Dialog from '../widgets/Dialog/Dialog';
 
 const messages = defineMessages({
   uriGenerateDialogTitle: {

diff --git a/packages/yoroi-extension/app/components/uri/URIInvalidDialog.js b/packages/yoroi-extension/app/components/uri/URIInvalidDialog.js
@@ -5,8 +5,8 @@ import classnames from 'classnames';
 import { observer } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 
-import Dialog from '../widgets/Dialog';
-import DialogCloseButton from '../widgets/DialogCloseButton';
+import Dialog from '../widgets/Dialog/Dialog';
+import DialogCloseButton from '../widgets/Dialog/DialogCloseButton';
 import globalMessages from '../../i18n/global-messages';
 import { ReactComponent as InvalidURIImg }  from '../../assets/images/uri/invalid-uri.inline.svg';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';

diff --git a/packages/yoroi-extension/app/components/uri/URILandingDialog.js b/packages/yoroi-extension/app/components/uri/URILandingDialog.js
@@ -6,8 +6,8 @@ import { observer } from 'mobx-react';
 import { Button } from '@mui/material';
 import { defineMessages, intlShape } from 'react-intl';
 
-import Dialog from '../widgets/Dialog';
-import DialogCloseButton from '../widgets/DialogCloseButton';
+import Dialog from '../widgets/Dialog/Dialog';
+import DialogCloseButton from '../widgets/Dialog/DialogCloseButton';
 import { ReactComponent as PerformTxImg }  from '../../assets/images/uri/perform-tx-uri.inline.svg';
 
 import styles from './URILandingDialog.scss';

diff --git a/packages/yoroi-extension/app/components/uri/URIVerifyDialog.js b/packages/yoroi-extension/app/components/uri/URIVerifyDialog.js
@@ -5,9 +5,9 @@ import classnames from 'classnames';
 import { observer } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 
-import Dialog from '../widgets/Dialog';
-import DialogCloseButton from '../widgets/DialogCloseButton';
-import DialogBackButton from '../widgets/DialogBackButton';
+import Dialog from '../widgets/Dialog/Dialog';
+import DialogCloseButton from '../widgets/Dialog/DialogCloseButton';
+import DialogBackButton from '../widgets/Dialog/DialogBackButton';
 import type { UriParams } from '../../utils/URIHandling';
 import globalMessages from '../../i18n/global-messages';
 import { truncateAddress, truncateToken } from '../../utils/formatters';