Merge branch 'develop' into Ahmed/date-range… - emurgo/yoroi-frontend@8860d16a

Home / Emurgo / yoroi-frontend / 8860d16a

View on GitHub

File Changes

m

+28/-45

import type { GeneratedData as ReceiveData } from './containers/wallet/Receive';

import type { ConfigType } from '../config/config-types';

import type { GeneratedData as AssetsData } from './containers/wallet/AssetsWrapper';

+

import LoadingPage from './containers/LoadingPage';

+

import StakingPage, { StakingPageContentPromise } from './containers/wallet/staking/StakingPage';

+

import Wallet from './containers/wallet/Wallet';

+

import Settings from './containers/settings/Settings';

+

import Transfer, { WalletTransferPagePromise } from './containers/transfer/Transfer';

+

import VotingPage, { VotingPageContentPromise } from './containers/wallet/voting/VotingPage';

+

import ConnectedWebsitesPage, { ConnectedWebsitesPagePromise } from './containers/dapp-connector/ConnectedWebsitesContainer';

+

import WalletAddPage, { AddAnotherWalletPromise } from './containers/wallet/WalletAddPage'

+

import AssetsWrapper from './containers/wallet/AssetsWrapper';

+

import NFTsWrapper from './containers/wallet/NFTsWrapper';

// PAGES

-

const WalletAddPagePromise = () => import('./containers/wallet/WalletAddPage');

-

const WalletAddPage = React.lazy(WalletAddPagePromise);

const LanguageSelectionPagePromise = () => import('./containers/profile/LanguageSelectionPage');

const LanguageSelectionPage = React.lazy(LanguageSelectionPagePromise);

const TermsOfUsePagePromise = () => import('./containers/profile/TermsOfUsePage');

const UriPromptPage = React.lazy(UriPromptPagePromise);

// SETTINGS

-

const SettingsPromise = () => import('./containers/settings/Settings');

-

const Settings = React.lazy(SettingsPromise);

const GeneralSettingsPagePromise = () => import('./containers/settings/categories/GeneralSettingsPage');

const GeneralSettingsPage = React.lazy(GeneralSettingsPagePromise);

const WalletSettingsPagePromise = () => import('./containers/settings/categories/WalletSettingsPage');

const SupportSettingsPagePromise = () => import('./containers/settings/categories/SupportSettingsPage');

const SupportSettingsPage = React.lazy(SupportSettingsPagePromise);

-

// Dynamic container loading - resolver loads file relative to '/app/' directory

-

const LoadingPagePromise = () => import('./containers/LoadingPage');

-

const LoadingPage = React.lazy(LoadingPagePromise);

const NightlyPagePromise = () => import('./containers/profile/NightlyPage');

const NightlyPage = React.lazy(NightlyPagePromise);

-

const WalletPromise = () => import('./containers/wallet/Wallet');

-

const Wallet = React.lazy(WalletPromise);

-

const MyWalletsPagePromise = () => import('./containers/wallet/MyWalletsPage');

const MyWalletsPage = React.lazy(MyWalletsPagePromise);

const URILandingPagePromise = () => import('./containers/uri/URILandingPage');

const URILandingPage = React.lazy(URILandingPagePromise);

-

const TransferPromise = () => import('./containers/transfer/Transfer');

-

const Transfer = React.lazy(TransferPromise);

-

const ReceivePromise = () => import('./containers/wallet/Receive');

const Receive = React.lazy(ReceivePromise);

const NoticeBoardPagePromise = () => import('./containers/notice-board/NoticeBoardPage');

const NoticeBoardPage = React.lazy(NoticeBoardPagePromise);

-

const VotingPagePromise = () => import('./containers/wallet/voting/VotingPage');

-

const VotingPage = React.lazy(VotingPagePromise);

-

const ComplexityLevelSettingsPagePromise = () => import('./containers/settings/categories/ComplexityLevelSettingsPage');

const ComplexityLevelSettingsPage = React.lazy(ComplexityLevelSettingsPagePromise);

const WalletSwitchPromise = () => import('./containers/WalletSwitch');

const WalletSwitch = React.lazy(WalletSwitchPromise);

-

const StakingPagePromise = () => import('./containers/wallet/staking/StakingPage');

-

const StakingPage = React.lazy(StakingPagePromise);

-

const AssetsWrapperPromise = () => import('./containers/wallet/AssetsWrapper');

-

const AssetsWrapper = React.lazy(AssetsWrapperPromise);

-

const NFTsWrapperPromise = () => import('./containers/wallet/NFTsWrapper');

-

const NFTsWrapper = React.lazy(NFTsWrapperPromise);

-

const TokensPageRevampPromise = () => import('./containers/wallet/TokensPageRevamp');

const TokensPageRevamp = React.lazy(TokensPageRevampPromise);

const NFTDetailPageRevampPromise = () => import('./containers/wallet/NFTDetailPageRevamp');

const NFTDetailPageRevamp = React.lazy(NFTDetailPageRevampPromise);

-

const ConnectedWebsitesPagePromise = () => import('./containers/dapp-connector/ConnectedWebsitesContainer');

-

const ConnectedWebsitesPage = React.lazy(ConnectedWebsitesPagePromise);

-

const YoroiPalettePagePromise = () => import('./containers/experimental/YoroiPalette');

const YoroiPalettePage = React.lazy(YoroiPalettePagePromise);

const YoroiThemesPagePromise = () => import('./containers/experimental/yoroiThemes');

const YoroiThemesPage = React.lazy(YoroiThemesPagePromise);

export const LazyLoadPromises: Array<() => any> = [

-

  WalletAddPagePromise,

+

  AddAnotherWalletPromise,

+

  StakingPageContentPromise,

  LanguageSelectionPagePromise,

  TermsOfUsePagePromise,

  UriPromptPagePromise,

-

  SettingsPromise,

  GeneralSettingsPagePromise,

  WalletSettingsPagePromise,

  ExternalStorageSettingsPagePromise,

  OAuthDropboxPagePromise,

  TermsOfUseSettingsPagePromise,

  SupportSettingsPagePromise,

-

  LoadingPagePromise,

  NightlyPagePromise,

-

  WalletPromise,

  MyWalletsPagePromise,

  WalletSummaryPagePromise,

  WalletSendPagePromise,

  WalletAssetsPagePromise,

  WalletReceivePagePromise,

  URILandingPagePromise,

-

  TransferPromise,

+

  WalletTransferPagePromise,

  ReceivePromise,

  StakingDashboardPagePromise,

  CardanoStakingPagePromise,

  NoticeBoardPagePromise,

-

  VotingPagePromise,

+

  VotingPageContentPromise,

  ComplexityLevelSettingsPagePromise,

  ComplexityLevelPagePromise,

  BlockchainSettingsPagePromise,

  WalletSwitchPromise,

-

  StakingPagePromise,

-

  AssetsWrapperPromise,

  TokensPageRevampPromise,

  TokensDetailPageRevampPromise,

  NFTsPageRevampPromise,

    <Route

      exact

      path={ROUTES.WALLETS.TRANSACTIONS}

-

      component={(props) => {

-

        return <WalletSummaryPage {...props} stores={stores} actions={actions} />

-

}}

+

      component={(props) => <WalletSummaryPage {...props} stores={stores} actions={actions} />}

/>

    <Route

      exact

/>

  </Switch>

-

/* eslint-enable max-len */

export function wrapSettings(

  settingsProps: InjectedOrGenerated<SettingsData>,

    <Settings

      {...settingsProps}

-

      {children}

+

      <Suspense fallback={null}>

+

        {children}

+

      </Suspense>

    </Settings>

);

    <AssetsWrapper

      {...assetsProps}

-

      {children}

+

      <Suspense fallback={null}>

+

        {children}

+

      </Suspense>

    </AssetsWrapper>

);

    <NFTsWrapper

      {...assetsProps}

-

      {children}

+

      <Suspense fallback={null}>

+

        {children}

+

      </Suspense>

    </NFTsWrapper>

);

    <Wallet

      {...walletProps}

-

      {children}

+

      <Suspense fallback={null}>

+

        {children}

+

      </Suspense>

    </Wallet>

);

...

m

packages/yoroi-extension/app/api/ada/lib/storage/bridge/tests/__snapshots__/multiwallet.test.js.snap

+16/-0

        "NetworkId": 250,

        "TokenId": 6,

},

+

      Object {

+

        "Digest": 6.262633522161549e-167,

+

        "Identifier": "",

+

        "IsDefault": true,

+

        "IsNFT": false,

+

        "Metadata": Object {

+

          "assetName": "",

+

          "longName": null,

+

          "numberOfDecimals": 6,

+

          "policyId": "",

+

          "ticker": "TADA",

+

          "type": "Cardano",

+

},

+

        "NetworkId": 350,

+

        "TokenId": 7,

+

},

],

},

  Object {

m

packages/yoroi-extension/app/api/ada/lib/storage/bridge/tests/__snapshots__/shelley.test.js.snap

+16/-0

        "NetworkId": 250,

        "TokenId": 6,

},

+

      Object {

+

        "Digest": 6.262633522161549e-167,

+

        "Identifier": "",

+

        "IsDefault": true,

+

        "IsNFT": false,

+

        "Metadata": Object {

+

          "assetName": "",

+

          "longName": null,

+

          "numberOfDecimals": 6,

+

          "policyId": "",

+

          "ticker": "TADA",

+

          "type": "Cardano",

+

},

+

        "NetworkId": 350,

+

        "TokenId": 7,

+

},

],

},

  Object {

m

packages/yoroi-extension/app/api/ada/lib/storage/bridge/tests/__snapshots__/simpleTxs.test.js.snap

+16/-0

        "NetworkId": 250,

        "TokenId": 6,

},

+

      Object {

+

        "Digest": 6.262633522161549e-167,

+

        "Identifier": "",

+

        "IsDefault": true,

+

        "IsNFT": false,

+

        "Metadata": Object {

+

          "assetName": "",

+

          "longName": null,

+

          "numberOfDecimals": 6,

+

          "policyId": "",

+

          "ticker": "TADA",

+

          "type": "Cardano",

+

},

+

        "NetworkId": 350,

+

        "TokenId": 7,

+

},

],

},

  Object {

m

packages/yoroi-extension/app/api/ada/lib/storage/bridge/tests/__snapshots__/status.test.js.snap

+32/-0

        "NetworkId": 250,

        "TokenId": 6,

},

+

      Object {

+

        "Digest": 6.262633522161549e-167,

+

        "Identifier": "",

+

        "IsDefault": true,

+

        "IsNFT": false,

+

        "Metadata": Object {

+

          "assetName": "",

+

          "longName": null,

+

          "numberOfDecimals": 6,

+

          "policyId": "",

+

          "ticker": "TADA",

+

          "type": "Cardano",

+

},

+

        "NetworkId": 350,

+

        "TokenId": 7,

+

},

],

},

  Object {

        "NetworkId": 250,

        "TokenId": 6,

},

+

      Object {

+

        "Digest": 6.262633522161549e-167,

+

        "Identifier": "",

+

        "IsDefault": true,

+

        "IsNFT": false,

+

        "Metadata": Object {

+

          "assetName": "",

+

          "longName": null,

+

          "numberOfDecimals": 6,

+

          "policyId": "",

+

          "ticker": "TADA",

+

          "type": "Cardano",

+

},

+

        "NetworkId": 350,

+

        "TokenId": 7,

+

},

],

},

  Object {

m

packages/yoroi-extension/app/api/ada/lib/storage/database/prepackaged/explorers.js

+21/-1

},

];

+

const CardanoPreviewTestnetExplorers: Array<$ReadOnly<ExplorerRow>> = [

+

    ExplorerId: 5_50,

+

    NetworkId: networks.CardanoPreviewTestnet.NetworkId,

+

    IsBackup: true,

+

    Endpoints: {

+

      address: 'https://preview.cardanoscan.io/address/',

+

      transaction: 'https://preview.cardanoscan.io/transaction/',

+

      pool: 'https://preview.cardanoscan.io/pool/',

+

      stakeAddress: 'https://preview.cardanoscan.io/stakeKey/',

+

      token: 'https://preview.cardanoscan.io/token/',

+

},

+

    Name: 'CardanoScan',

+

},

+

];

+

export const prepackagedExplorers: Map<number, $ReadOnlyArray<$ReadOnly<ExplorerRow>>> = new Map([

  [networks.CardanoMainnet.NetworkId, CardanoMainnetExplorers],

  [networks.CardanoTestnet.NetworkId, CardanoTestnetExplorers],

  [networks.CardanoPreprodTestnet.NetworkId, CardanoPreprodTestnetExplorers],

+

  [networks.CardanoPreviewTestnet.NetworkId, CardanoPreviewTestnetExplorers],

  [networks.JormungandrMainnet.NetworkId, JormungandrExplorers],

  [networks.ErgoMainnet.NetworkId, ErgoExplorers],

  [networks.AlonzoTestnet.NetworkId, AlonzoTestnetExplorers],

      CardanoTestnetExplorers.find(explorer => explorer.IsBackup)

)],

    [networks.CardanoPreprodTestnet.NetworkId, getOrThrow(

-

      CardanoTestnetExplorers.find(explorer => explorer.IsBackup)

+

      CardanoPreprodTestnetExplorers.find(explorer => explorer.IsBackup)

+

)],

+

    [networks.CardanoPreviewTestnet.NetworkId, getOrThrow(

+

      CardanoPreviewTestnetExplorers.find(explorer => explorer.IsBackup)

)],

    [networks.JormungandrMainnet.NetworkId, getOrThrow(

      JormungandrExplorers.find(explorer => explorer.IsBackup)

m

packages/yoroi-extension/app/api/ada/lib/storage/database/prepackaged/networks.js

+46/-2

    CoinType: CoinTypes.CARDANO,

    Fork: CardanoForks.Haskell,

  }: NetworkRow),

+

  CardanoPreviewTestnet: ({

+

    NetworkId: 3_50,

+

    NetworkName: 'Cardano Preview Testnet',

+

    Backend: {

+

      BackendService: environment.isTest()

+

        ? 'http://localhost:21000'

+

        : 'https://preview-backend.emurgornd.com',

+

      WebSocket: environment.isTest()

+

        ? 'ws://localhost:21000'

+

        : 'wss://preview-backend.emurgornd.com:443',

+

      TokenInfoService:

+

        'https://stage-cdn.yoroiwallet.com',

+

},

+

    BaseConfig: ([

+

      Object.freeze({

+

        StartAt: 0,

+

        ChainNetworkId: '0',

+

        ByronNetworkId: 2,

+

        GenesisDate: '1666656000000',

+

        SlotsPerEpoch: 21600,

+

        SlotDuration: 20,

+

}),

+

      Object.freeze({

+

        StartAt: 0,

+

        SlotsPerEpoch: 86400,

+

        SlotDuration: 1,

+

        PerEpochPercentageReward: 69344,

+

        LinearFee: {

+

          coefficient: '44',

+

          constant: '155381',

+

},

+

        CoinsPerUtxoWord: '34482',

+

        MinimumUtxoVal: '1000000',

+

        PoolDeposit: '500000000',

+

        KeyDeposit: '2000000',

+

})

+

    ]: CardanoHaskellBaseConfig),

+

    CoinType: CoinTypes.CARDANO,

+

    Fork: CardanoForks.Haskell,

+

  }: NetworkRow),

});

export function isTestnet(

  network: $ReadOnly<NetworkRow>,

): boolean {

  return network.NetworkId === networks.JormungandrMainnet.NetworkId

    || network.NetworkId === networks.CardanoTestnet.NetworkId

-

    || network.NetworkId === networks.CardanoPreprodTestnet.NetworkId;

+

    || network.NetworkId === networks.CardanoPreprodTestnet.NetworkId

+

    || network.NetworkId === networks.CardanoPreviewTestnet.NetworkId;

          policyId: PRIMARY_ASSET_CONSTANTS.Cardano,

          assetName: PRIMARY_ASSET_CONSTANTS.Cardano,

          ticker:

-

            (network === networks.CardanoTestnet || network === networks.CardanoPreprodTestnet || network === networks.AlonzoTestnet)

+

            (network === networks.CardanoTestnet

+

              || network === networks.CardanoPreprodTestnet

+

              || network === networks.CardanoPreviewTestnet

+

              || network === networks.AlonzoTestnet)

              ? 'TADA'

              : 'ADA',

          longName: null,

m

packages/yoroi-extension/app/api/ada/lib/storage/tests/__snapshots__/index.test.js.snap

+64/-0

      "Name": "CardanoScan",

      "NetworkId": 250,

},

+

    Object {

+

      "Endpoints": Object {

+

        "address": "https://preview.cardanoscan.io/address/",

+

        "pool": "https://preview.cardanoscan.io/pool/",

+

        "stakeAddress": "https://preview.cardanoscan.io/stakeKey/",

+

        "token": "https://preview.cardanoscan.io/token/",

+

        "transaction": "https://preview.cardanoscan.io/transaction/",

+

},

+

      "ExplorerId": 550,

+

      "IsBackup": true,

+

      "Name": "CardanoScan",

+

      "NetworkId": 350,

+

},

    Object {

      "Endpoints": Object {

        "address": "https://adastat.net/address/",

      "NetworkId": 250,

      "NetworkName": "Cardano Preprod Testnet",

},

+

    Object {

+

      "Backend": Object {

+

        "BackendService": "https://preview-backend.emurgornd.com",

+

        "TokenInfoService": "https://stage-cdn.yoroiwallet.com",

+

        "WebSocket": "wss://preview-backend.emurgornd.com:443",

+

},

+

      "BaseConfig": Array [

+

        Object {

+

          "ByronNetworkId": 2,

+

          "ChainNetworkId": "0",

+

          "GenesisDate": "1666656000000",

+

          "SlotDuration": 20,

+

          "SlotsPerEpoch": 21600,

+

          "StartAt": 0,

+

},

+

        Object {

+

          "CoinsPerUtxoWord": "34482",

+

          "KeyDeposit": "2000000",

+

          "LinearFee": Object {

+

            "coefficient": "44",

+

            "constant": "155381",

+

},

+

          "MinimumUtxoVal": "1000000",

+

          "PerEpochPercentageReward": 69344,

+

          "PoolDeposit": "500000000",

+

          "SlotDuration": 1,

+

          "SlotsPerEpoch": 86400,

+

          "StartAt": 0,

+

},

+

],

+

      "CoinType": 2147485463,

+

      "Fork": 0,

+

      "NetworkId": 350,

+

      "NetworkName": "Cardano Preview Testnet",

+

},

],

  "PreferredExplorer": Array [],

  "PriceData": Array [],

      "NetworkId": 250,

      "TokenId": 6,

},

+

    Object {

+

      "Digest": 6.262633522161549e-167,

+

      "Identifier": "",

+

      "IsDefault": true,

+

      "IsNFT": false,

+

      "Metadata": Object {

+

        "assetName": "",

+

        "longName": null,

+

        "numberOfDecimals": 6,

+

        "policyId": "",

+

        "ticker": "TADA",

+

        "type": "Cardano",

+

},

+

      "NetworkId": 350,

+

      "TokenId": 7,

+

},

],

  "TokenList": Array [],

  "Transaction": Array [],

m

packages/yoroi-extension/app/api/ergo/lib/storage/bridge/tests/__snapshots__/simpleTxs.test.js.snap

+16/-0

        "NetworkId": 250,

        "TokenId": 6,

},

+

      Object {

+

        "Digest": 6.262633522161549e-167,

+

        "Identifier": "",

+

        "IsDefault": true,

+

        "IsNFT": false,

+

        "Metadata": Object {

+

          "assetName": "",

+

          "longName": null,

+

          "numberOfDecimals": 6,

+

          "policyId": "",

+

          "ticker": "TADA",

+

          "type": "Cardano",

+

},

+

        "NetworkId": 350,

+

        "TokenId": 7,

+

},

],

},

  Object {

m

packages/yoroi-extension/app/components/wallet/add/option-dialog/PickCurrencyOptionDialog.js

+21/-0

  +onCardano: void => void,

  +onCardanoTestnet: void => void,

  +onCardanoPreprodTestnet: void => void,

+

  +onCardanoPreviewTestnet: void => void,

  +onErgo: void | (void => void),

  +onAlonzoTestnet: void => void,

  +onExternalLinkClick: MouseEvent => void,

/>

</>

+

            {(!environment.isProduction() || environment.isNightly() || environment.isTest()) &&

+

<>

+

                <OptionBlock

+

                  parentName="PickCurrencyOptionDialog"

+

                  type="cardanoTestnet"

+

                  title="Cardano Preview Testnet"

+

                  onSubmit={this.props.onCardanoPreviewTestnet}

+

                  learnMoreText={

+

<>

+

                      {intl.formatMessage(messages.testnetDescription)}<br />

+

<a

+

                        href="https://testnets.cardano.org/"

+

                        onClick={event => this.props.onExternalLinkClick(event)}

+

                        {intl.formatMessage(globalMessages.learnMore)}

+

                      </a>

+

                    </>}

+

/>

+

</>

+

            {/* <TODO:PENDING_REMOVAL> */}

            {/*{(!environment.isProduction() || environment.isNightly() || environment.isTest()) &&*/}

            {/*  <OptionBlock*/}

m

packages/yoroi-extension/app/containers/dapp-connector/ConnectedWebsitesContainer.js

+16/-12

// @flow

import type { Node, ComponentType } from 'react'

-

import { Component } from 'react'

+

import { Component, lazy, Suspense } from 'react'

import { computed } from 'mobx'

import { observer } from 'mobx-react'

import type { $npm$ReactIntl$IntlFormat } from 'react-intl'

import { withLayout } from '../../styles/context/layout'

import type { LayoutComponentMap } from '../../styles/context/layout'

import SidebarContainer from '../SidebarContainer'

-

import ConnectedWebsitesPage from '../../components/dapp-connector/ConnectedWebsites/ConnectedWebsitesPage'

import DappConnectorNavbar from '../../components/dapp-connector/Layout/DappConnectorNavbar'

import { genLookupOrFail } from '../../stores/stateless/tokenHelpers'

import FullscreenLayout from '../../components/layout/FullscreenLayout'

import type { MultiToken } from '../../api/common/lib/MultiToken'

+

export const ConnectedWebsitesPagePromise: void => Promise<any> = () => import('../../components/dapp-connector/ConnectedWebsites/ConnectedWebsitesPage');

+

const ConnectedWebsitesPage = lazy(ConnectedWebsitesPagePromise);

+

export type GeneratedData = typeof ConnectedWebsitesPageContainer.prototype.generated;

type Props = InjectedOrGenerated<GeneratedData>

        navbar={<DappConnectorNavbar />}

        <FullscreenLayout bottomPadding={0}>

-

          <ConnectedWebsitesPage

-

            whitelistEntries={this.generated.stores.connector.currentConnectorWhitelist}

-

            wallets={wallets}

-

            onRemoveWallet={this.onRemoveWallet}

-

            activeSites={this.generated.stores.connector.activeSites.sites}

-

            getTokenInfo={genLookupOrFail(this.generated.stores.tokenInfoStore.tokenInfo)}

-

            shouldHideBalance={this.generated.stores.profile.shouldHideBalance}

-

            getConceptualWallet={this.getConceptualWallet.bind(this)}

-

            getWalletInfo={this.getWalletInfo.bind(this)}

-

/>)

+

          <Suspense fallback={null}>

+

            <ConnectedWebsitesPage

+

              whitelistEntries={this.generated.stores.connector.currentConnectorWhitelist}

+

              wallets={wallets}

+

              onRemoveWallet={this.onRemoveWallet}

+

              activeSites={this.generated.stores.connector.activeSites.sites}

+

              getTokenInfo={genLookupOrFail(this.generated.stores.tokenInfoStore.tokenInfo)}

+

              shouldHideBalance={this.generated.stores.profile.shouldHideBalance}

+

              getConceptualWallet={this.getConceptualWallet.bind(this)}

+

              getWalletInfo={this.getWalletInfo.bind(this)}

+

/>

+

          </Suspense>

        </FullscreenLayout>

      </TopBarLayout>

);

m

packages/yoroi-extension/app/containers/transfer/Transfer.js

+19/-8

// @flow

-

import { Component } from 'react';

+

import { Component, lazy, Suspense } from 'react';

import type { Node, ComponentType } from 'react';

import { computed } from 'mobx';

import { observer } from 'mobx-react';

import NavBarTitle from '../../components/topbar/NavBarTitle';

import NavBarContainer from '../NavBarContainer';

import globalMessages from '../../i18n/global-messages';

-

import WalletTransferPage from './WalletTransferPage';

import type { GeneratedData as WalletTransferPageData } from './WalletTransferPage';

import type { GeneratedData as SidebarContainerData } from '../SidebarContainer';

import type { GeneratedData as NavBarContainerData } from '../NavBarContainer';

import type { LayoutComponentMap } from '../../styles/context/layout';

import type { GeneratedData as NavBarContainerRevampData } from '../NavBarContainerRevamp';

+

export const WalletTransferPagePromise: void => Promise<any> = () => import('./WalletTransferPage');

+

const WalletTransferPage = lazy(WalletTransferPagePromise);

+

export type GeneratedData = typeof Transfer.prototype.generated;

type Props = {|

    if (wallet.getParent().getNetworkInfo().CoinType !== CoinTypes.CARDANO) {

      return (<UnsupportedWallet />);

+

    const isRevamp = this.generated.stores.profile.isRevampTheme;

    return (

<>

-

        <HorizontalLine />

+

        {!isRevamp && <HorizontalLine />}

        <BackgroundColoredLayout>

-

          <WalletTransferPage

-

            {...this.generated.WalletTransferPageProps}

-

            publicDeriver={wallet}

-

/>

+

          <Suspense fallback={null}>

+

            <WalletTransferPage

+

              {...this.generated.WalletTransferPageProps}

+

              publicDeriver={wallet}

+

/>

+

          </Suspense>

        </BackgroundColoredLayout>

</>

);

|},

    stores: {|

      app: {| currentRoute: string |},

-

      wallets: {| selected: null | PublicDeriver<> |}

+

      wallets: {| selected: null | PublicDeriver<> |},

+

      profile: {|

+

          isRevampTheme: boolean,

+

|},

|}

    |} {

    if (this.props.generated !== undefined) {

},

        wallets: {

          selected: stores.wallets.selected,

+

},

+

        profile: {

+

          isRevampTheme: stores.profile.isRevampTheme,

},

      actions: {

m

packages/yoroi-extension/app/containers/transfer/Transfer.mock.js

+1/-0

} => {| generated: GeneratedData |} = (request) => ({

  // $FlowFixMe[prop-missing]: Some props are quite different for revamp components

  generated: {

+

    // $FlowFixMe[prop-missing]: Some props are quite different for revamp components

    stores: {

      app: {

        currentRoute: request.currentRoute,

m

packages/yoroi-extension/app/containers/wallet/WalletAddPage.js

+5/-2

// @flow

import type { Node, ComponentType } from 'react';

-

import { Component } from 'react';

+

import { Component, lazy } from 'react';

import { observer } from 'mobx-react';

import { computed } from 'mobx';

import { intlShape } from 'react-intl';

import BannerContainer from '../banners/BannerContainer';

import type { GeneratedData as BannerContainerData } from '../banners/BannerContainer';

import WalletAdd from '../../components/wallet/WalletAdd';

-

import AddAnotherWallet from '../../components/wallet/add/AddAnotherWallet';

import WalletCreateDialogContainer from './dialogs/WalletCreateDialogContainer';

import type { GeneratedData as WalletCreateDialogContainerData } from './dialogs/WalletCreateDialogContainer';

import { withLayout } from '../../styles/context/layout'

import type { LayoutComponentMap } from '../../styles/context/layout'

+

export const AddAnotherWalletPromise: void => Promise<any> = () => import('../../components/wallet/add/AddAnotherWallet');

+

const AddAnotherWallet = lazy(AddAnotherWalletPromise);

+

export type GeneratedData = typeof WalletAddPage.prototype.generated;

type Props = InjectedOrGenerated<GeneratedData>;

        onCardano={() => actions.profile.setSelectedNetwork.trigger(networks.CardanoMainnet)}

        onCardanoTestnet={() => actions.profile.setSelectedNetwork.trigger(networks.CardanoTestnet)}

        onCardanoPreprodTestnet={() => actions.profile.setSelectedNetwork.trigger(networks.CardanoPreprodTestnet)}

+

        onCardanoPreviewTestnet={() => actions.profile.setSelectedNetwork.trigger(networks.CardanoPreviewTestnet)}

        onErgo={(uiDialogs.isOpen(WalletConnectHWOptionDialog) || uiDialogs.isOpen(WalletCreateOptionDialog))

          ? undefined

          : () => actions.profile.setSelectedNetwork.trigger(networks.ErgoMainnet)}

m

packages/yoroi-extension/app/containers/wallet/dialogs/PickCurrencyDialogContainer.js

+2/-0

  +onCardano: void => void,

  +onCardanoTestnet: void => void,

  +onCardanoPreprodTestnet: void => void,

+

  +onCardanoPreviewTestnet: void => void,

  +onErgo: void | (void => void),

  +onAlonzoTestnet: void => void,

|};

        onCardano={this.props.onCardano}

        onCardanoTestnet={this.props.onCardanoTestnet}

        onCardanoPreprodTestnet={this.props.onCardanoPreprodTestnet}

+

        onCardanoPreviewTestnet={this.props.onCardanoPreviewTestnet}

        onErgo={this.props.onErgo}

        onAlonzoTestnet={this.props.onAlonzoTestnet}

/>

m

packages/yoroi-extension/app/containers/wallet/staking/StakingPage.js

+14/-642

// @flow

-

import type { ComponentType, Node } from 'react';

-

import type { $npm$ReactIntl$IntlFormat } from 'react-intl';

+

import { Component, Suspense, lazy } from 'react';

+

import type { Node } from 'react';

import type { GeneratedData as BannerContainerData } from '../../banners/BannerContainer';

import type { InjectedOrGenerated } from '../../../types/injectedPropsType';

import type { GeneratedData as SidebarContainerData } from '../../SidebarContainer';

import type { GeneratedData as NavBarContainerRevampData } from '../../NavBarContainerRevamp';

-

import type { LayoutComponentMap } from '../../../styles/context/layout';

import type { ConfigType } from '../../../../config/config-types';

-

import type { TxRequests } from '../../../stores/toplevel/TransactionsStore';

-

import type { DelegationRequests, PoolMeta } from '../../../stores/toplevel/DelegationStore';

-

import type { GeneratedData as UnmangleTxDialogContainerData } from '../../transfer/UnmangleTxDialogContainer';

-

import type { GeneratedData as DeregisterDialogContainerData } from '../../transfer/DeregisterDialogContainer';

-

import type { TokenInfoMap } from '../../../stores/toplevel/TokenInfoStore';

-

import type { NetworkRow } from '../../../api/ada/lib/storage/database/primitives/tables';

-

import type { UnitOfAccountSettingType } from '../../../types/unitOfAccountType';

-

import type { AdaDelegationRequests } from '../../../stores/ada/AdaDelegationStore';

-

import type { GeneratedData as WithdrawalTxDialogContainerData } from '../../transfer/WithdrawalTxDialogContainer';

-

import type { PoolRequest } from '../../../api/jormungandr/lib/storage/bridge/delegationUtils';

-

import type { TokenEntry } from '../../../api/common/lib/MultiToken';

-

import type {

-

  CurrentTimeRequests,

-

  TimeCalcRequests,

-

} from '../../../stores/base/BaseCardanoTimeStore';

-

import { Component } from 'react';

+

import { intlShape } from 'react-intl';

+

import type { $npm$ReactIntl$IntlFormat } from 'react-intl';

import { computed } from 'mobx';

import { observer } from 'mobx-react';

-

import { intlShape } from 'react-intl';

-

import moment from 'moment';

-

import globalMessages from '../../../i18n/global-messages';

import BannerContainer from '../../banners/BannerContainer';

import SidebarContainer from '../../SidebarContainer';

import NavBarContainerRevamp from '../../NavBarContainerRevamp';

import TopBarLayout from '../../../components/layout/TopBarLayout';

import NavBarTitle from '../../../components/topbar/NavBarTitle';

-

import { PublicDeriver } from '../../../api/ada/lib/storage/models/PublicDeriver/index';

-

import { withLayout } from '../../../styles/context/layout';

-

import WalletEmptyBanner from '../WalletEmptyBanner';

-

import BuySellDialog from '../../../components/buySell/BuySellDialog';

-

import CardanoStakingPage from './CardanoStakingPage';

-

import { Box, styled } from '@mui/system';

-

import SummaryCard from '../../../components/wallet/staking/dashboard-revamp/SummaryCard';

-

import EpochProgressWrapper from '../../../components/wallet/staking/dashboard-revamp/EpochProgressWrapper';

-

import OverviewModal from '../../../components/wallet/staking/dashboard-revamp/OverviewDialog';

-

import LocalizableError from '../../../i18n/LocalizableError';

-

import { MultiToken } from '../../../api/common/lib/MultiToken';

-

import { genLookupOrFail } from '../../../stores/stateless/tokenHelpers';

-

import UnmangleTxDialogContainer from '../../transfer/UnmangleTxDialogContainer';

-

import DeregisterDialogContainer from '../../transfer/DeregisterDialogContainer';

-

import { calculateAndFormatValue } from '../../../utils/unit-of-account';

-

import {

-

  isCardanoHaskell,

-

  isJormungandr,

-

} from '../../../api/ada/lib/storage/database/prepackaged/networks';

-

import EpochProgressContainer from './EpochProgressContainer';

-

import WithdrawalTxDialogContainer from '../../transfer/WithdrawalTxDialogContainer';

-

import UndelegateDialog from '../../../components/wallet/staking/dashboard/UndelegateDialog';

-

import { generateGraphData } from '../../../utils/graph';

-

import { ApiOptions, getApiForNetwork } from '../../../api/common/utils';

-

import RewardHistoryDialog from '../../../components/wallet/staking/dashboard-revamp/RewardHistoryDialog';

-

import DelegatedStakePoolCard from '../../../components/wallet/staking/dashboard-revamp/DelegatedStakePoolCard';

+

export const StakingPageContentPromise: void => Promise<any> = () => import('./StakingPageContent');

+

const StakingPageContent = lazy(StakingPageContentPromise);

export type GeneratedData = typeof StakingPage.prototype.generated;

// populated by ConfigWebpackPlugin

declare var CONFIG: ConfigType;

-

type Props = {|

-

  ...InjectedOrGenerated<GeneratedData>,

-

  actions: any,

-

  stores: any,

-

|};

-

type InjectedProps = {|

-

  +renderLayoutComponent: LayoutComponentMap => Node,

-

|};

+

type Props = {| ...InjectedOrGenerated<GeneratedData>, stores: any, actions: any |};

-

type AllProps = {| ...Props, ...InjectedProps |};

@observer

-

class StakingPage extends Component<AllProps> {

+

class StakingPage extends Component<Props> {

  static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {

    intl: intlShape.isRequired,

};

-

  onClose: void => void = () => {

-

    this.generated.actions.dialogs.closeActiveDialog.trigger();

-

};

-

  _isRegistered: (PublicDeriver<>) => ?boolean = publicDeriver => {

-

    if (!isCardanoHaskell(publicDeriver.getParent().getNetworkInfo())) {

-

      return undefined;

-

    const adaDelegationRequests = this.generated.stores.substores.ada.delegation.getDelegationRequests(

-

      publicDeriver

-

);

-

    if (adaDelegationRequests == null) return undefined;

-

    return adaDelegationRequests.getRegistrationHistory.result?.current;

-

};

-

  async componentDidMount() {

-

    const timeStore = this.generated.stores.time;

-

    const publicDeriver = this.generated.stores.wallets.selected;

-

    if (publicDeriver == null) {

-

      throw new Error(`${nameof(StakingPage)} no public deriver. Should never happen`);

-

    const timeCalcRequests = timeStore.getTimeCalcRequests(publicDeriver);

-

    await timeCalcRequests.requests.toAbsoluteSlot.execute().promise;

-

    await timeCalcRequests.requests.toRealTime.execute().promise;

-

    await timeCalcRequests.requests.currentEpochLength.execute().promise;

-

    await timeCalcRequests.requests.currentSlotLength.execute().promise;

-

    await timeCalcRequests.requests.timeSinceGenesis.execute().promise;

-

  getErrorInFetch: (PublicDeriver<>) => void | {| error: LocalizableError |} = publicDeriver => {

-

    const delegationStore = this.generated.stores.delegation;

-

    const delegationRequests = delegationStore.getDelegationRequests(publicDeriver);

-

    if (delegationRequests == null) {

-

      throw new Error(`${nameof(StakingPage)} opened for non-reward wallet`);

-

    if (delegationRequests.error != null) {

-

      return { error: delegationRequests.error };

-

    if (delegationRequests.getCurrentDelegation.result != null) {

-

      const currentDelegation = delegationRequests.getCurrentDelegation.result;

-

      const currEpochInfo = currentDelegation.currEpoch;

-

      if (currEpochInfo == null) {

-

        return undefined;

-

    return undefined;

-

};

-

  getEpochLengthInDays: (PublicDeriver<>) => ?number = publicDeriver => {

-

    const timeStore = this.generated.stores.time;

-

    const timeCalcRequests = timeStore.getTimeCalcRequests(publicDeriver);

-

    const getEpochLength = timeCalcRequests.requests.currentEpochLength.result;

-

    if (getEpochLength == null) return null;

-

    const getSlotLength = timeCalcRequests.requests.currentSlotLength.result;

-

    if (getSlotLength == null) return null;

-

    const epochLengthInSeconds = getEpochLength() * getSlotLength();

-

    const epochLengthInDays = epochLengthInSeconds / (60 * 60 * 24);

-

    return epochLengthInDays;

-

};

-

  getUserSummary: ({|

-

    delegationRequests: DelegationRequests,

-

    publicDeriver: PublicDeriver<>,

-

    errorIfPresent: void | {| error: LocalizableError |},

-

  |}) => Node = request => {

-

    const { actions, stores } = this.generated;

-

    const showRewardAmount =

-

      request.delegationRequests.getCurrentDelegation.wasExecuted &&

-

      request.delegationRequests.getDelegatedBalance.wasExecuted &&

-

      request.errorIfPresent == null;

-

    const defaultToken = request.publicDeriver.getParent().getDefaultToken();

-

    const currentlyDelegating =

-

      (request.delegationRequests.getCurrentDelegation.result?.currEpoch?.pools ?? []).length > 0;

-

    return (

-

      <SummaryCard

-

        onOverviewClick={() =>

-

          actions.dialogs.open.trigger({

-

            dialog: OverviewModal,

-

})

-

        unitOfAccount={this.toUnitOfAccount}

-

        getTokenInfo={genLookupOrFail(stores.tokenInfoStore.tokenInfo)}

-

        shouldHideBalance={stores.profile.shouldHideBalance}

-

        totalRewards={

-

          !showRewardAmount || request.delegationRequests.getDelegatedBalance.result == null

-

            ? undefined

-

            : request.delegationRequests.getDelegatedBalance.result.accountPart

-

        totalDelegated={(() => {

-

          if (!showRewardAmount) return undefined;

-

          if (request.delegationRequests.getDelegatedBalance.result == null) return undefined;

-

          return currentlyDelegating

-

            ? request.delegationRequests.getDelegatedBalance.result.utxoPart.joinAddCopy(

-

                request.delegationRequests.getDelegatedBalance.result.accountPart

-

            : new MultiToken([], defaultToken);

-

        })()}

-

        epochLength={this.getEpochLengthInDays(request.publicDeriver)}

-

        graphData={generateGraphData({

-

          delegationRequests: request.delegationRequests,

...

a

packages/yoroi-extension/app/containers/wallet/staking/StakingPageContent.js

+679/-0

+

// @flow

+

import type { ComponentType, Node } from 'react';

+

import type { $npm$ReactIntl$IntlFormat } from 'react-intl';

+

import type { InjectedOrGenerated } from '../../../types/injectedPropsType';

+

import type { LayoutComponentMap } from '../../../styles/context/layout';

+

import type { ConfigType } from '../../../../config/config-types';

+

import type { TxRequests } from '../../../stores/toplevel/TransactionsStore';

+

import type { DelegationRequests, PoolMeta } from '../../../stores/toplevel/DelegationStore';

+

import type { GeneratedData as UnmangleTxDialogContainerData } from '../../transfer/UnmangleTxDialogContainer';

+

import type { GeneratedData as DeregisterDialogContainerData } from '../../transfer/DeregisterDialogContainer';

+

import type { TokenInfoMap } from '../../../stores/toplevel/TokenInfoStore';

+

import type { NetworkRow } from '../../../api/ada/lib/storage/database/primitives/tables';

+

import type { UnitOfAccountSettingType } from '../../../types/unitOfAccountType';

+

import type { AdaDelegationRequests } from '../../../stores/ada/AdaDelegationStore';

+

import type { GeneratedData as WithdrawalTxDialogContainerData } from '../../transfer/WithdrawalTxDialogContainer';

+

import type { PoolRequest } from '../../../api/jormungandr/lib/storage/bridge/delegationUtils';

+

import type { TokenEntry } from '../../../api/common/lib/MultiToken';

+

import type {

+

  CurrentTimeRequests,

+

  TimeCalcRequests,

+

} from '../../../stores/base/BaseCardanoTimeStore';

+

import { Component } from 'react';

+

import { computed } from 'mobx';

+

import { observer } from 'mobx-react';

+

import { intlShape } from 'react-intl';

+

import moment from 'moment';

+

import globalMessages from '../../../i18n/global-messages';

+

import { PublicDeriver } from '../../../api/ada/lib/storage/models/PublicDeriver/index';

+

import { withLayout } from '../../../styles/context/layout';

+

import WalletEmptyBanner from '../WalletEmptyBanner';

+

import BuySellDialog from '../../../components/buySell/BuySellDialog';

+

import CardanoStakingPage from './CardanoStakingPage';

+

import { Box, styled } from '@mui/system';

+

import SummaryCard from '../../../components/wallet/staking/dashboard-revamp/SummaryCard';

+

import EpochProgressWrapper from '../../../components/wallet/staking/dashboard-revamp/EpochProgressWrapper';

+

import OverviewModal from '../../../components/wallet/staking/dashboard-revamp/OverviewDialog';

+

import LocalizableError from '../../../i18n/LocalizableError';

+

import { MultiToken } from '../../../api/common/lib/MultiToken';

+

import { genLookupOrFail } from '../../../stores/stateless/tokenHelpers';

+

import UnmangleTxDialogContainer from '../../transfer/UnmangleTxDialogContainer';

+

import DeregisterDialogContainer from '../../transfer/DeregisterDialogContainer';

+

import { calculateAndFormatValue } from '../../../utils/unit-of-account';

+

import {

+

  isCardanoHaskell,

+

  isJormungandr,

+

} from '../../../api/ada/lib/storage/database/prepackaged/networks';

+

import EpochProgressContainer from './EpochProgressContainer';

+

import WithdrawalTxDialogContainer from '../../transfer/WithdrawalTxDialogContainer';

+

import UndelegateDialog from '../../../components/wallet/staking/dashboard/UndelegateDialog';

+

import { generateGraphData } from '../../../utils/graph';

+

import { ApiOptions, getApiForNetwork } from '../../../api/common/utils';

+

import RewardHistoryDialog from '../../../components/wallet/staking/dashboard-revamp/RewardHistoryDialog';

+

import DelegatedStakePoolCard from '../../../components/wallet/staking/dashboard-revamp/DelegatedStakePoolCard';

+

export type GeneratedData = typeof StakingPageContent.prototype.generated;

+

// populated by ConfigWebpackPlugin

+

declare var CONFIG: ConfigType;

+

type Props = {|

+

  ...InjectedOrGenerated<GeneratedData>,

+

  actions: any,

+

  stores: any,

+

|};

+

type InjectedProps = {|

+

  +renderLayoutComponent: LayoutComponentMap => Node,

+

|};

+

type AllProps = {| ...Props, ...InjectedProps |};

+

@observer

+

class StakingPageContent extends Component<AllProps> {

+

  static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {

+

    intl: intlShape.isRequired,

+

};

+

  onClose: void => void = () => {

+

    this.generated.actions.dialogs.closeActiveDialog.trigger();

+

};

+

  _isRegistered: (PublicDeriver<>) => ?boolean = publicDeriver => {

+

    if (!isCardanoHaskell(publicDeriver.getParent().getNetworkInfo())) {

+

      return undefined;

+

    const delegation = this.generated.stores.substores.ada.delegation;

+

    const adaDelegationRequests = delegation.getDelegationRequests(publicDeriver);

+

    if (adaDelegationRequests == null) return undefined;

+

    return adaDelegationRequests.getRegistrationHistory.result?.current;

+

};

+

  async componentDidMount() {

+

    const timeStore = this.generated.stores.time;

+

    const publicDeriver = this.generated.stores.wallets.selected;

+

    if (publicDeriver == null) {

+

      throw new Error(`${nameof(StakingPageContent)} no public deriver. Should never happen`);

+

    const timeCalcRequests = timeStore.getTimeCalcRequests(publicDeriver);

+

    await timeCalcRequests.requests.toAbsoluteSlot.execute().promise;

+

    await timeCalcRequests.requests.toRealTime.execute().promise;

+

    await timeCalcRequests.requests.currentEpochLength.execute().promise;

+

    await timeCalcRequests.requests.currentSlotLength.execute().promise;

+

    await timeCalcRequests.requests.timeSinceGenesis.execute().promise;

+

  getErrorInFetch: (PublicDeriver<>) => void | {| error: LocalizableError |} = publicDeriver => {

+

    const delegationStore = this.generated.stores.delegation;

+

    const delegationRequests = delegationStore.getDelegationRequests(publicDeriver);

+

    if (delegationRequests == null) {

+

      throw new Error(`${nameof(StakingPageContent)} opened for non-reward wallet`);

+

    if (delegationRequests.error != null) {

+

      return { error: delegationRequests.error };

+

    if (delegationRequests.getCurrentDelegation.result != null) {

+

      const currentDelegation = delegationRequests.getCurrentDelegation.result;

+

      const currEpochInfo = currentDelegation.currEpoch;

+

      if (currEpochInfo == null) {

+

        return undefined;

+

    return undefined;

+

};

+

  getEpochLengthInDays: (PublicDeriver<>) => ?number = publicDeriver => {

+

    const timeStore = this.generated.stores.time;

+

    const timeCalcRequests = timeStore.getTimeCalcRequests(publicDeriver);

+

    const getEpochLength = timeCalcRequests.requests.currentEpochLength.result;

+

    if (getEpochLength == null) return null;

+

    const getSlotLength = timeCalcRequests.requests.currentSlotLength.result;

+

    if (getSlotLength == null) return null;

+

    const epochLengthInSeconds = getEpochLength() * getSlotLength();

+

    const epochLengthInDays = epochLengthInSeconds / (60 * 60 * 24);

+

    return epochLengthInDays;

+

};

+

  getUserSummary: ({|

+

    delegationRequests: DelegationRequests,

+

    publicDeriver: PublicDeriver<>,

+

    errorIfPresent: void | {| error: LocalizableError |},

+

  |}) => Node = request => {

+

    const { actions, stores } = this.generated;

+

    const showRewardAmount =

+

      request.delegationRequests.getCurrentDelegation.wasExecuted &&

+

      request.delegationRequests.getDelegatedBalance.wasExecuted &&

+

      request.errorIfPresent == null;

+

    const defaultToken = request.publicDeriver.getParent().getDefaultToken();

+

    const currentlyDelegating =

+

      (request.delegationRequests.getCurrentDelegation.result?.currEpoch?.pools ?? []).length > 0;

+

    return (

+

      <SummaryCard

+

        onOverviewClick={() =>

+

          actions.dialogs.open.trigger({

+

            dialog: OverviewModal,

+

})

+

        unitOfAccount={this.toUnitOfAccount}

+

        getTokenInfo={genLookupOrFail(stores.tokenInfoStore.tokenInfo)}

+

        shouldHideBalance={stores.profile.shouldHideBalance}

+

        totalRewards={

+

          !showRewardAmount || request.delegationRequests.getDelegatedBalance.result == null

+

            ? undefined

+

            : request.delegationRequests.getDelegatedBalance.result.accountPart

+

        totalDelegated={(() => {

+

          if (!showRewardAmount) return undefined;

+

          if (request.delegationRequests.getDelegatedBalance.result == null) return undefined;

+

          return currentlyDelegating

+

            ? request.delegationRequests.getDelegatedBalance.result.utxoPart.joinAddCopy(

+

                request.delegationRequests.getDelegatedBalance.result.accountPart

+

            : new MultiToken([], defaultToken);

+

        })()}

+

        epochLength={this.getEpochLengthInDays(request.publicDeriver)}

+

        graphData={generateGraphData({

+

          delegationRequests: request.delegationRequests,

+

          publicDeriver: request.publicDeriver,

+

          currentEpoch: stores.time.getCurrentTimeRequests(request.publicDeriver).currentEpoch,

+

          shouldHideBalance: stores.profile.shouldHideBalance,

+

          getLocalPoolInfo: stores.delegation.getLocalPoolInfo,

+

          tokenInfo: stores.tokenInfoStore.tokenInfo,

+

})}

+

        onOpenRewardList={() =>

+

          actions.dialogs.open.trigger({

+

            dialog: RewardHistoryDialog,

+

})

+

/>

+

);

+

};

+

  getStakePoolMeta: (PublicDeriver<>) => Node = publicDeriver => {

+

    const delegationStore = this.generated.stores.delegation;

+

    const delegationRequests = delegationStore.getDelegationRequests(publicDeriver);

...

m

packages/yoroi-extension/app/containers/wallet/voting/VotingPage.js

+24/-382

// @flow

-

import type { Node, ComponentType } from 'react';

-

import { Component } from 'react';

+

import { lazy, Component, Suspense  } from 'react';

+

import type { Node, ComponentType, } from 'react';

import { observer } from 'mobx-react';

import { computed } from 'mobx';

-

import { defineMessages, intlShape } from 'react-intl';

+

import { intlShape } from 'react-intl';

import type { $npm$ReactIntl$IntlFormat } from 'react-intl';

import type { InjectedOrGenerated } from '../../../types/injectedPropsType';

-

import Voting from '../../../components/wallet/voting/Voting';

-

import VotingRegistrationDialogContainer from '../dialogs/voting/VotingRegistrationDialogContainer';

-

import type { GeneratedData as VotingRegistrationDialogContainerData } from '../dialogs/voting/VotingRegistrationDialogContainer';

-

import { handleExternalLinkClick } from '../../../utils/routing';

-

import {

-

  WalletTypeOption,

-

} from '../../../api/ada/lib/storage/models/ConceptualWallet/interfaces';

-

import { PublicDeriver } from '../../../api/ada/lib/storage/models/PublicDeriver/index';

-

import LoadingSpinner from '../../../components/widgets/LoadingSpinner';

-

import VerticallyCenteredLayout from '../../../components/layout/VerticallyCenteredLayout';

-

import { CATALYST_MIN_AMOUNT, CATALYST_DISPLAYED_MIN_AMOUNT } from '../../../config/numbersConfig';

-

import InsufficientFundsPage from './InsufficientFundsPage';

-

import { getTokenName, genLookupOrFail } from '../../../stores/stateless/tokenHelpers';

-

import type { TokenInfoMap } from '../../../stores/toplevel/TokenInfoStore';

-

import environment from '../../../environment';

-

import { MultiToken } from '../../../api/common/lib/MultiToken';

-

import RegistrationOver from './RegistrationOver';

-

import type { DelegationRequests } from '../../../stores/toplevel/DelegationStore';

-

import {

-

  isLedgerNanoWallet,

-

  isTrezorTWallet,

-

} from '../../../api/ada/lib/storage/models/ConceptualWallet/index';

-

import type { CatalystRoundInfoResponse } from '../../../api/ada/lib/state-fetch/types'

+

import type { GeneratedData as VotingPageContentProps } from './VotingPageContent';

import TopBarLayout from '../../../components/layout/TopBarLayout';

import BannerContainer from '../../banners/BannerContainer';

import SidebarContainer from '../../SidebarContainer';

import type { GeneratedData as BannerContainerData } from '../../banners/BannerContainer'

import type { GeneratedData as NavBarContainerRevampData } from '../../NavBarContainerRevamp';

+

// $FlowFixMe[signature-verification-failure]

+

export const VotingPageContentPromise = () => import('./VotingPageContent');

+

const VotingPageContent = lazy(VotingPageContentPromise);

+

export type GeneratedData = typeof VotingPage.prototype.generated;

type Props = InjectedOrGenerated<GeneratedData>

type InjectedProps = {| +renderLayoutComponent: LayoutComponentMap => Node |};

  ...InjectedProps,

|};

-

const messages: * = defineMessages({

-

  mainTitle: {

-

    id: 'wallet.registrationOver.mainTitle',

-

    defaultMessage: '!!!Registration is now closed.',

-

},

-

  mainSubtitle: {

-

    id: 'wallet.registrationOver.mainSubtitle',

-

    defaultMessage: '!!!The registration period for fund {roundNumber} has ended. For more information, check the Catalyst app.',

-

},

-

  unavailableTitle: {

-

    id: 'wallet.registrationOver.unavailableTitle',

-

    defaultMessage: '!!!Catalyst Round information is currently unavailable.',

-

},

-

  unavailableSubtitle: {

-

    id: 'wallet.registrationOver.unavailableSubtitle',

-

    defaultMessage: '!!!Please check the Catalyst app for more info',

-

},

-

  earlyForRegistrationTitle: {

-

    id: 'wallet.registrationOver.earlyForRegistrationTitle',

-

    defaultMessage: '!!!Registration hasn\'t started yet.'

-

},

-

  earlyForRegistrationSubTitle: {

-

    id: 'wallet.registrationOver.earlyForRegistrationSubTitle',

-

    defaultMessage: '!!!Registration for Round {roundNumber} begins at {registrationStart}.'

-

},

-

  beforeVotingSubtitle: {

-

    id: 'wallet.registrationOver.beforeVotingSubtitle',

-

    defaultMessage: '!!!Registration has ended. Voting starts at {votingStart}'

-

},

-

  betweenVotingSubtitle: {

-

    id: 'wallet.registrationOver.betweenVotingSubtitle',

-

    defaultMessage: '!!!"Registration has ended.  Voting ends at  {votingEnd}'

-

},

-

  nextFundRegistration: {

-

    id: 'wallet.registrationOver.nextFundRegistration',

-

    defaultMessage: 'Round {roundNumber} starts at {registrationStart}'

-

});

-

@observer

class VotingPage extends Component<AllProps> {

  static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = { intl: intlShape.isRequired };

-

  onClose: void => void = () => {

-

    this.generated.actions.dialogs.closeActiveDialog.trigger();

-

};

-

  start: void => void = () => {

-

    this.generated.actions.dialogs.open.trigger({ dialog: VotingRegistrationDialogContainer });

-

};

-

  get isDelegated(): ?boolean {

-

    const publicDeriver = this.generated.stores.wallets.selected;

-

    const delegationStore = this.generated.stores.delegation;

-

    if (!publicDeriver) {

-

      throw new Error(`${nameof(this.isDelegated)} no public deriver. Should never happen`);

-

    const delegationRequests = delegationStore.getDelegationRequests(publicDeriver);

-

    if (delegationRequests == null) {

-

      throw new Error(`${nameof(this.isDelegated)} called for non-reward wallet`);

-

    const currentDelegation = delegationRequests.getCurrentDelegation;

-

    if (

-

      !currentDelegation.wasExecuted ||

-

      currentDelegation.isExecuting ||

-

      currentDelegation.result == null

-

) {

-

      return undefined;

-

if(

-

      !currentDelegation.result.currEpoch ||

-

      currentDelegation.result.currEpoch.pools.length === 0

-

) {

-

      return false;

-

    return true;

-

  render(): Node {

    const { intl } = this.context;

-

    const pageContent = this.getPageContent();

+

    const content = (

+

      <Suspense fallback={null}>

+

        <VotingPageContent

+

          {...this.generated.VotingPageContentProps}

+

/>

+

      </Suspense>

+

    const revampLayout = (

      <TopBarLayout

        banner={<BannerContainer {...this.generated.BannerContainerProps} />}

        showInContainer

        showAsCard

-

        {pageContent}

+

        {content}

      </TopBarLayout>

);

    return this.props.renderLayoutComponent({

-

      CLASSIC: pageContent,

+

      CLASSIC: content,

      REVAMP: revampLayout,

});

-

  getPageContent(): Node {

-

    const { intl } = this.context

-

    const {

-

      uiDialogs,

-

      wallets: { selected },

-

    } = this.generated.stores;

-

    let activeDialog = null;

-

    if(selected == null){

-

      throw new Error(`${nameof(VotingPage)} no wallet selected`);

-

    const balance = this.generated.balance;

-

    if (balance == null) {

-

      return (

-

        <VerticallyCenteredLayout>

-

          <LoadingSpinner />

-

        </VerticallyCenteredLayout>

-

);

-

    // keep enabled on the testnet

-

    const { catalystRoundInfo, loadingCatalystRoundInfo } =

-

      this.generated.stores.substores.ada.votingStore;

-

    if (loadingCatalystRoundInfo) {

-

      return (

-

        <VerticallyCenteredLayout>

-

          <LoadingSpinner />

-

        </VerticallyCenteredLayout>

-

);

-

    if (!environment.isTest()) {

-

      if (!catalystRoundInfo || (!catalystRoundInfo.currentFund && !catalystRoundInfo.nextFund)){

-

        return (

-

          <RegistrationOver

-

            title={intl.formatMessage(messages.unavailableTitle)}

...

a

packages/yoroi-extension/app/containers/wallet/voting/VotingPageContent.js

+421/-0

+

// @flow

+

import type { Node } from 'react';

+

import { Component } from 'react';

+

import { observer } from 'mobx-react';

+

import { computed } from 'mobx';

+

import { defineMessages, intlShape } from 'react-intl';

+

import type { $npm$ReactIntl$IntlFormat } from 'react-intl';

+

import type { InjectedOrGenerated } from '../../../types/injectedPropsType';

+

import Voting from '../../../components/wallet/voting/Voting';

+

import VotingRegistrationDialogContainer from '../dialogs/voting/VotingRegistrationDialogContainer';

+

import type { GeneratedData as VotingRegistrationDialogContainerData } from '../dialogs/voting/VotingRegistrationDialogContainer';

+

import { handleExternalLinkClick } from '../../../utils/routing';

+

import {

+

  WalletTypeOption,

+

} from '../../../api/ada/lib/storage/models/ConceptualWallet/interfaces';

+

import { PublicDeriver } from '../../../api/ada/lib/storage/models/PublicDeriver/index';

+

import LoadingSpinner from '../../../components/widgets/LoadingSpinner';

+

import VerticallyCenteredLayout from '../../../components/layout/VerticallyCenteredLayout';

+

import { CATALYST_MIN_AMOUNT, CATALYST_DISPLAYED_MIN_AMOUNT } from '../../../config/numbersConfig';

+

import InsufficientFundsPage from './InsufficientFundsPage';

+

import { getTokenName, genLookupOrFail } from '../../../stores/stateless/tokenHelpers';

+

import type { TokenInfoMap } from '../../../stores/toplevel/TokenInfoStore';

+

import environment from '../../../environment';

+

import { MultiToken } from '../../../api/common/lib/MultiToken';

+

import RegistrationOver from './RegistrationOver';

+

import type { DelegationRequests } from '../../../stores/toplevel/DelegationStore';

+

import {

+

  isLedgerNanoWallet,

+

  isTrezorTWallet,

+

} from '../../../api/ada/lib/storage/models/ConceptualWallet/index';

+

import type { CatalystRoundInfoResponse } from '../../../api/ada/lib/state-fetch/types'

+

export type GeneratedData = typeof VotingPageContent.prototype.generated;

+

type Props = InjectedOrGenerated<GeneratedData>

+

const messages: * = defineMessages({

+

  mainTitle: {

+

    id: 'wallet.registrationOver.mainTitle',

+

    defaultMessage: '!!!Registration is now closed.',

+

},

+

  mainSubtitle: {

+

    id: 'wallet.registrationOver.mainSubtitle',

+

    defaultMessage: '!!!The registration period for fund {roundNumber} has ended. For more information, check the Catalyst app.',

+

},

+

  unavailableTitle: {

+

    id: 'wallet.registrationOver.unavailableTitle',

+

    defaultMessage: '!!!Catalyst Round information is currently unavailable.',

+

},

+

  unavailableSubtitle: {

+

    id: 'wallet.registrationOver.unavailableSubtitle',

+

    defaultMessage: '!!!Please check the Catalyst app for more info',

+

},

+

  earlyForRegistrationTitle: {

+

    id: 'wallet.registrationOver.earlyForRegistrationTitle',

+

    defaultMessage: '!!!Registration hasn\'t started yet.'

+

},

+

  earlyForRegistrationSubTitle: {

+

    id: 'wallet.registrationOver.earlyForRegistrationSubTitle',

+

    defaultMessage: '!!!Registration for Round {roundNumber} begins at {registrationStart}.'

+

},

+

  beforeVotingSubtitle: {

+

    id: 'wallet.registrationOver.beforeVotingSubtitle',

+

    defaultMessage: '!!!Registration has ended. Voting starts at {votingStart}'

+

},

+

  betweenVotingSubtitle: {

+

    id: 'wallet.registrationOver.betweenVotingSubtitle',

+

    defaultMessage: '!!!"Registration has ended.  Voting ends at  {votingEnd}'

+

},

+

  nextFundRegistration: {

+

    id: 'wallet.registrationOver.nextFundRegistration',

+

    defaultMessage: 'Round {roundNumber} starts at {registrationStart}'

+

});

+

@observer

+

class VotingPageContent extends Component<Props> {

+

  static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = { intl: intlShape.isRequired };

+

  onClose: void => void = () => {

+

    this.generated.actions.dialogs.closeActiveDialog.trigger();

+

};

+

  start: void => void = () => {

+

    this.generated.actions.dialogs.open.trigger({ dialog: VotingRegistrationDialogContainer });

+

};

+

  get isDelegated(): ?boolean {

+

    const publicDeriver = this.generated.stores.wallets.selected;

+

    const delegationStore = this.generated.stores.delegation;

+

    if (!publicDeriver) {

+

      throw new Error(`${nameof(this.isDelegated)} no public deriver. Should never happen`);

+

    const delegationRequests = delegationStore.getDelegationRequests(publicDeriver);

+

    if (delegationRequests == null) {

+

      throw new Error(`${nameof(this.isDelegated)} called for non-reward wallet`);

+

    const currentDelegation = delegationRequests.getCurrentDelegation;

+

    if (

+

      !currentDelegation.wasExecuted ||

+

      currentDelegation.isExecuting ||

+

      currentDelegation.result == null

+

) {

+

      return undefined;

+

if(

+

      !currentDelegation.result.currEpoch ||

+

      currentDelegation.result.currEpoch.pools.length === 0

+

) {

+

      return false;

+

    return true;

+

  render(): Node {

+

    const { intl } = this.context

+

    const {

+

      uiDialogs,

+

      wallets: { selected },

+

    } = this.generated.stores;

+

    let activeDialog = null;

+

    if(selected == null){

+

      throw new Error(`${nameof(VotingPageContent)} no wallet selected`);

+

    const balance = this.generated.balance;

+

    if (balance == null) {

+

      return (

+

        <VerticallyCenteredLayout>

+

          <LoadingSpinner />

+

        </VerticallyCenteredLayout>

+

);

+

    // keep enabled on the testnet

+

    const { catalystRoundInfo, loadingCatalystRoundInfo } =

+

      this.generated.stores.substores.ada.votingStore;

+

    if (loadingCatalystRoundInfo) {

+

      return (

+

        <VerticallyCenteredLayout>

+

          <LoadingSpinner />

+

        </VerticallyCenteredLayout>

+

);

+

    if (!environment.isTest()) {

+

      if (!catalystRoundInfo || (!catalystRoundInfo.currentFund && !catalystRoundInfo.nextFund)){

+

        return (

+

          <RegistrationOver

+

            title={intl.formatMessage(messages.unavailableTitle)}

+

            subtitle={intl.formatMessage(messages.unavailableSubtitle)}

+

/>

+

);

+

      const { currentFund, nextFund } = catalystRoundInfo;

+

      const nextFundRegistrationSubtitle = intl.formatMessage(messages.nextFundRegistration, {

+

        roundNumber: nextFund?.id,

+

        registrationStart: nextFund?.registrationStart

+

})

+

      const fund = {

+

        'id': 8,

+

        'name': 'Fund9',

+

        'registrationStart': '2021-01-27T11:00:00Z',

+

        'registrationEnd': '2023-08-04T11:00:00Z',

+

        'votingStart': '2021-08-11T11:00:00Z',

+

        'votingEnd': '2023-08-25T11:00:00Z',

+

        'votingPowerThreshold': '450'

+

};

+

      if (currentFund) {

+

        const isLate = new Date() >= new Date(Date.parse(fund.registrationEnd))

+

        const isEarly = new Date() <= new Date(Date.parse(fund.registrationStart))

+

        const isBeforeVoting = new Date() <= new Date(Date.parse(fund.votingStart))

+

        const isAfterVoting = new Date() >= new Date(Date.parse(fund.votingEnd))

+

        const isBetweenVoting = !isBeforeVoting && !isAfterVoting;

+

        if (isEarly) {

+

          return (

+

            <RegistrationOver

+

              title={intl.formatMessage(messages.earlyForRegistrationTitle)}

+

              subtitle={intl.formatMessage(messages.earlyForRegistrationSubTitle, {

+

                roundNumber: currentFund.id,

+

                registrationStart: currentFund.registrationStart

+

})}

+

/>

+

);

+

        // registeration is ended -> check for voting start and end dates

+

        if (isLate) {

+

          if (isBeforeVoting) {

+

            return (

+

              <RegistrationOver

...

m

packages/yoroi-extension/app/stores/stateless/topbarCategories.js

+1/-0

      (environment.isTest()

        || networkId === networks.CardanoTestnet.NetworkId

        || networkId === networks.CardanoPreprodTestnet.NetworkId

+

        || networkId === networks.CardanoPreviewTestnet.NetworkId

);

},

});

m

packages/yoroi-extension/chrome/manifest.development.js

+1/-0

Diff too large – View on GitHub

3,381 commits this week Mar 20, 2023 - Mar 27, 2023

Showing 25 of 3381 recent commits.

Yesterday's Report

New Repo Discovered

New Releases