From 944d2e2bdde339ac8556429771c83d6efc4f3abf Mon Sep 17 00:00:00 2001
From: kalfada <kalfada3321@gmail.com>
Date: Tue, 3 Sep 2024 12:54:21 +0300
Subject: [PATCH 001/143] fix: EOL bug

---
 packages/yoroi-extension/chrome/constants-mv2.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/yoroi-extension/chrome/constants-mv2.js b/packages/yoroi-extension/chrome/constants-mv2.js
index f81572f587..d4f72659b9 100644
--- a/packages/yoroi-extension/chrome/constants-mv2.js
+++ b/packages/yoroi-extension/chrome/constants-mv2.js
@@ -10,12 +10,12 @@ export function genCSP(request: {|
   isDev: boolean,
   additional: {|
     'default-src'?: Array<string>,
-    'frame-src'?: Array<string>,
-    'script-src'?: Array<string>,
-    'object-src'?: Array<string>,
-    'connect-src'?: Array<string>,
-    'style-src'?: Array<string>,
-    'img-src'?: Array<string>,
+      'frame-src' ?: Array < string >,
+      'script-src' ?: Array < string >,
+      'object-src' ?: Array < string >,
+      'connect-src' ?: Array < string >,
+      'style-src' ?: Array < string >,
+      'img-src' ?: Array < string >,
   |},
 |}): string {
   const defaultSrc = request.additional['default-src'] ?? [];
@@ -49,6 +49,8 @@ export function genCSP(request: {|
   frameSrc.push('https://emurgo.github.io/yoroi-extension-ledger-bridge');
   frameSrc.push('https://emurgo.github.io/');
 
+  // Bringweb3
+
   // Analytics
   connectSrc.push('https://analytics.emurgo-rnd.com/');
   connectSrc.push('https://api2.amplitude.com/');

From 6bc3d452c5cd6b36722894f804623d3cc9e89d6f Mon Sep 17 00:00:00 2001
From: kalfada <kalfada3321@gmail.com>
Date: Wed, 11 Sep 2024 10:03:14 +0300
Subject: [PATCH 002/143] feat: add cashback tab and page

---
 packages/yoroi-extension/app/Routes.js        |   7 +
 .../app/api/ada/lib/test-config.forTests.js   |   5 +
 .../app/containers/cashback/CashbackPage.js   | 173 ++++++++++++++++++
 packages/yoroi-extension/app/environment.js   |  34 ++--
 .../app/i18n/global-messages.js               |   4 +
 .../app/i18n/locales/en-US.json               |   3 +-
 .../app/i18n/locales/hu-HU.json               |   3 +-
 .../app/i18n/locales/vi-VN.json               |   3 +-
 packages/yoroi-extension/app/routes-config.js |   4 +
 .../app/stores/stateless/sidebarCategories.js |  29 +--
 .../yoroi-extension/chrome/constants-mv2.js   |   3 +
 .../chrome/content-scripts/bring.js           |   8 +
 .../chrome/extension/background/bring.js      |  11 ++
 .../chrome/extension/background/index.js      |   4 +-
 .../chrome/manifest-mv2.template.js           |   2 +
 .../yoroi-extension/config/config-types.js    |  55 +++---
 .../yoroi-extension/config/development.json   |   7 +-
 packages/yoroi-extension/config/mainnet.json  |   7 +-
 packages/yoroi-extension/config/test.json     |   7 +-
 packages/yoroi-extension/package-lock.json    |   6 +
 packages/yoroi-extension/package.json         |   3 +-
 21 files changed, 320 insertions(+), 58 deletions(-)
 create mode 100644 packages/yoroi-extension/app/containers/cashback/CashbackPage.js
 create mode 100644 packages/yoroi-extension/chrome/content-scripts/bring.js
 create mode 100644 packages/yoroi-extension/chrome/extension/background/bring.js

diff --git a/packages/yoroi-extension/app/Routes.js b/packages/yoroi-extension/app/Routes.js
index dd24adae2f..3b60d30b98 100644
--- a/packages/yoroi-extension/app/Routes.js
+++ b/packages/yoroi-extension/app/Routes.js
@@ -125,6 +125,9 @@ const TokensPageRevamp = React.lazy(TokensPageRevampPromise);
 const TokensDetailPageRevampPromise = () => import('./containers/wallet/TokenDetailPageRevamp');
 const TokensDetailPageRevamp = React.lazy(TokensDetailPageRevampPromise);
 
+const CashbackPagePromise = () => import('./containers/cashback/CashbackPage');
+const CashbackPage = React.lazy(CashbackPagePromise)
+
 const NFTsPageRevampPromise = () => import('./containers/wallet/NFTsPageRevamp');
 const NFTsPageRevamp = React.lazy(NFTsPageRevampPromise);
 
@@ -245,6 +248,10 @@ export const Routes = (stores: StoresMap, actions: ActionsMap): Node => {
             path={ROUTES.NFTS.ROOT}
             component={props => wrapNFTs({ ...props, stores, actions }, NFTsSubPages(stores, actions))}
           />
+          <Route
+            path={ROUTES.CASHBACK.ROOT}
+            component={props => <CashbackPage {...props} stores={stores} actions={actions} />}
+          />
           <Route
             exact
             path={ROUTES.WALLETS.ADD}
diff --git a/packages/yoroi-extension/app/api/ada/lib/test-config.forTests.js b/packages/yoroi-extension/app/api/ada/lib/test-config.forTests.js
index a32c7589f9..3ef33bd436 100644
--- a/packages/yoroi-extension/app/api/ada/lib/test-config.forTests.js
+++ b/packages/yoroi-extension/app/api/ada/lib/test-config.forTests.js
@@ -21,6 +21,11 @@ const CONFIG: ConfigType = {
     pubKeyData: '',
     pubKeyMaster: '',
   },
+  bring: {
+    baseUrl: '',
+    iframeSrc: '',
+    identifier: ''
+  }
 };
 
 global.CONFIG = CONFIG;
diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
new file mode 100644
index 0000000000..c7967e4bb4
--- /dev/null
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -0,0 +1,173 @@
+// @flow
+import type { Node, ComponentType } from 'react';
+import { Component, Suspense } from 'react';
+import { observer } from 'mobx-react';
+import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
+import { intlShape } from 'react-intl';
+import type { StoresAndActionsProps } from '../../types/injectedProps.types';
+import TopBarLayout from '../../components/layout/TopBarLayout';
+import BannerContainer from '../banners/BannerContainer';
+import { withLayout } from '../../styles/context/layout';
+import type { LayoutComponentMap } from '../../styles/context/layout';
+import SidebarContainer from '../SidebarContainer';
+import FullscreenLayout from '../../components/layout/FullscreenLayout';
+import environment from '../../environment';
+import { ROUTES } from '../../routes-config';
+import NavBarContainerRevamp from '../NavBarContainerRevamp';
+import NavBarTitle from '../../components/topbar/NavBarTitle';
+import globalMessages from '../../i18n/global-messages';
+import { CoreAddressTypes } from '../../api/ada/lib/storage/database/primitives/enums';
+
+type Props = StoresAndActionsProps;
+
+type InjectedLayoutProps = {| +renderLayoutComponent: LayoutComponentMap => Node |};
+type AllProps = {| ...Props, ...InjectedLayoutProps |};
+type State = {| iframeSrc: string, status: string, popup: boolean, overlayBgColor: string |};
+
+type IframeMessageData = {|
+    action: string,
+        bgColor ?: string,
+        messageToSign: string
+            |};
+
+@observer
+class CashbackPageContainer extends Component<AllProps, State> {
+    static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
+    intl: intlShape.isRequired,
+  };
+
+state = {
+    iframeSrc: '', // Initial URL
+    status: 'loading', // Initial status
+    popup: false,
+    overlayBgColor: '#000000fa'
+};
+
+async componentDidMount() {
+    // User should not be able to access the route when using Yoroi Light
+    if (environment.isLight) {
+        this.props.actions.router.goToRoute.trigger({
+            route: ROUTES.MY_WALLETS,
+        });
+    }
+    this.fetchIframeUrl()
+    this.setupMessageListener();
+}
+
+componentWillUnmount() {
+    this.removeMessageListener();
+}
+
+setupMessageListener = () => {
+    window.addEventListener('message', this.handleMessage);
+}
+
+removeMessageListener = () => {
+    window.removeEventListener('message', this.handleMessage);
+}
+
+handleMessage = (event: MessageEvent) => {
+    const iframeOrigin = new URL(this.state.iframeSrc).origin
+
+    if (event.origin !== iframeOrigin) {
+        return;
+    }
+
+    console.log('Received message from iframe:', event.data);
+
+    const messageData: IframeMessageData = (event.data: any);
+
+    if (messageData.action === 'SIGN_MESSAGE') {
+        // messageData.messageToSign
+    }
+    else if (messageData.action === 'OPEN_POPUP') {
+        this.setState({ popup: true, overlayBgColor: messageData.bgColor || this.state.overlayBgColor })
+    }
+    else if (messageData.action === 'CLOSE_POPUP') {
+        this.setState({ popup: false })
+    }
+}
+
+async fetchIframeUrl(){
+    try {
+        const publicDeriver = this.props.stores.wallets.selected
+        if (!publicDeriver) throw Error('no publicDeriver')
+        const walletAddress = publicDeriver.externalAddressesByType[CoreAddressTypes.CARDANO_BASE][0].address;
+
+        const response = await fetch(`${environment.bringBaseUrl}check/portal`, {
+            method: 'POST',
+            headers: {
+                'x-api-key': environment.bringIdentifier,
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+                walletAddress,
+
+            }),
+        }); // Replace with your API endpoint
+        const data = await response.json();
+
+        // Convert data to query parameters (assuming data is an object)
+        const queryParams = new URLSearchParams({ ...data, theme: environment.isLight ? 'light' : 'dark' }).toString();
+        const iframeSrc = `${environment.bringIframeSrc}/?${queryParams}`;
+
+        // Update the state to reflect the new iframe URL
+        this.setState({ iframeSrc, status: 'done' });
+    } catch (error) {
+        console.error('Error fetching data:', error);
+    }
+}
+
+
+
+render(): Node {
+    const { actions, stores } = this.props;
+    const sidebarContainer = <SidebarContainer actions={actions} stores={stores} />;
+    const { intl } = this.context;
+
+    return (
+        <TopBarLayout
+            banner={<BannerContainer actions={actions} stores={stores} />}
+            sidebar={sidebarContainer}
+            navbar={
+                <NavBarContainerRevamp
+                    actions={actions}
+                    stores={stores}
+                    title={<NavBarTitle title={intl.formatMessage(globalMessages.sidebarCashback)} />}
+                />
+            }
+        >
+            <FullscreenLayout bottomPadding={0}>
+                {this.state.popup ?
+                    <div
+                        style={{ position: 'fixed', inset: 0, background: this.state.overlayBgColor, zIndex: 10 }}
+                        onClick={() => {
+                            const iframeElement = document.getElementById('bringweb3');
+                            if (iframeElement instanceof HTMLIFrameElement) {
+                                iframeElement.contentWindow.postMessage({ action: 'CLOSE_POPUP' }, '*')
+                            }
+                            this.setState({ popup: false })
+                        }}
+                    ></div>
+                    :
+                    null
+                }
+                <Suspense fallback={null}>
+                    {this.state.iframeSrc.length ?
+                        <iframe
+                            id='bringweb3'
+                            style={{ position: 'relative', zIndex: 11 }}
+                            src={this.state.iframeSrc}
+                            width='100%'
+                            height='100%'
+                        />
+                        :
+                        null
+                    }
+                </Suspense>
+            </FullscreenLayout>
+        </TopBarLayout>
+    );
+}
+}
+export default (withLayout(CashbackPageContainer): ComponentType < Props >);
diff --git a/packages/yoroi-extension/app/environment.js b/packages/yoroi-extension/app/environment.js
index ce035f74ed..a020ff9854 100644
--- a/packages/yoroi-extension/app/environment.js
+++ b/packages/yoroi-extension/app/environment.js
@@ -41,23 +41,29 @@ export const environment = ((
     getWalletRefreshInterval: () => CONFIG.app.walletRefreshInterval,
     getServerStatusRefreshInterval: () => CONFIG.app.serverStatusRefreshInterval,
     userAgentInfo,
+    bringBaseUrl: CONFIG.bring.baseUrl,
+    bringIframeSrc: CONFIG.bring.iframeSrc,
+    bringIdentifier: CONFIG.bring.identifier
   }
 ): {
-    getNetworkName: void => Network,
+  getNetworkName: void => Network,
     getVersion: void => string,
-    MOBX_DEV_TOOLS: ?string,
-    commit: string,
-    branch: string,
-    isJest: void => boolean,
-    isDev: void => boolean,
-    isNightly: void => boolean,
-    isTest: void => boolean,
-    isMainnet: void => boolean,
-    isProduction: void => boolean,
-    getWalletRefreshInterval: void => number,
-    getServerStatusRefreshInterval: void => number,
-    userAgentInfo: UserAgentInfo,
-    isLight: boolean,
+      MOBX_DEV_TOOLS: ?string,
+        commit: string,
+          branch: string,
+            isJest: void => boolean,
+              isDev: void => boolean,
+                isNightly: void => boolean,
+                  isTest: void => boolean,
+                    isMainnet: void => boolean,
+                      isProduction: void => boolean,
+                        getWalletRefreshInterval: void => number,
+                          getServerStatusRefreshInterval: void => number,
+                            userAgentInfo: UserAgentInfo,
+                              isLight: boolean,
+                                bringBaseUrl: string,
+                                  bringIframeSrc: string,
+                                    bringIdentifier: string,
     ...
 });
 
diff --git a/packages/yoroi-extension/app/i18n/global-messages.js b/packages/yoroi-extension/app/i18n/global-messages.js
index 89473394f0..5680c89351 100644
--- a/packages/yoroi-extension/app/i18n/global-messages.js
+++ b/packages/yoroi-extension/app/i18n/global-messages.js
@@ -690,6 +690,10 @@ const globalMessages: * = defineMessages({
     id: 'sidebar.wallets',
     defaultMessage: '!!!My wallets',
   },
+  sidebarCashback: {
+    id: 'sidebar.cashback',
+    defaultMessage: '!!!Cashback',
+  },
   sidebarAssets: {
     id: 'sidebar.assets',
     defaultMessage: '!!!Assets',
diff --git a/packages/yoroi-extension/app/i18n/locales/en-US.json b/packages/yoroi-extension/app/i18n/locales/en-US.json
index 91f9219b55..86be46c8a4 100644
--- a/packages/yoroi-extension/app/i18n/locales/en-US.json
+++ b/packages/yoroi-extension/app/i18n/locales/en-US.json
@@ -339,6 +339,7 @@
   "sidebar.feedback": "Feedback",
   "sidebar.newUpdates": "New updates",
   "sidebar.nfts": "NFTs",
+  "sidebar.cashback": "Cashback",
   "sidebar.settings": "Settings",
   "sidebar.governance": "Governance",
   "sidebar.staking": "Staking",
@@ -1159,4 +1160,4 @@
   "portfolio.orderTable.header.transactionId": "Transaction ID",
   "portfolio.welcomeBanner.title": "Welcome to Yoroi",
   "portfolio.welcomeBanner.description": "With new features and upgraded performance, transactions can be done faster and more securely than ever before."
-}
+}
\ No newline at end of file
diff --git a/packages/yoroi-extension/app/i18n/locales/hu-HU.json b/packages/yoroi-extension/app/i18n/locales/hu-HU.json
index 5ea7f991cc..322a31e587 100644
--- a/packages/yoroi-extension/app/i18n/locales/hu-HU.json
+++ b/packages/yoroi-extension/app/i18n/locales/hu-HU.json
@@ -339,6 +339,7 @@
   "sidebar.feedback": "Feedback",
   "sidebar.newUpdates": "New updates",
   "sidebar.nfts": "NFTs",
+  "sidebar.cashback": "Cashback",
   "sidebar.settings": "Settings",
   "sidebar.governance": "Governance",
   "sidebar.staking": "Staking",
@@ -1159,4 +1160,4 @@
   "portfolio.orderTable.header.transactionId": "Transaction ID",
   "portfolio.welcomeBanner.title": "Welcome to Yoroi",
   "portfolio.welcomeBanner.description": "With new features and upgraded performance, transactions can be done faster and more securely than ever before."
-}
+}
\ No newline at end of file
diff --git a/packages/yoroi-extension/app/i18n/locales/vi-VN.json b/packages/yoroi-extension/app/i18n/locales/vi-VN.json
index 124aaa3063..1c7db864dc 100644
--- a/packages/yoroi-extension/app/i18n/locales/vi-VN.json
+++ b/packages/yoroi-extension/app/i18n/locales/vi-VN.json
@@ -339,6 +339,7 @@
   "sidebar.feedback": "Phản hồi",
   "sidebar.newUpdates": "Cập nhật mới",
   "sidebar.nfts": "NFTs",
+  "sidebar.cashback": "Cashback",
   "sidebar.settings": "Thiết lập",
   "sidebar.governance": "Governance",
   "sidebar.staking": "Ủy thác",
@@ -1159,4 +1160,4 @@
   "portfolio.orderTable.header.transactionId": "Transaction ID",
   "portfolio.welcomeBanner.title": "Welcome to Yoroi",
   "portfolio.welcomeBanner.description": "With new features and upgraded performance, transactions can be done faster and more securely than ever before."
-}
+}
\ No newline at end of file
diff --git a/packages/yoroi-extension/app/routes-config.js b/packages/yoroi-extension/app/routes-config.js
index 2121dd72fe..1d9bc3f6c9 100644
--- a/packages/yoroi-extension/app/routes-config.js
+++ b/packages/yoroi-extension/app/routes-config.js
@@ -55,6 +55,10 @@ export const ROUTES = {
     ROOT: '/assets',
     DETAILS: '/assets/tokens/:tokenId',
   },
+  // Bringweb3
+  CASHBACK: {
+    ROOT: '/cashback'
+  },
   NFTS: {
     ROOT: '/nfts',
     DETAILS: '/nfts/:nftId',
diff --git a/packages/yoroi-extension/app/stores/stateless/sidebarCategories.js b/packages/yoroi-extension/app/stores/stateless/sidebarCategories.js
index b98b61f277..289aec6fc2 100644
--- a/packages/yoroi-extension/app/stores/stateless/sidebarCategories.js
+++ b/packages/yoroi-extension/app/stores/stateless/sidebarCategories.js
@@ -21,12 +21,12 @@ import environment from '../../environment';
 export type SidebarCategory = {|
   +className: string,
   +route: string,
-  +icon: string,
-  +label?: MessageDescriptor,
-  +isVisible: ({|
-    hasAnyWallets: boolean,
-    selected: ?{ publicDeriverId: number, ... },
-    currentRoute: string,
+    +icon: string,
+      +label ?: MessageDescriptor,
+      +isVisible: ({|
+        hasAnyWallets: boolean,
+          selected: ?{ publicDeriverId: number, ... },
+currentRoute: string,
   |}) => boolean,
 |};
 
@@ -86,8 +86,8 @@ export const CONNECTED_WEBSITES: SidebarCategory = registerCategory({
 
 type isVisibleFunc = ({|
   hasAnyWallets: boolean,
-  selected: ?{ publicDeriverId: number, isTestnet: boolean, networkId: number, ... },
-  currentRoute: string,
+    selected: ?{ publicDeriverId: number, isTestnet: boolean, networkId: number, ... },
+currentRoute: string,
   isRewardWallet: isRewardWalletFunc,
 |}) => boolean;
 
@@ -96,9 +96,9 @@ type isRewardWalletFunc = ({ publicDeriverId: number, ... }) => boolean;
 export type SidebarCategoryRevamp = {|
   +className: string,
   +route: string,
-  +icon: string,
-  +label?: MessageDescriptor,
-  +isVisible: isVisibleFunc,
+    +icon: string,
+      +label ?: MessageDescriptor,
+      +isVisible: isVisibleFunc,
 |};
 
 // TODO: Fix routes and isVisible prop
@@ -158,6 +158,13 @@ export const allCategoriesRevamp: Array<SidebarCategoryRevamp> = [
     // $FlowFixMe[prop-missing]
     isVisible: request => request.selected != null,
   },
+  {
+    className: 'cashback',
+    route: ROUTES.CASHBACK.ROOT,
+    icon: dappConnectorIcon,
+    label: globalMessages.sidebarCashback,
+    isVisible: _request => true,
+  },
   {
     className: 'connected-websites',
     route: ROUTES.DAPP_CONNECTOR.CONNECTED_WEBSITES,
diff --git a/packages/yoroi-extension/chrome/constants-mv2.js b/packages/yoroi-extension/chrome/constants-mv2.js
index d4f72659b9..ab5d94b909 100644
--- a/packages/yoroi-extension/chrome/constants-mv2.js
+++ b/packages/yoroi-extension/chrome/constants-mv2.js
@@ -50,6 +50,9 @@ export function genCSP(request: {|
   frameSrc.push('https://emurgo.github.io/');
 
   // Bringweb3
+  frameSrc.push('http://localhost:5173/')
+  frameSrc.push('https://*.bringweb3.io/')
+  connectSrc.push('https://*.bringweb3.io')
 
   // Analytics
   connectSrc.push('https://analytics.emurgo-rnd.com/');
diff --git a/packages/yoroi-extension/chrome/content-scripts/bring.js b/packages/yoroi-extension/chrome/content-scripts/bring.js
new file mode 100644
index 0000000000..0a2dcb7d18
--- /dev/null
+++ b/packages/yoroi-extension/chrome/content-scripts/bring.js
@@ -0,0 +1,8 @@
+import { bringInitContentScript } from '@bringweb3/chrome-extension-kit'
+
+bringInitContentScript({
+    getWalletAddress: async () => 'addr111111111111',
+    promptLogin: () => 'asfasfa',
+    walletAddressListeners: ['daniel'],
+    iframeEndpoint: 'https://sandbox-extension.bringweb3.io/',
+})
\ No newline at end of file
diff --git a/packages/yoroi-extension/chrome/extension/background/bring.js b/packages/yoroi-extension/chrome/extension/background/bring.js
new file mode 100644
index 0000000000..c0539e3b4a
--- /dev/null
+++ b/packages/yoroi-extension/chrome/extension/background/bring.js
@@ -0,0 +1,11 @@
+// @flow
+import { bringInitBackground } from '@bringweb3/chrome-extension-kit'
+import environment from '../../../app/environment'
+
+export default () => {
+    bringInitBackground({
+        identifier: environment.bringIdentifier,
+        apiEndpoint: 'sandbox',
+    })
+}
+
diff --git a/packages/yoroi-extension/chrome/extension/background/index.js b/packages/yoroi-extension/chrome/extension/background/index.js
index cc2d2da5d0..5044dffd96 100644
--- a/packages/yoroi-extension/chrome/extension/background/index.js
+++ b/packages/yoroi-extension/chrome/extension/background/index.js
@@ -6,10 +6,11 @@ import { init } from './state';
 import { startMonitorServerStatus } from './serverStatus';
 import { startPoll } from './coinPrice';
 import { environment } from '../../../app/environment';
-
+import bringInitBackground from './bring'
 /*::
 declare var chrome;
 */
+bringInitBackground();
 
 const onYoroiIconClicked = () => {
   chrome.tabs.create({ url: 'main_window.html' });
@@ -38,7 +39,6 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
   }
   return handleInjectorMessage(message, sender);
 });
-
 init().catch(console.error);
 startMonitorServerStatus();
 startPoll();
diff --git a/packages/yoroi-extension/chrome/manifest-mv2.template.js b/packages/yoroi-extension/chrome/manifest-mv2.template.js
index 0790a7ed93..379e51a806 100644
--- a/packages/yoroi-extension/chrome/manifest-mv2.template.js
+++ b/packages/yoroi-extension/chrome/manifest-mv2.template.js
@@ -68,6 +68,8 @@ export default ({
     },
     permissions: [
       'storage',
+      'alarms',
+      'tabs',
       '*://connect.trezor.io/*',
       'https://emurgo.github.io/yoroi-extension-ledger-connect-vnext/*'
     ],
diff --git a/packages/yoroi-extension/config/config-types.js b/packages/yoroi-extension/config/config-types.js
index 64a6527571..eff83f9017 100644
--- a/packages/yoroi-extension/config/config-types.js
+++ b/packages/yoroi-extension/config/config-types.js
@@ -2,46 +2,53 @@
 
 export type ConfigType = {|
   network: NetworkConfigType,
-  poolExplorer: PoolExplorerConfigType,
-  app: AppConfigType,
-|};
+    poolExplorer: PoolExplorerConfigType,
+      app: AppConfigType,
+        bring: BringConfigType
+          |};
+
+export type BringConfigType = {|
+  baseUrl: string,
+    iframeSrc: string,
+      identifier: string
+        |}
 
 export type PoolExplorerConfigType = {|
-    simpleTemplate: string,
+  simpleTemplate: string,
 |}
 
 export type AppConfigType = {|
   walletRefreshInterval: number,
-  serverStatusRefreshInterval: number,
-  logsBufferSize: number,
-  logsFileSuffix: string,
-  addressRequestSize: number,
-  txsBodiesRequestSize: number,
-  coinPriceRefreshInterval: number,
-  /**
-   * How long we should consider the "current price" valid.
-   * If wallet has been unable to connect to the server (ex: wallet is offline)
-   * We don't want to tell the user "this is the current price"
-  */
-  coinPriceFreshnessThreshold: number,
-  /** Public key we can use to make sure that the price information really dose come form EMURGO */
-  pubKeyData: string,
-  /** Public key to make sure that the ticker signing key change really does come from EMURGO */
-  pubKeyMaster: string,
+    serverStatusRefreshInterval: number,
+      logsBufferSize: number,
+        logsFileSuffix: string,
+          addressRequestSize: number,
+            txsBodiesRequestSize: number,
+              coinPriceRefreshInterval: number,
+                /**
+                 * How long we should consider the "current price" valid.
+                 * If wallet has been unable to connect to the server (ex: wallet is offline)
+                 * We don't want to tell the user "this is the current price"
+                */
+                coinPriceFreshnessThreshold: number,
+                  /** Public key we can use to make sure that the price information really dose come form EMURGO */
+                  pubKeyData: string,
+                    /** Public key to make sure that the ticker signing key change really does come from EMURGO */
+                    pubKeyMaster: string,
 |}
 
 export type NetworkConfigType = {|
   name: Network,
-  priceBackendUrl: string,
+    priceBackendUrl: string,
 |};
 
-export type Network =  'development' | 'mainnet' | 'test';
+export type Network = 'development' | 'mainnet' | 'test';
 export const NetworkType: {|
   DEVELOPMENT: Network,
   MAINNET: Network,
   TEST: Network,
 |} = {
   DEVELOPMENT: 'development',
-  MAINNET: 'mainnet',
-  TEST: 'test',
+    MAINNET: 'mainnet',
+      TEST: 'test',
 };
diff --git a/packages/yoroi-extension/config/development.json b/packages/yoroi-extension/config/development.json
index 97c436b631..0f27ed5ff7 100644
--- a/packages/yoroi-extension/config/development.json
+++ b/packages/yoroi-extension/config/development.json
@@ -17,5 +17,10 @@
     "coinPriceFreshnessThreshold": 900000,
     "pubKeyData": "0e011fe7149bff8e3802168261aec6da54febee37da6a41d6179fa545868421e",
     "pubKeyMaster": "ab9e4f1c4d996a0e9cdda8546bf5ee1dd8397fd7ab287c331ff171c7e4e0e9e2"
+  },
+  "bring": {
+    "baseUrl": "https://sandbox-api.bringweb3.io/v1/extension/",
+    "iframeSrc": "http://localhost:5173",
+    "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/yoroi-extension/config/mainnet.json b/packages/yoroi-extension/config/mainnet.json
index 14fa3fcc33..c8167b4ed5 100644
--- a/packages/yoroi-extension/config/mainnet.json
+++ b/packages/yoroi-extension/config/mainnet.json
@@ -16,5 +16,10 @@
     "coinPriceFreshnessThreshold": 900000,
     "pubKeyData": "0e011fe7149bff8e3802168261aec6da54febee37da6a41d6179fa545868421e",
     "pubKeyMaster": "ab9e4f1c4d996a0e9cdda8546bf5ee1dd8397fd7ab287c331ff171c7e4e0e9e2"
+  },
+  "bring": {
+    "baseUrl": "https://sandbox-api.bringweb3.io/v1/extension/",
+    "iframeSrc": "http://localhost:5173",
+    "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/yoroi-extension/config/test.json b/packages/yoroi-extension/config/test.json
index 55733cd3cc..0e2fafd0c0 100644
--- a/packages/yoroi-extension/config/test.json
+++ b/packages/yoroi-extension/config/test.json
@@ -17,5 +17,10 @@
     "coinPriceFreshnessThreshold": 900000,
     "pubKeyData": "0e011fe7149bff8e3802168261aec6da54febee37da6a41d6179fa545868421e",
     "pubKeyMaster": "ab9e4f1c4d996a0e9cdda8546bf5ee1dd8397fd7ab287c331ff171c7e4e0e9e2"
+  },
+  "bring": {
+    "baseUrl": "https://sandbox-api.bringweb3.io/v1/extension/check/portal",
+    "iframeSrc": "https://sandbox-extension.bringweb3.io",
+    "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index 6aa0670cea..f4ba719b2c 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -11,6 +11,7 @@
       "dependencies": {
         "@amplitude/analytics-browser": "^2.1.3",
         "@babel/preset-typescript": "^7.24.7",
+        "@bringweb3/chrome-extension-kit": "^1.0.12",
         "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
         "@emotion/react": "^11.4.1",
         "@emotion/styled": "^11.3.0",
@@ -2132,6 +2133,11 @@
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
       "dev": true
     },
+    "node_modules/@bringweb3/chrome-extension-kit": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/@bringweb3/chrome-extension-kit/-/chrome-extension-kit-1.0.12.tgz",
+      "integrity": "sha512-Q+p5Q8fqB4YD0vXZPlo773zvrij0BRtmpkMGZiefjyOq5mqfJcdYGrFg0hJGFwVLH8QYVlaI/wBVvSOdpNxxow=="
+    },
     "node_modules/@cardano-foundation/ledgerjs-hw-app-cardano": {
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/@cardano-foundation/ledgerjs-hw-app-cardano/-/ledgerjs-hw-app-cardano-7.1.3.tgz",
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
index c9692f8ed5..5c6dfb8e01 100644
--- a/packages/yoroi-extension/package.json
+++ b/packages/yoroi-extension/package.json
@@ -145,6 +145,7 @@
   "dependencies": {
     "@amplitude/analytics-browser": "^2.1.3",
     "@babel/preset-typescript": "^7.24.7",
+    "@bringweb3/chrome-extension-kit": "^1.0.12",
     "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",
@@ -235,4 +236,4 @@
     "node": "~18.18.2",
     "npm": "~9.8.1"
   }
-}
+}
\ No newline at end of file

From 5a2feaacf77bdaebf3ec5bb7d6e1e12567fa84f9 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Thu, 12 Sep 2024 18:17:07 +0800
Subject: [PATCH 003/143] bundle and inject code for bring

---
 .../chrome/content-scripts/bringInject.js     | 104 ++++++++++++++++++
 .../chrome/content-scripts/inject.js          |   1 +
 .../chrome/manifest-mv2.template.js           |   4 +-
 packages/yoroi-extension/package-lock.json    |   6 +
 packages/yoroi-extension/package.json         |   1 +
 packages/yoroi-extension/scripts-mv2/build.js |  10 ++
 .../yoroi-extension/webpack-mv2/devConfig.js  |  57 +++++++++-
 .../yoroi-extension/webpack-mv2/prodConfig.js |  45 +++++++-
 8 files changed, 225 insertions(+), 3 deletions(-)
 create mode 100644 packages/yoroi-extension/chrome/content-scripts/bringInject.js

diff --git a/packages/yoroi-extension/chrome/content-scripts/bringInject.js b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
new file mode 100644
index 0000000000..c28cbcba1e
--- /dev/null
+++ b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
@@ -0,0 +1,104 @@
+import { bringInitContentScript } from "@bringweb3/chrome-extension-kit";
+
+bringInitContentScript({
+    iframeEndpoint: process.env.IFRAME_ENDPOINT,
+    getWalletAddress: async () => await new Promise(resolve => setTimeout(() => resolve('<USER_WALLET_ADDRESS>'), 200)),// Async function that returns the current user's wallet address
+    promptLogin: () => { return window.prompt('login'); }, // Function that prompts a UI element asking the user to login
+    walletAddressListeners: ["customEvent:addressChanged"], // A list of custom events that dispatched when the user's wallet address had changed
+    customTheme: {
+        // font
+        fontUrl: 'https://fonts.googleapis.com/css2?family=Matemasie&display=swap',
+        fontFamily: "'Matemasie', system-ui",
+        // Popup
+        popupBg: "#192E34",
+        popupShadow: "",
+        // Primary button
+        primaryBtnBg: "linear-gradient(135deg, #5DEB5A 0%, #FDFC47 100%)",
+        primaryBtnFC: "#041417",
+        primaryBtnFW: "600",
+        primaryBtnFS: "14px",
+        primaryBtnBorderC: "transparent",
+        primaryBtnBorderW: "0",
+        primaryBtnRadius: "8px",
+        // Secondary button
+        secondaryBtnBg: "transparent",
+        secondaryBtnFS: "12px",
+        secondaryBtnFW: "500",
+        secondaryBtnFC: "white",
+        secondaryBtnBorderC: "rgba(149, 176, 178, 0.50)",
+        secondaryBtnBorderW: "2px",
+        secondaryBtnRadius: "8px",
+        // Markdown
+        markdownBg: "#07131766",
+        markdownFS: "12px",
+        markdownFC: "#DADCE5",
+        markdownBorderW: "0",
+        markdownRadius: "4px",
+        markdownBorderC: "black",
+        markdownScrollbarC: "#DADCE5",
+        // Wallet address
+        walletBg: "#33535B",
+        walletFS: "10px",
+        walletFW: "400",
+        walletFC: "white",
+        walletBorderC: "white",
+        walletBorderW: "0",
+        walletRadius: "4px",
+        // Details of offering
+        detailsBg: "#33535B",
+        detailsTitleFS: "15px",
+        detailsTitleFW: "600",
+        detailsTitleFC: "white",
+        detailsSubtitleFS: "14px",
+        detailsSubtitleFW: "500",
+        detailsSubtitleFC: "#A8ADBF",
+        detailsRadius: "8px",
+        detailsBorderW: "0",
+        detailsBorderC: "transparent",
+        detailsAmountFC: "#5DEB5A",
+        detailsAmountFW: "700",
+        // Overlay
+        overlayBg: "#192E34E6",
+        overlayFS: "13px",
+        overlayFW: "400",
+        overlayFC: "#DADCE5",
+        loaderBg: "#0A2EC0",
+        // Optout \ Turn off
+        optoutBg: "#192E34",
+        optoutFS: "14px",
+        optoutFW: "400",
+        optoutFC: "white",
+        optoutRadius: "56px",
+        // X Button and close buttons
+        closeFS: "9px",
+        closeFW: "300",
+        closeFC: "#B9BBBF",
+        // Token name
+        tokenBg: "transparent",
+        tokenFS: "13px",
+        tokenFW: "600",
+        tokenFC: "#DADCE5",
+        tokenBorderW: "2px",
+        tokenBorderC: "#DADCE5",
+        // Notification popup
+        notificationFS: "14px",
+        notificationFW: "500",
+        notificationFC: "white",
+        notificationBtnBg: "linear-gradient(135deg, #5DEB5A 0%, #FDFC47 100%)",
+        notificationBtnFS: "12px",
+        notificationBtnFW: "500",
+        notificationBtnFC: "#041417",
+        notificationBtnBorderW: "0",
+        notificationBtnBorderC: "transparent",
+        notificationBtnRadius: "8px",
+        activateTitleFS: "--activate-title-f-s",
+        activateTitleFW: "--activate-title-f-w",
+        activateTitleFC: "--activate-title-f-c",
+        activateTitleBoldFS: "--activate-title-bold-f-s",
+        activateTitleBoldFW: "--activate-title-bold-f-w",
+        activateTitleBoldFC: "--activate-title-bold-f-c",
+    }
+});
+
+
+console.log('Bring injected');
diff --git a/packages/yoroi-extension/chrome/content-scripts/inject.js b/packages/yoroi-extension/chrome/content-scripts/inject.js
index f73f62692b..4fb6a9e26f 100644
--- a/packages/yoroi-extension/chrome/content-scripts/inject.js
+++ b/packages/yoroi-extension/chrome/content-scripts/inject.js
@@ -198,6 +198,7 @@ async function connectorEventListener(event) {
 }
 
 if (shouldInject()) {
+    injectIntoPage('bringInject');
     if (injectIntoPage('initialInject')) {
         // events from page (injected code)
         window.addEventListener("message", connectorEventListener);
diff --git a/packages/yoroi-extension/chrome/manifest-mv2.template.js b/packages/yoroi-extension/chrome/manifest-mv2.template.js
index 0790a7ed93..12a38f3346 100644
--- a/packages/yoroi-extension/chrome/manifest-mv2.template.js
+++ b/packages/yoroi-extension/chrome/manifest-mv2.template.js
@@ -87,7 +87,9 @@ export default ({
           uriTemplate: 'main_window.html#/send-from-uri?q=%s',
         },
       ],
-    web_accessible_resources: [],
+    web_accessible_resources: [
+      'js/bringInject.js',
+    ],
   };
 
   if (shouldInjectConnector) {
diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index 877b7d6ac1..ed3d3b4c9f 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -11,6 +11,7 @@
       "dependencies": {
         "@amplitude/analytics-browser": "^2.1.3",
         "@babel/preset-typescript": "^7.24.7",
+        "@bringweb3/chrome-extension-kit": "^1.0.12",
         "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
         "@emotion/react": "^11.4.1",
         "@emotion/styled": "^11.3.0",
@@ -2132,6 +2133,11 @@
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
       "dev": true
     },
+    "node_modules/@bringweb3/chrome-extension-kit": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/@bringweb3/chrome-extension-kit/-/chrome-extension-kit-1.0.12.tgz",
+      "integrity": "sha512-Q+p5Q8fqB4YD0vXZPlo773zvrij0BRtmpkMGZiefjyOq5mqfJcdYGrFg0hJGFwVLH8QYVlaI/wBVvSOdpNxxow=="
+    },
     "node_modules/@cardano-foundation/ledgerjs-hw-app-cardano": {
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/@cardano-foundation/ledgerjs-hw-app-cardano/-/ledgerjs-hw-app-cardano-7.1.3.tgz",
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
index 2a61f9ee8a..c063fb0b5d 100644
--- a/packages/yoroi-extension/package.json
+++ b/packages/yoroi-extension/package.json
@@ -145,6 +145,7 @@
   "dependencies": {
     "@amplitude/analytics-browser": "^2.1.3",
     "@babel/preset-typescript": "^7.24.7",
+    "@bringweb3/chrome-extension-kit": "^1.0.12",
     "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",
diff --git a/packages/yoroi-extension/scripts-mv2/build.js b/packages/yoroi-extension/scripts-mv2/build.js
index bffd6a7928..03b3bdb85f 100644
--- a/packages/yoroi-extension/scripts-mv2/build.js
+++ b/packages/yoroi-extension/scripts-mv2/build.js
@@ -92,6 +92,16 @@ export function buildDev(env: string) {
     webpackHotMiddleware,
     serverOpts
   );
+
+  const Webpack = require('webpack');
+  const WebpackDevServer = require('webpack-dev-server');
+  const webpackConfig = config.contentScriptConfig(
+    argv.env,
+    isNightly,
+    !shouldInjectConnector
+  );
+  const server = new WebpackDevServer(webpackConfig.devServer, Webpack(webpackConfig));
+  server.start();
 }
 
 if (argv.type === 'debug') {
diff --git a/packages/yoroi-extension/webpack-mv2/devConfig.js b/packages/yoroi-extension/webpack-mv2/devConfig.js
index 90a83e5e32..d18bec38f1 100644
--- a/packages/yoroi-extension/webpack-mv2/devConfig.js
+++ b/packages/yoroi-extension/webpack-mv2/devConfig.js
@@ -108,4 +108,59 @@ const baseDevConfig = (
   }
 });
 
-module.exports = { baseDevConfig };
+const contentScriptConfig = (
+  networkName /*: string */,
+  isNightly /*: boolean */,
+  isLight /* : ?boolean */ = false
+) /*: * */ => ({
+  mode: 'development',
+  resolve: commonConfig.resolve(),
+  devtool: 'source-map',
+  entry: {
+    contentScript: [
+      path.join(__dirname, '../chrome/content-scripts/bringInject.js'),
+    ]
+  },
+  devServer: {
+    devMiddleware: {
+      writeToDisk: true,
+    },
+    hot: false,
+    liveReload: false,
+    // HTTP is not actually used because injected code must always be written to `dev` dir
+    port: 3001,
+  },
+  output: {
+    path: path.join(__dirname, '../dev/js'),
+    filename: 'bringInject.js',
+  },
+
+  plugins: [
+    ...commonConfig.plugins('dev', networkName),
+    new webpack.optimize.LimitChunkCountPlugin({
+        maxChunks: 1
+    }),
+    new webpack.DefinePlugin(commonConfig.definePlugin(
+      networkName,
+      false,
+      isNightly,
+      Boolean(isLight),
+    )),
+    new webpack.IgnorePlugin(/[^/]+\/[\S]+.dev$/),
+  ],
+  module: {
+    rules: [
+      ...commonConfig.rules(false),
+      {
+        test: /\.js$/,
+        loader: 'babel-loader',
+        exclude: /node_modules/,
+        options: {
+          presets: []
+        }
+      },
+    ]
+  },
+});
+
+module.exports = { baseDevConfig, contentScriptConfig };
diff --git a/packages/yoroi-extension/webpack-mv2/prodConfig.js b/packages/yoroi-extension/webpack-mv2/prodConfig.js
index cdbc02d9e0..161757f942 100644
--- a/packages/yoroi-extension/webpack-mv2/prodConfig.js
+++ b/packages/yoroi-extension/webpack-mv2/prodConfig.js
@@ -17,6 +17,49 @@ type EnvParams = {|
   isLight: "true" | "false"
 |};
 */
+const contentScriptConfig = (env /*: EnvParams */) /*: * */ => ({
+  mode: 'production',
+  optimization: commonConfig.optimization,
+  experiments: commonConfig.experiments,
+  resolve: commonConfig.resolve(),
+  entry: {
+    contentScript: [
+      path.join(__dirname, '../chrome/content-scripts/bringInject.js'),
+    ]
+  },
+  output: {
+    path: path.join(__dirname, '../build/js'),
+    filename: 'bringInject.js',
+  },
+
+  plugins: [
+    ...commonConfig.plugins('build', env.networkName),
+    new webpack.optimize.LimitChunkCountPlugin({
+        maxChunks: 1
+    }),
+    new webpack.DefinePlugin(commonConfig.definePlugin(
+      env.networkName,
+      true,
+      JSON.parse(env.nightly),
+      JSON.parse(env.isLight)
+    )),
+    new webpack.IgnorePlugin(/[^/]+\/[\S]+.dev$/),
+  ],
+  module: {
+    rules: [
+      ...commonConfig.rules(false),
+      {
+        test: /\.js$/,
+        loader: 'babel-loader',
+        exclude: /node_modules/,
+        options: {
+          presets: []
+        }
+      },
+    ]
+  },
+});
+
 const baseProdConfig = (env /*: EnvParams */) /*: * */ => ({
   mode: 'production',
   optimization: commonConfig.optimization,
@@ -86,4 +129,4 @@ const baseProdConfig = (env /*: EnvParams */) /*: * */ => ({
 });
 
 // export a callable function so we can swap out the network to use
-module.exports = baseProdConfig;
+module.exports = [ contentScriptConfig, baseProdConfig ];

From 0a29c0f55456f1a9320704d8e71f5418301591fd Mon Sep 17 00:00:00 2001
From: kalfada <kalfada3321@gmail.com>
Date: Wed, 18 Sep 2024 10:05:20 +0300
Subject: [PATCH 004/143] fix: change cashback page to use function component

---
 .../app/UI/context/IntlProvider.tsx           |   2 +-
 .../app/containers/cashback/CashbackPage.js   | 386 ++++++++++++------
 .../app/stores/stateless/sidebarCategories.js |  17 +-
 3 files changed, 261 insertions(+), 144 deletions(-)

diff --git a/packages/yoroi-extension/app/UI/context/IntlProvider.tsx b/packages/yoroi-extension/app/UI/context/IntlProvider.tsx
index 76d0e5b1f0..105696d691 100644
--- a/packages/yoroi-extension/app/UI/context/IntlProvider.tsx
+++ b/packages/yoroi-extension/app/UI/context/IntlProvider.tsx
@@ -8,4 +8,4 @@ export const IntlProvider = ({ children, intl }: { children: React.ReactNode; in
 };
 
 export const useIntl = () =>
-  React.useContext(IntlProviderContext) ?? console.warn('IntlProviderontext: needs to be wrapped in a IntlProvider');
+  React.useContext(IntlProviderContext) ?? console.warn('IntlProviderContext: needs to be wrapped in a IntlProvider');
diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index c7967e4bb4..d909cdba26 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -1,9 +1,9 @@
 // @flow
-import type { Node, ComponentType } from 'react';
-import { Component, Suspense } from 'react';
+import { useState, useEffect, useCallback, Suspense, useRef } from 'react';
+import styles from './styles.module.css'
+import type { Node } from 'react';
 import { observer } from 'mobx-react';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
-import { intlShape } from 'react-intl';
 import type { StoresAndActionsProps } from '../../types/injectedProps.types';
 import TopBarLayout from '../../components/layout/TopBarLayout';
 import BannerContainer from '../banners/BannerContainer';
@@ -17,157 +17,273 @@ import NavBarContainerRevamp from '../NavBarContainerRevamp';
 import NavBarTitle from '../../components/topbar/NavBarTitle';
 import globalMessages from '../../i18n/global-messages';
 import { CoreAddressTypes } from '../../api/ada/lib/storage/database/primitives/enums';
+import { useTheme } from '@mui/material';
+import { walletSignData } from '../../api/ada';
+import { getPublicDeriverById } from '../../../chrome/extension/background/handlers/yoroi/utils';
+import Dialog from '../../components/widgets/Dialog';
+import DialogCloseButton from '../../components/widgets/DialogCloseButton';
+import DialogTextBlock from '../../components/widgets/DialogTextBlock'
+import { Box, TextField, InputAdornment, IconButton, Tooltip, Typography } from '@mui/material';
 
 type Props = StoresAndActionsProps;
 
 type InjectedLayoutProps = {| +renderLayoutComponent: LayoutComponentMap => Node |};
 type AllProps = {| ...Props, ...InjectedLayoutProps |};
-type State = {| iframeSrc: string, status: string, popup: boolean, overlayBgColor: string |};
 
 type IframeMessageData = {|
-    action: string,
-        bgColor ?: string,
-        messageToSign: string
-            |};
-
-@observer
-class CashbackPageContainer extends Component<AllProps, State> {
-    static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
-    intl: intlShape.isRequired,
-  };
+  action: string,
+    bgColor ?: string,
+    message: string
+      |};
 
-state = {
-    iframeSrc: '', // Initial URL
-    status: 'loading', // Initial status
-    popup: false,
-    overlayBgColor: '#000000fa'
-};
-
-async componentDidMount() {
-    // User should not be able to access the route when using Yoroi Light
-    if (environment.isLight) {
-        this.props.actions.router.goToRoute.trigger({
-            route: ROUTES.MY_WALLETS,
-        });
-    }
-    this.fetchIframeUrl()
-    this.setupMessageListener();
-}
+const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllProps) => {
+  const { actions, stores } = props;
+  const theme = useTheme();
+  // const intl = useContext(IntlContext);
 
-componentWillUnmount() {
-    this.removeMessageListener();
-}
+  const iframeRef = useRef < HTMLIFrameElement | null > (null);
+  const [iframeSrc, setIframeSrc] = useState('');
+  const [status, setStatus] = useState('loading');
+  const [popup, setPopup] = useState(false);
+  const [password, setPassword] = useState('')
+  const [showPassword, setShowPassword] = useState(false)
+  const [errMsg, setErrMsg] = useState('')
+  const [message, setMessage] = useState('')
+  const [signaturePopup, setSignaturePopup] = useState(false);
+  const [overlayBgColor, setOverlayBgColor] = useState('#000000fa');
 
-setupMessageListener = () => {
-    window.addEventListener('message', this.handleMessage);
-}
+  const fetchIframeUrl = useCallback(async () => {
+    try {
+      console.log({ themeBring: theme.name.split('-')[0] });
 
-removeMessageListener = () => {
-    window.removeEventListener('message', this.handleMessage);
-}
+      const publicDeriver = stores.wallets.selected;
+      if (!publicDeriver) throw Error('no publicDeriver');
+      const walletAddress = publicDeriver.externalAddressesByType[CoreAddressTypes.CARDANO_BASE][0].address;
+
+      const response = await fetch(`${environment.bringBaseUrl}check/portal`, {
+        method: 'POST',
+        headers: {
+          'x-api-key': environment.bringIdentifier,
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({ walletAddress }),
+      });
+      const data = await response.json();
 
-handleMessage = (event: MessageEvent) => {
-    const iframeOrigin = new URL(this.state.iframeSrc).origin
+      const queryParams = new URLSearchParams({ ...data, theme: theme.name.split('-')[0] }).toString();
+      const newIframeSrc = `${environment.bringIframeSrc}/?${queryParams}`;
 
-    if (event.origin !== iframeOrigin) {
-        return;
+      setIframeSrc(newIframeSrc);
+      setStatus('done');
+    } catch (error) {
+      console.error('Error fetching data:', error);
     }
+  }, [stores.wallets.selected]);
 
-    console.log('Received message from iframe:', event.data);
+  const signMessage = useCallback(async (message: string, password: string) => {
+    const wallet = stores.wallets.selected;
+    if (!wallet) throw Error('no publicDeriver');
+    const address = wallet.externalAddressesByType[CoreAddressTypes.CARDANO_BASE][0].address;
+    const publicDeriver = await getPublicDeriverById(wallet.publicDeriverId)
+    let res: {| key: string, signature: string |}| null = null
+    console.log({ step: 'before', address, message });
+  try {
+    res = await walletSignData(publicDeriver, password, address, '74657374')
+    console.log({ step: 'after', ...res, message: 'test', address });
 
-    const messageData: IframeMessageData = (event.data: any);
+  } catch (error) {
+    setErrMsg(error.message)
+    console.warn(error);
+  }
+  iframeRef.current?.contentWindow.postMessage({ from: 'bringweb3', action: 'SIGNATURE', ...res, message, address }, '*');
+  setSignaturePopup(false)
+}, []);
 
-    if (messageData.action === 'SIGN_MESSAGE') {
-        // messageData.messageToSign
-    }
-    else if (messageData.action === 'OPEN_POPUP') {
-        this.setState({ popup: true, overlayBgColor: messageData.bgColor || this.state.overlayBgColor })
-    }
-    else if (messageData.action === 'CLOSE_POPUP') {
-        this.setState({ popup: false })
-    }
-}
+const handleMessage = useCallback(async (event: MessageEvent) => {
+  const iframeOrigin = new URL(iframeSrc).origin;
 
-async fetchIframeUrl(){
-    try {
-        const publicDeriver = this.props.stores.wallets.selected
-        if (!publicDeriver) throw Error('no publicDeriver')
-        const walletAddress = publicDeriver.externalAddressesByType[CoreAddressTypes.CARDANO_BASE][0].address;
-
-        const response = await fetch(`${environment.bringBaseUrl}check/portal`, {
-            method: 'POST',
-            headers: {
-                'x-api-key': environment.bringIdentifier,
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
-                walletAddress,
-
-            }),
-        }); // Replace with your API endpoint
-        const data = await response.json();
-
-        // Convert data to query parameters (assuming data is an object)
-        const queryParams = new URLSearchParams({ ...data, theme: environment.isLight ? 'light' : 'dark' }).toString();
-        const iframeSrc = `${environment.bringIframeSrc}/?${queryParams}`;
-
-        // Update the state to reflect the new iframe URL
-        this.setState({ iframeSrc, status: 'done' });
-    } catch (error) {
-        console.error('Error fetching data:', error);
-    }
-}
+  if (event.origin !== iframeOrigin) {
+    return;
+  }
 
+  console.log('Received message from iframe:', event.data);
 
+  const messageData: IframeMessageData = (event.data: any);
 
-render(): Node {
-    const { actions, stores } = this.props;
-    const sidebarContainer = <SidebarContainer actions={actions} stores={stores} />;
-    const { intl } = this.context;
-
-    return (
-        <TopBarLayout
-            banner={<BannerContainer actions={actions} stores={stores} />}
-            sidebar={sidebarContainer}
-            navbar={
-                <NavBarContainerRevamp
-                    actions={actions}
-                    stores={stores}
-                    title={<NavBarTitle title={intl.formatMessage(globalMessages.sidebarCashback)} />}
-                />
-            }
-        >
-            <FullscreenLayout bottomPadding={0}>
-                {this.state.popup ?
-                    <div
-                        style={{ position: 'fixed', inset: 0, background: this.state.overlayBgColor, zIndex: 10 }}
-                        onClick={() => {
-                            const iframeElement = document.getElementById('bringweb3');
-                            if (iframeElement instanceof HTMLIFrameElement) {
-                                iframeElement.contentWindow.postMessage({ action: 'CLOSE_POPUP' }, '*')
-                            }
-                            this.setState({ popup: false })
-                        }}
-                    ></div>
-                    :
-                    null
-                }
-                <Suspense fallback={null}>
-                    {this.state.iframeSrc.length ?
-                        <iframe
-                            id='bringweb3'
-                            style={{ position: 'relative', zIndex: 11 }}
-                            src={this.state.iframeSrc}
-                            width='100%'
-                            height='100%'
-                        />
-                        :
-                        null
-                    }
-                </Suspense>
-            </FullscreenLayout>
-        </TopBarLayout>
-    );
-}
+if (messageData.action === 'SIGN_MESSAGE') {
+  // const wallet = stores.wallets.selected;
+  setMessage(messageData.message)
+  setSignaturePopup(true)
+  //   if (!wallet) throw Error('no publicDeriver');
+  //   const address = wallet.externalAddressesByType[CoreAddressTypes.CARDANO_BASE][0].address;
+  //   const publicDeriver = await getPublicDeriverById(wallet.publicDeriverId)
+  //   let res: {| key: string, signature: string |}| null = null
+  // try {
+  //   res = await walletSignData(publicDeriver, 'Mottiemmanuelle123', address, messageData.messageToSign)
+  // } catch (error) {
+  //   setErrMsg(error.message)
+  //   console.warn(error);
+  // }
+  // console.log({ res });
+
+  // const iframe = document.getElementById('bringweb3');
+  // if (iframe instanceof HTMLIFrameElement) {
+  //   iframe.contentWindow.postMessage({ from: 'bringweb3', action: 'SIGNATURE', ...res, message: messageData.messageToSign }, '*');
+  // }
+
+} else if (messageData.action === 'OPEN_POPUP') {
+  setPopup(true);
+  setOverlayBgColor(messageData.bgColor || overlayBgColor);
+} else if (messageData.action === 'CLOSE_POPUP') {
+  setPopup(false);
 }
-export default (withLayout(CashbackPageContainer): ComponentType < Props >);
+}, [iframeSrc, overlayBgColor]);
+
+useEffect(() => {
+  if (environment.isLight) {
+    actions.router.goToRoute.trigger({
+      route: ROUTES.MY_WALLETS,
+    });
+  }
+  if (!iframeSrc) fetchIframeUrl();
+
+  window.addEventListener('message', handleMessage);
+
+  return () => {
+    window.removeEventListener('message', handleMessage);
+  };
+}, [iframeSrc, fetchIframeUrl, handleMessage]);
+
+const closePopup = useCallback(() => {
+  const iframeElement = document.getElementById('bringweb3');
+  if (iframeElement instanceof HTMLIFrameElement) {
+    iframeElement.contentWindow.postMessage({ action: 'CLOSE_POPUP' }, '*');
+  }
+  setPopup(false);
+}, []);
+
+const sidebarContainer = <SidebarContainer actions={actions} stores={stores} />;
+
+return (
+  <TopBarLayout
+    banner={<BannerContainer actions={actions} stores={stores} />}
+    sidebar={sidebarContainer}
+    navbar={
+      <NavBarContainerRevamp
+        actions={actions}
+        stores={stores}
+        title={<NavBarTitle title={'Cashback'} />}
+      // title={<NavBarTitle title={intl.formatMessage(globalMessages.sidebarCashback)} />}
+      />
+    }
+  >
+    <FullscreenLayout bottomPadding={0}>
+      <Suspense fallback={null}>
+        {signaturePopup ?
+          <Dialog
+            title='CLAIM CASHBACK'
+            closeOnOverlayClick
+            closeButton={<DialogCloseButton />}
+            onClose={() => setSignaturePopup(false)}
+            actions={[{
+              label: 'CONFIRM',
+              primary: true,
+              disabled: !password,
+              onClick: () => signMessage(message, password)
+            }]}
+          >
+            <Box>
+              <Typography>
+                Enter your password and confirm to claim the cashback rewards.
+              </Typography>
+              <DialogTextBlock>
+                Cashback rewards
+                <Tooltip
+                  placement='top'
+                  title={<Typography align='center' component="div" variant="body3">Cashback amount rewarded for online shopping</Typography>}
+                >
+                  i
+                </Tooltip>
+              </DialogTextBlock>
+              <Typography>
+                300 ADA
+              </Typography>
+              <TextField
+                className="walletPassword"
+                value={password}
+                label="Password"
+                type="password"
+                // endAdornment={
+                //   <InputAdornment position="end">
+                //     <IconButton
+                //       aria-label="toggle password visibility"
+                //       onClick={() => setShowPassword(!showPassword)}
+                //       edge="end"
+                //     >
+                //       {!showPassword ? <Icon.VisibilityOff /> : <Icon.VisibilityOn />}
+                //     </IconButton>
+                //   </InputAdornment>
+                // }
+                onChange={e => {
+                  setPassword(e.target.value);
+                }}
+                error={errMsg && 'Incorrect password!'}
+                disabled={false}
+              />
+            </Box>
+            {/* <TextField /> */}
+          </Dialog>
+          : null}
+        {signaturePopup ?
+          // <div className={styles.overlay}>
+          //   <div className={styles.popup}>
+          //     <button
+          //       className={styles.close_btn}
+          //       onClick={() => setSignaturePopup(false)}
+          //     >X</button>
+          //     <div>
+          //       Sign
+          //     </div>
+          //     <form
+          //       className={styles.form}
+          //       onSubmit={(e) => {
+          //         e.preventDefault()
+          //         signMessage(message, password)
+          //       }}
+          //     >
+          //       <input
+          //         type='text'
+          //         value={password}
+          //         onChange={e => setPassword(e.target.value)}
+          //       />
+          //       {errMsg ? <div>{errMsg}</div> : null}
+          //       <input type='submit' value={'Sign'} />
+          //     </form>
+          //   </div>
+          // </div>
+          <></>
+          : null}
+        {popup ? (
+          <div
+            className={styles.iframe_overlay}
+            style={{ background: overlayBgColor }}
+            onClick={closePopup}
+          />
+        ) : null}
+        {iframeSrc && (
+          <iframe
+            ref={iframeRef}
+            id="bringweb3"
+            className={styles.iframe}
+            src={iframeSrc}
+            width="100%"
+            height="100%"
+          />
+        )}
+      </Suspense>
+    </FullscreenLayout>
+  </TopBarLayout>
+);
+});
+
+export default (withLayout(CashbackPageContainer): React$ComponentType < Props >);
\ No newline at end of file
diff --git a/packages/yoroi-extension/app/stores/stateless/sidebarCategories.js b/packages/yoroi-extension/app/stores/stateless/sidebarCategories.js
index a12831fc86..23c5368657 100644
--- a/packages/yoroi-extension/app/stores/stateless/sidebarCategories.js
+++ b/packages/yoroi-extension/app/stores/stateless/sidebarCategories.js
@@ -1,6 +1,7 @@
 // @flow
 import type { MessageDescriptor } from 'react-intl';
 import { ReactComponent as dappConnectorIcon } from '../../assets/images/dapp-connector/dapp-connector.inline.svg';
+import { ReactComponent as CashbackIcon } from '../../assets/images/sidebar/cashback.inline.svg';
 import { ReactComponent as walletsIcon } from '../../assets/images/sidebar/my_wallets.inline.svg';
 import { ReactComponent as assetsIcon } from '../../assets/images/sidebar/revamp/assets.inline.svg';
 import { ReactComponent as governanceIcon } from '../../assets/images/sidebar/revamp/governance.inline.svg';
@@ -87,9 +88,9 @@ export const CONNECTED_WEBSITES: SidebarCategory = registerCategory({
 
 type isVisibleFunc = ({|
   hasAnyWallets: boolean,
-  selected: ?WalletState,
-  currentRoute: string,
-  isRewardWallet: isRewardWalletFunc,
+    selected: ?WalletState,
+      currentRoute: string,
+        isRewardWallet: isRewardWalletFunc,
 |}) => boolean;
 
 type isRewardWalletFunc = ({ publicDeriverId: number, ... }) => boolean;
@@ -97,10 +98,10 @@ type isRewardWalletFunc = ({ publicDeriverId: number, ... }) => boolean;
 export type SidebarCategoryRevamp = {|
   +className: string,
   +route: string,
-  +icon: string,
-  +label?: MessageDescriptor,
-  +isVisible: isVisibleFunc,
-  +featureFlagName?: string,
+    +icon: string,
+      +label ?: MessageDescriptor,
+      +isVisible: isVisibleFunc,
+        +featureFlagName ?: string,
 |};
 
 // TODO: Fix routes and isVisible prop
@@ -163,7 +164,7 @@ export const allCategoriesRevamp: Array<SidebarCategoryRevamp> = [
   {
     className: 'cashback',
     route: ROUTES.CASHBACK.ROOT,
-    icon: dappConnectorIcon,
+    icon: CashbackIcon,
     label: globalMessages.sidebarCashback,
     isVisible: _request => true,
   },

From 05488ba988637f2bdadad79b89ead34557cacde8 Mon Sep 17 00:00:00 2001
From: kalfada <kalfada3321@gmail.com>
Date: Wed, 18 Sep 2024 10:07:16 +0300
Subject: [PATCH 005/143] fix: add not added files

---
 .../assets/images/sidebar/cashback.inline.svg |  5 +++
 .../app/containers/cashback/styles.module.css | 44 +++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 packages/yoroi-extension/app/assets/images/sidebar/cashback.inline.svg
 create mode 100644 packages/yoroi-extension/app/containers/cashback/styles.module.css

diff --git a/packages/yoroi-extension/app/assets/images/sidebar/cashback.inline.svg b/packages/yoroi-extension/app/assets/images/sidebar/cashback.inline.svg
new file mode 100644
index 0000000000..c1ff199691
--- /dev/null
+++ b/packages/yoroi-extension/app/assets/images/sidebar/cashback.inline.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 5C2 2.79086 3.79086 1 6 1C8.20914 1 10 2.79086 10 5C10 7.20914 8.20914 9 6 9C3.79086 9 2 7.20914 2 5ZM6 3C4.89543 3 4 3.89543 4 5C4 6.10457 4.89543 7 6 7C7.10457 7 8 6.10457 8 5C8 3.89543 7.10457 3 6 3Z" fill="white" fill-opacity="0.48"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.9666 9.75994C18.5449 9.21519 19.3155 8.92183 20.1098 8.94428C20.9056 8.96678 21.66 9.3045 22.2068 9.88315C22.7536 10.4618 23.0482 11.234 23.0257 12.0298C23.0032 12.8245 22.6664 13.5778 22.0893 14.1245L22.0868 14.1268L17.5213 18.4939C16.6077 19.516 15.3317 20 14 20H10.0333L2.56661 20.4975C2.29046 20.5159 2.01903 20.419 1.81693 20.23C1.61482 20.0409 1.50012 19.7765 1.50012 19.4997V14.3C1.50012 13.7477 1.94784 13.3 2.50012 13.3H5.39638L7.8559 10.9283C8.40016 10.2574 9.21589 10 9.99998 10H13C13.7956 10 14.5587 10.3161 15.1213 10.8787C15.3925 11.1499 15.6064 11.4677 15.7553 11.8133L17.9666 9.75994ZM15.0512 15.1892C14.4961 15.7093 13.763 16 13 16H11C10.4477 16 9.99998 15.5523 9.99998 15C9.99998 14.4477 10.4477 14 11 14H13C13.2652 14 13.5195 13.8946 13.7071 13.7071C13.8946 13.5196 14 13.2652 14 13C14 12.7348 13.8946 12.4804 13.7071 12.2929C13.5195 12.1054 13.2652 12 13 12H9.99998C9.61141 12 9.45671 12.1244 9.39998 12.2C9.36795 12.2427 9.33255 12.2828 9.29412 12.3198L6.49412 15.0198C6.30774 15.1996 6.05891 15.3 5.79998 15.3H3.50012V18.4309L9.9335 18.0022C9.95563 18.0007 9.9778 18 9.99998 18H14C14.853 18 15.563 17.6951 16.0474 17.1415C16.0669 17.1192 16.0874 17.0978 16.1088 17.0774L20.7131 12.6732C20.9063 12.4907 21.019 12.2389 21.0265 11.9733C21.034 11.7077 20.9357 11.45 20.7532 11.2568C20.5707 11.0637 20.3189 10.951 20.0533 10.9435C19.7877 10.936 19.53 11.0343 19.3368 11.2168L19.3305 11.2228L15.1304 15.1228C15.1049 15.1465 15.0784 15.1686 15.0512 15.1892Z" fill="white" fill-opacity="0.48"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15 3C13.3431 3 12 4.34315 12 6C12 7.65685 13.3431 9 15 9C16.6569 9 18 7.65685 18 6C18 4.34315 16.6569 3 15 3ZM14 6C14 5.44772 14.4477 5 15 5C15.5523 5 16 5.44772 16 6C16 6.55228 15.5523 7 15 7C14.4477 7 14 6.55228 14 6Z" fill="white" fill-opacity="0.48"/>
+</svg>
diff --git a/packages/yoroi-extension/app/containers/cashback/styles.module.css b/packages/yoroi-extension/app/containers/cashback/styles.module.css
new file mode 100644
index 0000000000..790b4c8281
--- /dev/null
+++ b/packages/yoroi-extension/app/containers/cashback/styles.module.css
@@ -0,0 +1,44 @@
+.overlay{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    position: fixed;
+    inset: 0;
+    background: #00000031;
+    z-index: 12;
+}
+
+.popup{
+    position: relative;
+    display: flex;
+    gap: 8px;
+    flex-direction: column;
+    align-items: center;
+    height: 400px;
+    width: 480px;
+    background: white;
+    border-radius: 8px;
+    padding: 16px;
+}
+
+.close_btn{
+    position: absolute;
+    top: 16px;
+    right: 16px;
+}
+
+.form{
+    display: flex;
+    flex-direction: column;
+}
+
+.iframe_overlay{
+    position: fixed;
+    inset: 0;
+    z-index: 10;
+}
+
+.iframe{
+    position: relative;
+    z-index: 11;
+}
\ No newline at end of file

From 020701280c6ca04d6a2db2576ad756037701aeed Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Mon, 23 Sep 2024 18:46:05 +0800
Subject: [PATCH 006/143] move Bring code into a content script

---
 .../yoroi-extension/chrome/content-scripts/inject.js |  1 -
 .../yoroi-extension/chrome/manifest-mv2.template.js  | 12 ++++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/yoroi-extension/chrome/content-scripts/inject.js b/packages/yoroi-extension/chrome/content-scripts/inject.js
index 3dcfef9656..4f0f74dc18 100644
--- a/packages/yoroi-extension/chrome/content-scripts/inject.js
+++ b/packages/yoroi-extension/chrome/content-scripts/inject.js
@@ -198,7 +198,6 @@ async function connectorEventListener(event) {
 }
 
 if (shouldInject()) {
-    injectIntoPage('bringInject');
     if (injectIntoPage('initialInject')) {
         // events from page (injected code)
         window.addEventListener("message", connectorEventListener);
diff --git a/packages/yoroi-extension/chrome/manifest-mv2.template.js b/packages/yoroi-extension/chrome/manifest-mv2.template.js
index 12a38f3346..277201c79e 100644
--- a/packages/yoroi-extension/chrome/manifest-mv2.template.js
+++ b/packages/yoroi-extension/chrome/manifest-mv2.template.js
@@ -76,6 +76,18 @@ export default ({
         matches: ['*://connect.trezor.io/*/popup.html'],
         js: ['js/trezor-content-script.js'],
       },
+      {
+        matches: [
+          'file://*/*',
+          'http://*/*',
+          'https://*/*',
+        ],
+        js: [
+          'js/bringInject.js',
+        ],
+        run_at: 'document_start',
+        all_frames: true,
+      }
     ],
     content_security_policy: contentSecurityPolicy,
     protocol_handlers: !enableProtocolHandlers

From 754b8fdc24b38c4ed73fb282f2d7333dca1db39e Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Mon, 23 Sep 2024 18:47:13 +0800
Subject: [PATCH 007/143] add example for calling chrome.runtime.onMessage

---
 .../chrome/content-scripts/bringInject.js     | 191 +++++++++---------
 1 file changed, 98 insertions(+), 93 deletions(-)

diff --git a/packages/yoroi-extension/chrome/content-scripts/bringInject.js b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
index c28cbcba1e..95eead7c37 100644
--- a/packages/yoroi-extension/chrome/content-scripts/bringInject.js
+++ b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
@@ -1,104 +1,109 @@
 import { bringInitContentScript } from "@bringweb3/chrome-extension-kit";
 
-bringInitContentScript({
+(async () => {
+  await bringInitContentScript({
     iframeEndpoint: process.env.IFRAME_ENDPOINT,
     getWalletAddress: async () => await new Promise(resolve => setTimeout(() => resolve('<USER_WALLET_ADDRESS>'), 200)),// Async function that returns the current user's wallet address
     promptLogin: () => { return window.prompt('login'); }, // Function that prompts a UI element asking the user to login
     walletAddressListeners: ["customEvent:addressChanged"], // A list of custom events that dispatched when the user's wallet address had changed
     customTheme: {
-        // font
-        fontUrl: 'https://fonts.googleapis.com/css2?family=Matemasie&display=swap',
-        fontFamily: "'Matemasie', system-ui",
-        // Popup
-        popupBg: "#192E34",
-        popupShadow: "",
-        // Primary button
-        primaryBtnBg: "linear-gradient(135deg, #5DEB5A 0%, #FDFC47 100%)",
-        primaryBtnFC: "#041417",
-        primaryBtnFW: "600",
-        primaryBtnFS: "14px",
-        primaryBtnBorderC: "transparent",
-        primaryBtnBorderW: "0",
-        primaryBtnRadius: "8px",
-        // Secondary button
-        secondaryBtnBg: "transparent",
-        secondaryBtnFS: "12px",
-        secondaryBtnFW: "500",
-        secondaryBtnFC: "white",
-        secondaryBtnBorderC: "rgba(149, 176, 178, 0.50)",
-        secondaryBtnBorderW: "2px",
-        secondaryBtnRadius: "8px",
-        // Markdown
-        markdownBg: "#07131766",
-        markdownFS: "12px",
-        markdownFC: "#DADCE5",
-        markdownBorderW: "0",
-        markdownRadius: "4px",
-        markdownBorderC: "black",
-        markdownScrollbarC: "#DADCE5",
-        // Wallet address
-        walletBg: "#33535B",
-        walletFS: "10px",
-        walletFW: "400",
-        walletFC: "white",
-        walletBorderC: "white",
-        walletBorderW: "0",
-        walletRadius: "4px",
-        // Details of offering
-        detailsBg: "#33535B",
-        detailsTitleFS: "15px",
-        detailsTitleFW: "600",
-        detailsTitleFC: "white",
-        detailsSubtitleFS: "14px",
-        detailsSubtitleFW: "500",
-        detailsSubtitleFC: "#A8ADBF",
-        detailsRadius: "8px",
-        detailsBorderW: "0",
-        detailsBorderC: "transparent",
-        detailsAmountFC: "#5DEB5A",
-        detailsAmountFW: "700",
-        // Overlay
-        overlayBg: "#192E34E6",
-        overlayFS: "13px",
-        overlayFW: "400",
-        overlayFC: "#DADCE5",
-        loaderBg: "#0A2EC0",
-        // Optout \ Turn off
-        optoutBg: "#192E34",
-        optoutFS: "14px",
-        optoutFW: "400",
-        optoutFC: "white",
-        optoutRadius: "56px",
-        // X Button and close buttons
-        closeFS: "9px",
-        closeFW: "300",
-        closeFC: "#B9BBBF",
-        // Token name
-        tokenBg: "transparent",
-        tokenFS: "13px",
-        tokenFW: "600",
-        tokenFC: "#DADCE5",
-        tokenBorderW: "2px",
-        tokenBorderC: "#DADCE5",
-        // Notification popup
-        notificationFS: "14px",
-        notificationFW: "500",
-        notificationFC: "white",
-        notificationBtnBg: "linear-gradient(135deg, #5DEB5A 0%, #FDFC47 100%)",
-        notificationBtnFS: "12px",
-        notificationBtnFW: "500",
-        notificationBtnFC: "#041417",
-        notificationBtnBorderW: "0",
-        notificationBtnBorderC: "transparent",
-        notificationBtnRadius: "8px",
-        activateTitleFS: "--activate-title-f-s",
-        activateTitleFW: "--activate-title-f-w",
-        activateTitleFC: "--activate-title-f-c",
-        activateTitleBoldFS: "--activate-title-bold-f-s",
-        activateTitleBoldFW: "--activate-title-bold-f-w",
-        activateTitleBoldFC: "--activate-title-bold-f-c",
+      // font
+      fontUrl: 'https://fonts.googleapis.com/css2?family=Matemasie&display=swap',
+      fontFamily: "'Matemasie', system-ui",
+      // Popup
+      popupBg: "#192E34",
+      popupShadow: "",
+      // Primary button
+      primaryBtnBg: "linear-gradient(135deg, #5DEB5A 0%, #FDFC47 100%)",
+      primaryBtnFC: "#041417",
+      primaryBtnFW: "600",
+      primaryBtnFS: "14px",
+      primaryBtnBorderC: "transparent",
+      primaryBtnBorderW: "0",
+      primaryBtnRadius: "8px",
+      // Secondary button
+      secondaryBtnBg: "transparent",
+      secondaryBtnFS: "12px",
+      secondaryBtnFW: "500",
+      secondaryBtnFC: "white",
+      secondaryBtnBorderC: "rgba(149, 176, 178, 0.50)",
+      secondaryBtnBorderW: "2px",
+      secondaryBtnRadius: "8px",
+      // Markdown
+      markdownBg: "#07131766",
+      markdownFS: "12px",
+      markdownFC: "#DADCE5",
+      markdownBorderW: "0",
+      markdownRadius: "4px",
+      markdownBorderC: "black",
+      markdownScrollbarC: "#DADCE5",
+      // Wallet address
+      walletBg: "#33535B",
+      walletFS: "10px",
+      walletFW: "400",
+      walletFC: "white",
+      walletBorderC: "white",
+      walletBorderW: "0",
+      walletRadius: "4px",
+      // Details of offering
+      detailsBg: "#33535B",
+      detailsTitleFS: "15px",
+      detailsTitleFW: "600",
+      detailsTitleFC: "white",
+      detailsSubtitleFS: "14px",
+      detailsSubtitleFW: "500",
+      detailsSubtitleFC: "#A8ADBF",
+      detailsRadius: "8px",
+      detailsBorderW: "0",
+      detailsBorderC: "transparent",
+      detailsAmountFC: "#5DEB5A",
+      detailsAmountFW: "700",
+      // Overlay
+      overlayBg: "#192E34E6",
+      overlayFS: "13px",
+      overlayFW: "400",
+      overlayFC: "#DADCE5",
+      loaderBg: "#0A2EC0",
+      // Optout \ Turn off
+      optoutBg: "#192E34",
+      optoutFS: "14px",
+      optoutFW: "400",
+      optoutFC: "white",
+      optoutRadius: "56px",
+      // X Button and close buttons
+      closeFS: "9px",
+      closeFW: "300",
+      closeFC: "#B9BBBF",
+      // Token name
+      tokenBg: "transparent",
+      tokenFS: "13px",
+      tokenFW: "600",
+      tokenFC: "#DADCE5",
+      tokenBorderW: "2px",
+      tokenBorderC: "#DADCE5",
+      // Notification popup
+      notificationFS: "14px",
+      notificationFW: "500",
+      notificationFC: "white",
+      notificationBtnBg: "linear-gradient(135deg, #5DEB5A 0%, #FDFC47 100%)",
+      notificationBtnFS: "12px",
+      notificationBtnFW: "500",
+      notificationBtnFC: "#041417",
+      notificationBtnBorderW: "0",
+      notificationBtnBorderC: "transparent",
+      notificationBtnRadius: "8px",
+      activateTitleFS: "--activate-title-f-s",
+      activateTitleFW: "--activate-title-f-w",
+      activateTitleFC: "--activate-title-f-c",
+      activateTitleBoldFS: "--activate-title-bold-f-s",
+      activateTitleBoldFW: "--activate-title-bold-f-w",
+      activateTitleBoldFC: "--activate-title-bold-f-c",
     }
-});
+  });
+})().catch(console.error);
 
+// example
+chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
+});
 
 console.log('Bring injected');

From d4493f21572819bfbc3d9c209b6eccfa657d1a8a Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Tue, 24 Sep 2024 01:59:38 +0800
Subject: [PATCH 008/143] fix webpack

---
 packages/yoroi-extension/webpack-mv2/devConfig.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/yoroi-extension/webpack-mv2/devConfig.js b/packages/yoroi-extension/webpack-mv2/devConfig.js
index d18bec38f1..8078c99a1c 100644
--- a/packages/yoroi-extension/webpack-mv2/devConfig.js
+++ b/packages/yoroi-extension/webpack-mv2/devConfig.js
@@ -136,7 +136,6 @@ const contentScriptConfig = (
   },
 
   plugins: [
-    ...commonConfig.plugins('dev', networkName),
     new webpack.optimize.LimitChunkCountPlugin({
         maxChunks: 1
     }),

From e988a0e62e0271d0ad7e367462280a9095d593dc Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Tue, 24 Sep 2024 02:00:13 +0800
Subject: [PATCH 009/143] Bring content script gets addresses

---
 .../chrome/content-scripts/bringInject.js     | 43 +++++++++++++++++--
 .../background/handlers/content/rpc.js        | 20 ++++++++-
 2 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/packages/yoroi-extension/chrome/content-scripts/bringInject.js b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
index 95eead7c37..b6c8ac3bf8 100644
--- a/packages/yoroi-extension/chrome/content-scripts/bringInject.js
+++ b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
@@ -1,3 +1,5 @@
+// @flow
+
 import { bringInitContentScript } from "@bringweb3/chrome-extension-kit";
 
 (async () => {
@@ -102,8 +104,41 @@ import { bringInitContentScript } from "@bringweb3/chrome-extension-kit";
   });
 })().catch(console.error);
 
-// example
-chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
-});
+function getAddresses(): Promise<string> {
+  const uid = Math.random();
+  return new Promise((resolve, reject) => {
+    chrome.runtime.onMessage.addListener((msg, sender) => {
+      if (msg.type === 'connector_rpc_response' && msg.uid === uid) {
+        if (msg.return.ok) {
+          resolve(msg.return.ok);
+        } else {
+          reject(new Error(msg.return.err));
+        }
+      }
+    });
+
+    window.postMessage({
+      type: "connector_rpc_request",
+      url: location.hostname,
+      uid,
+      function: 'get_used_addresses',
+      params: [undefined],
+      returnType: 'cbor',
+    });
+  });
+}
+
+async function example() {
+  try {
+    const addrs = await getAddresses();
+    console.log('address', addrs[0]);
+  } catch (error) {
+    if (error.message === 'no wallet') {
+      console.log('no wallet');
+    } else {
+      throw error;
+    }
+  }
+}
 
-console.log('Bring injected');
+example().catch(console.error);
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js b/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js
index a97be9b726..7af533ef4c 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js
@@ -65,6 +65,7 @@ import {
 } from './connect';
 import type { CardanoTxRequest } from '../../../../../app/api/ada';
 import type { NFTMetadata } from '../../../../../app/api/ada/lib/storage/database/primitives/tables';
+import { getPublicDeriverById } from '../yoroi/utils';
 
 declare var chrome;
 
@@ -690,7 +691,24 @@ export async function handleRpc(message: Object, sender: Object) {
 
     let connectedWallet = undefined;
     if (handler.needConnectedWallet) {
-      connectedWallet = await getConnectedWallet(tabId, handler.syncConnectedWallet);
+      try {
+        connectedWallet = await getConnectedWallet(tabId, handler.syncConnectedWallet);
+      } catch (error) {
+        // fixme: unsafe
+        const localStorageApi = new LocalStorageApi();
+        const publicDeriverId = await localStorageApi.getSelectedWalletId();
+        if (publicDeriverId == null) {
+          sendRpcResponse(
+            {
+              err: 'no wallet',
+            },
+            tabId,
+            message.uid,
+          );
+          return;
+        }
+        connectedWallet = await getPublicDeriverById(publicDeriverId);
+      }
     }
 
     const result = await handler.handle({

From c29e5c0034045dbfacff881785029d0aa6043803 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Tue, 24 Sep 2024 11:00:22 +0800
Subject: [PATCH 010/143] get theme

---
 .../chrome/content-scripts/bringInject.js     | 19 +++++++++++++++----
 .../background/handlers/content/rpc.js        |  9 +++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/packages/yoroi-extension/chrome/content-scripts/bringInject.js b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
index b6c8ac3bf8..dd4dbbd6fb 100644
--- a/packages/yoroi-extension/chrome/content-scripts/bringInject.js
+++ b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
@@ -104,7 +104,7 @@ import { bringInitContentScript } from "@bringweb3/chrome-extension-kit";
   });
 })().catch(console.error);
 
-function getAddresses(): Promise<string> {
+function getFromBackground(functionName: string, params: andy): Promise<any> {
   const uid = Math.random();
   return new Promise((resolve, reject) => {
     chrome.runtime.onMessage.addListener((msg, sender) => {
@@ -121,17 +121,25 @@ function getAddresses(): Promise<string> {
       type: "connector_rpc_request",
       url: location.hostname,
       uid,
-      function: 'get_used_addresses',
-      params: [undefined],
+      function: functionName,
+      params,
       returnType: 'cbor',
     });
   });
 }
 
+function getAddresses(): Promise<string> {
+  return getFromBackground('get_used_addresses', [undefined]);
+}
+
+function getTheme(): Promise<'light' | 'dark'> {
+  return getFromBackground('get-theme-mode', [undefined]);
+}
+
 async function example() {
   try {
     const addrs = await getAddresses();
-    console.log('address', addrs[0]);
+    console.log('>>>address', addrs[0]);
   } catch (error) {
     if (error.message === 'no wallet') {
       console.log('no wallet');
@@ -139,6 +147,9 @@ async function example() {
       throw error;
     }
   }
+
+  const theme = await getTheme();
+  console.log('>>>theme:', theme);
 }
 
 example().catch(console.error);
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js b/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js
index 7af533ef4c..80a4d983a9 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js
@@ -644,6 +644,15 @@ const Handlers = Object.freeze({
       );
     }
   }),
+
+  'get-theme-mode': NewHandler.basic<
+    void,
+    'dark' | 'light'
+  >(async () => {
+    const localStorageApi = new LocalStorageApi();
+    const theme = await localStorageApi.getUserThemeMode();
+    return { ok: theme || 'light' };
+  }),
 });
 
 function sendRpcResponse(response: Object, tabId: number, messageUid: number) {

From 5cda0cf900edc513d7290a9553805845272c8397 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Tue, 24 Sep 2024 12:43:16 +0800
Subject: [PATCH 011/143] bug fix

---
 .../chrome/extension/background/handlers/yoroi/connector.js      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/connector.js b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/connector.js
index c76b142d8c..c1cd57ad54 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/connector.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/connector.js
@@ -427,7 +427,6 @@ export const RemoveWalletFromWhiteList: HandlerType<
       const site = connectedSites[tabId];
       if (site.url === request.url) {
         sendToInjector(Number(tabId), { type: 'disconnect' });
-        break;
       }
     }
   },

From 6b511a01c626f62b9f665d7713a78cc0e2ecb133 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Tue, 24 Sep 2024 12:43:37 +0800
Subject: [PATCH 012/143] Binds a wallet to bring

---
 .../chrome/content-scripts/bringInject.js     | 41 ++++++++++++++++---
 .../background/handlers/content/rpc.js        | 18 ++++----
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/packages/yoroi-extension/chrome/content-scripts/bringInject.js b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
index dd4dbbd6fb..ff3aeec66f 100644
--- a/packages/yoroi-extension/chrome/content-scripts/bringInject.js
+++ b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
@@ -117,9 +117,9 @@ function getFromBackground(functionName: string, params: andy): Promise<any> {
       }
     });
 
-    window.postMessage({
+    chrome.runtime.sendMessage({
       type: "connector_rpc_request",
-      url: location.hostname,
+      url: 'bring',
       uid,
       function: functionName,
       params,
@@ -128,6 +128,27 @@ function getFromBackground(functionName: string, params: andy): Promise<any> {
   });
 }
 
+// return false if user rejects
+function bindBringToWallet(unbindCallback: () => void): Promise<boolean> {
+  return new Promise((resolve, reject) => {
+    chrome.runtime.onMessage.addListener((msg, sender) => {
+      if (msg.type === 'yoroi_connect_response/cardano') {
+        resolve(msg.success);
+      } else if (msg.type === 'disconnect') {
+        unbindCallback();
+      }
+    });
+
+    chrome.runtime.sendMessage({
+      type: 'yoroi_connect_request/cardano',
+      connectParameters: {
+        url: 'bring',
+      },
+      imgBase64Url: '', // fixme: use Bring icon here
+    });
+  });
+}
+
 function getAddresses(): Promise<string> {
   return getFromBackground('get_used_addresses', [undefined]);
 }
@@ -137,19 +158,27 @@ function getTheme(): Promise<'light' | 'dark'> {
 }
 
 async function example() {
+  const bound = await bindBringToWallet(() => {
+    console.log('user unbinds wallet');
+  });
+  console.log('bound successfully:', bound);
+  if (!bound) {
+    return;
+  }
+
   try {
     const addrs = await getAddresses();
-    console.log('>>>address', addrs[0]);
+    console.log('address', addrs[0]);
   } catch (error) {
-    if (error.message === 'no wallet') {
-      console.log('no wallet');
+    if (error.message === 'not bound') {
+      console.log('Bring not bound to wallet');
     } else {
       throw error;
     }
   }
 
   const theme = await getTheme();
-  console.log('>>>theme:', theme);
+  console.log('theme:', theme);
 }
 
 example().catch(console.error);
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js b/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js
index 80a4d983a9..b71c09eacf 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js
@@ -62,6 +62,7 @@ import {
   getConnectedWallet,
   type ConnectedSite,
   type SignContinuationDataType,
+  getAllConnectedSites,
 } from './connect';
 import type { CardanoTxRequest } from '../../../../../app/api/ada';
 import type { NFTMetadata } from '../../../../../app/api/ada/lib/storage/database/primitives/tables';
@@ -700,23 +701,22 @@ export async function handleRpc(message: Object, sender: Object) {
 
     let connectedWallet = undefined;
     if (handler.needConnectedWallet) {
-      try {
-        connectedWallet = await getConnectedWallet(tabId, handler.syncConnectedWallet);
-      } catch (error) {
-        // fixme: unsafe
-        const localStorageApi = new LocalStorageApi();
-        const publicDeriverId = await localStorageApi.getSelectedWalletId();
-        if (publicDeriverId == null) {
+      if (message.url === 'bring') {
+        const connectedSites = await getAllConnectedSites();
+        const bringConnectedSite = Object.values(connectedSites).find(({ url }) => url === 'bring');
+        if (!bringConnectedSite) {
           sendRpcResponse(
             {
-              err: 'no wallet',
+              err: 'not bound',
             },
             tabId,
             message.uid,
           );
           return;
         }
-        connectedWallet = await getPublicDeriverById(publicDeriverId);
+        connectedWallet = await getPublicDeriverById(bringConnectedSite.status.publicDeriverId);      
+      } else {
+        connectedWallet = await getConnectedWallet(tabId, handler.syncConnectedWallet);
       }
     }
 

From 370d8cdfed1ba081594f28356221c209127cdc11 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Tue, 24 Sep 2024 20:39:18 +0800
Subject: [PATCH 013/143] Revert "Binds a wallet to bring"

This reverts commit 6b511a01c626f62b9f665d7713a78cc0e2ecb133.
---
 .../chrome/content-scripts/bringInject.js     | 41 +++----------------
 .../background/handlers/content/rpc.js        | 18 ++++----
 2 files changed, 15 insertions(+), 44 deletions(-)

diff --git a/packages/yoroi-extension/chrome/content-scripts/bringInject.js b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
index ff3aeec66f..dd4dbbd6fb 100644
--- a/packages/yoroi-extension/chrome/content-scripts/bringInject.js
+++ b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
@@ -117,9 +117,9 @@ function getFromBackground(functionName: string, params: andy): Promise<any> {
       }
     });
 
-    chrome.runtime.sendMessage({
+    window.postMessage({
       type: "connector_rpc_request",
-      url: 'bring',
+      url: location.hostname,
       uid,
       function: functionName,
       params,
@@ -128,27 +128,6 @@ function getFromBackground(functionName: string, params: andy): Promise<any> {
   });
 }
 
-// return false if user rejects
-function bindBringToWallet(unbindCallback: () => void): Promise<boolean> {
-  return new Promise((resolve, reject) => {
-    chrome.runtime.onMessage.addListener((msg, sender) => {
-      if (msg.type === 'yoroi_connect_response/cardano') {
-        resolve(msg.success);
-      } else if (msg.type === 'disconnect') {
-        unbindCallback();
-      }
-    });
-
-    chrome.runtime.sendMessage({
-      type: 'yoroi_connect_request/cardano',
-      connectParameters: {
-        url: 'bring',
-      },
-      imgBase64Url: '', // fixme: use Bring icon here
-    });
-  });
-}
-
 function getAddresses(): Promise<string> {
   return getFromBackground('get_used_addresses', [undefined]);
 }
@@ -158,27 +137,19 @@ function getTheme(): Promise<'light' | 'dark'> {
 }
 
 async function example() {
-  const bound = await bindBringToWallet(() => {
-    console.log('user unbinds wallet');
-  });
-  console.log('bound successfully:', bound);
-  if (!bound) {
-    return;
-  }
-
   try {
     const addrs = await getAddresses();
-    console.log('address', addrs[0]);
+    console.log('>>>address', addrs[0]);
   } catch (error) {
-    if (error.message === 'not bound') {
-      console.log('Bring not bound to wallet');
+    if (error.message === 'no wallet') {
+      console.log('no wallet');
     } else {
       throw error;
     }
   }
 
   const theme = await getTheme();
-  console.log('theme:', theme);
+  console.log('>>>theme:', theme);
 }
 
 example().catch(console.error);
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js b/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js
index b71c09eacf..80a4d983a9 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js
@@ -62,7 +62,6 @@ import {
   getConnectedWallet,
   type ConnectedSite,
   type SignContinuationDataType,
-  getAllConnectedSites,
 } from './connect';
 import type { CardanoTxRequest } from '../../../../../app/api/ada';
 import type { NFTMetadata } from '../../../../../app/api/ada/lib/storage/database/primitives/tables';
@@ -701,22 +700,23 @@ export async function handleRpc(message: Object, sender: Object) {
 
     let connectedWallet = undefined;
     if (handler.needConnectedWallet) {
-      if (message.url === 'bring') {
-        const connectedSites = await getAllConnectedSites();
-        const bringConnectedSite = Object.values(connectedSites).find(({ url }) => url === 'bring');
-        if (!bringConnectedSite) {
+      try {
+        connectedWallet = await getConnectedWallet(tabId, handler.syncConnectedWallet);
+      } catch (error) {
+        // fixme: unsafe
+        const localStorageApi = new LocalStorageApi();
+        const publicDeriverId = await localStorageApi.getSelectedWalletId();
+        if (publicDeriverId == null) {
           sendRpcResponse(
             {
-              err: 'not bound',
+              err: 'no wallet',
             },
             tabId,
             message.uid,
           );
           return;
         }
-        connectedWallet = await getPublicDeriverById(bringConnectedSite.status.publicDeriverId);      
-      } else {
-        connectedWallet = await getConnectedWallet(tabId, handler.syncConnectedWallet);
+        connectedWallet = await getPublicDeriverById(publicDeriverId);
       }
     }
 

From 2c6d4225ad59740f662a694205f4ad3aadee8328 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 25 Sep 2024 01:19:10 +0800
Subject: [PATCH 014/143] fix get address for new wallet

---
 .../chrome/content-scripts/bringInject.js           | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/yoroi-extension/chrome/content-scripts/bringInject.js b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
index dd4dbbd6fb..05020dabe3 100644
--- a/packages/yoroi-extension/chrome/content-scripts/bringInject.js
+++ b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
@@ -128,8 +128,13 @@ function getFromBackground(functionName: string, params: andy): Promise<any> {
   });
 }
 
-function getAddresses(): Promise<string> {
-  return getFromBackground('get_used_addresses', [undefined]);
+async function getFirstAddress(): Promise<string> {
+  const usedAddresses = await getFromBackground('get_used_addresses', [undefined]);
+  if (usedAddresses.length > 0) {
+    return usedAddresses[0];
+  }
+  const unusedAddresses = await getFromBackground('get_unused_addresses', [undefined]);
+  return unusedAddresses[0];
 }
 
 function getTheme(): Promise<'light' | 'dark'> {
@@ -138,8 +143,8 @@ function getTheme(): Promise<'light' | 'dark'> {
 
 async function example() {
   try {
-    const addrs = await getAddresses();
-    console.log('>>>address', addrs[0]);
+    const addr = await getFirstAddress();
+    console.log('address', addr);
   } catch (error) {
     if (error.message === 'no wallet') {
       console.log('no wallet');

From 510449c5fb7778b01099d61a4df6507a80e081f2 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 25 Sep 2024 18:36:13 +0800
Subject: [PATCH 015/143] add events for active wallet

---
 .../chrome/content-scripts/bringInject.js         | 15 ++++++++++++++-
 .../extension/background/handlers/yoroi/index.js  | 13 +++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/packages/yoroi-extension/chrome/content-scripts/bringInject.js b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
index 05020dabe3..364ee7ab2a 100644
--- a/packages/yoroi-extension/chrome/content-scripts/bringInject.js
+++ b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
@@ -141,6 +141,15 @@ function getTheme(): Promise<'light' | 'dark'> {
   return getFromBackground('get-theme-mode', [undefined]);
 }
 
+function listenForActiveWalletOpen(callback) {
+  // todo: verify sender extension id
+  chrome.runtime.onMessage.addListener((msg, sender) => {
+    if (msg.type === 'active-wallet-open') {
+      callback(msg.activeWalletId);
+    }
+  });
+}
+
 async function example() {
   try {
     const addr = await getFirstAddress();
@@ -154,7 +163,11 @@ async function example() {
   }
 
   const theme = await getTheme();
-  console.log('>>>theme:', theme);
+  console.log('theme:', theme);
+
+  listenForActiveWalletOpen((walletId: ?number) => {
+    console.log('active wallet ID is:', walletId);
+  });
 }
 
 example().catch(console.error);
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/index.js b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/index.js
index 4446a209af..07fc4e661f 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/index.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/index.js
@@ -95,6 +95,19 @@ export function getHandler(typeTag: string): ?Handler {
   if (typeTag === 'subscribe') {
     return async (request, sender, sendResponse) => {
       subscribe(sender.tab.id, request.request.activeWalletId);
+      // notify content scripts in all tabs
+      chrome.tabs.query({}, (tabs) => {
+        for (const tab of tabs) {
+          console.log('>>>notifiying tab', tab.id);
+          chrome.tabs.sendMessage(
+            tab.id,
+            {
+              type: 'active-wallet-open',
+              activeWalletId: request.request.activeWalletId
+            }
+          );
+        }
+      });
       sendResponse(undefined);
     };
   }

From 64012ff400d04bb3b3a3d00258d756eedb337ad4 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 25 Sep 2024 19:15:22 +0800
Subject: [PATCH 016/143] pop up Yoroi extension if no wallet

---
 .../chrome/content-scripts/bringInject.js           |  7 +++++++
 .../extension/background/handlers/content/rpc.js    | 13 +++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/packages/yoroi-extension/chrome/content-scripts/bringInject.js b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
index 364ee7ab2a..3ea0dc5024 100644
--- a/packages/yoroi-extension/chrome/content-scripts/bringInject.js
+++ b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
@@ -141,6 +141,10 @@ function getTheme(): Promise<'light' | 'dark'> {
   return getFromBackground('get-theme-mode', [undefined]);
 }
 
+function popUpWalletCreation(): void {
+  getFromBackground('pop-up-wallet-creation');
+}
+
 function listenForActiveWalletOpen(callback) {
   // todo: verify sender extension id
   chrome.runtime.onMessage.addListener((msg, sender) => {
@@ -157,6 +161,9 @@ async function example() {
   } catch (error) {
     if (error.message === 'no wallet') {
       console.log('no wallet');
+      if (window.confirm('no wallet, click OK to create')) {
+        popUpWalletCreation();
+      }
     } else {
       throw error;
     }
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js b/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js
index 80a4d983a9..234d606249 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js
@@ -653,6 +653,13 @@ const Handlers = Object.freeze({
     const theme = await localStorageApi.getUserThemeMode();
     return { ok: theme || 'light' };
   }),
+
+  'pop-up-wallet-creation': NewHandler.basic<
+    void,
+    void,
+  >(async () => {
+    chrome.tabs.create({ url: 'main_window.html' });
+  }),
 });
 
 function sendRpcResponse(response: Object, tabId: number, messageUid: number) {
@@ -706,7 +713,10 @@ export async function handleRpc(message: Object, sender: Object) {
         // fixme: unsafe
         const localStorageApi = new LocalStorageApi();
         const publicDeriverId = await localStorageApi.getSelectedWalletId();
-        if (publicDeriverId == null) {
+        if (publicDeriverId != null) {
+          connectedWallet = await getPublicDeriverById(publicDeriverId);
+        }
+        if (connectedWallet == null) {
           sendRpcResponse(
             {
               err: 'no wallet',
@@ -716,7 +726,6 @@ export async function handleRpc(message: Object, sender: Object) {
           );
           return;
         }
-        connectedWallet = await getPublicDeriverById(publicDeriverId);
       }
     }
 

From b83688c22e499bf98f09c8acb04fe8cff3d407ca Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Mon, 30 Sep 2024 22:26:51 +0800
Subject: [PATCH 017/143] get address function returns address in Bech32

---
 packages/yoroi-extension/chrome/content-scripts/bringInject.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/yoroi-extension/chrome/content-scripts/bringInject.js b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
index 3ea0dc5024..7aa32587f9 100644
--- a/packages/yoroi-extension/chrome/content-scripts/bringInject.js
+++ b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
@@ -123,7 +123,7 @@ function getFromBackground(functionName: string, params: andy): Promise<any> {
       uid,
       function: functionName,
       params,
-      returnType: 'cbor',
+      returnType: 'json',
     });
   });
 }

From c9e910c9cefee0fc7ebccab3095e00a3a4a1cca9 Mon Sep 17 00:00:00 2001
From: kalfada <kalfada3321@gmail.com>
Date: Sun, 6 Oct 2024 14:35:25 +0300
Subject: [PATCH 018/143] fix: iframeUrl source

---
 .../assets/images/sidebar/cashback.inline.svg |   6 +-
 .../app/containers/cashback/CashbackPage.js   | 169 +++++++-----------
 .../chrome/content-scripts/bring.js           |   8 -
 .../yoroi-extension/config/development.json   |   1 -
 packages/yoroi-extension/config/mainnet.json  |   1 -
 packages/yoroi-extension/config/test.json     |   1 -
 6 files changed, 66 insertions(+), 120 deletions(-)
 delete mode 100644 packages/yoroi-extension/chrome/content-scripts/bring.js

diff --git a/packages/yoroi-extension/app/assets/images/sidebar/cashback.inline.svg b/packages/yoroi-extension/app/assets/images/sidebar/cashback.inline.svg
index c1ff199691..6b4cc204c1 100644
--- a/packages/yoroi-extension/app/assets/images/sidebar/cashback.inline.svg
+++ b/packages/yoroi-extension/app/assets/images/sidebar/cashback.inline.svg
@@ -1,5 +1,5 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M2 5C2 2.79086 3.79086 1 6 1C8.20914 1 10 2.79086 10 5C10 7.20914 8.20914 9 6 9C3.79086 9 2 7.20914 2 5ZM6 3C4.89543 3 4 3.89543 4 5C4 6.10457 4.89543 7 6 7C7.10457 7 8 6.10457 8 5C8 3.89543 7.10457 3 6 3Z" fill="white" fill-opacity="0.48"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.9666 9.75994C18.5449 9.21519 19.3155 8.92183 20.1098 8.94428C20.9056 8.96678 21.66 9.3045 22.2068 9.88315C22.7536 10.4618 23.0482 11.234 23.0257 12.0298C23.0032 12.8245 22.6664 13.5778 22.0893 14.1245L22.0868 14.1268L17.5213 18.4939C16.6077 19.516 15.3317 20 14 20H10.0333L2.56661 20.4975C2.29046 20.5159 2.01903 20.419 1.81693 20.23C1.61482 20.0409 1.50012 19.7765 1.50012 19.4997V14.3C1.50012 13.7477 1.94784 13.3 2.50012 13.3H5.39638L7.8559 10.9283C8.40016 10.2574 9.21589 10 9.99998 10H13C13.7956 10 14.5587 10.3161 15.1213 10.8787C15.3925 11.1499 15.6064 11.4677 15.7553 11.8133L17.9666 9.75994ZM15.0512 15.1892C14.4961 15.7093 13.763 16 13 16H11C10.4477 16 9.99998 15.5523 9.99998 15C9.99998 14.4477 10.4477 14 11 14H13C13.2652 14 13.5195 13.8946 13.7071 13.7071C13.8946 13.5196 14 13.2652 14 13C14 12.7348 13.8946 12.4804 13.7071 12.2929C13.5195 12.1054 13.2652 12 13 12H9.99998C9.61141 12 9.45671 12.1244 9.39998 12.2C9.36795 12.2427 9.33255 12.2828 9.29412 12.3198L6.49412 15.0198C6.30774 15.1996 6.05891 15.3 5.79998 15.3H3.50012V18.4309L9.9335 18.0022C9.95563 18.0007 9.9778 18 9.99998 18H14C14.853 18 15.563 17.6951 16.0474 17.1415C16.0669 17.1192 16.0874 17.0978 16.1088 17.0774L20.7131 12.6732C20.9063 12.4907 21.019 12.2389 21.0265 11.9733C21.034 11.7077 20.9357 11.45 20.7532 11.2568C20.5707 11.0637 20.3189 10.951 20.0533 10.9435C19.7877 10.936 19.53 11.0343 19.3368 11.2168L19.3305 11.2228L15.1304 15.1228C15.1049 15.1465 15.0784 15.1686 15.0512 15.1892Z" fill="white" fill-opacity="0.48"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M15 3C13.3431 3 12 4.34315 12 6C12 7.65685 13.3431 9 15 9C16.6569 9 18 7.65685 18 6C18 4.34315 16.6569 3 15 3ZM14 6C14 5.44772 14.4477 5 15 5C15.5523 5 16 5.44772 16 6C16 6.55228 15.5523 7 15 7C14.4477 7 14 6.55228 14 6Z" fill="white" fill-opacity="0.48"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 5C2 2.79086 3.79086 1 6 1C8.20914 1 10 2.79086 10 5C10 7.20914 8.20914 9 6 9C3.79086 9 2 7.20914 2 5ZM6 3C4.89543 3 4 3.89543 4 5C4 6.10457 4.89543 7 6 7C7.10457 7 8 6.10457 8 5C8 3.89543 7.10457 3 6 3Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.9666 9.75994C18.5449 9.21519 19.3155 8.92183 20.1098 8.94428C20.9056 8.96678 21.66 9.3045 22.2068 9.88315C22.7536 10.4618 23.0482 11.234 23.0257 12.0298C23.0032 12.8245 22.6664 13.5778 22.0893 14.1245L22.0868 14.1268L17.5213 18.4939C16.6077 19.516 15.3317 20 14 20H10.0333L2.56661 20.4975C2.29046 20.5159 2.01903 20.419 1.81693 20.23C1.61482 20.0409 1.50012 19.7765 1.50012 19.4997V14.3C1.50012 13.7477 1.94784 13.3 2.50012 13.3H5.39638L7.8559 10.9283C8.40016 10.2574 9.21589 10 9.99998 10H13C13.7956 10 14.5587 10.3161 15.1213 10.8787C15.3925 11.1499 15.6064 11.4677 15.7553 11.8133L17.9666 9.75994ZM15.0512 15.1892C14.4961 15.7093 13.763 16 13 16H11C10.4477 16 9.99998 15.5523 9.99998 15C9.99998 14.4477 10.4477 14 11 14H13C13.2652 14 13.5195 13.8946 13.7071 13.7071C13.8946 13.5196 14 13.2652 14 13C14 12.7348 13.8946 12.4804 13.7071 12.2929C13.5195 12.1054 13.2652 12 13 12H9.99998C9.61141 12 9.45671 12.1244 9.39998 12.2C9.36795 12.2427 9.33255 12.2828 9.29412 12.3198L6.49412 15.0198C6.30774 15.1996 6.05891 15.3 5.79998 15.3H3.50012V18.4309L9.9335 18.0022C9.95563 18.0007 9.9778 18 9.99998 18H14C14.853 18 15.563 17.6951 16.0474 17.1415C16.0669 17.1192 16.0874 17.0978 16.1088 17.0774L20.7131 12.6732C20.9063 12.4907 21.019 12.2389 21.0265 11.9733C21.034 11.7077 20.9357 11.45 20.7532 11.2568C20.5707 11.0637 20.3189 10.951 20.0533 10.9435C19.7877 10.936 19.53 11.0343 19.3368 11.2168L19.3305 11.2228L15.1304 15.1228C15.1049 15.1465 15.0784 15.1686 15.0512 15.1892Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15 3C13.3431 3 12 4.34315 12 6C12 7.65685 13.3431 9 15 9C16.6569 9 18 7.65685 18 6C18 4.34315 16.6569 3 15 3ZM14 6C14 5.44772 14.4477 5 15 5C15.5523 5 16 5.44772 16 6C16 6.55228 15.5523 7 15 7C14.4477 7 14 6.55228 14 6Z" fill="white"/>
 </svg>
diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index d909cdba26..3dad43dffc 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -23,7 +23,8 @@ import { getPublicDeriverById } from '../../../chrome/extension/background/handl
 import Dialog from '../../components/widgets/Dialog';
 import DialogCloseButton from '../../components/widgets/DialogCloseButton';
 import DialogTextBlock from '../../components/widgets/DialogTextBlock'
-import { Box, TextField, InputAdornment, IconButton, Tooltip, Typography } from '@mui/material';
+import { Address } from '@emurgo/cardano-serialization-lib-browser'
+import { Box, TextField, InputAdornment, IconButton, Tooltip, Typography, DialogContentText } from '@mui/material';
 
 type Props = StoresAndActionsProps;
 
@@ -33,13 +34,15 @@ type AllProps = {| ...Props, ...InjectedLayoutProps |};
 type IframeMessageData = {|
   action: string,
     bgColor ?: string,
-    message: string
-      |};
+    message: string,
+      amount: number
+        |};
 
 const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllProps) => {
   const { actions, stores } = props;
   const theme = useTheme();
   // const intl = useContext(IntlContext);
+  console.log({ theme });
 
   const iframeRef = useRef < HTMLIFrameElement | null > (null);
   const [iframeSrc, setIframeSrc] = useState('');
@@ -49,16 +52,15 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
   const [showPassword, setShowPassword] = useState(false)
   const [errMsg, setErrMsg] = useState('')
   const [message, setMessage] = useState('')
+  const [claimAmount, setClaimAmount] = useState(0)
   const [signaturePopup, setSignaturePopup] = useState(false);
   const [overlayBgColor, setOverlayBgColor] = useState('#000000fa');
 
   const fetchIframeUrl = useCallback(async () => {
     try {
-      console.log({ themeBring: theme.name.split('-')[0] });
-
       const publicDeriver = stores.wallets.selected;
       if (!publicDeriver) throw Error('no publicDeriver');
-      const walletAddress = publicDeriver.externalAddressesByType[CoreAddressTypes.CARDANO_BASE][0].address;
+      const walletAddress = Address.from_hex(publicDeriver.externalAddressesByType[CoreAddressTypes.CARDANO_BASE][0].address).to_bech32();
 
       const response = await fetch(`${environment.bringBaseUrl}check/portal`, {
         method: 'POST',
@@ -69,74 +71,60 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
         body: JSON.stringify({ walletAddress }),
       });
       const data = await response.json();
+      const url = new URL(data.iframeUrl);
+      url.searchParams.set('theme', theme.name.split('-')[0]);
+      url.searchParams.set('token', data.token);
 
-      const queryParams = new URLSearchParams({ ...data, theme: theme.name.split('-')[0] }).toString();
-      const newIframeSrc = `${environment.bringIframeSrc}/?${queryParams}`;
-
-      setIframeSrc(newIframeSrc);
+      setIframeSrc(url.href);
       setStatus('done');
     } catch (error) {
       console.error('Error fetching data:', error);
     }
   }, [stores.wallets.selected]);
 
+  function stringToHex(str) {
+    return Array.from(str)
+      .map(char => char.charCodeAt(0).toString(16).padStart(2, '0'))
+      .join('');
+  }
+
   const signMessage = useCallback(async (message: string, password: string) => {
     const wallet = stores.wallets.selected;
     if (!wallet) throw Error('no publicDeriver');
     const address = wallet.externalAddressesByType[CoreAddressTypes.CARDANO_BASE][0].address;
     const publicDeriver = await getPublicDeriverById(wallet.publicDeriverId)
-    let res: {| key: string, signature: string |}| null = null
-    console.log({ step: 'before', address, message });
-  try {
-    res = await walletSignData(publicDeriver, password, address, '74657374')
-    console.log({ step: 'after', ...res, message: 'test', address });
-
-  } catch (error) {
-    setErrMsg(error.message)
-    console.warn(error);
-  }
-  iframeRef.current?.contentWindow.postMessage({ from: 'bringweb3', action: 'SIGNATURE', ...res, message, address }, '*');
-  setSignaturePopup(false)
-}, []);
-
-const handleMessage = useCallback(async (event: MessageEvent) => {
-  const iframeOrigin = new URL(iframeSrc).origin;
-
-  if (event.origin !== iframeOrigin) {
-    return;
-  }
+    try {
+      const res = await walletSignData(publicDeriver, password, address, stringToHex(message))
+      iframeRef.current?.contentWindow.postMessage({ from: 'bringweb3', action: 'SIGNATURE', ...res, message, address }, '*');
+      setSignaturePopup(false)
+      setPassword('')
+    } catch (error) {
+      setErrMsg(error.message)
+      // console.warn(error);
+    }
+  }, []);
 
-  console.log('Received message from iframe:', event.data);
+  const handleMessage = useCallback(async (event: MessageEvent) => {
+    const iframeOrigin = new URL(iframeSrc).origin;
 
-  const messageData: IframeMessageData = (event.data: any);
+    if (event.origin !== iframeOrigin) {
+      return;
+    }
 
-if (messageData.action === 'SIGN_MESSAGE') {
-  // const wallet = stores.wallets.selected;
-  setMessage(messageData.message)
-  setSignaturePopup(true)
-  //   if (!wallet) throw Error('no publicDeriver');
-  //   const address = wallet.externalAddressesByType[CoreAddressTypes.CARDANO_BASE][0].address;
-  //   const publicDeriver = await getPublicDeriverById(wallet.publicDeriverId)
-  //   let res: {| key: string, signature: string |}| null = null
-  // try {
-  //   res = await walletSignData(publicDeriver, 'Mottiemmanuelle123', address, messageData.messageToSign)
-  // } catch (error) {
-  //   setErrMsg(error.message)
-  //   console.warn(error);
-  // }
-  // console.log({ res });
+    console.log('Received message from iframe:', event.data);
 
-  // const iframe = document.getElementById('bringweb3');
-  // if (iframe instanceof HTMLIFrameElement) {
-  //   iframe.contentWindow.postMessage({ from: 'bringweb3', action: 'SIGNATURE', ...res, message: messageData.messageToSign }, '*');
-  // }
+    const messageData: IframeMessageData = (event.data: any);
 
-} else if (messageData.action === 'OPEN_POPUP') {
-  setPopup(true);
-  setOverlayBgColor(messageData.bgColor || overlayBgColor);
-} else if (messageData.action === 'CLOSE_POPUP') {
-  setPopup(false);
-}
+  if (messageData.action === 'SIGN_MESSAGE') {
+    setClaimAmount(messageData.amount)
+    setMessage(messageData.message)
+    setSignaturePopup(true)
+  } else if (messageData.action === 'OPEN_POPUP') {
+    setPopup(true);
+    setOverlayBgColor(messageData.bgColor || overlayBgColor);
+  } else if (messageData.action === 'CLOSE_POPUP') {
+    setPopup(false);
+  }
 }, [iframeSrc, overlayBgColor]);
 
 useEffect(() => {
@@ -155,13 +143,16 @@ useEffect(() => {
 }, [iframeSrc, fetchIframeUrl, handleMessage]);
 
 const closePopup = useCallback(() => {
-  const iframeElement = document.getElementById('bringweb3');
-  if (iframeElement instanceof HTMLIFrameElement) {
-    iframeElement.contentWindow.postMessage({ action: 'CLOSE_POPUP' }, '*');
-  }
+  iframeRef.current?.contentWindow.postMessage({ from: 'bringweb3', action: 'CLOSE_POPUP' }, '*');
   setPopup(false);
 }, []);
 
+const abortClaim = useCallback(() => {
+  iframeRef.current?.contentWindow.postMessage({ from: 'bringweb3', action: 'ABORT' }, '*');
+  setSignaturePopup(false)
+  setPassword('')
+}, []);
+
 const sidebarContainer = <SidebarContainer actions={actions} stores={stores} />;
 
 return (
@@ -184,7 +175,7 @@ return (
             title='CLAIM CASHBACK'
             closeOnOverlayClick
             closeButton={<DialogCloseButton />}
-            onClose={() => setSignaturePopup(false)}
+            onClose={abortClaim}
             actions={[{
               label: 'CONFIRM',
               primary: true,
@@ -193,21 +184,17 @@ return (
             }]}
           >
             <Box>
-              <Typography>
-                Enter your password and confirm to claim the cashback rewards.
+              <Typography sx={{ marginBottom: "16px", color: theme.name === 'light-theme' ? '#242838' : '#E1E6F5' }}>
+                Enter your password to claim cashback rewards.
               </Typography>
-              <DialogTextBlock>
-                Cashback rewards
-                <Tooltip
-                  placement='top'
-                  title={<Typography align='center' component="div" variant="body3">Cashback amount rewarded for online shopping</Typography>}
-                >
-                  i
-                </Tooltip>
-              </DialogTextBlock>
-              <Typography>
-                300 ADA
+              <Typography sx={{ color: theme.name === 'light-theme' ? '#6B7384' : '#7C85A3' }}>
+                Message
               </Typography>
+              <DialogContentText sx={{
+                whiteSpace: 'pre-wrap', wordBreak: 'break-word', color: theme.name === 'light-theme' ? '#242838' : '#E1E6F5'
+              }}>
+                {message}
+              </DialogContentText>
               <TextField
                 className="walletPassword"
                 value={password}
@@ -231,38 +218,8 @@ return (
                 disabled={false}
               />
             </Box>
-            {/* <TextField /> */}
           </Dialog>
           : null}
-        {signaturePopup ?
-          // <div className={styles.overlay}>
-          //   <div className={styles.popup}>
-          //     <button
-          //       className={styles.close_btn}
-          //       onClick={() => setSignaturePopup(false)}
-          //     >X</button>
-          //     <div>
-          //       Sign
-          //     </div>
-          //     <form
-          //       className={styles.form}
-          //       onSubmit={(e) => {
-          //         e.preventDefault()
-          //         signMessage(message, password)
-          //       }}
-          //     >
-          //       <input
-          //         type='text'
-          //         value={password}
-          //         onChange={e => setPassword(e.target.value)}
-          //       />
-          //       {errMsg ? <div>{errMsg}</div> : null}
-          //       <input type='submit' value={'Sign'} />
-          //     </form>
-          //   </div>
-          // </div>
-          <></>
-          : null}
         {popup ? (
           <div
             className={styles.iframe_overlay}
@@ -282,7 +239,7 @@ return (
         )}
       </Suspense>
     </FullscreenLayout>
-  </TopBarLayout>
+  </TopBarLayout >
 );
 });
 
diff --git a/packages/yoroi-extension/chrome/content-scripts/bring.js b/packages/yoroi-extension/chrome/content-scripts/bring.js
deleted file mode 100644
index 0a2dcb7d18..0000000000
--- a/packages/yoroi-extension/chrome/content-scripts/bring.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { bringInitContentScript } from '@bringweb3/chrome-extension-kit'
-
-bringInitContentScript({
-    getWalletAddress: async () => 'addr111111111111',
-    promptLogin: () => 'asfasfa',
-    walletAddressListeners: ['daniel'],
-    iframeEndpoint: 'https://sandbox-extension.bringweb3.io/',
-})
\ No newline at end of file
diff --git a/packages/yoroi-extension/config/development.json b/packages/yoroi-extension/config/development.json
index 0f27ed5ff7..9c342b2613 100644
--- a/packages/yoroi-extension/config/development.json
+++ b/packages/yoroi-extension/config/development.json
@@ -20,7 +20,6 @@
   },
   "bring": {
     "baseUrl": "https://sandbox-api.bringweb3.io/v1/extension/",
-    "iframeSrc": "http://localhost:5173",
     "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8"
   }
 }
\ No newline at end of file
diff --git a/packages/yoroi-extension/config/mainnet.json b/packages/yoroi-extension/config/mainnet.json
index c8167b4ed5..eef00087f2 100644
--- a/packages/yoroi-extension/config/mainnet.json
+++ b/packages/yoroi-extension/config/mainnet.json
@@ -19,7 +19,6 @@
   },
   "bring": {
     "baseUrl": "https://sandbox-api.bringweb3.io/v1/extension/",
-    "iframeSrc": "http://localhost:5173",
     "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8"
   }
 }
\ No newline at end of file
diff --git a/packages/yoroi-extension/config/test.json b/packages/yoroi-extension/config/test.json
index 0e2fafd0c0..f3460c8203 100644
--- a/packages/yoroi-extension/config/test.json
+++ b/packages/yoroi-extension/config/test.json
@@ -20,7 +20,6 @@
   },
   "bring": {
     "baseUrl": "https://sandbox-api.bringweb3.io/v1/extension/check/portal",
-    "iframeSrc": "https://sandbox-extension.bringweb3.io",
     "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8"
   }
 }
\ No newline at end of file

From d05d8de89bfb8b83f11c2288bb5baf391139c0eb Mon Sep 17 00:00:00 2001
From: kalfada <kalfada3321@gmail.com>
Date: Mon, 7 Oct 2024 10:20:21 +0300
Subject: [PATCH 019/143] fix: iframeUrl source

---
 .../yoroi-extension/app/containers/cashback/CashbackPage.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index 3dad43dffc..88145c8c74 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -72,8 +72,8 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
       });
       const data = await response.json();
       const url = new URL(data.iframeUrl);
-      url.searchParams.set('theme', theme.name.split('-')[0]);
       url.searchParams.set('token', data.token);
+      url.searchParams.set('theme', theme.name.split('-')[0]);
 
       setIframeSrc(url.href);
       setStatus('done');

From 93baceb8694252a33624048e46e8788618422073 Mon Sep 17 00:00:00 2001
From: kalfada <kalfada3321@gmail.com>
Date: Mon, 7 Oct 2024 18:47:35 +0300
Subject: [PATCH 020/143] fix: remove unused config

---
 .../app/api/ada/lib/test-config.forTests.js           |  1 -
 packages/yoroi-extension/app/environment.js           |  4 +---
 .../chrome/extension/background/bring.js              | 11 -----------
 .../chrome/extension/background/index.js              |  2 --
 packages/yoroi-extension/config/config-types.js       |  5 ++---
 packages/yoroi-extension/config/mainnet.json          |  2 +-
 packages/yoroi-extension/package-lock.json            |  6 ------
 packages/yoroi-extension/package.json                 |  3 +--
 8 files changed, 5 insertions(+), 29 deletions(-)
 delete mode 100644 packages/yoroi-extension/chrome/extension/background/bring.js

diff --git a/packages/yoroi-extension/app/api/ada/lib/test-config.forTests.js b/packages/yoroi-extension/app/api/ada/lib/test-config.forTests.js
index 3ef33bd436..cbf3bf5e6b 100644
--- a/packages/yoroi-extension/app/api/ada/lib/test-config.forTests.js
+++ b/packages/yoroi-extension/app/api/ada/lib/test-config.forTests.js
@@ -23,7 +23,6 @@ const CONFIG: ConfigType = {
   },
   bring: {
     baseUrl: '',
-    iframeSrc: '',
     identifier: ''
   }
 };
diff --git a/packages/yoroi-extension/app/environment.js b/packages/yoroi-extension/app/environment.js
index a020ff9854..fd23e6820e 100644
--- a/packages/yoroi-extension/app/environment.js
+++ b/packages/yoroi-extension/app/environment.js
@@ -42,7 +42,6 @@ export const environment = ((
     getServerStatusRefreshInterval: () => CONFIG.app.serverStatusRefreshInterval,
     userAgentInfo,
     bringBaseUrl: CONFIG.bring.baseUrl,
-    bringIframeSrc: CONFIG.bring.iframeSrc,
     bringIdentifier: CONFIG.bring.identifier
   }
 ): {
@@ -62,8 +61,7 @@ export const environment = ((
                             userAgentInfo: UserAgentInfo,
                               isLight: boolean,
                                 bringBaseUrl: string,
-                                  bringIframeSrc: string,
-                                    bringIdentifier: string,
+                                  bringIdentifier: string,
     ...
 });
 
diff --git a/packages/yoroi-extension/chrome/extension/background/bring.js b/packages/yoroi-extension/chrome/extension/background/bring.js
deleted file mode 100644
index c0539e3b4a..0000000000
--- a/packages/yoroi-extension/chrome/extension/background/bring.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// @flow
-import { bringInitBackground } from '@bringweb3/chrome-extension-kit'
-import environment from '../../../app/environment'
-
-export default () => {
-    bringInitBackground({
-        identifier: environment.bringIdentifier,
-        apiEndpoint: 'sandbox',
-    })
-}
-
diff --git a/packages/yoroi-extension/chrome/extension/background/index.js b/packages/yoroi-extension/chrome/extension/background/index.js
index 5044dffd96..5f94d61be0 100644
--- a/packages/yoroi-extension/chrome/extension/background/index.js
+++ b/packages/yoroi-extension/chrome/extension/background/index.js
@@ -6,11 +6,9 @@ import { init } from './state';
 import { startMonitorServerStatus } from './serverStatus';
 import { startPoll } from './coinPrice';
 import { environment } from '../../../app/environment';
-import bringInitBackground from './bring'
 /*::
 declare var chrome;
 */
-bringInitBackground();
 
 const onYoroiIconClicked = () => {
   chrome.tabs.create({ url: 'main_window.html' });
diff --git a/packages/yoroi-extension/config/config-types.js b/packages/yoroi-extension/config/config-types.js
index eff83f9017..1b152901fd 100644
--- a/packages/yoroi-extension/config/config-types.js
+++ b/packages/yoroi-extension/config/config-types.js
@@ -9,9 +9,8 @@ export type ConfigType = {|
 
 export type BringConfigType = {|
   baseUrl: string,
-    iframeSrc: string,
-      identifier: string
-        |}
+    identifier: string
+      |}
 
 export type PoolExplorerConfigType = {|
   simpleTemplate: string,
diff --git a/packages/yoroi-extension/config/mainnet.json b/packages/yoroi-extension/config/mainnet.json
index eef00087f2..ddb342cd74 100644
--- a/packages/yoroi-extension/config/mainnet.json
+++ b/packages/yoroi-extension/config/mainnet.json
@@ -18,7 +18,7 @@
     "pubKeyMaster": "ab9e4f1c4d996a0e9cdda8546bf5ee1dd8397fd7ab287c331ff171c7e4e0e9e2"
   },
   "bring": {
-    "baseUrl": "https://sandbox-api.bringweb3.io/v1/extension/",
+    "baseUrl": "https://api.bringweb3.io/v1/extension/",
     "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8"
   }
 }
\ No newline at end of file
diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index ed3d3b4c9f..877b7d6ac1 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -11,7 +11,6 @@
       "dependencies": {
         "@amplitude/analytics-browser": "^2.1.3",
         "@babel/preset-typescript": "^7.24.7",
-        "@bringweb3/chrome-extension-kit": "^1.0.12",
         "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
         "@emotion/react": "^11.4.1",
         "@emotion/styled": "^11.3.0",
@@ -2133,11 +2132,6 @@
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
       "dev": true
     },
-    "node_modules/@bringweb3/chrome-extension-kit": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/@bringweb3/chrome-extension-kit/-/chrome-extension-kit-1.0.12.tgz",
-      "integrity": "sha512-Q+p5Q8fqB4YD0vXZPlo773zvrij0BRtmpkMGZiefjyOq5mqfJcdYGrFg0hJGFwVLH8QYVlaI/wBVvSOdpNxxow=="
-    },
     "node_modules/@cardano-foundation/ledgerjs-hw-app-cardano": {
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/@cardano-foundation/ledgerjs-hw-app-cardano/-/ledgerjs-hw-app-cardano-7.1.3.tgz",
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
index b1ebc426c6..2a61f9ee8a 100644
--- a/packages/yoroi-extension/package.json
+++ b/packages/yoroi-extension/package.json
@@ -145,7 +145,6 @@
   "dependencies": {
     "@amplitude/analytics-browser": "^2.1.3",
     "@babel/preset-typescript": "^7.24.7",
-    "@bringweb3/chrome-extension-kit": "^1.0.12",
     "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",
@@ -236,4 +235,4 @@
     "node": "~18.18.2",
     "npm": "~9.8.1"
   }
-}
\ No newline at end of file
+}

From 4530486d796bbeeec75ba725ae221b5d00257360 Mon Sep 17 00:00:00 2001
From: kalfada <kalfada3321@gmail.com>
Date: Tue, 8 Oct 2024 18:01:12 +0300
Subject: [PATCH 021/143] fix: change event names

---
 .../app/containers/cashback/CashbackPage.js   | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index 88145c8c74..d0f3f65f6a 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -33,8 +33,8 @@ type AllProps = {| ...Props, ...InjectedLayoutProps |};
 
 type IframeMessageData = {|
   action: string,
-    bgColor ?: string,
-    message: string,
+    overlayBgColor ?: string,
+    messageToSign: string,
       amount: number
         |};
 
@@ -42,7 +42,6 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
   const { actions, stores } = props;
   const theme = useTheme();
   // const intl = useContext(IntlContext);
-  console.log({ theme });
 
   const iframeRef = useRef < HTMLIFrameElement | null > (null);
   const [iframeSrc, setIframeSrc] = useState('');
@@ -95,7 +94,7 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
     const publicDeriver = await getPublicDeriverById(wallet.publicDeriverId)
     try {
       const res = await walletSignData(publicDeriver, password, address, stringToHex(message))
-      iframeRef.current?.contentWindow.postMessage({ from: 'bringweb3', action: 'SIGNATURE', ...res, message, address }, '*');
+      iframeRef.current?.contentWindow.postMessage({ to: 'bringweb3', action: 'SIGNATURE', ...res, message, address }, '*');
       setSignaturePopup(false)
       setPassword('')
     } catch (error) {
@@ -111,18 +110,17 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
       return;
     }
 
-    console.log('Received message from iframe:', event.data);
-
     const messageData: IframeMessageData = (event.data: any);
 
   if (messageData.action === 'SIGN_MESSAGE') {
     setClaimAmount(messageData.amount)
-    setMessage(messageData.message)
+
+    setMessage(messageData.messageToSign)
     setSignaturePopup(true)
-  } else if (messageData.action === 'OPEN_POPUP') {
+  } else if (messageData.action === 'POPUP_OPENED') {
     setPopup(true);
-    setOverlayBgColor(messageData.bgColor || overlayBgColor);
-  } else if (messageData.action === 'CLOSE_POPUP') {
+    setOverlayBgColor(messageData.overlayBgColor || overlayBgColor);
+  } else if (messageData.action === 'POPUP_CLOSED') {
     setPopup(false);
   }
 }, [iframeSrc, overlayBgColor]);
@@ -143,12 +141,12 @@ useEffect(() => {
 }, [iframeSrc, fetchIframeUrl, handleMessage]);
 
 const closePopup = useCallback(() => {
-  iframeRef.current?.contentWindow.postMessage({ from: 'bringweb3', action: 'CLOSE_POPUP' }, '*');
+  iframeRef.current?.contentWindow.postMessage({ to: 'bringweb3', action: 'CLOSE_POPUP' }, '*');
   setPopup(false);
 }, []);
 
 const abortClaim = useCallback(() => {
-  iframeRef.current?.contentWindow.postMessage({ from: 'bringweb3', action: 'ABORT' }, '*');
+  iframeRef.current?.contentWindow.postMessage({ to: 'bringweb3', action: 'ABORT_SIGN_MESSAGE' }, '*');
   setSignaturePopup(false)
   setPassword('')
 }, []);
@@ -214,7 +212,7 @@ return (
                 onChange={e => {
                   setPassword(e.target.value);
                 }}
-                error={errMsg && 'Incorrect password!'}
+                error={!!errMsg}
                 disabled={false}
               />
             </Box>

From 3395dccea3a43337da0d4b602833d552e07a2f46 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 9 Oct 2024 00:46:57 +0800
Subject: [PATCH 022/143] only fire active-wallet-open event when active wallet
 changes

---
 packages/yoroi-extension/app/api/thunk.js     |  4 +--
 .../app/stores/toplevel/WalletStore.js        |  3 ++-
 .../background/handlers/yoroi/index.js        | 27 ++++++++++---------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/packages/yoroi-extension/app/api/thunk.js b/packages/yoroi-extension/app/api/thunk.js
index d0cab3ea60..9b67ce6f00 100644
--- a/packages/yoroi-extension/app/api/thunk.js
+++ b/packages/yoroi-extension/app/api/thunk.js
@@ -157,8 +157,8 @@ export async function getWallets(walletId?: number): Promise<Array<WalletState>>
   return wallets;
 }
 
-export async function subscribe(activeWalletId: ?number): Promise<void> {
-  await callBackground({ type: 'subscribe', request: { activeWalletId } });
+export async function subscribe(activeWalletId: ?number, changed?: boolean): Promise<void> {
+  await callBackground({ type: 'subscribe', request: { activeWalletId, changed: changed === true } });
 }
 
 export const createWallet: GetEntryFuncType<typeof CreateWallet> = async (request) => {
diff --git a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
index 8d106ef370..93b3ef26c4 100644
--- a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
@@ -284,11 +284,12 @@ export default class WalletStore extends Store<StoresMap, ActionsMap> {
     this.actions.profile.setSelectedNetwork.trigger(
       getNetworkById(this.wallets[walletIndex].networkId)
     );
+    const changed = (this.selectedIndex != null) && (this.selectedIndex !== walletIndex);
     this.selectedIndex = walletIndex;
     this.selectedWalletName = this.wallets[walletIndex].name;
     // Cache select wallet
     this.api.localStorage.setSelectedWalletId(publicDeriverId);
-    subscribe(publicDeriverId);
+    subscribe(publicDeriverId, changed);
   };
 
   getLastSelectedWallet: void => ?WalletState = () => {
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/index.js b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/index.js
index 07fc4e661f..cb0cb46878 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/index.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/index.js
@@ -95,19 +95,20 @@ export function getHandler(typeTag: string): ?Handler {
   if (typeTag === 'subscribe') {
     return async (request, sender, sendResponse) => {
       subscribe(sender.tab.id, request.request.activeWalletId);
-      // notify content scripts in all tabs
-      chrome.tabs.query({}, (tabs) => {
-        for (const tab of tabs) {
-          console.log('>>>notifiying tab', tab.id);
-          chrome.tabs.sendMessage(
-            tab.id,
-            {
-              type: 'active-wallet-open',
-              activeWalletId: request.request.activeWalletId
-            }
-          );
-        }
-      });
+      if (request.request.changed) {
+        // notify content scripts in all tabs
+        chrome.tabs.query({}, (tabs) => {
+          for (const tab of tabs) {
+            chrome.tabs.sendMessage(
+              tab.id,
+              {
+                type: 'active-wallet-open',
+                activeWalletId: request.request.activeWalletId
+              }
+            );
+          }
+        });
+      }
       sendResponse(undefined);
     };
   }

From 592882735059fb45cb532c8425075a4775eb5690 Mon Sep 17 00:00:00 2001
From: kalfada <kalfada3321@gmail.com>
Date: Thu, 10 Oct 2024 14:44:19 +0300
Subject: [PATCH 023/143] feat: bringweb3 popup

---
 .../yoroi-extension/chrome/constants-mv2.js   |  17 +-
 .../chrome/content-scripts/bringInject.js     | 330 ++++++++++++------
 .../chrome/extension/background/index.js      |   7 +
 .../chrome/manifest-mv2.template.js           |   4 +-
 packages/yoroi-extension/package-lock.json    |   8 +-
 packages/yoroi-extension/package.json         |   2 +-
 6 files changed, 245 insertions(+), 123 deletions(-)

diff --git a/packages/yoroi-extension/chrome/constants-mv2.js b/packages/yoroi-extension/chrome/constants-mv2.js
index f81572f587..8a8be3c399 100644
--- a/packages/yoroi-extension/chrome/constants-mv2.js
+++ b/packages/yoroi-extension/chrome/constants-mv2.js
@@ -10,12 +10,12 @@ export function genCSP(request: {|
   isDev: boolean,
   additional: {|
     'default-src'?: Array<string>,
-    'frame-src'?: Array<string>,
-    'script-src'?: Array<string>,
-    'object-src'?: Array<string>,
-    'connect-src'?: Array<string>,
-    'style-src'?: Array<string>,
-    'img-src'?: Array<string>,
+      'frame-src' ?: Array < string >,
+      'script-src' ?: Array < string >,
+      'object-src' ?: Array < string >,
+      'connect-src' ?: Array < string >,
+      'style-src' ?: Array < string >,
+      'img-src' ?: Array < string >,
   |},
 |}): string {
   const defaultSrc = request.additional['default-src'] ?? [];
@@ -67,6 +67,11 @@ export function genCSP(request: {|
   connectSrc.push('https://aggregator.muesliswap.com/');
   connectSrc.push('https://onchain2.muesliswap.com/');
 
+  // Bringweb3
+  frameSrc.push('http://localhost:5173/')
+  frameSrc.push('https://*.bringweb3.io/')
+  connectSrc.push('https://*.bringweb3.io')
+
   // wasm-eval is needed to compile WebAssembly in the browser
   // note: wasm-eval is not standardized but empirically works in Firefox & Chrome https://github.com/w3c/webappsec-csp/pull/293
   const evalSrc = "'wasm-eval'";
diff --git a/packages/yoroi-extension/chrome/content-scripts/bringInject.js b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
index 7aa32587f9..1c2ed5f2c2 100644
--- a/packages/yoroi-extension/chrome/content-scripts/bringInject.js
+++ b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
@@ -1,110 +1,203 @@
 // @flow
 
+/*::
+declare var chrome;
+*/
+
 import { bringInitContentScript } from "@bringweb3/chrome-extension-kit";
 
-(async () => {
-  await bringInitContentScript({
-    iframeEndpoint: process.env.IFRAME_ENDPOINT,
-    getWalletAddress: async () => await new Promise(resolve => setTimeout(() => resolve('<USER_WALLET_ADDRESS>'), 200)),// Async function that returns the current user's wallet address
-    promptLogin: () => { return window.prompt('login'); }, // Function that prompts a UI element asking the user to login
-    walletAddressListeners: ["customEvent:addressChanged"], // A list of custom events that dispatched when the user's wallet address had changed
-    customTheme: {
-      // font
-      fontUrl: 'https://fonts.googleapis.com/css2?family=Matemasie&display=swap',
-      fontFamily: "'Matemasie', system-ui",
-      // Popup
-      popupBg: "#192E34",
-      popupShadow: "",
-      // Primary button
-      primaryBtnBg: "linear-gradient(135deg, #5DEB5A 0%, #FDFC47 100%)",
-      primaryBtnFC: "#041417",
-      primaryBtnFW: "600",
-      primaryBtnFS: "14px",
-      primaryBtnBorderC: "transparent",
-      primaryBtnBorderW: "0",
-      primaryBtnRadius: "8px",
-      // Secondary button
-      secondaryBtnBg: "transparent",
-      secondaryBtnFS: "12px",
-      secondaryBtnFW: "500",
-      secondaryBtnFC: "white",
-      secondaryBtnBorderC: "rgba(149, 176, 178, 0.50)",
-      secondaryBtnBorderW: "2px",
-      secondaryBtnRadius: "8px",
-      // Markdown
-      markdownBg: "#07131766",
-      markdownFS: "12px",
-      markdownFC: "#DADCE5",
-      markdownBorderW: "0",
-      markdownRadius: "4px",
-      markdownBorderC: "black",
-      markdownScrollbarC: "#DADCE5",
-      // Wallet address
-      walletBg: "#33535B",
-      walletFS: "10px",
-      walletFW: "400",
-      walletFC: "white",
-      walletBorderC: "white",
-      walletBorderW: "0",
-      walletRadius: "4px",
-      // Details of offering
-      detailsBg: "#33535B",
-      detailsTitleFS: "15px",
-      detailsTitleFW: "600",
-      detailsTitleFC: "white",
-      detailsSubtitleFS: "14px",
-      detailsSubtitleFW: "500",
-      detailsSubtitleFC: "#A8ADBF",
-      detailsRadius: "8px",
-      detailsBorderW: "0",
-      detailsBorderC: "transparent",
-      detailsAmountFC: "#5DEB5A",
-      detailsAmountFW: "700",
-      // Overlay
-      overlayBg: "#192E34E6",
-      overlayFS: "13px",
-      overlayFW: "400",
-      overlayFC: "#DADCE5",
-      loaderBg: "#0A2EC0",
-      // Optout \ Turn off
-      optoutBg: "#192E34",
-      optoutFS: "14px",
-      optoutFW: "400",
-      optoutFC: "white",
-      optoutRadius: "56px",
-      // X Button and close buttons
-      closeFS: "9px",
-      closeFW: "300",
-      closeFC: "#B9BBBF",
-      // Token name
-      tokenBg: "transparent",
-      tokenFS: "13px",
-      tokenFW: "600",
-      tokenFC: "#DADCE5",
-      tokenBorderW: "2px",
-      tokenBorderC: "#DADCE5",
-      // Notification popup
-      notificationFS: "14px",
-      notificationFW: "500",
-      notificationFC: "white",
-      notificationBtnBg: "linear-gradient(135deg, #5DEB5A 0%, #FDFC47 100%)",
-      notificationBtnFS: "12px",
-      notificationBtnFW: "500",
-      notificationBtnFC: "#041417",
-      notificationBtnBorderW: "0",
-      notificationBtnBorderC: "transparent",
-      notificationBtnRadius: "8px",
-      activateTitleFS: "--activate-title-f-s",
-      activateTitleFW: "--activate-title-f-w",
-      activateTitleFC: "--activate-title-f-c",
-      activateTitleBoldFS: "--activate-title-bold-f-s",
-      activateTitleBoldFW: "--activate-title-bold-f-w",
-      activateTitleBoldFC: "--activate-title-bold-f-c",
-    }
-  });
-})().catch(console.error);
+const darkTheme = {
+  // font
+  fontUrl: 'https://fonts.googleapis.com/css2?family=Rubik:ital,wght@0,300..900;1,300..900&display=swap',
+  fontFamily: '"Rubik", sans-serif',
+  // Popup
+  popupBg: "#15171F",
+  popupShadow: "0px 6px 20px 0px rgba(0, 0, 0, 0.10), 0px 1px 8px 0px rgba(0, 0, 0, 0.06)",
+  // Primary button
+  primaryBtnBg: "#4B6DDE",
+  primaryBtnFS: "16px",
+  primaryBtnFW: "500",
+  primaryBtnFC: "#FFFFFF",
+  primaryBtnBorderC: "transparent",
+  primaryBtnBorderW: "0",
+  primaryBtnRadius: "8px",
+  // Secondary button
+  secondaryBtnBg: "#15171F",
+  secondaryBtnFS: "14px",
+  secondaryBtnFW: "500",
+  secondaryBtnFC: "#7892E8",
+  secondaryBtnBorderC: "#7892E8",
+  secondaryBtnBorderW: "2px",
+  secondaryBtnRadius: "8px",
+  // Markdown
+  markdownBg: "#15171F",
+  markdownFS: "14px",
+  markdownFC: "#E1E6F5",
+  markdownBorderW: "1px",
+  markdownRadius: "8px",
+  markdownBorderC: "#262A38",
+  markdownScrollbarC: "#4B5266",
+  // Wallet address
+  walletBg: "#1F232E",
+  walletFS: "12px",
+  walletFW: "400",
+  walletFC: "#E1E6F5",
+  walletBorderC: "transparent",
+  walletBorderW: "0",
+  walletRadius: "80px",
+  // Details of offering
+  detailsBg: "#15171F",
+  detailsTitleFS: "16px",
+  detailsTitleFW: "500",
+  detailsTitleFC: "#E1E6F5",
+  detailsSubtitleFS: "16px",
+  detailsSubtitleFW: "400",
+  detailsSubtitleFC: "#E1E6F5",
+  detailsRadius: "8px",
+  detailsBorderW: "1px",
+  detailsBorderC: "#262A38",
+  detailsAmountFC: "#7892E8",
+  detailsAmountFW: "500",
+  // Overlay
+  overlayBg: "#1F232ECC",
+  overlayFS: "16px",
+  overlayFW: "400",
+  overlayFC: "#E1E6F5",
+  loaderBg: "#4B6DDE",
+  // Optout \ Turn off
+  optoutBg: "#15171F",
+  optoutFS: "16px",
+  optoutFW: "400",
+  optoutFC: "#E1E6F5",
+  optoutRadius: "4px",
+  // X Button and close buttons
+  closeFS: "12px",
+  closeFW: "400",
+  closeFC: "#E1E6F5",
+  // Token name
+  tokenBg: "#1F253B",
+  tokenFS: "14px",
+  tokenFW: "500",
+  tokenFC: "#7892E8",
+  tokenBorderW: "0",
+  tokenBorderC: "transparent",
+  tokenRadius: "80px",
+  // Notification popup
+  notificationFS: "16px",
+  notificationFW: "400",
+  notificationFC: "#E1E6F5",
+  notificationBtnBg: "#15171F",
+  notificationBtnFS: "14px",
+  notificationBtnFW: "500",
+  notificationBtnFC: "#7892E8",
+  notificationBtnBorderW: "2px",
+  notificationBtnBorderC: "#7892E8",
+  notificationBtnRadius: "8px",
+  // Activate title
+  activateTitleFS: "16px",
+  activateTitleFW: "400",
+  activateTitleFC: "#E1E6F5",
+  activateTitleBoldFS: "16px",
+  activateTitleBoldFW: "500",
+  activateTitleBoldFC: "#E1E6F5",
+}
+
+const lightTheme = {
+
+  // Popup
+  popupBg: "#FFFFFF",
+  popupShadow: "0px 6px 20px 0px rgba(0, 0, 0, 0.10), 0px 1px 8px 0px rgba(0, 0, 0, 0.06)",
+  // Primary button
+  primaryBtnBg: "#4B6DDE",
+  primaryBtnFC: "#FFFFFF",
+  primaryBtnFW: "500",
+  primaryBtnFS: "16px",
+  primaryBtnBorderC: "transparent",
+  primaryBtnBorderW: "0",
+  primaryBtnRadius: "8px",
+  // Secondary button
+  secondaryBtnBg: "#FFFFFF",
+  secondaryBtnFS: "14px",
+  secondaryBtnFW: "500",
+  secondaryBtnFC: "#4B6DDE",
+  secondaryBtnBorderC: "#4B6DDE",
+  secondaryBtnBorderW: "2px",
+  secondaryBtnRadius: "8px",
+  // Markdown
+  markdownBg: "#FFFFFF",
+  markdownFS: "14px",
+  markdownFC: "#242838",
+  markdownBorderW: "1px",
+  markdownRadius: "8px",
+  markdownBorderC: "#DCE0E9",
+  markdownScrollbarC: "#A7AFC0",
+  // Wallet address
+  walletBg: "#EAEDF2",
+  walletFS: "12px",
+  walletFW: "400",
+  walletFC: "#242838",
+  walletBorderC: "transparent",
+  walletBorderW: "0",
+  walletRadius: "80px",
+  // Details of offering
+  detailsBg: "#FFFFFF",
+  detailsTitleFS: "16px",
+  detailsTitleFW: "500",
+  detailsTitleFC: "#242838",
+  detailsSubtitleFS: "16px",
+  detailsSubtitleFW: "400",
+  detailsSubtitleFC: "#242838",
+  detailsRadius: "8px",
+  detailsBorderW: "1px",
+  detailsBorderC: "#DCE0E9",
+  detailsAmountFC: "#4B6DDE",
+  detailsAmountFW: "500",
+  // Overlay
+  overlayBg: "#0000007A",
+  overlayFS: "16px",
+  overlayFW: "400",
+  overlayFC: "#242838",
+  loaderBg: "#4B6DDE",
+  // Optout \ Turn off
+  optoutBg: "#FFFFFF",
+  optoutFS: "16px",
+  optoutFW: "400",
+  optoutFC: "#242838",
+  optoutRadius: "4px",
+  // X Button and close buttons
+  closeFS: "12px",
+  closeFW: "400",
+  closeFC: "#242838",
+  // Token name
+  tokenBg: "#E4E8F7",
+  tokenFS: "14px",
+  tokenFW: "500",
+  tokenFC: "#4B6DDE",
+  tokenBorderW: "0",
+  tokenBorderC: "transparent",
+  tokenRadius: "80px",
+  // Notification popup
+  notificationFS: "16px",
+  notificationFW: "400",
+  notificationFC: "#242838",
+  notificationBtnBg: "#FFFFFF",
+  notificationBtnFS: "14px",
+  notificationBtnFW: "500",
+  notificationBtnFC: "#4B6DDE",
+  notificationBtnBorderW: "2px",
+  notificationBtnBorderC: "#4B6DDE",
+  notificationBtnRadius: "8px",
+  // Activate title
+  activateTitleFS: "16px",
+  activateTitleFW: "400",
+  activateTitleFC: "#242838",
+  activateTitleBoldFS: "16px",
+  activateTitleBoldFW: "500",
+  activateTitleBoldFC: "#242838",
+}
 
-function getFromBackground(functionName: string, params: andy): Promise<any> {
+
+function getFromBackground(functionName: string, params: any): Promise<any> {
   const uid = Math.random();
   return new Promise((resolve, reject) => {
     chrome.runtime.onMessage.addListener((msg, sender) => {
@@ -128,13 +221,17 @@ function getFromBackground(functionName: string, params: andy): Promise<any> {
   });
 }
 
-async function getFirstAddress(): Promise<string> {
-  const usedAddresses = await getFromBackground('get_used_addresses', [undefined]);
-  if (usedAddresses.length > 0) {
-    return usedAddresses[0];
+async function getFirstAddress(): Promise<string | typeof undefined> {
+  try {
+    const usedAddresses = await getFromBackground('get_used_addresses', [undefined]);
+    if (usedAddresses.length > 0) {
+      return usedAddresses[0];
+    }
+    const unusedAddresses = await getFromBackground('get_unused_addresses', [undefined]);
+    return unusedAddresses[0];
+  } catch (error) {
+    return undefined
   }
-  const unusedAddresses = await getFromBackground('get_unused_addresses', [undefined]);
-  return unusedAddresses[0];
 }
 
 function getTheme(): Promise<'light' | 'dark'> {
@@ -149,11 +246,24 @@ function listenForActiveWalletOpen(callback) {
   // todo: verify sender extension id
   chrome.runtime.onMessage.addListener((msg, sender) => {
     if (msg.type === 'active-wallet-open') {
-      callback(msg.activeWalletId);
+      callback();
     }
   });
 }
 
+(async () => {
+  await bringInitContentScript({
+    getWalletAddress: getFirstAddress,
+    promptLogin: popUpWalletCreation,
+    walletAddressUpdateCallback: listenForActiveWalletOpen,
+    theme: await getTheme(),
+    lightTheme,
+    darkTheme,
+    text: 'upper'
+  });
+})().catch(console.error);
+
+
 async function example() {
   try {
     const addr = await getFirstAddress();
@@ -177,4 +287,4 @@ async function example() {
   });
 }
 
-example().catch(console.error);
+// example().catch(console.error);
diff --git a/packages/yoroi-extension/chrome/extension/background/index.js b/packages/yoroi-extension/chrome/extension/background/index.js
index cc2d2da5d0..36322171e4 100644
--- a/packages/yoroi-extension/chrome/extension/background/index.js
+++ b/packages/yoroi-extension/chrome/extension/background/index.js
@@ -6,11 +6,18 @@ import { init } from './state';
 import { startMonitorServerStatus } from './serverStatus';
 import { startPoll } from './coinPrice';
 import { environment } from '../../../app/environment';
+import { bringInitBackground } from '@bringweb3/chrome-extension-kit'
 
 /*::
 declare var chrome;
 */
 
+bringInitBackground({
+  identifier: 'G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8',
+  apiEndpoint: 'sandbox',
+  cashbackPagePath: '/wallet/cashback'
+});
+
 const onYoroiIconClicked = () => {
   chrome.tabs.create({ url: 'main_window.html' });
 };
diff --git a/packages/yoroi-extension/chrome/manifest-mv2.template.js b/packages/yoroi-extension/chrome/manifest-mv2.template.js
index 277201c79e..180b18c9a6 100644
--- a/packages/yoroi-extension/chrome/manifest-mv2.template.js
+++ b/packages/yoroi-extension/chrome/manifest-mv2.template.js
@@ -68,6 +68,8 @@ export default ({
     },
     permissions: [
       'storage',
+      'alarms',
+      'tabs',
       '*://connect.trezor.io/*',
       'https://emurgo.github.io/yoroi-extension-ledger-connect-vnext/*'
     ],
@@ -78,7 +80,6 @@ export default ({
       },
       {
         matches: [
-          'file://*/*',
           'http://*/*',
           'https://*/*',
         ],
@@ -86,7 +87,6 @@ export default ({
           'js/bringInject.js',
         ],
         run_at: 'document_start',
-        all_frames: true,
       }
     ],
     content_security_policy: contentSecurityPolicy,
diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index 7643b0f462..7de4b9e948 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@amplitude/analytics-browser": "^2.1.3",
         "@babel/preset-typescript": "^7.24.7",
-        "@bringweb3/chrome-extension-kit": "^1.0.12",
+        "@bringweb3/chrome-extension-kit": "^1.1.9",
         "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
         "@emotion/react": "^11.4.1",
         "@emotion/styled": "^11.3.0",
@@ -2134,9 +2134,9 @@
       "dev": true
     },
     "node_modules/@bringweb3/chrome-extension-kit": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/@bringweb3/chrome-extension-kit/-/chrome-extension-kit-1.0.12.tgz",
-      "integrity": "sha512-Q+p5Q8fqB4YD0vXZPlo773zvrij0BRtmpkMGZiefjyOq5mqfJcdYGrFg0hJGFwVLH8QYVlaI/wBVvSOdpNxxow=="
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/@bringweb3/chrome-extension-kit/-/chrome-extension-kit-1.1.9.tgz",
+      "integrity": "sha512-zYMOmbm80zBZZAd6LZmgavrZyIgEmFkGoZdXU5PCx1krSscBDGPaa9jkXBjgGO0r6kY6L8Uxr2taOtQdmYP+YQ=="
     },
     "node_modules/@cardano-foundation/ledgerjs-hw-app-cardano": {
       "version": "7.1.3",
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
index 7b075dba65..e04945aff0 100644
--- a/packages/yoroi-extension/package.json
+++ b/packages/yoroi-extension/package.json
@@ -145,7 +145,7 @@
   "dependencies": {
     "@amplitude/analytics-browser": "^2.1.3",
     "@babel/preset-typescript": "^7.24.7",
-    "@bringweb3/chrome-extension-kit": "^1.0.12",
+    "@bringweb3/chrome-extension-kit": "^1.1.9",
     "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",

From d64b181f608598dc1ca773d6b5edd2d144203270 Mon Sep 17 00:00:00 2001
From: kalfada <kalfada3321@gmail.com>
Date: Thu, 10 Oct 2024 14:57:02 +0300
Subject: [PATCH 024/143] fix: change env to sandbox

---
 packages/yoroi-extension/config/mainnet.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/yoroi-extension/config/mainnet.json b/packages/yoroi-extension/config/mainnet.json
index ddb342cd74..eef00087f2 100644
--- a/packages/yoroi-extension/config/mainnet.json
+++ b/packages/yoroi-extension/config/mainnet.json
@@ -18,7 +18,7 @@
     "pubKeyMaster": "ab9e4f1c4d996a0e9cdda8546bf5ee1dd8397fd7ab287c331ff171c7e4e0e9e2"
   },
   "bring": {
-    "baseUrl": "https://api.bringweb3.io/v1/extension/",
+    "baseUrl": "https://sandbox-api.bringweb3.io/v1/extension/",
     "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8"
   }
 }
\ No newline at end of file

From 6ddab679c507422a111257e8e61f92f237517cf3 Mon Sep 17 00:00:00 2001
From: kalfada <kalfada3321@gmail.com>
Date: Wed, 16 Oct 2024 15:08:02 +0300
Subject: [PATCH 025/143] fix: configure sandbox and prod for bringweb3

---
 .../app/UI/components/Card.d.ts               |   2 +
 .../app/UI/components/Chip.d.ts               |  12 +
 .../components/Collapsible/Collapsible.d.ts   |   7 +
 .../UI/components/Input/PasswordInput.d.ts    |  13 +
 .../app/UI/components/Input/SearchInput.d.ts  |   3 +
 .../app/UI/components/Input/TextInput.d.ts    |  12 +
 .../app/UI/components/Skeleton.d.ts           |   2 +
 .../app/UI/components/Tooltip.d.ts            |   7 +
 .../TransactionFailed/FailedIlustration.d.ts  |   2 +
 .../TransactionFailed/TransactionFailed.d.ts  |   2 +
 .../SuccessIlustration.d.ts                   |   2 +
 .../TransactionSubmitted.d.ts                 |   8 +
 .../app/UI/components/buttons/CopyButton.d.ts |   7 +
 .../app/UI/components/icons/Cancel.d.ts       |   2 +
 .../app/UI/components/icons/ChevronDown.d.ts  |   2 +
 .../app/UI/components/icons/ChevronUp.d.ts    |   2 +
 .../UI/components/icons/ChipArrowDown.d.ts    |   2 +
 .../app/UI/components/icons/ChipArrowUp.d.ts  |   2 +
 .../app/UI/components/icons/CloseIcon.d.ts    |   2 +
 .../app/UI/components/icons/Copied.d.ts       |   2 +
 .../app/UI/components/icons/Copy.d.ts         |   2 +
 .../app/UI/components/icons/Expand.d.ts       |   2 +
 .../app/UI/components/icons/Search.d.ts       |   2 +
 .../app/UI/components/icons/Send.d.ts         |   2 +
 .../app/UI/components/icons/Sort.d.ts         |  11 +
 .../app/UI/components/icons/Staking.d.ts      |   2 +
 .../UI/components/icons/VisibilityOff.d.ts    |   2 +
 .../app/UI/components/icons/VisibilityOn.d.ts |   2 +
 .../app/UI/components/icons/index.d.ts        |  16 +
 .../ilustrations/NoTransactions.d.ts          |   2 +
 .../app/UI/components/index.d.ts              |  12 +
 .../UI/components/modals/ModalContext.d.ts    |  15 +
 .../UI/components/modals/ModalManager.d.ts    |   2 +
 .../app/UI/context/IntlProvider.d.ts          |   8 +
 .../governace/common/ChooseDRepModal.d.ts     |   6 +
 .../common/GovernanceVoteingCard.d.ts         |  14 +
 .../governace/common/VotingSkeletonCard.d.ts  |   2 +
 .../features/governace/common/constants.d.ts  |   4 +
 .../UI/features/governace/common/helpers.d.ts |  24 ++
 .../common/ilustrations/Abstein.d.ts          |   2 +
 .../common/ilustrations/DRepIlustration.d.ts  |   2 +
 .../common/ilustrations/NoConfidance.d.ts     |   2 +
 .../common/useGovernanceManagerMaker.d.ts     |   1 +
 .../governace/common/useNavigateTo.d.ts       |   6 +
 .../features/governace/common/useStrings.d.ts |  36 ++
 .../module/GovernanceContextProvider.d.ts     |  64 ++++
 .../UI/features/governace/module/state.d.ts   |  26 ++
 .../DelagationForm/DelagationForm.d.ts        |   2 +
 .../GovernanceStatusSelection.d.ts            |   6 +
 .../portfolio/common/components/Menu.d.ts     |   9 +
 .../common/components/NavigationButton.d.ts   |  10 +
 .../common/components/PortfolioHeader.d.ts    |   9 +
 .../common/components/PortfolioMenu.d.ts      |   6 +
 .../common/components/SortableTableHead.d.ts  |   9 +
 .../portfolio/common/components/Table.d.ts    |  15 +
 .../common/components/WelcomeBanner.d.ts      |   3 +
 .../common/helpers/formatHelper.d.ts          |   1 +
 .../portfolio/common/helpers/mockHelper.d.ts  |  14 +
 .../common/helpers/transactionHelper.d.ts     |   1 +
 .../portfolio/common/hooks/useChart.d.ts      |  37 +++
 .../portfolio/common/hooks/useNavigateTo.d.ts |   8 +
 .../portfolio/common/hooks/useStrings.d.ts    |  81 +++++
 .../portfolio/common/hooks/useTableSort.d.ts  |  17 +
 .../features/portfolio/common/mockData.d.ts   |  17 +
 .../portfolio/common/types/chart.d.ts         |  13 +
 .../portfolio/common/types/index.d.ts         |  81 +++++
 .../portfolio/common/types/table.d.ts         |  10 +
 .../portfolio/common/types/transaction.d.ts   |  22 ++
 .../module/PortfolioContextProvider.d.ts      |  22 ++
 .../UI/features/portfolio/module/state.d.ts   |  21 ++
 .../useCases/Dapps/LendAndBorrow.d.ts         |   3 +
 .../useCases/Dapps/LiquidityTable.d.ts        |   7 +
 .../portfolio/useCases/Dapps/OrderTable.d.ts  |   7 +
 .../useCases/Dapps/PortfolioDapps.d.ts        |  10 +
 .../TokenDetails/TokenDetailChart.d.ts        |   8 +
 .../TokenDetails/TokenDetailOverview.d.ts     |   8 +
 .../TokenDetails/TokenDetailPerformance.d.ts  |   7 +
 .../useCases/TokenDetails/TokenDetails.d.ts   |   6 +
 .../TokenDetails/TransactionTable.d.ts        |   6 +
 .../useCases/Wallet/PortfolioWallet.d.ts      |   6 +
 .../portfolio/useCases/Wallet/StatsTable.d.ts |   7 +
 .../GovernanceDelegationFormPage.d.ts         |   7 +
 .../Governance/GovernanceStatusPage.d.ts      |   7 +
 .../GovernanceTransactionFailedPage.d.ts      |   7 +
 .../GovernanceTransactionSubmittedPage.d.ts   |   7 +
 .../app/UI/pages/Governance/layout.d.ts       |   8 +
 .../pages/portfolio/PortfolioDappsPage.d.ts   |   7 +
 .../pages/portfolio/PortfolioDetailPage.d.ts  |   8 +
 .../app/UI/pages/portfolio/PortfolioPage.d.ts |   7 +
 .../app/UI/pages/portfolio/layout.d.ts        |   8 +
 .../yoroi-extension/app/UI/types/index.d.ts   |   0
 .../app/api/ada/lib/test-config.forTests.js   |   3 +-
 packages/yoroi-extension/app/environment.js   |   4 +-
 .../chrome/content-scripts/bringInject.js     |  26 --
 .../chrome/extension/background/index.js      |   6 +-
 .../yoroi-extension/config/config-types.js    |   5 +-
 .../yoroi-extension/config/development.json   |   3 +-
 packages/yoroi-extension/config/mainnet.json  |   5 +-
 packages/yoroi-extension/config/test.json     |   3 +-
 packages/yoroi-extension/package-lock.json    | 314 ++++++++++++++++--
 100 files changed, 1213 insertions(+), 73 deletions(-)
 create mode 100644 packages/yoroi-extension/app/UI/components/Card.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/Chip.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/Collapsible/Collapsible.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/Input/PasswordInput.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/Input/SearchInput.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/Input/TextInput.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/Skeleton.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/Tooltip.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/TransactionFailed/FailedIlustration.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/TransactionFailed/TransactionFailed.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/TransactionSubmitted/SuccessIlustration.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/TransactionSubmitted/TransactionSubmitted.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/buttons/CopyButton.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/icons/Cancel.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/icons/ChevronDown.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/icons/ChevronUp.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/icons/ChipArrowDown.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/icons/ChipArrowUp.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/icons/CloseIcon.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/icons/Copied.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/icons/Copy.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/icons/Expand.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/icons/Search.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/icons/Send.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/icons/Sort.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/icons/Staking.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/icons/VisibilityOff.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/icons/VisibilityOn.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/icons/index.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/ilustrations/NoTransactions.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/index.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/modals/ModalContext.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/components/modals/ModalManager.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/context/IntlProvider.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/governace/common/ChooseDRepModal.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/governace/common/GovernanceVoteingCard.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/governace/common/VotingSkeletonCard.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/governace/common/constants.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/governace/common/helpers.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/governace/common/ilustrations/Abstein.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/governace/common/ilustrations/DRepIlustration.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/governace/common/ilustrations/NoConfidance.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/governace/common/useGovernanceManagerMaker.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/governace/common/useNavigateTo.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/governace/common/useStrings.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/governace/module/GovernanceContextProvider.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/governace/module/state.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/governace/useCases/DelagationForm/DelagationForm.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/governace/useCases/SelectGovernanceStatus/GovernanceStatusSelection.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/components/Menu.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/components/NavigationButton.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/components/PortfolioHeader.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/components/PortfolioMenu.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/components/SortableTableHead.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/components/Table.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/components/WelcomeBanner.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/helpers/formatHelper.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/helpers/mockHelper.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/helpers/transactionHelper.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useChart.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useNavigateTo.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useStrings.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useTableSort.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/mockData.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/types/chart.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/types/index.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/types/table.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/types/transaction.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/module/PortfolioContextProvider.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/module/state.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/LendAndBorrow.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/LiquidityTable.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/OrderTable.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/PortfolioDapps.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetailChart.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetailOverview.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetailPerformance.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetails.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TransactionTable.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/useCases/Wallet/PortfolioWallet.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/features/portfolio/useCases/Wallet/StatsTable.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/pages/Governance/GovernanceDelegationFormPage.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/pages/Governance/GovernanceStatusPage.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/pages/Governance/GovernanceTransactionFailedPage.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/pages/Governance/GovernanceTransactionSubmittedPage.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/pages/Governance/layout.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/pages/portfolio/PortfolioDappsPage.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/pages/portfolio/PortfolioDetailPage.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/pages/portfolio/PortfolioPage.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/pages/portfolio/layout.d.ts
 create mode 100644 packages/yoroi-extension/app/UI/types/index.d.ts

diff --git a/packages/yoroi-extension/app/UI/components/Card.d.ts b/packages/yoroi-extension/app/UI/components/Card.d.ts
new file mode 100644
index 0000000000..ab31fa5a51
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/Card.d.ts
@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const Card: (props: any) => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/Chip.d.ts b/packages/yoroi-extension/app/UI/components/Chip.d.ts
new file mode 100644
index 0000000000..9c62b13749
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/Chip.d.ts
@@ -0,0 +1,12 @@
+export declare const ChipTypes: Readonly<{
+    ACTIVE: "active";
+    INACTIVE: "inactive";
+    DISABLED: "disabled";
+}>;
+interface Props {
+    label: JSX.Element;
+    type: typeof ChipTypes[keyof typeof ChipTypes];
+    sx?: any;
+}
+export declare const Chip: ({ label, type, sx, ...props }: Props) => JSX.Element;
+export {};
diff --git a/packages/yoroi-extension/app/UI/components/Collapsible/Collapsible.d.ts b/packages/yoroi-extension/app/UI/components/Collapsible/Collapsible.d.ts
new file mode 100644
index 0000000000..e9b3a1db55
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/Collapsible/Collapsible.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+type Props = {
+    title: string;
+    content: React.ReactNode;
+};
+export declare const Collapsible: ({ title, content }: Props) => React.JSX.Element;
+export {};
diff --git a/packages/yoroi-extension/app/UI/components/Input/PasswordInput.d.ts b/packages/yoroi-extension/app/UI/components/Input/PasswordInput.d.ts
new file mode 100644
index 0000000000..9d195e6710
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/Input/PasswordInput.d.ts
@@ -0,0 +1,13 @@
+import React from 'react';
+type StyledInputProps = {
+    id: string;
+    label: string;
+    variant?: string;
+    onChange: (event: any) => void;
+    value?: string;
+    error?: boolean;
+    helperText?: string;
+    disabled?: boolean;
+};
+export declare const PasswordInput: ({ id, label, onChange, value, error, disabled, helperText }: StyledInputProps) => React.JSX.Element;
+export {};
diff --git a/packages/yoroi-extension/app/UI/components/Input/SearchInput.d.ts b/packages/yoroi-extension/app/UI/components/Input/SearchInput.d.ts
new file mode 100644
index 0000000000..96e06df3b5
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/Input/SearchInput.d.ts
@@ -0,0 +1,3 @@
+import React from 'react';
+import { InputProps } from '@mui/material';
+export declare const SearchInput: (props: InputProps) => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/Input/TextInput.d.ts b/packages/yoroi-extension/app/UI/components/Input/TextInput.d.ts
new file mode 100644
index 0000000000..d028122589
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/Input/TextInput.d.ts
@@ -0,0 +1,12 @@
+import React from 'react';
+type StyledInputProps = {
+    id: string;
+    label: string;
+    variant: string;
+    onChange: (event: any) => void;
+    value?: string;
+    error?: boolean;
+    helperText?: string;
+};
+export declare const TextInput: ({ id, label, onChange, value, error, helperText }: StyledInputProps) => React.JSX.Element;
+export {};
diff --git a/packages/yoroi-extension/app/UI/components/Skeleton.d.ts b/packages/yoroi-extension/app/UI/components/Skeleton.d.ts
new file mode 100644
index 0000000000..2a45d1c95b
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/Skeleton.d.ts
@@ -0,0 +1,2 @@
+import { SkeletonProps } from '@mui/material';
+export declare const Skeleton: ({ width, height, ...props }: SkeletonProps) => JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/Tooltip.d.ts b/packages/yoroi-extension/app/UI/components/Tooltip.d.ts
new file mode 100644
index 0000000000..fa4ae319bd
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/Tooltip.d.ts
@@ -0,0 +1,7 @@
+import { TooltipProps } from '@mui/material/Tooltip';
+interface Props extends TooltipProps {
+    children: JSX.Element;
+    title: JSX.Element;
+}
+export declare const Tooltip: ({ children, title, ...props }: Props) => JSX.Element;
+export {};
diff --git a/packages/yoroi-extension/app/UI/components/TransactionFailed/FailedIlustration.d.ts b/packages/yoroi-extension/app/UI/components/TransactionFailed/FailedIlustration.d.ts
new file mode 100644
index 0000000000..de94b58574
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/TransactionFailed/FailedIlustration.d.ts
@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const FailedIlustration: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/TransactionFailed/TransactionFailed.d.ts b/packages/yoroi-extension/app/UI/components/TransactionFailed/TransactionFailed.d.ts
new file mode 100644
index 0000000000..76432caafe
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/TransactionFailed/TransactionFailed.d.ts
@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const TransactionFailed: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/TransactionSubmitted/SuccessIlustration.d.ts b/packages/yoroi-extension/app/UI/components/TransactionSubmitted/SuccessIlustration.d.ts
new file mode 100644
index 0000000000..24a4e77671
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/TransactionSubmitted/SuccessIlustration.d.ts
@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const SuccessIlustration: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/TransactionSubmitted/TransactionSubmitted.d.ts b/packages/yoroi-extension/app/UI/components/TransactionSubmitted/TransactionSubmitted.d.ts
new file mode 100644
index 0000000000..2f94f72234
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/TransactionSubmitted/TransactionSubmitted.d.ts
@@ -0,0 +1,8 @@
+import React from 'react';
+export declare const TransactionSubmitted: ({ title, subtitle, content, btnText, onPress, }: {
+    title?: string;
+    subtitle?: string;
+    content?: string;
+    btnText?: string;
+    onPress?: () => void;
+}) => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/buttons/CopyButton.d.ts b/packages/yoroi-extension/app/UI/components/buttons/CopyButton.d.ts
new file mode 100644
index 0000000000..17b5620cc1
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/buttons/CopyButton.d.ts
@@ -0,0 +1,7 @@
+import React from 'react';
+interface Props {
+    textToCopy: string;
+    disabled: boolean;
+}
+export declare const CopyButton: ({ textToCopy, disabled, ...props }: Props) => React.JSX.Element;
+export {};
diff --git a/packages/yoroi-extension/app/UI/components/icons/Cancel.d.ts b/packages/yoroi-extension/app/UI/components/icons/Cancel.d.ts
new file mode 100644
index 0000000000..991a80b643
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/icons/Cancel.d.ts
@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const Cancel: (props: React.SVGProps<SVGSVGElement>) => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/ChevronDown.d.ts b/packages/yoroi-extension/app/UI/components/icons/ChevronDown.d.ts
new file mode 100644
index 0000000000..53fd67bdf5
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/icons/ChevronDown.d.ts
@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const ChevronDown: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/ChevronUp.d.ts b/packages/yoroi-extension/app/UI/components/icons/ChevronUp.d.ts
new file mode 100644
index 0000000000..764c982f41
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/icons/ChevronUp.d.ts
@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const ChevronUp: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/ChipArrowDown.d.ts b/packages/yoroi-extension/app/UI/components/icons/ChipArrowDown.d.ts
new file mode 100644
index 0000000000..8600429687
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/icons/ChipArrowDown.d.ts
@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const ChipArrowDown: (props: React.SVGProps<SVGSVGElement>) => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/ChipArrowUp.d.ts b/packages/yoroi-extension/app/UI/components/icons/ChipArrowUp.d.ts
new file mode 100644
index 0000000000..010f501b64
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/icons/ChipArrowUp.d.ts
@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const ChipArrowUp: (props: React.SVGProps<SVGSVGElement>) => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/CloseIcon.d.ts b/packages/yoroi-extension/app/UI/components/icons/CloseIcon.d.ts
new file mode 100644
index 0000000000..28af3d70e7
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/icons/CloseIcon.d.ts
@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const CloseIcon: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/Copied.d.ts b/packages/yoroi-extension/app/UI/components/icons/Copied.d.ts
new file mode 100644
index 0000000000..e037a0a94f
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/icons/Copied.d.ts
@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const Copied: (props: React.SVGProps<SVGSVGElement>) => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/Copy.d.ts b/packages/yoroi-extension/app/UI/components/icons/Copy.d.ts
new file mode 100644
index 0000000000..6afba67d55
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/icons/Copy.d.ts
@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const Copy: (props: React.SVGProps<SVGSVGElement>) => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/Expand.d.ts b/packages/yoroi-extension/app/UI/components/icons/Expand.d.ts
new file mode 100644
index 0000000000..fefde7f73c
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/icons/Expand.d.ts
@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const Expand: (props: React.SVGProps<SVGSVGElement>) => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/Search.d.ts b/packages/yoroi-extension/app/UI/components/icons/Search.d.ts
new file mode 100644
index 0000000000..5d88d1ae8c
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/icons/Search.d.ts
@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const Search: (props: React.SVGProps<SVGSVGElement>) => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/Send.d.ts b/packages/yoroi-extension/app/UI/components/icons/Send.d.ts
new file mode 100644
index 0000000000..a729f336a9
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/icons/Send.d.ts
@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const Send: (props: React.SVGProps<SVGSVGElement>) => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/Sort.d.ts b/packages/yoroi-extension/app/UI/components/icons/Sort.d.ts
new file mode 100644
index 0000000000..82f2c48517
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/icons/Sort.d.ts
@@ -0,0 +1,11 @@
+import React from 'react';
+interface Props {
+    id: string;
+    order: string | null;
+    orderBy: string | null;
+    style: any;
+    onClick: () => void;
+    props?: React.SVGProps<SVGSVGElement>;
+}
+export declare const Sort: ({ id, order, orderBy, style, onClick, ...props }: Props) => React.JSX.Element;
+export {};
diff --git a/packages/yoroi-extension/app/UI/components/icons/Staking.d.ts b/packages/yoroi-extension/app/UI/components/icons/Staking.d.ts
new file mode 100644
index 0000000000..974fffe4ba
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/icons/Staking.d.ts
@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const Staking: (props: React.SVGProps<SVGSVGElement>) => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/VisibilityOff.d.ts b/packages/yoroi-extension/app/UI/components/icons/VisibilityOff.d.ts
new file mode 100644
index 0000000000..37142520c3
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/icons/VisibilityOff.d.ts
@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const VisibilityOff: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/VisibilityOn.d.ts b/packages/yoroi-extension/app/UI/components/icons/VisibilityOn.d.ts
new file mode 100644
index 0000000000..34e1024f9c
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/icons/VisibilityOn.d.ts
@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const VisibilityOn: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/index.d.ts b/packages/yoroi-extension/app/UI/components/icons/index.d.ts
new file mode 100644
index 0000000000..e1ab18523a
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/icons/index.d.ts
@@ -0,0 +1,16 @@
+export declare const Icon: {
+    CloseIcon: () => import("react").JSX.Element;
+    VisibilityOn: () => import("react").JSX.Element;
+    VisibilityOff: () => import("react").JSX.Element;
+    Copy: (props: import("react").SVGProps<SVGSVGElement>) => import("react").JSX.Element;
+    Copied: (props: import("react").SVGProps<SVGSVGElement>) => import("react").JSX.Element;
+    ChipArrowUp: (props: import("react").SVGProps<SVGSVGElement>) => import("react").JSX.Element;
+    ChipArrowDown: (props: import("react").SVGProps<SVGSVGElement>) => import("react").JSX.Element;
+    Send: (props: import("react").SVGProps<SVGSVGElement>) => import("react").JSX.Element;
+    Cancel: (props: import("react").SVGProps<SVGSVGElement>) => import("react").JSX.Element;
+    Staking: (props: import("react").SVGProps<SVGSVGElement>) => import("react").JSX.Element;
+    Expand: (props: import("react").SVGProps<SVGSVGElement>) => import("react").JSX.Element;
+    ChevronDown: () => import("react").JSX.Element;
+    ChevronUp: () => import("react").JSX.Element;
+    Search: (props: import("react").SVGProps<SVGSVGElement>) => import("react").JSX.Element;
+};
diff --git a/packages/yoroi-extension/app/UI/components/ilustrations/NoTransactions.d.ts b/packages/yoroi-extension/app/UI/components/ilustrations/NoTransactions.d.ts
new file mode 100644
index 0000000000..76365d4f57
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/ilustrations/NoTransactions.d.ts
@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const NoTransactions: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/index.d.ts b/packages/yoroi-extension/app/UI/components/index.d.ts
new file mode 100644
index 0000000000..afb8a9baea
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/index.d.ts
@@ -0,0 +1,12 @@
+export * from './Card';
+export * from './Tooltip';
+export * from './Skeleton';
+export * from './Chip';
+export * from './buttons/CopyButton';
+export * from './Input/SearchInput';
+export * from './Input/TextInput';
+export * from './Input/PasswordInput';
+export * from './TransactionFailed/TransactionFailed';
+export * from './TransactionSubmitted/TransactionSubmitted';
+export * from './Collapsible/Collapsible';
+export * from './icons';
diff --git a/packages/yoroi-extension/app/UI/components/modals/ModalContext.d.ts b/packages/yoroi-extension/app/UI/components/modals/ModalContext.d.ts
new file mode 100644
index 0000000000..4cb44ef227
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/modals/ModalContext.d.ts
@@ -0,0 +1,15 @@
+import React from 'react';
+type ModalState = {
+    isOpen: boolean;
+    title: string;
+    content: React.ReactNode;
+    height: string;
+    width: string;
+    isLoading: boolean;
+};
+export declare const useModal: () => any;
+export declare const ModalProvider: ({ children, initialState }: {
+    children: React.ReactNode;
+    initialState?: ModalState;
+}) => React.JSX.Element;
+export {};
diff --git a/packages/yoroi-extension/app/UI/components/modals/ModalManager.d.ts b/packages/yoroi-extension/app/UI/components/modals/ModalManager.d.ts
new file mode 100644
index 0000000000..3029acef76
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/components/modals/ModalManager.d.ts
@@ -0,0 +1,2 @@
+import * as React from 'react';
+export declare const ModalManager: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/context/IntlProvider.d.ts b/packages/yoroi-extension/app/UI/context/IntlProvider.d.ts
new file mode 100644
index 0000000000..d6bcb79996
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/context/IntlProvider.d.ts
@@ -0,0 +1,8 @@
+import * as React from 'react';
+export declare const IntlProvider: ({ children, intl }: {
+    children: React.ReactNode;
+    intl: any;
+}) => React.JSX.Element;
+export declare const useIntl: () => {
+    intl: any;
+};
diff --git a/packages/yoroi-extension/app/UI/features/governace/common/ChooseDRepModal.d.ts b/packages/yoroi-extension/app/UI/features/governace/common/ChooseDRepModal.d.ts
new file mode 100644
index 0000000000..ca0b9531d2
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/governace/common/ChooseDRepModal.d.ts
@@ -0,0 +1,6 @@
+import * as React from 'react';
+type ChooseDRepModallProps = {
+    onSubmit?: (drepId: string, drepCredential: string) => void;
+};
+export declare const ChooseDRepModal: ({ onSubmit }: ChooseDRepModallProps) => React.JSX.Element;
+export {};
diff --git a/packages/yoroi-extension/app/UI/features/governace/common/GovernanceVoteingCard.d.ts b/packages/yoroi-extension/app/UI/features/governace/common/GovernanceVoteingCard.d.ts
new file mode 100644
index 0000000000..9577cffec2
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/governace/common/GovernanceVoteingCard.d.ts
@@ -0,0 +1,14 @@
+import * as React from 'react';
+type Props = {
+    title: string;
+    titleHover?: string;
+    description: string;
+    descriptionHover?: string;
+    icon: React.ReactNode;
+    selected: boolean;
+    onClick: () => void;
+    pending: boolean;
+    loading: boolean;
+};
+export declare const GovernanceVoteingCard: ({ title, description, descriptionHover, titleHover, icon, selected, onClick, pending, loading, }: Props) => React.JSX.Element;
+export {};
diff --git a/packages/yoroi-extension/app/UI/features/governace/common/VotingSkeletonCard.d.ts b/packages/yoroi-extension/app/UI/features/governace/common/VotingSkeletonCard.d.ts
new file mode 100644
index 0000000000..d6ae536a5d
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/governace/common/VotingSkeletonCard.d.ts
@@ -0,0 +1,2 @@
+import * as React from 'react';
+export declare const VotingSkeletonCard: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/features/governace/common/constants.d.ts b/packages/yoroi-extension/app/UI/features/governace/common/constants.d.ts
new file mode 100644
index 0000000000..f1ee0404e5
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/governace/common/constants.d.ts
@@ -0,0 +1,4 @@
+export declare const BECOME_DREP_LINK = "https://emurgohelpdesk.zendesk.com/hc/en-us/articles/8600742035855-Who-are-DReps-on-Cardano";
+export declare const LEARN_MORE_LINK = "https://emurgohelpdesk.zendesk.com/hc/en-us/sections/8582793481231-Governance";
+export declare const DREP_ALWAYS_ABSTAIN: any;
+export declare const DREP_ALWAYS_NO_CONFIDENCE: any;
diff --git a/packages/yoroi-extension/app/UI/features/governace/common/helpers.d.ts b/packages/yoroi-extension/app/UI/features/governace/common/helpers.d.ts
new file mode 100644
index 0000000000..97f6b0eeb1
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/governace/common/helpers.d.ts
@@ -0,0 +1,24 @@
+export declare const mapStakingKeyStateToGovernanceAction: (state: any) => {
+    kind: string;
+    drepID?: undefined;
+} | {
+    kind: string;
+    drepID: any;
+} | null;
+export declare const createCurrrentWalletInfo: (stores: any) => {
+    currentPool: any;
+    networkId: any;
+    walletId: number;
+    selectedWallet: any;
+    walletAdaBalance: any;
+    unitOfAccount: any;
+    defaultTokenInfo: any;
+    getCurrentPrice: any;
+    recentTransactions: any;
+    submitedTransactions: any;
+    isHardwareWallet: boolean;
+    backendService: any;
+    backendServiceZero: any;
+    stakingAddress: any;
+};
+export declare const getFormattedPairingValue: (getCurrentPrice: any, defaultTokenInfo: any, unitOfAccount: any, lovelaces: string) => string;
diff --git a/packages/yoroi-extension/app/UI/features/governace/common/ilustrations/Abstein.d.ts b/packages/yoroi-extension/app/UI/features/governace/common/ilustrations/Abstein.d.ts
new file mode 100644
index 0000000000..af108a9c84
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/governace/common/ilustrations/Abstein.d.ts
@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const Abstein: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/features/governace/common/ilustrations/DRepIlustration.d.ts b/packages/yoroi-extension/app/UI/features/governace/common/ilustrations/DRepIlustration.d.ts
new file mode 100644
index 0000000000..9af32e0b07
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/governace/common/ilustrations/DRepIlustration.d.ts
@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const DRepIlustration: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/features/governace/common/ilustrations/NoConfidance.d.ts b/packages/yoroi-extension/app/UI/features/governace/common/ilustrations/NoConfidance.d.ts
new file mode 100644
index 0000000000..df55855eaf
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/governace/common/ilustrations/NoConfidance.d.ts
@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const NoConfidance: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/features/governace/common/useGovernanceManagerMaker.d.ts b/packages/yoroi-extension/app/UI/features/governace/common/useGovernanceManagerMaker.d.ts
new file mode 100644
index 0000000000..32ea8f03d9
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/governace/common/useGovernanceManagerMaker.d.ts
@@ -0,0 +1 @@
+export declare const useGovernanceManagerMaker: (walletId: string, networkId: string) => any;
diff --git a/packages/yoroi-extension/app/UI/features/governace/common/useNavigateTo.d.ts b/packages/yoroi-extension/app/UI/features/governace/common/useNavigateTo.d.ts
new file mode 100644
index 0000000000..112276f7df
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/governace/common/useNavigateTo.d.ts
@@ -0,0 +1,6 @@
+export declare const useNavigateTo: () => {
+    selectStatus: () => void;
+    delegationForm: () => void;
+    transactionSubmited: () => void;
+    transactionFail: () => void;
+};
diff --git a/packages/yoroi-extension/app/UI/features/governace/common/useStrings.d.ts b/packages/yoroi-extension/app/UI/features/governace/common/useStrings.d.ts
new file mode 100644
index 0000000000..b81378d7c9
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/governace/common/useStrings.d.ts
@@ -0,0 +1,36 @@
+export declare const messages: any;
+export declare const useStrings: () => {
+    delegateToDRep: any;
+    delegatingToDRep: any;
+    designatingSomeoneElse: any;
+    governanceStatus: any;
+    governanceStatusInfo: any;
+    abstain: any;
+    abstainInfo: any;
+    noConfidence: any;
+    noConfidenceInfo: any;
+    learnMore: any;
+    becomeADrep: any;
+    drepId: any;
+    registerGovernance: any;
+    reviewSelection: any;
+    statusSelected: (status: any) => any;
+    chooseDrep: any;
+    designatedSomeone: any;
+    transactionDetails: any;
+    operations: any;
+    selectAbstein: any;
+    selectNoConfidence: any;
+    back: any;
+    confirm: any;
+    total: any;
+    password: any;
+    wrongPassword: any;
+    identifyDrep: any;
+    incorectFormat: any;
+    statusPending: any;
+    thanksForParticipation: any;
+    theTransactionCanTake: any;
+    participatingInGovernance: any;
+    goToGovernance: any;
+};
diff --git a/packages/yoroi-extension/app/UI/features/governace/module/GovernanceContextProvider.d.ts b/packages/yoroi-extension/app/UI/features/governace/module/GovernanceContextProvider.d.ts
new file mode 100644
index 0000000000..e20dbc61fd
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/governace/module/GovernanceContextProvider.d.ts
@@ -0,0 +1,64 @@
+import * as React from 'react';
+type GovernanceProviderProps = {
+    children: React.ReactNode;
+    currentWallet: any;
+    createDrepDelegationTransaction: (drepCredential: String) => Promise<void>;
+    txDelegationResult: any;
+    txDelegationError: any;
+    signDelegationTransaction: (params: any) => Promise<void>;
+    tokenInfo: any;
+    triggerBuySellAdaDialog: any;
+};
+export declare const GovernanceContextProvider: ({ children, currentWallet, createDrepDelegationTransaction, txDelegationResult, txDelegationError, signDelegationTransaction, tokenInfo, triggerBuySellAdaDialog, }: GovernanceProviderProps) => React.JSX.Element;
+export declare const useGovernance: () => {
+    walletId: string;
+    governanceManager: null;
+    checkUserPassword: (_password: string) => {
+        new (body?: BodyInit | null, init?: ResponseInit): Response;
+        prototype: Response;
+        error(): Response;
+        json(data: any, init?: ResponseInit): Response;
+        redirect(url: string | URL, status?: number): Response;
+    };
+    txDelegationResult: null;
+    txDelegationError: null;
+    tokenInfo: null;
+    getFormattedPairingAmount: (_amount: string) => {
+        new (body?: BodyInit | null, init?: ResponseInit): Response;
+        prototype: Response;
+        error(): Response;
+        json(data: any, init?: ResponseInit): Response;
+        redirect(url: string | URL, status?: number): Response;
+    };
+    isHardwareWallet: boolean;
+    createDrepDelegationTransaction: (_drepCredential: string) => Promise<{
+        new (body?: BodyInit | null, init?: ResponseInit): Response;
+        prototype: Response;
+        error(): Response;
+        json(data: any, init?: ResponseInit): Response;
+        redirect(url: string | URL, status?: number): Response;
+    }>;
+    signDelegationTransaction: (_params: any) => Promise<{
+        new (body?: BodyInit | null, init?: ResponseInit): Response;
+        prototype: Response;
+        error(): Response;
+        json(data: any, init?: ResponseInit): Response;
+        redirect(url: string | URL, status?: number): Response;
+    }>;
+    selectedWallet: null;
+    walletAdaBalance: null;
+    governanceStatus: {
+        status: null;
+        drep: null;
+    };
+    triggerBuySellAdaDialog: null;
+    recentTransactions: never[];
+    submitedTransactions: {
+        isDrepDelegation: boolean;
+    }[];
+    governanceVoteChanged: (vote: any) => void;
+    dRepIdChanged: (id: string) => void;
+    governanceVote: any;
+    dRepId?: string;
+};
+export {};
diff --git a/packages/yoroi-extension/app/UI/features/governace/module/state.d.ts b/packages/yoroi-extension/app/UI/features/governace/module/state.d.ts
new file mode 100644
index 0000000000..3d929320fc
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/governace/module/state.d.ts
@@ -0,0 +1,26 @@
+export type Vote = {
+    kind: string;
+    drepID?: string;
+};
+export type GovernanceActions = {
+    governanceVoteChanged: (vote: any) => void;
+    dRepIdChanged: (id: string) => void;
+};
+export declare const GovernanceActionType: Readonly<{
+    GovernanceVoteChanged: "governanceVoteChanged";
+    DRepIdChanged: "dRepIdChanged";
+}>;
+export type GovernanceAction = {
+    type: typeof GovernanceActionType.GovernanceVoteChanged;
+    governanceVote: Vote;
+} | {
+    type: typeof GovernanceActionType.DRepIdChanged;
+    dRepId: '';
+};
+export type GovernanceState = {
+    governanceVote: any;
+    dRepId?: string;
+};
+export declare const defaultGovernanceState: GovernanceState;
+export declare const defaultGovernanceActions: GovernanceActions;
+export declare const GovernanceReducer: (state: GovernanceState, action: GovernanceAction) => GovernanceState;
diff --git a/packages/yoroi-extension/app/UI/features/governace/useCases/DelagationForm/DelagationForm.d.ts b/packages/yoroi-extension/app/UI/features/governace/useCases/DelagationForm/DelagationForm.d.ts
new file mode 100644
index 0000000000..096ef42dc3
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/governace/useCases/DelagationForm/DelagationForm.d.ts
@@ -0,0 +1,2 @@
+import * as React from 'react';
+export declare const DelagationForm: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/features/governace/useCases/SelectGovernanceStatus/GovernanceStatusSelection.d.ts b/packages/yoroi-extension/app/UI/features/governace/useCases/SelectGovernanceStatus/GovernanceStatusSelection.d.ts
new file mode 100644
index 0000000000..b363775f5d
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/governace/useCases/SelectGovernanceStatus/GovernanceStatusSelection.d.ts
@@ -0,0 +1,6 @@
+import * as React from 'react';
+export declare const mapStatus: {
+    [x: number]: string;
+    delegate: string;
+};
+export declare const GovernanceStatusSelection: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/components/Menu.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/components/Menu.d.ts
new file mode 100644
index 0000000000..30c75789c9
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/common/components/Menu.d.ts
@@ -0,0 +1,9 @@
+import React from 'react';
+import { SubMenuOption } from '../types';
+interface Props {
+    options: SubMenuOption[];
+    onItemClick: (route: string) => void;
+    isActiveItem: (route: string) => boolean;
+}
+declare const Menu: ({ options, onItemClick, isActiveItem }: Props) => React.JSX.Element;
+export default Menu;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/components/NavigationButton.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/components/NavigationButton.d.ts
new file mode 100644
index 0000000000..8990522066
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/common/components/NavigationButton.d.ts
@@ -0,0 +1,10 @@
+import React from 'react';
+interface Props {
+    label: string;
+    onClick: () => void;
+    variant: any;
+    sx?: any;
+    width?: string;
+}
+declare const NavigationButton: ({ label, onClick, variant, sx, width, ...props }: Props) => React.JSX.Element;
+export default NavigationButton;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/components/PortfolioHeader.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/components/PortfolioHeader.d.ts
new file mode 100644
index 0000000000..9eb5a838d2
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/common/components/PortfolioHeader.d.ts
@@ -0,0 +1,9 @@
+import { BalanceType } from '../types/index';
+interface Props {
+    balance: BalanceType;
+    setKeyword: (keyword: string) => void;
+    isLoading: boolean;
+    tooltipTitle: JSX.Element;
+}
+declare const PortfolioHeader: ({ balance, setKeyword, isLoading, tooltipTitle }: Props) => JSX.Element;
+export default PortfolioHeader;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/components/PortfolioMenu.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/components/PortfolioMenu.d.ts
new file mode 100644
index 0000000000..f8dfafe791
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/common/components/PortfolioMenu.d.ts
@@ -0,0 +1,6 @@
+interface Props {
+    onItemClick: (itemId: string) => void;
+    isActiveItem: (itemId: string) => boolean;
+}
+declare const PortfolioMenu: (props: Props) => JSX.Element;
+export default PortfolioMenu;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/components/SortableTableHead.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/components/SortableTableHead.d.ts
new file mode 100644
index 0000000000..acbd51a388
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/common/components/SortableTableHead.d.ts
@@ -0,0 +1,9 @@
+import { IHeadCell } from '../types/table';
+interface Props {
+    headCells: IHeadCell[];
+    order: string | null;
+    orderBy: string | null;
+    onRequestSort: (id: string) => void;
+}
+declare const SortableTableHead: ({ headCells, order, orderBy, onRequestSort }: Props) => JSX.Element;
+export default SortableTableHead;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/components/Table.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/components/Table.d.ts
new file mode 100644
index 0000000000..a9963633ed
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/common/components/Table.d.ts
@@ -0,0 +1,15 @@
+import { ReactElement, ReactNode } from 'react';
+import { IHeadCell } from '../types/table';
+interface Props {
+    name: string;
+    headCells: IHeadCell[];
+    data: any[];
+    order: string | null;
+    orderBy: string | null;
+    handleRequestSort: (id: string) => void;
+    isLoading: boolean;
+    TableRowSkeleton: ReactElement;
+    children: ReactNode;
+}
+declare const Table: ({ name, headCells, data, order, orderBy, handleRequestSort, isLoading, TableRowSkeleton, children, }: Props) => JSX.Element;
+export default Table;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/components/WelcomeBanner.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/components/WelcomeBanner.d.ts
new file mode 100644
index 0000000000..9fd930327b
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/common/components/WelcomeBanner.d.ts
@@ -0,0 +1,3 @@
+import React from 'react';
+declare const WelcomeBanner: () => React.JSX.Element;
+export default WelcomeBanner;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/helpers/formatHelper.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/helpers/formatHelper.d.ts
new file mode 100644
index 0000000000..3fbf20e0f9
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/common/helpers/formatHelper.d.ts
@@ -0,0 +1 @@
+export declare const formatNumber: (numb: number, fractionDigits?: number) => string;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/helpers/mockHelper.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/helpers/mockHelper.d.ts
new file mode 100644
index 0000000000..ddbbfa25bd
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/common/helpers/mockHelper.d.ts
@@ -0,0 +1,14 @@
+export declare const now: Date;
+export declare const start24HoursAgo: number;
+export declare const start1WeekAgo: number;
+export declare const start1MonthAgo: number;
+export declare const start6MonthAgo: number;
+export declare const start1YearAgo: number;
+type TimePeriodType = '24H' | '1W' | '1M' | '6M' | '1Y';
+export declare const getRandomTime: (startDate: number) => string;
+export declare const createChartData: (timePeriod: TimePeriodType) => {
+    time: string;
+    value: number;
+    fiatValue: number;
+}[];
+export {};
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/helpers/transactionHelper.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/helpers/transactionHelper.d.ts
new file mode 100644
index 0000000000..7a4ee7c255
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/common/helpers/transactionHelper.d.ts
@@ -0,0 +1 @@
+export declare const mapStrings: (arr: any[], strings: any) => any[];
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useChart.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useChart.d.ts
new file mode 100644
index 0000000000..d16aad2a81
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useChart.d.ts
@@ -0,0 +1,37 @@
+import React from 'react';
+import { IChartData } from '../types/chart';
+import { ITabButtonProps } from '../types';
+declare const useChart: (data: IChartData) => {
+    CustomYAxisTick: ({ x, y, payload, }: {
+        x: number;
+        y: number;
+        payload: {
+            value: number;
+        };
+    }) => React.SVGProps<SVGTextElement>;
+    CustomActiveDot: ({ cx, cy, payload, index, dataLength, chartBottom, rectWidth, rectHeight, }: {
+        cx: number;
+        cy: number;
+        payload: {
+            time: string;
+        };
+        index: number;
+        dataLength: number;
+        chartBottom: number;
+        rectWidth: number;
+        rectHeight: number;
+    }) => JSX.Element | React.ReactElement;
+    handleChoosePeriod: (id: string) => void;
+    handleMouseMove: (props: any) => void;
+    handleMouseDown: (props: any) => void;
+    handleMouseUp: () => void;
+    periodButtonProps: ITabButtonProps[];
+    detailInfo: {
+        value: number;
+        fiatValue: number;
+    };
+    minValue: number;
+    maxValue: number;
+    activePeriodId: string | number;
+};
+export default useChart;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useNavigateTo.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useNavigateTo.d.ts
new file mode 100644
index 0000000000..9d08d20bb3
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useNavigateTo.d.ts
@@ -0,0 +1,8 @@
+export declare const useNavigateTo: () => {
+    portfolio: () => void;
+    portfolioDapps: () => void;
+    portfolioDetail: (tokenId: string) => void;
+    swapPage: () => void;
+    sendPage: () => void;
+    receivePage: () => void;
+};
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useStrings.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useStrings.d.ts
new file mode 100644
index 0000000000..f10cfb386d
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useStrings.d.ts
@@ -0,0 +1,81 @@
+export declare const messages: any;
+export declare const useStrings: () => {
+    mainHeaderText: any;
+    detailHeaderText: any;
+    menuWallet: any;
+    menuDapps: any;
+    dapps: any;
+    copyToClipboard: any;
+    copied: any;
+    soonAvailable: any;
+    noResultsForThisSearch: any;
+    search: any;
+    balancePerformance: any;
+    balanceChange: any;
+    tokenPriceChange: any;
+    in24hours: any;
+    backToPortfolio: any;
+    swap: any;
+    send: any;
+    receive: any;
+    liquidityPool: any;
+    openOrders: any;
+    lendAndBorrow: any;
+    balance: any;
+    marketPrice: any;
+    description: any;
+    website: any;
+    policyId: any;
+    fingerprint: any;
+    detailsOn: any;
+    overview: any;
+    performance: any;
+    marketData: any;
+    tokenPrice: any;
+    marketCap: any;
+    '24hVolumn': any;
+    rank: any;
+    circulating: any;
+    totalSupply: any;
+    maxSupply: any;
+    allTimeHigh: any;
+    allTimeLow: any;
+    name: any;
+    price: any;
+    '24H': any;
+    '1W': any;
+    '1M': any;
+    '6M': any;
+    '1Y': any;
+    ALL: any;
+    portfolio: any;
+    totalAmount: any;
+    transactionHistory: any;
+    transactionType: any;
+    status: any;
+    fee: any;
+    amount: any;
+    today: any;
+    yesterday: any;
+    sent: any;
+    received: any;
+    transactionError: any;
+    rewardWithdraw: any;
+    stakeDelegate: any;
+    low: any;
+    high: any;
+    failed: any;
+    assets: any;
+    tokenPair: any;
+    dex: any;
+    firstTokenValue: any;
+    secondTokenValue: any;
+    lpTokens: any;
+    totalValue: any;
+    pair: any;
+    assetPrice: any;
+    assetAmount: any;
+    transactionId: any;
+    welcomeBannerTitle: any;
+    welcomeBannerDesc: any;
+};
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useTableSort.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useTableSort.d.ts
new file mode 100644
index 0000000000..eae4e6667b
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useTableSort.d.ts
@@ -0,0 +1,17 @@
+import { IHeadCell } from '../types/table';
+export interface ISortState {
+    order: string | null;
+    orderBy: string | null;
+}
+interface Props {
+    order: string | null;
+    orderBy: string | null;
+    setSortState: React.Dispatch<React.SetStateAction<ISortState>>;
+    headCells: IHeadCell[];
+    data: any[];
+}
+declare const useTableSort: ({ order, orderBy, setSortState, headCells, data }: Props) => {
+    getSortedData: (arr: any[]) => any[];
+    handleRequestSort: (property: string) => void;
+};
+export default useTableSort;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/mockData.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/mockData.d.ts
new file mode 100644
index 0000000000..d739d47c4d
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/common/mockData.d.ts
@@ -0,0 +1,17 @@
+import { BalanceType, LiquidityItemType, OrderItemType, TokenType } from './types';
+import { TransactionItemType } from './types/transaction';
+declare const mockData: {
+    common: {
+        walletBalance: BalanceType;
+        dappsBalance: BalanceType;
+    };
+    wallet: {
+        tokenList: TokenType[];
+    };
+    dapps: {
+        liquidityList: LiquidityItemType[];
+        orderList: OrderItemType[];
+    };
+    transactionHistory: TransactionItemType[];
+};
+export default mockData;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/types/chart.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/types/chart.d.ts
new file mode 100644
index 0000000000..19cdfd91b0
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/common/types/chart.d.ts
@@ -0,0 +1,13 @@
+export interface IChartDataItem {
+    time: string;
+    value: number;
+    fiatValue: number;
+}
+export interface IChartData {
+    start24HoursAgo: IChartDataItem[];
+    start1WeekAgo: IChartDataItem[];
+    start1MonthAgo: IChartDataItem[];
+    start6MonthAgo: IChartDataItem[];
+    start1YearAgo: IChartDataItem[];
+    ALL: IChartDataItem[];
+}
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/types/index.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/types/index.d.ts
new file mode 100644
index 0000000000..6713641f2f
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/common/types/index.d.ts
@@ -0,0 +1,81 @@
+import { IChartData } from './chart';
+export interface ITabButtonProps {
+    id: string | number;
+    label: string;
+    active: boolean;
+}
+export interface SubMenuOption {
+    label: string;
+    route: string;
+    className: string;
+}
+export type BalanceType = {
+    ada: number;
+    usd: number;
+    percents: number;
+    amount: number;
+};
+export interface IDetailOverview {
+    description: string;
+    website: string;
+    detailOn: string;
+    policyId: string;
+    fingerprint: string;
+}
+export interface IDetailPerformanceItem {
+    value: number | string | null;
+}
+export type TokenType = {
+    name: string;
+    id: string;
+    price: number;
+    portfolioPercents: number;
+    '24h': number;
+    '1W': number;
+    '1M': number;
+    totalAmount: number;
+    totalAmountUsd: number;
+    overview: IDetailOverview;
+    performance: IDetailPerformanceItem[];
+    chartData: IChartData;
+};
+export type LiquidityItemType = {
+    id: number;
+    tokenPair: string;
+    DEX: string;
+    DEXLink: string;
+    firstToken: {
+        name: string;
+        id: string;
+    };
+    secondToken: {
+        name: string;
+        id: string;
+    };
+    lpTokens: number;
+    totalValue: number;
+    totalValueUsd: number;
+    firstTokenValue: number;
+    firstTokenValueUsd: number;
+    secondTokenValue: number;
+    secondTokenValueUsd: number;
+};
+export type OrderItemType = {
+    id: number;
+    pair: string;
+    firstToken: {
+        name: string;
+        id: string;
+    };
+    secondToken: {
+        name: string;
+        id: string;
+    };
+    DEX: string;
+    DEXLink: string;
+    assetPrice: number;
+    assetAmount: number;
+    transactionId: string;
+    totalValue: number;
+    totalValueUsd: number;
+};
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/types/table.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/types/table.d.ts
new file mode 100644
index 0000000000..2f3eca0bf2
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/common/types/table.d.ts
@@ -0,0 +1,10 @@
+import { TableCellProps } from '@mui/material';
+export type TableSortType = 'character' | 'numeric';
+export interface IHeadCell {
+    id: string;
+    label: string;
+    align: TableCellProps['align'];
+    sortType?: TableSortType;
+    disabledSort?: boolean;
+    isPadding?: boolean;
+}
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/types/transaction.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/types/transaction.d.ts
new file mode 100644
index 0000000000..867ddd435e
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/common/types/transaction.d.ts
@@ -0,0 +1,22 @@
+export declare const HistoryItemType: Readonly<{
+    SENT: 1;
+    RECEIVED: 2;
+    ERROR: 3;
+    WITHDRAW: 4;
+    DELEGATE: 5;
+}>;
+export declare const HistoryItemStatus: Readonly<{
+    LOW: "Low";
+    HIGH: "High";
+    FAILED: "Failed";
+}>;
+export type TransactionItemType = {
+    type: typeof HistoryItemType[keyof typeof HistoryItemType];
+    status: typeof HistoryItemStatus[keyof typeof HistoryItemStatus];
+    time: string;
+    feeValue?: number;
+    feeValueUsd?: number;
+    amountTotal: number;
+    amountTotalUsd: number;
+    amountAsset: number | string;
+};
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/module/PortfolioContextProvider.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/module/PortfolioContextProvider.d.ts
new file mode 100644
index 0000000000..36a605bfbe
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/module/PortfolioContextProvider.d.ts
@@ -0,0 +1,22 @@
+import * as React from 'react';
+import { CurrencyType } from './state';
+type PortfolioProviderProps = {
+    children: React.ReactNode;
+    settingFiatPairUnit: {
+        currency: CurrencyType;
+        enabled: boolean;
+    };
+    initialState: {
+        unitOfAccount: CurrencyType;
+    };
+};
+export declare const PortfolioContextProvider: ({ children, settingFiatPairUnit, initialState, }: PortfolioProviderProps) => React.JSX.Element;
+export declare const usePortfolio: () => {
+    changeUnitOfAccount: (currency: CurrencyType) => void;
+    unitOfAccount: CurrencyType;
+    settingFiatPairUnit: {
+        currency: CurrencyType;
+        enabled: boolean;
+    };
+};
+export {};
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/module/state.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/module/state.d.ts
new file mode 100644
index 0000000000..96e54a8121
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/module/state.d.ts
@@ -0,0 +1,21 @@
+export type CurrencyType = 'ADA' | 'USD' | 'BRL' | 'ETH' | 'BTC' | 'KRW' | 'CNY' | 'EUR' | 'JPY' | null;
+export type PortfolioActions = {
+    changeUnitOfAccount: (currency: CurrencyType) => void;
+};
+export declare const PortfolioActionType: Readonly<{
+    changeUnitOfAccount: "changeUnitOfAccount";
+}>;
+export type PortfolioAction = {
+    type: typeof PortfolioActionType.changeUnitOfAccount;
+    unitOfAccount: CurrencyType;
+};
+export type PortfolioState = {
+    unitOfAccount: CurrencyType;
+    settingFiatPairUnit: {
+        currency: CurrencyType;
+        enabled: boolean;
+    };
+};
+export declare const defaultPortfolioState: PortfolioState;
+export declare const defaultPortfolioActions: PortfolioActions;
+export declare const PortfolioReducer: (state: PortfolioState, action: PortfolioAction) => PortfolioState;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/LendAndBorrow.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/LendAndBorrow.d.ts
new file mode 100644
index 0000000000..e5f9c3e7b7
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/LendAndBorrow.d.ts
@@ -0,0 +1,3 @@
+import React from 'react';
+declare const LendAndBorrow: () => React.JSX.Element;
+export default LendAndBorrow;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/LiquidityTable.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/LiquidityTable.d.ts
new file mode 100644
index 0000000000..6014260411
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/LiquidityTable.d.ts
@@ -0,0 +1,7 @@
+import { LiquidityItemType } from '../../common/types/index';
+interface Props {
+    data: LiquidityItemType[];
+    isLoading: boolean;
+}
+declare const LiquidityTable: ({ data, isLoading }: Props) => JSX.Element;
+export default LiquidityTable;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/OrderTable.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/OrderTable.d.ts
new file mode 100644
index 0000000000..8332b3d997
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/OrderTable.d.ts
@@ -0,0 +1,7 @@
+import { OrderItemType } from '../../common/types/index';
+interface Props {
+    data: OrderItemType[];
+    isLoading: boolean;
+}
+declare const OrderTable: ({ data, isLoading }: Props) => JSX.Element;
+export default OrderTable;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/PortfolioDapps.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/PortfolioDapps.d.ts
new file mode 100644
index 0000000000..3173e02096
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/PortfolioDapps.d.ts
@@ -0,0 +1,10 @@
+import React from 'react';
+import { LiquidityItemType, OrderItemType } from '../../common/types/index';
+interface Props {
+    data: {
+        liquidityList: LiquidityItemType[];
+        orderList: OrderItemType[];
+    };
+}
+declare const PortfolioDapps: ({ data }: Props) => React.JSX.Element;
+export default PortfolioDapps;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetailChart.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetailChart.d.ts
new file mode 100644
index 0000000000..4f30c9bb63
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetailChart.d.ts
@@ -0,0 +1,8 @@
+import { TokenType } from '../../common/types/index';
+interface Props {
+    isLoading: boolean;
+    tokenInfo: TokenType;
+    isAda: boolean;
+}
+declare const TokenDetailChart: ({ isLoading, tokenInfo, isAda }: Props) => JSX.Element;
+export default TokenDetailChart;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetailOverview.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetailOverview.d.ts
new file mode 100644
index 0000000000..2ffe1ea80f
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetailOverview.d.ts
@@ -0,0 +1,8 @@
+import { TokenType } from '../../common/types/index';
+interface Props {
+    tokenInfo: TokenType;
+    isLoading: boolean;
+    isAda: boolean;
+}
+declare const TokenDetailOverview: ({ tokenInfo, isLoading, isAda }: Props) => JSX.Element;
+export default TokenDetailOverview;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetailPerformance.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetailPerformance.d.ts
new file mode 100644
index 0000000000..b417adfce6
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetailPerformance.d.ts
@@ -0,0 +1,7 @@
+import { TokenType } from '../../common/types/index';
+interface Props {
+    tokenInfo: TokenType;
+    isLoading: boolean;
+}
+declare const TokenDetailPerformance: ({ tokenInfo, isLoading }: Props) => JSX.Element;
+export default TokenDetailPerformance;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetails.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetails.d.ts
new file mode 100644
index 0000000000..acd5cd44cd
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetails.d.ts
@@ -0,0 +1,6 @@
+import { TokenType } from '../../common/types/index';
+interface Props {
+    tokenInfo: TokenType;
+}
+declare const TokenDetails: ({ tokenInfo }: Props) => JSX.Element;
+export default TokenDetails;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TransactionTable.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TransactionTable.d.ts
new file mode 100644
index 0000000000..7724591112
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TransactionTable.d.ts
@@ -0,0 +1,6 @@
+import { TransactionItemType } from '../../common/types/transaction';
+declare const TransactionTable: ({ history, tokenName }: {
+    history: TransactionItemType[];
+    tokenName: string;
+}) => JSX.Element;
+export default TransactionTable;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/useCases/Wallet/PortfolioWallet.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/useCases/Wallet/PortfolioWallet.d.ts
new file mode 100644
index 0000000000..56db7cf213
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/useCases/Wallet/PortfolioWallet.d.ts
@@ -0,0 +1,6 @@
+import { TokenType } from '../../common/types/index';
+interface Props {
+    data: TokenType[];
+}
+declare const PortfolioWallet: ({ data }: Props) => JSX.Element;
+export default PortfolioWallet;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/useCases/Wallet/StatsTable.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/useCases/Wallet/StatsTable.d.ts
new file mode 100644
index 0000000000..9ae4d6a5ac
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/features/portfolio/useCases/Wallet/StatsTable.d.ts
@@ -0,0 +1,7 @@
+import { TokenType } from '../../common/types/index';
+interface Props {
+    data: TokenType[];
+    isLoading: boolean;
+}
+declare const StatsTable: ({ data, isLoading }: Props) => JSX.Element;
+export default StatsTable;
diff --git a/packages/yoroi-extension/app/UI/pages/Governance/GovernanceDelegationFormPage.d.ts b/packages/yoroi-extension/app/UI/pages/Governance/GovernanceDelegationFormPage.d.ts
new file mode 100644
index 0000000000..35725ca1c3
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/pages/Governance/GovernanceDelegationFormPage.d.ts
@@ -0,0 +1,7 @@
+type Props = {
+    stores: any;
+    actions: any;
+    children?: any;
+};
+declare const GovernanceDelegationFormPage: (props: Props) => any;
+export default GovernanceDelegationFormPage;
diff --git a/packages/yoroi-extension/app/UI/pages/Governance/GovernanceStatusPage.d.ts b/packages/yoroi-extension/app/UI/pages/Governance/GovernanceStatusPage.d.ts
new file mode 100644
index 0000000000..bff725951d
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/pages/Governance/GovernanceStatusPage.d.ts
@@ -0,0 +1,7 @@
+type Props = {
+    stores: any;
+    actions: any;
+    children?: any;
+};
+declare const GovernanceStatusPage: (props: Props) => any;
+export default GovernanceStatusPage;
diff --git a/packages/yoroi-extension/app/UI/pages/Governance/GovernanceTransactionFailedPage.d.ts b/packages/yoroi-extension/app/UI/pages/Governance/GovernanceTransactionFailedPage.d.ts
new file mode 100644
index 0000000000..9cce5d99a8
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/pages/Governance/GovernanceTransactionFailedPage.d.ts
@@ -0,0 +1,7 @@
+type Props = {
+    stores: any;
+    actions: any;
+    children?: any;
+};
+declare const GovernanceTransactionFailedPage: (props: Props) => any;
+export default GovernanceTransactionFailedPage;
diff --git a/packages/yoroi-extension/app/UI/pages/Governance/GovernanceTransactionSubmittedPage.d.ts b/packages/yoroi-extension/app/UI/pages/Governance/GovernanceTransactionSubmittedPage.d.ts
new file mode 100644
index 0000000000..91f2db9441
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/pages/Governance/GovernanceTransactionSubmittedPage.d.ts
@@ -0,0 +1,7 @@
+type Props = {
+    stores: any;
+    actions: any;
+    children?: any;
+};
+declare const GovernanceTransactionSubmittedPage: (props: Props) => any;
+export default GovernanceTransactionSubmittedPage;
diff --git a/packages/yoroi-extension/app/UI/pages/Governance/layout.d.ts b/packages/yoroi-extension/app/UI/pages/Governance/layout.d.ts
new file mode 100644
index 0000000000..2bab94c8d5
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/pages/Governance/layout.d.ts
@@ -0,0 +1,8 @@
+import React from 'react';
+type Props = {
+    stores: any;
+    actions: any;
+    children: React.ReactNode;
+};
+declare const GovernanceLayout: ({ stores, actions, children }: Props) => any;
+export default GovernanceLayout;
diff --git a/packages/yoroi-extension/app/UI/pages/portfolio/PortfolioDappsPage.d.ts b/packages/yoroi-extension/app/UI/pages/portfolio/PortfolioDappsPage.d.ts
new file mode 100644
index 0000000000..eb3ed23d01
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/pages/portfolio/PortfolioDappsPage.d.ts
@@ -0,0 +1,7 @@
+import React from 'react';
+type Props = {
+    stores: any;
+    actions: any;
+};
+declare const PortfolioDappsPage: (props: Props) => React.JSX.Element;
+export default PortfolioDappsPage;
diff --git a/packages/yoroi-extension/app/UI/pages/portfolio/PortfolioDetailPage.d.ts b/packages/yoroi-extension/app/UI/pages/portfolio/PortfolioDetailPage.d.ts
new file mode 100644
index 0000000000..63025e24fb
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/pages/portfolio/PortfolioDetailPage.d.ts
@@ -0,0 +1,8 @@
+import React from 'react';
+type Props = {
+    stores: any;
+    actions: any;
+    match: any;
+};
+declare const PortfolioDetailPage: ({ match, ...props }: Props) => React.JSX.Element;
+export default PortfolioDetailPage;
diff --git a/packages/yoroi-extension/app/UI/pages/portfolio/PortfolioPage.d.ts b/packages/yoroi-extension/app/UI/pages/portfolio/PortfolioPage.d.ts
new file mode 100644
index 0000000000..fda997444f
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/pages/portfolio/PortfolioPage.d.ts
@@ -0,0 +1,7 @@
+import React from 'react';
+type Props = {
+    stores: any;
+    actions: any;
+};
+declare const PortfolioPage: (props: Props) => React.JSX.Element;
+export default PortfolioPage;
diff --git a/packages/yoroi-extension/app/UI/pages/portfolio/layout.d.ts b/packages/yoroi-extension/app/UI/pages/portfolio/layout.d.ts
new file mode 100644
index 0000000000..956314ac08
--- /dev/null
+++ b/packages/yoroi-extension/app/UI/pages/portfolio/layout.d.ts
@@ -0,0 +1,8 @@
+import { ReactNode } from 'react';
+type Props = {
+    stores: any;
+    actions: any;
+    children: ReactNode;
+};
+declare const PortfolioLayout: ({ stores, actions, children }: Props) => JSX.Element;
+export default PortfolioLayout;
diff --git a/packages/yoroi-extension/app/UI/types/index.d.ts b/packages/yoroi-extension/app/UI/types/index.d.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/yoroi-extension/app/api/ada/lib/test-config.forTests.js b/packages/yoroi-extension/app/api/ada/lib/test-config.forTests.js
index cbf3bf5e6b..57907ca27d 100644
--- a/packages/yoroi-extension/app/api/ada/lib/test-config.forTests.js
+++ b/packages/yoroi-extension/app/api/ada/lib/test-config.forTests.js
@@ -23,7 +23,8 @@ const CONFIG: ConfigType = {
   },
   bring: {
     baseUrl: '',
-    identifier: ''
+    identifier: '',
+    apiEndpoint: ''
   }
 };
 
diff --git a/packages/yoroi-extension/app/environment.js b/packages/yoroi-extension/app/environment.js
index fd23e6820e..0f96cca08e 100644
--- a/packages/yoroi-extension/app/environment.js
+++ b/packages/yoroi-extension/app/environment.js
@@ -42,7 +42,8 @@ export const environment = ((
     getServerStatusRefreshInterval: () => CONFIG.app.serverStatusRefreshInterval,
     userAgentInfo,
     bringBaseUrl: CONFIG.bring.baseUrl,
-    bringIdentifier: CONFIG.bring.identifier
+    bringIdentifier: CONFIG.bring.identifier,
+    bringApiEndpoint: CONFIG.bring.apiEndpoint
   }
 ): {
   getNetworkName: void => Network,
@@ -62,6 +63,7 @@ export const environment = ((
                               isLight: boolean,
                                 bringBaseUrl: string,
                                   bringIdentifier: string,
+                                    bringApiEndpoint: string,
     ...
 });
 
diff --git a/packages/yoroi-extension/chrome/content-scripts/bringInject.js b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
index 1c2ed5f2c2..b5e3fdedd5 100644
--- a/packages/yoroi-extension/chrome/content-scripts/bringInject.js
+++ b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
@@ -262,29 +262,3 @@ function listenForActiveWalletOpen(callback) {
     text: 'upper'
   });
 })().catch(console.error);
-
-
-async function example() {
-  try {
-    const addr = await getFirstAddress();
-    console.log('address', addr);
-  } catch (error) {
-    if (error.message === 'no wallet') {
-      console.log('no wallet');
-      if (window.confirm('no wallet, click OK to create')) {
-        popUpWalletCreation();
-      }
-    } else {
-      throw error;
-    }
-  }
-
-  const theme = await getTheme();
-  console.log('theme:', theme);
-
-  listenForActiveWalletOpen((walletId: ?number) => {
-    console.log('active wallet ID is:', walletId);
-  });
-}
-
-// example().catch(console.error);
diff --git a/packages/yoroi-extension/chrome/extension/background/index.js b/packages/yoroi-extension/chrome/extension/background/index.js
index 0938467670..1d2c4ee468 100644
--- a/packages/yoroi-extension/chrome/extension/background/index.js
+++ b/packages/yoroi-extension/chrome/extension/background/index.js
@@ -13,9 +13,9 @@ declare var chrome;
 */
 
 bringInitBackground({
-  identifier: 'G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8',
-  apiEndpoint: 'sandbox',
-  cashbackPagePath: '/wallet/cashback'
+  identifier: environment.bringIdentifier,
+  apiEndpoint: environment.bringApiEndpoint,
+  cashbackPagePath: '/main_window.html#/cashback'
 });
 
 const onYoroiIconClicked = () => {
diff --git a/packages/yoroi-extension/config/config-types.js b/packages/yoroi-extension/config/config-types.js
index 1b152901fd..028050364e 100644
--- a/packages/yoroi-extension/config/config-types.js
+++ b/packages/yoroi-extension/config/config-types.js
@@ -9,8 +9,9 @@ export type ConfigType = {|
 
 export type BringConfigType = {|
   baseUrl: string,
-    identifier: string
-      |}
+    identifier: string,
+      apiEndpoint: string
+        |}
 
 export type PoolExplorerConfigType = {|
   simpleTemplate: string,
diff --git a/packages/yoroi-extension/config/development.json b/packages/yoroi-extension/config/development.json
index 9c342b2613..bba392790b 100644
--- a/packages/yoroi-extension/config/development.json
+++ b/packages/yoroi-extension/config/development.json
@@ -20,6 +20,7 @@
   },
   "bring": {
     "baseUrl": "https://sandbox-api.bringweb3.io/v1/extension/",
-    "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8"
+    "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8",
+    "apiEndpoint": "sandbox"
   }
 }
\ No newline at end of file
diff --git a/packages/yoroi-extension/config/mainnet.json b/packages/yoroi-extension/config/mainnet.json
index eef00087f2..0cab2e14f7 100644
--- a/packages/yoroi-extension/config/mainnet.json
+++ b/packages/yoroi-extension/config/mainnet.json
@@ -18,7 +18,8 @@
     "pubKeyMaster": "ab9e4f1c4d996a0e9cdda8546bf5ee1dd8397fd7ab287c331ff171c7e4e0e9e2"
   },
   "bring": {
-    "baseUrl": "https://sandbox-api.bringweb3.io/v1/extension/",
-    "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8"
+    "baseUrl": "https://api.bringweb3.io/v1/extension/",
+    "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8",
+    "apiEndpoint": "prod"
   }
 }
\ No newline at end of file
diff --git a/packages/yoroi-extension/config/test.json b/packages/yoroi-extension/config/test.json
index f3460c8203..81b2e13ff2 100644
--- a/packages/yoroi-extension/config/test.json
+++ b/packages/yoroi-extension/config/test.json
@@ -20,6 +20,7 @@
   },
   "bring": {
     "baseUrl": "https://sandbox-api.bringweb3.io/v1/extension/check/portal",
-    "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8"
+    "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8",
+    "apiEndpoint": "sandbox"
   }
 }
\ No newline at end of file
diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index 7de4b9e948..d495ff56a3 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "yoroi",
-  "version": "5.3.131",
+  "version": "5.3.111",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "yoroi",
-      "version": "5.3.131",
+      "version": "5.3.111",
       "license": "MIT",
       "dependencies": {
         "@amplitude/analytics-browser": "^2.1.3",
@@ -16,12 +16,12 @@
         "@emotion/react": "^11.4.1",
         "@emotion/styled": "^11.3.0",
         "@emurgo/cardano-message-signing-browser": "1.0.1",
-        "@emurgo/cardano-serialization-lib-browser": "12.1.0",
+        "@emurgo/cardano-serialization-lib-browser": "12.0.1",
         "@emurgo/cip14-js": "2.0.0",
         "@emurgo/cip4-js": "1.0.5",
-        "@emurgo/cross-csl-browser": "5.1.1",
+        "@emurgo/cross-csl-browser": "5.0.1",
         "@emurgo/yoroi-eutxo-txs": "0.0.2-alpha.8",
-        "@emurgo/yoroi-lib": "1.2.2",
+        "@emurgo/yoroi-lib": "1.2.0",
         "@ledgerhq/hw-transport-u2f": "5.36.0-deprecated",
         "@ledgerhq/hw-transport-webauthn": "5.36.0-deprecated",
         "@ledgerhq/hw-transport-webhid": "5.51.1",
@@ -113,8 +113,8 @@
         "@babel/runtime": "7.12.18",
         "@babel/runtime-corejs3": "7.12.18",
         "@emurgo/cardano-message-signing-nodejs": "1.0.1",
-        "@emurgo/cardano-serialization-lib-nodejs": "12.1.0",
-        "@emurgo/cross-csl-nodejs": "5.1.1",
+        "@emurgo/cardano-serialization-lib-nodejs": "12.0.1",
+        "@emurgo/cross-csl-nodejs": "5.0.1",
         "@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
         "@types/chrome": "^0.0.268",
         "@types/react-intl": "^3.0.0",
@@ -2441,14 +2441,14 @@
       "dev": true
     },
     "node_modules/@emurgo/cardano-serialization-lib-browser": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-browser/-/cardano-serialization-lib-browser-12.1.0.tgz",
-      "integrity": "sha512-9Ka4cEV0I0Yk0msCNa4dv3M2XbOaUGXgGMzU5XtPIggP1V4pXmdfn0LJA2AAJAenvZhQzeX8uRzryyFioPF9Gw=="
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-browser/-/cardano-serialization-lib-browser-12.0.1.tgz",
+      "integrity": "sha512-3Hoi7pzGyTAjtd7CXmUiUG9i+TOv8QMlSU/KgTwPeZkUFfdNT9syt572FCaM4fBeagiR3LRhQeNE5TMUo07VBA=="
     },
     "node_modules/@emurgo/cardano-serialization-lib-nodejs": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-12.1.0.tgz",
-      "integrity": "sha512-S2zu5bi13GNhr8/V7PpalP7VPsUIRjRKAPLMVRFpnfWu8ruD5CHAAa7Ka7+SMj4M09YLKQM+Vmx7b94v6mgCXQ==",
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-12.0.1.tgz",
+      "integrity": "sha512-QWvMgBHgoSAGbfAtKIeNV1wpRBzivbboeUjF8cBOGl/TS9OSYmLEVhNacbPoFqT1iqMhVRlAYoyXXTW/RmNC0w==",
       "dev": true
     },
     "node_modules/@emurgo/cip14-js": {
@@ -2515,18 +2515,96 @@
       "integrity": "sha512-C40jQ3NzfkP53NsO8kEOFd79p4b9kDXQMwgiY1z8ZwrDZgUyom0AHwGegF4Dm99L+YoYhuaB0ceerUcXmqr1rQ=="
     },
     "node_modules/@emurgo/cross-csl-browser": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@emurgo/cross-csl-browser/-/cross-csl-browser-5.1.1.tgz",
-      "integrity": "sha512-UmTRX4diEKZ2ZYfbtJzGrR0uCqpF7XyOgrYWKUERQL7ntWW6EHxLuR73XzezhN+j5jaAx7oW4bCPOHLp0ZhwGw==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@emurgo/cross-csl-browser/-/cross-csl-browser-5.0.1.tgz",
+      "integrity": "sha512-ASuqEVbrOsjOhDkk99GCR+ymrCiUjGAgHCx2Kvsk8aGyHeG38exRXzAxssJiq5TvZjxjJRfBe8Ors3ikrWtIQA==",
       "dependencies": {
-        "@emurgo/cardano-serialization-lib-browser": "12.1.0",
-        "@emurgo/cross-csl-core": "5.1.1"
+        "@emurgo/cardano-serialization-lib-browser": "12.0.1",
+        "@emurgo/cross-csl-core": "5.0.1"
       }
     },
+    "node_modules/@emurgo/cross-csl-browser/node_modules/@cardano-foundation/ledgerjs-hw-app-cardano": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@cardano-foundation/ledgerjs-hw-app-cardano/-/ledgerjs-hw-app-cardano-5.1.0.tgz",
+      "integrity": "sha512-ucuz/XbS/0ZD0Bal/GI/kiTm9jDIl8J+A7ypEqcAcBDGicFsyWmtPotOTwuDovTsiM8+eA/5OGTFX0oRqzxstQ==",
+      "dependencies": {
+        "@ledgerhq/hw-transport": "^5.12.0",
+        "@types/ledgerhq__hw-transport": "^4.21.3",
+        "base-x": "^3.0.5",
+        "bech32": "^1.1.4",
+        "blake2": "^4.0.2",
+        "int64-buffer": "^1.0.1"
+      }
+    },
+    "node_modules/@emurgo/cross-csl-browser/node_modules/@cardano-foundation/ledgerjs-hw-app-cardano/node_modules/bech32": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz",
+      "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ=="
+    },
     "node_modules/@emurgo/cross-csl-browser/node_modules/@emurgo/cross-csl-core": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@emurgo/cross-csl-core/-/cross-csl-core-5.1.1.tgz",
-      "integrity": "sha512-UYzf7kR/jY01gAyTkhz2OwirdrVCh/e5I2O/P8MxzdFvtLU88XLY8T6KWgroJ4cQ3XoFCKtSJDFOxcN01nteRg=="
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@emurgo/cross-csl-core/-/cross-csl-core-5.0.1.tgz",
+      "integrity": "sha512-PlNsW3GjqlJ7mTrHqY+M6mGkLnWh++6PAok1rdJwUP7bYS24PE2Fm4JeO1uK0dtv9mbpVLlXyjybH+HSRV7a0Q==",
+      "dependencies": {
+        "@cardano-foundation/ledgerjs-hw-app-cardano": "^5.0.0",
+        "@types/mocha": "^9.1.1",
+        "axios": "^0.24.0",
+        "bech32": "^2.0.0",
+        "bignumber.js": "^9.0.1",
+        "blake2b": "^2.1.4",
+        "hash-wasm": "^4.9.0",
+        "mocha": "^10.0.0"
+      }
+    },
+    "node_modules/@emurgo/cross-csl-browser/node_modules/@ledgerhq/devices": {
+      "version": "5.51.1",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-5.51.1.tgz",
+      "integrity": "sha512-4w+P0VkbjzEXC7kv8T1GJ/9AVaP9I6uasMZ/JcdwZBS3qwvKo5A5z9uGhP5c7TvItzcmPb44b5Mw2kT+WjUuAA==",
+      "dependencies": {
+        "@ledgerhq/errors": "^5.50.0",
+        "@ledgerhq/logs": "^5.50.0",
+        "rxjs": "6",
+        "semver": "^7.3.5"
+      }
+    },
+    "node_modules/@emurgo/cross-csl-browser/node_modules/@ledgerhq/errors": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-5.50.0.tgz",
+      "integrity": "sha512-gu6aJ/BHuRlpU7kgVpy2vcYk6atjB4iauP2ymF7Gk0ez0Y/6VSMVSJvubeEQN+IV60+OBK0JgeIZG7OiHaw8ow=="
+    },
+    "node_modules/@emurgo/cross-csl-browser/node_modules/@ledgerhq/hw-transport": {
+      "version": "5.51.1",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-5.51.1.tgz",
+      "integrity": "sha512-6wDYdbWrw9VwHIcoDnqWBaDFyviyjZWv6H9vz9Vyhe4Qd7TIFmbTl/eWs6hZvtZBza9K8y7zD8ChHwRI4s9tSw==",
+      "dependencies": {
+        "@ledgerhq/devices": "^5.51.1",
+        "@ledgerhq/errors": "^5.50.0",
+        "events": "^3.3.0"
+      }
+    },
+    "node_modules/@emurgo/cross-csl-browser/node_modules/@ledgerhq/logs": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/logs/-/logs-5.50.0.tgz",
+      "integrity": "sha512-swKHYCOZUGyVt4ge0u8a7AwNcA//h4nx5wIi0sruGye1IJ5Cva0GyK9L2/WdX+kWVTKp92ZiEo1df31lrWGPgA=="
+    },
+    "node_modules/@emurgo/cross-csl-browser/node_modules/axios": {
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",
+      "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
+      "dependencies": {
+        "follow-redirects": "^1.14.4"
+      }
+    },
+    "node_modules/@emurgo/cross-csl-browser/node_modules/rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
     },
     "node_modules/@emurgo/cross-csl-core": {
       "version": "4.4.0",
@@ -2612,21 +2690,107 @@
       }
     },
     "node_modules/@emurgo/cross-csl-nodejs": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@emurgo/cross-csl-nodejs/-/cross-csl-nodejs-5.1.1.tgz",
-      "integrity": "sha512-Ij0YxNhY01rae5QbWyNl8cUN0lsTu4701yOt/x+r1BlllqCvkdTNcTL7kjnGSSuHgAw1KMqoKeUXWcNLPUgu7g==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@emurgo/cross-csl-nodejs/-/cross-csl-nodejs-5.0.1.tgz",
+      "integrity": "sha512-fu4Cif9xWfjFS7ue391KgPK4OdOaeRkiMtlTNrqiOReFicXAyJirpCgH3DZ+Mb2qJkffW9NJX75TXDqpewjoGw==",
       "dev": true,
       "dependencies": {
-        "@emurgo/cardano-serialization-lib-nodejs": "12.1.0",
-        "@emurgo/cross-csl-core": "5.1.1"
+        "@emurgo/cardano-serialization-lib-nodejs": "12.0.1",
+        "@emurgo/cross-csl-core": "5.0.1"
       }
     },
+    "node_modules/@emurgo/cross-csl-nodejs/node_modules/@cardano-foundation/ledgerjs-hw-app-cardano": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@cardano-foundation/ledgerjs-hw-app-cardano/-/ledgerjs-hw-app-cardano-5.1.0.tgz",
+      "integrity": "sha512-ucuz/XbS/0ZD0Bal/GI/kiTm9jDIl8J+A7ypEqcAcBDGicFsyWmtPotOTwuDovTsiM8+eA/5OGTFX0oRqzxstQ==",
+      "dev": true,
+      "dependencies": {
+        "@ledgerhq/hw-transport": "^5.12.0",
+        "@types/ledgerhq__hw-transport": "^4.21.3",
+        "base-x": "^3.0.5",
+        "bech32": "^1.1.4",
+        "blake2": "^4.0.2",
+        "int64-buffer": "^1.0.1"
+      }
+    },
+    "node_modules/@emurgo/cross-csl-nodejs/node_modules/@cardano-foundation/ledgerjs-hw-app-cardano/node_modules/bech32": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz",
+      "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==",
+      "dev": true
+    },
     "node_modules/@emurgo/cross-csl-nodejs/node_modules/@emurgo/cross-csl-core": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@emurgo/cross-csl-core/-/cross-csl-core-5.1.1.tgz",
-      "integrity": "sha512-UYzf7kR/jY01gAyTkhz2OwirdrVCh/e5I2O/P8MxzdFvtLU88XLY8T6KWgroJ4cQ3XoFCKtSJDFOxcN01nteRg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@emurgo/cross-csl-core/-/cross-csl-core-5.0.1.tgz",
+      "integrity": "sha512-PlNsW3GjqlJ7mTrHqY+M6mGkLnWh++6PAok1rdJwUP7bYS24PE2Fm4JeO1uK0dtv9mbpVLlXyjybH+HSRV7a0Q==",
+      "dev": true,
+      "dependencies": {
+        "@cardano-foundation/ledgerjs-hw-app-cardano": "^5.0.0",
+        "@types/mocha": "^9.1.1",
+        "axios": "^0.24.0",
+        "bech32": "^2.0.0",
+        "bignumber.js": "^9.0.1",
+        "blake2b": "^2.1.4",
+        "hash-wasm": "^4.9.0",
+        "mocha": "^10.0.0"
+      }
+    },
+    "node_modules/@emurgo/cross-csl-nodejs/node_modules/@ledgerhq/devices": {
+      "version": "5.51.1",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-5.51.1.tgz",
+      "integrity": "sha512-4w+P0VkbjzEXC7kv8T1GJ/9AVaP9I6uasMZ/JcdwZBS3qwvKo5A5z9uGhP5c7TvItzcmPb44b5Mw2kT+WjUuAA==",
+      "dev": true,
+      "dependencies": {
+        "@ledgerhq/errors": "^5.50.0",
+        "@ledgerhq/logs": "^5.50.0",
+        "rxjs": "6",
+        "semver": "^7.3.5"
+      }
+    },
+    "node_modules/@emurgo/cross-csl-nodejs/node_modules/@ledgerhq/errors": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-5.50.0.tgz",
+      "integrity": "sha512-gu6aJ/BHuRlpU7kgVpy2vcYk6atjB4iauP2ymF7Gk0ez0Y/6VSMVSJvubeEQN+IV60+OBK0JgeIZG7OiHaw8ow==",
       "dev": true
     },
+    "node_modules/@emurgo/cross-csl-nodejs/node_modules/@ledgerhq/hw-transport": {
+      "version": "5.51.1",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-5.51.1.tgz",
+      "integrity": "sha512-6wDYdbWrw9VwHIcoDnqWBaDFyviyjZWv6H9vz9Vyhe4Qd7TIFmbTl/eWs6hZvtZBza9K8y7zD8ChHwRI4s9tSw==",
+      "dev": true,
+      "dependencies": {
+        "@ledgerhq/devices": "^5.51.1",
+        "@ledgerhq/errors": "^5.50.0",
+        "events": "^3.3.0"
+      }
+    },
+    "node_modules/@emurgo/cross-csl-nodejs/node_modules/@ledgerhq/logs": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/logs/-/logs-5.50.0.tgz",
+      "integrity": "sha512-swKHYCOZUGyVt4ge0u8a7AwNcA//h4nx5wIi0sruGye1IJ5Cva0GyK9L2/WdX+kWVTKp92ZiEo1df31lrWGPgA==",
+      "dev": true
+    },
+    "node_modules/@emurgo/cross-csl-nodejs/node_modules/axios": {
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",
+      "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
+      "dev": true,
+      "dependencies": {
+        "follow-redirects": "^1.14.4"
+      }
+    },
+    "node_modules/@emurgo/cross-csl-nodejs/node_modules/rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
     "node_modules/@emurgo/yoroi-eutxo-txs": {
       "version": "0.0.2-alpha.8",
       "resolved": "https://registry.npmjs.org/@emurgo/yoroi-eutxo-txs/-/yoroi-eutxo-txs-0.0.2-alpha.8.tgz",
@@ -2725,12 +2889,12 @@
       }
     },
     "node_modules/@emurgo/yoroi-lib": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@emurgo/yoroi-lib/-/yoroi-lib-1.2.2.tgz",
-      "integrity": "sha512-alzxMst6K9dazsYAmp6KsyqaI8Aw+Y1SM9K288Pc9pwbFk1n0QQiPrvvK/t6YczBZFXQUmNezcNu17EpJVgLDw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@emurgo/yoroi-lib/-/yoroi-lib-1.2.0.tgz",
+      "integrity": "sha512-GHmj3StVEA9FBhbnqeOYh5iRtOhc95NKQ2y0gaVoCc3v88d7pJlybMZi7ajrFjo0VAg6X8yF+OAIITKo9NK1qQ==",
       "dependencies": {
         "@cardano-foundation/ledgerjs-hw-app-cardano": "^7.1.3",
-        "@emurgo/cross-csl-core": "5.1.1",
+        "@emurgo/cross-csl-core": "5.0.1",
         "@noble/hashes": "^1.3.2",
         "axios": "^1.7.5",
         "axios-cache-interceptor": "^1.5.3",
@@ -2740,9 +2904,76 @@
       }
     },
     "node_modules/@emurgo/yoroi-lib/node_modules/@emurgo/cross-csl-core": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@emurgo/cross-csl-core/-/cross-csl-core-5.1.1.tgz",
-      "integrity": "sha512-UYzf7kR/jY01gAyTkhz2OwirdrVCh/e5I2O/P8MxzdFvtLU88XLY8T6KWgroJ4cQ3XoFCKtSJDFOxcN01nteRg=="
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@emurgo/cross-csl-core/-/cross-csl-core-5.0.1.tgz",
+      "integrity": "sha512-PlNsW3GjqlJ7mTrHqY+M6mGkLnWh++6PAok1rdJwUP7bYS24PE2Fm4JeO1uK0dtv9mbpVLlXyjybH+HSRV7a0Q==",
+      "dependencies": {
+        "@cardano-foundation/ledgerjs-hw-app-cardano": "^5.0.0",
+        "@types/mocha": "^9.1.1",
+        "axios": "^0.24.0",
+        "bech32": "^2.0.0",
+        "bignumber.js": "^9.0.1",
+        "blake2b": "^2.1.4",
+        "hash-wasm": "^4.9.0",
+        "mocha": "^10.0.0"
+      }
+    },
+    "node_modules/@emurgo/yoroi-lib/node_modules/@emurgo/cross-csl-core/node_modules/@cardano-foundation/ledgerjs-hw-app-cardano": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@cardano-foundation/ledgerjs-hw-app-cardano/-/ledgerjs-hw-app-cardano-5.1.0.tgz",
+      "integrity": "sha512-ucuz/XbS/0ZD0Bal/GI/kiTm9jDIl8J+A7ypEqcAcBDGicFsyWmtPotOTwuDovTsiM8+eA/5OGTFX0oRqzxstQ==",
+      "dependencies": {
+        "@ledgerhq/hw-transport": "^5.12.0",
+        "@types/ledgerhq__hw-transport": "^4.21.3",
+        "base-x": "^3.0.5",
+        "bech32": "^1.1.4",
+        "blake2": "^4.0.2",
+        "int64-buffer": "^1.0.1"
+      }
+    },
+    "node_modules/@emurgo/yoroi-lib/node_modules/@emurgo/cross-csl-core/node_modules/@cardano-foundation/ledgerjs-hw-app-cardano/node_modules/bech32": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz",
+      "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ=="
+    },
+    "node_modules/@emurgo/yoroi-lib/node_modules/@emurgo/cross-csl-core/node_modules/axios": {
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",
+      "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
+      "dependencies": {
+        "follow-redirects": "^1.14.4"
+      }
+    },
+    "node_modules/@emurgo/yoroi-lib/node_modules/@ledgerhq/devices": {
+      "version": "5.51.1",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-5.51.1.tgz",
+      "integrity": "sha512-4w+P0VkbjzEXC7kv8T1GJ/9AVaP9I6uasMZ/JcdwZBS3qwvKo5A5z9uGhP5c7TvItzcmPb44b5Mw2kT+WjUuAA==",
+      "dependencies": {
+        "@ledgerhq/errors": "^5.50.0",
+        "@ledgerhq/logs": "^5.50.0",
+        "rxjs": "6",
+        "semver": "^7.3.5"
+      }
+    },
+    "node_modules/@emurgo/yoroi-lib/node_modules/@ledgerhq/errors": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-5.50.0.tgz",
+      "integrity": "sha512-gu6aJ/BHuRlpU7kgVpy2vcYk6atjB4iauP2ymF7Gk0ez0Y/6VSMVSJvubeEQN+IV60+OBK0JgeIZG7OiHaw8ow=="
+    },
+    "node_modules/@emurgo/yoroi-lib/node_modules/@ledgerhq/hw-transport": {
+      "version": "5.51.1",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-5.51.1.tgz",
+      "integrity": "sha512-6wDYdbWrw9VwHIcoDnqWBaDFyviyjZWv6H9vz9Vyhe4Qd7TIFmbTl/eWs6hZvtZBza9K8y7zD8ChHwRI4s9tSw==",
+      "dependencies": {
+        "@ledgerhq/devices": "^5.51.1",
+        "@ledgerhq/errors": "^5.50.0",
+        "events": "^3.3.0"
+      }
+    },
+    "node_modules/@emurgo/yoroi-lib/node_modules/@ledgerhq/logs": {
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/logs/-/logs-5.50.0.tgz",
+      "integrity": "sha512-swKHYCOZUGyVt4ge0u8a7AwNcA//h4nx5wIi0sruGye1IJ5Cva0GyK9L2/WdX+kWVTKp92ZiEo1df31lrWGPgA=="
     },
     "node_modules/@emurgo/yoroi-lib/node_modules/axios": {
       "version": "1.7.5",
@@ -2767,6 +2998,17 @@
         "node": ">= 6"
       }
     },
+    "node_modules/@emurgo/yoroi-lib/node_modules/rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
     "node_modules/@eslint/eslintrc": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.3.0.tgz",

From b817054418faeecc57e415cd704f426043dd5ec6 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 30 Oct 2024 14:17:22 +0800
Subject: [PATCH 026/143] remove .d.ts files

---
 .../app/UI/components/Card.d.ts               |  2 -
 .../app/UI/components/Chip.d.ts               | 12 ---
 .../components/Collapsible/Collapsible.d.ts   |  7 --
 .../UI/components/Input/PasswordInput.d.ts    | 13 ---
 .../app/UI/components/Input/SearchInput.d.ts  |  3 -
 .../app/UI/components/Input/TextInput.d.ts    | 12 ---
 .../app/UI/components/Skeleton.d.ts           |  2 -
 .../app/UI/components/Tooltip.d.ts            |  7 --
 .../TransactionFailed/FailedIlustration.d.ts  |  2 -
 .../TransactionFailed/TransactionFailed.d.ts  |  2 -
 .../SuccessIlustration.d.ts                   |  2 -
 .../TransactionSubmitted.d.ts                 |  8 --
 .../app/UI/components/buttons/CopyButton.d.ts |  7 --
 .../app/UI/components/icons/Cancel.d.ts       |  2 -
 .../app/UI/components/icons/ChevronDown.d.ts  |  2 -
 .../app/UI/components/icons/ChevronUp.d.ts    |  2 -
 .../UI/components/icons/ChipArrowDown.d.ts    |  2 -
 .../app/UI/components/icons/ChipArrowUp.d.ts  |  2 -
 .../app/UI/components/icons/CloseIcon.d.ts    |  2 -
 .../app/UI/components/icons/Copied.d.ts       |  2 -
 .../app/UI/components/icons/Copy.d.ts         |  2 -
 .../app/UI/components/icons/Expand.d.ts       |  2 -
 .../app/UI/components/icons/Search.d.ts       |  2 -
 .../app/UI/components/icons/Send.d.ts         |  2 -
 .../app/UI/components/icons/Sort.d.ts         | 11 ---
 .../app/UI/components/icons/Staking.d.ts      |  2 -
 .../UI/components/icons/VisibilityOff.d.ts    |  2 -
 .../app/UI/components/icons/VisibilityOn.d.ts |  2 -
 .../app/UI/components/icons/index.d.ts        | 16 ----
 .../ilustrations/NoTransactions.d.ts          |  2 -
 .../app/UI/components/index.d.ts              | 12 ---
 .../UI/components/modals/ModalContext.d.ts    | 15 ----
 .../UI/components/modals/ModalManager.d.ts    |  2 -
 .../app/UI/context/IntlProvider.d.ts          |  8 --
 .../governace/common/ChooseDRepModal.d.ts     |  6 --
 .../common/GovernanceVoteingCard.d.ts         | 14 ----
 .../governace/common/VotingSkeletonCard.d.ts  |  2 -
 .../features/governace/common/constants.d.ts  |  4 -
 .../UI/features/governace/common/helpers.d.ts | 24 ------
 .../common/ilustrations/Abstein.d.ts          |  2 -
 .../common/ilustrations/DRepIlustration.d.ts  |  2 -
 .../common/ilustrations/NoConfidance.d.ts     |  2 -
 .../common/useGovernanceManagerMaker.d.ts     |  1 -
 .../governace/common/useNavigateTo.d.ts       |  6 --
 .../features/governace/common/useStrings.d.ts | 36 ---------
 .../module/GovernanceContextProvider.d.ts     | 64 ---------------
 .../UI/features/governace/module/state.d.ts   | 26 ------
 .../DelagationForm/DelagationForm.d.ts        |  2 -
 .../GovernanceStatusSelection.d.ts            |  6 --
 .../portfolio/common/components/Menu.d.ts     |  9 ---
 .../common/components/NavigationButton.d.ts   | 10 ---
 .../common/components/PortfolioHeader.d.ts    |  9 ---
 .../common/components/PortfolioMenu.d.ts      |  6 --
 .../common/components/SortableTableHead.d.ts  |  9 ---
 .../portfolio/common/components/Table.d.ts    | 15 ----
 .../common/components/WelcomeBanner.d.ts      |  3 -
 .../common/helpers/formatHelper.d.ts          |  1 -
 .../portfolio/common/helpers/mockHelper.d.ts  | 14 ----
 .../common/helpers/transactionHelper.d.ts     |  1 -
 .../portfolio/common/hooks/useChart.d.ts      | 37 ---------
 .../portfolio/common/hooks/useNavigateTo.d.ts |  8 --
 .../portfolio/common/hooks/useStrings.d.ts    | 81 -------------------
 .../portfolio/common/hooks/useTableSort.d.ts  | 17 ----
 .../features/portfolio/common/mockData.d.ts   | 17 ----
 .../portfolio/common/types/chart.d.ts         | 13 ---
 .../portfolio/common/types/index.d.ts         | 81 -------------------
 .../portfolio/common/types/table.d.ts         | 10 ---
 .../portfolio/common/types/transaction.d.ts   | 22 -----
 .../module/PortfolioContextProvider.d.ts      | 22 -----
 .../UI/features/portfolio/module/state.d.ts   | 21 -----
 .../useCases/Dapps/LendAndBorrow.d.ts         |  3 -
 .../useCases/Dapps/LiquidityTable.d.ts        |  7 --
 .../portfolio/useCases/Dapps/OrderTable.d.ts  |  7 --
 .../useCases/Dapps/PortfolioDapps.d.ts        | 10 ---
 .../TokenDetails/TokenDetailChart.d.ts        |  8 --
 .../TokenDetails/TokenDetailOverview.d.ts     |  8 --
 .../TokenDetails/TokenDetailPerformance.d.ts  |  7 --
 .../useCases/TokenDetails/TokenDetails.d.ts   |  6 --
 .../TokenDetails/TransactionTable.d.ts        |  6 --
 .../useCases/Wallet/PortfolioWallet.d.ts      |  6 --
 .../portfolio/useCases/Wallet/StatsTable.d.ts |  7 --
 .../GovernanceDelegationFormPage.d.ts         |  7 --
 .../Governance/GovernanceStatusPage.d.ts      |  7 --
 .../GovernanceTransactionFailedPage.d.ts      |  7 --
 .../GovernanceTransactionSubmittedPage.d.ts   |  7 --
 .../app/UI/pages/Governance/layout.d.ts       |  8 --
 .../pages/portfolio/PortfolioDappsPage.d.ts   |  7 --
 .../pages/portfolio/PortfolioDetailPage.d.ts  |  8 --
 .../app/UI/pages/portfolio/PortfolioPage.d.ts |  7 --
 .../app/UI/pages/portfolio/layout.d.ts        |  8 --
 .../yoroi-extension/app/UI/types/index.d.ts   |  0
 91 files changed, 917 deletions(-)
 delete mode 100644 packages/yoroi-extension/app/UI/components/Card.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/Chip.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/Collapsible/Collapsible.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/Input/PasswordInput.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/Input/SearchInput.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/Input/TextInput.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/Skeleton.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/Tooltip.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/TransactionFailed/FailedIlustration.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/TransactionFailed/TransactionFailed.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/TransactionSubmitted/SuccessIlustration.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/TransactionSubmitted/TransactionSubmitted.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/buttons/CopyButton.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/icons/Cancel.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/icons/ChevronDown.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/icons/ChevronUp.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/icons/ChipArrowDown.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/icons/ChipArrowUp.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/icons/CloseIcon.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/icons/Copied.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/icons/Copy.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/icons/Expand.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/icons/Search.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/icons/Send.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/icons/Sort.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/icons/Staking.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/icons/VisibilityOff.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/icons/VisibilityOn.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/icons/index.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/ilustrations/NoTransactions.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/index.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/modals/ModalContext.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/components/modals/ModalManager.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/context/IntlProvider.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/governace/common/ChooseDRepModal.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/governace/common/GovernanceVoteingCard.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/governace/common/VotingSkeletonCard.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/governace/common/constants.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/governace/common/helpers.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/governace/common/ilustrations/Abstein.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/governace/common/ilustrations/DRepIlustration.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/governace/common/ilustrations/NoConfidance.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/governace/common/useGovernanceManagerMaker.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/governace/common/useNavigateTo.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/governace/common/useStrings.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/governace/module/GovernanceContextProvider.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/governace/module/state.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/governace/useCases/DelagationForm/DelagationForm.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/governace/useCases/SelectGovernanceStatus/GovernanceStatusSelection.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/components/Menu.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/components/NavigationButton.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/components/PortfolioHeader.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/components/PortfolioMenu.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/components/SortableTableHead.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/components/Table.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/components/WelcomeBanner.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/helpers/formatHelper.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/helpers/mockHelper.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/helpers/transactionHelper.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useChart.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useNavigateTo.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useStrings.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useTableSort.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/mockData.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/types/chart.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/types/index.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/types/table.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/common/types/transaction.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/module/PortfolioContextProvider.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/module/state.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/LendAndBorrow.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/LiquidityTable.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/OrderTable.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/PortfolioDapps.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetailChart.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetailOverview.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetailPerformance.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetails.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TransactionTable.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/useCases/Wallet/PortfolioWallet.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/features/portfolio/useCases/Wallet/StatsTable.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/pages/Governance/GovernanceDelegationFormPage.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/pages/Governance/GovernanceStatusPage.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/pages/Governance/GovernanceTransactionFailedPage.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/pages/Governance/GovernanceTransactionSubmittedPage.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/pages/Governance/layout.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/pages/portfolio/PortfolioDappsPage.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/pages/portfolio/PortfolioDetailPage.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/pages/portfolio/PortfolioPage.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/pages/portfolio/layout.d.ts
 delete mode 100644 packages/yoroi-extension/app/UI/types/index.d.ts

diff --git a/packages/yoroi-extension/app/UI/components/Card.d.ts b/packages/yoroi-extension/app/UI/components/Card.d.ts
deleted file mode 100644
index ab31fa5a51..0000000000
--- a/packages/yoroi-extension/app/UI/components/Card.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const Card: (props: any) => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/Chip.d.ts b/packages/yoroi-extension/app/UI/components/Chip.d.ts
deleted file mode 100644
index 9c62b13749..0000000000
--- a/packages/yoroi-extension/app/UI/components/Chip.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export declare const ChipTypes: Readonly<{
-    ACTIVE: "active";
-    INACTIVE: "inactive";
-    DISABLED: "disabled";
-}>;
-interface Props {
-    label: JSX.Element;
-    type: typeof ChipTypes[keyof typeof ChipTypes];
-    sx?: any;
-}
-export declare const Chip: ({ label, type, sx, ...props }: Props) => JSX.Element;
-export {};
diff --git a/packages/yoroi-extension/app/UI/components/Collapsible/Collapsible.d.ts b/packages/yoroi-extension/app/UI/components/Collapsible/Collapsible.d.ts
deleted file mode 100644
index e9b3a1db55..0000000000
--- a/packages/yoroi-extension/app/UI/components/Collapsible/Collapsible.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import * as React from 'react';
-type Props = {
-    title: string;
-    content: React.ReactNode;
-};
-export declare const Collapsible: ({ title, content }: Props) => React.JSX.Element;
-export {};
diff --git a/packages/yoroi-extension/app/UI/components/Input/PasswordInput.d.ts b/packages/yoroi-extension/app/UI/components/Input/PasswordInput.d.ts
deleted file mode 100644
index 9d195e6710..0000000000
--- a/packages/yoroi-extension/app/UI/components/Input/PasswordInput.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from 'react';
-type StyledInputProps = {
-    id: string;
-    label: string;
-    variant?: string;
-    onChange: (event: any) => void;
-    value?: string;
-    error?: boolean;
-    helperText?: string;
-    disabled?: boolean;
-};
-export declare const PasswordInput: ({ id, label, onChange, value, error, disabled, helperText }: StyledInputProps) => React.JSX.Element;
-export {};
diff --git a/packages/yoroi-extension/app/UI/components/Input/SearchInput.d.ts b/packages/yoroi-extension/app/UI/components/Input/SearchInput.d.ts
deleted file mode 100644
index 96e06df3b5..0000000000
--- a/packages/yoroi-extension/app/UI/components/Input/SearchInput.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import React from 'react';
-import { InputProps } from '@mui/material';
-export declare const SearchInput: (props: InputProps) => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/Input/TextInput.d.ts b/packages/yoroi-extension/app/UI/components/Input/TextInput.d.ts
deleted file mode 100644
index d028122589..0000000000
--- a/packages/yoroi-extension/app/UI/components/Input/TextInput.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from 'react';
-type StyledInputProps = {
-    id: string;
-    label: string;
-    variant: string;
-    onChange: (event: any) => void;
-    value?: string;
-    error?: boolean;
-    helperText?: string;
-};
-export declare const TextInput: ({ id, label, onChange, value, error, helperText }: StyledInputProps) => React.JSX.Element;
-export {};
diff --git a/packages/yoroi-extension/app/UI/components/Skeleton.d.ts b/packages/yoroi-extension/app/UI/components/Skeleton.d.ts
deleted file mode 100644
index 2a45d1c95b..0000000000
--- a/packages/yoroi-extension/app/UI/components/Skeleton.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import { SkeletonProps } from '@mui/material';
-export declare const Skeleton: ({ width, height, ...props }: SkeletonProps) => JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/Tooltip.d.ts b/packages/yoroi-extension/app/UI/components/Tooltip.d.ts
deleted file mode 100644
index fa4ae319bd..0000000000
--- a/packages/yoroi-extension/app/UI/components/Tooltip.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { TooltipProps } from '@mui/material/Tooltip';
-interface Props extends TooltipProps {
-    children: JSX.Element;
-    title: JSX.Element;
-}
-export declare const Tooltip: ({ children, title, ...props }: Props) => JSX.Element;
-export {};
diff --git a/packages/yoroi-extension/app/UI/components/TransactionFailed/FailedIlustration.d.ts b/packages/yoroi-extension/app/UI/components/TransactionFailed/FailedIlustration.d.ts
deleted file mode 100644
index de94b58574..0000000000
--- a/packages/yoroi-extension/app/UI/components/TransactionFailed/FailedIlustration.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const FailedIlustration: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/TransactionFailed/TransactionFailed.d.ts b/packages/yoroi-extension/app/UI/components/TransactionFailed/TransactionFailed.d.ts
deleted file mode 100644
index 76432caafe..0000000000
--- a/packages/yoroi-extension/app/UI/components/TransactionFailed/TransactionFailed.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const TransactionFailed: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/TransactionSubmitted/SuccessIlustration.d.ts b/packages/yoroi-extension/app/UI/components/TransactionSubmitted/SuccessIlustration.d.ts
deleted file mode 100644
index 24a4e77671..0000000000
--- a/packages/yoroi-extension/app/UI/components/TransactionSubmitted/SuccessIlustration.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const SuccessIlustration: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/TransactionSubmitted/TransactionSubmitted.d.ts b/packages/yoroi-extension/app/UI/components/TransactionSubmitted/TransactionSubmitted.d.ts
deleted file mode 100644
index 2f94f72234..0000000000
--- a/packages/yoroi-extension/app/UI/components/TransactionSubmitted/TransactionSubmitted.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import React from 'react';
-export declare const TransactionSubmitted: ({ title, subtitle, content, btnText, onPress, }: {
-    title?: string;
-    subtitle?: string;
-    content?: string;
-    btnText?: string;
-    onPress?: () => void;
-}) => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/buttons/CopyButton.d.ts b/packages/yoroi-extension/app/UI/components/buttons/CopyButton.d.ts
deleted file mode 100644
index 17b5620cc1..0000000000
--- a/packages/yoroi-extension/app/UI/components/buttons/CopyButton.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import React from 'react';
-interface Props {
-    textToCopy: string;
-    disabled: boolean;
-}
-export declare const CopyButton: ({ textToCopy, disabled, ...props }: Props) => React.JSX.Element;
-export {};
diff --git a/packages/yoroi-extension/app/UI/components/icons/Cancel.d.ts b/packages/yoroi-extension/app/UI/components/icons/Cancel.d.ts
deleted file mode 100644
index 991a80b643..0000000000
--- a/packages/yoroi-extension/app/UI/components/icons/Cancel.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const Cancel: (props: React.SVGProps<SVGSVGElement>) => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/ChevronDown.d.ts b/packages/yoroi-extension/app/UI/components/icons/ChevronDown.d.ts
deleted file mode 100644
index 53fd67bdf5..0000000000
--- a/packages/yoroi-extension/app/UI/components/icons/ChevronDown.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const ChevronDown: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/ChevronUp.d.ts b/packages/yoroi-extension/app/UI/components/icons/ChevronUp.d.ts
deleted file mode 100644
index 764c982f41..0000000000
--- a/packages/yoroi-extension/app/UI/components/icons/ChevronUp.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const ChevronUp: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/ChipArrowDown.d.ts b/packages/yoroi-extension/app/UI/components/icons/ChipArrowDown.d.ts
deleted file mode 100644
index 8600429687..0000000000
--- a/packages/yoroi-extension/app/UI/components/icons/ChipArrowDown.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const ChipArrowDown: (props: React.SVGProps<SVGSVGElement>) => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/ChipArrowUp.d.ts b/packages/yoroi-extension/app/UI/components/icons/ChipArrowUp.d.ts
deleted file mode 100644
index 010f501b64..0000000000
--- a/packages/yoroi-extension/app/UI/components/icons/ChipArrowUp.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const ChipArrowUp: (props: React.SVGProps<SVGSVGElement>) => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/CloseIcon.d.ts b/packages/yoroi-extension/app/UI/components/icons/CloseIcon.d.ts
deleted file mode 100644
index 28af3d70e7..0000000000
--- a/packages/yoroi-extension/app/UI/components/icons/CloseIcon.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const CloseIcon: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/Copied.d.ts b/packages/yoroi-extension/app/UI/components/icons/Copied.d.ts
deleted file mode 100644
index e037a0a94f..0000000000
--- a/packages/yoroi-extension/app/UI/components/icons/Copied.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const Copied: (props: React.SVGProps<SVGSVGElement>) => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/Copy.d.ts b/packages/yoroi-extension/app/UI/components/icons/Copy.d.ts
deleted file mode 100644
index 6afba67d55..0000000000
--- a/packages/yoroi-extension/app/UI/components/icons/Copy.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const Copy: (props: React.SVGProps<SVGSVGElement>) => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/Expand.d.ts b/packages/yoroi-extension/app/UI/components/icons/Expand.d.ts
deleted file mode 100644
index fefde7f73c..0000000000
--- a/packages/yoroi-extension/app/UI/components/icons/Expand.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const Expand: (props: React.SVGProps<SVGSVGElement>) => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/Search.d.ts b/packages/yoroi-extension/app/UI/components/icons/Search.d.ts
deleted file mode 100644
index 5d88d1ae8c..0000000000
--- a/packages/yoroi-extension/app/UI/components/icons/Search.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const Search: (props: React.SVGProps<SVGSVGElement>) => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/Send.d.ts b/packages/yoroi-extension/app/UI/components/icons/Send.d.ts
deleted file mode 100644
index a729f336a9..0000000000
--- a/packages/yoroi-extension/app/UI/components/icons/Send.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const Send: (props: React.SVGProps<SVGSVGElement>) => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/Sort.d.ts b/packages/yoroi-extension/app/UI/components/icons/Sort.d.ts
deleted file mode 100644
index 82f2c48517..0000000000
--- a/packages/yoroi-extension/app/UI/components/icons/Sort.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from 'react';
-interface Props {
-    id: string;
-    order: string | null;
-    orderBy: string | null;
-    style: any;
-    onClick: () => void;
-    props?: React.SVGProps<SVGSVGElement>;
-}
-export declare const Sort: ({ id, order, orderBy, style, onClick, ...props }: Props) => React.JSX.Element;
-export {};
diff --git a/packages/yoroi-extension/app/UI/components/icons/Staking.d.ts b/packages/yoroi-extension/app/UI/components/icons/Staking.d.ts
deleted file mode 100644
index 974fffe4ba..0000000000
--- a/packages/yoroi-extension/app/UI/components/icons/Staking.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const Staking: (props: React.SVGProps<SVGSVGElement>) => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/VisibilityOff.d.ts b/packages/yoroi-extension/app/UI/components/icons/VisibilityOff.d.ts
deleted file mode 100644
index 37142520c3..0000000000
--- a/packages/yoroi-extension/app/UI/components/icons/VisibilityOff.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const VisibilityOff: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/VisibilityOn.d.ts b/packages/yoroi-extension/app/UI/components/icons/VisibilityOn.d.ts
deleted file mode 100644
index 34e1024f9c..0000000000
--- a/packages/yoroi-extension/app/UI/components/icons/VisibilityOn.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const VisibilityOn: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/icons/index.d.ts b/packages/yoroi-extension/app/UI/components/icons/index.d.ts
deleted file mode 100644
index e1ab18523a..0000000000
--- a/packages/yoroi-extension/app/UI/components/icons/index.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export declare const Icon: {
-    CloseIcon: () => import("react").JSX.Element;
-    VisibilityOn: () => import("react").JSX.Element;
-    VisibilityOff: () => import("react").JSX.Element;
-    Copy: (props: import("react").SVGProps<SVGSVGElement>) => import("react").JSX.Element;
-    Copied: (props: import("react").SVGProps<SVGSVGElement>) => import("react").JSX.Element;
-    ChipArrowUp: (props: import("react").SVGProps<SVGSVGElement>) => import("react").JSX.Element;
-    ChipArrowDown: (props: import("react").SVGProps<SVGSVGElement>) => import("react").JSX.Element;
-    Send: (props: import("react").SVGProps<SVGSVGElement>) => import("react").JSX.Element;
-    Cancel: (props: import("react").SVGProps<SVGSVGElement>) => import("react").JSX.Element;
-    Staking: (props: import("react").SVGProps<SVGSVGElement>) => import("react").JSX.Element;
-    Expand: (props: import("react").SVGProps<SVGSVGElement>) => import("react").JSX.Element;
-    ChevronDown: () => import("react").JSX.Element;
-    ChevronUp: () => import("react").JSX.Element;
-    Search: (props: import("react").SVGProps<SVGSVGElement>) => import("react").JSX.Element;
-};
diff --git a/packages/yoroi-extension/app/UI/components/ilustrations/NoTransactions.d.ts b/packages/yoroi-extension/app/UI/components/ilustrations/NoTransactions.d.ts
deleted file mode 100644
index 76365d4f57..0000000000
--- a/packages/yoroi-extension/app/UI/components/ilustrations/NoTransactions.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const NoTransactions: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/components/index.d.ts b/packages/yoroi-extension/app/UI/components/index.d.ts
deleted file mode 100644
index afb8a9baea..0000000000
--- a/packages/yoroi-extension/app/UI/components/index.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export * from './Card';
-export * from './Tooltip';
-export * from './Skeleton';
-export * from './Chip';
-export * from './buttons/CopyButton';
-export * from './Input/SearchInput';
-export * from './Input/TextInput';
-export * from './Input/PasswordInput';
-export * from './TransactionFailed/TransactionFailed';
-export * from './TransactionSubmitted/TransactionSubmitted';
-export * from './Collapsible/Collapsible';
-export * from './icons';
diff --git a/packages/yoroi-extension/app/UI/components/modals/ModalContext.d.ts b/packages/yoroi-extension/app/UI/components/modals/ModalContext.d.ts
deleted file mode 100644
index 4cb44ef227..0000000000
--- a/packages/yoroi-extension/app/UI/components/modals/ModalContext.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from 'react';
-type ModalState = {
-    isOpen: boolean;
-    title: string;
-    content: React.ReactNode;
-    height: string;
-    width: string;
-    isLoading: boolean;
-};
-export declare const useModal: () => any;
-export declare const ModalProvider: ({ children, initialState }: {
-    children: React.ReactNode;
-    initialState?: ModalState;
-}) => React.JSX.Element;
-export {};
diff --git a/packages/yoroi-extension/app/UI/components/modals/ModalManager.d.ts b/packages/yoroi-extension/app/UI/components/modals/ModalManager.d.ts
deleted file mode 100644
index 3029acef76..0000000000
--- a/packages/yoroi-extension/app/UI/components/modals/ModalManager.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import * as React from 'react';
-export declare const ModalManager: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/context/IntlProvider.d.ts b/packages/yoroi-extension/app/UI/context/IntlProvider.d.ts
deleted file mode 100644
index d6bcb79996..0000000000
--- a/packages/yoroi-extension/app/UI/context/IntlProvider.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import * as React from 'react';
-export declare const IntlProvider: ({ children, intl }: {
-    children: React.ReactNode;
-    intl: any;
-}) => React.JSX.Element;
-export declare const useIntl: () => {
-    intl: any;
-};
diff --git a/packages/yoroi-extension/app/UI/features/governace/common/ChooseDRepModal.d.ts b/packages/yoroi-extension/app/UI/features/governace/common/ChooseDRepModal.d.ts
deleted file mode 100644
index ca0b9531d2..0000000000
--- a/packages/yoroi-extension/app/UI/features/governace/common/ChooseDRepModal.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import * as React from 'react';
-type ChooseDRepModallProps = {
-    onSubmit?: (drepId: string, drepCredential: string) => void;
-};
-export declare const ChooseDRepModal: ({ onSubmit }: ChooseDRepModallProps) => React.JSX.Element;
-export {};
diff --git a/packages/yoroi-extension/app/UI/features/governace/common/GovernanceVoteingCard.d.ts b/packages/yoroi-extension/app/UI/features/governace/common/GovernanceVoteingCard.d.ts
deleted file mode 100644
index 9577cffec2..0000000000
--- a/packages/yoroi-extension/app/UI/features/governace/common/GovernanceVoteingCard.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import * as React from 'react';
-type Props = {
-    title: string;
-    titleHover?: string;
-    description: string;
-    descriptionHover?: string;
-    icon: React.ReactNode;
-    selected: boolean;
-    onClick: () => void;
-    pending: boolean;
-    loading: boolean;
-};
-export declare const GovernanceVoteingCard: ({ title, description, descriptionHover, titleHover, icon, selected, onClick, pending, loading, }: Props) => React.JSX.Element;
-export {};
diff --git a/packages/yoroi-extension/app/UI/features/governace/common/VotingSkeletonCard.d.ts b/packages/yoroi-extension/app/UI/features/governace/common/VotingSkeletonCard.d.ts
deleted file mode 100644
index d6ae536a5d..0000000000
--- a/packages/yoroi-extension/app/UI/features/governace/common/VotingSkeletonCard.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import * as React from 'react';
-export declare const VotingSkeletonCard: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/features/governace/common/constants.d.ts b/packages/yoroi-extension/app/UI/features/governace/common/constants.d.ts
deleted file mode 100644
index f1ee0404e5..0000000000
--- a/packages/yoroi-extension/app/UI/features/governace/common/constants.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export declare const BECOME_DREP_LINK = "https://emurgohelpdesk.zendesk.com/hc/en-us/articles/8600742035855-Who-are-DReps-on-Cardano";
-export declare const LEARN_MORE_LINK = "https://emurgohelpdesk.zendesk.com/hc/en-us/sections/8582793481231-Governance";
-export declare const DREP_ALWAYS_ABSTAIN: any;
-export declare const DREP_ALWAYS_NO_CONFIDENCE: any;
diff --git a/packages/yoroi-extension/app/UI/features/governace/common/helpers.d.ts b/packages/yoroi-extension/app/UI/features/governace/common/helpers.d.ts
deleted file mode 100644
index 97f6b0eeb1..0000000000
--- a/packages/yoroi-extension/app/UI/features/governace/common/helpers.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-export declare const mapStakingKeyStateToGovernanceAction: (state: any) => {
-    kind: string;
-    drepID?: undefined;
-} | {
-    kind: string;
-    drepID: any;
-} | null;
-export declare const createCurrrentWalletInfo: (stores: any) => {
-    currentPool: any;
-    networkId: any;
-    walletId: number;
-    selectedWallet: any;
-    walletAdaBalance: any;
-    unitOfAccount: any;
-    defaultTokenInfo: any;
-    getCurrentPrice: any;
-    recentTransactions: any;
-    submitedTransactions: any;
-    isHardwareWallet: boolean;
-    backendService: any;
-    backendServiceZero: any;
-    stakingAddress: any;
-};
-export declare const getFormattedPairingValue: (getCurrentPrice: any, defaultTokenInfo: any, unitOfAccount: any, lovelaces: string) => string;
diff --git a/packages/yoroi-extension/app/UI/features/governace/common/ilustrations/Abstein.d.ts b/packages/yoroi-extension/app/UI/features/governace/common/ilustrations/Abstein.d.ts
deleted file mode 100644
index af108a9c84..0000000000
--- a/packages/yoroi-extension/app/UI/features/governace/common/ilustrations/Abstein.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const Abstein: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/features/governace/common/ilustrations/DRepIlustration.d.ts b/packages/yoroi-extension/app/UI/features/governace/common/ilustrations/DRepIlustration.d.ts
deleted file mode 100644
index 9af32e0b07..0000000000
--- a/packages/yoroi-extension/app/UI/features/governace/common/ilustrations/DRepIlustration.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const DRepIlustration: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/features/governace/common/ilustrations/NoConfidance.d.ts b/packages/yoroi-extension/app/UI/features/governace/common/ilustrations/NoConfidance.d.ts
deleted file mode 100644
index df55855eaf..0000000000
--- a/packages/yoroi-extension/app/UI/features/governace/common/ilustrations/NoConfidance.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const NoConfidance: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/features/governace/common/useGovernanceManagerMaker.d.ts b/packages/yoroi-extension/app/UI/features/governace/common/useGovernanceManagerMaker.d.ts
deleted file mode 100644
index 32ea8f03d9..0000000000
--- a/packages/yoroi-extension/app/UI/features/governace/common/useGovernanceManagerMaker.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export declare const useGovernanceManagerMaker: (walletId: string, networkId: string) => any;
diff --git a/packages/yoroi-extension/app/UI/features/governace/common/useNavigateTo.d.ts b/packages/yoroi-extension/app/UI/features/governace/common/useNavigateTo.d.ts
deleted file mode 100644
index 112276f7df..0000000000
--- a/packages/yoroi-extension/app/UI/features/governace/common/useNavigateTo.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export declare const useNavigateTo: () => {
-    selectStatus: () => void;
-    delegationForm: () => void;
-    transactionSubmited: () => void;
-    transactionFail: () => void;
-};
diff --git a/packages/yoroi-extension/app/UI/features/governace/common/useStrings.d.ts b/packages/yoroi-extension/app/UI/features/governace/common/useStrings.d.ts
deleted file mode 100644
index b81378d7c9..0000000000
--- a/packages/yoroi-extension/app/UI/features/governace/common/useStrings.d.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-export declare const messages: any;
-export declare const useStrings: () => {
-    delegateToDRep: any;
-    delegatingToDRep: any;
-    designatingSomeoneElse: any;
-    governanceStatus: any;
-    governanceStatusInfo: any;
-    abstain: any;
-    abstainInfo: any;
-    noConfidence: any;
-    noConfidenceInfo: any;
-    learnMore: any;
-    becomeADrep: any;
-    drepId: any;
-    registerGovernance: any;
-    reviewSelection: any;
-    statusSelected: (status: any) => any;
-    chooseDrep: any;
-    designatedSomeone: any;
-    transactionDetails: any;
-    operations: any;
-    selectAbstein: any;
-    selectNoConfidence: any;
-    back: any;
-    confirm: any;
-    total: any;
-    password: any;
-    wrongPassword: any;
-    identifyDrep: any;
-    incorectFormat: any;
-    statusPending: any;
-    thanksForParticipation: any;
-    theTransactionCanTake: any;
-    participatingInGovernance: any;
-    goToGovernance: any;
-};
diff --git a/packages/yoroi-extension/app/UI/features/governace/module/GovernanceContextProvider.d.ts b/packages/yoroi-extension/app/UI/features/governace/module/GovernanceContextProvider.d.ts
deleted file mode 100644
index e20dbc61fd..0000000000
--- a/packages/yoroi-extension/app/UI/features/governace/module/GovernanceContextProvider.d.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import * as React from 'react';
-type GovernanceProviderProps = {
-    children: React.ReactNode;
-    currentWallet: any;
-    createDrepDelegationTransaction: (drepCredential: String) => Promise<void>;
-    txDelegationResult: any;
-    txDelegationError: any;
-    signDelegationTransaction: (params: any) => Promise<void>;
-    tokenInfo: any;
-    triggerBuySellAdaDialog: any;
-};
-export declare const GovernanceContextProvider: ({ children, currentWallet, createDrepDelegationTransaction, txDelegationResult, txDelegationError, signDelegationTransaction, tokenInfo, triggerBuySellAdaDialog, }: GovernanceProviderProps) => React.JSX.Element;
-export declare const useGovernance: () => {
-    walletId: string;
-    governanceManager: null;
-    checkUserPassword: (_password: string) => {
-        new (body?: BodyInit | null, init?: ResponseInit): Response;
-        prototype: Response;
-        error(): Response;
-        json(data: any, init?: ResponseInit): Response;
-        redirect(url: string | URL, status?: number): Response;
-    };
-    txDelegationResult: null;
-    txDelegationError: null;
-    tokenInfo: null;
-    getFormattedPairingAmount: (_amount: string) => {
-        new (body?: BodyInit | null, init?: ResponseInit): Response;
-        prototype: Response;
-        error(): Response;
-        json(data: any, init?: ResponseInit): Response;
-        redirect(url: string | URL, status?: number): Response;
-    };
-    isHardwareWallet: boolean;
-    createDrepDelegationTransaction: (_drepCredential: string) => Promise<{
-        new (body?: BodyInit | null, init?: ResponseInit): Response;
-        prototype: Response;
-        error(): Response;
-        json(data: any, init?: ResponseInit): Response;
-        redirect(url: string | URL, status?: number): Response;
-    }>;
-    signDelegationTransaction: (_params: any) => Promise<{
-        new (body?: BodyInit | null, init?: ResponseInit): Response;
-        prototype: Response;
-        error(): Response;
-        json(data: any, init?: ResponseInit): Response;
-        redirect(url: string | URL, status?: number): Response;
-    }>;
-    selectedWallet: null;
-    walletAdaBalance: null;
-    governanceStatus: {
-        status: null;
-        drep: null;
-    };
-    triggerBuySellAdaDialog: null;
-    recentTransactions: never[];
-    submitedTransactions: {
-        isDrepDelegation: boolean;
-    }[];
-    governanceVoteChanged: (vote: any) => void;
-    dRepIdChanged: (id: string) => void;
-    governanceVote: any;
-    dRepId?: string;
-};
-export {};
diff --git a/packages/yoroi-extension/app/UI/features/governace/module/state.d.ts b/packages/yoroi-extension/app/UI/features/governace/module/state.d.ts
deleted file mode 100644
index 3d929320fc..0000000000
--- a/packages/yoroi-extension/app/UI/features/governace/module/state.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-export type Vote = {
-    kind: string;
-    drepID?: string;
-};
-export type GovernanceActions = {
-    governanceVoteChanged: (vote: any) => void;
-    dRepIdChanged: (id: string) => void;
-};
-export declare const GovernanceActionType: Readonly<{
-    GovernanceVoteChanged: "governanceVoteChanged";
-    DRepIdChanged: "dRepIdChanged";
-}>;
-export type GovernanceAction = {
-    type: typeof GovernanceActionType.GovernanceVoteChanged;
-    governanceVote: Vote;
-} | {
-    type: typeof GovernanceActionType.DRepIdChanged;
-    dRepId: '';
-};
-export type GovernanceState = {
-    governanceVote: any;
-    dRepId?: string;
-};
-export declare const defaultGovernanceState: GovernanceState;
-export declare const defaultGovernanceActions: GovernanceActions;
-export declare const GovernanceReducer: (state: GovernanceState, action: GovernanceAction) => GovernanceState;
diff --git a/packages/yoroi-extension/app/UI/features/governace/useCases/DelagationForm/DelagationForm.d.ts b/packages/yoroi-extension/app/UI/features/governace/useCases/DelagationForm/DelagationForm.d.ts
deleted file mode 100644
index 096ef42dc3..0000000000
--- a/packages/yoroi-extension/app/UI/features/governace/useCases/DelagationForm/DelagationForm.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import * as React from 'react';
-export declare const DelagationForm: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/features/governace/useCases/SelectGovernanceStatus/GovernanceStatusSelection.d.ts b/packages/yoroi-extension/app/UI/features/governace/useCases/SelectGovernanceStatus/GovernanceStatusSelection.d.ts
deleted file mode 100644
index b363775f5d..0000000000
--- a/packages/yoroi-extension/app/UI/features/governace/useCases/SelectGovernanceStatus/GovernanceStatusSelection.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import * as React from 'react';
-export declare const mapStatus: {
-    [x: number]: string;
-    delegate: string;
-};
-export declare const GovernanceStatusSelection: () => React.JSX.Element;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/components/Menu.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/components/Menu.d.ts
deleted file mode 100644
index 30c75789c9..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/common/components/Menu.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import React from 'react';
-import { SubMenuOption } from '../types';
-interface Props {
-    options: SubMenuOption[];
-    onItemClick: (route: string) => void;
-    isActiveItem: (route: string) => boolean;
-}
-declare const Menu: ({ options, onItemClick, isActiveItem }: Props) => React.JSX.Element;
-export default Menu;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/components/NavigationButton.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/components/NavigationButton.d.ts
deleted file mode 100644
index 8990522066..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/common/components/NavigationButton.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import React from 'react';
-interface Props {
-    label: string;
-    onClick: () => void;
-    variant: any;
-    sx?: any;
-    width?: string;
-}
-declare const NavigationButton: ({ label, onClick, variant, sx, width, ...props }: Props) => React.JSX.Element;
-export default NavigationButton;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/components/PortfolioHeader.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/components/PortfolioHeader.d.ts
deleted file mode 100644
index 9eb5a838d2..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/common/components/PortfolioHeader.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { BalanceType } from '../types/index';
-interface Props {
-    balance: BalanceType;
-    setKeyword: (keyword: string) => void;
-    isLoading: boolean;
-    tooltipTitle: JSX.Element;
-}
-declare const PortfolioHeader: ({ balance, setKeyword, isLoading, tooltipTitle }: Props) => JSX.Element;
-export default PortfolioHeader;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/components/PortfolioMenu.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/components/PortfolioMenu.d.ts
deleted file mode 100644
index f8dfafe791..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/common/components/PortfolioMenu.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-interface Props {
-    onItemClick: (itemId: string) => void;
-    isActiveItem: (itemId: string) => boolean;
-}
-declare const PortfolioMenu: (props: Props) => JSX.Element;
-export default PortfolioMenu;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/components/SortableTableHead.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/components/SortableTableHead.d.ts
deleted file mode 100644
index acbd51a388..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/common/components/SortableTableHead.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { IHeadCell } from '../types/table';
-interface Props {
-    headCells: IHeadCell[];
-    order: string | null;
-    orderBy: string | null;
-    onRequestSort: (id: string) => void;
-}
-declare const SortableTableHead: ({ headCells, order, orderBy, onRequestSort }: Props) => JSX.Element;
-export default SortableTableHead;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/components/Table.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/components/Table.d.ts
deleted file mode 100644
index a9963633ed..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/common/components/Table.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { ReactElement, ReactNode } from 'react';
-import { IHeadCell } from '../types/table';
-interface Props {
-    name: string;
-    headCells: IHeadCell[];
-    data: any[];
-    order: string | null;
-    orderBy: string | null;
-    handleRequestSort: (id: string) => void;
-    isLoading: boolean;
-    TableRowSkeleton: ReactElement;
-    children: ReactNode;
-}
-declare const Table: ({ name, headCells, data, order, orderBy, handleRequestSort, isLoading, TableRowSkeleton, children, }: Props) => JSX.Element;
-export default Table;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/components/WelcomeBanner.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/components/WelcomeBanner.d.ts
deleted file mode 100644
index 9fd930327b..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/common/components/WelcomeBanner.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import React from 'react';
-declare const WelcomeBanner: () => React.JSX.Element;
-export default WelcomeBanner;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/helpers/formatHelper.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/helpers/formatHelper.d.ts
deleted file mode 100644
index 3fbf20e0f9..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/common/helpers/formatHelper.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export declare const formatNumber: (numb: number, fractionDigits?: number) => string;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/helpers/mockHelper.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/helpers/mockHelper.d.ts
deleted file mode 100644
index ddbbfa25bd..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/common/helpers/mockHelper.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-export declare const now: Date;
-export declare const start24HoursAgo: number;
-export declare const start1WeekAgo: number;
-export declare const start1MonthAgo: number;
-export declare const start6MonthAgo: number;
-export declare const start1YearAgo: number;
-type TimePeriodType = '24H' | '1W' | '1M' | '6M' | '1Y';
-export declare const getRandomTime: (startDate: number) => string;
-export declare const createChartData: (timePeriod: TimePeriodType) => {
-    time: string;
-    value: number;
-    fiatValue: number;
-}[];
-export {};
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/helpers/transactionHelper.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/helpers/transactionHelper.d.ts
deleted file mode 100644
index 7a4ee7c255..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/common/helpers/transactionHelper.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export declare const mapStrings: (arr: any[], strings: any) => any[];
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useChart.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useChart.d.ts
deleted file mode 100644
index d16aad2a81..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useChart.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import React from 'react';
-import { IChartData } from '../types/chart';
-import { ITabButtonProps } from '../types';
-declare const useChart: (data: IChartData) => {
-    CustomYAxisTick: ({ x, y, payload, }: {
-        x: number;
-        y: number;
-        payload: {
-            value: number;
-        };
-    }) => React.SVGProps<SVGTextElement>;
-    CustomActiveDot: ({ cx, cy, payload, index, dataLength, chartBottom, rectWidth, rectHeight, }: {
-        cx: number;
-        cy: number;
-        payload: {
-            time: string;
-        };
-        index: number;
-        dataLength: number;
-        chartBottom: number;
-        rectWidth: number;
-        rectHeight: number;
-    }) => JSX.Element | React.ReactElement;
-    handleChoosePeriod: (id: string) => void;
-    handleMouseMove: (props: any) => void;
-    handleMouseDown: (props: any) => void;
-    handleMouseUp: () => void;
-    periodButtonProps: ITabButtonProps[];
-    detailInfo: {
-        value: number;
-        fiatValue: number;
-    };
-    minValue: number;
-    maxValue: number;
-    activePeriodId: string | number;
-};
-export default useChart;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useNavigateTo.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useNavigateTo.d.ts
deleted file mode 100644
index 9d08d20bb3..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useNavigateTo.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export declare const useNavigateTo: () => {
-    portfolio: () => void;
-    portfolioDapps: () => void;
-    portfolioDetail: (tokenId: string) => void;
-    swapPage: () => void;
-    sendPage: () => void;
-    receivePage: () => void;
-};
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useStrings.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useStrings.d.ts
deleted file mode 100644
index f10cfb386d..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useStrings.d.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-export declare const messages: any;
-export declare const useStrings: () => {
-    mainHeaderText: any;
-    detailHeaderText: any;
-    menuWallet: any;
-    menuDapps: any;
-    dapps: any;
-    copyToClipboard: any;
-    copied: any;
-    soonAvailable: any;
-    noResultsForThisSearch: any;
-    search: any;
-    balancePerformance: any;
-    balanceChange: any;
-    tokenPriceChange: any;
-    in24hours: any;
-    backToPortfolio: any;
-    swap: any;
-    send: any;
-    receive: any;
-    liquidityPool: any;
-    openOrders: any;
-    lendAndBorrow: any;
-    balance: any;
-    marketPrice: any;
-    description: any;
-    website: any;
-    policyId: any;
-    fingerprint: any;
-    detailsOn: any;
-    overview: any;
-    performance: any;
-    marketData: any;
-    tokenPrice: any;
-    marketCap: any;
-    '24hVolumn': any;
-    rank: any;
-    circulating: any;
-    totalSupply: any;
-    maxSupply: any;
-    allTimeHigh: any;
-    allTimeLow: any;
-    name: any;
-    price: any;
-    '24H': any;
-    '1W': any;
-    '1M': any;
-    '6M': any;
-    '1Y': any;
-    ALL: any;
-    portfolio: any;
-    totalAmount: any;
-    transactionHistory: any;
-    transactionType: any;
-    status: any;
-    fee: any;
-    amount: any;
-    today: any;
-    yesterday: any;
-    sent: any;
-    received: any;
-    transactionError: any;
-    rewardWithdraw: any;
-    stakeDelegate: any;
-    low: any;
-    high: any;
-    failed: any;
-    assets: any;
-    tokenPair: any;
-    dex: any;
-    firstTokenValue: any;
-    secondTokenValue: any;
-    lpTokens: any;
-    totalValue: any;
-    pair: any;
-    assetPrice: any;
-    assetAmount: any;
-    transactionId: any;
-    welcomeBannerTitle: any;
-    welcomeBannerDesc: any;
-};
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useTableSort.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useTableSort.d.ts
deleted file mode 100644
index eae4e6667b..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/common/hooks/useTableSort.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { IHeadCell } from '../types/table';
-export interface ISortState {
-    order: string | null;
-    orderBy: string | null;
-}
-interface Props {
-    order: string | null;
-    orderBy: string | null;
-    setSortState: React.Dispatch<React.SetStateAction<ISortState>>;
-    headCells: IHeadCell[];
-    data: any[];
-}
-declare const useTableSort: ({ order, orderBy, setSortState, headCells, data }: Props) => {
-    getSortedData: (arr: any[]) => any[];
-    handleRequestSort: (property: string) => void;
-};
-export default useTableSort;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/mockData.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/mockData.d.ts
deleted file mode 100644
index d739d47c4d..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/common/mockData.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { BalanceType, LiquidityItemType, OrderItemType, TokenType } from './types';
-import { TransactionItemType } from './types/transaction';
-declare const mockData: {
-    common: {
-        walletBalance: BalanceType;
-        dappsBalance: BalanceType;
-    };
-    wallet: {
-        tokenList: TokenType[];
-    };
-    dapps: {
-        liquidityList: LiquidityItemType[];
-        orderList: OrderItemType[];
-    };
-    transactionHistory: TransactionItemType[];
-};
-export default mockData;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/types/chart.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/types/chart.d.ts
deleted file mode 100644
index 19cdfd91b0..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/common/types/chart.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export interface IChartDataItem {
-    time: string;
-    value: number;
-    fiatValue: number;
-}
-export interface IChartData {
-    start24HoursAgo: IChartDataItem[];
-    start1WeekAgo: IChartDataItem[];
-    start1MonthAgo: IChartDataItem[];
-    start6MonthAgo: IChartDataItem[];
-    start1YearAgo: IChartDataItem[];
-    ALL: IChartDataItem[];
-}
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/types/index.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/types/index.d.ts
deleted file mode 100644
index 6713641f2f..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/common/types/index.d.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import { IChartData } from './chart';
-export interface ITabButtonProps {
-    id: string | number;
-    label: string;
-    active: boolean;
-}
-export interface SubMenuOption {
-    label: string;
-    route: string;
-    className: string;
-}
-export type BalanceType = {
-    ada: number;
-    usd: number;
-    percents: number;
-    amount: number;
-};
-export interface IDetailOverview {
-    description: string;
-    website: string;
-    detailOn: string;
-    policyId: string;
-    fingerprint: string;
-}
-export interface IDetailPerformanceItem {
-    value: number | string | null;
-}
-export type TokenType = {
-    name: string;
-    id: string;
-    price: number;
-    portfolioPercents: number;
-    '24h': number;
-    '1W': number;
-    '1M': number;
-    totalAmount: number;
-    totalAmountUsd: number;
-    overview: IDetailOverview;
-    performance: IDetailPerformanceItem[];
-    chartData: IChartData;
-};
-export type LiquidityItemType = {
-    id: number;
-    tokenPair: string;
-    DEX: string;
-    DEXLink: string;
-    firstToken: {
-        name: string;
-        id: string;
-    };
-    secondToken: {
-        name: string;
-        id: string;
-    };
-    lpTokens: number;
-    totalValue: number;
-    totalValueUsd: number;
-    firstTokenValue: number;
-    firstTokenValueUsd: number;
-    secondTokenValue: number;
-    secondTokenValueUsd: number;
-};
-export type OrderItemType = {
-    id: number;
-    pair: string;
-    firstToken: {
-        name: string;
-        id: string;
-    };
-    secondToken: {
-        name: string;
-        id: string;
-    };
-    DEX: string;
-    DEXLink: string;
-    assetPrice: number;
-    assetAmount: number;
-    transactionId: string;
-    totalValue: number;
-    totalValueUsd: number;
-};
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/types/table.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/types/table.d.ts
deleted file mode 100644
index 2f3eca0bf2..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/common/types/table.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { TableCellProps } from '@mui/material';
-export type TableSortType = 'character' | 'numeric';
-export interface IHeadCell {
-    id: string;
-    label: string;
-    align: TableCellProps['align'];
-    sortType?: TableSortType;
-    disabledSort?: boolean;
-    isPadding?: boolean;
-}
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/common/types/transaction.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/common/types/transaction.d.ts
deleted file mode 100644
index 867ddd435e..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/common/types/transaction.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-export declare const HistoryItemType: Readonly<{
-    SENT: 1;
-    RECEIVED: 2;
-    ERROR: 3;
-    WITHDRAW: 4;
-    DELEGATE: 5;
-}>;
-export declare const HistoryItemStatus: Readonly<{
-    LOW: "Low";
-    HIGH: "High";
-    FAILED: "Failed";
-}>;
-export type TransactionItemType = {
-    type: typeof HistoryItemType[keyof typeof HistoryItemType];
-    status: typeof HistoryItemStatus[keyof typeof HistoryItemStatus];
-    time: string;
-    feeValue?: number;
-    feeValueUsd?: number;
-    amountTotal: number;
-    amountTotalUsd: number;
-    amountAsset: number | string;
-};
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/module/PortfolioContextProvider.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/module/PortfolioContextProvider.d.ts
deleted file mode 100644
index 36a605bfbe..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/module/PortfolioContextProvider.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import * as React from 'react';
-import { CurrencyType } from './state';
-type PortfolioProviderProps = {
-    children: React.ReactNode;
-    settingFiatPairUnit: {
-        currency: CurrencyType;
-        enabled: boolean;
-    };
-    initialState: {
-        unitOfAccount: CurrencyType;
-    };
-};
-export declare const PortfolioContextProvider: ({ children, settingFiatPairUnit, initialState, }: PortfolioProviderProps) => React.JSX.Element;
-export declare const usePortfolio: () => {
-    changeUnitOfAccount: (currency: CurrencyType) => void;
-    unitOfAccount: CurrencyType;
-    settingFiatPairUnit: {
-        currency: CurrencyType;
-        enabled: boolean;
-    };
-};
-export {};
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/module/state.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/module/state.d.ts
deleted file mode 100644
index 96e54a8121..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/module/state.d.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-export type CurrencyType = 'ADA' | 'USD' | 'BRL' | 'ETH' | 'BTC' | 'KRW' | 'CNY' | 'EUR' | 'JPY' | null;
-export type PortfolioActions = {
-    changeUnitOfAccount: (currency: CurrencyType) => void;
-};
-export declare const PortfolioActionType: Readonly<{
-    changeUnitOfAccount: "changeUnitOfAccount";
-}>;
-export type PortfolioAction = {
-    type: typeof PortfolioActionType.changeUnitOfAccount;
-    unitOfAccount: CurrencyType;
-};
-export type PortfolioState = {
-    unitOfAccount: CurrencyType;
-    settingFiatPairUnit: {
-        currency: CurrencyType;
-        enabled: boolean;
-    };
-};
-export declare const defaultPortfolioState: PortfolioState;
-export declare const defaultPortfolioActions: PortfolioActions;
-export declare const PortfolioReducer: (state: PortfolioState, action: PortfolioAction) => PortfolioState;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/LendAndBorrow.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/LendAndBorrow.d.ts
deleted file mode 100644
index e5f9c3e7b7..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/LendAndBorrow.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import React from 'react';
-declare const LendAndBorrow: () => React.JSX.Element;
-export default LendAndBorrow;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/LiquidityTable.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/LiquidityTable.d.ts
deleted file mode 100644
index 6014260411..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/LiquidityTable.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { LiquidityItemType } from '../../common/types/index';
-interface Props {
-    data: LiquidityItemType[];
-    isLoading: boolean;
-}
-declare const LiquidityTable: ({ data, isLoading }: Props) => JSX.Element;
-export default LiquidityTable;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/OrderTable.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/OrderTable.d.ts
deleted file mode 100644
index 8332b3d997..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/OrderTable.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { OrderItemType } from '../../common/types/index';
-interface Props {
-    data: OrderItemType[];
-    isLoading: boolean;
-}
-declare const OrderTable: ({ data, isLoading }: Props) => JSX.Element;
-export default OrderTable;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/PortfolioDapps.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/PortfolioDapps.d.ts
deleted file mode 100644
index 3173e02096..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/useCases/Dapps/PortfolioDapps.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import React from 'react';
-import { LiquidityItemType, OrderItemType } from '../../common/types/index';
-interface Props {
-    data: {
-        liquidityList: LiquidityItemType[];
-        orderList: OrderItemType[];
-    };
-}
-declare const PortfolioDapps: ({ data }: Props) => React.JSX.Element;
-export default PortfolioDapps;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetailChart.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetailChart.d.ts
deleted file mode 100644
index 4f30c9bb63..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetailChart.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { TokenType } from '../../common/types/index';
-interface Props {
-    isLoading: boolean;
-    tokenInfo: TokenType;
-    isAda: boolean;
-}
-declare const TokenDetailChart: ({ isLoading, tokenInfo, isAda }: Props) => JSX.Element;
-export default TokenDetailChart;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetailOverview.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetailOverview.d.ts
deleted file mode 100644
index 2ffe1ea80f..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetailOverview.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { TokenType } from '../../common/types/index';
-interface Props {
-    tokenInfo: TokenType;
-    isLoading: boolean;
-    isAda: boolean;
-}
-declare const TokenDetailOverview: ({ tokenInfo, isLoading, isAda }: Props) => JSX.Element;
-export default TokenDetailOverview;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetailPerformance.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetailPerformance.d.ts
deleted file mode 100644
index b417adfce6..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetailPerformance.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { TokenType } from '../../common/types/index';
-interface Props {
-    tokenInfo: TokenType;
-    isLoading: boolean;
-}
-declare const TokenDetailPerformance: ({ tokenInfo, isLoading }: Props) => JSX.Element;
-export default TokenDetailPerformance;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetails.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetails.d.ts
deleted file mode 100644
index acd5cd44cd..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TokenDetails.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { TokenType } from '../../common/types/index';
-interface Props {
-    tokenInfo: TokenType;
-}
-declare const TokenDetails: ({ tokenInfo }: Props) => JSX.Element;
-export default TokenDetails;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TransactionTable.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TransactionTable.d.ts
deleted file mode 100644
index 7724591112..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/useCases/TokenDetails/TransactionTable.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { TransactionItemType } from '../../common/types/transaction';
-declare const TransactionTable: ({ history, tokenName }: {
-    history: TransactionItemType[];
-    tokenName: string;
-}) => JSX.Element;
-export default TransactionTable;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/useCases/Wallet/PortfolioWallet.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/useCases/Wallet/PortfolioWallet.d.ts
deleted file mode 100644
index 56db7cf213..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/useCases/Wallet/PortfolioWallet.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { TokenType } from '../../common/types/index';
-interface Props {
-    data: TokenType[];
-}
-declare const PortfolioWallet: ({ data }: Props) => JSX.Element;
-export default PortfolioWallet;
diff --git a/packages/yoroi-extension/app/UI/features/portfolio/useCases/Wallet/StatsTable.d.ts b/packages/yoroi-extension/app/UI/features/portfolio/useCases/Wallet/StatsTable.d.ts
deleted file mode 100644
index 9ae4d6a5ac..0000000000
--- a/packages/yoroi-extension/app/UI/features/portfolio/useCases/Wallet/StatsTable.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { TokenType } from '../../common/types/index';
-interface Props {
-    data: TokenType[];
-    isLoading: boolean;
-}
-declare const StatsTable: ({ data, isLoading }: Props) => JSX.Element;
-export default StatsTable;
diff --git a/packages/yoroi-extension/app/UI/pages/Governance/GovernanceDelegationFormPage.d.ts b/packages/yoroi-extension/app/UI/pages/Governance/GovernanceDelegationFormPage.d.ts
deleted file mode 100644
index 35725ca1c3..0000000000
--- a/packages/yoroi-extension/app/UI/pages/Governance/GovernanceDelegationFormPage.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-type Props = {
-    stores: any;
-    actions: any;
-    children?: any;
-};
-declare const GovernanceDelegationFormPage: (props: Props) => any;
-export default GovernanceDelegationFormPage;
diff --git a/packages/yoroi-extension/app/UI/pages/Governance/GovernanceStatusPage.d.ts b/packages/yoroi-extension/app/UI/pages/Governance/GovernanceStatusPage.d.ts
deleted file mode 100644
index bff725951d..0000000000
--- a/packages/yoroi-extension/app/UI/pages/Governance/GovernanceStatusPage.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-type Props = {
-    stores: any;
-    actions: any;
-    children?: any;
-};
-declare const GovernanceStatusPage: (props: Props) => any;
-export default GovernanceStatusPage;
diff --git a/packages/yoroi-extension/app/UI/pages/Governance/GovernanceTransactionFailedPage.d.ts b/packages/yoroi-extension/app/UI/pages/Governance/GovernanceTransactionFailedPage.d.ts
deleted file mode 100644
index 9cce5d99a8..0000000000
--- a/packages/yoroi-extension/app/UI/pages/Governance/GovernanceTransactionFailedPage.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-type Props = {
-    stores: any;
-    actions: any;
-    children?: any;
-};
-declare const GovernanceTransactionFailedPage: (props: Props) => any;
-export default GovernanceTransactionFailedPage;
diff --git a/packages/yoroi-extension/app/UI/pages/Governance/GovernanceTransactionSubmittedPage.d.ts b/packages/yoroi-extension/app/UI/pages/Governance/GovernanceTransactionSubmittedPage.d.ts
deleted file mode 100644
index 91f2db9441..0000000000
--- a/packages/yoroi-extension/app/UI/pages/Governance/GovernanceTransactionSubmittedPage.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-type Props = {
-    stores: any;
-    actions: any;
-    children?: any;
-};
-declare const GovernanceTransactionSubmittedPage: (props: Props) => any;
-export default GovernanceTransactionSubmittedPage;
diff --git a/packages/yoroi-extension/app/UI/pages/Governance/layout.d.ts b/packages/yoroi-extension/app/UI/pages/Governance/layout.d.ts
deleted file mode 100644
index 2bab94c8d5..0000000000
--- a/packages/yoroi-extension/app/UI/pages/Governance/layout.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import React from 'react';
-type Props = {
-    stores: any;
-    actions: any;
-    children: React.ReactNode;
-};
-declare const GovernanceLayout: ({ stores, actions, children }: Props) => any;
-export default GovernanceLayout;
diff --git a/packages/yoroi-extension/app/UI/pages/portfolio/PortfolioDappsPage.d.ts b/packages/yoroi-extension/app/UI/pages/portfolio/PortfolioDappsPage.d.ts
deleted file mode 100644
index eb3ed23d01..0000000000
--- a/packages/yoroi-extension/app/UI/pages/portfolio/PortfolioDappsPage.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import React from 'react';
-type Props = {
-    stores: any;
-    actions: any;
-};
-declare const PortfolioDappsPage: (props: Props) => React.JSX.Element;
-export default PortfolioDappsPage;
diff --git a/packages/yoroi-extension/app/UI/pages/portfolio/PortfolioDetailPage.d.ts b/packages/yoroi-extension/app/UI/pages/portfolio/PortfolioDetailPage.d.ts
deleted file mode 100644
index 63025e24fb..0000000000
--- a/packages/yoroi-extension/app/UI/pages/portfolio/PortfolioDetailPage.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import React from 'react';
-type Props = {
-    stores: any;
-    actions: any;
-    match: any;
-};
-declare const PortfolioDetailPage: ({ match, ...props }: Props) => React.JSX.Element;
-export default PortfolioDetailPage;
diff --git a/packages/yoroi-extension/app/UI/pages/portfolio/PortfolioPage.d.ts b/packages/yoroi-extension/app/UI/pages/portfolio/PortfolioPage.d.ts
deleted file mode 100644
index fda997444f..0000000000
--- a/packages/yoroi-extension/app/UI/pages/portfolio/PortfolioPage.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import React from 'react';
-type Props = {
-    stores: any;
-    actions: any;
-};
-declare const PortfolioPage: (props: Props) => React.JSX.Element;
-export default PortfolioPage;
diff --git a/packages/yoroi-extension/app/UI/pages/portfolio/layout.d.ts b/packages/yoroi-extension/app/UI/pages/portfolio/layout.d.ts
deleted file mode 100644
index 956314ac08..0000000000
--- a/packages/yoroi-extension/app/UI/pages/portfolio/layout.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { ReactNode } from 'react';
-type Props = {
-    stores: any;
-    actions: any;
-    children: ReactNode;
-};
-declare const PortfolioLayout: ({ stores, actions, children }: Props) => JSX.Element;
-export default PortfolioLayout;
diff --git a/packages/yoroi-extension/app/UI/types/index.d.ts b/packages/yoroi-extension/app/UI/types/index.d.ts
deleted file mode 100644
index e69de29bb2..0000000000

From 3305974f1dece3501604a4dba6fefce0cb1d2e55 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 30 Oct 2024 16:29:01 +0800
Subject: [PATCH 027/143] mv3 Bring integration support

---
 .../chrome/manifest.template.js               | 12 ++++
 packages/yoroi-extension/package.json         |  5 +-
 packages/yoroi-extension/scripts/dev.js       | 21 ++++++-
 packages/yoroi-extension/webpack/devConfig.js | 56 ++++++++++++++++++-
 .../yoroi-extension/webpack/prodConfig.js     | 45 ++++++++++++++-
 5 files changed, 134 insertions(+), 5 deletions(-)

diff --git a/packages/yoroi-extension/chrome/manifest.template.js b/packages/yoroi-extension/chrome/manifest.template.js
index c9aff95ea4..88a46ab4bc 100644
--- a/packages/yoroi-extension/chrome/manifest.template.js
+++ b/packages/yoroi-extension/chrome/manifest.template.js
@@ -78,6 +78,18 @@ export default ({
         matches: ['*://connect.trezor.io/*/popup.html'],
         js: ['js/trezor-content-script.js'],
       },
+      {
+        matches: [
+          'file://*/*',
+          'http://*/*',
+          'https://*/*',
+        ],
+        js: [
+          'js/bringInject.js',
+        ],
+        run_at: 'document_start',
+        all_frames: true,
+      }
     ],
     content_security_policy: {
       extension_pages: contentSecurityPolicy
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
index 2344231fd3..6d27a9f231 100644
--- a/packages/yoroi-extension/package.json
+++ b/packages/yoroi-extension/package.json
@@ -6,8 +6,9 @@
     "dev-mv2": "rimraf dev/ && NODE_OPTIONS=--openssl-legacy-provider babel-node scripts-mv2/build --type=debug --env 'mainnet'",
     "dev:main": "NODE_OPTIONS=--openssl-legacy-provider babel-node scripts/dev main --env mainnet",
     "dev:background": "NODE_OPTIONS=--openssl-legacy-provider babel-node scripts/dev background  --env mainnet",
-    "dev:stable": "rimraf dev/ && concurrently -c auto  -n  extension,background \"npm run dev:main\"  \"npm run dev:background\"",
-    "dev:nightly": "rimraf dev/ && concurrently   -n  extension,background \"npm run dev:main --nightly\"  \"npm run dev:background --nightly\" ",
+    "dev:bring": "NODE_OPTIONS=--openssl-legacy-provider babel-node scripts/dev bring  --env mainnet",
+    "dev:stable": "rimraf dev/ && concurrently -c auto -n extension,background,bring \"npm run dev:main\"  \"npm run dev:background\" \"npm run dev:bring\"",
+    "dev:nightly": "rimraf dev/ && concurrently -c auto -n extension,background,bring \"npm run dev:main --nightly\"  \"npm run dev:background --nightly\" \"npm run dev:bring --nightly \"",
     "prod:build-mv2": "rimraf build/ && NODE_OPTIONS=--openssl-legacy-provider NODE_ENV=production babel-node scripts-mv2/build --type=prod",
     "prod:build": "rimraf build/ && NODE_OPTIONS=--openssl-legacy-provider NODE_ENV=production babel-node scripts/build",
     "prod:build:light": "rimraf build/ && NODE_OPTIONS=--openssl-legacy-provider NODE_ENV=production babel-node scripts/build --dontInjectConnector",
diff --git a/packages/yoroi-extension/scripts/dev.js b/packages/yoroi-extension/scripts/dev.js
index 213d8a674c..12117eb0ef 100644
--- a/packages/yoroi-extension/scripts/dev.js
+++ b/packages/yoroi-extension/scripts/dev.js
@@ -4,7 +4,11 @@ const webpack = require('webpack');
 const WebpackDevServer = require('webpack-dev-server');
 const tasks = require('./tasks');
 
-const { baseDevConfig, backgroundServiceWorkerConfig } = require(`../webpack/devConfig`);
+const {
+  baseDevConfig,
+  backgroundServiceWorkerConfig,
+  bringContentScriptConfig,
+} = require(`../webpack/devConfig`);
 const { argv, shouldInjectConnector, isNightly, buildAndCopyInjector } = require('./utils');
 
 // override NODE_ENV for ConfigWebpackPlugin
@@ -51,10 +55,25 @@ function devBackgroundServiceWorker() {
   server.start();
 }
 
+function devBringContentScript() {
+  const config = bringContentScriptConfig(
+    argv.env,
+    isNightly,
+    !shouldInjectConnector
+  );
+
+  const compiler = webpack(config);
+
+  const server = new WebpackDevServer(config.devServer, compiler);
+  server.start();
+}
+
 if (argv._[0] === 'main') {
   devMainWindow(argv.env);
 } else if (argv._[0] === 'background') {
   devBackgroundServiceWorker();
+} else if (argv._[0] === 'bring') {
+  devBringContentScript();
 } else {
   console.error('unknown component');
   process.exit(1);
diff --git a/packages/yoroi-extension/webpack/devConfig.js b/packages/yoroi-extension/webpack/devConfig.js
index 76450f93ce..67e3bda8ce 100644
--- a/packages/yoroi-extension/webpack/devConfig.js
+++ b/packages/yoroi-extension/webpack/devConfig.js
@@ -170,4 +170,58 @@ const backgroundServiceWorkerConfig = (
   }
 });
 
-module.exports = { baseDevConfig, backgroundServiceWorkerConfig };
+const bringContentScriptConfig = (
+  networkName /*: string */,
+  isNightly /*: boolean */,
+  isLight /* : ?boolean */ = false
+) /*: * */ => ({
+  mode: 'development',
+  resolve: commonConfig.resolve(),
+  devtool: 'source-map',
+  entry: {
+    contentScript: [
+      path.join(__dirname, '../chrome/content-scripts/bringInject.js'),
+    ]
+  },
+  devServer: {
+    devMiddleware: {
+      writeToDisk: true,
+    },
+    hot: false,
+    liveReload: false,
+    // HTTP is not actually used because injected code must always be written to `dev` dir
+    port: 8003,
+  },
+  output: {
+    path: path.join(__dirname, '../dev/js'),
+    filename: 'bringInject.js',
+  },
+
+  plugins: [
+    new webpack.optimize.LimitChunkCountPlugin({
+        maxChunks: 1
+    }),
+    new webpack.DefinePlugin(commonConfig.definePlugin(
+      networkName,
+      false,
+      isNightly,
+      Boolean(isLight),
+    )),
+    new webpack.IgnorePlugin(/[^/]+\/[\S]+.dev$/),
+  ],
+  module: {
+    rules: [
+      ...commonConfig.rules(false),
+      {
+        test: /\.js$/,
+        loader: 'babel-loader',
+        exclude: /node_modules/,
+        options: {
+          presets: []
+        }
+      },
+    ]
+  },
+});
+
+module.exports = { baseDevConfig, backgroundServiceWorkerConfig, bringContentScriptConfig };
diff --git a/packages/yoroi-extension/webpack/prodConfig.js b/packages/yoroi-extension/webpack/prodConfig.js
index 336efbb255..947692b9f5 100644
--- a/packages/yoroi-extension/webpack/prodConfig.js
+++ b/packages/yoroi-extension/webpack/prodConfig.js
@@ -143,5 +143,48 @@ const backgroundServiceWorkerConfig = (env /*: EnvParams */) /*: * */ => ({
   }
 });
 
+const bringContentScriptConfig = (env /*: EnvParams */) /*: * */ => ({
+  mode: 'production',
+  optimization: commonConfig.optimization,
+  experiments: commonConfig.experiments,
+  resolve: commonConfig.resolve(),
+  entry: {
+    contentScript: [
+      path.join(__dirname, '../chrome/content-scripts/bringInject.js'),
+    ]
+  },
+  output: {
+    path: path.join(__dirname, '../build/js'),
+    filename: 'bringInject.js',
+  },
+
+  plugins: [
+    ...commonConfig.plugins('build', env.networkName),
+    new webpack.optimize.LimitChunkCountPlugin({
+        maxChunks: 1
+    }),
+    new webpack.DefinePlugin(commonConfig.definePlugin(
+      env.networkName,
+      true,
+      JSON.parse(env.nightly),
+      JSON.parse(env.isLight)
+    )),
+    new webpack.IgnorePlugin(/[^/]+\/[\S]+.dev$/),
+  ],
+  module: {
+    rules: [
+      ...commonConfig.rules(false),
+      {
+        test: /\.js$/,
+        loader: 'babel-loader',
+        exclude: /node_modules/,
+        options: {
+          presets: []
+        }
+      },
+    ]
+  },
+});
+
 // export a callable function so we can swap out the network to use
-module.exports = [baseProdConfig, backgroundServiceWorkerConfig];
+module.exports = [baseProdConfig, backgroundServiceWorkerConfig, bringContentScriptConfig];

From fe7fd048a18e3b18166ae2cf79d810ec020c2090 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Mon, 14 Oct 2024 19:11:52 +0800
Subject: [PATCH 028/143] fire active-wallet-open event after the first wallet
 is created

---
 .../app/stores/toplevel/WalletStore.js           |  7 +++++--
 .../extension/background/handlers/yoroi/index.js | 13 ++-----------
 .../extension/background/handlers/yoroi/utils.js | 14 ++++++++++++++
 .../background/handlers/yoroi/wallet.js          | 16 +++++++++++-----
 4 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
index 6cb0c58e4d..c102b993bb 100644
--- a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
@@ -182,11 +182,11 @@ export default class WalletStore extends Store<StoresMap, ActionsMap> {
 
     runInAction(() => {
       this.wallets.push(newWallet);
+      this.initialSyncingWalletIds.add(newWallet.publicDeriverId);
       this._setActiveWallet({
         publicDeriverId: newWallet.publicDeriverId,
       });
       this.actions.dialogs.closeActiveDialog.trigger();
-      this.initialSyncingWalletIds.add(newWallet.publicDeriverId);
       this.actions.router.goToRoute.trigger({ route: ROUTES.WALLETS.ROOT });
     });
   };
@@ -286,7 +286,10 @@ export default class WalletStore extends Store<StoresMap, ActionsMap> {
     this.actions.profile.setSelectedNetwork.trigger(
       getNetworkById(this.wallets[walletIndex].networkId)
     );
-    const changed = (this.selectedIndex != null) && (this.selectedIndex !== walletIndex);
+    const changed = (this.selectedIndex != null) && (this.selectedIndex !== walletIndex)
+      // This flag is used to determine whether to send the active-wallet-open event to Bring's content script.
+      // Don't send it here when we are creating a new wallet because the wallet hasn't been synced.
+      && !this.isInitialSyncing(publicDeriverId);
     this.selectedIndex = walletIndex;
     this.selectedWalletName = this.wallets[walletIndex].name;
     // Cache select wallet
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/index.js b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/index.js
index 1d5e4fa210..69a96dc247 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/index.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/index.js
@@ -43,6 +43,7 @@ import {
 } from './connector';
 import { GetProtocolParameters } from './protocolParameters';
 import { subscribe } from '../../subscriptionManager';
+import { notifyAllTabsActiveWalletOpen } from './utils';
 
 const handlerMap = Object.freeze({
   [GetHistoricalCoinPrices.typeTag]: GetHistoricalCoinPrices.handle,
@@ -100,17 +101,7 @@ export function getHandler(typeTag: string): ?Handler {
       subscribe(sender.tab.id, request.request.activeWalletId);
       if (request.request.changed) {
         // notify content scripts in all tabs
-        chrome.tabs.query({}, (tabs) => {
-          for (const tab of tabs) {
-            chrome.tabs.sendMessage(
-              tab.id,
-              {
-                type: 'active-wallet-open',
-                activeWalletId: request.request.activeWalletId
-              }
-            );
-          }
-        });
+        notifyAllTabsActiveWalletOpen(request.request.activeWalletId);
       }
       sendResponse(undefined);
     };
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/utils.js b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/utils.js
index bd914dbfff..e411d010c0 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/utils.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/utils.js
@@ -12,3 +12,17 @@ export async function getPublicDeriverById(publicDeriverId: number): Promise<Pub
   }
   throw new Error(`missing public deriver ${publicDeriverId}`);
 }
+
+export function notifyAllTabsActiveWalletOpen(activeWalletId: number) {
+  chrome.tabs.query({}, (tabs) => {
+    for (const tab of tabs) {
+      chrome.tabs.sendMessage(
+        tab.id,
+        {
+          type: 'active-wallet-open',
+          activeWalletId,
+        }
+      );
+    }
+  });
+}
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js
index 71724c3768..8f14fcb0a3 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js
@@ -13,7 +13,7 @@ import { getCardanoStateFetcher } from '../../utils';
 import LocalStorageApi, {
   loadSubmittedTransactions, persistSubmittedTransactions
 } from '../../../../../app/api/localStorage';
-import { getPublicDeriverById } from './utils';
+import { getPublicDeriverById, notifyAllTabsActiveWalletOpen } from './utils';
 import { removePublicDeriver } from '../../../../../app/api/ada/lib/storage/bridge/walletBuilder/remove';
 import { loadWalletsFromStorage } from '../../../../../app/api/ada/lib/storage/models/load';
 import {
@@ -57,15 +57,18 @@ export const CreateWallet: HandlerType<CreateWalletRequest, CreateWalletResponse
       walletPassword: request.walletPassword,
       accountIndex: request.accountIndex,
     });
+    const publicDeriverId = publicDerivers[0].getPublicDeriverId();
 
     emitUpdateToSubscriptions({
       type: 'wallet-state-update',
       params: {
         eventType: 'new',
-        publicDeriverId: publicDerivers[0].getPublicDeriverId(),
+        publicDeriverId,
       }
     });
-    syncWallet(publicDerivers[0], 'new wallet', 1);
+    syncWallet(publicDerivers[0], 'new wallet', 1).then(() => {
+      notifyAllTabsActiveWalletOpen(publicDeriverId);
+    });
     return await getPlaceHolderWalletState(publicDerivers[0]);
   },
 });
@@ -103,15 +106,18 @@ export const CreateHardwareWallet: HandlerType<
       checkAddressesInUse: stateFetcher.checkAddressesInUse,
       addressing: request.addressing,
     });
+    const publicDeriverId = publicDeriver.getPublicDeriverId();
 
     emitUpdateToSubscriptions({
       type: 'wallet-state-update',
       params: {
         eventType: 'new',
-        publicDeriverId: publicDeriver.getPublicDeriverId(),
+        publicDeriverId,
       }
     });
-    syncWallet(publicDeriver, 'new wallet', 1);
+    syncWallet(publicDeriver, 'new wallet', 1).then(() => {
+      notifyAllTabsActiveWalletOpen(publicDeriverId);
+    });;
 
     return await getPlaceHolderWalletState(publicDeriver);
   },

From 64f4e535f531d012a45eb0922df86dddc2906ffd Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 30 Oct 2024 16:33:40 +0800
Subject: [PATCH 029/143] flow fix

---
 .../chrome/extension/background/handlers/content/rpc.js    | 7 +++++--
 .../chrome/extension/background/handlers/yoroi/utils.js    | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js b/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js
index 1de93b3c7a..541d7c2165 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js
@@ -648,8 +648,11 @@ const Handlers = Object.freeze({
     'dark' | 'light'
   >(async () => {
     const localStorageApi = new LocalStorageApi();
-    const theme = await localStorageApi.getUserThemeMode();
-    return { ok: theme || 'light' };
+    let theme = await localStorageApi.getUserThemeMode();
+    if (theme !== 'light' && theme !== 'dark') {
+      theme = 'light';
+    }
+    return { ok: theme };
   }),
 
   'pop-up-wallet-creation': NewHandler.basic<
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/utils.js b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/utils.js
index e411d010c0..82b7ba02c6 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/utils.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/utils.js
@@ -14,6 +14,7 @@ export async function getPublicDeriverById(publicDeriverId: number): Promise<Pub
 }
 
 export function notifyAllTabsActiveWalletOpen(activeWalletId: number) {
+  declare var chrome;
   chrome.tabs.query({}, (tabs) => {
     for (const tab of tabs) {
       chrome.tabs.sendMessage(

From 9e7ea1228645a54d68c6107bde85693a050b722c Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 30 Oct 2024 17:15:17 +0800
Subject: [PATCH 030/143] revert translation file changes

---
 .../app/i18n/locales/hu-HU.json               |  3 +-
 .../app/i18n/locales/vi-VN.json               | 35 ++++++++++++-------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/packages/yoroi-extension/app/i18n/locales/hu-HU.json b/packages/yoroi-extension/app/i18n/locales/hu-HU.json
index 30456aa169..235a06f275 100644
--- a/packages/yoroi-extension/app/i18n/locales/hu-HU.json
+++ b/packages/yoroi-extension/app/i18n/locales/hu-HU.json
@@ -345,7 +345,6 @@
   "sidebar.feedback": "Feedback",
   "sidebar.newUpdates": "New updates",
   "sidebar.nfts": "NFTs",
-  "sidebar.cashback": "Cashback",
   "sidebar.settings": "Settings",
   "sidebar.governance": "Governance",
   "sidebar.staking": "Staking",
@@ -1175,4 +1174,4 @@
   "portfolio.orderTable.header.transactionId": "Transaction ID",
   "portfolio.welcomeBanner.title": "Welcome to Yoroi",
   "portfolio.welcomeBanner.description": "With new features and upgraded performance, transactions can be done faster and more securely than ever before."
-}
\ No newline at end of file
+}
diff --git a/packages/yoroi-extension/app/i18n/locales/vi-VN.json b/packages/yoroi-extension/app/i18n/locales/vi-VN.json
index 0ec217e606..996e6b31af 100644
--- a/packages/yoroi-extension/app/i18n/locales/vi-VN.json
+++ b/packages/yoroi-extension/app/i18n/locales/vi-VN.json
@@ -32,6 +32,7 @@
   "api.errors.invalidWitnessError": "Chữ ký không hợp lệ.",
   "api.errors.noInputsError": "Ví đã khôi phục của bạn trống. Vui lòng kiểm tra cụm từ khôi phục của bạn và khôi phục lại.",
   "api.errors.noOutputsError": "Giao dịch yêu cầu ít nhất 1 đầu ra, nhưng không có đầu ra nào được cung cấp.",
+  "api.errors.oversizedTransaction": "Maximum transaction size exceeded.",
   "api.errors.poolMissingApiError": "Pool không thể tìm thấy. Làm ơn kiểm tra lại Pool ID và đảm bảo rằng pool không bị hủy đăng ký.",
   "api.errors.rewardAddressEmpty": "Địa chỉ trả thưởng chưa hiển thị cho đến khi người dùng có phần thưởng.",
   "api.errors.rollbackApiError": "Rollback đã được phát hiện.",
@@ -202,6 +203,9 @@
   "global.yoroi": "Yoroi",
   "global.yoroi.intro": "Light wallet for Cardano assets",
   "global.yoroiNightly": "Yoroi Nightly",
+  "global.labels.unexpectedError": "Something unexpected happened",
+  "global.labels.contactSupport": "If this keep happening, contact our support team.",
+  "global.labels.pleaseGoBack": "Please go back and try again.",
   "incorrectTime.line1": "CẢNH BÁO: thời gian trên máy tính của bạn không khớp với máy chủ. Điều này có thể gây ra kết quả không mong muốn",
   "incorrectTime.line2": "Thời gian khác biệt:",
   "incorrectTime.line3": "Đồng bộ hóa thời gian trên thiết bị của bạn để giải quyết vấn đề này",
@@ -289,6 +293,8 @@
   "settings.general.languageSelect.labelInfo": "Bản dịch ngôn ngữ đã chọn được cung cấp đầy đủ bởi cộng đồng",
   "settings.general.translation.acknowledgment": "Xin cảm ơn những điều sau đây vì sự đóng góp của họ: ",
   "settings.general.translation.contributors": "_",
+  "settings.general.theme.light": "Light Theme",
+  "settings.general.theme.dark": "Dark Theme",
   "settings.menu.analytics.link.label": "Analytics",
   "settings.menu.assetDeposit.link.label": "Khóa tài sản đặt cọc",
   "settings.menu.blockchain.link.label": "Blockchain",
@@ -339,7 +345,6 @@
   "sidebar.feedback": "Phản hồi",
   "sidebar.newUpdates": "Cập nhật mới",
   "sidebar.nfts": "NFTs",
-  "sidebar.cashback": "Cashback",
   "sidebar.settings": "Thiết lập",
   "sidebar.governance": "Governance",
   "sidebar.staking": "Ủy thác",
@@ -589,9 +594,10 @@
   "wallet.delegation.transaction.success.title": "Ủy quyền thành công",
   "wallet.deprecation.byronLine1": "Bản nâng cấp giao thức Shelley thêm một loại ví Shelley mới hỗ trợ ủy quyền.",
   "wallet.deprecation.byronLine2": "Để ủy quyền {ticker} của bạn, bạn sẽ cần nâng cấp lên ví Shelley.",
-  "wallet.emptyWalletMessage": "Your wallet is empty",
-  "wallet.emptyWalletMessageSubtitle": "Top up your wallet safely using our trusted partners",
+  "wallet.emptyWalletMessage": "Get your first ADA in Yoroi 🔥",
+  "wallet.emptyWalletMessageSubtitle": "Buy ADA directly within your wallet and unlock the power of Cardano.",
   "wallet.hw.common.error.101": "Người dùng không cấp các quyền cần thiết. Làm ơn hãy thử lại.",
+  "wallet.hw.data.sign.unkown.address": "The requested signing address is not found in this wallet",
   "wallet.hw.incorrectDevice": "Đã phát hiện thiết bị không chính xác. Cần có thiết bị {expectedDeviceId}, nhưng có thiết bị {responseDeviceId}. Vui lòng cắm đúng thiết bị",
   "wallet.hw.incorrectVersion": "Đã phát hiện phiên bản thiết bị không chính xác. Chúng tôi hỗ trợ phiên bản {supportedVersions} nhưng bạn có phiên bản {responseVersion}.",
   "wallet.hw.ledger.app.not.running": "Ứng dụng Cardano không chạy trên Sổ cái của bạn",
@@ -602,6 +608,8 @@
   "wallet.hw.ledger.common.error.103": "Thiết bị sổ cái bị khóa, vui lòng mở khóa và thử lại.",
   "wallet.hw.ledger.common.error.104": "Hết thời gian chờ của thiết bị sổ cái, vui lòng thử lại.",
   "wallet.hw.ledger.common.error.105": "Lỗi mạng. Xin vui lòng kiểm tra kết nối Internet của bạn.",
+  "wallet.hw.ledger.error.deviceStatus": "Invalid or oversized data for Ledger.",
+  "wallet.hw.ledger.error.deviceVersionNoDataSigning": "CIP-8 message signing not supported by your Ledger app version",
   "wallet.hw.ledger.data.sign.unsupported.error": "Ví Trezor không hỗ trợ ký dữ liệu tại thời điểm này",
   "wallet.hw.trezor.data.sign.unsupported.error": "Ví Trezor không hỗ trợ ký dữ liệu tại thời điểm này",
   "wallet.hw.tx.hash.error": "Giá trị hàm băm giao dịch được tính toán bởi tiện ích mở rộng Yoroi và từ thiết bị không khớp.",
@@ -668,19 +676,21 @@
   "wallet.receive.page.generateURLLabel": "Tạo URL",
   "wallet.receive.page.generatedAddressesSectionTitle": "Đã tạo các địa chỉ",
   "wallet.receive.page.internal.learnMore": "https://emurgo.io/en/blog/understanding-unspent-transaction-outputs-in-cardano",
-  "wallet.receive.page.internalWarning1": "Địa chỉ nội bộ (hoặc địa chỉ \"thay đổi\") duy trì quyền riêng tư của bạn bằng cách ẩn địa chỉ nào thuộc về bạn trên chuỗi khối",
-  "wallet.receive.page.internalWarning2": "địa chỉ được hiển thị ở đây cho mục đích kiểm toán cá nhân và <strong>không bao giờ</strong> được sử dụng.",
+  "wallet.receive.page.internalWarning1": "Internal addresses (or \"change\" addresses) maintain your privacy by obscuring which addresses belong to you on the blockchain.",
+  "wallet.receive.page.internalWarning2": "addresses are shown here for personal auditing purposes and should never be used.",
   "wallet.receive.page.label": "Nhãn",
   "wallet.receive.page.mangledWarning1": "Các địa chỉ bị xáo trộn đóng góp vào số dư {ticker} của bạn nhưng có tùy chọn ủy quyền ưa thích",
   "wallet.receive.page.noResultsFoundLabel": "Không tìm thấy kết quả.",
   "wallet.receive.page.notFoundAnyAddresses": "Chưa có địa chỉ ví nào được sử dụng.",
   "wallet.receive.page.outputAmountUTXO": "Số dư (tổng UTXO)",
-  "wallet.receive.page.rewardAddressLine1": "Địa chỉ phần thưởng giữ phần thưởng của bạn và được sử dụng để xác thực bất kỳ thay đổi nào đối với tùy chọn ủy quyền của bạn",
-  "wallet.receive.page.rewardAddressLine2": "Bạn không thể gửi {ticker} đến các địa chỉ phần thưởng, nhưng chúng tôi hiển thị nó cho mục đích kiểm toán cá nhân",
+  "wallet.receive.page.rewardAddressLine1": "Your reward address holds your rewards and is used to validate any changes to your delegation preference.",
+  "wallet.receive.page.rewardAddressLine2": "You cannot send {ticker} to reward addresses, but we show it for personal auditing purposes.",
   "wallet.receive.page.unmangeLabel": "Tùy chọn ủy quyền chính xác",
   "wallet.receive.page.verifyAddressLabel": "Xác minh địa chỉ",
   "wallet.receive.page.walletAddressLabel": "Địa chỉ ví của bạn",
   "wallet.receive.page.walletReceiveInstructions": "Chia sẻ địa chỉ ví này để nhận thanh toán.<br>Để bảo vệ quyền riêng tư của bạn, địa chỉ mới được tạo tự động sau khi bạn sử dụng chúng.",
+  "wallet.receive.page.rewardAddressesTitle": "Reward addresses",
+  "wallet.receive.page.internalAddressesTitle": "Internal addresses",
   "wallet.recovery.phrase.show.entry.dialog.button.labelClear": "Xóa",
   "wallet.recovery.phrase.show.entry.dialog.button.labelConfirm": "Xác nhận",
   "wallet.recovery.phrase.show.entry.dialog.button.labelRemoveLast": "Xóa cuối cùng",
@@ -888,7 +898,6 @@
   "wallet.syncingOverlay.explanation": "Vui lòng đợi trong khi chúng tôi xử lý dữ liệu ví. Điều này có thể mất một thời gian.",
   "wallet.syncingOverlay.return": "Quay lại ví của tôi",
   "wallet.syncingOverlay.title": "Đồng bộ ví",
-  "wallet.topbar.dialog.cardano": "Cardano, ADA",
   "wallet.topbar.dialog.tokenTypes": "Các kiểu token",
   "wallet.topbar.dialog.totalBalance": "Tổng số dư",
   "wallet.transaction.address.from": "Từ địa chỉ",
@@ -1025,7 +1034,7 @@
   "widgets.copyableaddress.addressCopyTooltipMessage": "Sao chép vào clipboard",
   "widgets.copyableaddress.copied": "Đã sao lưu",
   "widgets.explorer.tooltip": "Truy cập {websiteName}",
-  "widgets.warningBox.headerText": "CHÚ Ý:",
+  "widgets.warningBox.headerText": "Attention",
   "yoroiTransfer.error.noTransferTxError": "Không có giao dịch chuyển khoản để gửi.",
   "yoroiTransfer.error.transferFundsError": "Không thể chuyển tiền.",
   "yoroiTransfer.error.walletChangedError": "Ví đã thay đổi. Vui lòng xác nhận lại giao dịch của bạn.",
@@ -1085,7 +1094,7 @@
   "governance.selectNoConfidenc": "Select no confidence",
   "governance.participatingInGovernance": "Participating in the Cardano Governance gives you the opportunity to participate in the voting as well as withdraw your staking rewards",
   "governance.designatedSomeone": "You are designating someone else to cast your vote on your behalf for all proposals now and in the future.",
-  "governance.identifyDrep": "Identify your preferred DRep and enter their ID below to delegate your vote",
+  "governance.identifyDrep": "Identify your preferred DRep and enter their ID below to delegate your vote:",
   "governance.thanksForParticipation": "Thank you for participating in Governance",
   "governance.theTransactionCanTake": "This transaction can take a while!",
   "governance.goToGovernance": "GO to governance",
@@ -1163,6 +1172,6 @@
   "portfolio.orderTable.header.assetPrice": "Asset price",
   "portfolio.orderTable.header.assetAmount": "Asset amount",
   "portfolio.orderTable.header.transactionId": "Transaction ID",
-  "portfolio.welcomeBanner.title": "Welcome to Yoroi",
-  "portfolio.welcomeBanner.description": "With new features and upgraded performance, transactions can be done faster and more securely than ever before."
-}
\ No newline at end of file
+  "portfolio.welcomeBanner.title": "Start your crypto journey",
+  "portfolio.welcomeBanner.description": "Get started with Cardanos native currency, ADA. Its your key to  unlocking a world of possibilities."
+}

From 5e80da9246242d19032bc2067676a352bf610b0f Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 30 Oct 2024 19:19:49 +0800
Subject: [PATCH 031/143] add frame-src and connect-src for Bring

---
 packages/yoroi-extension/chrome/constants.js  | 4 ++++
 packages/yoroi-extension/webpack/devConfig.js | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/yoroi-extension/chrome/constants.js b/packages/yoroi-extension/chrome/constants.js
index 6394b5a431..8b6d2ac91e 100644
--- a/packages/yoroi-extension/chrome/constants.js
+++ b/packages/yoroi-extension/chrome/constants.js
@@ -46,6 +46,10 @@ export function genCSP(request: {|
   connectSrc.push('https://aggregator.muesliswap.com/');
   connectSrc.push('https://onchain2.muesliswap.com/');
 
+  // Bring
+  connectSrc.push('https://api.bringweb3.io/v1/extension/');
+  frameSrc.push('https://portal.bringweb3.io/');
+
   // unsafe-inline is unfortunately required by style-loader (even in production builds)
   const evalStyle = "'unsafe-inline'";
   return [
diff --git a/packages/yoroi-extension/webpack/devConfig.js b/packages/yoroi-extension/webpack/devConfig.js
index 67e3bda8ce..e21453783c 100644
--- a/packages/yoroi-extension/webpack/devConfig.js
+++ b/packages/yoroi-extension/webpack/devConfig.js
@@ -190,7 +190,7 @@ const bringContentScriptConfig = (
     hot: false,
     liveReload: false,
     // HTTP is not actually used because injected code must always be written to `dev` dir
-    port: 8003,
+    port: 8082,
   },
   output: {
     path: path.join(__dirname, '../dev/js'),

From 40bf7c72faafca3dcd6d4f01980dbddf3cc6d73c Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 30 Oct 2024 19:26:47 +0800
Subject: [PATCH 032/143] fix flow

---
 .../app/containers/cashback/CashbackPage.js               | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index d0f3f65f6a..8f6172a997 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -23,7 +23,7 @@ import { getPublicDeriverById } from '../../../chrome/extension/background/handl
 import Dialog from '../../components/widgets/Dialog';
 import DialogCloseButton from '../../components/widgets/DialogCloseButton';
 import DialogTextBlock from '../../components/widgets/DialogTextBlock'
-import { Address } from '@emurgo/cardano-serialization-lib-browser'
+import { RustModule } from '../../api/ada/lib/cardanoCrypto/rustLoader';
 import { Box, TextField, InputAdornment, IconButton, Tooltip, Typography, DialogContentText } from '@mui/material';
 
 type Props = StoresAndActionsProps;
@@ -59,7 +59,9 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
     try {
       const publicDeriver = stores.wallets.selected;
       if (!publicDeriver) throw Error('no publicDeriver');
-      const walletAddress = Address.from_hex(publicDeriver.externalAddressesByType[CoreAddressTypes.CARDANO_BASE][0].address).to_bech32();
+      const walletAddress = RustModule.WalletV4.Address.from_hex(
+        publicDeriver.externalAddressesByType[CoreAddressTypes.CARDANO_BASE][0].address
+      ).to_bech32();
 
       const response = await fetch(`${environment.bringBaseUrl}check/portal`, {
         method: 'POST',
@@ -241,4 +243,4 @@ return (
 );
 });
 
-export default (withLayout(CashbackPageContainer): React$ComponentType < Props >);
\ No newline at end of file
+export default (withLayout(CashbackPageContainer): React$ComponentType < Props >);

From ac4581e7532a631c0f7f54a1d1fc2256630623a4 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Thu, 31 Oct 2024 02:33:15 +0800
Subject: [PATCH 033/143] hardware wallet cashback support

---
 .../app/containers/cashback/CashbackPage.js   | 89 +++++++++++++------
 1 file changed, 60 insertions(+), 29 deletions(-)

diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index 8f6172a997..d0060e7896 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -25,6 +25,8 @@ import DialogCloseButton from '../../components/widgets/DialogCloseButton';
 import DialogTextBlock from '../../components/widgets/DialogTextBlock'
 import { RustModule } from '../../api/ada/lib/cardanoCrypto/rustLoader';
 import { Box, TextField, InputAdornment, IconButton, Tooltip, Typography, DialogContentText } from '@mui/material';
+import { LedgerConnect } from '../../utils/hwConnectHandler';
+import { MessageAddressFieldType } from '@cardano-foundation/ledgerjs-hw-app-cardano';
 
 type Props = StoresAndActionsProps;
 
@@ -40,6 +42,9 @@ type IframeMessageData = {|
 
 const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllProps) => {
   const { actions, stores } = props;
+  const wallet = stores.wallets.selected;
+  if (!wallet) throw Error('no publicDeriver');
+
   const theme = useTheme();
   // const intl = useContext(IntlContext);
 
@@ -90,12 +95,33 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
   }
 
   const signMessage = useCallback(async (message: string, password: string) => {
-    const wallet = stores.wallets.selected;
-    if (!wallet) throw Error('no publicDeriver');
-    const address = wallet.externalAddressesByType[CoreAddressTypes.CARDANO_BASE][0].address;
-    const publicDeriver = await getPublicDeriverById(wallet.publicDeriverId)
+    const { address, addressing } = wallet.externalAddressesByType[CoreAddressTypes.CARDANO_BASE][0];
+
     try {
-      const res = await walletSignData(publicDeriver, password, address, stringToHex(message))
+      let res;
+      if (wallet.type === 'mnemonic') {
+        const publicDeriver = await getPublicDeriverById(wallet.publicDeriverId)
+        res = await walletSignData(publicDeriver, password, address, stringToHex(message))
+      } else if (wallet.type === 'ledger') {
+        const ledgerConnect = new LedgerConnect({
+          locale: stores.profile.currentLocale,
+        });
+        const { signatureHex, signingPublicKeyHex, addressFieldHex } = await ledgerConnect.signMessage({
+          serial: null,
+          params: {
+            messageHex: stringToHex(message),
+            signingPath: addressing.path,
+            hashPayload: false,
+            addressFieldType: MessageAddressFieldType.KEY_HASH,
+          },
+        });
+        res = {
+          signature: signatureHex,
+          key: signingPublicKeyHex,
+        };
+      } else {
+        throw new Error('unsupported wallet type');
+      }
       iframeRef.current?.contentWindow.postMessage({ to: 'bringweb3', action: 'SIGNATURE', ...res, message, address }, '*');
       setSignaturePopup(false)
       setPassword('')
@@ -179,13 +205,16 @@ return (
             actions={[{
               label: 'CONFIRM',
               primary: true,
-              disabled: !password,
+              disabled: wallet.type === 'mnemonic' && !password,
               onClick: () => signMessage(message, password)
             }]}
           >
             <Box>
               <Typography sx={{ marginBottom: "16px", color: theme.name === 'light-theme' ? '#242838' : '#E1E6F5' }}>
-                Enter your password to claim cashback rewards.
+                {wallet.type === 'mnemonic' ?
+                 'Enter your password to claim cashback rewards.' :
+                 'Confirm on your hardware wallet to claim cashback rewards.'
+                }
               </Typography>
               <Typography sx={{ color: theme.name === 'light-theme' ? '#6B7384' : '#7C85A3' }}>
                 Message
@@ -195,28 +224,30 @@ return (
               }}>
                 {message}
               </DialogContentText>
-              <TextField
-                className="walletPassword"
-                value={password}
-                label="Password"
-                type="password"
-                // endAdornment={
-                //   <InputAdornment position="end">
-                //     <IconButton
-                //       aria-label="toggle password visibility"
-                //       onClick={() => setShowPassword(!showPassword)}
-                //       edge="end"
-                //     >
-                //       {!showPassword ? <Icon.VisibilityOff /> : <Icon.VisibilityOn />}
-                //     </IconButton>
-                //   </InputAdornment>
-                // }
-                onChange={e => {
-                  setPassword(e.target.value);
-                }}
-                error={!!errMsg}
-                disabled={false}
-              />
+              {wallet.type === 'mnemonic' && (
+                <TextField
+                  className="walletPassword"
+                  value={password}
+                  label="Password"
+                  type="password"
+                  // endAdornment={
+                  //   <InputAdornment position="end">
+                  //     <IconButton
+                  //       aria-label="toggle password visibility"
+                  //       onClick={() => setShowPassword(!showPassword)}
+                  //       edge="end"
+                  //     >
+                  //       {!showPassword ? <Icon.VisibilityOff /> : <Icon.VisibilityOn />}
+                  //     </IconButton>
+                  //   </InputAdornment>
+                  // }
+                  onChange={e => {
+                    setPassword(e.target.value);
+                  }}
+                  error={!!errMsg}
+                  disabled={false}
+                />
+              )}
             </Box>
           </Dialog>
           : null}

From cb46cbefeb88c667ee0a24718ed59aadd7ca95cd Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Thu, 31 Oct 2024 17:35:24 +0800
Subject: [PATCH 034/143] handling cashback submission errors

---
 .../app/containers/cashback/CashbackPage.js   | 70 +++++++++++++------
 1 file changed, 47 insertions(+), 23 deletions(-)

diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index d0060e7896..d3e2f426f7 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -3,7 +3,6 @@ import { useState, useEffect, useCallback, Suspense, useRef } from 'react';
 import styles from './styles.module.css'
 import type { Node } from 'react';
 import { observer } from 'mobx-react';
-import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import type { StoresAndActionsProps } from '../../types/injectedProps.types';
 import TopBarLayout from '../../components/layout/TopBarLayout';
 import BannerContainer from '../banners/BannerContainer';
@@ -27,11 +26,17 @@ import { RustModule } from '../../api/ada/lib/cardanoCrypto/rustLoader';
 import { Box, TextField, InputAdornment, IconButton, Tooltip, Typography, DialogContentText } from '@mui/material';
 import { LedgerConnect } from '../../utils/hwConnectHandler';
 import { MessageAddressFieldType } from '@cardano-foundation/ledgerjs-hw-app-cardano';
+import { WrongPassphraseError } from '../../api/ada/lib/cardanoCrypto/cryptoErrors';
+import { IncorrectWalletPasswordError } from '../../api/common/errors';
+import { convertToLocalizableError } from '../../domain/LedgerLocalizedError';
+import LocalizableError from '../../i18n/LocalizableError';
+import type { $npm$ReactIntl$IntlShape } from 'react-intl';
+import { injectIntl } from 'react-intl';
 
 type Props = StoresAndActionsProps;
 
 type InjectedLayoutProps = {| +renderLayoutComponent: LayoutComponentMap => Node |};
-type AllProps = {| ...Props, ...InjectedLayoutProps |};
+type AllProps = {| ...Props, ...InjectedLayoutProps, intl: $npm$ReactIntl$IntlShape, |};
 
 type IframeMessageData = {|
   action: string,
@@ -41,12 +46,11 @@ type IframeMessageData = {|
         |};
 
 const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllProps) => {
-  const { actions, stores } = props;
+  const { actions, stores, intl } = props;
   const wallet = stores.wallets.selected;
   if (!wallet) throw Error('no publicDeriver');
 
   const theme = useTheme();
-  // const intl = useContext(IntlContext);
 
   const iframeRef = useRef < HTMLIFrameElement | null > (null);
   const [iframeSrc, setIframeSrc] = useState('');
@@ -101,32 +105,51 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
       let res;
       if (wallet.type === 'mnemonic') {
         const publicDeriver = await getPublicDeriverById(wallet.publicDeriverId)
-        res = await walletSignData(publicDeriver, password, address, stringToHex(message))
+        try {
+          res = await walletSignData(publicDeriver, password, address, stringToHex(message))
+        } catch (error) {
+          if (error instanceof WrongPassphraseError) {
+            throw new IncorrectWalletPasswordError();
+          }
+          throw error;
+        }
       } else if (wallet.type === 'ledger') {
         const ledgerConnect = new LedgerConnect({
           locale: stores.profile.currentLocale,
         });
-        const { signatureHex, signingPublicKeyHex, addressFieldHex } = await ledgerConnect.signMessage({
-          serial: null,
-          params: {
-            messageHex: stringToHex(message),
-            signingPath: addressing.path,
-            hashPayload: false,
-            addressFieldType: MessageAddressFieldType.KEY_HASH,
-          },
-        });
-        res = {
-          signature: signatureHex,
-          key: signingPublicKeyHex,
-        };
+        try {
+          const { signatureHex, signingPublicKeyHex, addressFieldHex } = await ledgerConnect.signMessage({
+            serial: null,
+            params: {
+              messageHex: stringToHex(message),
+              signingPath: addressing.path,
+              hashPayload: false,
+              addressFieldType: MessageAddressFieldType.KEY_HASH,
+            },
+          });
+          res = {
+            signature: signatureHex,
+            key: signingPublicKeyHex,
+          };
+        } catch (error) {
+          throw new convertToLocalizableError(error);
+        }
       } else {
         throw new Error('unsupported wallet type');
       }
-      iframeRef.current?.contentWindow.postMessage({ to: 'bringweb3', action: 'SIGNATURE', ...res, message, address }, '*');
-      setSignaturePopup(false)
-      setPassword('')
+      iframeRef.current?.contentWindow.postMessage(
+        {
+          to: 'bringweb3',
+          action: 'SIGNATURE',
+          ...res,
+          message, address
+        },
+        '*'
+      );
+      setSignaturePopup(false);
+      setPassword('');
     } catch (error) {
-      setErrMsg(error.message)
+      setErrMsg(error instanceof LocalizableError ? intl.formatMessage(error) : error.message)
       // console.warn(error);
     }
   }, []);
@@ -248,6 +271,7 @@ return (
                   disabled={false}
                 />
               )}
+              { errMsg }
             </Box>
           </Dialog>
           : null}
@@ -274,4 +298,4 @@ return (
 );
 });
 
-export default (withLayout(CashbackPageContainer): React$ComponentType < Props >);
+export default (injectIntl((withLayout(CashbackPageContainer))): React$ComponentType < Props >);

From f50fa93c1f73940944c0f64b9939a89503c87b74 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Thu, 31 Oct 2024 17:41:44 +0800
Subject: [PATCH 035/143] indent code

---
 .../app/containers/cashback/CashbackPage.js   | 258 +++++++++---------
 1 file changed, 129 insertions(+), 129 deletions(-)

diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index d3e2f426f7..fc11c62ccb 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -40,10 +40,10 @@ type AllProps = {| ...Props, ...InjectedLayoutProps, intl: $npm$ReactIntl$IntlSh
 
 type IframeMessageData = {|
   action: string,
-    overlayBgColor ?: string,
-    messageToSign: string,
-      amount: number
-        |};
+  overlayBgColor ?: string,
+  messageToSign: string,
+  amount: number
+|};
 
 const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllProps) => {
   const { actions, stores, intl } = props;
@@ -163,139 +163,139 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
 
     const messageData: IframeMessageData = (event.data: any);
 
-  if (messageData.action === 'SIGN_MESSAGE') {
-    setClaimAmount(messageData.amount)
+    if (messageData.action === 'SIGN_MESSAGE') {
+      setClaimAmount(messageData.amount)
 
-    setMessage(messageData.messageToSign)
-    setSignaturePopup(true)
-  } else if (messageData.action === 'POPUP_OPENED') {
-    setPopup(true);
-    setOverlayBgColor(messageData.overlayBgColor || overlayBgColor);
-  } else if (messageData.action === 'POPUP_CLOSED') {
-    setPopup(false);
-  }
-}, [iframeSrc, overlayBgColor]);
+      setMessage(messageData.messageToSign)
+      setSignaturePopup(true)
+    } else if (messageData.action === 'POPUP_OPENED') {
+      setPopup(true);
+      setOverlayBgColor(messageData.overlayBgColor || overlayBgColor);
+    } else if (messageData.action === 'POPUP_CLOSED') {
+      setPopup(false);
+    }
+  }, [iframeSrc, overlayBgColor]);
 
-useEffect(() => {
-  if (environment.isLight) {
-    actions.router.goToRoute.trigger({
-      route: ROUTES.MY_WALLETS,
-    });
-  }
-  if (!iframeSrc) fetchIframeUrl();
+  useEffect(() => {
+    if (environment.isLight) {
+      actions.router.goToRoute.trigger({
+        route: ROUTES.MY_WALLETS,
+      });
+    }
+    if (!iframeSrc) fetchIframeUrl();
 
-  window.addEventListener('message', handleMessage);
+    window.addEventListener('message', handleMessage);
 
-  return () => {
-    window.removeEventListener('message', handleMessage);
-  };
-}, [iframeSrc, fetchIframeUrl, handleMessage]);
+    return () => {
+      window.removeEventListener('message', handleMessage);
+    };
+  }, [iframeSrc, fetchIframeUrl, handleMessage]);
 
-const closePopup = useCallback(() => {
-  iframeRef.current?.contentWindow.postMessage({ to: 'bringweb3', action: 'CLOSE_POPUP' }, '*');
-  setPopup(false);
-}, []);
+  const closePopup = useCallback(() => {
+    iframeRef.current?.contentWindow.postMessage({ to: 'bringweb3', action: 'CLOSE_POPUP' }, '*');
+    setPopup(false);
+  }, []);
 
-const abortClaim = useCallback(() => {
-  iframeRef.current?.contentWindow.postMessage({ to: 'bringweb3', action: 'ABORT_SIGN_MESSAGE' }, '*');
-  setSignaturePopup(false)
-  setPassword('')
-}, []);
+  const abortClaim = useCallback(() => {
+    iframeRef.current?.contentWindow.postMessage({ to: 'bringweb3', action: 'ABORT_SIGN_MESSAGE' }, '*');
+    setSignaturePopup(false)
+    setPassword('')
+  }, []);
 
-const sidebarContainer = <SidebarContainer actions={actions} stores={stores} />;
+  const sidebarContainer = <SidebarContainer actions={actions} stores={stores} />;
 
-return (
-  <TopBarLayout
-    banner={<BannerContainer actions={actions} stores={stores} />}
-    sidebar={sidebarContainer}
-    navbar={
-      <NavBarContainerRevamp
-        actions={actions}
-        stores={stores}
-        title={<NavBarTitle title={'Cashback'} />}
-      // title={<NavBarTitle title={intl.formatMessage(globalMessages.sidebarCashback)} />}
-      />
-    }
-  >
-    <FullscreenLayout bottomPadding={0}>
-      <Suspense fallback={null}>
-        {signaturePopup ?
-          <Dialog
-            title='CLAIM CASHBACK'
-            closeOnOverlayClick
-            closeButton={<DialogCloseButton />}
-            onClose={abortClaim}
-            actions={[{
-              label: 'CONFIRM',
-              primary: true,
-              disabled: wallet.type === 'mnemonic' && !password,
-              onClick: () => signMessage(message, password)
-            }]}
-          >
-            <Box>
-              <Typography sx={{ marginBottom: "16px", color: theme.name === 'light-theme' ? '#242838' : '#E1E6F5' }}>
-                {wallet.type === 'mnemonic' ?
-                 'Enter your password to claim cashback rewards.' :
-                 'Confirm on your hardware wallet to claim cashback rewards.'
-                }
-              </Typography>
-              <Typography sx={{ color: theme.name === 'light-theme' ? '#6B7384' : '#7C85A3' }}>
-                Message
-              </Typography>
-              <DialogContentText sx={{
-                whiteSpace: 'pre-wrap', wordBreak: 'break-word', color: theme.name === 'light-theme' ? '#242838' : '#E1E6F5'
-              }}>
-                {message}
-              </DialogContentText>
-              {wallet.type === 'mnemonic' && (
-                <TextField
-                  className="walletPassword"
-                  value={password}
-                  label="Password"
-                  type="password"
-                  // endAdornment={
-                  //   <InputAdornment position="end">
-                  //     <IconButton
-                  //       aria-label="toggle password visibility"
-                  //       onClick={() => setShowPassword(!showPassword)}
-                  //       edge="end"
-                  //     >
-                  //       {!showPassword ? <Icon.VisibilityOff /> : <Icon.VisibilityOn />}
-                  //     </IconButton>
-                  //   </InputAdornment>
-                  // }
-                  onChange={e => {
-                    setPassword(e.target.value);
-                  }}
-                  error={!!errMsg}
-                  disabled={false}
-                />
-              )}
-              { errMsg }
-            </Box>
-          </Dialog>
-          : null}
-        {popup ? (
-          <div
-            className={styles.iframe_overlay}
-            style={{ background: overlayBgColor }}
-            onClick={closePopup}
-          />
-        ) : null}
-        {iframeSrc && (
-          <iframe
-            ref={iframeRef}
-            id="bringweb3"
-            className={styles.iframe}
-            src={iframeSrc}
-            width="100%"
-            height="100%"
-          />
-        )}
-      </Suspense>
-    </FullscreenLayout>
-  </TopBarLayout >
-);
+  return (
+    <TopBarLayout
+      banner={<BannerContainer actions={actions} stores={stores} />}
+      sidebar={sidebarContainer}
+      navbar={
+        <NavBarContainerRevamp
+          actions={actions}
+          stores={stores}
+          title={<NavBarTitle title={'Cashback'} />}
+          // title={<NavBarTitle title={intl.formatMessage(globalMessages.sidebarCashback)} />}
+        />
+      }
+    >
+      <FullscreenLayout bottomPadding={0}>
+        <Suspense fallback={null}>
+          {signaturePopup ?
+            <Dialog
+              title='CLAIM CASHBACK'
+              closeOnOverlayClick
+              closeButton={<DialogCloseButton />}
+              onClose={abortClaim}
+              actions={[{
+                label: 'CONFIRM',
+                primary: true,
+                disabled: wallet.type === 'mnemonic' && !password,
+                onClick: () => signMessage(message, password)
+              }]}
+            >
+              <Box>
+                <Typography sx={{ marginBottom: "16px", color: theme.name === 'light-theme' ? '#242838' : '#E1E6F5' }}>
+                  {wallet.type === 'mnemonic' ?
+                   'Enter your password to claim cashback rewards.' :
+                   'Confirm on your hardware wallet to claim cashback rewards.'
+                  }
+                </Typography>
+                <Typography sx={{ color: theme.name === 'light-theme' ? '#6B7384' : '#7C85A3' }}>
+                  Message
+                </Typography>
+                <DialogContentText sx={{
+                  whiteSpace: 'pre-wrap', wordBreak: 'break-word', color: theme.name === 'light-theme' ? '#242838' : '#E1E6F5'
+                }}>
+                  {message}
+                </DialogContentText>
+                {wallet.type === 'mnemonic' && (
+                  <TextField
+                    className="walletPassword"
+                    value={password}
+                    label="Password"
+                    type="password"
+                    // endAdornment={
+                    //   <InputAdornment position="end">
+                    //     <IconButton
+                    //       aria-label="toggle password visibility"
+                    //       onClick={() => setShowPassword(!showPassword)}
+                    //       edge="end"
+                    //     >
+                    //       {!showPassword ? <Icon.VisibilityOff /> : <Icon.VisibilityOn />}
+                    //     </IconButton>
+                    //   </InputAdornment>
+                    // }
+                    onChange={e => {
+                      setPassword(e.target.value);
+                    }}
+                    error={!!errMsg}
+                    disabled={false}
+                  />
+                )}
+                { errMsg }
+              </Box>
+            </Dialog>
+            : null}
+          {popup ? (
+            <div
+              className={styles.iframe_overlay}
+              style={{ background: overlayBgColor }}
+              onClick={closePopup}
+            />
+          ) : null}
+          {iframeSrc && (
+            <iframe
+              ref={iframeRef}
+              id="bringweb3"
+              className={styles.iframe}
+              src={iframeSrc}
+              width="100%"
+              height="100%"
+            />
+          )}
+        </Suspense>
+      </FullscreenLayout>
+    </TopBarLayout >
+  );
 });
 
 export default (injectIntl((withLayout(CashbackPageContainer))): React$ComponentType < Props >);

From 25265e0f519f637801075f6032d56b92dab38211 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Thu, 31 Oct 2024 18:09:11 +0800
Subject: [PATCH 036/143] i18n

---
 .../app/containers/cashback/CashbackPage.js   | 37 ++++++++++++++-----
 .../app/i18n/locales/en-US.json               |  4 ++
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index fc11c62ccb..cd00546da0 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -31,7 +31,26 @@ import { IncorrectWalletPasswordError } from '../../api/common/errors';
 import { convertToLocalizableError } from '../../domain/LedgerLocalizedError';
 import LocalizableError from '../../i18n/LocalizableError';
 import type { $npm$ReactIntl$IntlShape } from 'react-intl';
-import { injectIntl } from 'react-intl';
+import { injectIntl, defineMessages, } from 'react-intl';
+
+const messages = defineMessages({
+  claim: {
+    id: 'cashback.claim.dialog.title',
+    defaultMessage: '!!!CLAIM CASHBACK',
+  },
+  passwordClaimInstruction: {
+    id: 'cashback.claim.dialog.instruction.password',
+    defaultMessage: '!!!Enter your password to claim cashback rewards.',
+  },
+  hardwardClaimInstruction: {
+    id: 'cashback.claim.dialog.instruction.hardware',
+    defaultMessage: '!!!Confirm on your hardware wallet to claim cashback rewards.',
+  },
+  message: {
+    id: 'cashback.claim.dialog.message.label',
+    defaultMessage: '!!!Message',
+  },
+});
 
 type Props = StoresAndActionsProps;
 
@@ -212,8 +231,7 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
         <NavBarContainerRevamp
           actions={actions}
           stores={stores}
-          title={<NavBarTitle title={'Cashback'} />}
-          // title={<NavBarTitle title={intl.formatMessage(globalMessages.sidebarCashback)} />}
+          title={<NavBarTitle title={intl.formatMessage(globalMessages.sidebarCashback)} />}
         />
       }
     >
@@ -221,12 +239,12 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
         <Suspense fallback={null}>
           {signaturePopup ?
             <Dialog
-              title='CLAIM CASHBACK'
+              title={intl.formatMessage(messages.claim)}
               closeOnOverlayClick
               closeButton={<DialogCloseButton />}
               onClose={abortClaim}
               actions={[{
-                label: 'CONFIRM',
+                label: intl.formatMessage(globalMessages.confirm),
                 primary: true,
                 disabled: wallet.type === 'mnemonic' && !password,
                 onClick: () => signMessage(message, password)
@@ -234,13 +252,12 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
             >
               <Box>
                 <Typography sx={{ marginBottom: "16px", color: theme.name === 'light-theme' ? '#242838' : '#E1E6F5' }}>
-                  {wallet.type === 'mnemonic' ?
-                   'Enter your password to claim cashback rewards.' :
-                   'Confirm on your hardware wallet to claim cashback rewards.'
-                  }
+                  {intl.formatMessage(wallet.type === 'mnemonic' ?
+                    messages.passwordClaimInstruction : messages. hardwardClaimInstruction
+                  )}
                 </Typography>
                 <Typography sx={{ color: theme.name === 'light-theme' ? '#6B7384' : '#7C85A3' }}>
-                  Message
+                  {intl.formatMessage(messages.message)}
                 </Typography>
                 <DialogContentText sx={{
                   whiteSpace: 'pre-wrap', wordBreak: 'break-word', color: theme.name === 'light-theme' ? '#242838' : '#E1E6F5'
diff --git a/packages/yoroi-extension/app/i18n/locales/en-US.json b/packages/yoroi-extension/app/i18n/locales/en-US.json
index 74d07c21d3..2b0447f9d0 100644
--- a/packages/yoroi-extension/app/i18n/locales/en-US.json
+++ b/packages/yoroi-extension/app/i18n/locales/en-US.json
@@ -61,6 +61,10 @@
   "buysell.dialog.providerFee": "Provider fee",
   "buysell.dialog.title": "Exchange ADA",
   "buysell.end.text": "Congrats! 🎉 Your transaction is now in progress. You should be receiving the funds soon.",
+  "cashback.claim.dialog.instruction.hardware": "Confirm on your hardware wallet to claim cashback rewards.",
+  "cashback.claim.dialog.instruction.password": "Enter your password to claim cashback rewards.",
+  "cashback.claim.dialog.message.label": "Message",
+  "cashback.claim.dialog.title": "CLAIM CASHBACK",
   "connector.appName": "Dapp Connector",
   "connector.appNameShort": "Connector",
   "connector.assetReceived": "{assetName} received",

From f63a452454d4ca9f13a5acb1ff0b18734f081521 Mon Sep 17 00:00:00 2001
From: kalfada <kalfada3321@gmail.com>
Date: Thu, 31 Oct 2024 15:50:30 +0200
Subject: [PATCH 037/143] style: change cashback icon

---
 .../app/assets/images/sidebar/cashback.inline.svg             | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/yoroi-extension/app/assets/images/sidebar/cashback.inline.svg b/packages/yoroi-extension/app/assets/images/sidebar/cashback.inline.svg
index 6b4cc204c1..67c836e086 100644
--- a/packages/yoroi-extension/app/assets/images/sidebar/cashback.inline.svg
+++ b/packages/yoroi-extension/app/assets/images/sidebar/cashback.inline.svg
@@ -1,5 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M2 5C2 2.79086 3.79086 1 6 1C8.20914 1 10 2.79086 10 5C10 7.20914 8.20914 9 6 9C3.79086 9 2 7.20914 2 5ZM6 3C4.89543 3 4 3.89543 4 5C4 6.10457 4.89543 7 6 7C7.10457 7 8 6.10457 8 5C8 3.89543 7.10457 3 6 3Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.9666 9.75994C18.5449 9.21519 19.3155 8.92183 20.1098 8.94428C20.9056 8.96678 21.66 9.3045 22.2068 9.88315C22.7536 10.4618 23.0482 11.234 23.0257 12.0298C23.0032 12.8245 22.6664 13.5778 22.0893 14.1245L22.0868 14.1268L17.5213 18.4939C16.6077 19.516 15.3317 20 14 20H10.0333L2.56661 20.4975C2.29046 20.5159 2.01903 20.419 1.81693 20.23C1.61482 20.0409 1.50012 19.7765 1.50012 19.4997V14.3C1.50012 13.7477 1.94784 13.3 2.50012 13.3H5.39638L7.8559 10.9283C8.40016 10.2574 9.21589 10 9.99998 10H13C13.7956 10 14.5587 10.3161 15.1213 10.8787C15.3925 11.1499 15.6064 11.4677 15.7553 11.8133L17.9666 9.75994ZM15.0512 15.1892C14.4961 15.7093 13.763 16 13 16H11C10.4477 16 9.99998 15.5523 9.99998 15C9.99998 14.4477 10.4477 14 11 14H13C13.2652 14 13.5195 13.8946 13.7071 13.7071C13.8946 13.5196 14 13.2652 14 13C14 12.7348 13.8946 12.4804 13.7071 12.2929C13.5195 12.1054 13.2652 12 13 12H9.99998C9.61141 12 9.45671 12.1244 9.39998 12.2C9.36795 12.2427 9.33255 12.2828 9.29412 12.3198L6.49412 15.0198C6.30774 15.1996 6.05891 15.3 5.79998 15.3H3.50012V18.4309L9.9335 18.0022C9.95563 18.0007 9.9778 18 9.99998 18H14C14.853 18 15.563 17.6951 16.0474 17.1415C16.0669 17.1192 16.0874 17.0978 16.1088 17.0774L20.7131 12.6732C20.9063 12.4907 21.019 12.2389 21.0265 11.9733C21.034 11.7077 20.9357 11.45 20.7532 11.2568C20.5707 11.0637 20.3189 10.951 20.0533 10.9435C19.7877 10.936 19.53 11.0343 19.3368 11.2168L19.3305 11.2228L15.1304 15.1228C15.1049 15.1465 15.0784 15.1686 15.0512 15.1892Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M15 3C13.3431 3 12 4.34315 12 6C12 7.65685 13.3431 9 15 9C16.6569 9 18 7.65685 18 6C18 4.34315 16.6569 3 15 3ZM14 6C14 5.44772 14.4477 5 15 5C15.5523 5 16 5.44772 16 6C16 6.55228 15.5523 7 15 7C14.4477 7 14 6.55228 14 6Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.46944 5.01207C8.80934 4.27863 8.12408 3.98923 7.51742 3.9998L7.5 3.99995C7.10218 3.99995 6.72064 4.15798 6.43934 4.43929C6.15804 4.72059 6 5.10212 6 5.49995C6 5.89777 6.15804 6.2793 6.43934 6.56061C6.72064 6.84191 7.10218 6.99995 7.5 6.99995H10.6419C10.3251 6.18851 9.92148 5.51433 9.46944 5.01207ZM11 8.99995V10.9999L5 10.9999L4 10.9999V8.99995H11ZM4.33772 6.99995C4.11743 6.53552 4 6.02379 4 5.49995C4 4.57169 4.36875 3.68145 5.02513 3.02507C5.67943 2.37077 6.56612 2.00228 7.4912 1.99996C8.81053 1.97987 10.0128 2.62607 10.956 3.67414C11.3497 4.11154 11.6987 4.61776 12 5.17651C12.3013 4.61776 12.6503 4.11154 13.044 3.67414C13.9872 2.62607 15.1895 1.97987 16.5088 1.99996C17.4339 2.00228 18.3206 2.37077 18.9749 3.02507C19.6312 3.68145 20 4.57169 20 5.49995C20 6.02379 19.8826 6.53552 19.6623 6.99995H20C21.1046 6.99995 22 7.89538 22 8.99995V10.9999C22 12.1045 21.1046 12.9999 20 12.9999V18.9999C20 19.7956 19.6839 20.5587 19.1213 21.1213C18.5587 21.6839 17.7957 21.9999 17 21.9999H7C6.20435 21.9999 5.44129 21.6839 4.87868 21.1213C4.31607 20.5587 4 19.7956 4 18.9999V12.9999C2.89543 12.9999 2 12.1045 2 10.9999V8.99995C2 7.89538 2.89543 6.99995 4 6.99995H4.33772ZM6 12.9999V18.9999C6 19.2652 6.10536 19.5195 6.29289 19.7071C6.48043 19.8946 6.73478 19.9999 7 19.9999H11V12.9999H6ZM13 12.9999V19.9999H17C17.2652 19.9999 17.5196 19.8946 17.7071 19.7071C17.8946 19.5195 18 19.2652 18 18.9999V12.9999H13ZM19 10.9999L20 10.9999V8.99995H13V10.9999L19 10.9999ZM16.5 6.99995C16.8978 6.99995 17.2794 6.84191 17.5607 6.56061C17.842 6.2793 18 5.89777 18 5.49995C18 5.10212 17.842 4.72059 17.5607 4.43929C17.2794 4.15798 16.8978 3.99995 16.5 3.99995L16.4826 3.9998C15.8759 3.98923 15.1907 4.27863 14.5306 5.01207C14.0785 5.51433 13.6749 6.18851 13.3581 6.99995H16.5Z" fill="white"/>
 </svg>

From 9a6b807716a97816f772ad8c8629e7ed43929646 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Thu, 31 Oct 2024 23:43:54 +0800
Subject: [PATCH 038/143] stylize error text

---
 .../yoroi-extension/app/containers/cashback/CashbackPage.js   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index cd00546da0..7e1e5bfad2 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -288,7 +288,9 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
                     disabled={false}
                   />
                 )}
-                { errMsg }
+                <Typography color="ds.text_error">
+                  { errMsg }
+                </Typography>
               </Box>
             </Dialog>
             : null}

From 3f6f276eb9c831cd693ca0a75a975d7daafd5301 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Thu, 31 Oct 2024 23:46:24 +0800
Subject: [PATCH 039/143] use wildcard in frame-src and connect-src to allow
 both Bring production and sandbox

---
 packages/yoroi-extension/chrome/constants.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/yoroi-extension/chrome/constants.js b/packages/yoroi-extension/chrome/constants.js
index 8b6d2ac91e..9f6156523a 100644
--- a/packages/yoroi-extension/chrome/constants.js
+++ b/packages/yoroi-extension/chrome/constants.js
@@ -47,8 +47,8 @@ export function genCSP(request: {|
   connectSrc.push('https://onchain2.muesliswap.com/');
 
   // Bring
-  connectSrc.push('https://api.bringweb3.io/v1/extension/');
-  frameSrc.push('https://portal.bringweb3.io/');
+  frameSrc.push('https://*.bringweb3.io/')
+  connectSrc.push('https://*.bringweb3.io')
 
   // unsafe-inline is unfortunately required by style-loader (even in production builds)
   const evalStyle = "'unsafe-inline'";

From e538d97e59c45b7a9fe0c4e450526c58750aa9f6 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Fri, 1 Nov 2024 00:23:48 +0800
Subject: [PATCH 040/143] sign message hash

---
 .../app/containers/cashback/CashbackPage.js   | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index 7e1e5bfad2..5c399b79cc 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -25,13 +25,14 @@ import DialogTextBlock from '../../components/widgets/DialogTextBlock'
 import { RustModule } from '../../api/ada/lib/cardanoCrypto/rustLoader';
 import { Box, TextField, InputAdornment, IconButton, Tooltip, Typography, DialogContentText } from '@mui/material';
 import { LedgerConnect } from '../../utils/hwConnectHandler';
-import { MessageAddressFieldType } from '@cardano-foundation/ledgerjs-hw-app-cardano';
+import { MessageAddressFieldType, AddressType } from '@cardano-foundation/ledgerjs-hw-app-cardano';
 import { WrongPassphraseError } from '../../api/ada/lib/cardanoCrypto/cryptoErrors';
 import { IncorrectWalletPasswordError } from '../../api/common/errors';
 import { convertToLocalizableError } from '../../domain/LedgerLocalizedError';
 import LocalizableError from '../../i18n/LocalizableError';
 import type { $npm$ReactIntl$IntlShape } from 'react-intl';
 import { injectIntl, defineMessages, } from 'react-intl';
+import { getNetworkById } from '../../api/ada/lib/storage/database/prepackaged/networks';
 
 const messages = defineMessages({
   claim: {
@@ -137,13 +138,27 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
           locale: stores.profile.currentLocale,
         });
         try {
+          const network = getNetworkById(wallet.networkId);
+          const config = network.BaseConfig[0];
           const { signatureHex, signingPublicKeyHex, addressFieldHex } = await ledgerConnect.signMessage({
             serial: null,
             params: {
+              preferHexDisplay: false,
               messageHex: stringToHex(message),
               signingPath: addressing.path,
-              hashPayload: false,
-              addressFieldType: MessageAddressFieldType.KEY_HASH,
+              hashPayload: true,
+              addressFieldType: MessageAddressFieldType.ADDRESS,
+              address: {
+                type: AddressType.BASE_PAYMENT_KEY_STAKE_KEY,
+                params: {
+                  spendingPath: addressing.path,
+                  stakingPath: wallet.stakingAddressing.addressing.path,
+                },
+              },
+              network: {
+                protocolMagic: config.ByronNetworkId,
+                networkId: Number(config.ChainNetworkId),
+              },
             },
           });
           res = {

From d0b63daebc892d79d3028d73b872b8bb272fea6f Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Mon, 4 Nov 2024 19:31:31 +0800
Subject: [PATCH 041/143] fix for Ledger wallet

---
 .../app/containers/cashback/CashbackPage.js       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index 5c399b79cc..72df861612 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -17,7 +17,7 @@ import NavBarTitle from '../../components/topbar/NavBarTitle';
 import globalMessages from '../../i18n/global-messages';
 import { CoreAddressTypes } from '../../api/ada/lib/storage/database/primitives/enums';
 import { useTheme } from '@mui/material';
-import { walletSignData } from '../../api/ada';
+import { walletSignData, encodeHardwareWalletSignResult } from '../../api/ada';
 import { getPublicDeriverById } from '../../../chrome/extension/background/handlers/yoroi/utils';
 import Dialog from '../../components/widgets/Dialog';
 import DialogCloseButton from '../../components/widgets/DialogCloseButton';
@@ -140,11 +140,12 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
         try {
           const network = getNetworkById(wallet.networkId);
           const config = network.BaseConfig[0];
+          const messageHex = stringToHex(message);
           const { signatureHex, signingPublicKeyHex, addressFieldHex } = await ledgerConnect.signMessage({
             serial: null,
             params: {
               preferHexDisplay: false,
-              messageHex: stringToHex(message),
+              messageHex,
               signingPath: addressing.path,
               hashPayload: true,
               addressFieldType: MessageAddressFieldType.ADDRESS,
@@ -161,10 +162,12 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
               },
             },
           });
-          res = {
-            signature: signatureHex,
-            key: signingPublicKeyHex,
-          };
+          res = await encodeHardwareWalletSignResult(
+            addressFieldHex,
+            signatureHex,
+            messageHex,
+            signingPublicKeyHex,
+          );
         } catch (error) {
           throw new convertToLocalizableError(error);
         }

From c3c3864d3e29fa7eb522047521c9b036c5b7fe6f Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Tue, 5 Nov 2024 03:49:14 +0800
Subject: [PATCH 042/143] fix for Ledger wallet

---
 packages/yoroi-extension/app/api/ada/index.js    |  2 ++
 .../app/api/ada/lib/cardanoCrypto/utils.js       | 12 ++++++++++++
 .../app/containers/cashback/CashbackPage.js      |  4 +++-
 packages/yoroi-extension/package-lock.json       | 16 ++++++++--------
 packages/yoroi-extension/package.json            |  4 ++--
 5 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/packages/yoroi-extension/app/api/ada/index.js b/packages/yoroi-extension/app/api/ada/index.js
index 4d45651c83..eab205fc36 100644
--- a/packages/yoroi-extension/app/api/ada/index.js
+++ b/packages/yoroi-extension/app/api/ada/index.js
@@ -2686,11 +2686,13 @@ export async function encodeHardwareWalletSignResult(
   signatureHex: string,
   payloadHex: string,
   signingPublicKeyHex: string,
+  payloadHashed: boolean = false,
 ): Promise<{| signature: string, key: string |}> {
   const coseSign1 = await buildCoseSign1FromSignature (
     hexToBytes(addressHex),
     hexToBytes(signatureHex),
     hexToBytes(payloadHex),
+    payloadHashed,
   );
 
   const key = makeCip8Key(hexToBytes(signingPublicKeyHex));
diff --git a/packages/yoroi-extension/app/api/ada/lib/cardanoCrypto/utils.js b/packages/yoroi-extension/app/api/ada/lib/cardanoCrypto/utils.js
index 42b7ab8120..06f200fba6 100644
--- a/packages/yoroi-extension/app/api/ada/lib/cardanoCrypto/utils.js
+++ b/packages/yoroi-extension/app/api/ada/lib/cardanoCrypto/utils.js
@@ -106,6 +106,7 @@ export const buildCoseSign1FromSignature = async (
   address: Buffer,
   signature: Buffer,
   payload: Buffer,
+  payloadHashed: boolean = false,
 ): Promise<RustModule.MessageSigning.COSESign1> => {
   const protectedHeader = RustModule.MessageSigning.HeaderMap.new();
   protectedHeader.set_algorithm_id(
@@ -119,8 +120,19 @@ export const buildCoseSign1FromSignature = async (
   );
   const protectedSerialized = RustModule.MessageSigning.ProtectedHeaderMap.new(protectedHeader);
   const unprotected = RustModule.MessageSigning.HeaderMap.new();
+  if (payloadHashed) {
+    unprotected.set_header(
+      RustModule.MessageSigning.Label.new_text('hashed'),
+      RustModule.MessageSigning.CBORValue.new_special(
+        RustModule.MessageSigning.CBORSpecial.new_bool(true)
+      ),
+    );
+  }
   const headers = RustModule.MessageSigning.Headers.new(protectedSerialized, unprotected);
   const builder = RustModule.MessageSigning.COSESign1Builder.new(headers, payload, false);
+  if (payloadHashed) {
+    builder.hash_payload();
+  }
   return builder.build(signature);
 }
 
diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index 72df861612..454f5d4ff1 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -141,13 +141,14 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
           const network = getNetworkById(wallet.networkId);
           const config = network.BaseConfig[0];
           const messageHex = stringToHex(message);
+          const hashPayload = true;
           const { signatureHex, signingPublicKeyHex, addressFieldHex } = await ledgerConnect.signMessage({
             serial: null,
             params: {
               preferHexDisplay: false,
               messageHex,
               signingPath: addressing.path,
-              hashPayload: true,
+              hashPayload,
               addressFieldType: MessageAddressFieldType.ADDRESS,
               address: {
                 type: AddressType.BASE_PAYMENT_KEY_STAKE_KEY,
@@ -167,6 +168,7 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
             signatureHex,
             messageHex,
             signingPublicKeyHex,
+            hashPayload,
           );
         } catch (error) {
           throw new convertToLocalizableError(error);
diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index 0247bd8982..9016728661 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -15,7 +15,7 @@
         "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
         "@emotion/react": "^11.4.1",
         "@emotion/styled": "^11.3.0",
-        "@emurgo/cardano-message-signing-browser": "1.0.1",
+        "@emurgo/cardano-message-signing-browser": "1.1.0",
         "@emurgo/cardano-serialization-lib-browser": "12.1.1",
         "@emurgo/cip14-js": "2.0.0",
         "@emurgo/cip4-js": "1.0.5",
@@ -114,7 +114,7 @@
         "@babel/register": "7.12.13",
         "@babel/runtime": "7.12.18",
         "@babel/runtime-corejs3": "7.12.18",
-        "@emurgo/cardano-message-signing-nodejs": "1.0.1",
+        "@emurgo/cardano-message-signing-nodejs": "1.1.0",
         "@emurgo/cardano-serialization-lib-nodejs": "12.1.1",
         "@emurgo/cross-csl-nodejs": "5.1.2",
         "@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
@@ -2434,14 +2434,14 @@
       "integrity": "sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww=="
     },
     "node_modules/@emurgo/cardano-message-signing-browser": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@emurgo/cardano-message-signing-browser/-/cardano-message-signing-browser-1.0.1.tgz",
-      "integrity": "sha512-yC4Ymq44WR0bXO1wzxCoyc2W/RD1KSAla0oYhin7IYoVkp2raGp8wt7QNF4pDdNnTcejn5fyPyYY9dL4666H1w=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@emurgo/cardano-message-signing-browser/-/cardano-message-signing-browser-1.1.0.tgz",
+      "integrity": "sha512-LyeiGIqCyZu9DZnKsi4wlBjZA1MN+uy3Cqpb5J6RZWvFXDJnCoxrYB/EixUiGRD/la4WsldBgtPsrIHyGsVkpg=="
     },
     "node_modules/@emurgo/cardano-message-signing-nodejs": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@emurgo/cardano-message-signing-nodejs/-/cardano-message-signing-nodejs-1.0.1.tgz",
-      "integrity": "sha512-PoKh1tQnJX18f8iEr8Jk1KXxKCn9eqaSslMI1pyOJvYRJhQVDLCh0+9YReufjp0oFJIY1ShcrR+4/WnECVZUKQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@emurgo/cardano-message-signing-nodejs/-/cardano-message-signing-nodejs-1.1.0.tgz",
+      "integrity": "sha512-PQRc8K8wZshEdmQenNUzVtiI8oJNF/1uAnBhidee5C4o1l2mDLOW+ur46HWHIFKQ6x8mSJTllcjMscHgzju0gQ==",
       "dev": true
     },
     "node_modules/@emurgo/cardano-serialization-lib-browser": {
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
index 6d27a9f231..9da52c2c6e 100644
--- a/packages/yoroi-extension/package.json
+++ b/packages/yoroi-extension/package.json
@@ -76,7 +76,7 @@
     "@babel/register": "7.12.13",
     "@babel/runtime": "7.12.18",
     "@babel/runtime-corejs3": "7.12.18",
-    "@emurgo/cardano-message-signing-nodejs": "1.0.1",
+    "@emurgo/cardano-message-signing-nodejs": "1.1.0",
     "@emurgo/cardano-serialization-lib-nodejs": "12.1.1",
     "@emurgo/cross-csl-nodejs": "5.1.2",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
@@ -154,7 +154,7 @@
     "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",
-    "@emurgo/cardano-message-signing-browser": "1.0.1",
+    "@emurgo/cardano-message-signing-browser": "1.1.0",
     "@emurgo/cardano-serialization-lib-browser": "12.1.1",
     "@emurgo/cip14-js": "2.0.0",
     "@emurgo/cip4-js": "1.0.5",

From 85075e73d61c85cd948166ffc4faacffc1dd30bc Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Tue, 5 Nov 2024 15:45:09 +0800
Subject: [PATCH 043/143] fix code format

---
 packages/yoroi-extension/app/environment.js | 36 ++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/packages/yoroi-extension/app/environment.js b/packages/yoroi-extension/app/environment.js
index 0f96cca08e..350a1b622c 100644
--- a/packages/yoroi-extension/app/environment.js
+++ b/packages/yoroi-extension/app/environment.js
@@ -47,24 +47,24 @@ export const environment = ((
   }
 ): {
   getNetworkName: void => Network,
-    getVersion: void => string,
-      MOBX_DEV_TOOLS: ?string,
-        commit: string,
-          branch: string,
-            isJest: void => boolean,
-              isDev: void => boolean,
-                isNightly: void => boolean,
-                  isTest: void => boolean,
-                    isMainnet: void => boolean,
-                      isProduction: void => boolean,
-                        getWalletRefreshInterval: void => number,
-                          getServerStatusRefreshInterval: void => number,
-                            userAgentInfo: UserAgentInfo,
-                              isLight: boolean,
-                                bringBaseUrl: string,
-                                  bringIdentifier: string,
-                                    bringApiEndpoint: string,
-    ...
+  getVersion: void => string,
+  MOBX_DEV_TOOLS: ?string,
+  commit: string,
+  branch: string,
+  isJest: void => boolean,
+  isDev: void => boolean,
+  isNightly: void => boolean,
+  isTest: void => boolean,
+  isMainnet: void => boolean,
+  isProduction: void => boolean,
+  getWalletRefreshInterval: void => number,
+  getServerStatusRefreshInterval: void => number,
+  userAgentInfo: UserAgentInfo,
+  isLight: boolean,
+  bringBaseUrl: string,
+  bringIdentifier: string,
+  bringApiEndpoint: string,
+  ...
 });
 
 export default environment;

From 40c1f3d0443407f15fc78c6faa6c6699ba2e28d3 Mon Sep 17 00:00:00 2001
From: kalfada <kalfada3321@gmail.com>
Date: Tue, 5 Nov 2024 17:09:45 +0200
Subject: [PATCH 044/143] fix: update bringweb3 package

---
 .../chrome/content-scripts/bringInject.js            | 12 ++++++++++++
 packages/yoroi-extension/package-lock.json           |  8 ++++----
 packages/yoroi-extension/package.json                |  4 ++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/packages/yoroi-extension/chrome/content-scripts/bringInject.js b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
index b5e3fdedd5..324db921fb 100644
--- a/packages/yoroi-extension/chrome/content-scripts/bringInject.js
+++ b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
@@ -13,6 +13,7 @@ const darkTheme = {
   // Popup
   popupBg: "#15171F",
   popupShadow: "0px 6px 20px 0px rgba(0, 0, 0, 0.10), 0px 1px 8px 0px rgba(0, 0, 0, 0.06)",
+  xBtnFC: "#E1E6F5",
   // Primary button
   primaryBtnBg: "#4B6DDE",
   primaryBtnFS: "16px",
@@ -32,7 +33,11 @@ const darkTheme = {
   // Markdown
   markdownBg: "#15171F",
   markdownFS: "14px",
+  markdownFW: "400",
   markdownFC: "#E1E6F5",
+  markdownTitleFS: "14px",
+  markdownTitleFW: "500",
+  markdownTitleFC: "#E1E6F5",
   markdownBorderW: "1px",
   markdownRadius: "8px",
   markdownBorderC: "#262A38",
@@ -59,6 +64,7 @@ const darkTheme = {
   detailsAmountFC: "#7892E8",
   detailsAmountFW: "500",
   // Overlay
+  overlayWaitingBg: "#15171F",
   overlayBg: "#1F232ECC",
   overlayFS: "16px",
   overlayFW: "400",
@@ -107,6 +113,7 @@ const lightTheme = {
   // Popup
   popupBg: "#FFFFFF",
   popupShadow: "0px 6px 20px 0px rgba(0, 0, 0, 0.10), 0px 1px 8px 0px rgba(0, 0, 0, 0.06)",
+  xBtnFC: "#242838",
   // Primary button
   primaryBtnBg: "#4B6DDE",
   primaryBtnFC: "#FFFFFF",
@@ -126,7 +133,11 @@ const lightTheme = {
   // Markdown
   markdownBg: "#FFFFFF",
   markdownFS: "14px",
+  markdownFW: "400",
   markdownFC: "#242838",
+  markdownTitleFS: "14px",
+  markdownTitleFW: "500",
+  markdownTitleFC: "#242838",
   markdownBorderW: "1px",
   markdownRadius: "8px",
   markdownBorderC: "#DCE0E9",
@@ -153,6 +164,7 @@ const lightTheme = {
   detailsAmountFC: "#4B6DDE",
   detailsAmountFW: "500",
   // Overlay
+  overlayWaitingBg: "#FFFFFF",
   overlayBg: "#0000007A",
   overlayFS: "16px",
   overlayFW: "400",
diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index 4beea61af6..fb2e352e39 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@amplitude/analytics-browser": "^2.1.3",
         "@babel/preset-typescript": "^7.24.7",
-        "@bringweb3/chrome-extension-kit": "^1.1.9",
+        "@bringweb3/chrome-extension-kit": "^1.1.12",
         "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
         "@emotion/react": "^11.4.1",
         "@emotion/styled": "^11.3.0",
@@ -2138,9 +2138,9 @@
       "dev": true
     },
     "node_modules/@bringweb3/chrome-extension-kit": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/@bringweb3/chrome-extension-kit/-/chrome-extension-kit-1.1.9.tgz",
-      "integrity": "sha512-zYMOmbm80zBZZAd6LZmgavrZyIgEmFkGoZdXU5PCx1krSscBDGPaa9jkXBjgGO0r6kY6L8Uxr2taOtQdmYP+YQ=="
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/@bringweb3/chrome-extension-kit/-/chrome-extension-kit-1.1.12.tgz",
+      "integrity": "sha512-secOPnTvymcbYzpKIXNftbChrejURnjIFPo3crh6QKK+61y2Fz4eGlNnfzwasaX5ZXscXztIUV4cSVZH8xbFnQ=="
     },
     "node_modules/@cardano-foundation/ledgerjs-hw-app-cardano": {
       "version": "7.1.3",
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
index 3708661a39..2848be5819 100644
--- a/packages/yoroi-extension/package.json
+++ b/packages/yoroi-extension/package.json
@@ -150,7 +150,7 @@
   "dependencies": {
     "@amplitude/analytics-browser": "^2.1.3",
     "@babel/preset-typescript": "^7.24.7",
-    "@bringweb3/chrome-extension-kit": "^1.1.9",
+    "@bringweb3/chrome-extension-kit": "^1.1.12",
     "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",
@@ -171,12 +171,12 @@
     "@svgr/webpack": "5.5.0",
     "@vespaiach/axios-fetch-adapter": "^0.3.1",
     "@yoroi/exchange": "2.0.1",
+    "@yoroi/explorers": "^1.0.2",
     "@yoroi/portfolio": "1.0.3",
     "@yoroi/resolver": "2.0.2",
     "@yoroi/staking": "^1.5.1",
     "@yoroi/swap": "1.5.2",
     "@yoroi/types": "1.5.8",
-    "@yoroi/explorers": "^1.0.2",
     "assert": "2.1.0",
     "async-await-queue": "2.1.4",
     "axios": "0.21.1",

From 5030e42f4e13507e2d126b709c75240e1701708f Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 6 Nov 2024 15:53:04 +0800
Subject: [PATCH 045/143] fix Ledger error message handling

---
 .../app/domain/LedgerLocalizedError.js            | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/yoroi-extension/app/domain/LedgerLocalizedError.js b/packages/yoroi-extension/app/domain/LedgerLocalizedError.js
index 3df2297340..e31160c223 100644
--- a/packages/yoroi-extension/app/domain/LedgerLocalizedError.js
+++ b/packages/yoroi-extension/app/domain/LedgerLocalizedError.js
@@ -95,6 +95,16 @@ export function convertToLocalizableError(error: Error): LocalizableError {
         ledgerErrors.cancelOnDeviceError101
       );
     }
+    if (
+      // Not running the Cardano app on Ledger
+      /General error 0x6e01/.test(error.message) ||
+        // Ledger is sleeping
+        /General error 0x5515/.test(error.message)
+    ) {
+      return new LocalizableError(
+        ledgerErrors.cardanoAppNotRunning
+      );
+    }
     // Ledger device related error happened, convert then to LocalizableError
     switch (error.message) {
       case 'TransportError: Failed to sign with Ledger device: U2F TIMEOUT':
@@ -125,11 +135,6 @@ export function convertToLocalizableError(error: Error): LocalizableError {
           ledgerErrors.cip15NotSupportedError106
         );
         break;
-      case 'DeviceStatusError: General error 0x6e01. Please consult https://github.com/cardano-foundation/ledger-app-cardano/blob/master/src/errors.h':
-        localizableError = new LocalizableError(
-          ledgerErrors.cardanoAppNotRunning
-        );
-        break;
       case 'DeviceVersionUnsupported: CIP36 registration not supported by Ledger app version 5.0.0.':
         localizableError = new LocalizableError(
           ledgerErrors.cip36NotSupported

From b451b6adcd5c1c9f35a259ec4fabbfc5246ab3bf Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 6 Nov 2024 15:56:55 +0800
Subject: [PATCH 046/143] clear error message after closing cashback claiming
 dialog

---
 packages/yoroi-extension/app/containers/cashback/CashbackPage.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index 454f5d4ff1..d5ea0bbd86 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -239,6 +239,7 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
     iframeRef.current?.contentWindow.postMessage({ to: 'bringweb3', action: 'ABORT_SIGN_MESSAGE' }, '*');
     setSignaturePopup(false)
     setPassword('')
+    setErrMsg('')
   }, []);
 
   const sidebarContainer = <SidebarContainer actions={actions} stores={stores} />;

From 610a19f8353886ac4516886505166116ae936b41 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Thu, 14 Nov 2024 18:30:01 +0800
Subject: [PATCH 047/143] get rid of double scroll

---
 packages/yoroi-extension/app/containers/cashback/CashbackPage.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index d5ea0bbd86..7d7a7342f0 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -328,6 +328,7 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
               id="bringweb3"
               className={styles.iframe}
               src={iframeSrc}
+              style={{ verticalAlign: "bottom" }}
               width="100%"
               height="100%"
             />

From ba0bf515b5b7da7f83f83ae078527c2a65f38bec Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 20 Nov 2024 02:01:21 +0800
Subject: [PATCH 048/143] restructure code

---
 .../chrome/content-scripts/bringInject.js     | 74 +++--------------
 .../chrome/content-scripts/bringLib.js        | 59 +++++++++++++
 .../chrome/content-scripts/inject.js          |  9 ++
 .../background/handlers/content/bring.js      | 83 +++++++++++++++++++
 .../background/handlers/content/index.js      |  3 +
 .../background/handlers/content/rpc.js        | 41 +--------
 6 files changed, 165 insertions(+), 104 deletions(-)
 create mode 100644 packages/yoroi-extension/chrome/content-scripts/bringLib.js
 create mode 100644 packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js

diff --git a/packages/yoroi-extension/chrome/content-scripts/bringInject.js b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
index 324db921fb..a163a31ce9 100644
--- a/packages/yoroi-extension/chrome/content-scripts/bringInject.js
+++ b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
@@ -1,12 +1,13 @@
 // @flow
-
-/*::
-declare var chrome;
-*/
-
 import { bringInitContentScript } from "@bringweb3/chrome-extension-kit";
+import {
+  getFirstAddress,
+  getTheme,
+  popUpWalletCreation,
+  listenForActiveWalletOpen,
+} from './bringLib';
 
-const darkTheme = {
+const darkTheme = Object.freeze({
   // font
   fontUrl: 'https://fonts.googleapis.com/css2?family=Rubik:ital,wght@0,300..900;1,300..900&display=swap',
   fontFamily: '"Rubik", sans-serif',
@@ -106,9 +107,9 @@ const darkTheme = {
   activateTitleBoldFS: "16px",
   activateTitleBoldFW: "500",
   activateTitleBoldFC: "#E1E6F5",
-}
+});
 
-const lightTheme = {
+const lightTheme = Object.freeze({
 
   // Popup
   popupBg: "#FFFFFF",
@@ -206,62 +207,7 @@ const lightTheme = {
   activateTitleBoldFS: "16px",
   activateTitleBoldFW: "500",
   activateTitleBoldFC: "#242838",
-}
-
-
-function getFromBackground(functionName: string, params: any): Promise<any> {
-  const uid = Math.random();
-  return new Promise((resolve, reject) => {
-    chrome.runtime.onMessage.addListener((msg, sender) => {
-      if (msg.type === 'connector_rpc_response' && msg.uid === uid) {
-        if (msg.return.ok) {
-          resolve(msg.return.ok);
-        } else {
-          reject(new Error(msg.return.err));
-        }
-      }
-    });
-
-    window.postMessage({
-      type: "connector_rpc_request",
-      url: location.hostname,
-      uid,
-      function: functionName,
-      params,
-      returnType: 'json',
-    });
-  });
-}
-
-async function getFirstAddress(): Promise<string | typeof undefined> {
-  try {
-    const usedAddresses = await getFromBackground('get_used_addresses', [undefined]);
-    if (usedAddresses.length > 0) {
-      return usedAddresses[0];
-    }
-    const unusedAddresses = await getFromBackground('get_unused_addresses', [undefined]);
-    return unusedAddresses[0];
-  } catch (error) {
-    return undefined
-  }
-}
-
-function getTheme(): Promise<'light' | 'dark'> {
-  return getFromBackground('get-theme-mode', [undefined]);
-}
-
-function popUpWalletCreation(): void {
-  getFromBackground('pop-up-wallet-creation');
-}
-
-function listenForActiveWalletOpen(callback) {
-  // todo: verify sender extension id
-  chrome.runtime.onMessage.addListener((msg, sender) => {
-    if (msg.type === 'active-wallet-open') {
-      callback();
-    }
-  });
-}
+});
 
 (async () => {
   await bringInitContentScript({
diff --git a/packages/yoroi-extension/chrome/content-scripts/bringLib.js b/packages/yoroi-extension/chrome/content-scripts/bringLib.js
new file mode 100644
index 0000000000..fe2d9ef432
--- /dev/null
+++ b/packages/yoroi-extension/chrome/content-scripts/bringLib.js
@@ -0,0 +1,59 @@
+// @flow
+declare var chrome;
+
+// We pass the RPC call inject.js and have it relay the request and reponse messages to the background,
+// instead of directly calling the background with chrome.runtime.sendMessage, so that this lib can also
+// be used in the web page process.
+const callbacks = [];
+
+window.addEventListener('message', (event) => {
+  if (event.data.type === 'bring_rpc_response') {
+    const callback = callbacks.splice(event.data.uid, 1)[0];
+    if (callback) {
+      callback(event.data);
+    }
+  }
+});
+
+function callBackground(functionName: string, params: any): Promise<any> {
+  console.log('>>>bring call', functionName, params);
+  return new Promise((resolve, reject) => {
+    callbacks.push((msg) => {
+      console.log('>>>bring return', msg.return);
+      if (msg.return.ok) {
+        resolve(msg.return.ok);
+      } else {
+        reject(new Error(msg.return.err));
+      }
+    });
+  
+    window.postMessage({
+      type: 'bring_rpc_request',
+      url: location.hostname,
+      uid: callbacks.length - 1,
+      function: functionName,
+      params,
+    });
+  });
+}
+
+export async function getFirstAddress(): Promise<string | typeof undefined> {
+  return await callBackground('get_addresses', [undefined]);
+}
+
+export function getTheme(): Promise<'light' | 'dark'> {
+  return callBackground('get-theme-mode', [undefined]);
+}
+
+export function popUpWalletCreation(): void {
+  callBackground('pop-up-wallet-creation');
+}
+
+export function listenForActiveWalletOpen(callback: () => void): void {
+  // todo: verify sender extension id
+  chrome.runtime.onMessage.addListener((msg, sender) => {
+    if (msg.type === 'active-wallet-open') {
+      callback();
+    }
+  });
+}
diff --git a/packages/yoroi-extension/chrome/content-scripts/inject.js b/packages/yoroi-extension/chrome/content-scripts/inject.js
index 4f0f74dc18..64f1368762 100644
--- a/packages/yoroi-extension/chrome/content-scripts/inject.js
+++ b/packages/yoroi-extension/chrome/content-scripts/inject.js
@@ -194,6 +194,8 @@ async function connectorEventListener(event) {
         await handleConnectorConnectRequest(event, protocol);
     } else if (dataType === 'scripted_injected') {
         resolveScriptedInject();
+    } else if (dataType === 'bring_rpc_request') {
+      await chrome.runtime.sendMessage(event.data);
     }
 }
 
@@ -249,3 +251,10 @@ window.addEventListener('message', function (event) {
     chrome.runtime.sendMessage(event.data);
   }
 });
+
+// relay message from background to Bring
+chrome.runtime.onMessage.addListener((message) => {
+  if (message.type === 'bring_rpc_response') {
+    window.postMessage(message, location.origin);
+  }
+});
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
new file mode 100644
index 0000000000..79a5959ad9
--- /dev/null
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
@@ -0,0 +1,83 @@
+// @flow
+import { sendToInjector, } from './utils';
+import LocalStorageApi from '../../../../../app/api/localStorage';
+import { isTrezorTWallet } from '../../../../../app/api/ada/lib/storage/models/ConceptualWallet/index';
+import { getAllAddressesForWallet } from '../../../../../app/api/ada/lib/storage/bridge/traitUtils';
+import { PublicDeriver, } from '../../../../../app/api/ada/lib/storage/models/PublicDeriver/index';
+import { getDb } from '../../state';
+import { loadWalletsFromStorage } from '../../../../../app/api/ada/lib/storage/models/load';
+
+declare var chrome;
+
+const handlers = Object.freeze({
+  'get-theme-mode': async () => {
+    const localStorageApi = new LocalStorageApi();
+    let theme = await localStorageApi.getUserThemeMode();
+    if (theme !== 'light' && theme !== 'dark') {
+      theme = 'light';
+    }
+    return { ok: theme };
+  },
+
+  'pop-up-wallet-creation': async () => {
+    chrome.tabs.create({ url: 'main_window.html' });
+    return { ok: undefined };
+  },
+
+  'get-address': async () => {
+    const publicDeriver = await getCashbackWallet();
+    if (!publicDeriver) {
+      return;
+    }
+    const result = (await getAllAddressesForWallet(publicDeriver)).accountingAddresses[0];
+    debugger
+  },
+});
+
+async function getCashbackWallet(): Promise<PublicDeriver<> | null> {
+  const localStorageApi = new LocalStorageApi();
+  // todo
+  const selectedPublicDeriverId = await localStorageApi.getSelectedWalletId();
+
+  const db = await getDb();
+  const publicDerivers = await loadWalletsFromStorage(db);
+
+  for (const publicDeriver of publicDerivers) {
+    if (
+      publicDeriver.getPublicDeriverId() === selectedPublicDeriverId &&
+        !isTrezorTWallet(publicDeriver.getParent())
+    ) {
+      return publicDeriver;
+    }
+  }
+
+  for (const publicDeriver of publicDerivers) {
+    if (!isTrezorTWallet(publicDeriver.getParent())) {
+      return publicDeriver;
+    }
+  }
+
+  return null;
+}
+
+function sendRpcResponse(response: Object, tabId: number, messageUid: number) {
+  sendToInjector(
+    tabId,
+    {
+      type: 'bring_rpc_response',
+      uid: messageUid,
+      return: response,
+    }
+  );
+}
+
+export async function handleBringRpc(message: Object, sender: Object) {
+  const handler = handlers[message.function];
+  
+  if (!handler) {
+    throw new Error('missing Bring handler for ' + message.function);
+  }
+
+  const result = await handler();
+  sendRpcResponse(result, sender.tab.id, message.uid);
+}
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/content/index.js b/packages/yoroi-extension/chrome/extension/background/handlers/content/index.js
index 8a7a8dc3b2..f4848bccfa 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/content/index.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/content/index.js
@@ -1,6 +1,7 @@
 // @flow
 import { handleRpc } from './rpc';
 import { handleConnect } from './connect';
+import { handleBringRpc } from './bring';
 import { stringifyError } from '../../../../../app/utils/logging';
 import { sendToInjector } from './utils';
 
@@ -22,6 +23,8 @@ export async function handleInjectorMessage(message: Object, sender: Object) {
     }
   } else if (message.type === 'connector_rpc_request') {
     await handleRpc(message, sender);
+  } else if (message.type === 'bring_rpc_request') {
+    await handleBringRpc(message, sender);
   }
 }
 
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js b/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js
index 541d7c2165..313c481050 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/content/rpc.js
@@ -67,7 +67,6 @@ import type { CardanoTxRequest } from '../../../../../app/api/ada';
 import type { NFTMetadata } from '../../../../../app/api/ada/lib/storage/database/primitives/tables';
 import { getProtocolParameters } from '../yoroi/protocolParameters';
 import { hexToBytes } from '../../../../../app/coreUtils';
-import { getPublicDeriverById } from '../yoroi/utils';
 
 declare var chrome;
 
@@ -642,25 +641,6 @@ const Handlers = Object.freeze({
       );
     }
   }),
-
-  'get-theme-mode': NewHandler.basic<
-    void,
-    'dark' | 'light'
-  >(async () => {
-    const localStorageApi = new LocalStorageApi();
-    let theme = await localStorageApi.getUserThemeMode();
-    if (theme !== 'light' && theme !== 'dark') {
-      theme = 'light';
-    }
-    return { ok: theme };
-  }),
-
-  'pop-up-wallet-creation': NewHandler.basic<
-    void,
-    void,
-  >(async () => {
-    chrome.tabs.create({ url: 'main_window.html' });
-  }),
 });
 
 function sendRpcResponse(response: Object, tabId: number, messageUid: number) {
@@ -708,26 +688,7 @@ export async function handleRpc(message: Object, sender: Object) {
 
     let connectedWallet = undefined;
     if (handler.needConnectedWallet) {
-      try {
-        connectedWallet = await getConnectedWallet(tabId, handler.syncConnectedWallet);
-      } catch (error) {
-        // fixme: unsafe
-        const localStorageApi = new LocalStorageApi();
-        const publicDeriverId = await localStorageApi.getSelectedWalletId();
-        if (publicDeriverId != null) {
-          connectedWallet = await getPublicDeriverById(publicDeriverId);
-        }
-        if (connectedWallet == null) {
-          sendRpcResponse(
-            {
-              err: 'no wallet',
-            },
-            tabId,
-            message.uid,
-          );
-          return;
-        }
-      }
+      connectedWallet = await getConnectedWallet(tabId, handler.syncConnectedWallet);
     }
 
     const result = await handler.handle({

From 995fa5303b1fe3b0d76bea5f136a0f4d4cb01d9f Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 20 Nov 2024 15:02:58 +0800
Subject: [PATCH 049/143] use chrome.storage instead of window.localStorage to
 record selected wallet

---
 .../app/api/localStorage/index.js                | 16 +++++++++++-----
 .../app/stores/toplevel/ProfileStore.js          |  2 +-
 .../app/stores/toplevel/WalletStore.js           |  5 ++---
 .../chrome/content-scripts/bringLib.js           |  4 +---
 .../background/handlers/content/bring.js         |  2 +-
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/packages/yoroi-extension/app/api/localStorage/index.js b/packages/yoroi-extension/app/api/localStorage/index.js
index 899f335b92..1c10dbe81f 100644
--- a/packages/yoroi-extension/app/api/localStorage/index.js
+++ b/packages/yoroi-extension/app/api/localStorage/index.js
@@ -126,15 +126,21 @@ export default class LocalStorageApi {
 
   // ========== Select Wallet ========== //
 
-  getSelectedWalletId: void => number | null = () => {
-    const id = localStorage.getItem(storageKeys.SELECTED_WALLET);
-    if (!id) return null;
+  getSelectedWalletId: void => Promise<number | null> = async () => {
+    let id = await getLocalItem(storageKeys.SELECTED_WALLET);
+    // previously it was stored in window.localStorage, which is not accessible in the mv3 service worker
+    if (!id) {
+      id = window?.localStorage.getItem(storageKeys.SELECTED_WALLET);
+    }
+    if (!id) {
+      return null;
+    }
     if (isNaN(Number(id))) throw new Error(`Invalid wallet Id: ${id}`);
     return Number(id);
   };
 
-  setSelectedWalletId: number => void = id => {
-    localStorage.setItem(storageKeys.SELECTED_WALLET, id.toString());
+  setSelectedWalletId: number => Promise<void> = async (id) => {
+    await setLocalItem(storageKeys.SELECTED_WALLET, id.toString());
   };
 
   // ========== Legacy Theme ========== //
diff --git a/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js b/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
index 6d431d8368..9e052dc189 100644
--- a/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
@@ -112,7 +112,7 @@ export default class ProfileStore extends BaseProfileStore<StoresMap, ActionsMap
           }
           const isRevamp = this.stores.profile.isRevampTheme;
           if (isRevamp) {
-            const lastSelectedWallet = this.stores.wallets.getLastSelectedWallet();
+            const lastSelectedWallet = await this.stores.wallets.getLastSelectedWallet();
             this.actions.router.goToRoute.trigger({
               route: ROUTES.WALLETS.ROOT,
               publicDeriverId: lastSelectedWallet?.publicDeriverId ?? firstWallet.publicDeriverId,
diff --git a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
index c102b993bb..36790a9830 100644
--- a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
@@ -292,13 +292,12 @@ export default class WalletStore extends Store<StoresMap, ActionsMap> {
       && !this.isInitialSyncing(publicDeriverId);
     this.selectedIndex = walletIndex;
     this.selectedWalletName = this.wallets[walletIndex].name;
-    // Cache select wallet
     this.api.localStorage.setSelectedWalletId(publicDeriverId);
     subscribe(publicDeriverId, changed);
   };
 
-  getLastSelectedWallet: void => ?WalletState = () => {
-    const walletId = this.api.localStorage.getSelectedWalletId();
+  getLastSelectedWallet: void => Promise<?WalletState> = async () => {
+    const walletId: ?number = await this.api.localStorage.getSelectedWalletId();
     return this.wallets.find(wallet => wallet.publicDeriverId === walletId);
   };
 
diff --git a/packages/yoroi-extension/chrome/content-scripts/bringLib.js b/packages/yoroi-extension/chrome/content-scripts/bringLib.js
index fe2d9ef432..c831e0f41e 100644
--- a/packages/yoroi-extension/chrome/content-scripts/bringLib.js
+++ b/packages/yoroi-extension/chrome/content-scripts/bringLib.js
@@ -16,10 +16,8 @@ window.addEventListener('message', (event) => {
 });
 
 function callBackground(functionName: string, params: any): Promise<any> {
-  console.log('>>>bring call', functionName, params);
   return new Promise((resolve, reject) => {
     callbacks.push((msg) => {
-      console.log('>>>bring return', msg.return);
       if (msg.return.ok) {
         resolve(msg.return.ok);
       } else {
@@ -38,7 +36,7 @@ function callBackground(functionName: string, params: any): Promise<any> {
 }
 
 export async function getFirstAddress(): Promise<string | typeof undefined> {
-  return await callBackground('get_addresses', [undefined]);
+  return await callBackground('get-address', [undefined]);
 }
 
 export function getTheme(): Promise<'light' | 'dark'> {
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
index 79a5959ad9..947f88dbb0 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
@@ -30,7 +30,7 @@ const handlers = Object.freeze({
       return;
     }
     const result = (await getAllAddressesForWallet(publicDeriver)).accountingAddresses[0];
-    debugger
+    return { ok: result.address.Hash };
   },
 });
 

From 173faaa7bd0f95199815d12ae502d6907685960e Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 20 Nov 2024 16:51:59 +0800
Subject: [PATCH 050/143] save cashback wallet

---
 .../app/api/localStorage/index.js             | 12 +++++++++++
 .../background/handlers/content/bring.js      | 20 +++++++++++++++----
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/packages/yoroi-extension/app/api/localStorage/index.js b/packages/yoroi-extension/app/api/localStorage/index.js
index 1c10dbe81f..30f89d8276 100644
--- a/packages/yoroi-extension/app/api/localStorage/index.js
+++ b/packages/yoroi-extension/app/api/localStorage/index.js
@@ -46,6 +46,8 @@ const storageKeys = {
   // ========== LEGACY USED FOR MIGRATIONS ========== //
   CUSTOM_THEME: networkForLocalStorage + '-CUSTOM-THEME',
   THEME: networkForLocalStorage + '-THEME',
+
+  CASHBACK_WALLET_ID: 'CASHBACK_WALLET_ID',
 };
 
 export type SetCustomUserThemeRequest = {|
@@ -332,6 +334,16 @@ export default class LocalStorageApi {
 
   unsetIsAnalyticsAllowed: void => Promise<void> = () => removeLocalItem(storageKeys.IS_ANALYTICS_ALLOWED);
 
+  saveCashbackWalletId: (number) => Promise<void> = (id) => setLocalItem(
+    storageKeys.CASHBACK_WALLET_ID,
+    String(id)
+  );
+
+  getCashbackWalletId: () => Promise<number> = async () => {
+    const v = await getLocalItem(storageKeys.CASHBACK_WALLET_ID);
+    return Number(v);
+  }
+
   async reset(): Promise<void> {
     await this.unsetUserLocale();
     await this.unsetComplexityLevel();
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
index 947f88dbb0..f5fce681a8 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
@@ -35,24 +35,36 @@ const handlers = Object.freeze({
 });
 
 async function getCashbackWallet(): Promise<PublicDeriver<> | null> {
-  const localStorageApi = new LocalStorageApi();
-  // todo
-  const selectedPublicDeriverId = await localStorageApi.getSelectedWalletId();
-
   const db = await getDb();
   const publicDerivers = await loadWalletsFromStorage(db);
+  const localStorageApi = new LocalStorageApi();
+  // try to load saved cashback wallet
+  const savedCashbackWalletId = await localStorageApi.getCashbackWalletId();
+  for (const publicDeriver of publicDerivers) {
+    if (
+      publicDeriver.getPublicDeriverId() === savedCashbackWalletId &&
+        !isTrezorTWallet(publicDeriver.getParent())
+    ) {
+      return publicDeriver;
+    }
+  }
 
+  // default to the selected wallet
+  const selectedPublicDeriverId = await localStorageApi.getSelectedWalletId();
   for (const publicDeriver of publicDerivers) {
     if (
       publicDeriver.getPublicDeriverId() === selectedPublicDeriverId &&
         !isTrezorTWallet(publicDeriver.getParent())
     ) {
+      await localStorageApi.saveCashbackWalletId(publicDeriver.getPublicDeriverId());
       return publicDeriver;
     }
   }
 
+  // selected wallet is a Trezor wallet, fall back to the first non-Trezor wallet
   for (const publicDeriver of publicDerivers) {
     if (!isTrezorTWallet(publicDeriver.getParent())) {
+      await localStorageApi.saveCashbackWalletId(publicDeriver.getPublicDeriverId());
       return publicDeriver;
     }
   }

From 61b31c4a897c6e1e393ca632a03dc70d4fb9c785 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 20 Nov 2024 19:49:58 +0800
Subject: [PATCH 051/143] add APIs to list wallets and set cashback wallet

---
 .../chrome/content-scripts/bringLib.js        | 18 ++++++++++----
 .../background/handlers/content/bring.js      | 24 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/packages/yoroi-extension/chrome/content-scripts/bringLib.js b/packages/yoroi-extension/chrome/content-scripts/bringLib.js
index c831e0f41e..b8e66fed80 100644
--- a/packages/yoroi-extension/chrome/content-scripts/bringLib.js
+++ b/packages/yoroi-extension/chrome/content-scripts/bringLib.js
@@ -18,10 +18,10 @@ window.addEventListener('message', (event) => {
 function callBackground(functionName: string, params: any): Promise<any> {
   return new Promise((resolve, reject) => {
     callbacks.push((msg) => {
-      if (msg.return.ok) {
-        resolve(msg.return.ok);
-      } else {
+      if (msg.return.err) {
         reject(new Error(msg.return.err));
+      } else {
+        resolve(msg.return.ok);
       }
     });
   
@@ -36,11 +36,11 @@ function callBackground(functionName: string, params: any): Promise<any> {
 }
 
 export async function getFirstAddress(): Promise<string | typeof undefined> {
-  return await callBackground('get-address', [undefined]);
+  return await callBackground('get-address');
 }
 
 export function getTheme(): Promise<'light' | 'dark'> {
-  return callBackground('get-theme-mode', [undefined]);
+  return callBackground('get-theme-mode');
 }
 
 export function popUpWalletCreation(): void {
@@ -55,3 +55,11 @@ export function listenForActiveWalletOpen(callback: () => void): void {
     }
   });
 }
+
+export async function getWallets(): Promise<Array<{| id: number, name: string, address: string, |}>> {
+  return callBackground('get-wallets');
+}
+
+export async function setCashbackWallet(id: number): Promise<void> {
+  return callBackground('set-cashback-wallet', id);
+}
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
index f5fce681a8..b2e57023e4 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
@@ -32,6 +32,28 @@ const handlers = Object.freeze({
     const result = (await getAllAddressesForWallet(publicDeriver)).accountingAddresses[0];
     return { ok: result.address.Hash };
   },
+
+  'get-wallets': async () => {
+    const db = await getDb();
+    const publicDerivers = await loadWalletsFromStorage(db);
+    const result = [];
+    for (const publicDeriver of publicDerivers) {
+      if (!isTrezorTWallet(publicDeriver.getParent())) {
+        result.push({
+          id: publicDeriver.getPublicDeriverId(),
+          address: (await getAllAddressesForWallet(publicDeriver)).accountingAddresses[0].address.Hash,
+          name: (await publicDeriver.getParent().getFullConceptualWalletInfo()).Name
+        });
+      }
+    }
+    return { ok: result };
+  },
+
+  'set-cashback-wallet': async (id: number) => {
+    const localStorageApi = new LocalStorageApi();
+    await localStorageApi.saveCashbackWalletId(id);
+    return { ok: undefined };
+  },
 });
 
 async function getCashbackWallet(): Promise<PublicDeriver<> | null> {
@@ -90,6 +112,6 @@ export async function handleBringRpc(message: Object, sender: Object) {
     throw new Error('missing Bring handler for ' + message.function);
   }
 
-  const result = await handler();
+  const result = await handler(message.params);
   sendRpcResponse(result, sender.tab.id, message.uid);
 }

From 68163c51ba2ea621abb2eaac69c9d2179c3a010f Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 20 Nov 2024 21:32:12 +0800
Subject: [PATCH 052/143] implement Ledger sign message UI as design

---
 .../img/illustration-hardware-extension.svg   | 140 +++++++
 .../ledger/assets/img/yoroi.svg               |   7 +
 .../operation/send/SignMessageBlock.js        | 360 ++----------------
 .../operation/send/SignMessageBlock.scss      |  35 ++
 .../ledger/i18n/locales/en-US.json            |   5 +-
 5 files changed, 215 insertions(+), 332 deletions(-)
 create mode 100644 packages/yoroi-extension/ledger/assets/img/illustration-hardware-extension.svg
 create mode 100644 packages/yoroi-extension/ledger/assets/img/yoroi.svg
 create mode 100644 packages/yoroi-extension/ledger/components/connect/operation/send/SignMessageBlock.scss

diff --git a/packages/yoroi-extension/ledger/assets/img/illustration-hardware-extension.svg b/packages/yoroi-extension/ledger/assets/img/illustration-hardware-extension.svg
new file mode 100644
index 0000000000..3bdfb52200
--- /dev/null
+++ b/packages/yoroi-extension/ledger/assets/img/illustration-hardware-extension.svg
@@ -0,0 +1,140 @@
+<svg width="280" height="280" viewBox="0 0 280 280" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M161.362 193.115C162.897 193.115 164.142 194.343 164.142 195.858V260.453C164.142 261.968 162.897 263.196 161.362 263.196C159.827 263.196 158.582 261.968 158.582 260.453V195.858C158.582 194.343 159.827 193.115 161.362 193.115Z" fill="url(#paint0_linear_18611_133549)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M224.978 44.0461L206.331 21.3194C204.307 18.8411 201.536 18.5247 200.151 20.6339L154.385 90.8178C149.537 98.2528 151.455 111.435 158.648 120.189C165.84 128.942 175.59 129.996 180.438 122.561L226.204 52.3775C227.536 50.2683 227.003 46.5244 224.978 44.0461ZM161.098 116.392C154.279 108.904 151.775 98.2001 155.451 92.5579C159.127 86.9158 167.651 88.3922 174.418 95.8799C181.237 103.368 183.741 114.072 180.065 119.714C176.389 125.409 167.865 123.932 161.098 116.392Z" fill="url(#paint1_linear_18611_133549)"/>
+<path d="M152.895 186.894V197.493C152.895 198.6 153.481 199.602 154.44 200.182L164.882 207.353C167.546 207.67 169.464 206.035 169.464 203.715V194.962L152.895 186.894Z" fill="url(#paint2_linear_18611_133549)"/>
+<path d="M150.604 187.578V198.177C150.604 199.284 151.19 200.286 152.149 200.866L162.592 206.983C164.616 208.196 167.174 206.719 167.174 204.399V195.646L150.604 187.578Z" fill="url(#paint3_linear_18611_133549)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M164.348 93.2439C159.553 90.5547 155.664 92.7166 155.664 97.9897C155.664 103.263 159.553 109.749 164.348 112.385C169.143 115.074 173.033 112.912 173.033 107.639C173.033 102.366 169.143 95.8805 164.348 93.2439ZM177.668 207.616L151.562 188.211C148.205 186.313 145.488 181.831 145.488 178.14L142.345 75.6848C145.861 74.8411 152.627 74.1556 155.345 75.6848L179.959 89.3946C183.315 91.2929 186.033 95.775 186.033 99.4661V200.128C186.086 203.819 183.049 206.667 177.668 207.616Z" fill="url(#paint4_linear_18611_133549)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M160.778 94.6164C155.983 91.9271 152.094 94.0891 152.094 99.3621C152.094 104.635 155.983 111.121 160.778 113.757C165.573 116.447 169.463 114.285 169.463 109.012C169.463 103.739 165.573 97.2529 160.778 94.6164ZM174.524 206.826L146.127 191.007C142.77 189.109 140 184.627 140 180.936V79.641C140 75.9498 142.717 74.4734 146.074 76.3717L174.471 92.1908C177.827 94.089 180.544 98.5711 180.544 102.262V203.557C180.598 207.195 177.881 208.672 174.524 206.826Z" fill="url(#paint5_linear_18611_133549)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M167.383 191.744L152.146 183.254C149.908 181.989 148.097 178.983 148.097 176.557V135.375C148.097 132.897 149.908 131.948 152.146 133.16L167.383 141.65C169.621 142.916 171.432 145.921 171.432 148.347V189.529C171.486 192.007 169.621 192.956 167.383 191.744Z" fill="url(#paint6_linear_18611_133549)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M217.464 41.6744L198.71 19.0531C196.632 16.5748 193.915 16.3111 192.53 18.4203L147.137 88.8679C142.342 96.3556 144.313 109.485 151.559 118.186C158.805 126.886 168.555 127.888 173.35 120.453L218.742 50.0057C220.074 47.8965 219.488 44.1527 217.464 41.6744ZM155.874 111.331C151.026 106.058 149.215 98.5176 151.772 94.5101C154.329 90.5026 160.35 91.5044 165.198 96.7775C170.046 102.05 171.858 109.591 169.301 113.598C166.743 117.659 160.723 116.604 155.874 111.331Z" fill="url(#paint7_linear_18611_133549)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M194.661 17.0486C194.661 17.0486 201.694 16.5741 205.477 20.0543C207.341 21.7416 225.616 44.5738 225.616 44.5738C225.616 44.5738 227.8 47.8431 226.681 51.2706C226.681 51.2706 224.07 49.2141 218.796 49.5305C218.796 49.5305 220.448 45.2066 216.825 40.9882C213.735 37.297 199.882 20.5816 199.882 20.5816C199.882 20.5816 197.591 17.5759 194.661 17.0486Z" fill="url(#paint8_linear_18611_133549)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M170.687 124.883C169.781 125.357 165.785 125.357 165.785 125.357C165.785 125.357 167.757 125.252 169.888 123.881C171.859 122.615 172.818 121.192 174.363 118.766L218.797 49.4785C219.063 49.0566 219.543 48.793 220.076 48.793C220.875 48.793 222.153 48.8457 223.645 49.3203C224.924 49.6894 226.895 50.5858 226.682 51.2186C226.362 52.0622 225.616 53.2223 225.616 53.2223L186.084 113.862V111.12L224.764 52.5368C224.924 52.2732 224.817 51.9568 224.498 51.9041L221.461 51.1658C220.395 50.9022 219.276 51.324 218.69 52.2732L174.363 121.824C173.084 123.723 172.072 124.197 170.687 124.883Z" fill="url(#paint9_linear_18611_133549)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M179.795 68.6695C179.102 68.5641 178.463 68.9332 177.93 69.7769C177.664 70.146 177.504 70.4624 177.504 70.8842C177.344 71.2533 177.238 71.6751 177.131 72.1497L177.504 72.7298C177.596 72.2288 177.728 71.8458 177.831 71.5468C177.847 71.4997 177.862 71.4546 177.877 71.4115C177.983 71.0951 178.143 70.726 178.356 70.4096C178.836 69.7241 179.315 69.355 179.848 69.5132C180.381 69.6187 180.967 70.146 181.553 71.0424L178.889 75.3135L179.209 75.8408C179.795 76.79 180.381 77.3173 181.02 77.4755C181.606 77.5809 182.139 77.3173 182.565 76.6318C183.045 75.8408 183.205 74.8917 183.098 73.7844C182.992 72.677 182.565 71.5697 181.873 70.5151C181.18 69.4078 180.487 68.775 179.795 68.6695ZM182.565 74.1007C182.565 74.839 182.459 75.5245 182.086 76.1045C181.766 76.6318 181.393 76.79 180.914 76.6318C180.434 76.5263 179.955 76.0518 179.475 75.2608L181.766 71.6224C182.246 72.5188 182.512 73.3098 182.565 74.1007Z" fill="white"/>
+<path d="M178.516 82.643C178.729 82.4321 178.942 82.2212 179.102 81.9575C179.369 81.5357 179.528 81.1139 179.582 80.5338C179.635 80.112 179.582 79.4792 179.422 78.741V78.6883L180.221 79.8483L180.541 79.3738L176.225 72.677L175.852 73.2571L178.197 76.9482C178.676 77.7391 178.942 78.4773 179.049 79.321C179.156 80.112 179.049 80.7975 178.729 81.2721C178.569 81.5357 178.41 81.7466 178.197 81.9575L178.516 82.643Z" fill="white"/>
+<path d="M204.196 46.9974L201.692 50.9522C201.213 51.6904 200.36 51.5849 199.827 50.7412L196.95 46.2592L200.307 40.9334L204.196 46.9974Z" fill="white"/>
+<path d="M205.368 45.0464L204.942 45.7319L203.45 43.4117L204.729 41.3553L205.208 42.0935C205.794 42.9899 205.848 44.3082 205.368 45.0464Z" fill="white"/>
+<path d="M202.544 42.0408L203.823 39.9843L202.331 37.6642L201.053 39.7206L202.544 42.0408Z" fill="white"/>
+<path d="M195.459 41.1443L195.885 40.4589L197.377 42.779L196.098 44.8355L195.618 44.0972C195.032 43.2008 194.979 41.8826 195.459 41.1443Z" fill="white"/>
+<path d="M198.122 41.5662L199.401 39.5097L197.909 37.1896L196.631 39.2461L198.122 41.5662Z" fill="white"/>
+<path d="M200.946 35.5022L201.426 36.2404L200.147 38.3496L198.655 36.0295L199.081 35.344C199.561 34.5531 200.413 34.6585 200.946 35.5022Z" fill="white"/>
+<path d="M198.176 55.9099L192.368 46.8931L189.651 51.2697L190.024 51.8497L192.422 48.0531L197.803 56.49L198.176 55.9099Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M189.758 52.7988C189.065 52.6934 188.426 53.0625 187.893 53.9062C187.68 54.1698 187.467 54.5389 187.52 55.0135C187.36 55.3826 187.254 55.8045 187.147 56.279L187.52 56.8591C187.612 56.358 187.744 55.9751 187.847 55.6761C187.863 55.629 187.878 55.5839 187.893 55.5408C187.999 55.2244 188.159 54.8553 188.372 54.5389C188.852 53.8534 189.331 53.4843 189.864 53.6425C190.397 53.748 190.983 54.2753 191.569 55.1717L188.852 59.4428L189.172 59.9701C189.758 60.9193 190.344 61.4466 190.983 61.6048C191.569 61.7102 192.102 61.4466 192.528 60.7611C193.008 59.9701 193.167 59.021 193.061 57.9137C192.954 56.8063 192.528 55.699 191.835 54.6444C191.143 53.5371 190.45 52.9043 189.758 52.7988ZM192.581 58.1246C192.581 58.8628 192.475 59.5483 192.102 60.1283C191.782 60.6556 191.356 60.8666 190.93 60.6556C190.45 60.5502 189.971 60.0756 189.491 59.2847L191.782 55.6463C192.262 56.5427 192.528 57.3336 192.581 58.1246Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M188.372 66.6669C188.639 66.5087 188.958 66.245 189.225 65.8232C189.704 65.0323 189.917 64.1358 189.864 63.134C189.704 62.0794 189.278 60.972 188.532 59.812C187.786 58.7046 187.147 58.0191 186.508 57.9137C185.815 57.7555 185.282 58.0719 184.75 58.9155C184.217 59.7592 184.057 60.8138 184.27 62.0266L183.524 61.1302L183.311 61.4993L189.491 71.149L189.811 70.6217L188.266 68.1961C187.946 67.6688 187.627 67.1942 187.254 66.6669V66.6142C187.68 66.7723 188.053 66.7724 188.372 66.6669ZM189.278 63.0285C189.385 63.9249 189.225 64.6631 188.852 65.2959C188.426 65.9814 187.999 66.2978 187.52 66.0341C187.04 65.9287 186.454 65.3486 185.815 64.294L185.762 64.1886C185.069 63.134 184.75 62.2376 184.643 61.4993C184.536 60.7611 184.696 60.0756 185.122 59.3901C185.922 58.0719 186.934 58.3882 188.159 60.2865C188.799 61.2884 189.172 62.1848 189.278 63.0285Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M183.684 73.5218L183.95 73.9437L185.176 71.9926C185.314 71.9016 185.491 71.6536 185.709 71.3501C185.743 71.3019 185.779 71.2523 185.815 71.2017C186.241 70.5689 186.401 69.8834 186.401 69.0925C186.348 68.3543 186.135 67.616 185.709 66.9305C185.389 66.5087 185.069 66.1923 184.75 66.0341C184.377 65.8759 184.057 65.9287 183.737 66.0869C183.791 65.2432 183.684 64.5577 183.418 64.1358C183.311 63.9249 183.151 63.8195 182.991 63.7667C182.885 63.714 182.672 63.7667 182.512 63.8195C182.725 63.2922 182.778 62.7121 182.778 62.1848C182.778 61.6575 182.618 61.1302 182.299 60.6556C181.979 60.0756 181.553 59.812 181.073 59.9174C180.594 60.0229 180.114 60.4447 179.635 61.1829C179.049 62.1321 178.676 63.0285 178.623 63.9249C178.569 64.7686 178.729 65.5596 179.209 66.2978C179.582 66.8778 180.008 67.1415 180.381 67.0887C180.807 67.036 181.233 66.6669 181.606 66.0341L182.245 65.0323C182.459 64.6631 182.618 64.5049 182.778 64.4522C182.938 64.3995 183.045 64.5049 183.204 64.7159C183.364 64.9268 183.418 65.1377 183.471 65.4541C183.471 65.7177 183.471 66.0341 183.418 66.4032C183.364 66.456 183.204 66.6669 183.045 66.9305C182.618 67.5633 182.459 68.2488 182.459 69.0397C182.459 69.8307 182.672 70.5162 183.098 71.2017C183.418 71.729 183.844 72.0454 184.377 72.2036L183.684 73.5218ZM179.955 61.7102C180.7 60.4975 181.393 60.392 181.979 61.2884C182.565 62.2376 182.565 63.2922 181.873 64.3995L181.286 65.3486C180.967 65.8759 180.647 66.1923 180.381 66.245C180.114 66.2978 179.848 66.1396 179.582 65.7177C178.836 64.6104 178.996 63.2394 179.955 61.7102ZM184.323 66.7196C184.696 66.7196 185.069 66.9833 185.389 67.5106C185.709 68.0379 185.922 68.6179 185.922 69.1979C185.975 69.778 185.868 70.3053 185.549 70.7799C185.229 71.2544 184.909 71.4653 184.536 71.4653C184.217 71.4653 183.844 71.2017 183.471 70.6217C183.151 70.0416 182.938 69.5671 182.938 68.987C182.885 68.4597 183.045 67.8797 183.364 67.4051C183.631 66.9305 183.95 66.7196 184.323 66.7196Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M98.5 151C99.8807 151 101 152.163 101 153.599V214.401C101 215.837 99.8807 217 98.5 217C97.1193 217 96 215.837 96 214.401V153.599C96 152.163 97.1193 151 98.5 151Z" fill="url(#paint10_linear_18611_133549)"/>
+<path d="M94.0378 153.865V159.982C94.0378 160.626 94.3632 161.212 94.9251 161.534L100.958 165.661C102.496 165.837 103.591 164.9 103.591 163.553V158.519L94.0378 153.865Z" fill="url(#paint11_linear_18611_133549)"/>
+<path d="M92.7388 154.274V160.392C92.7388 161.036 93.0641 161.621 93.626 161.943L99.6593 165.485C100.842 166.158 102.321 165.339 102.321 163.992V158.958L92.7388 154.274Z" fill="url(#paint12_linear_18611_133549)"/>
+<path d="M131.658 96.4927C131.658 92.5704 128.346 87.565 124.205 85.2526L78.5707 60.021C75.1105 57.972 68.2195 59.6405 68.2195 59.6405L70.0531 110.514C70.0236 111.919 70.408 113.528 71.1474 115.109L83.8942 142.829C83.8942 142.829 88.0052 151.113 92.5006 153.63L107.643 165.075C107.791 165.075 107.968 165.104 108.116 165.104C111.991 165.221 115.806 163.494 118.674 160.538L130.534 148.478C131.214 147.659 131.599 146.488 131.658 145.112V96.4927Z" fill="url(#paint13_linear_18611_133549)"/>
+<path d="M127.606 98.0737C127.606 94.1514 124.294 89.1461 120.153 86.8337L73.4545 60.5482C69.314 58.2358 66.0016 59.4945 66.0016 63.4168V112.065C65.972 113.47 66.3565 115.08 67.0959 116.661L79.8427 144.381C79.8427 144.381 83.9536 152.664 88.449 155.182L104.922 164.46C109.388 166.978 113.351 163.612 113.351 163.612L126.483 150.03C127.163 149.21 127.547 148.039 127.606 146.664V98.0737Z" fill="url(#paint14_linear_18611_133549)"/>
+<path d="M74.402 80.13L119.179 105.332C120.509 106.093 121.604 107.879 121.604 109.343V141.248C121.604 142.712 120.509 143.268 119.179 142.507L74.402 117.304C73.0711 116.543 71.9768 114.758 71.9768 113.294V81.3887C71.9768 79.9544 73.0415 79.369 74.402 80.13Z" fill="url(#paint15_linear_18611_133549)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M102.499 109.138L99.7777 107.616L93.8331 104.279C93.4782 103.196 93.1825 101.761 93.4191 100.854C93.5965 100.21 94.0106 99.8588 94.75 99.8002C95.5485 99.7417 96.2879 100.034 96.9681 100.678C97.8258 101.498 98.5356 102.786 99.0088 103.781C99.1566 104.132 99.5115 104.337 99.8664 104.308L101.109 104.22C101.375 104.191 101.552 103.898 101.434 103.635C100.783 102.142 99.6003 99.8295 97.8258 98.161C96.4062 96.8438 94.8978 96.1999 93.4487 96.2877C92.0586 96.3755 91.1122 97.1658 90.7869 98.5708C90.4912 99.8002 90.6686 101.264 90.9644 102.581L89.6631 101.849C89.3673 101.703 89.042 101.937 89.042 102.288V114.289C89.042 114.641 89.1603 114.992 89.3969 115.226L96.3174 122.924C96.6723 123.305 97.116 123.51 97.6188 123.539L102.735 123.598C103.77 123.598 104.628 122.69 104.628 121.578V111.479C104.628 110.777 104.273 110.162 103.711 109.84L102.499 109.138ZM101.878 120.114L96.7906 120.056L91.7037 114.406V106.211L101.848 111.918V120.114H101.878Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M79.666 72.7829V71.817C79.666 70.3827 80.849 69.9143 82.3277 70.7632C83.7769 71.6121 84.9599 73.4561 84.9599 74.8904V75.8564C85.4627 76.2369 85.9655 76.6759 85.9655 76.8223V81.8862C85.9655 81.8862 85.9655 82.0326 85.8176 82.0033C85.3946 81.9405 84.1095 81.6382 83.217 81.4282C82.8614 81.3446 82.5681 81.2756 82.4165 81.2422C82.3277 81.2422 82.3277 81.2422 82.2982 81.213C82.2686 81.213 82.239 81.1837 82.1799 81.1252C81.6475 80.6275 79.3702 78.4908 78.7787 77.9346C78.6309 77.7882 78.6309 77.6419 78.6309 77.6419V72.5487C78.6309 72.4024 79.1632 72.578 79.666 72.7829ZM80.1688 77.6712C80.1983 77.7297 82.2094 79.6031 82.2094 79.6031L82.2982 79.6909C82.3277 79.6909 82.4165 79.7201 82.4165 79.7201C82.4165 79.7201 84.4276 80.1885 84.4571 80.1885C84.4877 80.2036 84.5024 80.2109 84.5096 80.2064C84.5163 80.2022 84.5163 80.1875 84.5163 80.1592V76.9979C84.5163 76.8223 83.5107 76.1491 82.2982 75.4466C81.1152 74.7441 80.1096 74.2465 80.1096 74.4221V77.5834C80.1096 77.598 80.117 77.6053 80.1281 77.6163C80.1392 77.6273 80.154 77.6419 80.1688 77.6712ZM82.3277 71.9926C81.4701 71.495 80.9377 71.6999 80.9377 72.5487H80.9673V73.3976C81.9433 73.8952 82.7418 74.3928 83.7178 75.0075V74.1586C83.7178 73.3098 83.1854 72.4902 82.3277 71.9926Z" fill="white"/>
+<path d="M88.0637 77.5542V78.7836L89.365 79.5447V83.0279L90.8142 83.8475V80.3935L92.0859 81.1253V79.8959L88.0637 77.5542Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M92.7086 80.248V84.9606L94.1578 85.8095V84.3166L94.6902 84.6093L95.3408 86.4827L96.997 87.4486L96.1394 85.2826C96.5238 85.3118 96.997 85.1655 96.997 84.3459C96.997 83.4678 96.4055 82.3847 95.2817 81.7408L92.7086 80.248ZM94.1578 82.3262L95.0451 82.8531C95.2817 82.9994 95.5183 83.2336 95.5183 83.497C95.5183 83.7605 95.2817 83.7312 95.0451 83.6141L94.1578 83.0872V82.3262Z" fill="white"/>
+<path d="M97.7349 83.1752V87.8878L101.373 89.9953V88.7659L99.184 87.478V86.9804L101.313 88.2098V86.9804L99.184 85.7217V85.2534L101.373 86.5413V85.2827L97.7349 83.1752Z" fill="white"/>
+<path d="M102.112 86.9801V85.7215L105.838 87.9168V89.0291L104.034 90.317L105.897 91.4V92.6587L102.112 90.4634V89.3218L103.945 88.0339L102.112 86.9801Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M106.252 90.5214C106.252 91.9557 107.406 93.6241 108.885 94.473C110.363 95.3219 111.517 94.9999 111.517 93.5656C111.517 92.1021 110.363 90.4629 108.885 89.5847C107.406 88.7359 106.252 89.0579 106.252 90.5214ZM107.731 91.3703C107.731 90.7263 108.175 90.4629 108.885 90.8727C109.594 91.2825 110.038 92.0728 110.038 92.7167C110.038 93.3607 109.594 93.6242 108.885 93.2144C108.175 92.8046 107.731 92.0142 107.731 91.3703Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.109 96.2584V91.5457L114.682 93.0386C115.806 93.6825 116.397 94.7656 116.397 95.6437C116.397 96.4633 115.924 96.6096 115.54 96.5804L116.397 98.7464L114.741 97.7805L114.09 95.9071L113.558 95.6144V97.1072L112.109 96.2584ZM114.445 94.1801L113.558 93.6533V94.4143L114.445 94.9412C114.682 95.0583 114.919 95.0875 114.919 94.8241C114.919 94.5607 114.682 94.3265 114.445 94.1801Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_18611_133549" x1="164.391" y1="305.631" x2="190.678" y2="302.033" gradientUnits="userSpaceOnUse">
+<stop stop-color="#244ABF"/>
+<stop offset="1" stop-color="#4760FF"/>
+</linearGradient>
+<linearGradient id="paint1_linear_18611_133549" x1="230.308" y1="193.077" x2="378.984" y2="14.8361" gradientUnits="userSpaceOnUse">
+<stop stop-color="#244ABF"/>
+<stop offset="1" stop-color="#4760FF"/>
+</linearGradient>
+<linearGradient id="paint2_linear_18611_133549" x1="170.207" y1="219.805" x2="197.304" y2="182.011" gradientUnits="userSpaceOnUse">
+<stop stop-color="#244ABF"/>
+<stop offset="1" stop-color="#4760FF"/>
+</linearGradient>
+<linearGradient id="paint3_linear_18611_133549" x1="160.706" y1="187.578" x2="149.002" y2="201.31" gradientUnits="userSpaceOnUse">
+<stop stop-color="#17D1AA"/>
+<stop offset="0.15" stop-color="#1ACBAF"/>
+<stop offset="0.37" stop-color="#21B8BC"/>
+<stop offset="0.62" stop-color="#2E9BD3"/>
+<stop offset="0.89" stop-color="#3F71F1"/>
+<stop offset="1" stop-color="#475FFF"/>
+</linearGradient>
+<linearGradient id="paint4_linear_18611_133549" x1="168.979" y1="74.7771" x2="108.541" y2="102.702" gradientUnits="userSpaceOnUse">
+<stop stop-color="#17D1AA"/>
+<stop offset="0.15" stop-color="#1ACBAF"/>
+<stop offset="0.37" stop-color="#21B8BC"/>
+<stop offset="0.62" stop-color="#2E9BD3"/>
+<stop offset="0.89" stop-color="#3F71F1"/>
+<stop offset="1" stop-color="#475FFF"/>
+</linearGradient>
+<linearGradient id="paint5_linear_18611_133549" x1="140" y1="207.623" x2="180.545" y2="207.623" gradientUnits="userSpaceOnUse">
+<stop stop-color="#17D1AA"/>
+<stop offset="0.15" stop-color="#1ACBAF"/>
+<stop offset="0.37" stop-color="#21B8BC"/>
+<stop offset="0.62" stop-color="#2E9BD3"/>
+<stop offset="0.89" stop-color="#3F71F1"/>
+<stop offset="1" stop-color="#475FFF"/>
+</linearGradient>
+<linearGradient id="paint6_linear_18611_133549" x1="172.48" y1="228.378" x2="249.684" y2="176.244" gradientUnits="userSpaceOnUse">
+<stop stop-color="#244ABF"/>
+<stop offset="1" stop-color="#4760FF"/>
+</linearGradient>
+<linearGradient id="paint7_linear_18611_133549" x1="144.518" y1="125.433" x2="219.458" y2="125.433" gradientUnits="userSpaceOnUse">
+<stop stop-color="#17D1AA"/>
+<stop offset="0.15" stop-color="#1ACBAF"/>
+<stop offset="0.37" stop-color="#21B8BC"/>
+<stop offset="0.62" stop-color="#2E9BD3"/>
+<stop offset="0.89" stop-color="#3F71F1"/>
+<stop offset="1" stop-color="#475FFF"/>
+</linearGradient>
+<linearGradient id="paint8_linear_18611_133549" x1="194.661" y1="51.2707" x2="227" y2="51.2707" gradientUnits="userSpaceOnUse">
+<stop stop-color="#17D1AA"/>
+<stop offset="0.15" stop-color="#1ACBAF"/>
+<stop offset="0.37" stop-color="#21B8BC"/>
+<stop offset="0.62" stop-color="#2E9BD3"/>
+<stop offset="0.89" stop-color="#3F71F1"/>
+<stop offset="1" stop-color="#475FFF"/>
+</linearGradient>
+<linearGradient id="paint9_linear_18611_133549" x1="202.92" y1="48.793" x2="157.458" y2="99.6057" gradientUnits="userSpaceOnUse">
+<stop stop-color="#17D1AA"/>
+<stop offset="0.15" stop-color="#1ACBAF"/>
+<stop offset="0.37" stop-color="#21B8BC"/>
+<stop offset="0.62" stop-color="#2E9BD3"/>
+<stop offset="0.89" stop-color="#3F71F1"/>
+<stop offset="1" stop-color="#475FFF"/>
+</linearGradient>
+<linearGradient id="paint10_linear_18611_133549" x1="101.224" y1="256.964" x2="124.904" y2="253.868" gradientUnits="userSpaceOnUse">
+<stop stop-color="#244ABF"/>
+<stop offset="1" stop-color="#4760FF"/>
+</linearGradient>
+<linearGradient id="paint11_linear_18611_133549" x1="104.019" y1="172.838" x2="119.64" y2="151.049" gradientUnits="userSpaceOnUse">
+<stop stop-color="#244ABF"/>
+<stop offset="1" stop-color="#4760FF"/>
+</linearGradient>
+<linearGradient id="paint12_linear_18611_133549" x1="98.5805" y1="154.274" x2="91.8276" y2="162.213" gradientUnits="userSpaceOnUse">
+<stop stop-color="#17D1AA"/>
+<stop offset="0.15" stop-color="#1ACBAF"/>
+<stop offset="0.37" stop-color="#21B8BC"/>
+<stop offset="0.62" stop-color="#2E9BD3"/>
+<stop offset="0.89" stop-color="#3F71F1"/>
+<stop offset="1" stop-color="#475FFF"/>
+</linearGradient>
+<linearGradient id="paint13_linear_18611_133549" x1="106.894" y1="59" x2="44.4503" y2="111.448" gradientUnits="userSpaceOnUse">
+<stop stop-color="#17D1AA"/>
+<stop offset="0.15" stop-color="#1ACBAF"/>
+<stop offset="0.37" stop-color="#21B8BC"/>
+<stop offset="0.62" stop-color="#2E9BD3"/>
+<stop offset="0.89" stop-color="#3F71F1"/>
+<stop offset="1" stop-color="#475FFF"/>
+</linearGradient>
+<linearGradient id="paint14_linear_18611_133549" x1="66.0001" y1="165.395" x2="127.606" y2="165.395" gradientUnits="userSpaceOnUse">
+<stop stop-color="#17D1AA"/>
+<stop offset="0.15" stop-color="#1ACBAF"/>
+<stop offset="0.37" stop-color="#21B8BC"/>
+<stop offset="0.62" stop-color="#2E9BD3"/>
+<stop offset="0.89" stop-color="#3F71F1"/>
+<stop offset="1" stop-color="#475FFF"/>
+</linearGradient>
+<linearGradient id="paint15_linear_18611_133549" x1="123.828" y1="181.026" x2="207.865" y2="66.8935" gradientUnits="userSpaceOnUse">
+<stop stop-color="#244ABF"/>
+<stop offset="1" stop-color="#4760FF"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/packages/yoroi-extension/ledger/assets/img/yoroi.svg b/packages/yoroi-extension/ledger/assets/img/yoroi.svg
new file mode 100644
index 0000000000..b2cf95b2f3
--- /dev/null
+++ b/packages/yoroi-extension/ledger/assets/img/yoroi.svg
@@ -0,0 +1,7 @@
+<svg width="56" height="48" viewBox="0 0 56 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M26.4594 19.4882L-0.000732422 0H8.31098L27.9303 14.0028L47.6476 0H56.0008L29.4085 19.4882C28.9654 19.8 28.4434 19.956 27.9303 19.956C27.4198 19.956 26.9004 19.8 26.4594 19.4882Z" fill="#4B6DDE"/>
+<path d="M36.8056 41.8013L4.43689 18.7441V12.1371L42.0263 38.7001L36.8056 41.8013Z" fill="#4B6DDE"/>
+<path d="M38.3724 28.3169L49.8581 19.8221V13.4847L33.9348 25.0808L38.3724 28.3169Z" fill="#4B6DDE"/>
+<path d="M48.5524 35.5984L49.8576 34.5197V28.3172L44.1147 32.3623L48.5524 35.5984Z" fill="#4B6DDE"/>
+<path d="M4.43689 33.0337L25.842 48.0007L31.1933 45.0342L4.43689 26.157V33.0337Z" fill="#4B6DDE"/>
+</svg>
diff --git a/packages/yoroi-extension/ledger/components/connect/operation/send/SignMessageBlock.js b/packages/yoroi-extension/ledger/components/connect/operation/send/SignMessageBlock.js
index 9b5b211a42..5dbe5db710 100644
--- a/packages/yoroi-extension/ledger/components/connect/operation/send/SignMessageBlock.js
+++ b/packages/yoroi-extension/ledger/components/connect/operation/send/SignMessageBlock.js
@@ -4,187 +4,24 @@ import type { Node } from 'react';
 import { observer } from 'mobx-react';
 import { intlShape, defineMessages } from 'react-intl';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
-import semverGte from 'semver/functions/gte';
-
+import yoroiIcon from '../../../../assets/img/yoroi.svg';
+import hardwareWalletsIllustration from '../../../../assets/img/illustration-hardware-extension.svg';
+import styles from './SignMessageBlock.scss';
 import type { DeviceCodeType }  from '../../../../types/enum';
-import HintBlock from '../../../widgets/hint/HintBlock';
-import HintGap from '../../../widgets/hint/HintGap';
-import type { SignTransactionRequest, Certificate } from '@cardano-foundation/ledgerjs-hw-app-cardano';
-import {
-  AddressType,
-  CertificateType,
-  TxAuxiliaryDataType,
-  CredentialParamsType,
-} from '@cardano-foundation/ledgerjs-hw-app-cardano';
-import {
-  pathToString,
-} from '../../../../utils/cmn';
-import { bech32 } from 'bech32';
-import { getAddressHintBlock } from '../../../widgets/hint/AddressHintBlock';
-
-import styles from './SendTxHintBlock.scss';
 
-const message = defineMessages({
-  sStartNewTx: {
-    id: 'hint.sendTx.startNewTx',
-    defaultMessage: '!!!Check your Ledger screen, then press <strong>right</strong> button.'
-  },
-  sConfirmValue: {
-    id: 'hint.sendTx.confirmValue',
-    defaultMessage: '!!!Confirm the ADA amount by pressing <strong>both</strong> buttons.'
-  },
-  sConfirmAddress: {
-    id: 'hint.sendTx.confirmAddress',
-    defaultMessage: "!!!Confirm the receiver's address by pressing <strong>both</strong> buttons."
-  },
-  sConfirmFee: {
-    id: 'hint.sendTx.confirmFee',
-    defaultMessage: '!!!Confirm Transaction Fee by pressing <strong>both</strong> buttons.'
-  },
-  sConfirmTx: {
-    id: 'hint.sendTx.confirmTx',
-    defaultMessage: '!!!Confirm Transaction Fee by pressing <strong>both</strong> buttons.'
-  },
-  sTtl: {
-    id: 'hint.sendTx.ttl',
-    defaultMessage: '!!!Confirm the time-to-live by pressing <strong>both</strong> buttons.'
-  },
-  sRegistration: {
-    id: 'hint.certificate.registration',
-    defaultMessage: '!!!Confirm the staking key registration by pressing <strong>both</strong> buttons.'
-  },
-  sRegistrationComplete: {
-    id: 'hint.certificate.registrationComplete',
-    defaultMessage: '!!!Confirm the staking key registration by pressing the <strong>right</strong> button.'
-  },
-  sDeregistration: {
-    id: 'hint.certificate.deregistration',
-    defaultMessage: '!!!Confirm the deregistration by pressing <strong>both</strong> buttons.'
-  },
-  sDeregistrationComplete: {
-    id: 'hint.certificate.deregistrationComplete',
-    defaultMessage: '!!!Confirm the deregistration by pressing the <strong>right</strong> button.'
-  },
-  sDelegation: {
-    id: 'hint.certificate.delegation',
-    defaultMessage: '!!!Make sure the pool shown on your Ledger is the same as the one shown below, then press <strong>both</strong> buttons.'
-  },
-  sDelegationComplete: {
-    id: 'hint.certificate.delegationComplete',
-    defaultMessage: '!!!Confirm the delegation by pressing the <strong>right</strong> button.'
-  },
-  sPath: {
-    id: 'hint.verifyAddress.path',
-    defaultMessage: '!!!Make sure the address path shown on your Ledger is the same as the one shown below, then press <strong>both</strong> buttons.'
-  },
-  sWithdrawal: {
-    id: 'hint.withdrawal',
-    defaultMessage: '!!!Confirm the withdrawal, then press <strong>both</strong> buttons.'
-  },
-  sMetadata: {
-    id: 'hint.metadata',
-    defaultMessage: '!!!Confirm the metadata <strong>hash</strong>, then press <strong>both</strong> buttons.'
-  },
-  xStartNewTx: {
-    id: 'hint.nanoX.sendTx.startNewTx',
-    defaultMessage: '!!!Check your Ledger screen, then press <strong>both</strong> buttons.'
-  },
-  xConfirmValue: {
-    id: 'hint.sendTx.confirmValue',
-    defaultMessage: '!!!Confirm the ADA amount by pressing <strong>both</strong> buttons.'
-  },
-  xConfirmAddress: {
-    id: 'hint.nanoX.sendTx.confirmAddress',
-    defaultMessage: "!!!Confirm the receiver's address by pressing the <strong>right</strong> button to scroll through the entire address. Then press <strong>both</strong> buttons."
-  },
-  xConfirmFee: {
-    id: 'hint.sendTx.confirmFee',
-    defaultMessage: '!!!Confirm Transaction Fee by pressing <strong>both</strong> buttons.'
-  },
-  xConfirmTx: {
-    id: 'hint.nanoX.sendTx.confirmTx',
-    defaultMessage: '!!!Confirm the transaction by pressing the <strong>both</strong> buttons.'
-  },
-  xTtl: {
-    id: 'hint.sendTx.ttl',
-    defaultMessage: '!!!Confirm the time-to-live by pressing <strong>both</strong> buttons.'
-  },
-  xRegistration: {
-    id: 'hint.certificate.registration',
-    defaultMessage: '!!!Confirm the staking key registration by pressing <strong>both</strong> buttons.'
-  },
-  xRegistrationComplete: {
-    id: 'hint.certificate.registrationComplete',
-    defaultMessage: '!!!Confirm the staking key registration by pressing the <strong>right</strong> button.'
+const messages = defineMessages({
+  confirm: {
+    id: 'sign.data.confirm',
+    defaultMessage: '!!!Confirm on your hardware wallet'
   },
-  xDeregistration: {
-    id: 'hint.certificate.deregistration',
-    defaultMessage: '!!!Confirm the deregistration by pressing <strong>both</strong> buttons.'
-  },
-  xDeregistrationComplete: {
-    id: 'hint.certificate.deregistrationComplete',
-    defaultMessage: '!!!Confirm the deregistration by pressing the <strong>right</strong> button.'
-  },
-  xDelegation: {
-    id: 'hint.certificate.delegation',
-    defaultMessage: '!!!Make sure the pool shown on your Ledger is the same as the one shown below, then press <strong>both</strong> buttons.'
-  },
-  xDelegationComplete: {
-    id: 'hint.certificate.delegationComplete',
-    defaultMessage: '!!!Confirm the delegation by pressing the <strong>right</strong> button.'
-  },
-  xPath: {
-    id: 'hint.verifyAddress.path',
-    defaultMessage: '!!!Make sure the address path shown on your Ledger is the same as the one shown below, then press <strong>both</strong> buttons.'
-  },
-  xWithdrawal: {
-    id: 'hint.withdrawal',
-    defaultMessage: '!!!Confirm the withdrawal, then press <strong>both</strong> buttons.'
-  },
-  xMetadata: {
-    id: 'hint.metadata',
-    defaultMessage: '!!!Confirm the metadata <strong>hash</strong>, then press <strong>both</strong> buttons.'
-  },
-  catalystStep1: {
-    id: 'hint.catalystStep1',
-    defaultMessage: '!!!Confirm the network ID by pressing <strong>both</strong> buttons.',
-  },
-  catalystStep3: {
-    id: 'hint.catalystStep3',
-    defaultMessage: '!!!Confirm to register Catalyst voting key by pressing the <strong>right</strong> button.',
-  },
-  catalystStep4: {
-    id: 'hint.catalystStep4',
-    defaultMessage: '!!!Confirm the voting public key by pressing <strong>both</strong> buttons.',
-  },
-  catalystStep5: {
-    id: 'hint.catalystStep5',
-    defaultMessage: '!!!Confirm the staking key path by pressing <strong>both</strong> buttons.',
-  },
-  catalystStep6: {
-    id: 'hint.catalystStep6',
-    defaultMessage: '!!!Confirm the reward address by pressing <strong>both</strong> buttons.',
-  },
-  catalystStep7: {
-    id: 'hint.catalystStep7',
-    defaultMessage: '!!!Confirm the nonce by pressing <strong>both</strong> buttons.',
-  },
-  catalystStep8: {
-    id: 'hint.catalystStep8',
-    defaultMessage: '!!!Confirm voting key registration by pressing the <strong>right</strong> button.',
-  },
-  catalystStep9: {
-    id: 'hint.catalystStep9',
-    defaultMessage: '!!!Confirm the auxilliary data hash by pressing <strong>both</strong> buttons.',
-  },
-  confirmAssetFingerprint: {
-    id: 'hint.sendTx.confirmAssetFingerprint',
-    defaultMessage: '!!!Confirm the asset fingerprint by pressing <strong>both</strong> buttons',
-  },
-  confirmAssetAmount: {
-    id: 'hint.sendTx.confirmAssetAmount',
-    defaultMessage: '!!!Confirm the token amount by pressing <strong>both</strong> buttons',
+  instruction1: {
+    id: 'sign.data.instruction1',
+    defaultMessage: '!!!Take your hardware wallet device and follow the instructions there.'
   },
+  instruction2: {
+    id: 'sign.data.instruction2',
+    defaultMessage: '!!!Make sure you confirm a trusted action.'
+  }
 });
 
 type Props = {|
@@ -199,164 +36,25 @@ export default class SendTxHintBlock extends React.Component<Props> {
     intl: intlShape.isRequired
   };
 
-  renderCertificate: {|
-    cert: Certificate,
-    getAndIncrementStep: void => number,
-    deviceVersion: ?string,
-  |} => Array<Node> = (request) => {
-    const stakingKey = require(`../../../../assets/img/nano-${this.props.deviceCode}/hint-staking-key.png`);
-
-    if (request.cert.type === CertificateType.STAKE_REGISTRATION) {
-      const { params } = request.cert;
-      if (params.stakeCredential.type !== CredentialParamsType.KEY_PATH) {
-        throw new Error('unsupported stake credential type');
-      }
-      // $FLowIgnore
-      const { keyPath } = params.stakeCredential;
-      const imgRegister = require(`../../../../assets/img/nano-${this.props.deviceCode}/hint-registration.png`);
-      const imgRegisterConfirm = require(`../../../../assets/img/nano-${this.props.deviceCode}/hint-registration-confirm.png`);
-      const firstStep = request.getAndIncrementStep();
-      const secondStep = request.getAndIncrementStep();
-      const thirdStep = request.getAndIncrementStep();
-      return [
-        (<HintBlock
-          key={firstStep}
-          number={firstStep}
-          text={message[`${this.props.deviceCode}Registration`]}
-          imagePath={imgRegister}
-        />),
-        (<HintGap key={firstStep + 'gap'} />),
-        (<HintBlock
-          key={secondStep}
-          number={secondStep}
-          text={message[`${this.props.deviceCode}Path`]}
-          imagePath={stakingKey}
-          secondaryText={pathToString(keyPath)}
-        />),
-        (<HintGap key={secondStep + 'gap'} />),
-        (<HintBlock
-          key={thirdStep}
-          number={thirdStep}
-          text={message[`${this.props.deviceCode}RegistrationComplete`]}
-          imagePath={imgRegisterConfirm}
-        />),
-        (<HintGap key={thirdStep + 'gap'} />),
-      ];
-    }
-    if (request.cert.type === CertificateType.STAKE_DELEGATION) {
-      const { params } = request.cert;
-      if (params.stakeCredential.type !== CredentialParamsType.KEY_PATH) {
-        throw new Error('unsupported stake credential type');
-      }
-      // $FLowIgnore
-      const { keyPath } = params.stakeCredential;
-      const imgDelegatePool = require(`../../../../assets/img/nano-${this.props.deviceCode}/hint-delegation-pool.png`);
-      const imgDelegateConfirm = require(`../../../../assets/img/nano-${this.props.deviceCode}/hint-delegation-confirm.png`);
-      const firstStep = request.getAndIncrementStep();
-      const secondStep = request.getAndIncrementStep();
-      const thirdStep = request.getAndIncrementStep();
-
-      let poolId;
-      if (request.deviceVersion === undefined) {
-        throw new Error('unexpect null deviceVersion');
-      }
-      // Starting from version 2.4.1, the Ledger Cardano app show the pool ID
-      // in bech32, complying with CIP0005
-      if (semverGte(request.deviceVersion, '2.4.1')) {
-        poolId = bech32.encode(
-          'pool',
-          bech32.toWords(Buffer.from(params.poolKeyHashHex, 'hex'))
-        );
-      } else {
-        poolId = params.poolKeyHashHex;
-      }
-
-      return [
-        (<HintBlock
-          key={firstStep}
-          number={firstStep}
-          text={message[`${this.props.deviceCode}Delegation`]}
-          imagePath={imgDelegatePool}
-          secondaryText={poolId}
-        />),
-        (<HintGap key={firstStep + 'gap'} />),
-        (<HintBlock
-          key={secondStep}
-          number={secondStep}
-          text={message[`${this.props.deviceCode}Path`]}
-          imagePath={stakingKey}
-          secondaryText={pathToString(keyPath)}
-        />),
-        (<HintGap key={secondStep + 'gap'} />),
-        (<HintBlock
-          key={thirdStep}
-          number={thirdStep}
-          text={message[`${this.props.deviceCode}DelegationComplete`]}
-          imagePath={imgDelegateConfirm}
-        />),
-        (<HintGap key={thirdStep + 'gap'} />),
-      ];
-    }
-    if (request.cert.type === CertificateType.STAKE_DEREGISTRATION) {
-      const { params } = request.cert;
-      if (params.stakeCredential.type !== CredentialParamsType.KEY_PATH) {
-        throw new Error('unsupported stake credential type');
-      }
-      // $FLowIgnore
-      const { keyPath } = params.stakeCredential;
-      const imgDeregister = require(`../../../../assets/img/nano-${this.props.deviceCode}/hint-deregister-key.png`);
-      const imgDeregisterConfirm = require(`../../../../assets/img/nano-${this.props.deviceCode}/hint-deregister-confirm.png`);
-      const firstStep = request.getAndIncrementStep();
-      const secondStep = request.getAndIncrementStep();
-      const thirdStep = request.getAndIncrementStep();
-      return [
-        (<HintBlock
-          key={firstStep}
-          number={firstStep}
-          text={message[`${this.props.deviceCode}Deregistration`]}
-          imagePath={imgDeregister}
-        />),
-        (<HintGap key={firstStep + 'gap'} />),
-        (<HintBlock
-          key={secondStep}
-          number={secondStep}
-          text={message[`${this.props.deviceCode}Path`]}
-          imagePath={stakingKey}
-          secondaryText={pathToString(keyPath)}
-        />),
-        (<HintGap key={secondStep + 'gap'} />),
-        (<HintBlock
-          key={thirdStep}
-          number={thirdStep}
-          text={message[`${this.props.deviceCode}DeregistrationComplete`]}
-          imagePath={imgDeregisterConfirm}
-        />),
-        (<HintGap key={thirdStep + 'gap'} />),
-      ];
-    }
-    if (request.cert.type === CertificateType.STAKE_POOL_REGISTRATION) {
-      const { params } = request.cert;
-      // TODO
-    }
-    //  unhandled certificate type
-    return [];
-  }
-
   render(): Node {
-    const {
-      deviceCode,
-      wasDeviceLocked,
-      deviceVersion,
-    } = this.props;
-    const stepStartNumber: number = wasDeviceLocked ? 2 : 0; // 2 = count of common step
-    let stepNumber = stepStartNumber;
-    let content = 'Please confirm on your Ledger.';
-
+    const { intl } = this.context;
 
     return (
       <div className={styles.component}>
-        <div className={styles.stepsGrid}>
-          {content}
+        <div className={styles.title}>
+          <img src={yoroiIcon} />
+        </div>
+        <div className={styles.content}>
+          <img src={hardwareWalletsIllustration} />
+          <div className={styles.confirm}>
+            {intl.formatMessage(messages.confirm)}
+          </div>
+          <div className={styles.instruction}>
+            {intl.formatMessage(messages.instruction1)}
+          </div>
+          <div className={styles.instruction}>
+            {intl.formatMessage(messages.instruction2)}
+          </div>
         </div>
       </div>
     );
diff --git a/packages/yoroi-extension/ledger/components/connect/operation/send/SignMessageBlock.scss b/packages/yoroi-extension/ledger/components/connect/operation/send/SignMessageBlock.scss
new file mode 100644
index 0000000000..65e875e39c
--- /dev/null
+++ b/packages/yoroi-extension/ledger/components/connect/operation/send/SignMessageBlock.scss
@@ -0,0 +1,35 @@
+.component {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-grow: 1;
+  flex-direction: column;
+  .title {
+    margin: auto;
+  }
+  .content {
+    margin: auto;
+    flex-grow: 1;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+  }
+  .confirm {
+    //font-family: Rubik;
+    font-size: 18px;
+    font-weight: 600;
+    line-height: 26px;
+    text-align: center;
+    text-underline-position: from-font;
+    text-decoration-skip-ink: none;
+  }
+  .instruction {
+    //font-family: Rubik;
+    font-size: 16px;
+    font-weight: 400;
+    line-height: 24px;
+    text-align: center;
+    text-underline-position: from-font;
+    text-decoration-skip-ink: none;
+  }
+}
diff --git a/packages/yoroi-extension/ledger/i18n/locales/en-US.json b/packages/yoroi-extension/ledger/i18n/locales/en-US.json
index 26ccdcaf32..1a90de9bd6 100644
--- a/packages/yoroi-extension/ledger/i18n/locales/en-US.json
+++ b/packages/yoroi-extension/ledger/i18n/locales/en-US.json
@@ -62,5 +62,8 @@
   "hint.catalystStep6": "Confirm the reward address by pressing <strong>both</strong> buttons.",
   "hint.catalystStep7": "Confirm the nonce by pressing <strong>both</strong> buttons.",
   "hint.catalystStep8": "Confirm voting key registration by pressing the <strong>right</strong> button.",
-  "hint.catalystStep9": "Confirm the auxilliary data hash by pressing <strong>both</strong> buttons."
+  "hint.catalystStep9": "Confirm the auxilliary data hash by pressing <strong>both</strong> buttons.",
+  "sign.data.confirm": "Confirm on your hardware wallet",
+  "sign.data.instruction1": "Take your hardware wallet device and follow the instructions there.",
+  "sign.data.instruction2": "Make sure you confirm a trusted action."
 }

From 158a00cfbf61091cdc4c41606cd98bc3ef0fb8b3 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Fri, 22 Nov 2024 01:31:59 +0800
Subject: [PATCH 053/143] trigger cashback wallet change event when cashback
 wallet changes

---
 .../chrome/content-scripts/bringInject.js     |  4 ++--
 .../chrome/content-scripts/bringLib.js        |  4 ++--
 .../background/handlers/content/bring.js      |  2 ++
 .../background/handlers/yoroi/index.js        |  5 ----
 .../background/handlers/yoroi/utils.js        |  4 ++--
 .../background/handlers/yoroi/wallet.js       | 23 ++++++++++++-------
 6 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/packages/yoroi-extension/chrome/content-scripts/bringInject.js b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
index a163a31ce9..3aa656990d 100644
--- a/packages/yoroi-extension/chrome/content-scripts/bringInject.js
+++ b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
@@ -4,7 +4,7 @@ import {
   getFirstAddress,
   getTheme,
   popUpWalletCreation,
-  listenForActiveWalletOpen,
+  listenForCashbackWalletChange,
 } from './bringLib';
 
 const darkTheme = Object.freeze({
@@ -213,7 +213,7 @@ const lightTheme = Object.freeze({
   await bringInitContentScript({
     getWalletAddress: getFirstAddress,
     promptLogin: popUpWalletCreation,
-    walletAddressUpdateCallback: listenForActiveWalletOpen,
+    walletAddressUpdateCallback: listenForCashbackWalletChange,
     theme: await getTheme(),
     lightTheme,
     darkTheme,
diff --git a/packages/yoroi-extension/chrome/content-scripts/bringLib.js b/packages/yoroi-extension/chrome/content-scripts/bringLib.js
index b8e66fed80..8d426b6978 100644
--- a/packages/yoroi-extension/chrome/content-scripts/bringLib.js
+++ b/packages/yoroi-extension/chrome/content-scripts/bringLib.js
@@ -47,10 +47,10 @@ export function popUpWalletCreation(): void {
   callBackground('pop-up-wallet-creation');
 }
 
-export function listenForActiveWalletOpen(callback: () => void): void {
+export function listenForCashbackWalletChange(callback: () => void): void {
   // todo: verify sender extension id
   chrome.runtime.onMessage.addListener((msg, sender) => {
-    if (msg.type === 'active-wallet-open') {
+    if (msg.type === 'cashback-wallet-change') {
       callback();
     }
   });
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
index b2e57023e4..ed9b547eb3 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
@@ -6,6 +6,7 @@ import { getAllAddressesForWallet } from '../../../../../app/api/ada/lib/storage
 import { PublicDeriver, } from '../../../../../app/api/ada/lib/storage/models/PublicDeriver/index';
 import { getDb } from '../../state';
 import { loadWalletsFromStorage } from '../../../../../app/api/ada/lib/storage/models/load';
+import { notifyAllTabsCashbackWalletChange } from '../yoroi/utils';
 
 declare var chrome;
 
@@ -52,6 +53,7 @@ const handlers = Object.freeze({
   'set-cashback-wallet': async (id: number) => {
     const localStorageApi = new LocalStorageApi();
     await localStorageApi.saveCashbackWalletId(id);
+    notifyAllTabsCashbackWalletChange(id);
     return { ok: undefined };
   },
 });
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/index.js b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/index.js
index 69a96dc247..f935d3711a 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/index.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/index.js
@@ -43,7 +43,6 @@ import {
 } from './connector';
 import { GetProtocolParameters } from './protocolParameters';
 import { subscribe } from '../../subscriptionManager';
-import { notifyAllTabsActiveWalletOpen } from './utils';
 
 const handlerMap = Object.freeze({
   [GetHistoricalCoinPrices.typeTag]: GetHistoricalCoinPrices.handle,
@@ -99,10 +98,6 @@ export function getHandler(typeTag: string): ?Handler {
   if (typeTag === 'subscribe') {
     return async (request, sender, sendResponse) => {
       subscribe(sender.tab.id, request.request.activeWalletId);
-      if (request.request.changed) {
-        // notify content scripts in all tabs
-        notifyAllTabsActiveWalletOpen(request.request.activeWalletId);
-      }
       sendResponse(undefined);
     };
   }
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/utils.js b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/utils.js
index 82b7ba02c6..ca9f5c11a8 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/utils.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/utils.js
@@ -13,14 +13,14 @@ export async function getPublicDeriverById(publicDeriverId: number): Promise<Pub
   throw new Error(`missing public deriver ${publicDeriverId}`);
 }
 
-export function notifyAllTabsActiveWalletOpen(activeWalletId: number) {
+export function notifyAllTabsCashbackWalletChange(activeWalletId: number) {
   declare var chrome;
   chrome.tabs.query({}, (tabs) => {
     for (const tab of tabs) {
       chrome.tabs.sendMessage(
         tab.id,
         {
-          type: 'active-wallet-open',
+          type: 'cashback-wallet-change',
           activeWalletId,
         }
       );
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js
index 81cfc414c1..7462b49aeb 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js
@@ -13,7 +13,7 @@ import { getCardanoStateFetcher } from '../../utils';
 import LocalStorageApi, {
   loadSubmittedTransactions, persistSubmittedTransactions
 } from '../../../../../app/api/localStorage';
-import { getPublicDeriverById, notifyAllTabsActiveWalletOpen } from './utils';
+import { getPublicDeriverById, notifyAllTabsCashbackWalletChange } from './utils';
 import { removePublicDeriver } from '../../../../../app/api/ada/lib/storage/bridge/walletBuilder/remove';
 import { loadWalletsFromStorage } from '../../../../../app/api/ada/lib/storage/models/load';
 import {
@@ -29,6 +29,8 @@ import type { ReferenceTransaction, BaseGetTransactionsRequest } from '../../../
 import WalletTransaction from '../../../../../app/domain/WalletTransaction';
 import type { AdaGetTransactionsRequest } from '../../../../../app/api/ada';
 import { updateProtocolParametersCacheFromNetwork } from './protocolParameters';
+import { isTrezorTWallet } from '../../../../../app/api/ada/lib/storage/models/ConceptualWallet';
+import type { PublicDeriver, } from '../../../../../app/api/ada/lib/storage/models/PublicDeriver/';
 
 type CreateWalletRequest = {|
   networkId: number,
@@ -66,9 +68,8 @@ export const CreateWallet: HandlerType<CreateWalletRequest, CreateWalletResponse
         publicDeriverId,
       }
     });
-    syncWallet(publicDerivers[0], 'new wallet', 1).then(() => {
-      notifyAllTabsActiveWalletOpen(publicDeriverId);
-    });
+    await syncWallet(publicDerivers[0], 'new wallet', 1);
+    maybeNotifyCashbackWalletChange(publicDerivers[0]);
     return await getPlaceHolderWalletState(publicDerivers[0]);
   },
 });
@@ -115,14 +116,20 @@ export const CreateHardwareWallet: HandlerType<
         publicDeriverId,
       }
     });
-    syncWallet(publicDeriver, 'new wallet', 1).then(() => {
-      notifyAllTabsActiveWalletOpen(publicDeriverId);
-    });;
-
+    await syncWallet(publicDeriver, 'new wallet', 1);
+    maybeNotifyCashbackWalletChange(publicDeriver);
     return await getPlaceHolderWalletState(publicDeriver);
   },
 });
 
+async function maybeNotifyCashbackWalletChange(newWallet: PublicDeriver<>) {
+  const db = await getDb();
+  const publicDerivers = await loadWalletsFromStorage(db);
+  if (publicDerivers.length === 1 && !isTrezorTWallet(newWallet.getParent())) {
+    notifyAllTabsCashbackWalletChange(newWallet.getPublicDeriverId());
+  }
+}
+
 export const RemoveWallet: HandlerType<
   {| publicDeriverId: number |},
   void,

From 9c4807eaa8d38c9ffb6cb350a4b1ceeeb5feec6f Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Fri, 22 Nov 2024 03:49:56 +0800
Subject: [PATCH 054/143] cashback page warning dialog when current wallet is
 not cashback wallet

---
 packages/yoroi-extension/app/api/thunk.js     |  7 +-
 .../app/containers/cashback/CashbackPage.js   | 81 +++++++++++++++++++
 .../app/i18n/locales/en-US.json               |  5 ++
 .../app/stores/toplevel/WalletStore.js        | 19 ++++-
 4 files changed, 110 insertions(+), 2 deletions(-)

diff --git a/packages/yoroi-extension/app/api/thunk.js b/packages/yoroi-extension/app/api/thunk.js
index 6ee1e5961a..13a09a1a65 100644
--- a/packages/yoroi-extension/app/api/thunk.js
+++ b/packages/yoroi-extension/app/api/thunk.js
@@ -401,7 +401,12 @@ export const getConnectedSites: GetEntryFuncType<typeof GetConnectedSites> = asy
 export const getProtocolParameters: GetEntryFuncType<typeof GetProtocolParameters> = async (request) => {
   return await callBackground({ type: GetProtocolParameters.typeTag, request });
 }
-  
+
+
+export function setCashbackWallet(id: number): void {
+  chrome.runtime.sendMessage({ type: 'bring_rpc_request', function: 'set-cashback-wallet', params: id });
+}
+
 // Background -> UI notifications:
 const callbacks = Object.freeze({
   walletStateUpdate: [],
diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index 7d7a7342f0..71dbfa42ef 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -33,6 +33,8 @@ import LocalizableError from '../../i18n/LocalizableError';
 import type { $npm$ReactIntl$IntlShape } from 'react-intl';
 import { injectIntl, defineMessages, } from 'react-intl';
 import { getNetworkById } from '../../api/ada/lib/storage/database/prepackaged/networks';
+import { forceNonNull } from '../../coreUtils';
+import { constructPlate32 } from '../../components/topbar/WalletCard';
 
 const messages = defineMessages({
   claim: {
@@ -51,6 +53,26 @@ const messages = defineMessages({
     id: 'cashback.claim.dialog.message.label',
     defaultMessage: '!!!Message',
   },
+  notCurrentText: {
+    id: 'cashback.not.current.warning.text',
+    defaultMessage: '!!!Your cashback rewards are currently linked to another wallet. To claim your ADA cashback, either switch to the wallet connected to Bring or change the rewards wallet to the one you\'re using now. You can always access settings at anytime to change your cashback wallet and make claiming rewards relevant for you.',
+  },
+  currentWalletLabel: {
+    id: 'cashback.not.current.warning.current',
+    defaultMessage: '!!!Current rewards wallet'
+  },
+  warning: {
+    id: 'cashback.not.current.warning.title',
+    defaultMessage: '!!!WARNING',
+  },
+  useThis: {
+    id: 'cashback.not.current.warning.use.this',
+    defaultMessage: '!!!use this wallet',
+  },
+  keep: {
+    id: 'cashback.not.current.warning.keep',
+    defaultMessage: '!!!keep current wallet',
+  },
 });
 
 type Props = StoresAndActionsProps;
@@ -230,6 +252,17 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
     };
   }, [iframeSrc, fetchIframeUrl, handleMessage]);
 
+  const [shownCashbackWallet, setShownCashbackWallet] = useState(null);
+
+  useEffect(() => {
+    stores.wallets.getCashbackWallet().then((currentCashbackWallet) => {
+      if (currentCashbackWallet && currentCashbackWallet !== stores.wallets.selected) {
+        setShownCashbackWallet(currentCashbackWallet);
+        setPopup(true);
+      }
+    });
+  }, []);
+  
   const closePopup = useCallback(() => {
     iframeRef.current?.contentWindow.postMessage({ to: 'bringweb3', action: 'CLOSE_POPUP' }, '*');
     setPopup(false);
@@ -258,6 +291,52 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
     >
       <FullscreenLayout bottomPadding={0}>
         <Suspense fallback={null}>
+          {shownCashbackWallet && (
+            <Dialog
+              title={intl.formatMessage(messages.warning)}
+              actions={[
+                {
+                  label: intl.formatMessage(messages.useThis),
+                  onClick: () => {
+                    stores.wallets.setCashbackWallet(forceNonNull(stores.wallets.selected).publicDeriverId);
+                    setShownCashbackWallet(null);
+                    setPopup(false);
+                  }
+                },
+                {
+                  label: intl.formatMessage(messages.keep),
+                  primary: true,
+                  onClick: () => {
+                    setShownCashbackWallet(null);
+                    setPopup(false);
+                  }
+                }
+              ]}
+            >
+              <Typography sx={{ fontSize: '16px', lineHeight: '24px' }}>
+                {intl.formatMessage(messages.notCurrentText)}
+              </Typography>
+              <Typography sx={{ fontSize: '12px', fontHeight: '16px',lineHeight: '16px' }}>
+                {intl.formatMessage(messages.currentWalletLabel)}
+              </Typography>
+              <Box sx={{ display: 'flex', flexDirection: 'row', overflow: 'hidden' }}>
+                {constructPlate32(shownCashbackWallet.plate)[1]}
+                <Typography
+                  sx={{
+                    fontWeight: '500px',
+                    fontSize: '16px',
+                    lineHeight: '24px',
+                    marginTop: 'auto',
+                    marginBottom: 'auto',
+                    marginLeft: '1em',
+                  }}
+                >
+                  {shownCashbackWallet.plate.TextPart}
+                </Typography>
+              </Box>
+            </Dialog>
+          )}
+
           {signaturePopup ?
             <Dialog
               title={intl.formatMessage(messages.claim)}
@@ -315,6 +394,7 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
               </Box>
             </Dialog>
             : null}
+
           {popup ? (
             <div
               className={styles.iframe_overlay}
@@ -322,6 +402,7 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
               onClick={closePopup}
             />
           ) : null}
+
           {iframeSrc && (
             <iframe
               ref={iframeRef}
diff --git a/packages/yoroi-extension/app/i18n/locales/en-US.json b/packages/yoroi-extension/app/i18n/locales/en-US.json
index 2b0447f9d0..b8fff125d4 100644
--- a/packages/yoroi-extension/app/i18n/locales/en-US.json
+++ b/packages/yoroi-extension/app/i18n/locales/en-US.json
@@ -65,6 +65,11 @@
   "cashback.claim.dialog.instruction.password": "Enter your password to claim cashback rewards.",
   "cashback.claim.dialog.message.label": "Message",
   "cashback.claim.dialog.title": "CLAIM CASHBACK",
+  "cashback.not.current.warning.current": "Current rewards wallet",
+  "cashback.not.current.warning.keep": "keep current wallet",
+  "cashback.not.current.warning.text": "Your cashback rewards are currently linked to another wallet. To claim your ADA cashback, either switch to the wallet connected to Bring or change the rewards wallet to the one you're using now. You can always access settings at anytime to change your cashback wallet and make claiming rewards relevant for you.",
+  "cashback.not.current.warning.title": "WARNING",
+  "cashback.not.current.warning.use.this": "use this wallet",
   "connector.appName": "Dapp Connector",
   "connector.appNameShort": "Connector",
   "connector.assetReceived": "{assetName} received",
diff --git a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
index 36790a9830..b7ae9847a3 100644
--- a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
@@ -16,7 +16,7 @@ import type { ActionsMap } from '../../actions/index';
 import type { StoresMap } from '../index';
 import { getNetworkById, getCardanoHaskellBaseConfig } from '../../api/ada/lib/storage/database/prepackaged/networks';
 import type { WalletState } from '../../../chrome/extension/background/types';
-import { getWallets, subscribe, listenForWalletStateUpdate } from '../../api/thunk';
+import { getWallets, subscribe, listenForWalletStateUpdate, setCashbackWallet } from '../../api/thunk';
 import { FlagsApi } from '@emurgo/yoroi-lib/dist/flags';
 import type { StorageAPI } from '@emurgo/yoroi-lib/dist/flags';
 import { createFlagStorage, loadSubmittedTransactions } from '../../api/localStorage';
@@ -435,6 +435,23 @@ export default class WalletStore extends Store<StoresMap, ActionsMap> {
       submittedTxs,
     );
   }
+
+  async getCashbackWallet(): Promise<?WalletState> {
+    const savedCashbackWalletId = await this.api.localStorage.getCashbackWalletId();
+    if (typeof savedCashbackWalletId !== 'number') {
+      return null;
+    }
+    for (const wallet of this.wallets) {
+      if (wallet.publicDeriverId === savedCashbackWalletId) {
+        return wallet;
+      }
+    }
+    return null;
+  }
+
+  setCashbackWallet(id: number): void {
+    setCashbackWallet(id);
+  }
 }
 
 export const WalletCreationNotifications: {| [key: string]: Notification |} = {

From 61c3e21750f660cf29238007a29c52ccc7dd5dc7 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Fri, 22 Nov 2024 15:19:49 +0800
Subject: [PATCH 055/143] disable cashback icon on side bar of Trezor wallets

---
 .../yoroi-extension/app/stores/stateless/sidebarCategories.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/yoroi-extension/app/stores/stateless/sidebarCategories.js b/packages/yoroi-extension/app/stores/stateless/sidebarCategories.js
index cb7191d28f..603e0b0b74 100644
--- a/packages/yoroi-extension/app/stores/stateless/sidebarCategories.js
+++ b/packages/yoroi-extension/app/stores/stateless/sidebarCategories.js
@@ -166,7 +166,7 @@ export const allCategoriesRevamp: Array<SidebarCategoryRevamp> = [
     route: ROUTES.CASHBACK.ROOT,
     icon: CashbackIcon,
     label: globalMessages.sidebarCashback,
-    isVisible: _request => true,
+    isVisible: ({ selected }) => selected?.type !== 'trezor',
   },
   {
     className: 'connected-websites',

From b30cb54a15abc22ab3cb70563987991d8b2075ca Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Fri, 22 Nov 2024 16:22:43 +0800
Subject: [PATCH 056/143] handle deleting cashback wallet

---
 .../app/api/localStorage/index.js             |  5 +-
 .../categories/RemoveWalletDialogContainer.js | 62 ++++++++++++++++---
 .../app/i18n/locales/en-US.json               |  3 +
 .../background/handlers/content/bring.js      |  3 +-
 .../background/handlers/yoroi/utils.js        |  3 +-
 .../background/handlers/yoroi/wallet.js       |  9 ++-
 6 files changed, 70 insertions(+), 15 deletions(-)

diff --git a/packages/yoroi-extension/app/api/localStorage/index.js b/packages/yoroi-extension/app/api/localStorage/index.js
index 30f89d8276..ded9df75ed 100644
--- a/packages/yoroi-extension/app/api/localStorage/index.js
+++ b/packages/yoroi-extension/app/api/localStorage/index.js
@@ -339,8 +339,11 @@ export default class LocalStorageApi {
     String(id)
   );
 
-  getCashbackWalletId: () => Promise<number> = async () => {
+  getCashbackWalletId: () => Promise<number | null> = async () => {
     const v = await getLocalItem(storageKeys.CASHBACK_WALLET_ID);
+    if (!v) {
+      return null;
+    }
     return Number(v);
   }
 
diff --git a/packages/yoroi-extension/app/containers/settings/categories/RemoveWalletDialogContainer.js b/packages/yoroi-extension/app/containers/settings/categories/RemoveWalletDialogContainer.js
index c8a69e9659..e94730d274 100644
--- a/packages/yoroi-extension/app/containers/settings/categories/RemoveWalletDialogContainer.js
+++ b/packages/yoroi-extension/app/containers/settings/categories/RemoveWalletDialogContainer.js
@@ -4,7 +4,7 @@ import { Component } from 'react';
 import { action, observable } from 'mobx';
 import { observer } from 'mobx-react';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, intlShape, type $npm$ReactIntl$MessageDescriptor } from 'react-intl';
 import globalMessages from '../../../i18n/global-messages';
 import { messages } from '../../../components/wallet/settings/RemoveWallet';
 
@@ -23,6 +23,12 @@ type InjectedLayoutProps = {|
 |};
 type AllProps = {| ...Props, ...InjectedLayoutProps |};
 
+type State = {|
+  warning1Text: ?$npm$ReactIntl$MessageDescriptor,
+  warning2Text: ?$npm$ReactIntl$MessageDescriptor,
+  acceptText: ?$npm$ReactIntl$MessageDescriptor,
+|};
+
 const dialogMessages = defineMessages({
   warning2: {
     id: 'wallet.settings.delete.warning2',
@@ -34,10 +40,28 @@ const dialogMessages = defineMessages({
     id: 'wallet.settings.delete.accept',
     defaultMessage: '!!!I still have the means to restore this wallet',
   },
+  cashbackWarning1: {
+    id: 'wallet.settings.delete.warning1.cashback',
+    defaultMessage: '!!!Removing this wallet will not impact its balance, but as it’s connected to Bring, this may disrupt your cashback process. You can also use another wallet for connecting the cashback before removing this wallet.'
+  },
+  cashbackWarning2: {
+    id: 'wallet.settings.delete.warning2.cashback',
+    defaultMessage: '!!!This wallet can be restored again at any time, but double-check if you still have the means to restore access to it. If you cannot, removing the wallet may result in irreversible loss of funds.'
+  },
+  cashbackAccept: {
+    id: 'wallet.settings.delete.accept.cashback',
+    defaultMessage: '!!!I still have the means to restore this wallet and want to stop generating cashback rewards for this wallet.'
+  },
 });
 
 @observer
-class RemoveWalletDialogContainer extends Component<AllProps> {
+class RemoveWalletDialogContainer extends Component<AllProps, State> {
+  state = {
+    warning1Text: null,
+    warning2Text: null,
+    acceptText: null,
+  }
+
   static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
     intl: intlShape.isRequired,
   };
@@ -46,6 +70,23 @@ class RemoveWalletDialogContainer extends Component<AllProps> {
     this.props.stores.walletSettings.removeWalletRequest.reset();
   }
 
+  async componentDidMount() {
+    const { wallets } = this.props.stores;
+    if (await wallets.getCashbackWallet() === wallets.selected) {
+      this.setState({
+        warning1Text: dialogMessages.cashbackWarning1,
+        warning2Text: dialogMessages.cashbackWarning2,
+        acceptText: dialogMessages.cashbackAccept,
+      });
+    } else {
+      this.setState({
+        warning1Text: messages.removeExplanation,
+        warning2Text: dialogMessages.warning2,
+        acceptText: dialogMessages.accept,
+      });
+    }
+  }
+
   @observable isChecked: boolean = false;
 
   @action
@@ -78,10 +119,15 @@ class RemoveWalletDialogContainer extends Component<AllProps> {
     const settingsStore = this.props.stores.walletSettings;
     const settingsActions = this.props.actions.walletSettings;
 
+    const { warning1Text, warning2Text, acceptText } = this.state;
+    if (!warning1Text || !warning2Text || !acceptText) {
+      return null;
+    }
+
     const DangerousActionDialogClassic = (
       <DangerousActionDialog
         title={intl.formatMessage(messages.titleLabel)}
-        checkboxAcknowledge={intl.formatMessage(dialogMessages.accept)}
+        checkboxAcknowledge={intl.formatMessage(acceptText)}
         isChecked={this.isChecked}
         toggleCheck={this.toggleCheck}
         isSubmitting={settingsStore.removeWalletRequest.isExecuting}
@@ -100,14 +146,14 @@ class RemoveWalletDialogContainer extends Component<AllProps> {
         }}
         id="removeWalletDialog"
       >
-        <p>{intl.formatMessage(messages.removeExplanation)}</p>
-        <p>{intl.formatMessage(dialogMessages.warning2)}</p>
+        <p>{intl.formatMessage(warning1Text)}</p>
+        <p>{intl.formatMessage(warning2Text)}</p>
       </DangerousActionDialog>
     );
     const DangerousActionDialogRevamp = (
       <DangerousActionDialog
         title={intl.formatMessage(messages.titleLabel)}
-        checkboxAcknowledge={intl.formatMessage(dialogMessages.accept)}
+        checkboxAcknowledge={intl.formatMessage(acceptText)}
         isChecked={this.isChecked}
         toggleCheck={this.toggleCheck}
         isSubmitting={settingsStore.removeWalletRequest.isExecuting}
@@ -122,8 +168,8 @@ class RemoveWalletDialogContainer extends Component<AllProps> {
         }}
         id="removeWalletDialog"
       >
-        <p>{intl.formatMessage(messages.removeExplanation)}</p>
-        <p>{intl.formatMessage(dialogMessages.warning2)}</p>
+        <p>{intl.formatMessage(warning1Text)}</p>
+        <p>{intl.formatMessage(warning2Text)}</p>
       </DangerousActionDialog>
     );
 
diff --git a/packages/yoroi-extension/app/i18n/locales/en-US.json b/packages/yoroi-extension/app/i18n/locales/en-US.json
index b8fff125d4..a6a5203bce 100644
--- a/packages/yoroi-extension/app/i18n/locales/en-US.json
+++ b/packages/yoroi-extension/app/i18n/locales/en-US.json
@@ -841,7 +841,10 @@
   "wallet.settings.changePassword.dialog.repeatPasswordLabel": "Repeat new password",
   "wallet.settings.changePassword.dialog.title.changePassword": "Change password",
   "wallet.settings.delete.accept": "I still have the means to restore this wallet",
+  "wallet.settings.delete.accept.cashback": "I still have the means to restore this wallet and want to stop generating cashback rewards for this wallet.",
+  "wallet.settings.delete.warning1.cashback": "Removing this wallet will not impact its balance, but as it’s connected to Bring, this may disrupt your cashback process. You can also use another wallet for connecting the cashback before removing this wallet.",
   "wallet.settings.delete.warning2": "Please double-check you still have the means to restore access to this wallet. If you cannot, removing the wallet may result in irreversible loss of funds.",
+  "wallet.settings.delete.warning2.cashback": "This wallet can be restored again at any time, but double-check if you still have the means to restore access to it. If you cannot, removing the wallet may result in irreversible loss of funds.",
   "wallet.settings.export.explanation": "This can be used to transfer a wallet between devices.",
   "wallet.settings.export.label": "Export wallet",
   "wallet.settings.general.language": "Language",
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
index ed9b547eb3..9681e5df02 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
@@ -53,12 +53,11 @@ const handlers = Object.freeze({
   'set-cashback-wallet': async (id: number) => {
     const localStorageApi = new LocalStorageApi();
     await localStorageApi.saveCashbackWalletId(id);
-    notifyAllTabsCashbackWalletChange(id);
     return { ok: undefined };
   },
 });
 
-async function getCashbackWallet(): Promise<PublicDeriver<> | null> {
+export async function getCashbackWallet(): Promise<PublicDeriver<> | null> {
   const db = await getDb();
   const publicDerivers = await loadWalletsFromStorage(db);
   const localStorageApi = new LocalStorageApi();
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/utils.js b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/utils.js
index ca9f5c11a8..9f6c5372d9 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/utils.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/utils.js
@@ -13,7 +13,7 @@ export async function getPublicDeriverById(publicDeriverId: number): Promise<Pub
   throw new Error(`missing public deriver ${publicDeriverId}`);
 }
 
-export function notifyAllTabsCashbackWalletChange(activeWalletId: number) {
+export function notifyAllTabsCashbackWalletChange() {
   declare var chrome;
   chrome.tabs.query({}, (tabs) => {
     for (const tab of tabs) {
@@ -21,7 +21,6 @@ export function notifyAllTabsCashbackWalletChange(activeWalletId: number) {
         tab.id,
         {
           type: 'cashback-wallet-change',
-          activeWalletId,
         }
       );
     }
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js
index 7462b49aeb..17e7eb0e21 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js
@@ -30,7 +30,7 @@ import WalletTransaction from '../../../../../app/domain/WalletTransaction';
 import type { AdaGetTransactionsRequest } from '../../../../../app/api/ada';
 import { updateProtocolParametersCacheFromNetwork } from './protocolParameters';
 import { isTrezorTWallet } from '../../../../../app/api/ada/lib/storage/models/ConceptualWallet';
-import type { PublicDeriver, } from '../../../../../app/api/ada/lib/storage/models/PublicDeriver/';
+import type { PublicDeriver, } from '../../../../../app/api/ada/lib/storage/models/PublicDeriver';
 
 type CreateWalletRequest = {|
   networkId: number,
@@ -126,7 +126,7 @@ async function maybeNotifyCashbackWalletChange(newWallet: PublicDeriver<>) {
   const db = await getDb();
   const publicDerivers = await loadWalletsFromStorage(db);
   if (publicDerivers.length === 1 && !isTrezorTWallet(newWallet.getParent())) {
-    notifyAllTabsCashbackWalletChange(newWallet.getPublicDeriverId());
+    notifyAllTabsCashbackWalletChange();
   }
 }
 
@@ -151,6 +151,11 @@ export const RemoveWallet: HandlerType<
         publicDeriverId: request.publicDeriverId,
       }
     });
+
+    const localStorageApi = new LocalStorageApi();
+    if (await localStorageApi.getCashbackWalletId() === request.publicDeriverId) {
+      notifyAllTabsCashbackWalletChange();
+    }
   },
 });
 

From 54816d6a6c1b5521df726600f9b32ba27cc901b3 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Mon, 25 Nov 2024 04:53:22 +0800
Subject: [PATCH 057/143] cashback wallet selection popup dialog

---
 packages/yoroi-extension/app/connector/App.js |   2 +-
 .../yoroi-extension/app/connector/Routes.js   |  40 +++++--
 .../components/connect/ConnectPage.js         | 113 +++++++++++-------
 .../components/connect/ConnectPage.scss       |  11 +-
 .../components/connect/ConnectedWallet.js     |  42 ++++---
 .../components/connect/ConnectedWallet.scss   |   9 ++
 .../app/connector/components/layout/Layout.js |  24 +++-
 .../SelectCashbackWalletContainer.js          |  52 ++++++++
 .../app/connector/routes-config.js            |   1 +
 .../app/i18n/locales/en-US.json               |   3 +
 .../chrome/content-scripts/bringLib.js        |  15 ++-
 .../background/handlers/content/bring.js      |  16 ++-
 packages/yoroi-extension/package-lock.json    |  28 +++++
 packages/yoroi-extension/package.json         |   1 +
 14 files changed, 275 insertions(+), 82 deletions(-)
 create mode 100644 packages/yoroi-extension/app/connector/containers/SelectCashbackWalletContainer.js

diff --git a/packages/yoroi-extension/app/connector/App.js b/packages/yoroi-extension/app/connector/App.js
index 45a11ff962..9b4b78e5f2 100644
--- a/packages/yoroi-extension/app/connector/App.js
+++ b/packages/yoroi-extension/app/connector/App.js
@@ -130,7 +130,7 @@ class App extends Component<Props, State> {
     if (this.state.crashed === true) {
       return <CrashPage />;
     }
-    return <Router history={history}>{Routes(stores, actions)}</Router>;
+    return <Router history={history}><Routes stores={stores} actions={actions} /></Router>;
   };
 }
 
diff --git a/packages/yoroi-extension/app/connector/Routes.js b/packages/yoroi-extension/app/connector/Routes.js
index 3dcd54028d..3483c0c78c 100644
--- a/packages/yoroi-extension/app/connector/Routes.js
+++ b/packages/yoroi-extension/app/connector/Routes.js
@@ -1,22 +1,41 @@
 // @flow
 import type { Node } from 'react';
-import { Route, Switch } from 'react-router-dom';
+import { Route, Switch, useLocation } from 'react-router-dom';
 import type { StoresMap } from './stores/index';
 import type { ActionsMap } from './actions/index';
 import { ROUTES } from './routes-config';
+import Helmet from 'react-helmet';
+import { injectIntl } from 'react-intl';
+import type { $npm$ReactIntl$IntlShape } from 'react-intl';
+import { observer } from 'mobx-react';
 
 // PAGES
 import ConnectContainer from './containers/ConnectContainer';
-import Layout from './components/layout/Layout';
+import Layout, { messages } from './components/layout/Layout';
 import SignTxContainer from './containers/SignTxContainer';
 import LoadingPage from '../containers/LoadingPage';
+import SelectCashbackWalletContainer from './containers/SelectCashbackWalletContainer';
 
-export const Routes = (stores: StoresMap, actions: ActionsMap): Node => {
-  if (stores.loading.isLoading) {
-    return <LoadingPage stores={stores} actions={actions} />;
-  }
-  return wrapPages(getContent(stores, actions));
-};
+type Props = {| stores: StoresMap, actions: ActionsMap, |};
+type Intl = {| intl: $npm$ReactIntl$IntlShape |};
+export const Routes: React$ComponentType<Props>  = injectIntl(observer((props: Props & Intl) => {
+  const { stores, actions, intl } = props;
+  const title = intl.formatMessage(
+    useLocation().pathname === ROUTES.SELECT_CASHBACK_WALLET ?
+      messages.yoroiConnector : messages.yoroiDappConnector
+  );
+
+  return (
+    <>
+      <Helmet><title>Yoroi Connector</title></Helmet>
+      {stores.loading.isLoading ? (
+        <LoadingPage stores={stores} actions={actions} />
+      ) : (
+        wrapPages(getContent(stores, actions))
+      )}
+    </>
+  );
+}));
 
 const getContent = (stores, actions) => (
   <Switch>
@@ -30,6 +49,11 @@ const getContent = (stores, actions) => (
       path={ROUTES.SIGNIN_TRANSACTION}
       component={props => <SignTxContainer {...props} stores={stores} actions={actions} />}
     />
+    <Route
+      exact
+      path={ROUTES.SELECT_CASHBACK_WALLET}
+      component={props => <SelectCashbackWalletContainer {...props} stores={stores} actions={actions} />}
+    />
   </Switch>
 );
 
diff --git a/packages/yoroi-extension/app/connector/components/connect/ConnectPage.js b/packages/yoroi-extension/app/connector/components/connect/ConnectPage.js
index 6f2c922b45..ee02a58a3c 100644
--- a/packages/yoroi-extension/app/connector/components/connect/ConnectPage.js
+++ b/packages/yoroi-extension/app/connector/components/connect/ConnectPage.js
@@ -74,6 +74,14 @@ const messages = defineMessages({
     id: 'connector.connect.hardwareWalletsConnectWithAuthNotSupported',
     defaultMessage: '!!!Connecting to hardware wallet with authentication is not supported',
   },
+  cashbackApplyAll: {
+    id: 'connector.connect.cashback.apply.all',
+    defaultMessage: '!!!The wallet you select will be applied for all parter websites.'
+  },
+  cashbackDisabledTrezor: {
+    id: 'connector.connect.cashback.trezor.disabled',
+    defaultMessage: '!!!Bring cashback service doesn’t support Trezor wallet connection',
+  },
 });
 
 type Props = {|
@@ -97,6 +105,7 @@ type Props = {|
   +unitOfAccount: UnitOfAccountSettingType,
   +getCurrentPrice: (from: string, to: string) => ?string,
   +onUpdateHideBalance: void => Promise<void>,
+  +isSelectingCashbackWallet?: boolean,
 |};
 
 type InjectedProps = {| +isRevampLayout: boolean |};
@@ -188,6 +197,7 @@ class ConnectPage extends Component<Props & InjectedProps> {
       onUpdateHideBalance,
       isRevampLayout,
       selectedWallet,
+      isSelectingCashbackWallet = false,
     } = this.props;
     const isNightly = environment.isNightly();
     const componentClasses = classNames([styles.component, isNightly && styles.isNightly]);
@@ -258,7 +268,7 @@ class ConnectPage extends Component<Props & InjectedProps> {
       <div className={componentClasses}>
         {hasWallets ? (
           <>
-            <ProgressBar step={isAppAuth ? 2 : 1} max={2} />
+            {!isSelectingCashbackWallet && (<ProgressBar step={isAppAuth ? 2 : 1} max={2} />)}
             <Typography
               component="div"
               variant="h4"
@@ -272,19 +282,21 @@ class ConnectPage extends Component<Props & InjectedProps> {
             >
               {intl.formatMessage(messages.connectWallet)}
             </Typography>
-            <div className={styles.connectWrapper}>
-              <div className={styles.image}>
-                {faviconUrl != null && faviconUrl !== '' ? <img src={faviconUrl} alt={`${url} favicon`} /> : <NoDappIcon />}
-              </div>
-              <Box marginTop="16px">
-                <Typography component="div" variant="body-1" fontWeight="400" color="gray.900">
-                  {intl.formatMessage(messages.subtitle)}{' '}
-                  <Typography as="span" variant="body-1" fontWeight="500">
-                    {url}
+            {!isSelectingCashbackWallet && (
+              <div className={styles.connectWrapper}>
+                <div className={styles.image}>
+                  {faviconUrl != null && faviconUrl !== '' ? <img src={faviconUrl} alt={`${url} favicon`} /> : <NoDappIcon />}
+                </div>
+                <Box marginTop="16px">
+                  <Typography component="div" variant="body-1" fontWeight="400" color="gray.900">
+                    {intl.formatMessage(messages.subtitle)}{' '}
+                    <Typography as="span" variant="body-1" fontWeight="500">
+                      {url}
+                    </Typography>
                   </Typography>
-                </Typography>
-              </Box>
-            </div>
+                </Box>
+              </div>
+            )}
           </>
         ) : null}
         <Box flex={1}>
@@ -308,42 +320,56 @@ class ConnectPage extends Component<Props & InjectedProps> {
                     </button>
                   </div>
 
+                  {isSelectingCashbackWallet && (
+                    <div className={styles.cashbackApplyAll}>{intl.formatMessage(messages.cashbackApplyAll)}</div>
+                  )}
+
                   <ul className={styles.list}>
-                    {publicDerivers.map((wallet, idx) => (
-                      <li key={wallet.publicDeriverId} className={styles.listItem}>
-                        <WalletButton onClick={() => onSelectWallet(wallet, wallet.plate)}>
-                          <ConnectedWallet
-                            publicDeriver={wallet}
-                            walletBalance={
-                              <Box
-                                sx={{
-                                  ml: 'auto',
-                                  textAlign: 'right',
-                                }}
-                              >
-                                <AmountDisplay
-                                  shouldHideBalance={this.props.shouldHideBalance}
-                                  amount={wallet.balance}
-                                  getTokenInfo={this.props.getTokenInfo}
-                                  unitOfAccountSetting={this.props.unitOfAccount}
-                                  getCurrentPrice={this.props.getCurrentPrice}
-                                  showFiat
-                                  showAmount
-                                  id={'dAppConnector:connect:walletList:walletCard_' + idx}
-                                />
-                              </Box>
-                            }
-                          />
-                        </WalletButton>
-                      </li>
-                    ))}
+                    {publicDerivers.map((wallet, idx) => {
+                      const isTrezor = isSelectingCashbackWallet && wallet.type === 'trezor';
+                      const Button = isTrezor ? DisabledWalletButton : WalletButton;
+                      return (
+                        <li
+                          key={wallet.publicDeriverId}
+                          className={[styles.listItem, isTrezor ? '' : styles.enabledWallet].join(' ')}
+                        >
+                          <Button onClick={() => onSelectWallet(wallet, wallet.plate)}>
+                            <ConnectedWallet
+                              disabledForReason={
+                                isTrezor ? intl.formatMessage(messages.cashbackDisabledTrezor) : null
+                              }
+                              publicDeriver={wallet}
+                              walletBalance={
+                                <Box
+                                  sx={{
+                                    ml: 'auto',
+                                    textAlign: 'right',
+                                  }}
+                                >
+                                  <AmountDisplay
+                                    shouldHideBalance={this.props.shouldHideBalance}
+                                    amount={wallet.balance}
+                                    getTokenInfo={this.props.getTokenInfo}
+                                    unitOfAccountSetting={this.props.unitOfAccount}
+                                    getCurrentPrice={this.props.getCurrentPrice}
+                                    showFiat
+                                    showAmount
+                                    id={'dAppConnector:connect:walletList:walletCard_' + idx}
+                                  />
+                                </Box>
+                              }
+                            />
+                          </Button>
+                        </li>
+                      );
+                    })}
                   </ul>
                 </div>
               ) : null}
             </>
           )}
         </Box>
-        {hasWallets && !isAppAuth ? (
+        {!isSelectingCashbackWallet && hasWallets && !isAppAuth ? (
           <div className={styles.bottom}>
             <div className={styles.infoText}>{intl.formatMessage(messages.connectInfo)}</div>
             <div className={styles.infoText}>{intl.formatMessage(connectorMessages.messageReadOnly)}</div>
@@ -362,3 +388,6 @@ const WalletButton = styled('button')({
   fontSize: '1rem',
   padding: '16px',
 });
+const DisabledWalletButton = styled(WalletButton)({
+  cursor: 'default',
+});
diff --git a/packages/yoroi-extension/app/connector/components/connect/ConnectPage.scss b/packages/yoroi-extension/app/connector/components/connect/ConnectPage.scss
index 043799529d..a8703b2b00 100644
--- a/packages/yoroi-extension/app/connector/components/connect/ConnectPage.scss
+++ b/packages/yoroi-extension/app/connector/components/connect/ConnectPage.scss
@@ -92,6 +92,13 @@
   }
 }
 
+.cashbackApplyAll {
+  margin-left: 16px;
+  font-weight: 400;
+  font-size: 14px;
+  line-height: 16px;
+}
+
 .list {
   & .listItem {
     border: 1px solid #fff;
@@ -105,12 +112,12 @@
       width: 100%;
       color: var(--yoroi-palette-gray-900);
     }
-
+  }
+  & .enabledWallet {
     &:hover {
       border-color: #c4cad7;
     }
   }
-
   overflow: auto;
 }
 
diff --git a/packages/yoroi-extension/app/connector/components/connect/ConnectedWallet.js b/packages/yoroi-extension/app/connector/components/connect/ConnectedWallet.js
index 7ce9265b7c..36771356b6 100644
--- a/packages/yoroi-extension/app/connector/components/connect/ConnectedWallet.js
+++ b/packages/yoroi-extension/app/connector/components/connect/ConnectedWallet.js
@@ -10,6 +10,7 @@ import type { WalletState } from '../../../../chrome/extension/background/types'
 type Props = {|
   +publicDeriver: WalletState,
   +walletBalance?: Node,
+  +disabledForReason?: ?string,
 |};
 
 function constructPlate(
@@ -35,7 +36,7 @@ export default class WalletCard extends Component<Props> {
   };
 
   render(): Node {
-    const { publicDeriver, walletBalance } = this.props;
+    const { publicDeriver, walletBalance, disabledForReason } = this.props;
     // eslint-disable-next-line no-unused-vars
     const [_, iconComponent] = publicDeriver.plate
       ? constructPlate(publicDeriver.plate, 0, styles.icon)
@@ -44,25 +45,28 @@ export default class WalletCard extends Component<Props> {
     const checksum = this.props.publicDeriver.plate?.TextPart;
 
     return (
-      <Box className={styles.card}>
-        <div className={styles.wrapper}>
-          <div className={styles.avatar}>{iconComponent}</div>
-          <div className={styles.nameWrapper}>
-            <Typography
-              component="div"
-              color="#242838"
-              fontWeight="500"
-              variant="b1"
-              fontSize={16}
-              id="connectedWalletName"
-            >
-              {this.props.publicDeriver.name}
-            </Typography>
-            <div className={styles.checksum} id="connectedWalletPlate">{checksum}</div>
+      <>
+        <Box className={styles.card}>
+          <div className={styles.wrapper}>
+            <div className={styles.avatar}>{iconComponent}</div>
+            <div className={styles.nameWrapper}>
+              <Typography
+                component="div"
+                color="#242838"
+                fontWeight="500"
+                variant="b1"
+                fontSize={16}
+                id="connectedWalletName"
+              >
+                {this.props.publicDeriver.name}
+              </Typography>
+              <div className={styles.checksum} id="connectedWalletPlate">{checksum}</div>
+            </div>
+            {walletBalance != null && <Box sx={{ ml: 'auto' }}>{walletBalance}</Box>}
           </div>
-          {walletBalance != null && <Box sx={{ ml: 'auto' }}>{walletBalance}</Box>}
-        </div>
-      </Box>
+        </Box>
+        {disabledForReason && (<div className={styles.disabledReason}>{disabledForReason}</div>)}
+      </>
     );
   }
 }
diff --git a/packages/yoroi-extension/app/connector/components/connect/ConnectedWallet.scss b/packages/yoroi-extension/app/connector/components/connect/ConnectedWallet.scss
index 9f846562d5..d6187b178f 100644
--- a/packages/yoroi-extension/app/connector/components/connect/ConnectedWallet.scss
+++ b/packages/yoroi-extension/app/connector/components/connect/ConnectedWallet.scss
@@ -50,3 +50,12 @@
     font-size: 14px;
   }
 }
+
+.disabledReason {
+  font-size: 12px;
+  font-weight: 400;
+  line-height: 16px;
+  letter-spacing: 0.20000000298023224px;
+  text-align: left;
+  color: var(--text-error, rgba(255, 19, 81, 1));
+}
diff --git a/packages/yoroi-extension/app/connector/components/layout/Layout.js b/packages/yoroi-extension/app/connector/components/layout/Layout.js
index f80423e5db..7d76c3c336 100644
--- a/packages/yoroi-extension/app/connector/components/layout/Layout.js
+++ b/packages/yoroi-extension/app/connector/components/layout/Layout.js
@@ -1,6 +1,7 @@
 // @flow
 import { Component } from 'react';
-import type { Node } from 'react';
+import type { Node, ComponentType } from 'react';
+import { withRouter, type Location } from 'react-router-dom';
 import { ReactComponent as YoroiLogo } from '../../assets/images/yoroi-logo.inline.svg';
 import styles from './Layout.scss';
 import { observer } from 'mobx-react';
@@ -9,25 +10,38 @@ import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import TestnetWarningBanner from '../../../components/topbar/banners/TestnetWarningBanner';
 import { ReactComponent as DappConnectorIcon } from '../../../assets/images/dapp-connector/dapp-connector.inline.svg';
 import environment from '../../../environment';
+import { ROUTES } from '../../routes-config';
 
 type Props = {|
   children: Node,
 |};
+type LocationProp = {|
+  location: Location,
+|};
 
-const messages = defineMessages({
+export const messages: Object = defineMessages({
   yoroiDappConnector: {
     id: 'global.connector.yoroiDappConnector',
     defaultMessage: '!!!Yoroi Dapp Connector',
   },
+  yoroiConnector: {
+    id: 'global.connector.yoroiConnector',
+    defaultMessage: '!!!Yoroi Connector',
+  },
 });
+
 @observer
-export default class Layout extends Component<Props> {
+class Layout extends Component<Props & LocationProp> {
   static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
     intl: intlShape.isRequired,
   };
 
   render(): Node {
     const { intl } = this.context;
+    const title = intl.formatMessage(
+      this.props.location.pathname === ROUTES.SELECT_CASHBACK_WALLET ?
+        messages.yoroiConnector : messages.yoroiDappConnector
+    );
 
     return (
       <div className={styles.layout}>
@@ -36,7 +50,7 @@ export default class Layout extends Component<Props> {
           <div className={styles.menu}>
             <YoroiLogo />
             <div className={styles.logo}>
-              <h3>{intl.formatMessage(messages.yoroiDappConnector)}</h3>
+              <h3>{title}</h3>
             </div>
             <div className={styles.connectorLogoContainer}>
               <DappConnectorIcon className={styles.connectorLogo} />
@@ -48,3 +62,5 @@ export default class Layout extends Component<Props> {
     );
   }
 }
+
+export default (withRouter(Layout): ComponentType<Props>);
diff --git a/packages/yoroi-extension/app/connector/containers/SelectCashbackWalletContainer.js b/packages/yoroi-extension/app/connector/containers/SelectCashbackWalletContainer.js
new file mode 100644
index 0000000000..2ada2fce6b
--- /dev/null
+++ b/packages/yoroi-extension/app/connector/containers/SelectCashbackWalletContainer.js
@@ -0,0 +1,52 @@
+// @flow
+import { Component, type Node } from 'react';
+import ConnectPage from '../components/connect/ConnectPage';
+import { observer } from 'mobx-react';
+import { autorun } from 'mobx';
+import { genLookupOrFail } from '../../stores/stateless/tokenHelpers';
+import type { WalletState } from '../../../chrome/extension/background/types';
+import { setCashbackWallet } from '../../api/thunk';
+import type { ConnectorStoresAndActionsProps } from '../../types/injectedProps.types';
+
+@observer
+export default class SelectCashbackWalletContainer extends Component<ConnectorStoresAndActionsProps> {
+  componentDidMount() {
+    this.props.actions.connector.refreshWallets.trigger();
+  }
+
+  onCancel() {
+    window.close();
+  }
+
+  onSelectWallet(wallet: WalletState) {
+    setCashbackWallet(wallet.publicDeriverId);
+    window.close();
+  }
+
+  render(): Node {
+    const { stores, actions } = this.props;
+
+    return (
+      <ConnectPage
+        selectedWallet={{ index: -1, deriver: undefined, checksum: undefined }} // placeholder
+        onConnect={async () => {}} // placeholder
+        onCancel={this.onCancel}
+        isAppAuth={false} // na
+        hidePasswordForm={() => {}} // placeholder
+        loading={stores.connector.loadingWallets}
+        error={''} // na
+        message={null} // na
+        publicDerivers={stores.connector.wallets}
+        onSelectWallet={this.onSelectWallet}
+        network="Cardano"
+        getTokenInfo={genLookupOrFail(stores.tokenInfoStore.tokenInfo)}
+        shouldHideBalance={stores.profile.shouldHideBalance}
+        unitOfAccount={stores.profile.unitOfAccount}
+        getCurrentPrice={stores.coinPriceStore.getCurrentPrice}
+        onUpdateHideBalance={actions.profile.updateHideBalance.trigger}
+        isSelectingCashbackWallet={true}
+      />
+    );
+  }
+}
+
diff --git a/packages/yoroi-extension/app/connector/routes-config.js b/packages/yoroi-extension/app/connector/routes-config.js
index f526f0ecc3..a602fb167e 100644
--- a/packages/yoroi-extension/app/connector/routes-config.js
+++ b/packages/yoroi-extension/app/connector/routes-config.js
@@ -2,4 +2,5 @@
 export const ROUTES = {
   ROOT: '/',
   SIGNIN_TRANSACTION: '/signin-transaction',
+  SELECT_CASHBACK_WALLET: '/select-cashback-wallet',
 };
diff --git a/packages/yoroi-extension/app/i18n/locales/en-US.json b/packages/yoroi-extension/app/i18n/locales/en-US.json
index a6a5203bce..9f539fa648 100644
--- a/packages/yoroi-extension/app/i18n/locales/en-US.json
+++ b/packages/yoroi-extension/app/i18n/locales/en-US.json
@@ -77,6 +77,8 @@
   "connector.assetsReceived": "{quantity} assets received",
   "connector.assetsSent": "{quantity} assets sent",
   "connector.connect.connectedWallets": "Connected Wallets",
+  "connector.connect.cashback.apply.all": "The wallet you select will be applied for all parter websites.",
+  "connector.connect.cashback.trezor.disabled": "Bring cashback service doesn’t support Trezor wallet connection",
   "connector.connect.connectedWallets.active": "Active",
   "connector.connect.createWallet": "create wallet",
   "connector.connect.hardwareWalletsConnectWithAuthNotSupported": "Connecting to hardware wallet with authentication is not supported",
@@ -117,6 +119,7 @@
   "global.blog.learnMore": "You can read our {blogLink} to learn more.",
   "global.connector.connectedWebsites": "Connected Websites",
   "global.connector.messageReadOnly": "We are granting read-only to view utxos/addresses.",
+  "global.connector.yoroiConnector": "Yoroi Connector",
   "global.connector.yoroiDappConnector": "Yoroi Dapp Connector",
   "global.contact": "contact support",
   "global.copyTooltipMessage": "Copied",
diff --git a/packages/yoroi-extension/chrome/content-scripts/bringLib.js b/packages/yoroi-extension/chrome/content-scripts/bringLib.js
index 8d426b6978..959c850933 100644
--- a/packages/yoroi-extension/chrome/content-scripts/bringLib.js
+++ b/packages/yoroi-extension/chrome/content-scripts/bringLib.js
@@ -4,12 +4,14 @@ declare var chrome;
 // We pass the RPC call inject.js and have it relay the request and reponse messages to the background,
 // instead of directly calling the background with chrome.runtime.sendMessage, so that this lib can also
 // be used in the web page process.
-const callbacks = [];
+const callbacks: Map<number, (Object) => void> = new Map();
+let uid = 0;
 
 window.addEventListener('message', (event) => {
   if (event.data.type === 'bring_rpc_response') {
-    const callback = callbacks.splice(event.data.uid, 1)[0];
+    const callback = callbacks.get(event.data.uid);
     if (callback) {
+      callbacks.delete(event.data.uid);
       callback(event.data);
     }
   }
@@ -17,7 +19,7 @@ window.addEventListener('message', (event) => {
 
 function callBackground(functionName: string, params: any): Promise<any> {
   return new Promise((resolve, reject) => {
-    callbacks.push((msg) => {
+    callbacks.set(uid, (msg) => {
       if (msg.return.err) {
         reject(new Error(msg.return.err));
       } else {
@@ -28,10 +30,11 @@ function callBackground(functionName: string, params: any): Promise<any> {
     window.postMessage({
       type: 'bring_rpc_request',
       url: location.hostname,
-      uid: callbacks.length - 1,
+      uid,
       function: functionName,
       params,
     });
+    uid += 1;
   });
 }
 
@@ -47,6 +50,10 @@ export function popUpWalletCreation(): void {
   callBackground('pop-up-wallet-creation');
 }
 
+export function popUpCashbackWalletSelection(): void {
+  callBackground('pop-up-cashback-wallet-selection');
+}
+
 export function listenForCashbackWalletChange(callback: () => void): void {
   // todo: verify sender extension id
   chrome.runtime.onMessage.addListener((msg, sender) => {
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
index 9681e5df02..acce0e9c79 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
@@ -7,6 +7,7 @@ import { PublicDeriver, } from '../../../../../app/api/ada/lib/storage/models/Pu
 import { getDb } from '../../state';
 import { loadWalletsFromStorage } from '../../../../../app/api/ada/lib/storage/models/load';
 import { notifyAllTabsCashbackWalletChange } from '../yoroi/utils';
+import { getBoundsForTabWindow, popupProps } from './utils';
 
 declare var chrome;
 
@@ -21,7 +22,18 @@ const handlers = Object.freeze({
   },
 
   'pop-up-wallet-creation': async () => {
-    chrome.tabs.create({ url: 'main_window.html' });
+    chrome.tabs.create({ url: 'main_window.html#/wallets/add' });
+    return { ok: undefined };
+  },
+
+  'pop-up-cashback-wallet-selection': async (_: void, tabId: number) => {
+    const bounds = await getBoundsForTabWindow(tabId);
+    chrome.windows.create({
+      ...popupProps,
+      url: chrome.runtime.getURL('main_window_connector.html#/select-cashback-wallet'),
+      left: (bounds.width + bounds.positionX) - popupProps.width,
+      top: bounds.positionY + 80,
+    });
     return { ok: undefined };
   },
 
@@ -113,6 +125,6 @@ export async function handleBringRpc(message: Object, sender: Object) {
     throw new Error('missing Bring handler for ' + message.function);
   }
 
-  const result = await handler(message.params);
+  const result = await handler(message.params, sender.tab.id);
   sendRpcResponse(result, sender.tab.id, message.uid);
 }
diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index fb2e352e39..92ea44d12e 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -80,6 +80,7 @@
         "react-blockies": "1.4.1",
         "react-copy-to-clipboard": "5.0.3",
         "react-dom": "17.0.2",
+        "react-helmet": "^6.1.0",
         "react-intl": "2.9.0",
         "react-markdown": "5.0.3",
         "react-query": "^3.39.3",
@@ -23831,6 +23832,25 @@
         "react": "17.0.2"
       }
     },
+    "node_modules/react-fast-compare": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
+      "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="
+    },
+    "node_modules/react-helmet": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz",
+      "integrity": "sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==",
+      "dependencies": {
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.7.2",
+        "react-fast-compare": "^3.1.1",
+        "react-side-effect": "^2.1.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.3.0"
+      }
+    },
     "node_modules/react-intl": {
       "version": "2.9.0",
       "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-2.9.0.tgz",
@@ -24044,6 +24064,14 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
+    "node_modules/react-side-effect": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.2.tgz",
+      "integrity": "sha512-PVjOcvVOyIILrYoyGEpDN3vmYNLdy1CajSFNt4TDsVQC5KpTijDvWVoR+/7Rz2xT978D8/ZtFceXxzsPwZEDvw==",
+      "peerDependencies": {
+        "react": "^16.3.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
     "node_modules/react-smooth": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-4.0.1.tgz",
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
index 2848be5819..03b5d69738 100644
--- a/packages/yoroi-extension/package.json
+++ b/packages/yoroi-extension/package.json
@@ -219,6 +219,7 @@
     "react-blockies": "1.4.1",
     "react-copy-to-clipboard": "5.0.3",
     "react-dom": "17.0.2",
+    "react-helmet": "6.1.0",
     "react-intl": "2.9.0",
     "react-markdown": "5.0.3",
     "react-query": "^3.39.3",

From 16c1ee17b0c864dd90adf5c7ed1a1a64411b1dd1 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Mon, 25 Nov 2024 13:38:53 +0800
Subject: [PATCH 058/143] bug fix

---
 packages/yoroi-extension/app/api/localStorage/index.js          | 2 +-
 .../chrome/extension/background/handlers/content/bring.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/yoroi-extension/app/api/localStorage/index.js b/packages/yoroi-extension/app/api/localStorage/index.js
index ded9df75ed..a5cabc0db7 100644
--- a/packages/yoroi-extension/app/api/localStorage/index.js
+++ b/packages/yoroi-extension/app/api/localStorage/index.js
@@ -132,7 +132,7 @@ export default class LocalStorageApi {
     let id = await getLocalItem(storageKeys.SELECTED_WALLET);
     // previously it was stored in window.localStorage, which is not accessible in the mv3 service worker
     if (!id) {
-      id = window?.localStorage.getItem(storageKeys.SELECTED_WALLET);
+      id = window.localStorage?.getItem(storageKeys.SELECTED_WALLET);
     }
     if (!id) {
       return null;
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
index acce0e9c79..692e1e6d15 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
@@ -40,7 +40,7 @@ const handlers = Object.freeze({
   'get-address': async () => {
     const publicDeriver = await getCashbackWallet();
     if (!publicDeriver) {
-      return;
+      return { ok: undefined };
     }
     const result = (await getAllAddressesForWallet(publicDeriver)).accountingAddresses[0];
     return { ok: result.address.Hash };

From 2ce1cc42119e19471ac7c5b50978091d258b12a2 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Mon, 25 Nov 2024 20:09:00 +0800
Subject: [PATCH 059/143] move some message definitions

---
 .../app/components/buySell/BuySellDialog.js          | 12 ++----------
 packages/yoroi-extension/app/i18n/global-messages.js |  8 ++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/yoroi-extension/app/components/buySell/BuySellDialog.js b/packages/yoroi-extension/app/components/buySell/BuySellDialog.js
index 4618144d79..fa436f4b02 100644
--- a/packages/yoroi-extension/app/components/buySell/BuySellDialog.js
+++ b/packages/yoroi-extension/app/components/buySell/BuySellDialog.js
@@ -51,19 +51,11 @@ const messages = defineMessages({
     id: 'buysell.dialog.providerFee',
     defaultMessage: '!!!Provider fee',
   },
-  disclaimer: {
-    id: 'buysell.dialog.disclaimer',
-    defaultMessage: '!!!Disclaimer',
-  },
   disclaimerText: {
     id: 'buysell.dialog.disclaimerText',
     defaultMessage:
       '!!!Yoroi Wallet utilizes third-party web3 on-and-off ramp solutions for direct Fiat-ADA exchanges. By clicking "Proceed," you acknowledge that you will be redirected to our partner\'s website, where you may need to accept their terms and conditions.  Please note, the third party web3 solution may have limitations based on your location and financial institution.',
   },
-  proceed: {
-    id: 'buysell.dialog.proceed',
-    defaultMessage: 'PROCEED',
-  },
   urlGenerationErrorDialogTitle: {
     id: 'buysell.dialog.error.dialog.title',
     defaultMessage: '!!!url generation',
@@ -411,7 +403,7 @@ export default class BuySellDialog extends Component<Props, State> {
               <InfoIcon style={{ verticalAlign: 'middle' }} />
             </IconWrapper>
             <Typography style={{ verticalAlign: 'middle' }} color="ds.text_gray_medium">
-              {intl.formatMessage(messages.disclaimer)}
+              {intl.formatMessage(globalMessages.disclaimer)}
             </Typography>
           </header>
           <Typography color="ds.text_gray_medium">{intl.formatMessage(messages.disclaimerText)}</Typography>
@@ -479,7 +471,7 @@ export default class BuySellDialog extends Component<Props, State> {
         forceBottomDivider
         actions={[
           {
-            label: intl.formatMessage(messages.proceed),
+            label: intl.formatMessage(globalMessages.proceed),
             primary: true,
             disabled: state.amountAda === '' || state.inputError !== null,
             onClick: this.onSubmit,
diff --git a/packages/yoroi-extension/app/i18n/global-messages.js b/packages/yoroi-extension/app/i18n/global-messages.js
index 30d9fe5fee..2d7e548db3 100644
--- a/packages/yoroi-extension/app/i18n/global-messages.js
+++ b/packages/yoroi-extension/app/i18n/global-messages.js
@@ -1012,6 +1012,14 @@ const globalMessages: * = defineMessages({
     id: 'buysell.dialog.provider',
     defaultMessage: '!!!Provider',
   },
+  disclaimer: {
+    id: 'buysell.dialog.disclaimer',
+    defaultMessage: '!!!Disclaimer',
+  },
+  proceed: {
+    id: 'buysell.dialog.proceed',
+    defaultMessage: 'PROCEED',
+  },
 });
 export default globalMessages;
 

From dccc00d1205f9b2f409384722e1cd7bf1b3058a8 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Mon, 25 Nov 2024 20:10:34 +0800
Subject: [PATCH 060/143] disclaimer for cashback

---
 .../app/api/localStorage/index.js             | 20 ++++
 .../components/widgets/DisclaimerDialog.js    | 94 +++++++++++++++++++
 .../app/containers/cashback/CashbackPage.js   | 33 ++++++-
 .../app/i18n/locales/en-US.json               |  7 ++
 4 files changed, 152 insertions(+), 2 deletions(-)
 create mode 100644 packages/yoroi-extension/app/components/widgets/DisclaimerDialog.js

diff --git a/packages/yoroi-extension/app/api/localStorage/index.js b/packages/yoroi-extension/app/api/localStorage/index.js
index a5cabc0db7..e08a4c8673 100644
--- a/packages/yoroi-extension/app/api/localStorage/index.js
+++ b/packages/yoroi-extension/app/api/localStorage/index.js
@@ -48,6 +48,7 @@ const storageKeys = {
   THEME: networkForLocalStorage + '-THEME',
 
   CASHBACK_WALLET_ID: 'CASHBACK_WALLET_ID',
+  SHOWN_DISCLAIMERS: 'SHOWN_DISCLAIMERS',
 };
 
 export type SetCustomUserThemeRequest = {|
@@ -58,6 +59,8 @@ export type WalletsNavigation = {|
   cardano: number[],
 |};
 
+type Disclaimer = 'cashback' | 'buySellAda' | 'swap';
+
 /**
  * This api layer provides access to the electron local storage
  * for user settings that are not synced with any coin backend.
@@ -347,6 +350,23 @@ export default class LocalStorageApi {
     return Number(v);
   }
 
+  _getShownDisclaimerObject: () => Promise<Object> = async () => {
+    const raw = await getLocalItem(storageKeys.SHOWN_DISCLAIMERS);
+    const val = raw ? JSON.parse(raw) : {};
+    return val;
+  }
+
+  setShownDisclaimer: (Disclaimer) => Promise<void> = async (which) => {
+    const val = await this._getShownDisclaimerObject();
+    val[which] = true;
+    await setLocalItem(storageKeys.SHOWN_DISCLAIMERS, JSON.stringify(val));
+  };
+
+  isDisclaimerShown: (Disclaimer) => Promise<boolean> = async (which) => {
+    const val = await this._getShownDisclaimerObject();
+    return val[which] === true;
+  }
+
   async reset(): Promise<void> {
     await this.unsetUserLocale();
     await this.unsetComplexityLevel();
diff --git a/packages/yoroi-extension/app/components/widgets/DisclaimerDialog.js b/packages/yoroi-extension/app/components/widgets/DisclaimerDialog.js
new file mode 100644
index 0000000000..3aa8999f6f
--- /dev/null
+++ b/packages/yoroi-extension/app/components/widgets/DisclaimerDialog.js
@@ -0,0 +1,94 @@
+// @flow
+import { useState } from 'react';
+import { injectIntl, defineMessages, type $npm$ReactIntl$IntlShape } from 'react-intl';
+import Dialog from './Dialog';
+import globalMessages from '../../i18n/global-messages';
+import { Typography, Checkbox, FormControlLabel } from '@mui/material';
+import { styled } from '@mui/material/styles';
+
+const messages = defineMessages({
+  disclaimer: {
+    id: 'cashback.disclaimer',
+    defaultMessage: '!!!By clicking "Proceed," you acknowledge that you will be redirected to a third-party service provider offering cashback services in ADA currency. You may be required to agree to the terms, conditions, and privacy policies of the third-party provider to complete the transaction. Yoroi Wallet does not control, endorse, or assume responsibility for the content, security, policies, or services provided by the third party.',
+  },
+  disclaimerNote: {
+    id: 'cashback.disclaimer.note',
+    defaultMessage: '!!!
Please note:',
+  },
+  disclaimerNote1: {
+    id: 'cashback.disclaimer.note.1',
+    defaultMessage: '!!!1. Yoroi Wallet is not liable for any losses, delays, or errors that may occur while using the third-party service.',
+  },
+  disclaimerNote2: {
+    id: 'cashback.disclaimer.note.2',
+    defaultMessage: '!!!2. Transactions may be subject to restrictions based on your geographic location, applicable laws, financial institution policies, or the service provider\'s limitations.',
+  },
+  disclaimerNote3: {
+    id: 'cashback.disclaimer.note.3',
+    defaultMessage: '!!!3. Ensure you review and understand the third party\'s terms, as your interactions are solely governed by their agreements.',
+  },
+  disclaimerNote4: {
+    id: 'cashback.disclaimer.note.4',
+    defaultMessage: '!!!4. Yoroi Wallet does not collect or store any personal or financial data submitted through the third-party platform.',
+  },
+  disclaimerAgree: {
+    id: 'cashback.disclaimer.agree',
+    defaultMessage: '!!!I understand this disclaimer.',
+  },
+});
+
+type Props = {|
+  onProceed: () => void,
+|};
+type Intl = {|
+  intl: $npm$ReactIntl$IntlShape
+|};
+
+const DisclaimerText = styled(Typography)(() => ({
+  fontSize: '16px',
+  lineHeight: '24px',
+}));
+const DisclaimerBold = styled(Typography)(() => ({
+  fontSize: '16px',
+  lineHeight: '24px',
+  fontWeight: 500,
+}));
+
+const DisclaimerDialog: React$ComponentType<Props> = injectIntl((props: Props & Intl) => {
+  const { intl } = props;
+  const [disclaimerAgreed, setDisclaimerAgreed] = useState(false);
+  return (
+    <Dialog
+      title={intl.formatMessage(globalMessages.disclaimer)}
+      actions={[
+        {
+          label: intl.formatMessage(globalMessages.proceed),
+          onClick: props.onProceed,
+          disabled: !disclaimerAgreed,
+          primary: true,
+        }
+      ]}
+    >
+      <DisclaimerText>{intl.formatMessage(messages.disclaimer)}</DisclaimerText>
+      <DisclaimerText>&nbsp;</DisclaimerText>
+      <DisclaimerBold>{intl.formatMessage(messages.disclaimerNote)}</DisclaimerBold>
+      <DisclaimerText>{intl.formatMessage(messages.disclaimerNote1)}</DisclaimerText>
+      <DisclaimerText>{intl.formatMessage(messages.disclaimerNote2)}</DisclaimerText>
+      <DisclaimerText>{intl.formatMessage(messages.disclaimerNote3)}</DisclaimerText>
+      <DisclaimerText>{intl.formatMessage(messages.disclaimerNote4)}</DisclaimerText>
+      <DisclaimerText>&nbsp;</DisclaimerText>
+      <FormControlLabel
+        sx={{ marginLeft: '0px' }}
+        control={
+          <Checkbox
+            checked={disclaimerAgreed}
+            onChange={(event) => setDisclaimerAgreed(event.target.checked)}
+          />
+        }
+        label={intl.formatMessage(messages.disclaimerAgree)}
+      />
+    </Dialog>
+  );
+});
+
+export default DisclaimerDialog;
diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index 71dbfa42ef..29b7a9e6d5 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -35,6 +35,8 @@ import { injectIntl, defineMessages, } from 'react-intl';
 import { getNetworkById } from '../../api/ada/lib/storage/database/prepackaged/networks';
 import { forceNonNull } from '../../coreUtils';
 import { constructPlate32 } from '../../components/topbar/WalletCard';
+import LocalStorageApi from '../../api/localStorage';
+import DisclaimerDialog from '../../components/widgets/DisclaimerDialog';
 
 const messages = defineMessages({
   claim: {
@@ -252,6 +254,8 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
     };
   }, [iframeSrc, fetchIframeUrl, handleMessage]);
 
+  // If the current cashback wallet is not the current wallet, this value initially holds the current cashback
+  // wallet, to be shown in a warning dialog.
   const [shownCashbackWallet, setShownCashbackWallet] = useState(null);
 
   useEffect(() => {
@@ -262,7 +266,19 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
       }
     });
   }, []);
-  
+
+  const [shouldShowDisclaimer, setShouldShowDisclaimer] = useState(false);
+
+  useEffect(() => {
+    const localStorageApi = new LocalStorageApi();
+    localStorageApi.isDisclaimerShown('cashback').then((result) => {
+      if (!result) {
+        setShouldShowDisclaimer(true);
+        setPopup(true);
+      }
+    });
+  }, []);
+
   const closePopup = useCallback(() => {
     iframeRef.current?.contentWindow.postMessage({ to: 'bringweb3', action: 'CLOSE_POPUP' }, '*');
     setPopup(false);
@@ -291,7 +307,20 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
     >
       <FullscreenLayout bottomPadding={0}>
         <Suspense fallback={null}>
-          {shownCashbackWallet && (
+          {shouldShowDisclaimer && (
+            <DisclaimerDialog
+              onProceed={() => {
+                setShouldShowDisclaimer(false);
+                if (!shownCashbackWallet) {
+                  setPopup(false);
+                }
+                const localStorageApi = new LocalStorageApi();
+                localStorageApi.setShownDisclaimer('cashback');
+              }}
+            />
+          )}
+
+          {shownCashbackWallet && !shouldShowDisclaimer && (
             <Dialog
               title={intl.formatMessage(messages.warning)}
               actions={[
diff --git a/packages/yoroi-extension/app/i18n/locales/en-US.json b/packages/yoroi-extension/app/i18n/locales/en-US.json
index 9f539fa648..166492a9c0 100644
--- a/packages/yoroi-extension/app/i18n/locales/en-US.json
+++ b/packages/yoroi-extension/app/i18n/locales/en-US.json
@@ -65,6 +65,13 @@
   "cashback.claim.dialog.instruction.password": "Enter your password to claim cashback rewards.",
   "cashback.claim.dialog.message.label": "Message",
   "cashback.claim.dialog.title": "CLAIM CASHBACK",
+  "cashback.disclaimer": "By clicking \"Proceed,\" you acknowledge that you will be redirected to a third-party service provider offering cashback services in ADA currency. You may be required to agree to the terms, conditions, and privacy policies of the third-party provider to complete the transaction. Yoroi Wallet does not control, endorse, or assume responsibility for the content, security, policies, or services provided by the third party.",
+  "cashback.disclaimer.agree": "I understand this disclaimer.",
+  "cashback.disclaimer.note": "
Please note:",
+  "cashback.disclaimer.note.1": "1. Yoroi Wallet is not liable for any losses, delays, or errors that may occur while using the third-party service.",
+  "cashback.disclaimer.note.2": "2. Transactions may be subject to restrictions based on your geographic location, applicable laws, financial institution policies, or the service provider's limitations.",
+  "cashback.disclaimer.note.3": "3. Ensure you review and understand the third party's terms, as your interactions are solely governed by their agreements.",
+  "cashback.disclaimer.note.4": "4. Yoroi Wallet does not collect or store any personal or financial data submitted through the third-party platform.",
   "cashback.not.current.warning.current": "Current rewards wallet",
   "cashback.not.current.warning.keep": "keep current wallet",
   "cashback.not.current.warning.text": "Your cashback rewards are currently linked to another wallet. To claim your ADA cashback, either switch to the wallet connected to Bring or change the rewards wallet to the one you're using now. You can always access settings at anytime to change your cashback wallet and make claiming rewards relevant for you.",

From 775ba10c5914049d1df2085a92c758b4c6807d96 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Mon, 25 Nov 2024 23:58:45 +0800
Subject: [PATCH 061/143] fix typo

---
 .../app/connector/components/connect/ConnectPage.js             | 2 +-
 packages/yoroi-extension/app/i18n/locales/en-US.json            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/yoroi-extension/app/connector/components/connect/ConnectPage.js b/packages/yoroi-extension/app/connector/components/connect/ConnectPage.js
index ee02a58a3c..18bcaf65a4 100644
--- a/packages/yoroi-extension/app/connector/components/connect/ConnectPage.js
+++ b/packages/yoroi-extension/app/connector/components/connect/ConnectPage.js
@@ -76,7 +76,7 @@ const messages = defineMessages({
   },
   cashbackApplyAll: {
     id: 'connector.connect.cashback.apply.all',
-    defaultMessage: '!!!The wallet you select will be applied for all parter websites.'
+    defaultMessage: '!!!The wallet you select will be applied for all partner websites.'
   },
   cashbackDisabledTrezor: {
     id: 'connector.connect.cashback.trezor.disabled',
diff --git a/packages/yoroi-extension/app/i18n/locales/en-US.json b/packages/yoroi-extension/app/i18n/locales/en-US.json
index 166492a9c0..ee512aa67c 100644
--- a/packages/yoroi-extension/app/i18n/locales/en-US.json
+++ b/packages/yoroi-extension/app/i18n/locales/en-US.json
@@ -84,7 +84,7 @@
   "connector.assetsReceived": "{quantity} assets received",
   "connector.assetsSent": "{quantity} assets sent",
   "connector.connect.connectedWallets": "Connected Wallets",
-  "connector.connect.cashback.apply.all": "The wallet you select will be applied for all parter websites.",
+  "connector.connect.cashback.apply.all": "The wallet you select will be applied for all partner websites.",
   "connector.connect.cashback.trezor.disabled": "Bring cashback service doesn’t support Trezor wallet connection",
   "connector.connect.connectedWallets.active": "Active",
   "connector.connect.createWallet": "create wallet",

From 7fd63d31b1a368713345de413e9f92176e305d32 Mon Sep 17 00:00:00 2001
From: Sorin Chis <kish.sorin@yahoo.com>
Date: Wed, 27 Nov 2024 14:08:04 +0200
Subject: [PATCH 062/143] add setting option for bring cashback

---
 .../general-setting/BringCashbackSettings.js  | 190 ++++++++++++++++++
 .../categories/GeneralSettingsPage.js         |  50 +++++
 .../app/i18n/locales/en-US.json               |   3 +
 3 files changed, 243 insertions(+)
 create mode 100644 packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js

diff --git a/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js b/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
new file mode 100644
index 0000000000..bb189bf910
--- /dev/null
+++ b/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
@@ -0,0 +1,190 @@
+// @flow
+import { Component } from 'react';
+import type { Node, ComponentType } from 'react';
+import { observer } from 'mobx-react';
+import classNames from 'classnames';
+import Select from '../../../common/Select';
+import { MenuItem, Typography, Stack } from '@mui/material';
+import { Box } from '@mui/system';
+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 VerticalFlexContainer from '../../../layout/VerticalFlexContainer';
+import LoadingSpinner from '../../../widgets/LoadingSpinner';
+import globalMessages from '../../../../i18n/global-messages';
+import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
+import { withLayout } from '../../../../styles/context/layout';
+import type { InjectedLayoutProps } from '../../../../styles/context/layout';
+import WalletAccountIcon from '../../../topbar/WalletAccountIcon';
+
+const messages = defineMessages({
+  bringCashbackTitle: {
+    id: 'settings.cashback.title',
+    defaultMessage: '!!!Bring cashback wallet',
+  },
+  note: {
+    id: 'settings.cashback.note',
+    defaultMessage:
+      '!!!Your connected wallet is the designated wallet for receiving ADA cashback rewards through Bring and applied to all partner websites. You can switch to a different wallet anytime to ensure your cashback is directed to your preferred wallet or select “None” to decline this service.',
+  },
+  label: {
+    id: 'settings.cashback.label',
+    defaultMessage: '!!!Connected Wallet',
+  },
+});
+
+type currentValue = Array<{
+  isSelected: boolean,
+  name: string,
+  plate: any,
+  type: string,
+  walletId: number,
+  ...
+}>;
+
+type Props = {|
+  +onSelect: string => Promise<void>,
+  +isSubmitting: boolean,
+  +cardanoWallets: any,
+  +currentValue: currentValue,
+  +error?: ?LocalizableError,
+|};
+
+const saturationFactor = {
+  saturationFactor: 0,
+  size: 8,
+  scalePx: 4,
+  iconSize: 32,
+  borderRadius: 4,
+};
+
+@observer
+class BringCashbackSettings extends Component<Props & InjectedLayoutProps> {
+  static defaultProps: {| error: void |} = {
+    error: undefined,
+  };
+
+  static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
+    intl: intlShape.isRequired,
+  };
+
+  form: ReactToolboxMobxForm = new ReactToolboxMobxForm({
+    fields: {
+      cashbackWalletId: {
+        label: this.context.intl.formatMessage(messages.label),
+      },
+    },
+  });
+
+  render(): Node {
+    const { cardanoWallets, error, currentValue } = this.props;
+    const { intl } = this.context;
+    const { form } = this;
+    const cashbackWalletId = form.$('cashbackWalletId');
+    const componentClassNames = classNames([styles.component, 'currency']);
+
+    const optionRenderer = option => {
+      return (
+        <MenuItem
+          key={option.name}
+          value={option.name}
+          sx={{ height: '60px' }}
+          id={'selectCashbackWallet-' + option.name + '-menuItem'}
+        >
+          <Box sx={{ display: 'flex' }}>
+            <WalletIcon imagePart={option.plate.ImagePart} />
+            <Box sx={{ marginLeft: '8px' }}>
+              <Typography variant="body1" color="ds.text_gray_medium">
+                {option.name}| {option.plate.TextPart}
+              </Typography>
+            </Box>
+          </Box>
+        </MenuItem>
+      );
+    };
+
+    const dialog = this.props.isSubmitting ? (
+      <Dialog title={intl.formatMessage(globalMessages.processingLabel)} closeOnOverlayClick={false}>
+        <VerticalFlexContainer>
+          <LoadingSpinner />
+        </VerticalFlexContainer>
+      </Dialog>
+    ) : null;
+
+    return (
+      <Box
+        sx={{
+          b: '20px',
+          mt: '13px',
+        }}
+        className={componentClassNames}
+      >
+        {dialog}
+        <Typography component="h2" variant="body1" fontWeight={500} mb="16px">
+          {intl.formatMessage(messages.bringCashbackTitle)}
+        </Typography>
+
+        <Box
+          sx={{
+            width: '506px',
+            marginTop: '0px',
+          }}
+        >
+          <Select
+            formControlProps={{ error: !!error }}
+            helperText={error && intl.formatMessage(error, error.values)}
+            error={!!error}
+            {...cashbackWalletId.bind()}
+            onChange={this.props.onSelect}
+            value={currentValue[0]}
+            menuProps={{
+              sx: {
+                '& .MuiMenu-paper': {
+                  maxHeight: '280px',
+                },
+              },
+            }}
+            renderValue={value => (
+              <Stack direction="row">
+                <WalletIcon imagePart={value.plate.ImagePart} />
+                <Typography variant="body1" color="ds.text_gray_medium" mt="2px">
+                  {value.name}| {value.plate.TextPart}
+                </Typography>
+              </Stack>
+            )}
+          >
+            {cardanoWallets.map(option => optionRenderer(option))}
+          </Select>
+          <Typography component="div" variant="caption1" display="inline-block" color="grayscale.700">
+            <FormattedHTMLMessage {...messages.note} />
+          </Typography>
+        </Box>
+      </Box>
+    );
+  }
+}
+
+export default (withLayout(BringCashbackSettings): ComponentType<Props>);
+
+const WalletIcon = ({ imagePart }: {| imagePart: string |}) => {
+  return (
+    <Box
+      sx={{
+        width: `24px`,
+        height: `24px`,
+        borderRadius: `8px`,
+        alignItems: 'center',
+        justifyContent: 'center',
+        '& .identicon': {
+          borderRadius: `8px`,
+        },
+
+        marginRight: '16px',
+      }}
+    >
+      <WalletAccountIcon iconSeed={imagePart} saturationFactor={0} size={8} scalePx={4} />
+    </Box>
+  );
+};
diff --git a/packages/yoroi-extension/app/containers/settings/categories/GeneralSettingsPage.js b/packages/yoroi-extension/app/containers/settings/categories/GeneralSettingsPage.js
index 9a7f6f4fdf..3560a34a9a 100644
--- a/packages/yoroi-extension/app/containers/settings/categories/GeneralSettingsPage.js
+++ b/packages/yoroi-extension/app/containers/settings/categories/GeneralSettingsPage.js
@@ -8,6 +8,7 @@ import type { StoresAndActionsProps } from '../../../types/injectedProps.types';
 import ThemeSettingsBlock from '../../../components/settings/categories/general-setting/ThemeSettingsBlock';
 import AboutYoroiSettingsBlock from '../../../components/settings/categories/general-setting/AboutYoroiSettingsBlock';
 import UnitOfAccountSettings from '../../../components/settings/categories/general-setting/UnitOfAccountSettings';
+import BringCashbackSettings from '../../../components/settings/categories/general-setting/BringCashbackSettings';
 import { ReactComponent as AdaCurrency } from '../../../assets/images/currencies/ADA.inline.svg';
 import { unitOfAccountDisabledValue } from '../../../types/unitOfAccountType';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
@@ -50,6 +51,24 @@ const currencyLabels = defineMessages({
   },
 });
 
+const getGeneratedWalletIds = (sortedWalletListIdx, currentWalletIdx) => {
+  let generatedWalletIds;
+  if (sortedWalletListIdx !== undefined && sortedWalletListIdx.length > 0) {
+    const newWalletIds = currentWalletIdx.filter(id => {
+      const index = sortedWalletListIdx.indexOf(id);
+      if (index === -1) {
+        return true;
+      }
+      return false;
+    });
+    generatedWalletIds = [...sortedWalletListIdx, ...newWalletIds];
+  } else {
+    generatedWalletIds = currentWalletIdx;
+  }
+
+  return generatedWalletIds;
+};
+
 @observer
 export default class GeneralSettingsPage extends Component<StoresAndActionsProps> {
   static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
@@ -64,8 +83,14 @@ export default class GeneralSettingsPage extends Component<StoresAndActionsProps
     await this.props.actions.profile.updateUnitOfAccount.trigger(unitOfAccount);
   };
 
+  onSelectBringCashbackWallet: string => Promise<void> = async value => {
+    console.log('CASHBACK Wallet Selected', value);
+  };
+
   render(): Node {
     const { intl } = this.context;
+    const { wallets } = this.props.stores.wallets;
+
     const profileStore = this.props.stores.profile;
     const coinPriceStore = this.props.stores.coinPriceStore;
 
@@ -92,6 +117,24 @@ export default class GeneralSettingsPage extends Component<StoresAndActionsProps
 
     const unitOfAccountValue = profileStore.unitOfAccount.enabled ? profileStore.unitOfAccount.currency : 'ADA';
 
+    const cardanoWallets = [];
+
+    const selectedWalletName = this.props.stores.wallets.selectedWalletName;
+
+    wallets.forEach(wallet => {
+      const rewards = this.props.stores.delegation.getRewardBalanceOrZero(wallet);
+
+      const walletMap = {
+        walletId: wallet.publicDeriverId,
+        plate: wallet.plate,
+        type: wallet.type,
+        name: wallet.name,
+        isSelected: wallet.name === selectedWalletName,
+      };
+
+      cardanoWallets.push(walletMap);
+    });
+
     return (
       <Box sx={{ pb: profileStore.isRevampTheme ? '50px' : '0px' }}>
         {profileStore.isRevampTheme && (
@@ -106,6 +149,13 @@ export default class GeneralSettingsPage extends Component<StoresAndActionsProps
           currentLocale={profileStore.currentLocale}
           error={profileStore.setProfileLocaleRequest.error}
         />
+        <BringCashbackSettings
+          onSelect={this.onSelectBringCashbackWallet}
+          isSubmitting={false}
+          cardanoWallets={cardanoWallets}
+          currentValue={cardanoWallets.filter(wallet => wallet.isSelected)}
+          error={null}
+        />
         <UnitOfAccountSettings
           onSelect={this.onSelectUnitOfAccount}
           isSubmitting={isSubmittingUnitOfAccount}
diff --git a/packages/yoroi-extension/app/i18n/locales/en-US.json b/packages/yoroi-extension/app/i18n/locales/en-US.json
index ee512aa67c..d2851b4ecc 100644
--- a/packages/yoroi-extension/app/i18n/locales/en-US.json
+++ b/packages/yoroi-extension/app/i18n/locales/en-US.json
@@ -358,6 +358,9 @@
   "settings.unitOfAccount.note": "<strong>Note:</strong> coin price is approximate and may not match the price of any given trading platform. Any transactions based on these price approximates are done at your own risk.",
   "settings.unitOfAccount.revamp.label": "Select currency",
   "settings.unitOfAccount.title": "Fiat pairing",
+  "settings.cashback.title": "Bring cashback wallet",
+  "settings.cashback.note": "Your connected wallet is the designated wallet for receiving ADA cashback rewards through Bring and applied to all partner websites. You can switch to a different wallet anytime to ensure your cashback is directed to your preferred wallet or select “None” to decline this service.",
+  "settings.cashback.label": "Connected wallet",
   "sidebar.assets": "Assets",
   "sidebar.portfolio": "Portfolio",
   "sidebar.faq": "Faq",

From fab32868a4842c7a02b7028f4404d058998883c7 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 27 Nov 2024 16:48:40 +0800
Subject: [PATCH 063/143] refactor to lift public key derivation

---
 packages/yoroi-extension/app/api/ada/index.js | 15 +++++++++--
 .../lib/storage/bridge/walletBuilder/byron.js |  2 +-
 .../storage/bridge/walletBuilder/shelley.js   | 25 ++++++-----------
 .../models/ConceptualWallet/interfaces.js     | 16 ++++++-----
 .../storage/models/ConceptualWallet/traits.js | 27 +++++++------------
 .../api/ada/lib/storage/tests/index.test.js   |  2 +-
 6 files changed, 41 insertions(+), 46 deletions(-)

diff --git a/packages/yoroi-extension/app/api/ada/index.js b/packages/yoroi-extension/app/api/ada/index.js
index 4d45651c83..cdadc18d66 100644
--- a/packages/yoroi-extension/app/api/ada/index.js
+++ b/packages/yoroi-extension/app/api/ada/index.js
@@ -165,6 +165,7 @@ import TimeUtils from './lib/storage/bridge/timeUtils';
 import type { IFetcher } from './lib/state-fetch/IFetcher.types';
 import { Bip44DerivationLevels, CoinType } from '@emurgo/yoroi-lib';
 import type { ProtocolParameters } from '@emurgo/yoroi-lib/dist/protocol-parameters/models';
+import { encryptWithPassword } from '../../utils/passwordCipher';
 
 // ADA specific Request / Response params
 
@@ -1815,11 +1816,21 @@ export default class AdaApi {
     try {
       // Note: we only restore for 0th account
       const rootPk = generateWalletRootKey(recoveryPhrase);
+      const encryptedRoot = encryptWithPassword(
+        walletPassword,
+        rootPk.as_bytes(),
+      );
+      const accountPublicKey = rootPk
+        .derive(WalletTypePurpose.CIP1852)
+        .derive(CoinTypes.CARDANO)
+        .derive(request.accountIndex)
+        .to_public();
+
       const newPubDerivers = [];
       const wallet = await createStandardCip1852Wallet({
         db: request.db,
-        rootPk,
-        password: walletPassword,
+        encryptedRoot,
+        accountPublicKey,
         accountIndex: request.accountIndex,
         walletName,
         accountName: '', // set account name empty now
diff --git a/packages/yoroi-extension/app/api/ada/lib/storage/bridge/walletBuilder/byron.js b/packages/yoroi-extension/app/api/ada/lib/storage/bridge/walletBuilder/byron.js
index e166436923..6c06b4b270 100644
--- a/packages/yoroi-extension/app/api/ada/lib/storage/bridge/walletBuilder/byron.js
+++ b/packages/yoroi-extension/app/api/ada/lib/storage/bridge/walletBuilder/byron.js
@@ -217,7 +217,7 @@ export async function createStandardBip44Wallet(request: {|
           }
           return {
             deriverRequest: {
-              decryptPrivateDeriverPassword: request.password,
+              decryptPrivateDeriver: { preDerived: false, password: request.password },
               publicDeriverMeta: {
                 name: request.accountName,
               },
diff --git a/packages/yoroi-extension/app/api/ada/lib/storage/bridge/walletBuilder/shelley.js b/packages/yoroi-extension/app/api/ada/lib/storage/bridge/walletBuilder/shelley.js
index 6da1605320..f8c9cdb6ff 100644
--- a/packages/yoroi-extension/app/api/ada/lib/storage/bridge/walletBuilder/shelley.js
+++ b/packages/yoroi-extension/app/api/ada/lib/storage/bridge/walletBuilder/shelley.js
@@ -23,7 +23,6 @@ import type { HWFeatures, } from '../../database/walletTypes/core/tables';
 import { WalletBuilder } from './builder';
 
 import { RustModule } from '../../../cardanoCrypto/rustLoader';
-import { encryptWithPassword } from '../../../../../../utils/passwordCipher';
 
 import {
   Bip44DerivationLevels,
@@ -153,8 +152,8 @@ export async function getAccountDefaultDerivations(
 
 export async function createStandardCip1852Wallet(request: {|
   db: lf$Database,
-  rootPk: RustModule.WalletV4.Bip32PrivateKey,
-  password: string,
+  encryptedRoot: string,
+  accountPublicKey: RustModule.WalletV4.Bip32PublicKey,
   accountIndex: number,
   walletName: string,
   accountName: string,
@@ -164,24 +163,13 @@ export async function createStandardCip1852Wallet(request: {|
     throw new Error(`${nameof(createStandardCip1852Wallet)} needs hardened index`);
   }
 
-  const encryptedRoot = encryptWithPassword(
-    request.password,
-    request.rootPk.as_bytes(),
-  );
-
-  const accountPublicKey = request.rootPk
-    .derive(WalletTypePurpose.CIP1852)
-    .derive(CoinTypes.CARDANO)
-    .derive(request.accountIndex)
-    .to_public();
-
   if (request.network.BaseConfig[0].ChainNetworkId == null) {
     throw new Error(`${nameof(createStandardCip1852Wallet)} missing Byron network id`);
   }
 
   const initialDerivations = await getAccountDefaultDerivations(
     Number.parseInt(request.network.BaseConfig[0].ChainNetworkId, 10),
-    accountPublicKey,
+    request.accountPublicKey,
     rawGenAddByHash(new Set()),
   );
 
@@ -203,7 +191,7 @@ export async function createStandardCip1852Wallet(request: {|
         _finalState => ({
           rootInsert: {
             privateKeyInfo: {
-              Hash: encryptedRoot,
+              Hash: request.encryptedRoot,
               IsEncrypted: true,
               PasswordLastUpdate: null,
               Type: KeyKind.BIP32ED25519,
@@ -244,7 +232,10 @@ export async function createStandardCip1852Wallet(request: {|
           }
           return {
             deriverRequest: {
-              decryptPrivateDeriverPassword: request.password,
+              decryptPrivateDeriver: {
+                preDerived: true,
+                result: { pubKeyHex: request.accountPublicKey.to_hex() }
+              },
               publicDeriverMeta: {
                 name: request.accountName,
               },
diff --git a/packages/yoroi-extension/app/api/ada/lib/storage/models/ConceptualWallet/interfaces.js b/packages/yoroi-extension/app/api/ada/lib/storage/models/ConceptualWallet/interfaces.js
index c24351f6b3..23de72313c 100644
--- a/packages/yoroi-extension/app/api/ada/lib/storage/models/ConceptualWallet/interfaces.js
+++ b/packages/yoroi-extension/app/api/ada/lib/storage/models/ConceptualWallet/interfaces.js
@@ -75,13 +75,15 @@ export type IDerivePublicFromPrivateRequest = {|
   publicDeriverMeta: {|
     name: string,
   |},
-  decryptPrivateDeriverPassword: null | string,
-  /**
-   * void -> do not store key
-   * null -> store as unencrypted
-   * string  -> store and encrypt
-   */
-  encryptPublicDeriverPassword?: null | string,
+  decryptPrivateDeriver: {|
+    preDerived: false,
+    password: null | string
+  |} | {|
+    preDerived: true,
+    result: {|
+      pubKeyHex: string,
+    |},
+  |},
   initialDerivations: TreeInsert<any>,
   path: Array<{|
     index: number,
diff --git a/packages/yoroi-extension/app/api/ada/lib/storage/models/ConceptualWallet/traits.js b/packages/yoroi-extension/app/api/ada/lib/storage/models/ConceptualWallet/traits.js
index 899718810f..7ac6a54958 100644
--- a/packages/yoroi-extension/app/api/ada/lib/storage/models/ConceptualWallet/traits.js
+++ b/packages/yoroi-extension/app/api/ada/lib/storage/models/ConceptualWallet/traits.js
@@ -77,11 +77,14 @@ export async function derivePublicDeriver<Row>(
     {
       publicDeriverMeta: body.publicDeriverMeta,
       pathToPublic: privateKeyRow => {
-        const pubDeriverKey = normalizeToPubDeriverLevel({
-          privateKeyRow,
-          password: body.decryptPrivateDeriverPassword,
-          path: body.path.map(entry => entry.index),
-        });
+        const pubDeriverKey = body.decryptPrivateDeriver.preDerived ?
+          body.decryptPrivateDeriver.result :
+          normalizeToPubDeriverLevel({
+            privateKeyRow,
+            password: body.decryptPrivateDeriver.password,
+            path: body.path.map(entry => entry.index),
+          });
+          
         return [
           ...body.path.slice(0, body.path.length - 1).map(pathEntry => ({
             index: pathEntry.index,
@@ -98,19 +101,7 @@ export async function derivePublicDeriver<Row>(
               KeyDerivationId: insertRequest.keyDerivationId,
               ...body.path[body.path.length - 1].insert,
             }),
-            privateKey: body.encryptPublicDeriverPassword === undefined
-              ? null
-              : {
-                Hash: body.encryptPublicDeriverPassword === null
-                  ? pubDeriverKey.prvKeyHex
-                  : encryptWithPassword(
-                    body.encryptPublicDeriverPassword,
-                    hexToBytes(pubDeriverKey.prvKeyHex)
-                  ),
-                IsEncrypted: true,
-                PasswordLastUpdate: null,
-                Type: privateKeyRow.Type, // type doesn't change with derivations
-              },
+            privateKey: null,
             publicKey: {
               Hash: pubDeriverKey.pubKeyHex,
               IsEncrypted: false,
diff --git a/packages/yoroi-extension/app/api/ada/lib/storage/tests/index.test.js b/packages/yoroi-extension/app/api/ada/lib/storage/tests/index.test.js
index 39d5c3fba4..6343005a99 100644
--- a/packages/yoroi-extension/app/api/ada/lib/storage/tests/index.test.js
+++ b/packages/yoroi-extension/app/api/ada/lib/storage/tests/index.test.js
@@ -126,7 +126,7 @@ test('Can add and fetch address in wallet', async (done) => {
               insert: {},
             },
           ],
-          decryptPrivateDeriverPassword: privateDeriverPassword,
+          decryptPrivateDeriver: { preDerived: false, password: privateDeriverPassword },
           initialDerivations: [
             {
               index: 0, // external chain,

From 9de3b7446cce6c2fd4d2d725b2d1c9adeadea510 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Thu, 28 Nov 2024 02:48:20 +0800
Subject: [PATCH 064/143] add clone wallet function

---
 packages/yoroi-extension/app/api/ada/index.js | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/packages/yoroi-extension/app/api/ada/index.js b/packages/yoroi-extension/app/api/ada/index.js
index cdadc18d66..8238785ffa 100644
--- a/packages/yoroi-extension/app/api/ada/index.js
+++ b/packages/yoroi-extension/app/api/ada/index.js
@@ -1801,6 +1801,57 @@ export default class AdaApi {
     }
   }
 
+  async cloneWallet(
+    db: lf$Database,
+    publicDeriver: PublicDeriver<>,
+    network: $ReadOnly<NetworkRow>,
+  ): Promise<RestoreWalletResponse> {
+    const withSigningKey = asGetSigningKey(publicDeriver);
+    if (!withSigningKey) {
+      throw new Error('unable to get signing key');
+    }
+    const signingKey = await withSigningKey.getSigningKey();
+    const encryptedRoot = signingKey.row.Hash;
+
+    const withPublicKey = asGetPublicKey(publicDeriver);
+    if (!withPublicKey) {
+      throw new Error('unable to get public key');
+    }
+    const publicKey = await withPublicKey.getPublicKey();
+    const accountPublicKey = RustModule.WalletV4.Bip32PublicKey.from_hex(publicKey.Hash);
+
+    const accountIndex = signingKey.path[3].Index;
+    if (accountIndex === null) {
+      throw new Error('missing account index');
+    }
+
+    const walletName = (await publicDeriver.getParent().getFullConceptualWalletInfo()).Name;
+
+    const newPubDerivers = [];
+    const wallet = await createStandardCip1852Wallet({
+      db,
+      encryptedRoot,
+      accountPublicKey,
+      accountIndex,
+      walletName,
+      accountName: '', // set account name empty now
+      network,
+    });
+    const cip1852Wallet = await Cip1852Wallet.createCip1852Wallet(
+      db,
+      wallet.cip1852WrapperRow,
+    );
+    for (const pubDeriver of wallet.publicDeriver) {
+      newPubDerivers.push(await PublicDeriver.createPublicDeriver(
+        pubDeriver.publicDeriverResult,
+        cip1852Wallet,
+      ));
+    }
+    return {
+      publicDerivers: newPubDerivers,
+    };
+  }
+
   /**
    * Creates wallet and saves result to DB
   */

From 9447c45ec76d806db048994584ef85fbf6e7ee9e Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Thu, 28 Nov 2024 13:08:02 +0800
Subject: [PATCH 065/143] remove unused parameter

---
 packages/yoroi-extension/app/api/ada/index.js                  | 1 -
 .../chrome/extension/background/handlers/yoroi/wallet.js       | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/packages/yoroi-extension/app/api/ada/index.js b/packages/yoroi-extension/app/api/ada/index.js
index 8238785ffa..aa569f70a6 100644
--- a/packages/yoroi-extension/app/api/ada/index.js
+++ b/packages/yoroi-extension/app/api/ada/index.js
@@ -493,7 +493,6 @@ export type CreateHardwareWalletRequest = {|
   publicKey: string,
   ...Addressing,
   hwFeatures: HWFeatures,
-  checkAddressesInUse: FilterFunc,
   network: $ReadOnly<NetworkRow>,
 |};
 export type CreateHardwareWalletResponse = {|
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js
index bd9b23d1e8..5e3e2c5358 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js
@@ -91,8 +91,6 @@ export const CreateHardwareWallet: HandlerType<
 
     const db = await getDb();
 
-    const stateFetcher = await getCardanoStateFetcher(new LocalStorageApi());
-
     const adaApi = new AdaApi();
     const { publicDeriver } = await adaApi.createHardwareWallet({
       db,
@@ -100,7 +98,6 @@ export const CreateHardwareWallet: HandlerType<
       walletName: request.walletName,
       publicKey: request.publicKey,
       hwFeatures: request.hwFeatures,
-      checkAddressesInUse: stateFetcher.checkAddressesInUse,
       addressing: request.addressing,
     });
 

From 60680eab829a6f01a845ee2ef2fc4f494d67cd51 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Thu, 28 Nov 2024 13:53:28 +0800
Subject: [PATCH 066/143] support cloning hardware wallet

---
 packages/yoroi-extension/app/api/ada/index.js | 92 ++++++++++++-------
 1 file changed, 61 insertions(+), 31 deletions(-)

diff --git a/packages/yoroi-extension/app/api/ada/index.js b/packages/yoroi-extension/app/api/ada/index.js
index aa569f70a6..e515a9a0d5 100644
--- a/packages/yoroi-extension/app/api/ada/index.js
+++ b/packages/yoroi-extension/app/api/ada/index.js
@@ -44,9 +44,10 @@ import {
   asGetSigningKey,
   asHasLevels,
   asHasUtxoChains,
+  asGetStakingKey,
 } from './lib/storage/models/PublicDeriver/traits';
 import { ConceptualWallet } from './lib/storage/models/ConceptualWallet/index';
-import type { IHasLevels } from './lib/storage/models/ConceptualWallet/interfaces';
+import { WalletTypeOption, type IHasLevels } from './lib/storage/models/ConceptualWallet/interfaces';
 import type {
   Address,
   Addressing,
@@ -1804,14 +1805,7 @@ export default class AdaApi {
     db: lf$Database,
     publicDeriver: PublicDeriver<>,
     network: $ReadOnly<NetworkRow>,
-  ): Promise<RestoreWalletResponse> {
-    const withSigningKey = asGetSigningKey(publicDeriver);
-    if (!withSigningKey) {
-      throw new Error('unable to get signing key');
-    }
-    const signingKey = await withSigningKey.getSigningKey();
-    const encryptedRoot = signingKey.row.Hash;
-
+  ): Promise<PublicDeriver<>> {
     const withPublicKey = asGetPublicKey(publicDeriver);
     if (!withPublicKey) {
       throw new Error('unable to get public key');
@@ -1819,36 +1813,72 @@ export default class AdaApi {
     const publicKey = await withPublicKey.getPublicKey();
     const accountPublicKey = RustModule.WalletV4.Bip32PublicKey.from_hex(publicKey.Hash);
 
-    const accountIndex = signingKey.path[3].Index;
-    if (accountIndex === null) {
-      throw new Error('missing account index');
+    const withStakingKey = asGetStakingKey(publicDeriver);
+    if (!withStakingKey) {
+      throw new Error('unable to get staking key');
     }
+    const stakingKey = await withStakingKey.getStakingKey();
 
-    const walletName = (await publicDeriver.getParent().getFullConceptualWalletInfo()).Name;
+    const conceptualWallet = publicDeriver.getParent();
+    const walletName = (await conceptualWallet.getFullConceptualWalletInfo()).Name;
 
-    const newPubDerivers = [];
-    const wallet = await createStandardCip1852Wallet({
-      db,
-      encryptedRoot,
-      accountPublicKey,
-      accountIndex,
-      walletName,
-      accountName: '', // set account name empty now
-      network,
-    });
+    const hwMeta = conceptualWallet.getHwWalletMeta();
+    if (!hwMeta) {
+      throw new Error('unexpectedly missing hardware metadata');
+    }
+
+    let wallet;
+    if (conceptualWallet.getWalletType() === WalletTypeOption.HARDWARE_WALLET) {
+      wallet = await createHardwareCip1852Wallet({
+        db,
+        accountPublicKey,
+        accountIndex: stakingKey.addressing.path[2],
+        walletName,
+        accountName: '',
+        hwWalletMetaInsert: {
+          Vendor: hwMeta.Vendor,
+          Model: hwMeta.Model,
+          DeviceId: hwMeta.DeviceId,
+        },
+        network,
+      });
+    } else {
+      const withSigningKey = asGetSigningKey(publicDeriver);
+      if (!withSigningKey) {
+        throw new Error('unable to get signing key');
+      }
+      const signingKey = await withSigningKey.getSigningKey();
+      const encryptedRoot = signingKey.row.Hash;
+
+      const accountIndex = signingKey.path[3].Index;
+      if (accountIndex === null) {
+        throw new Error('missing account index');
+      }
+
+      wallet = await createStandardCip1852Wallet({
+        db,
+        encryptedRoot,
+        accountPublicKey,
+        accountIndex,
+        walletName,
+        accountName: '', // set account name empty now
+        network,
+      });
+    }
+  
     const cip1852Wallet = await Cip1852Wallet.createCip1852Wallet(
       db,
       wallet.cip1852WrapperRow,
     );
-    for (const pubDeriver of wallet.publicDeriver) {
-      newPubDerivers.push(await PublicDeriver.createPublicDeriver(
-        pubDeriver.publicDeriverResult,
-        cip1852Wallet,
-      ));
+
+    if (wallet.publicDeriver.length !== 1) {
+      throw new Error(`${nameof(AdaApi)}::${nameof(this.cloneWallet)} should only do 1 HW derivation at a time`);
     }
-    return {
-      publicDerivers: newPubDerivers,
-    };
+    const pubDeriverResult = wallet.publicDeriver[0].publicDeriverResult;
+    return await PublicDeriver.createPublicDeriver(
+      pubDeriverResult,
+      cip1852Wallet,
+    );
   }
 
   /**

From 480728c1d4d07a9ad38342fb138f83227a9aa2b7 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Thu, 28 Nov 2024 13:54:55 +0800
Subject: [PATCH 067/143] refactor to lift public key derivation

---
 packages/yoroi-extension/app/api/ada/index.js | 22 ++++-----
 .../extension/background/handlers/utils.js    | 46 ++++++++++++++++++-
 2 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/packages/yoroi-extension/app/api/ada/index.js b/packages/yoroi-extension/app/api/ada/index.js
index e515a9a0d5..ca85c1a5fa 100644
--- a/packages/yoroi-extension/app/api/ada/index.js
+++ b/packages/yoroi-extension/app/api/ada/index.js
@@ -1813,22 +1813,22 @@ export default class AdaApi {
     const publicKey = await withPublicKey.getPublicKey();
     const accountPublicKey = RustModule.WalletV4.Bip32PublicKey.from_hex(publicKey.Hash);
 
-    const withStakingKey = asGetStakingKey(publicDeriver);
-    if (!withStakingKey) {
-      throw new Error('unable to get staking key');
-    }
-    const stakingKey = await withStakingKey.getStakingKey();
-
     const conceptualWallet = publicDeriver.getParent();
     const walletName = (await conceptualWallet.getFullConceptualWalletInfo()).Name;
 
-    const hwMeta = conceptualWallet.getHwWalletMeta();
-    if (!hwMeta) {
-      throw new Error('unexpectedly missing hardware metadata');
-    }
-
     let wallet;
     if (conceptualWallet.getWalletType() === WalletTypeOption.HARDWARE_WALLET) {
+      const withStakingKey = asGetStakingKey(publicDeriver);
+      if (!withStakingKey) {
+        throw new Error('unable to get staking key');
+      }
+      const stakingKey = await withStakingKey.getStakingKey();
+
+      const hwMeta = conceptualWallet.getHwWalletMeta();
+      if (!hwMeta) {
+        throw new Error('unexpectedly missing hardware metadata');
+      }
+
       wallet = await createHardwareCip1852Wallet({
         db,
         accountPublicKey,
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/utils.js b/packages/yoroi-extension/chrome/extension/background/handlers/utils.js
index 73a18d7051..dab217791b 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/utils.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/utils.js
@@ -35,8 +35,10 @@ import { getDb } from '../state/databaseManager';
 import { refreshingWalletIdSet } from '../state/refreshScheduler';
 import { loadWalletsFromStorage } from '../../../../app/api/ada/lib/storage/models/load';
 import { getProtocolParameters } from './yoroi/protocolParameters';
+import { getNetworkById } from '../../../../app/api/ada/lib/storage/database/prepackaged/networks';
+import AdaApi from '../../../../app/api/ada';
 
-export async function getWalletsState(publicDeriverId: ?number): Promise<Array<WalletState>> {
+export async function getWalletsState(publicDeriverId: ?number, targetNetworkId?: number): Promise<Array<WalletState>> {
   const db = await getDb();
   let publicDerivers = await loadWalletsFromStorage(db);
   if (publicDeriverId != null) {
@@ -47,7 +49,47 @@ export async function getWalletsState(publicDeriverId: ?number): Promise<Array<W
     publicDerivers = publicDeriver ? [publicDeriver] : [];
   }
 
-  const maybeWalletStates = await Promise.all(publicDerivers.map(async publicDeriver => {
+  let publicDeriversOfNetwork;
+  if (publicDeriverId == null && targetNetworkId !== undefined) {
+    publicDeriversOfNetwork = [];
+    // group wallets by staking key
+    const publicDeriversByPublicKey = new Map<string, Array<PublicDeriver<>>>;
+    for (const publicDeriver of publicDerivers) {
+      const withPublicKey = asGetPublicKey(publicDeriver);
+      if (withPublicKey == null) {
+        throw new Error('unexpected missing public key');
+      }
+      const key = (await withPublicKey.getPublicKey()).Hash;
+      let value = publicDeriversByPublicKey.get(key);
+      if (!value) {
+        value = [];
+        publicDeriversByPublicKey.set(key, value);
+      }
+      value.push(publicDeriver);
+    }
+    // for each staking key, either find an existing wallet or clone one
+    for (const value of publicDeriversByPublicKey.values()) {
+      let found = false;
+      for (const publicDeriver of value) {
+        if (publicDeriver.getParent().getNetworkInfo().NetworkId === targetNetworkId) {
+          publicDeriversOfNetwork.push(publicDeriver);
+          found = true;
+          break;
+        }
+      }
+      if (!found) {
+        const db = await getDb();
+        const network = getNetworkById(targetNetworkId);
+        const adaApi = new AdaApi();
+        const clonedWallet = await adaApi.cloneWallet(db, value[0], network);
+        publicDeriversOfNetwork.push(clonedWallet);
+      }
+    }
+  } else {
+    publicDeriversOfNetwork = publicDerivers;
+  }
+
+  const maybeWalletStates = await Promise.all(publicDeriversOfNetwork.map(async publicDeriver => {
     try {
       return await getWalletState(publicDeriver);
     } catch (err) {

From 9b0e95e36a0896cec1df5191170224f90f8ffd5c Mon Sep 17 00:00:00 2001
From: kalfada <kalfada3321@gmail.com>
Date: Thu, 28 Nov 2024 22:25:06 +0200
Subject: [PATCH 068/143] feat: support switch wallet

---
 packages/yoroi-extension/chrome/constants.js        | 13 +++++++------
 .../chrome/content-scripts/bringInject.js           |  7 ++++---
 .../chrome/content-scripts/bringLib.js              | 11 ++++++++++-
 .../yoroi-extension/chrome/manifest.template.js     |  2 ++
 packages/yoroi-extension/package-lock.json          | 10 +++++-----
 packages/yoroi-extension/package.json               |  2 +-
 6 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/packages/yoroi-extension/chrome/constants.js b/packages/yoroi-extension/chrome/constants.js
index 9f6156523a..f6a532ce08 100644
--- a/packages/yoroi-extension/chrome/constants.js
+++ b/packages/yoroi-extension/chrome/constants.js
@@ -5,11 +5,11 @@ export function genCSP(request: {|
   isDev: boolean,
   additional: {|
     'default-src'?: Array<string>,
-    'frame-src'?: Array<string>,
-    'object-src'?: Array<string>,
-    'connect-src'?: Array<string>,
-    'style-src'?: Array<string>,
-    'img-src'?: Array<string>,
+      'frame-src' ?: Array < string >,
+      'object-src' ?: Array < string >,
+      'connect-src' ?: Array < string >,
+      'style-src' ?: Array < string >,
+      'img-src' ?: Array < string >,
   |},
 |}): string {
   const defaultSrc = request.additional['default-src'] ?? [];
@@ -46,7 +46,8 @@ export function genCSP(request: {|
   connectSrc.push('https://aggregator.muesliswap.com/');
   connectSrc.push('https://onchain2.muesliswap.com/');
 
-  // Bring
+  // Bringweb3
+  frameSrc.push('http://localhost:5173/')
   frameSrc.push('https://*.bringweb3.io/')
   connectSrc.push('https://*.bringweb3.io')
 
diff --git a/packages/yoroi-extension/chrome/content-scripts/bringInject.js b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
index 3aa656990d..bd19657415 100644
--- a/packages/yoroi-extension/chrome/content-scripts/bringInject.js
+++ b/packages/yoroi-extension/chrome/content-scripts/bringInject.js
@@ -3,7 +3,7 @@ import { bringInitContentScript } from "@bringweb3/chrome-extension-kit";
 import {
   getFirstAddress,
   getTheme,
-  popUpWalletCreation,
+  promptCreationOrSelection,
   listenForCashbackWalletChange,
 } from './bringLib';
 
@@ -212,11 +212,12 @@ const lightTheme = Object.freeze({
 (async () => {
   await bringInitContentScript({
     getWalletAddress: getFirstAddress,
-    promptLogin: popUpWalletCreation,
+    promptLogin: promptCreationOrSelection,
     walletAddressUpdateCallback: listenForCashbackWalletChange,
     theme: await getTheme(),
     lightTheme,
     darkTheme,
-    text: 'upper'
+    text: 'upper',
+    switchWallet: true
   });
 })().catch(console.error);
diff --git a/packages/yoroi-extension/chrome/content-scripts/bringLib.js b/packages/yoroi-extension/chrome/content-scripts/bringLib.js
index 959c850933..f8837a172c 100644
--- a/packages/yoroi-extension/chrome/content-scripts/bringLib.js
+++ b/packages/yoroi-extension/chrome/content-scripts/bringLib.js
@@ -26,7 +26,7 @@ function callBackground(functionName: string, params: any): Promise<any> {
         resolve(msg.return.ok);
       }
     });
-  
+
     window.postMessage({
       type: 'bring_rpc_request',
       url: location.hostname,
@@ -54,6 +54,15 @@ export function popUpCashbackWalletSelection(): void {
   callBackground('pop-up-cashback-wallet-selection');
 }
 
+export async function promptCreationOrSelection() {
+  const address = await getFirstAddress()
+  if (address) {
+    return await popUpCashbackWalletSelection()
+  } else {
+    return await popUpWalletCreation()
+  }
+}
+
 export function listenForCashbackWalletChange(callback: () => void): void {
   // todo: verify sender extension id
   chrome.runtime.onMessage.addListener((msg, sender) => {
diff --git a/packages/yoroi-extension/chrome/manifest.template.js b/packages/yoroi-extension/chrome/manifest.template.js
index 88a46ab4bc..23c8cc5875 100644
--- a/packages/yoroi-extension/chrome/manifest.template.js
+++ b/packages/yoroi-extension/chrome/manifest.template.js
@@ -67,6 +67,8 @@ export default ({
     },
     permissions: [
       'storage',
+      'tabs',
+      'alarms',
       // so that the background service could access `chrome.system.display.width`
       'system.display',
     ],
diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index 92ea44d12e..9a72c8e4f3 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@amplitude/analytics-browser": "^2.1.3",
         "@babel/preset-typescript": "^7.24.7",
-        "@bringweb3/chrome-extension-kit": "^1.1.12",
+        "@bringweb3/chrome-extension-kit": "^1.2.2",
         "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
         "@emotion/react": "^11.4.1",
         "@emotion/styled": "^11.3.0",
@@ -80,7 +80,7 @@
         "react-blockies": "1.4.1",
         "react-copy-to-clipboard": "5.0.3",
         "react-dom": "17.0.2",
-        "react-helmet": "^6.1.0",
+        "react-helmet": "6.1.0",
         "react-intl": "2.9.0",
         "react-markdown": "5.0.3",
         "react-query": "^3.39.3",
@@ -2139,9 +2139,9 @@
       "dev": true
     },
     "node_modules/@bringweb3/chrome-extension-kit": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/@bringweb3/chrome-extension-kit/-/chrome-extension-kit-1.1.12.tgz",
-      "integrity": "sha512-secOPnTvymcbYzpKIXNftbChrejURnjIFPo3crh6QKK+61y2Fz4eGlNnfzwasaX5ZXscXztIUV4cSVZH8xbFnQ=="
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@bringweb3/chrome-extension-kit/-/chrome-extension-kit-1.2.2.tgz",
+      "integrity": "sha512-31bqMPI0L0VRzWBIPAf4o3ABWND2V6fvQrLaumnR3wrGPcD8tWd6EPEoI/5G4QXFjGUFyjQK60MNaafQiKHZYQ=="
     },
     "node_modules/@cardano-foundation/ledgerjs-hw-app-cardano": {
       "version": "7.1.3",
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
index 03b5d69738..0c20aaed5c 100644
--- a/packages/yoroi-extension/package.json
+++ b/packages/yoroi-extension/package.json
@@ -150,7 +150,7 @@
   "dependencies": {
     "@amplitude/analytics-browser": "^2.1.3",
     "@babel/preset-typescript": "^7.24.7",
-    "@bringweb3/chrome-extension-kit": "^1.1.12",
+    "@bringweb3/chrome-extension-kit": "^1.2.2",
     "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",

From 87d6de94ff8df07dad32b249f341cb75777adba6 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Fri, 29 Nov 2024 15:02:05 +0800
Subject: [PATCH 069/143] type annotation

---
 packages/yoroi-extension/chrome/content-scripts/bringLib.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/yoroi-extension/chrome/content-scripts/bringLib.js b/packages/yoroi-extension/chrome/content-scripts/bringLib.js
index f8837a172c..5f3e9ac197 100644
--- a/packages/yoroi-extension/chrome/content-scripts/bringLib.js
+++ b/packages/yoroi-extension/chrome/content-scripts/bringLib.js
@@ -54,7 +54,7 @@ export function popUpCashbackWalletSelection(): void {
   callBackground('pop-up-cashback-wallet-selection');
 }
 
-export async function promptCreationOrSelection() {
+export async function promptCreationOrSelection(): Promise<void> {
   const address = await getFirstAddress()
   if (address) {
     return await popUpCashbackWalletSelection()

From 4a537a6a32ad51ad8906e1b6d532042e7761be3d Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Fri, 29 Nov 2024 15:06:01 +0800
Subject: [PATCH 070/143] restore format and remove dev-only frame-src

---
 packages/yoroi-extension/chrome/constants.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/yoroi-extension/chrome/constants.js b/packages/yoroi-extension/chrome/constants.js
index f6a532ce08..44bf773d5f 100644
--- a/packages/yoroi-extension/chrome/constants.js
+++ b/packages/yoroi-extension/chrome/constants.js
@@ -5,11 +5,11 @@ export function genCSP(request: {|
   isDev: boolean,
   additional: {|
     'default-src'?: Array<string>,
-      'frame-src' ?: Array < string >,
-      'object-src' ?: Array < string >,
-      'connect-src' ?: Array < string >,
-      'style-src' ?: Array < string >,
-      'img-src' ?: Array < string >,
+    'frame-src'?: Array<string>,
+    'object-src'?: Array<string>,
+    'connect-src'?: Array<string>,
+    'style-src'?: Array<string>,
+    'img-src'?: Array<string>,
   |},
 |}): string {
   const defaultSrc = request.additional['default-src'] ?? [];
@@ -47,7 +47,6 @@ export function genCSP(request: {|
   connectSrc.push('https://onchain2.muesliswap.com/');
 
   // Bringweb3
-  frameSrc.push('http://localhost:5173/')
   frameSrc.push('https://*.bringweb3.io/')
   connectSrc.push('https://*.bringweb3.io')
 

From 5088dc463ad43346601514f6ba05a94ec08e0f85 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Fri, 29 Nov 2024 15:07:06 +0800
Subject: [PATCH 071/143] do not pick default cashback wallet whne there are >1
 wallets

---
 .../background/handlers/content/bring.js      | 24 ++++---------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
index 692e1e6d15..ef72987b99 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
@@ -69,7 +69,7 @@ const handlers = Object.freeze({
   },
 });
 
-export async function getCashbackWallet(): Promise<PublicDeriver<> | null> {
+async function getCashbackWallet(): Promise<PublicDeriver<> | null> {
   const db = await getDb();
   const publicDerivers = await loadWalletsFromStorage(db);
   const localStorageApi = new LocalStorageApi();
@@ -84,24 +84,10 @@ export async function getCashbackWallet(): Promise<PublicDeriver<> | null> {
     }
   }
 
-  // default to the selected wallet
-  const selectedPublicDeriverId = await localStorageApi.getSelectedWalletId();
-  for (const publicDeriver of publicDerivers) {
-    if (
-      publicDeriver.getPublicDeriverId() === selectedPublicDeriverId &&
-        !isTrezorTWallet(publicDeriver.getParent())
-    ) {
-      await localStorageApi.saveCashbackWalletId(publicDeriver.getPublicDeriverId());
-      return publicDeriver;
-    }
-  }
-
-  // selected wallet is a Trezor wallet, fall back to the first non-Trezor wallet
-  for (const publicDeriver of publicDerivers) {
-    if (!isTrezorTWallet(publicDeriver.getParent())) {
-      await localStorageApi.saveCashbackWalletId(publicDeriver.getPublicDeriverId());
-      return publicDeriver;
-    }
+  // if there is one and only wallet use it as the cashback wallet
+  if (publicDerivers.length === 1 && !isTrezorTWallet(publicDerivers[0].getParent())) {
+    await localStorageApi.saveCashbackWalletId(publicDerivers[0].getPublicDeriverId());
+    return publicDerivers[0];
   }
 
   return null;

From 3f2fe8ac215862815b415f92c2cd69d141d965f1 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Fri, 29 Nov 2024 17:16:58 +0800
Subject: [PATCH 072/143] finish cashback wallet setting

---
 .../general-setting/BringCashbackSettings.js  | 44 +++++++++----------
 .../categories/GeneralSettingsPage.js         | 36 ++++++---------
 .../app/stores/toplevel/WalletStore.js        |  5 +++
 3 files changed, 39 insertions(+), 46 deletions(-)

diff --git a/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js b/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
index bb189bf910..4d65175851 100644
--- a/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
+++ b/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
@@ -18,6 +18,7 @@ import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import { withLayout } from '../../../../styles/context/layout';
 import type { InjectedLayoutProps } from '../../../../styles/context/layout';
 import WalletAccountIcon from '../../../topbar/WalletAccountIcon';
+import type { WalletChecksum } from '@emurgo/cip4-js';
 
 const messages = defineMessages({
   bringCashbackTitle: {
@@ -35,20 +36,11 @@ const messages = defineMessages({
   },
 });
 
-type currentValue = Array<{
-  isSelected: boolean,
-  name: string,
-  plate: any,
-  type: string,
-  walletId: number,
-  ...
-}>;
-
 type Props = {|
-  +onSelect: string => Promise<void>,
+  +onSelect: number => Promise<void>,
   +isSubmitting: boolean,
-  +cardanoWallets: any,
-  +currentValue: currentValue,
+  +cardanoWallets: Array<{ publicDeriverId: number, name: string, plate: WalletChecksum, ... }>,
+  +currentValue: ?number,
   +error?: ?LocalizableError,
 |};
 
@@ -88,8 +80,8 @@ class BringCashbackSettings extends Component<Props & InjectedLayoutProps> {
     const optionRenderer = option => {
       return (
         <MenuItem
-          key={option.name}
-          value={option.name}
+          key={option.publicDeriverId}
+          value={option.publicDeriverId}
           sx={{ height: '60px' }}
           id={'selectCashbackWallet-' + option.name + '-menuItem'}
         >
@@ -138,7 +130,7 @@ class BringCashbackSettings extends Component<Props & InjectedLayoutProps> {
             error={!!error}
             {...cashbackWalletId.bind()}
             onChange={this.props.onSelect}
-            value={currentValue[0]}
+            value={currentValue}
             menuProps={{
               sx: {
                 '& .MuiMenu-paper': {
@@ -146,14 +138,20 @@ class BringCashbackSettings extends Component<Props & InjectedLayoutProps> {
                 },
               },
             }}
-            renderValue={value => (
-              <Stack direction="row">
-                <WalletIcon imagePart={value.plate.ImagePart} />
-                <Typography variant="body1" color="ds.text_gray_medium" mt="2px">
-                  {value.name}| {value.plate.TextPart}
-                </Typography>
-              </Stack>
-            )}
+            renderValue={value => {
+              const wallet = cardanoWallets.find(({ publicDeriverId }) => publicDeriverId === value);
+              if (!wallet) {
+                throw new Error('unexpected selected value');
+              }
+              return (
+                <Stack direction="row">
+                  <WalletIcon imagePart={wallet.plate.ImagePart} />
+                  <Typography variant="body1" color="ds.text_gray_medium" mt="2px">
+                    {wallet.name}| {wallet.plate.TextPart}
+                  </Typography>
+                </Stack>
+              );
+            }}
           >
             {cardanoWallets.map(option => optionRenderer(option))}
           </Select>
diff --git a/packages/yoroi-extension/app/containers/settings/categories/GeneralSettingsPage.js b/packages/yoroi-extension/app/containers/settings/categories/GeneralSettingsPage.js
index 3560a34a9a..4a9559c269 100644
--- a/packages/yoroi-extension/app/containers/settings/categories/GeneralSettingsPage.js
+++ b/packages/yoroi-extension/app/containers/settings/categories/GeneralSettingsPage.js
@@ -75,6 +75,12 @@ export default class GeneralSettingsPage extends Component<StoresAndActionsProps
     intl: intlShape.isRequired,
   };
 
+  componentDidMount() {
+    const request = this.props.stores.wallets.getCashbackWalletRequest;
+    request.reset();
+    request.execute();
+  }
+
   onSelectUnitOfAccount: string => Promise<void> = async value => {
     const localStorageApi = new LocalStorageApi();
 
@@ -83,13 +89,13 @@ export default class GeneralSettingsPage extends Component<StoresAndActionsProps
     await this.props.actions.profile.updateUnitOfAccount.trigger(unitOfAccount);
   };
 
-  onSelectBringCashbackWallet: string => Promise<void> = async value => {
-    console.log('CASHBACK Wallet Selected', value);
+  onSelectBringCashbackWallet: number => Promise<void> = async value => {
+    this.props.stores.wallets.setCashbackWallet(value);
   };
 
   render(): Node {
     const { intl } = this.context;
-    const { wallets } = this.props.stores.wallets;
+    const { wallets, getCashbackWalletRequest } = this.props.stores.wallets;
 
     const profileStore = this.props.stores.profile;
     const coinPriceStore = this.props.stores.coinPriceStore;
@@ -117,24 +123,6 @@ export default class GeneralSettingsPage extends Component<StoresAndActionsProps
 
     const unitOfAccountValue = profileStore.unitOfAccount.enabled ? profileStore.unitOfAccount.currency : 'ADA';
 
-    const cardanoWallets = [];
-
-    const selectedWalletName = this.props.stores.wallets.selectedWalletName;
-
-    wallets.forEach(wallet => {
-      const rewards = this.props.stores.delegation.getRewardBalanceOrZero(wallet);
-
-      const walletMap = {
-        walletId: wallet.publicDeriverId,
-        plate: wallet.plate,
-        type: wallet.type,
-        name: wallet.name,
-        isSelected: wallet.name === selectedWalletName,
-      };
-
-      cardanoWallets.push(walletMap);
-    });
-
     return (
       <Box sx={{ pb: profileStore.isRevampTheme ? '50px' : '0px' }}>
         {profileStore.isRevampTheme && (
@@ -152,8 +140,10 @@ export default class GeneralSettingsPage extends Component<StoresAndActionsProps
         <BringCashbackSettings
           onSelect={this.onSelectBringCashbackWallet}
           isSubmitting={false}
-          cardanoWallets={cardanoWallets}
-          currentValue={cardanoWallets.filter(wallet => wallet.isSelected)}
+          // $FlowFixMe this is apparently correct, flow is out of its mind
+          cardanoWallets={wallets.filter(w=>w.type !== 'trezor')}
+          // $FlowFixMe this is apparently correct, flow is out of its mind
+          currentValue={getCashbackWalletRequest.result?.publicDeriverId || ''}
           error={null}
         />
         <UnitOfAccountSettings
diff --git a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
index b7ae9847a3..58c39f0510 100644
--- a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
@@ -77,6 +77,10 @@ export default class WalletStore extends Store<StoresMap, ActionsMap> {
   flagStorage: StorageAPI;
   absoluteSlotGetters: { [string]: () => Promise<number> } = {};
 
+  @observable getCashbackWalletRequest: Request<
+    () => Promise<?WalletState>
+  > = new Request(this.getCashbackWallet.bind(this));
+
   setup(): void {
     super.setup();
     const { wallets } = this.actions;
@@ -450,6 +454,7 @@ export default class WalletStore extends Store<StoresMap, ActionsMap> {
   }
 
   setCashbackWallet(id: number): void {
+    this.getCashbackWalletRequest.patch(() => this.wallets.find(w => w.publicDeriverId === id));
     setCashbackWallet(id);
   }
 }

From f8645a53d68219a0734e8877aaf2707ff4cdab52 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Fri, 29 Nov 2024 20:00:44 +0800
Subject: [PATCH 073/143] lint

---
 .../general-setting/BringCashbackSettings.js  |  8 ----
 .../components/widgets/DisclaimerDialog.js    |  2 +-
 .../components/connect/ConnectPage.js         |  6 +--
 .../SelectCashbackWalletContainer.js          |  3 +-
 .../app/containers/cashback/CashbackPage.js   | 43 +++++++++++--------
 .../categories/GeneralSettingsPage.js         | 18 --------
 .../categories/RemoveWalletDialogContainer.js |  4 +-
 .../background/handlers/content/bring.js      |  5 ++-
 .../background/handlers/yoroi/wallet.js       | 14 +++---
 9 files changed, 43 insertions(+), 60 deletions(-)

diff --git a/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js b/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
index 4d65175851..b21d013d80 100644
--- a/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
+++ b/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
@@ -44,14 +44,6 @@ type Props = {|
   +error?: ?LocalizableError,
 |};
 
-const saturationFactor = {
-  saturationFactor: 0,
-  size: 8,
-  scalePx: 4,
-  iconSize: 32,
-  borderRadius: 4,
-};
-
 @observer
 class BringCashbackSettings extends Component<Props & InjectedLayoutProps> {
   static defaultProps: {| error: void |} = {
diff --git a/packages/yoroi-extension/app/components/widgets/DisclaimerDialog.js b/packages/yoroi-extension/app/components/widgets/DisclaimerDialog.js
index 3aa8999f6f..593ab2622a 100644
--- a/packages/yoroi-extension/app/components/widgets/DisclaimerDialog.js
+++ b/packages/yoroi-extension/app/components/widgets/DisclaimerDialog.js
@@ -13,7 +13,7 @@ const messages = defineMessages({
   },
   disclaimerNote: {
     id: 'cashback.disclaimer.note',
-    defaultMessage: '!!!
Please note:',
+    defaultMessage: '!!!Please note:',
   },
   disclaimerNote1: {
     id: 'cashback.disclaimer.note.1',
diff --git a/packages/yoroi-extension/app/connector/components/connect/ConnectPage.js b/packages/yoroi-extension/app/connector/components/connect/ConnectPage.js
index 18bcaf65a4..7f2babb43e 100644
--- a/packages/yoroi-extension/app/connector/components/connect/ConnectPage.js
+++ b/packages/yoroi-extension/app/connector/components/connect/ConnectPage.js
@@ -327,13 +327,13 @@ class ConnectPage extends Component<Props & InjectedProps> {
                   <ul className={styles.list}>
                     {publicDerivers.map((wallet, idx) => {
                       const isTrezor = isSelectingCashbackWallet && wallet.type === 'trezor';
-                      const Button = isTrezor ? DisabledWalletButton : WalletButton;
+                      const Btn = isTrezor ? DisabledWalletButton : WalletButton;
                       return (
                         <li
                           key={wallet.publicDeriverId}
                           className={[styles.listItem, isTrezor ? '' : styles.enabledWallet].join(' ')}
                         >
-                          <Button onClick={() => onSelectWallet(wallet, wallet.plate)}>
+                          <Btn onClick={() => onSelectWallet(wallet, wallet.plate)}>
                             <ConnectedWallet
                               disabledForReason={
                                 isTrezor ? intl.formatMessage(messages.cashbackDisabledTrezor) : null
@@ -359,7 +359,7 @@ class ConnectPage extends Component<Props & InjectedProps> {
                                 </Box>
                               }
                             />
-                          </Button>
+                          </Btn>
                         </li>
                       );
                     })}
diff --git a/packages/yoroi-extension/app/connector/containers/SelectCashbackWalletContainer.js b/packages/yoroi-extension/app/connector/containers/SelectCashbackWalletContainer.js
index 2ada2fce6b..f61b90ee66 100644
--- a/packages/yoroi-extension/app/connector/containers/SelectCashbackWalletContainer.js
+++ b/packages/yoroi-extension/app/connector/containers/SelectCashbackWalletContainer.js
@@ -2,7 +2,6 @@
 import { Component, type Node } from 'react';
 import ConnectPage from '../components/connect/ConnectPage';
 import { observer } from 'mobx-react';
-import { autorun } from 'mobx';
 import { genLookupOrFail } from '../../stores/stateless/tokenHelpers';
 import type { WalletState } from '../../../chrome/extension/background/types';
 import { setCashbackWallet } from '../../api/thunk';
@@ -44,7 +43,7 @@ export default class SelectCashbackWalletContainer extends Component<ConnectorSt
         unitOfAccount={stores.profile.unitOfAccount}
         getCurrentPrice={stores.coinPriceStore.getCurrentPrice}
         onUpdateHideBalance={actions.profile.updateHideBalance.trigger}
-        isSelectingCashbackWallet={true}
+        isSelectingCashbackWallet
       />
     );
   }
diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index 29b7a9e6d5..e3f043fd47 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -16,14 +16,18 @@ import NavBarContainerRevamp from '../NavBarContainerRevamp';
 import NavBarTitle from '../../components/topbar/NavBarTitle';
 import globalMessages from '../../i18n/global-messages';
 import { CoreAddressTypes } from '../../api/ada/lib/storage/database/primitives/enums';
-import { useTheme } from '@mui/material';
 import { walletSignData, encodeHardwareWalletSignResult } from '../../api/ada';
 import { getPublicDeriverById } from '../../../chrome/extension/background/handlers/yoroi/utils';
 import Dialog from '../../components/widgets/Dialog';
 import DialogCloseButton from '../../components/widgets/DialogCloseButton';
-import DialogTextBlock from '../../components/widgets/DialogTextBlock'
 import { RustModule } from '../../api/ada/lib/cardanoCrypto/rustLoader';
-import { Box, TextField, InputAdornment, IconButton, Tooltip, Typography, DialogContentText } from '@mui/material';
+import {
+  useTheme,
+  Box,
+  TextField,
+  Typography,
+  DialogContentText
+} from '@mui/material';
 import { LedgerConnect } from '../../utils/hwConnectHandler';
 import { MessageAddressFieldType, AddressType } from '@cardano-foundation/ledgerjs-hw-app-cardano';
 import { WrongPassphraseError } from '../../api/ada/lib/cardanoCrypto/cryptoErrors';
@@ -98,13 +102,10 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
 
   const iframeRef = useRef < HTMLIFrameElement | null > (null);
   const [iframeSrc, setIframeSrc] = useState('');
-  const [status, setStatus] = useState('loading');
   const [popup, setPopup] = useState(false);
   const [password, setPassword] = useState('')
-  const [showPassword, setShowPassword] = useState(false)
   const [errMsg, setErrMsg] = useState('')
   const [message, setMessage] = useState('')
-  const [claimAmount, setClaimAmount] = useState(0)
   const [signaturePopup, setSignaturePopup] = useState(false);
   const [overlayBgColor, setOverlayBgColor] = useState('#000000fa');
 
@@ -130,7 +131,6 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
       url.searchParams.set('theme', theme.name.split('-')[0]);
 
       setIframeSrc(url.href);
-      setStatus('done');
     } catch (error) {
       console.error('Error fetching data:', error);
     }
@@ -142,7 +142,7 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
       .join('');
   }
 
-  const signMessage = useCallback(async (message: string, password: string) => {
+  const signMessage = useCallback(async (msg: string, pwd: string) => {
     const { address, addressing } = wallet.externalAddressesByType[CoreAddressTypes.CARDANO_BASE][0];
 
     try {
@@ -150,7 +150,7 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
       if (wallet.type === 'mnemonic') {
         const publicDeriver = await getPublicDeriverById(wallet.publicDeriverId)
         try {
-          res = await walletSignData(publicDeriver, password, address, stringToHex(message))
+          res = await walletSignData(publicDeriver, pwd, address, stringToHex(msg))
         } catch (error) {
           if (error instanceof WrongPassphraseError) {
             throw new IncorrectWalletPasswordError();
@@ -164,7 +164,7 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
         try {
           const network = getNetworkById(wallet.networkId);
           const config = network.BaseConfig[0];
-          const messageHex = stringToHex(message);
+          const messageHex = stringToHex(msg);
           const hashPayload = true;
           const { signatureHex, signingPublicKeyHex, addressFieldHex } = await ledgerConnect.signMessage({
             serial: null,
@@ -227,8 +227,6 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
     const messageData: IframeMessageData = (event.data: any);
 
     if (messageData.action === 'SIGN_MESSAGE') {
-      setClaimAmount(messageData.amount)
-
       setMessage(messageData.messageToSign)
       setSignaturePopup(true)
     } else if (messageData.action === 'POPUP_OPENED') {
@@ -264,7 +262,8 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
         setShownCashbackWallet(currentCashbackWallet);
         setPopup(true);
       }
-    });
+      return 'nonsense';
+    }).catch(console.error);
   }, []);
 
   const [shouldShowDisclaimer, setShouldShowDisclaimer] = useState(false);
@@ -276,7 +275,8 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
         setShouldShowDisclaimer(true);
         setPopup(true);
       }
-    });
+      return 'nonsense';
+    }).catch(console.error);
   }, []);
 
   const closePopup = useCallback(() => {
@@ -380,7 +380,12 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
               }]}
             >
               <Box>
-                <Typography sx={{ marginBottom: "16px", color: theme.name === 'light-theme' ? '#242838' : '#E1E6F5' }}>
+                <Typography
+                  sx={{
+                    marginBottom: '16px',
+                    color: theme.name === 'light-theme' ? '#242838' : '#E1E6F5'
+                  }}
+                >
                   {intl.formatMessage(wallet.type === 'mnemonic' ?
                     messages.passwordClaimInstruction : messages. hardwardClaimInstruction
                   )}
@@ -424,21 +429,23 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
             </Dialog>
             : null}
 
-          {popup ? (
+           {popup ? (
+            // eslint-disable-next-line
             <div
               className={styles.iframe_overlay}
               style={{ background: overlayBgColor }}
               onClick={closePopup}
             />
-          ) : null}
+           ) : null}
 
           {iframeSrc && (
             <iframe
+              title="cashback"
               ref={iframeRef}
               id="bringweb3"
               className={styles.iframe}
               src={iframeSrc}
-              style={{ verticalAlign: "bottom" }}
+              style={{ verticalAlign: 'bottom' }}
               width="100%"
               height="100%"
             />
diff --git a/packages/yoroi-extension/app/containers/settings/categories/GeneralSettingsPage.js b/packages/yoroi-extension/app/containers/settings/categories/GeneralSettingsPage.js
index 4a9559c269..e7efc2bcc5 100644
--- a/packages/yoroi-extension/app/containers/settings/categories/GeneralSettingsPage.js
+++ b/packages/yoroi-extension/app/containers/settings/categories/GeneralSettingsPage.js
@@ -51,24 +51,6 @@ const currencyLabels = defineMessages({
   },
 });
 
-const getGeneratedWalletIds = (sortedWalletListIdx, currentWalletIdx) => {
-  let generatedWalletIds;
-  if (sortedWalletListIdx !== undefined && sortedWalletListIdx.length > 0) {
-    const newWalletIds = currentWalletIdx.filter(id => {
-      const index = sortedWalletListIdx.indexOf(id);
-      if (index === -1) {
-        return true;
-      }
-      return false;
-    });
-    generatedWalletIds = [...sortedWalletListIdx, ...newWalletIds];
-  } else {
-    generatedWalletIds = currentWalletIdx;
-  }
-
-  return generatedWalletIds;
-};
-
 @observer
 export default class GeneralSettingsPage extends Component<StoresAndActionsProps> {
   static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
diff --git a/packages/yoroi-extension/app/containers/settings/categories/RemoveWalletDialogContainer.js b/packages/yoroi-extension/app/containers/settings/categories/RemoveWalletDialogContainer.js
index e94730d274..7001087174 100644
--- a/packages/yoroi-extension/app/containers/settings/categories/RemoveWalletDialogContainer.js
+++ b/packages/yoroi-extension/app/containers/settings/categories/RemoveWalletDialogContainer.js
@@ -3,8 +3,8 @@ import type { ComponentType, Node } from 'react';
 import { Component } from 'react';
 import { action, observable } from 'mobx';
 import { observer } from 'mobx-react';
-import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
-import { defineMessages, intlShape, type $npm$ReactIntl$MessageDescriptor } from 'react-intl';
+import type { $npm$ReactIntl$IntlFormat, $npm$ReactIntl$MessageDescriptor } from 'react-intl';
+import { defineMessages, intlShape } from 'react-intl';
 import globalMessages from '../../../i18n/global-messages';
 import { messages } from '../../../components/wallet/settings/RemoveWallet';
 
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
index ef72987b99..e0d4345bc5 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
@@ -1,5 +1,4 @@
 // @flow
-import { sendToInjector, } from './utils';
 import LocalStorageApi from '../../../../../app/api/localStorage';
 import { isTrezorTWallet } from '../../../../../app/api/ada/lib/storage/models/ConceptualWallet/index';
 import { getAllAddressesForWallet } from '../../../../../app/api/ada/lib/storage/bridge/traitUtils';
@@ -7,7 +6,7 @@ import { PublicDeriver, } from '../../../../../app/api/ada/lib/storage/models/Pu
 import { getDb } from '../../state';
 import { loadWalletsFromStorage } from '../../../../../app/api/ada/lib/storage/models/load';
 import { notifyAllTabsCashbackWalletChange } from '../yoroi/utils';
-import { getBoundsForTabWindow, popupProps } from './utils';
+import { getBoundsForTabWindow, popupProps, sendToInjector } from './utils';
 
 declare var chrome;
 
@@ -65,6 +64,8 @@ const handlers = Object.freeze({
   'set-cashback-wallet': async (id: number) => {
     const localStorageApi = new LocalStorageApi();
     await localStorageApi.saveCashbackWalletId(id);
+
+    notifyAllTabsCashbackWalletChange()
     return { ok: undefined };
   },
 });
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js
index 0343b1645b..5d0bd605b2 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js
@@ -123,12 +123,14 @@ export const CreateHardwareWallet: HandlerType<
   },
 });
 
-async function maybeNotifyCashbackWalletChange(newWallet: PublicDeriver<>) {
-  const db = await getDb();
-  const publicDerivers = await loadWalletsFromStorage(db);
-  if (publicDerivers.length === 1 && !isTrezorTWallet(newWallet.getParent())) {
-    notifyAllTabsCashbackWalletChange();
-  }
+function maybeNotifyCashbackWalletChange(newWallet: PublicDeriver<>) {
+  (async () => {
+    const db = await getDb();
+    const publicDerivers = await loadWalletsFromStorage(db);
+    if (publicDerivers.length === 1 && !isTrezorTWallet(newWallet.getParent())) {
+      notifyAllTabsCashbackWalletChange();
+    }
+  })().catch(console.error);
 }
 
 export const RemoveWallet: HandlerType<

From 3e763066ec6ca923f85cb367540e3a2dc84dfa0e Mon Sep 17 00:00:00 2001
From: vantuz-subhuman <vantuz-subhuman@yandex.ru>
Date: Fri, 29 Nov 2024 19:58:22 +0300
Subject: [PATCH 074/143] Version bump: 5.4.501 (nightly)

---
 packages/yoroi-extension/package-lock.json | 4 ++--
 packages/yoroi-extension/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index 4ca26a459c..eaa830c610 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "yoroi",
-  "version": "5.4.500",
+  "version": "5.4.501",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "yoroi",
-      "version": "5.4.500",
+      "version": "5.4.501",
       "license": "MIT",
       "dependencies": {
         "@amplitude/analytics-browser": "^2.1.3",
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
index 02ea2c19dd..0c0611c942 100644
--- a/packages/yoroi-extension/package.json
+++ b/packages/yoroi-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yoroi",
-  "version": "5.4.500",
+  "version": "5.4.501",
   "description": "Cardano ADA wallet",
   "scripts": {
     "dev-mv2": "rimraf dev/ && NODE_OPTIONS=--openssl-legacy-provider babel-node scripts-mv2/build --type=debug --env 'mainnet'",

From b7d2b7264e90347fddb5b3c51ddde0b921082753 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Sat, 30 Nov 2024 03:05:31 +0800
Subject: [PATCH 075/143] lint

---
 .../api/ada/lib/storage/models/ConceptualWallet/traits.js | 3 ---
 .../chrome/extension/background/handlers/utils.js         | 8 +++++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/yoroi-extension/app/api/ada/lib/storage/models/ConceptualWallet/traits.js b/packages/yoroi-extension/app/api/ada/lib/storage/models/ConceptualWallet/traits.js
index 7ac6a54958..0588d2b8a7 100644
--- a/packages/yoroi-extension/app/api/ada/lib/storage/models/ConceptualWallet/traits.js
+++ b/packages/yoroi-extension/app/api/ada/lib/storage/models/ConceptualWallet/traits.js
@@ -39,8 +39,6 @@ import {
   Mixin,
 } from 'mixwith';
 
-import { encryptWithPassword } from '../../../../../../utils/passwordCipher';
-
 import {
   DerivePublicDeriverFromKey, AddAdhocPublicDeriver,
 } from '../../database/walletTypes/common/api/write';
@@ -56,7 +54,6 @@ import {
 import type {
   IChangePasswordRequest, IChangePasswordResponse,
 } from '../common/interfaces';
-import { hexToBytes } from '../../../../../../coreUtils';
 
 // ===========================
 //   DerivePublicFromPrivate
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/utils.js b/packages/yoroi-extension/chrome/extension/background/handlers/utils.js
index dab217791b..b8567ee78e 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/utils.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/utils.js
@@ -24,7 +24,11 @@ import {
 import { getForeignAddresses } from '../../../../app/api/ada/lib/storage/bridge/updateTransactions';
 import { isLedgerNanoWallet, isTrezorTWallet } from '../../../../app/api/ada/lib/storage/models/ConceptualWallet/index';
 import { Bip44Wallet } from '../../../../app/api/ada/lib/storage/models/Bip44Wallet/wrapper';
-import { isCardanoHaskell, isTestnet, } from '../../../../app/api/ada/lib/storage/database/prepackaged/networks';
+import {
+  isCardanoHaskell,
+  isTestnet,
+  getNetworkById
+} from '../../../../app/api/ada/lib/storage/database/prepackaged/networks';
 import BigNumber from 'bignumber.js';
 import { asAddressedUtxo, cardanoValueFromRemoteFormat, } from '../../../../app/api/ada/transactions/utils';
 import { MultiToken } from '../../../../app/api/common/lib/MultiToken';
@@ -35,7 +39,6 @@ import { getDb } from '../state/databaseManager';
 import { refreshingWalletIdSet } from '../state/refreshScheduler';
 import { loadWalletsFromStorage } from '../../../../app/api/ada/lib/storage/models/load';
 import { getProtocolParameters } from './yoroi/protocolParameters';
-import { getNetworkById } from '../../../../app/api/ada/lib/storage/database/prepackaged/networks';
 import AdaApi from '../../../../app/api/ada';
 
 export async function getWalletsState(publicDeriverId: ?number, targetNetworkId?: number): Promise<Array<WalletState>> {
@@ -78,7 +81,6 @@ export async function getWalletsState(publicDeriverId: ?number, targetNetworkId?
         }
       }
       if (!found) {
-        const db = await getDb();
         const network = getNetworkById(targetNetworkId);
         const adaApi = new AdaApi();
         const clonedWallet = await adaApi.cloneWallet(db, value[0], network);

From 549e0d00c2cfb406a8f51abb0a5cab4502b75593 Mon Sep 17 00:00:00 2001
From: vantuz-subhuman <vantuz-subhuman@yandex.ru>
Date: Mon, 2 Dec 2024 13:57:46 +0300
Subject: [PATCH 076/143] wallet list rendering fix

---
 .../categories/general-setting/BringCashbackSettings.js         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js b/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
index b21d013d80..d7906a1bed 100644
--- a/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
+++ b/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
@@ -81,7 +81,7 @@ class BringCashbackSettings extends Component<Props & InjectedLayoutProps> {
             <WalletIcon imagePart={option.plate.ImagePart} />
             <Box sx={{ marginLeft: '8px' }}>
               <Typography variant="body1" color="ds.text_gray_medium">
-                {option.name}| {option.plate.TextPart}
+                {option.plate.TextPart}&nbsp;|&nbsp;{option.name}
               </Typography>
             </Box>
           </Box>

From abdb397b0c63ba6d6f0d19f7b478c94051828e5b Mon Sep 17 00:00:00 2001
From: vantuz-subhuman <vantuz-subhuman@yandex.ru>
Date: Mon, 2 Dec 2024 20:05:00 +0300
Subject: [PATCH 077/143] filter mainnet wallets

---
 .../categories/general-setting/BringCashbackSettings.js      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js b/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
index d7906a1bed..1a8be6a182 100644
--- a/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
+++ b/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
@@ -97,6 +97,9 @@ class BringCashbackSettings extends Component<Props & InjectedLayoutProps> {
       </Dialog>
     ) : null;
 
+    const mainnetWallets =
+      cardanoWallets.filter(({ isTestnet }) => !isTestnet);
+
     return (
       <Box
         sx={{
@@ -145,7 +148,7 @@ class BringCashbackSettings extends Component<Props & InjectedLayoutProps> {
               );
             }}
           >
-            {cardanoWallets.map(option => optionRenderer(option))}
+            {mainnetWallets.map(option => optionRenderer(option))}
           </Select>
           <Typography component="div" variant="caption1" display="inline-block" color="grayscale.700">
             <FormattedHTMLMessage {...messages.note} />

From 239775d42ba94fa0b6e8b51e75ebf7ff6d88920d Mon Sep 17 00:00:00 2001
From: vantuz-subhuman <vantuz-subhuman@yandex.ru>
Date: Tue, 3 Dec 2024 13:44:58 +0300
Subject: [PATCH 078/143] bring two configs

---
 .../yoroi-extension/config/config-types.js    | 57 ++++++++++---------
 .../yoroi-extension/config/development.json   |  5 ++
 packages/yoroi-extension/config/mainnet.json  |  5 ++
 packages/yoroi-extension/config/test.json     |  5 ++
 4 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/packages/yoroi-extension/config/config-types.js b/packages/yoroi-extension/config/config-types.js
index 028050364e..25fb19f525 100644
--- a/packages/yoroi-extension/config/config-types.js
+++ b/packages/yoroi-extension/config/config-types.js
@@ -2,44 +2,45 @@
 
 export type ConfigType = {|
   network: NetworkConfigType,
-    poolExplorer: PoolExplorerConfigType,
-      app: AppConfigType,
-        bring: BringConfigType
-          |};
+  poolExplorer: PoolExplorerConfigType,
+  app: AppConfigType,
+  bring: BringConfigType
+  bringSandbox: BringConfigType
+|};
 
 export type BringConfigType = {|
   baseUrl: string,
-    identifier: string,
-      apiEndpoint: string
-        |}
+  identifier: string,
+  apiEndpoint: string
+|};
 
 export type PoolExplorerConfigType = {|
   simpleTemplate: string,
-|}
+|};
 
 export type AppConfigType = {|
   walletRefreshInterval: number,
-    serverStatusRefreshInterval: number,
-      logsBufferSize: number,
-        logsFileSuffix: string,
-          addressRequestSize: number,
-            txsBodiesRequestSize: number,
-              coinPriceRefreshInterval: number,
-                /**
-                 * How long we should consider the "current price" valid.
-                 * If wallet has been unable to connect to the server (ex: wallet is offline)
-                 * We don't want to tell the user "this is the current price"
-                */
-                coinPriceFreshnessThreshold: number,
-                  /** Public key we can use to make sure that the price information really dose come form EMURGO */
-                  pubKeyData: string,
-                    /** Public key to make sure that the ticker signing key change really does come from EMURGO */
-                    pubKeyMaster: string,
-|}
+  serverStatusRefreshInterval: number,
+  logsBufferSize: number,
+  logsFileSuffix: string,
+  addressRequestSize: number,
+  txsBodiesRequestSize: number,
+  coinPriceRefreshInterval: number,
+  /**
+   * How long we should consider the "current price" valid.
+   * If wallet has been unable to connect to the server (ex: wallet is offline)
+   * We don't want to tell the user "this is the current price"
+   */
+  coinPriceFreshnessThreshold: number,
+  /** Public key we can use to make sure that the price information really dose come form EMURGO */
+  pubKeyData: string,
+  /** Public key to make sure that the ticker signing key change really does come from EMURGO */
+  pubKeyMaster: string,
+|};
 
 export type NetworkConfigType = {|
   name: Network,
-    priceBackendUrl: string,
+  priceBackendUrl: string,
 |};
 
 export type Network = 'development' | 'mainnet' | 'test';
@@ -49,6 +50,6 @@ export const NetworkType: {|
   TEST: Network,
 |} = {
   DEVELOPMENT: 'development',
-    MAINNET: 'mainnet',
-      TEST: 'test',
+  MAINNET: 'mainnet',
+  TEST: 'test',
 };
diff --git a/packages/yoroi-extension/config/development.json b/packages/yoroi-extension/config/development.json
index bba392790b..2bd642df45 100644
--- a/packages/yoroi-extension/config/development.json
+++ b/packages/yoroi-extension/config/development.json
@@ -22,5 +22,10 @@
     "baseUrl": "https://sandbox-api.bringweb3.io/v1/extension/",
     "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8",
     "apiEndpoint": "sandbox"
+  },
+  "bringSandbox": {
+    "baseUrl": "https://sandbox-api.bringweb3.io/v1/extension/",
+    "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8",
+    "apiEndpoint": "sandbox"
   }
 }
\ No newline at end of file
diff --git a/packages/yoroi-extension/config/mainnet.json b/packages/yoroi-extension/config/mainnet.json
index 0cab2e14f7..644d754025 100644
--- a/packages/yoroi-extension/config/mainnet.json
+++ b/packages/yoroi-extension/config/mainnet.json
@@ -21,5 +21,10 @@
     "baseUrl": "https://api.bringweb3.io/v1/extension/",
     "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8",
     "apiEndpoint": "prod"
+  },
+  "bringSandbox": {
+    "baseUrl": "https://sandbox-api.bringweb3.io/v1/extension/",
+    "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8",
+    "apiEndpoint": "sandbox"
   }
 }
\ No newline at end of file
diff --git a/packages/yoroi-extension/config/test.json b/packages/yoroi-extension/config/test.json
index 81b2e13ff2..b8f2692aad 100644
--- a/packages/yoroi-extension/config/test.json
+++ b/packages/yoroi-extension/config/test.json
@@ -22,5 +22,10 @@
     "baseUrl": "https://sandbox-api.bringweb3.io/v1/extension/check/portal",
     "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8",
     "apiEndpoint": "sandbox"
+  },
+  "bringSandbox": {
+    "baseUrl": "https://sandbox-api.bringweb3.io/v1/extension/",
+    "identifier": "G1TjqDrfxS8jhRYz15Sg2fMGsvZpdFF8IWgKe0g8",
+    "apiEndpoint": "sandbox"
   }
 }
\ No newline at end of file

From f73d4dc5d1c5df27ecbafd06357165b03fa93d2a Mon Sep 17 00:00:00 2001
From: vantuz-subhuman <vantuz-subhuman@yandex.ru>
Date: Tue, 3 Dec 2024 13:52:17 +0300
Subject: [PATCH 079/143] bring two configs

---
 .../app/api/ada/lib/test-config.forTests.js   |  7 ++++++-
 .../general-setting/BringCashbackSettings.js  |  2 +-
 .../app/containers/cashback/CashbackPage.js   |  4 ++--
 packages/yoroi-extension/app/environment.js   | 19 ++++++++++++-------
 .../chrome/extension/background/index.js      |  4 ++--
 .../yoroi-extension/config/config-types.js    |  6 +++---
 6 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/packages/yoroi-extension/app/api/ada/lib/test-config.forTests.js b/packages/yoroi-extension/app/api/ada/lib/test-config.forTests.js
index 57907ca27d..b1adda2090 100644
--- a/packages/yoroi-extension/app/api/ada/lib/test-config.forTests.js
+++ b/packages/yoroi-extension/app/api/ada/lib/test-config.forTests.js
@@ -25,7 +25,12 @@ const CONFIG: ConfigType = {
     baseUrl: '',
     identifier: '',
     apiEndpoint: ''
-  }
+  },
+  bringSandbox: {
+    baseUrl: '',
+    identifier: '',
+    apiEndpoint: ''
+  },
 };
 
 global.CONFIG = CONFIG;
diff --git a/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js b/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
index 1a8be6a182..7b8f0ea442 100644
--- a/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
+++ b/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
@@ -39,7 +39,7 @@ const messages = defineMessages({
 type Props = {|
   +onSelect: number => Promise<void>,
   +isSubmitting: boolean,
-  +cardanoWallets: Array<{ publicDeriverId: number, name: string, plate: WalletChecksum, ... }>,
+  +cardanoWallets: Array<{ publicDeriverId: number, name: string, plate: WalletChecksum, isTestnet: boolean, ... }>,
   +currentValue: ?number,
   +error?: ?LocalizableError,
 |};
diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index e3f043fd47..64cd35faeb 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -117,10 +117,10 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
         publicDeriver.externalAddressesByType[CoreAddressTypes.CARDANO_BASE][0].address
       ).to_bech32();
 
-      const response = await fetch(`${environment.bringBaseUrl}check/portal`, {
+      const response = await fetch(`${environment.bring.baseUrl}check/portal`, {
         method: 'POST',
         headers: {
-          'x-api-key': environment.bringIdentifier,
+          'x-api-key': environment.bring.identifier,
           'Content-Type': 'application/json',
         },
         body: JSON.stringify({ walletAddress }),
diff --git a/packages/yoroi-extension/app/environment.js b/packages/yoroi-extension/app/environment.js
index bf425c93dc..65d26b8a9d 100644
--- a/packages/yoroi-extension/app/environment.js
+++ b/packages/yoroi-extension/app/environment.js
@@ -1,6 +1,6 @@
 // @flow
 
-import type { ConfigType, Network } from '../config/config-types';
+import type { BringConfigType, ConfigType, Network } from '../config/config-types';
 import { NetworkType } from '../config/config-types';
 import type { UserAgentInfo } from './utils/userAgentInfo';
 import userAgentInfo from './utils/userAgentInfo';
@@ -90,6 +90,11 @@ function getVersion(): string {
 
 const FIREFOX_PRIVACY_POLICY_URL = 'https://addons.mozilla.org/en-US/firefox/addon/yoroi/privacy';
 
+/**
+ * This can be replaced with `.bringSandbox`
+ */
+const BRING_CONFIG = CONFIG.bring; // CONFIG.bringSandbox;
+
 export const environment = ((
   {
     ...process.env,
@@ -115,9 +120,11 @@ export const environment = ((
     getWalletRefreshInterval: () => CONFIG.app.walletRefreshInterval,
     getServerStatusRefreshInterval: () => CONFIG.app.serverStatusRefreshInterval,
     userAgentInfo,
-    bringBaseUrl: CONFIG.bring.baseUrl,
-    bringIdentifier: CONFIG.bring.identifier,
-    bringApiEndpoint: CONFIG.bring.apiEndpoint,
+    bring: {
+      baseUrl: BRING_CONFIG.baseUrl,
+      identifier: BRING_CONFIG.identifier,
+      apiEndpoint: BRING_CONFIG.apiEndpoint,
+    },
     isFirefox,
     isChrome,
     isExtension,
@@ -145,9 +152,7 @@ export const environment = ((
   getServerStatusRefreshInterval: void => number,
   userAgentInfo: UserAgentInfo,
   isLight: boolean,
-  bringBaseUrl: string,
-  bringIdentifier: string,
-  bringApiEndpoint: string,
+  bring: BringConfigType,
   isExtension: void => boolean,
   isFirefox: void => boolean,
   isChrome: void => boolean,
diff --git a/packages/yoroi-extension/chrome/extension/background/index.js b/packages/yoroi-extension/chrome/extension/background/index.js
index 673e51835f..26921269df 100644
--- a/packages/yoroi-extension/chrome/extension/background/index.js
+++ b/packages/yoroi-extension/chrome/extension/background/index.js
@@ -20,8 +20,8 @@ declare var browser;
 */
 
 bringInitBackground({
-  identifier: environment.bringIdentifier,
-  apiEndpoint: environment.bringApiEndpoint,
+  identifier: environment.bring.identifier,
+  apiEndpoint: environment.bring.apiEndpoint,
   cashbackPagePath: '/main_window.html#/cashback'
 });
 
diff --git a/packages/yoroi-extension/config/config-types.js b/packages/yoroi-extension/config/config-types.js
index 25fb19f525..8a60e1f8ab 100644
--- a/packages/yoroi-extension/config/config-types.js
+++ b/packages/yoroi-extension/config/config-types.js
@@ -4,14 +4,14 @@ export type ConfigType = {|
   network: NetworkConfigType,
   poolExplorer: PoolExplorerConfigType,
   app: AppConfigType,
-  bring: BringConfigType
-  bringSandbox: BringConfigType
+  bring: BringConfigType,
+  bringSandbox: BringConfigType,
 |};
 
 export type BringConfigType = {|
   baseUrl: string,
   identifier: string,
-  apiEndpoint: string
+  apiEndpoint: string,
 |};
 
 export type PoolExplorerConfigType = {|

From e5db4bead68ba16919e47ef7f9276c235b8886f8 Mon Sep 17 00:00:00 2001
From: kalfada <kalfada3321@gmail.com>
Date: Tue, 3 Dec 2024 15:56:50 +0200
Subject: [PATCH 080/143] fix: update bring npm package

---
 packages/yoroi-extension/package-lock.json | 8 ++++----
 packages/yoroi-extension/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index eaa830c610..e74e551667 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@amplitude/analytics-browser": "^2.1.3",
         "@babel/preset-typescript": "^7.24.7",
-        "@bringweb3/chrome-extension-kit": "^1.2.2",
+        "@bringweb3/chrome-extension-kit": "^1.2.4",
         "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
         "@emotion/react": "^11.4.1",
         "@emotion/styled": "^11.3.0",
@@ -2139,9 +2139,9 @@
       "dev": true
     },
     "node_modules/@bringweb3/chrome-extension-kit": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@bringweb3/chrome-extension-kit/-/chrome-extension-kit-1.2.2.tgz",
-      "integrity": "sha512-31bqMPI0L0VRzWBIPAf4o3ABWND2V6fvQrLaumnR3wrGPcD8tWd6EPEoI/5G4QXFjGUFyjQK60MNaafQiKHZYQ=="
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@bringweb3/chrome-extension-kit/-/chrome-extension-kit-1.2.4.tgz",
+      "integrity": "sha512-m0zBixNx+YWxtLZ4KX7NNhM+BeQC4RJEPuHISUfiRyyQw4KT5+F3cmXcJWOu0cDHT4KcLwfshPPFfEaI1Ewvgg=="
     },
     "node_modules/@cardano-foundation/ledgerjs-hw-app-cardano": {
       "version": "7.1.3",
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
index 0c0611c942..22eda2ea06 100644
--- a/packages/yoroi-extension/package.json
+++ b/packages/yoroi-extension/package.json
@@ -150,7 +150,7 @@
   "dependencies": {
     "@amplitude/analytics-browser": "^2.1.3",
     "@babel/preset-typescript": "^7.24.7",
-    "@bringweb3/chrome-extension-kit": "^1.2.2",
+    "@bringweb3/chrome-extension-kit": "^1.2.4",
     "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",

From a2b764344b3e2b02ab6cb4156d8b55be18ee0836 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 4 Dec 2024 02:47:24 +0800
Subject: [PATCH 081/143] remove unused

---
 .../app/containers/cashback/CashbackPage.js          | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index e3f043fd47..fcaa3529d9 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -6,8 +6,6 @@ import { observer } from 'mobx-react';
 import type { StoresAndActionsProps } from '../../types/injectedProps.types';
 import TopBarLayout from '../../components/layout/TopBarLayout';
 import BannerContainer from '../banners/BannerContainer';
-import { withLayout } from '../../styles/context/layout';
-import type { LayoutComponentMap } from '../../styles/context/layout';
 import SidebarContainer from '../SidebarContainer';
 import FullscreenLayout from '../../components/layout/FullscreenLayout';
 import environment from '../../environment';
@@ -81,10 +79,9 @@ const messages = defineMessages({
   },
 });
 
-type Props = StoresAndActionsProps;
+type Props = $ReadOnly<StoresAndActionsProps>;
 
-type InjectedLayoutProps = {| +renderLayoutComponent: LayoutComponentMap => Node |};
-type AllProps = {| ...Props, ...InjectedLayoutProps, intl: $npm$ReactIntl$IntlShape, |};
+type AllProps = {| ...Props, intl: $npm$ReactIntl$IntlShape, |};
 
 type IframeMessageData = {|
   action: string,
@@ -93,7 +90,8 @@ type IframeMessageData = {|
   amount: number
 |};
 
-const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllProps) => {
+
+const CashbackPageContainer = observer((props: AllProps) => {
   const { actions, stores, intl } = props;
   const wallet = stores.wallets.selected;
   if (!wallet) throw Error('no publicDeriver');
@@ -456,4 +454,4 @@ const CashbackPageContainer: React$ComponentType<Props> = observer((props: AllPr
   );
 });
 
-export default (injectIntl((withLayout(CashbackPageContainer))): React$ComponentType < Props >);
+export default (injectIntl(CashbackPageContainer): React$ComponentType < Props >);

From becf77b47162b1c6a44f002983378e35ab76c1c3 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 4 Dec 2024 03:40:50 +0800
Subject: [PATCH 082/143] new not current wallet warning dialog

---
 .../app/containers/cashback/CashbackPage.js   | 185 +++++++++++++-----
 1 file changed, 139 insertions(+), 46 deletions(-)

diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index fcaa3529d9..c6eb8fe9dc 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -77,11 +77,134 @@ const messages = defineMessages({
     id: 'cashback.not.current.warning.keep',
     defaultMessage: '!!!keep current wallet',
   },
+  chooseTitle: {
+    id: 'cashback.not.current.warning.title.choose',
+    defaultMessage: '!!!choose cashback wallet',
+  },
+  setThis: {
+    id: 'cashback.not.current.warning.button.set.this',
+    defaultMessage: '!!!set this wallet',
+  },
+  switch: {
+    id: 'cashback.not.current.warning.button.switch',
+    defaultMessage: '!!!switch wallet',
+  },
+  chooseText1: {
+    id: 'cashback.not.current.warning.text.choose.1',
+    defaultMessage: '!!!Your cashback rewards are currently linked to another wallet.',
+  },
+  chooseText2: {
+    id: 'cashback.not.current.warning.text.choose.2',
+    defaultMessage: '!!!Would you like to set this wallet as your cashback wallet?',
+  },
+  setCurrentTitle: {
+    id: 'cashback.not.current.warning.title.set.current',
+    defaultMessage: '!!!Set my Current Wallet as my Cashback Wallet'
+  },
+  no: {
+    id: 'cashback.not.current.warning.button.no',
+    defaultMessage: '!!!no'
+  },
+  yes: {
+    id: 'cashback.not.current.warning.button.yes',
+    defaultMessage: '!!!yes'
+  },
+  switchText: {
+    id: 'cashback.not.current.warning.text.switch',
+    defaultMessage: '!!!To claim your ADA cashback, either switch to your Cashback Wallet or choose your current wallet as your new Cashback Wallet.'
+  },
 });
 
-type Props = $ReadOnly<StoresAndActionsProps>;
+type NotCurrentWalletModalProps = {|
+  onSetCurrentAsCashbackWallet: () => void,
+  onSwitchToCashbackWallet: () => void,
+  shownCashbackWallet: {
+    plate: {|
+      ImagePart: string,
+      TextPart: string,
+    |},
+    name: string,
+    ...,
+  },
+  intl: $npm$ReactIntl$IntlShape,
+|};
 
-type AllProps = {| ...Props, intl: $npm$ReactIntl$IntlShape, |};
+const NotCurrentWalletModal = injectIntl(observer((props: NotCurrentWalletModalProps) => {
+  const { intl } = props;
+
+  const [state, setState] = useState<'switchOrSet' | 'confirmSet'>('switchOrSet');
+
+  if (state === 'switchOrSet') {
+    return (
+      <Dialog
+        title={intl.formatMessage(messages.chooseTitle)}
+        actions={[
+          {
+            label: intl.formatMessage(messages.setThis),
+            onClick: () => {
+              setState('confirmSet');
+            }
+          },
+          {
+            label: intl.formatMessage(messages.switch),
+            primary: true,
+            onClick: props.onSwitchToCashbackWallet,
+          }
+        ]}
+      >
+        <Typography sx={{ fontSize: '16px', lineHeight: '24px' }}>
+          {intl.formatMessage(messages.chooseText1)}
+        </Typography>
+        <Typography sx={{ fontSize: '16px', lineHeight: '24px' }}>
+          {intl.formatMessage(messages.chooseText2)}
+        </Typography>
+      </Dialog>
+    );
+  }
+
+  return (
+    <Dialog
+      title={intl.formatMessage(messages.setCurrentTitle)}
+      actions={[
+        {
+          label: intl.formatMessage(messages.no),
+          onClick: () => {
+            setState('switchOrSet');
+          }
+        },
+        {
+          label: intl.formatMessage(messages.yes),
+          primary: true,
+          onClick: props.onSetCurrentAsCashbackWallet,
+        }
+      ]}
+    >
+      <Typography sx={{ fontSize: '16px', lineHeight: '24px' }}>
+        {intl.formatMessage(messages.switchText)}
+      </Typography>
+      <Typography sx={{ fontSize: '12px', fontHeight: '16px',lineHeight: '16px' }}>
+        {intl.formatMessage(messages.currentWalletLabel)}
+      </Typography>
+      <Box sx={{ display: 'flex', flexDirection: 'row', overflow: 'hidden' }}>
+        {constructPlate32(props.shownCashbackWallet.plate)[1]}
+        <Typography
+          sx={{
+            fontWeight: '500px',
+            fontSize: '16px',
+            lineHeight: '24px',
+            marginTop: 'auto',
+            marginBottom: 'auto',
+            marginLeft: '1em',
+          }}
+        >
+          {props.shownCashbackWallet.plate.TextPart}
+        </Typography>
+      </Box>
+    </Dialog>
+  );
+}));
+
+type AllProps = {| ...StoresAndActionsProps, intl: $npm$ReactIntl$IntlShape, |};
 
 type IframeMessageData = {|
   action: string,
@@ -319,49 +442,19 @@ const CashbackPageContainer = observer((props: AllProps) => {
           )}
 
           {shownCashbackWallet && !shouldShowDisclaimer && (
-            <Dialog
-              title={intl.formatMessage(messages.warning)}
-              actions={[
-                {
-                  label: intl.formatMessage(messages.useThis),
-                  onClick: () => {
-                    stores.wallets.setCashbackWallet(forceNonNull(stores.wallets.selected).publicDeriverId);
-                    setShownCashbackWallet(null);
-                    setPopup(false);
-                  }
-                },
-                {
-                  label: intl.formatMessage(messages.keep),
-                  primary: true,
-                  onClick: () => {
-                    setShownCashbackWallet(null);
-                    setPopup(false);
-                  }
-                }
-              ]}
-            >
-              <Typography sx={{ fontSize: '16px', lineHeight: '24px' }}>
-                {intl.formatMessage(messages.notCurrentText)}
-              </Typography>
-              <Typography sx={{ fontSize: '12px', fontHeight: '16px',lineHeight: '16px' }}>
-                {intl.formatMessage(messages.currentWalletLabel)}
-              </Typography>
-              <Box sx={{ display: 'flex', flexDirection: 'row', overflow: 'hidden' }}>
-                {constructPlate32(shownCashbackWallet.plate)[1]}
-                <Typography
-                  sx={{
-                    fontWeight: '500px',
-                    fontSize: '16px',
-                    lineHeight: '24px',
-                    marginTop: 'auto',
-                    marginBottom: 'auto',
-                    marginLeft: '1em',
-                  }}
-                >
-                  {shownCashbackWallet.plate.TextPart}
-                </Typography>
-              </Box>
-            </Dialog>
+            <NotCurrentWalletModal
+              shownCashbackWallet={shownCashbackWallet}
+              onSetCurrentAsCashbackWallet={() => {
+                stores.wallets.setCashbackWallet(forceNonNull(stores.wallets.selected).publicDeriverId);
+                setShownCashbackWallet(null);
+                setPopup(false);
+              }}
+              onSwitchToCashbackWallet={() => {
+                props.actions.wallets.setActiveWallet.trigger(
+                  { publicDeriverId: shownCashbackWallet.publicDeriverId }
+                );
+              }}
+            />
           )}
 
           {signaturePopup ?
@@ -454,4 +547,4 @@ const CashbackPageContainer = observer((props: AllProps) => {
   );
 });
 
-export default (injectIntl(CashbackPageContainer): React$ComponentType < Props >);
+export default (injectIntl(CashbackPageContainer): React$ComponentType<StoresAndActionsProps>);

From 03a1e158cb616345a7407bf890e3a576fcd265e3 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 4 Dec 2024 04:11:04 +0800
Subject: [PATCH 083/143] fix double scroll again

---
 .../yoroi-extension/app/containers/cashback/CashbackPage.js   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index c6eb8fe9dc..8a77acb952 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -7,7 +7,6 @@ import type { StoresAndActionsProps } from '../../types/injectedProps.types';
 import TopBarLayout from '../../components/layout/TopBarLayout';
 import BannerContainer from '../banners/BannerContainer';
 import SidebarContainer from '../SidebarContainer';
-import FullscreenLayout from '../../components/layout/FullscreenLayout';
 import environment from '../../environment';
 import { ROUTES } from '../../routes-config';
 import NavBarContainerRevamp from '../NavBarContainerRevamp';
@@ -426,7 +425,6 @@ const CashbackPageContainer = observer((props: AllProps) => {
         />
       }
     >
-      <FullscreenLayout bottomPadding={0}>
         <Suspense fallback={null}>
           {shouldShowDisclaimer && (
             <DisclaimerDialog
@@ -542,7 +540,7 @@ const CashbackPageContainer = observer((props: AllProps) => {
             />
           )}
         </Suspense>
-      </FullscreenLayout>
+
     </TopBarLayout >
   );
 });

From 9df9ef576482e605449a8d58eb7df36d8b693ef1 Mon Sep 17 00:00:00 2001
From: vantuz-subhuman <vantuz-subhuman@yandex.ru>
Date: Thu, 5 Dec 2024 17:58:19 +0300
Subject: [PATCH 084/143] moved bring config from environment

---
 .../app/containers/cashback/CashbackPage.js         | 11 ++++++++---
 packages/yoroi-extension/app/environment.js         | 13 +------------
 .../chrome/extension/background/index.js            |  8 ++++++--
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index 08683f75a5..975eb0dbac 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -38,6 +38,7 @@ import { forceNonNull } from '../../coreUtils';
 import { constructPlate32 } from '../../components/topbar/WalletCard';
 import LocalStorageApi from '../../api/localStorage';
 import DisclaimerDialog from '../../components/widgets/DisclaimerDialog';
+import type { BringConfigType } from '../../../config/config-types';
 
 const messages = defineMessages({
   claim: {
@@ -114,6 +115,9 @@ const messages = defineMessages({
   },
 });
 
+// populated by ConfigWebpackPlugin
+declare var CONFIG: ConfigType;
+
 type NotCurrentWalletModalProps = {|
   onSetCurrentAsCashbackWallet: () => void,
   onSwitchToCashbackWallet: () => void,
@@ -212,12 +216,13 @@ type IframeMessageData = {|
   amount: number
 |};
 
-
 const CashbackPageContainer = observer((props: AllProps) => {
   const { actions, stores, intl } = props;
   const wallet = stores.wallets.selected;
   if (!wallet) throw Error('no publicDeriver');
 
+  const bringConfig: BringConfigType = CONFIG.bring;
+
   const theme = useTheme();
 
   const iframeRef = useRef < HTMLIFrameElement | null > (null);
@@ -237,10 +242,10 @@ const CashbackPageContainer = observer((props: AllProps) => {
         publicDeriver.externalAddressesByType[CoreAddressTypes.CARDANO_BASE][0].address
       ).to_bech32();
 
-      const response = await fetch(`${environment.bring.baseUrl}check/portal`, {
+      const response = await fetch(`${bringConfig.baseUrl}check/portal`, {
         method: 'POST',
         headers: {
-          'x-api-key': environment.bring.identifier,
+          'x-api-key': bringConfig.identifier,
           'Content-Type': 'application/json',
         },
         body: JSON.stringify({ walletAddress }),
diff --git a/packages/yoroi-extension/app/environment.js b/packages/yoroi-extension/app/environment.js
index 65d26b8a9d..440d2537c9 100644
--- a/packages/yoroi-extension/app/environment.js
+++ b/packages/yoroi-extension/app/environment.js
@@ -1,6 +1,6 @@
 // @flow
 
-import type { BringConfigType, ConfigType, Network } from '../config/config-types';
+import type { ConfigType, Network } from '../config/config-types';
 import { NetworkType } from '../config/config-types';
 import type { UserAgentInfo } from './utils/userAgentInfo';
 import userAgentInfo from './utils/userAgentInfo';
@@ -90,11 +90,6 @@ function getVersion(): string {
 
 const FIREFOX_PRIVACY_POLICY_URL = 'https://addons.mozilla.org/en-US/firefox/addon/yoroi/privacy';
 
-/**
- * This can be replaced with `.bringSandbox`
- */
-const BRING_CONFIG = CONFIG.bring; // CONFIG.bringSandbox;
-
 export const environment = ((
   {
     ...process.env,
@@ -120,11 +115,6 @@ export const environment = ((
     getWalletRefreshInterval: () => CONFIG.app.walletRefreshInterval,
     getServerStatusRefreshInterval: () => CONFIG.app.serverStatusRefreshInterval,
     userAgentInfo,
-    bring: {
-      baseUrl: BRING_CONFIG.baseUrl,
-      identifier: BRING_CONFIG.identifier,
-      apiEndpoint: BRING_CONFIG.apiEndpoint,
-    },
     isFirefox,
     isChrome,
     isExtension,
@@ -152,7 +142,6 @@ export const environment = ((
   getServerStatusRefreshInterval: void => number,
   userAgentInfo: UserAgentInfo,
   isLight: boolean,
-  bring: BringConfigType,
   isExtension: void => boolean,
   isFirefox: void => boolean,
   isChrome: void => boolean,
diff --git a/packages/yoroi-extension/chrome/extension/background/index.js b/packages/yoroi-extension/chrome/extension/background/index.js
index 26921269df..bc710571fd 100644
--- a/packages/yoroi-extension/chrome/extension/background/index.js
+++ b/packages/yoroi-extension/chrome/extension/background/index.js
@@ -11,6 +11,10 @@ import axios from 'axios';
 import fetchAdapter from '@vespaiach/axios-fetch-adapter';
 import { sanitizeForLog } from '../../../app/coreUtils';
 import LocalStorageApi from '../../../app/api/localStorage/index';
+import type { ConfigType } from '../../../config/config-types';
+
+// populated by ConfigWebpackPlugin
+declare var CONFIG: ConfigType;
 
 axios.defaults.adapter = fetchAdapter;
 
@@ -20,8 +24,8 @@ declare var browser;
 */
 
 bringInitBackground({
-  identifier: environment.bring.identifier,
-  apiEndpoint: environment.bring.apiEndpoint,
+  identifier: CONFIG.bring.identifier,
+  apiEndpoint: CONFIG.bring.apiEndpoint,
   cashbackPagePath: '/main_window.html#/cashback'
 });
 

From 1509f60ef7ffecd222c0a1ef87d193b38cd4c0e1 Mon Sep 17 00:00:00 2001
From: vantuz-subhuman <vantuz-subhuman@yandex.ru>
Date: Thu, 5 Dec 2024 19:21:48 +0300
Subject: [PATCH 085/143] pick config from flag

---
 .../app/api/localStorage/index.js             | 14 +++++++++++++
 .../app/containers/cashback/CashbackPage.js   | 20 ++++++++++++++++---
 .../app/stores/base/BaseProfileStore.js       |  8 ++++++++
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/packages/yoroi-extension/app/api/localStorage/index.js b/packages/yoroi-extension/app/api/localStorage/index.js
index e8f29a42dd..d4ea536ff0 100644
--- a/packages/yoroi-extension/app/api/localStorage/index.js
+++ b/packages/yoroi-extension/app/api/localStorage/index.js
@@ -33,6 +33,7 @@ const storageKeys = {
   FLAGS: networkForLocalStorage + '-FLAGS',
   USER_THEME: networkForLocalStorage + '-USER-THEME',
   PORTFOLIO_FIAT_PAIR: networkForLocalStorage + '-PORTFOLIO_FIAT_PAIR',
+  BRING_SANDBOX: networkForLocalStorage + '-BRING_SANDBOX',
   // ========== CONNECTOR   ========== //
   DAPP_CONNECTOR_WHITELIST: 'connector_whitelist',
   SELECTED_WALLET: 'SELECTED_WALLET',
@@ -217,6 +218,19 @@ export default class LocalStorageApi {
 
   unsetToggleSidebar: void => Promise<void> = () => removeLocalItem(storageKeys.TOGGLE_SIDEBAR);
 
+  // ========== Expand / retract Sidebar ========== //
+
+  getBringSandbox: void => Promise<boolean> = () =>
+    getLocalItem(storageKeys.BRING_SANDBOX).then(s => s === 'true');
+
+  setBringSandbox: boolean => Promise<void> = flag => {
+    return flag
+      ? setLocalItem(storageKeys.BRING_SANDBOX, 'true')
+      : this.unsetBringSandbox();
+  };
+
+  unsetBringSandbox: void => Promise<void> = () => removeLocalItem(storageKeys.BRING_SANDBOX);
+
   // ============ External storage provider ============ //
 
   getExternalStorage: void => Promise<?SelectedExternalStorageProvider> = () =>
diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index 975eb0dbac..7593708bd0 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -216,13 +216,13 @@ type IframeMessageData = {|
   amount: number
 |};
 
+const canUseSandbox = environment.isDev() || environment.isNightly();
+
 const CashbackPageContainer = observer((props: AllProps) => {
   const { actions, stores, intl } = props;
   const wallet = stores.wallets.selected;
   if (!wallet) throw Error('no publicDeriver');
 
-  const bringConfig: BringConfigType = CONFIG.bring;
-
   const theme = useTheme();
 
   const iframeRef = useRef < HTMLIFrameElement | null > (null);
@@ -234,7 +234,18 @@ const CashbackPageContainer = observer((props: AllProps) => {
   const [signaturePopup, setSignaturePopup] = useState(false);
   const [overlayBgColor, setOverlayBgColor] = useState('#000000fa');
 
+  const bringSandboxRequest = stores.profile.getBringSandboxRequest;
   const fetchIframeUrl = useCallback(async () => {
+
+    if (canUseSandbox) {
+      if (!bringSandboxRequest.wasExecuted) {
+        bringSandboxRequest.execute();
+      }
+      await bringSandboxRequest.promise;
+    }
+    const isBringSandbox = canUseSandbox && (bringSandboxRequest.result ?? false);
+    const bringConfig: BringConfigType = isBringSandbox ? CONFIG.bringSandbox : CONFIG.bring;
+
     try {
       const publicDeriver = stores.wallets.selected;
       if (!publicDeriver) throw Error('no publicDeriver');
@@ -259,7 +270,10 @@ const CashbackPageContainer = observer((props: AllProps) => {
     } catch (error) {
       console.error('Error fetching data:', error);
     }
-  }, [stores.wallets.selected]);
+  }, [
+    stores.wallets.selected,
+    bringSandboxRequest.result,
+  ]);
 
   function stringToHex(str) {
     return Array.from(str)
diff --git a/packages/yoroi-extension/app/stores/base/BaseProfileStore.js b/packages/yoroi-extension/app/stores/base/BaseProfileStore.js
index 5284176e1c..967c57866f 100644
--- a/packages/yoroi-extension/app/stores/base/BaseProfileStore.js
+++ b/packages/yoroi-extension/app/stores/base/BaseProfileStore.js
@@ -146,6 +146,14 @@ export default class BaseProfileStore
     (void) => Promise<?boolean>
   > = new Request(this.api.localStorage.loadIsAnalyticsAllowed);
 
+  @observable setBringSandboxRequest: Request<
+    (boolean) => Promise<void>
+    > = new Request(this.api.localStorage.setBringSandbox);
+
+  @observable getBringSandboxRequest: Request<
+    (void) => Promise<boolean>
+    > = new Request(this.api.localStorage.getBringSandbox);
+
   @observable _acceptedTosVersion: {| version: ?number |} = { version: undefined };
 
   setup(): void {

From a7aa631121a866a0bcc97736fe32b7cba6ac809e Mon Sep 17 00:00:00 2001
From: vantuz-subhuman <vantuz-subhuman@yandex.ru>
Date: Fri, 6 Dec 2024 14:50:06 +0300
Subject: [PATCH 086/143] bring sandbox selector

---
 .../general-setting/BringCashbackSettings.js  | 21 ++++++++++++++++
 .../app/containers/cashback/CashbackPage.js   | 25 ++++++++-----------
 .../categories/GeneralSettingsPage.js         |  8 ++++++
 .../app/stores/base/BaseProfileStore.js       |  1 +
 4 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js b/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
index 7b8f0ea442..3b4eb76e19 100644
--- a/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
+++ b/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
@@ -19,6 +19,8 @@ import { withLayout } from '../../../../styles/context/layout';
 import type { InjectedLayoutProps } from '../../../../styles/context/layout';
 import WalletAccountIcon from '../../../topbar/WalletAccountIcon';
 import type { WalletChecksum } from '@emurgo/cip4-js';
+import { RevampSwitch } from '../../../widgets/Switch';
+import FormControlLabel from '@mui/material/FormControlLabel';
 
 const messages = defineMessages({
   bringCashbackTitle: {
@@ -42,12 +44,16 @@ type Props = {|
   +cardanoWallets: Array<{ publicDeriverId: number, name: string, plate: WalletChecksum, isTestnet: boolean, ... }>,
   +currentValue: ?number,
   +error?: ?LocalizableError,
+  +isUseSandbox?: boolean,
+  +onSetUseSandbox?: ?((boolean) => *),
 |};
 
 @observer
 class BringCashbackSettings extends Component<Props & InjectedLayoutProps> {
   static defaultProps: {| error: void |} = {
     error: undefined,
+    isUseSandbox: false,
+    onSetUseSandbox: null,
   };
 
   static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
@@ -154,6 +160,21 @@ class BringCashbackSettings extends Component<Props & InjectedLayoutProps> {
             <FormattedHTMLMessage {...messages.note} />
           </Typography>
         </Box>
+        {this.props.onSetUseSandbox != null ? (
+          <FormControlLabel
+            label="Use Sandbox Backend"
+            control={
+              <Box ml="8px">
+                <RevampSwitch
+                  checked={this.props.isUseSandbox ?? false}
+                  onChange={event => this.props.onSetUseSandbox(event.target.checked)}
+                />
+              </Box>
+            }
+            labelPlacement="start"
+            sx={{ marginLeft: '0px', marginTop: '40px' }}
+          />
+        ) : null}
       </Box>
     );
   }
diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index 7593708bd0..e80956d824 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -1,7 +1,6 @@
 // @flow
-import { useState, useEffect, useCallback, Suspense, useRef } from 'react';
+import { useState, useEffect, useCallback, Suspense, useRef, useMemo } from 'react';
 import styles from './styles.module.css'
-import type { Node } from 'react';
 import { observer } from 'mobx-react';
 import type { StoresAndActionsProps } from '../../types/injectedProps.types';
 import TopBarLayout from '../../components/layout/TopBarLayout';
@@ -235,15 +234,14 @@ const CashbackPageContainer = observer((props: AllProps) => {
   const [overlayBgColor, setOverlayBgColor] = useState('#000000fa');
 
   const bringSandboxRequest = stores.profile.getBringSandboxRequest;
+  const isBringSandbox: ?boolean = useMemo(
+  () => canUseSandbox && bringSandboxRequest.result,
+  [bringSandboxRequest.result],
+  );
+
+
   const fetchIframeUrl = useCallback(async () => {
 
-    if (canUseSandbox) {
-      if (!bringSandboxRequest.wasExecuted) {
-        bringSandboxRequest.execute();
-      }
-      await bringSandboxRequest.promise;
-    }
-    const isBringSandbox = canUseSandbox && (bringSandboxRequest.result ?? false);
     const bringConfig: BringConfigType = isBringSandbox ? CONFIG.bringSandbox : CONFIG.bring;
 
     try {
@@ -270,10 +268,7 @@ const CashbackPageContainer = observer((props: AllProps) => {
     } catch (error) {
       console.error('Error fetching data:', error);
     }
-  }, [
-    stores.wallets.selected,
-    bringSandboxRequest.result,
-  ]);
+  }, [stores.wallets.selected, isBringSandbox]);
 
   function stringToHex(str) {
     return Array.from(str)
@@ -440,7 +435,9 @@ const CashbackPageContainer = observer((props: AllProps) => {
         <NavBarContainerRevamp
           actions={actions}
           stores={stores}
-          title={<NavBarTitle title={intl.formatMessage(globalMessages.sidebarCashback)} />}
+          title={<NavBarTitle title={intl.formatMessage(globalMessages.sidebarCashback) + (
+            isBringSandbox ? ' (sandbox)' : ''
+          )} />}
         />
       }
     >
diff --git a/packages/yoroi-extension/app/containers/settings/categories/GeneralSettingsPage.js b/packages/yoroi-extension/app/containers/settings/categories/GeneralSettingsPage.js
index e7efc2bcc5..c48b81582b 100644
--- a/packages/yoroi-extension/app/containers/settings/categories/GeneralSettingsPage.js
+++ b/packages/yoroi-extension/app/containers/settings/categories/GeneralSettingsPage.js
@@ -15,6 +15,7 @@ import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import { Box, Typography } from '@mui/material';
 import { settingsMenuMessages } from '../../../components/settings/menu/SettingsMenu';
 import LocalStorageApi from '../../../api/localStorage/index';
+import environment from '../../../environment';
 
 const currencyLabels = defineMessages({
   USD: {
@@ -51,6 +52,8 @@ const currencyLabels = defineMessages({
   },
 });
 
+const canUseSandbox = environment.isDev() || environment.isNightly();
+
 @observer
 export default class GeneralSettingsPage extends Component<StoresAndActionsProps> {
   static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
@@ -126,6 +129,11 @@ export default class GeneralSettingsPage extends Component<StoresAndActionsProps
           cardanoWallets={wallets.filter(w=>w.type !== 'trezor')}
           // $FlowFixMe this is apparently correct, flow is out of its mind
           currentValue={getCashbackWalletRequest.result?.publicDeriverId || ''}
+          isUseSandbox={profileStore.getBringSandboxRequest.result}
+          onSetUseSandbox={canUseSandbox ? (async (useSandbox) => {
+            await profileStore.setBringSandboxRequest.execute(useSandbox);
+            await profileStore.getBringSandboxRequest.execute();
+          }) : null}
           error={null}
         />
         <UnitOfAccountSettings
diff --git a/packages/yoroi-extension/app/stores/base/BaseProfileStore.js b/packages/yoroi-extension/app/stores/base/BaseProfileStore.js
index 967c57866f..c24d97ea87 100644
--- a/packages/yoroi-extension/app/stores/base/BaseProfileStore.js
+++ b/packages/yoroi-extension/app/stores/base/BaseProfileStore.js
@@ -175,6 +175,7 @@ export default class BaseProfileStore
     this._getSelectComplexityLevel(); // eagerly cache
     noop(this.isRevampAnnounced);
     noop(this.didUserMigratedToRevampTheme);
+    this.getBringSandboxRequest.execute();
     this.stores.loading.registerBlockingLoadingRequest(
       this._loadAcceptedTosVersion(),
       'load-tos-version',

From 32f63537db34ccc12dbb805c4c99b2b8e463b238 Mon Sep 17 00:00:00 2001
From: vantuz-subhuman <vantuz-subhuman@yandex.ru>
Date: Fri, 6 Dec 2024 14:53:20 +0300
Subject: [PATCH 087/143] package-lock update

---
 packages/yoroi-extension/package-lock.json | 50 ++++++++++++++++++----
 1 file changed, 42 insertions(+), 8 deletions(-)

diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index c98cfad557..f8d6b9500e 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -11,10 +11,11 @@
       "dependencies": {
         "@amplitude/analytics-browser": "^2.1.3",
         "@babel/preset-typescript": "^7.24.7",
+        "@bringweb3/chrome-extension-kit": "^1.2.4",
         "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
         "@emotion/react": "^11.4.1",
         "@emotion/styled": "^11.3.0",
-        "@emurgo/cardano-message-signing-browser": "1.0.1",
+        "@emurgo/cardano-message-signing-browser": "1.1.0",
         "@emurgo/cardano-serialization-lib-browser": "12.1.1",
         "@emurgo/cip14-js": "2.0.0",
         "@emurgo/cip4-js": "1.0.5",
@@ -79,6 +80,7 @@
         "react-blockies": "1.4.1",
         "react-copy-to-clipboard": "5.0.3",
         "react-dom": "17.0.2",
+        "react-helmet": "6.1.0",
         "react-intl": "2.9.0",
         "react-markdown": "5.0.3",
         "react-query": "^3.39.3",
@@ -113,7 +115,7 @@
         "@babel/register": "7.12.13",
         "@babel/runtime": "7.12.18",
         "@babel/runtime-corejs3": "7.12.18",
-        "@emurgo/cardano-message-signing-nodejs": "1.0.1",
+        "@emurgo/cardano-message-signing-nodejs": "1.1.0",
         "@emurgo/cardano-serialization-lib-nodejs": "12.1.1",
         "@emurgo/cross-csl-nodejs": "5.1.2",
         "@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
@@ -2136,6 +2138,11 @@
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
       "dev": true
     },
+    "node_modules/@bringweb3/chrome-extension-kit": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@bringweb3/chrome-extension-kit/-/chrome-extension-kit-1.2.4.tgz",
+      "integrity": "sha512-m0zBixNx+YWxtLZ4KX7NNhM+BeQC4RJEPuHISUfiRyyQw4KT5+F3cmXcJWOu0cDHT4KcLwfshPPFfEaI1Ewvgg=="
+    },
     "node_modules/@cardano-foundation/ledgerjs-hw-app-cardano": {
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/@cardano-foundation/ledgerjs-hw-app-cardano/-/ledgerjs-hw-app-cardano-7.1.3.tgz",
@@ -2428,14 +2435,14 @@
       "integrity": "sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww=="
     },
     "node_modules/@emurgo/cardano-message-signing-browser": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@emurgo/cardano-message-signing-browser/-/cardano-message-signing-browser-1.0.1.tgz",
-      "integrity": "sha512-yC4Ymq44WR0bXO1wzxCoyc2W/RD1KSAla0oYhin7IYoVkp2raGp8wt7QNF4pDdNnTcejn5fyPyYY9dL4666H1w=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@emurgo/cardano-message-signing-browser/-/cardano-message-signing-browser-1.1.0.tgz",
+      "integrity": "sha512-LyeiGIqCyZu9DZnKsi4wlBjZA1MN+uy3Cqpb5J6RZWvFXDJnCoxrYB/EixUiGRD/la4WsldBgtPsrIHyGsVkpg=="
     },
     "node_modules/@emurgo/cardano-message-signing-nodejs": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@emurgo/cardano-message-signing-nodejs/-/cardano-message-signing-nodejs-1.0.1.tgz",
-      "integrity": "sha512-PoKh1tQnJX18f8iEr8Jk1KXxKCn9eqaSslMI1pyOJvYRJhQVDLCh0+9YReufjp0oFJIY1ShcrR+4/WnECVZUKQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@emurgo/cardano-message-signing-nodejs/-/cardano-message-signing-nodejs-1.1.0.tgz",
+      "integrity": "sha512-PQRc8K8wZshEdmQenNUzVtiI8oJNF/1uAnBhidee5C4o1l2mDLOW+ur46HWHIFKQ6x8mSJTllcjMscHgzju0gQ==",
       "dev": true
     },
     "node_modules/@emurgo/cardano-serialization-lib-browser": {
@@ -23704,6 +23711,25 @@
         "react": "17.0.2"
       }
     },
+    "node_modules/react-fast-compare": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
+      "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="
+    },
+    "node_modules/react-helmet": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz",
+      "integrity": "sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==",
+      "dependencies": {
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.7.2",
+        "react-fast-compare": "^3.1.1",
+        "react-side-effect": "^2.1.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.3.0"
+      }
+    },
     "node_modules/react-intl": {
       "version": "2.9.0",
       "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-2.9.0.tgz",
@@ -23917,6 +23943,14 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
+    "node_modules/react-side-effect": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.2.tgz",
+      "integrity": "sha512-PVjOcvVOyIILrYoyGEpDN3vmYNLdy1CajSFNt4TDsVQC5KpTijDvWVoR+/7Rz2xT978D8/ZtFceXxzsPwZEDvw==",
+      "peerDependencies": {
+        "react": "^16.3.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
     "node_modules/react-smooth": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-4.0.1.tgz",

From 821050ab63be61bbc042a7b4a23b8ca87aa60f17 Mon Sep 17 00:00:00 2001
From: vantuz-subhuman <vantuz-subhuman@yandex.ru>
Date: Fri, 6 Dec 2024 15:03:47 +0300
Subject: [PATCH 088/143] unset local storage value on reset

---
 packages/yoroi-extension/app/api/localStorage/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/yoroi-extension/app/api/localStorage/index.js b/packages/yoroi-extension/app/api/localStorage/index.js
index d4ea536ff0..6949e6a985 100644
--- a/packages/yoroi-extension/app/api/localStorage/index.js
+++ b/packages/yoroi-extension/app/api/localStorage/index.js
@@ -404,6 +404,7 @@ export default class LocalStorageApi {
     await this.unsetAcceptedTosVersion();
     await this.unsetIsAnalyticsAllowed();
     await this.unsetPortfolioFiatPair();
+    await this.unsetBringSandbox();
   }
 
   getItem: string => Promise<?string> = key => getLocalItem(key);

From ffbb251f70a1da8053e0912f760879c94427c662 Mon Sep 17 00:00:00 2001
From: vantuz-subhuman <vantuz-subhuman@yandex.ru>
Date: Fri, 6 Dec 2024 16:17:59 +0300
Subject: [PATCH 089/143] Version bump: 5.4.511 (nightly)

---
 packages/yoroi-extension/package-lock.json | 4 ++--
 packages/yoroi-extension/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index f8d6b9500e..57eaf5f1ec 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "yoroi",
-  "version": "5.4.510",
+  "version": "5.4.511",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "yoroi",
-      "version": "5.4.510",
+      "version": "5.4.511",
       "license": "MIT",
       "dependencies": {
         "@amplitude/analytics-browser": "^2.1.3",
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
index 0507e5b3fc..5e00328ae7 100644
--- a/packages/yoroi-extension/package.json
+++ b/packages/yoroi-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yoroi",
-  "version": "5.4.510",
+  "version": "5.4.511",
   "description": "Cardano ADA wallet",
   "scripts": {
     "dev-mv2": "rimraf dev/ && NODE_OPTIONS=--openssl-legacy-provider babel-node scripts-mv2/build --type=debug --env 'mainnet'",

From 5f591442843df965e43deaf3601e9274e423f721 Mon Sep 17 00:00:00 2001
From: kalfada <kalfada3321@gmail.com>
Date: Tue, 10 Dec 2024 12:38:29 +0200
Subject: [PATCH 090/143] fix: bring pass message after signing

---
 .../app/containers/cashback/CashbackPage.js   | 414 +++++++++---------
 1 file changed, 208 insertions(+), 206 deletions(-)

diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index e80956d824..d3bb061524 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -119,22 +119,22 @@ declare var CONFIG: ConfigType;
 
 type NotCurrentWalletModalProps = {|
   onSetCurrentAsCashbackWallet: () => void,
-  onSwitchToCashbackWallet: () => void,
-  shownCashbackWallet: {
-    plate: {|
-      ImagePart: string,
+    onSwitchToCashbackWallet: () => void,
+      shownCashbackWallet: {
+  plate: {|
+    ImagePart: string,
       TextPart: string,
     |},
-    name: string,
+  name: string,
     ...,
-  },
-  intl: $npm$ReactIntl$IntlShape,
+},
+intl: $npm$ReactIntl$IntlShape,
 |};
 
 const NotCurrentWalletModal = injectIntl(observer((props: NotCurrentWalletModalProps) => {
   const { intl } = props;
 
-  const [state, setState] = useState<'switchOrSet' | 'confirmSet'>('switchOrSet');
+  const [state, setState] = useState < 'switchOrSet' | 'confirmSet' > ('switchOrSet');
 
   if (state === 'switchOrSet') {
     return (
@@ -184,7 +184,7 @@ const NotCurrentWalletModal = injectIntl(observer((props: NotCurrentWalletModalP
       <Typography sx={{ fontSize: '16px', lineHeight: '24px' }}>
         {intl.formatMessage(messages.switchText)}
       </Typography>
-      <Typography sx={{ fontSize: '12px', fontHeight: '16px',lineHeight: '16px' }}>
+      <Typography sx={{ fontSize: '12px', fontHeight: '16px', lineHeight: '16px' }}>
         {intl.formatMessage(messages.currentWalletLabel)}
       </Typography>
       <Box sx={{ display: 'flex', flexDirection: 'row', overflow: 'hidden' }}>
@@ -210,10 +210,10 @@ type AllProps = {| ...StoresAndActionsProps, intl: $npm$ReactIntl$IntlShape, |};
 
 type IframeMessageData = {|
   action: string,
-  overlayBgColor ?: string,
-  messageToSign: string,
-  amount: number
-|};
+    overlayBgColor ?: string,
+    messageToSign: string,
+      amount: number
+        |};
 
 const canUseSandbox = environment.isDev() || environment.isNightly();
 
@@ -235,8 +235,8 @@ const CashbackPageContainer = observer((props: AllProps) => {
 
   const bringSandboxRequest = stores.profile.getBringSandboxRequest;
   const isBringSandbox: ?boolean = useMemo(
-  () => canUseSandbox && bringSandboxRequest.result,
-  [bringSandboxRequest.result],
+    () => canUseSandbox && bringSandboxRequest.result,
+    [bringSandboxRequest.result],
   );
 
 
@@ -278,6 +278,7 @@ const CashbackPageContainer = observer((props: AllProps) => {
 
   const signMessage = useCallback(async (msg: string, pwd: string) => {
     const { address, addressing } = wallet.externalAddressesByType[CoreAddressTypes.CARDANO_BASE][0];
+    console.log('BRING', { msg });
 
     try {
       let res;
@@ -339,7 +340,8 @@ const CashbackPageContainer = observer((props: AllProps) => {
           to: 'bringweb3',
           action: 'SIGNATURE',
           ...res,
-          message, address
+          message: msg,
+          address
         },
         '*'
       );
@@ -360,205 +362,205 @@ const CashbackPageContainer = observer((props: AllProps) => {
 
     const messageData: IframeMessageData = (event.data: any);
 
-    if (messageData.action === 'SIGN_MESSAGE') {
-      setMessage(messageData.messageToSign)
-      setSignaturePopup(true)
-    } else if (messageData.action === 'POPUP_OPENED') {
-      setPopup(true);
-      setOverlayBgColor(messageData.overlayBgColor || overlayBgColor);
-    } else if (messageData.action === 'POPUP_CLOSED') {
-      setPopup(false);
-    }
-  }, [iframeSrc, overlayBgColor]);
-
-  useEffect(() => {
-    if (environment.isLight) {
-      actions.router.goToRoute.trigger({
-        route: ROUTES.MY_WALLETS,
-      });
-    }
-    if (!iframeSrc) fetchIframeUrl();
-
-    window.addEventListener('message', handleMessage);
-
-    return () => {
-      window.removeEventListener('message', handleMessage);
-    };
-  }, [iframeSrc, fetchIframeUrl, handleMessage]);
-
-  // If the current cashback wallet is not the current wallet, this value initially holds the current cashback
-  // wallet, to be shown in a warning dialog.
-  const [shownCashbackWallet, setShownCashbackWallet] = useState(null);
+  if (messageData.action === 'SIGN_MESSAGE') {
+    setMessage(messageData.messageToSign)
+    setSignaturePopup(true)
+  } else if (messageData.action === 'POPUP_OPENED') {
+    setPopup(true);
+    setOverlayBgColor(messageData.overlayBgColor || overlayBgColor);
+  } else if (messageData.action === 'POPUP_CLOSED') {
+    setPopup(false);
+  }
+}, [iframeSrc, overlayBgColor]);
 
-  useEffect(() => {
-    stores.wallets.getCashbackWallet().then((currentCashbackWallet) => {
-      if (currentCashbackWallet && currentCashbackWallet !== stores.wallets.selected) {
-        setShownCashbackWallet(currentCashbackWallet);
-        setPopup(true);
-      }
-      return 'nonsense';
-    }).catch(console.error);
-  }, []);
+useEffect(() => {
+  if (environment.isLight) {
+    actions.router.goToRoute.trigger({
+      route: ROUTES.MY_WALLETS,
+    });
+  }
+  if (!iframeSrc) fetchIframeUrl();
 
-  const [shouldShowDisclaimer, setShouldShowDisclaimer] = useState(false);
+  window.addEventListener('message', handleMessage);
 
-  useEffect(() => {
-    const localStorageApi = new LocalStorageApi();
-    localStorageApi.isDisclaimerShown('cashback').then((result) => {
-      if (!result) {
-        setShouldShowDisclaimer(true);
-        setPopup(true);
-      }
-      return 'nonsense';
-    }).catch(console.error);
-  }, []);
+  return () => {
+    window.removeEventListener('message', handleMessage);
+  };
+}, [iframeSrc, fetchIframeUrl, handleMessage]);
 
-  const closePopup = useCallback(() => {
-    iframeRef.current?.contentWindow.postMessage({ to: 'bringweb3', action: 'CLOSE_POPUP' }, '*');
-    setPopup(false);
-  }, []);
+// If the current cashback wallet is not the current wallet, this value initially holds the current cashback
+// wallet, to be shown in a warning dialog.
+const [shownCashbackWallet, setShownCashbackWallet] = useState(null);
 
-  const abortClaim = useCallback(() => {
-    iframeRef.current?.contentWindow.postMessage({ to: 'bringweb3', action: 'ABORT_SIGN_MESSAGE' }, '*');
-    setSignaturePopup(false)
-    setPassword('')
-    setErrMsg('')
-  }, []);
+useEffect(() => {
+  stores.wallets.getCashbackWallet().then((currentCashbackWallet) => {
+    if (currentCashbackWallet && currentCashbackWallet !== stores.wallets.selected) {
+      setShownCashbackWallet(currentCashbackWallet);
+      setPopup(true);
+    }
+    return 'nonsense';
+  }).catch(console.error);
+}, []);
 
-  const sidebarContainer = <SidebarContainer actions={actions} stores={stores} />;
+const [shouldShowDisclaimer, setShouldShowDisclaimer] = useState(false);
 
-  return (
-    <TopBarLayout
-      banner={<BannerContainer actions={actions} stores={stores} />}
-      sidebar={sidebarContainer}
-      navbar={
-        <NavBarContainerRevamp
-          actions={actions}
-          stores={stores}
-          title={<NavBarTitle title={intl.formatMessage(globalMessages.sidebarCashback) + (
-            isBringSandbox ? ' (sandbox)' : ''
-          )} />}
+useEffect(() => {
+  const localStorageApi = new LocalStorageApi();
+  localStorageApi.isDisclaimerShown('cashback').then((result) => {
+    if (!result) {
+      setShouldShowDisclaimer(true);
+      setPopup(true);
+    }
+    return 'nonsense';
+  }).catch(console.error);
+}, []);
+
+const closePopup = useCallback(() => {
+  iframeRef.current?.contentWindow.postMessage({ to: 'bringweb3', action: 'CLOSE_POPUP' }, '*');
+  setPopup(false);
+}, []);
+
+const abortClaim = useCallback(() => {
+  iframeRef.current?.contentWindow.postMessage({ to: 'bringweb3', action: 'ABORT_SIGN_MESSAGE' }, '*');
+  setSignaturePopup(false)
+  setPassword('')
+  setErrMsg('')
+}, []);
+
+const sidebarContainer = <SidebarContainer actions={actions} stores={stores} />;
+
+return (
+  <TopBarLayout
+    banner={<BannerContainer actions={actions} stores={stores} />}
+    sidebar={sidebarContainer}
+    navbar={
+      <NavBarContainerRevamp
+        actions={actions}
+        stores={stores}
+        title={<NavBarTitle title={intl.formatMessage(globalMessages.sidebarCashback) + (
+          isBringSandbox ? ' (sandbox)' : ''
+        )} />}
+      />
+    }
+  >
+    <Suspense fallback={null}>
+      {shouldShowDisclaimer && (
+        <DisclaimerDialog
+          onProceed={() => {
+            setShouldShowDisclaimer(false);
+            if (!shownCashbackWallet) {
+              setPopup(false);
+            }
+            const localStorageApi = new LocalStorageApi();
+            localStorageApi.setShownDisclaimer('cashback');
+          }}
         />
-      }
-    >
-        <Suspense fallback={null}>
-          {shouldShowDisclaimer && (
-            <DisclaimerDialog
-              onProceed={() => {
-                setShouldShowDisclaimer(false);
-                if (!shownCashbackWallet) {
-                  setPopup(false);
-                }
-                const localStorageApi = new LocalStorageApi();
-                localStorageApi.setShownDisclaimer('cashback');
-              }}
-            />
-          )}
-
-          {shownCashbackWallet && !shouldShowDisclaimer && (
-            <NotCurrentWalletModal
-              shownCashbackWallet={shownCashbackWallet}
-              onSetCurrentAsCashbackWallet={() => {
-                stores.wallets.setCashbackWallet(forceNonNull(stores.wallets.selected).publicDeriverId);
-                setShownCashbackWallet(null);
-                setPopup(false);
-              }}
-              onSwitchToCashbackWallet={() => {
-                props.actions.wallets.setActiveWallet.trigger(
-                  { publicDeriverId: shownCashbackWallet.publicDeriverId }
-                );
+      )}
+
+      {shownCashbackWallet && !shouldShowDisclaimer && (
+        <NotCurrentWalletModal
+          shownCashbackWallet={shownCashbackWallet}
+          onSetCurrentAsCashbackWallet={() => {
+            stores.wallets.setCashbackWallet(forceNonNull(stores.wallets.selected).publicDeriverId);
+            setShownCashbackWallet(null);
+            setPopup(false);
+          }}
+          onSwitchToCashbackWallet={() => {
+            props.actions.wallets.setActiveWallet.trigger(
+              { publicDeriverId: shownCashbackWallet.publicDeriverId }
+            );
+          }}
+        />
+      )}
+
+      {signaturePopup ?
+        <Dialog
+          title={intl.formatMessage(messages.claim)}
+          closeOnOverlayClick
+          closeButton={<DialogCloseButton />}
+          onClose={abortClaim}
+          actions={[{
+            label: intl.formatMessage(globalMessages.confirm),
+            primary: true,
+            disabled: wallet.type === 'mnemonic' && !password,
+            onClick: () => signMessage(message, password)
+          }]}
+        >
+          <Box>
+            <Typography
+              sx={{
+                marginBottom: '16px',
+                color: theme.name === 'light-theme' ? '#242838' : '#E1E6F5'
               }}
-            />
-          )}
-
-          {signaturePopup ?
-            <Dialog
-              title={intl.formatMessage(messages.claim)}
-              closeOnOverlayClick
-              closeButton={<DialogCloseButton />}
-              onClose={abortClaim}
-              actions={[{
-                label: intl.formatMessage(globalMessages.confirm),
-                primary: true,
-                disabled: wallet.type === 'mnemonic' && !password,
-                onClick: () => signMessage(message, password)
-              }]}
             >
-              <Box>
-                <Typography
-                  sx={{
-                    marginBottom: '16px',
-                    color: theme.name === 'light-theme' ? '#242838' : '#E1E6F5'
-                  }}
-                >
-                  {intl.formatMessage(wallet.type === 'mnemonic' ?
-                    messages.passwordClaimInstruction : messages. hardwardClaimInstruction
-                  )}
-                </Typography>
-                <Typography sx={{ color: theme.name === 'light-theme' ? '#6B7384' : '#7C85A3' }}>
-                  {intl.formatMessage(messages.message)}
-                </Typography>
-                <DialogContentText sx={{
-                  whiteSpace: 'pre-wrap', wordBreak: 'break-word', color: theme.name === 'light-theme' ? '#242838' : '#E1E6F5'
-                }}>
-                  {message}
-                </DialogContentText>
-                {wallet.type === 'mnemonic' && (
-                  <TextField
-                    className="walletPassword"
-                    value={password}
-                    label="Password"
-                    type="password"
-                    // endAdornment={
-                    //   <InputAdornment position="end">
-                    //     <IconButton
-                    //       aria-label="toggle password visibility"
-                    //       onClick={() => setShowPassword(!showPassword)}
-                    //       edge="end"
-                    //     >
-                    //       {!showPassword ? <Icon.VisibilityOff /> : <Icon.VisibilityOn />}
-                    //     </IconButton>
-                    //   </InputAdornment>
-                    // }
-                    onChange={e => {
-                      setPassword(e.target.value);
-                    }}
-                    error={!!errMsg}
-                    disabled={false}
-                  />
-                )}
-                <Typography color="ds.text_error">
-                  { errMsg }
-                </Typography>
-              </Box>
-            </Dialog>
-            : null}
-
-           {popup ? (
-            // eslint-disable-next-line
-            <div
-              className={styles.iframe_overlay}
-              style={{ background: overlayBgColor }}
-              onClick={closePopup}
-            />
-           ) : null}
-
-          {iframeSrc && (
-            <iframe
-              title="cashback"
-              ref={iframeRef}
-              id="bringweb3"
-              className={styles.iframe}
-              src={iframeSrc}
-              style={{ verticalAlign: 'bottom' }}
-              width="100%"
-              height="100%"
-            />
-          )}
-        </Suspense>
-
-    </TopBarLayout >
-  );
+              {intl.formatMessage(wallet.type === 'mnemonic' ?
+                messages.passwordClaimInstruction : messages.hardwardClaimInstruction
+              )}
+            </Typography>
+            <Typography sx={{ color: theme.name === 'light-theme' ? '#6B7384' : '#7C85A3' }}>
+              {intl.formatMessage(messages.message)}
+            </Typography>
+            <DialogContentText sx={{
+              whiteSpace: 'pre-wrap', wordBreak: 'break-word', color: theme.name === 'light-theme' ? '#242838' : '#E1E6F5'
+            }}>
+              {message}
+            </DialogContentText>
+            {wallet.type === 'mnemonic' && (
+              <TextField
+                className="walletPassword"
+                value={password}
+                label="Password"
+                type="password"
+                // endAdornment={
+                //   <InputAdornment position="end">
+                //     <IconButton
+                //       aria-label="toggle password visibility"
+                //       onClick={() => setShowPassword(!showPassword)}
+                //       edge="end"
+                //     >
+                //       {!showPassword ? <Icon.VisibilityOff /> : <Icon.VisibilityOn />}
+                //     </IconButton>
+                //   </InputAdornment>
+                // }
+                onChange={e => {
+                  setPassword(e.target.value);
+                }}
+                error={!!errMsg}
+                disabled={false}
+              />
+            )}
+            <Typography color="ds.text_error">
+              {errMsg}
+            </Typography>
+          </Box>
+        </Dialog>
+        : null}
+
+      {popup ? (
+        // eslint-disable-next-line
+        <div
+          className={styles.iframe_overlay}
+          style={{ background: overlayBgColor }}
+          onClick={closePopup}
+        />
+      ) : null}
+
+      {iframeSrc && (
+        <iframe
+          title="cashback"
+          ref={iframeRef}
+          id="bringweb3"
+          className={styles.iframe}
+          src={iframeSrc}
+          style={{ verticalAlign: 'bottom' }}
+          width="100%"
+          height="100%"
+        />
+      )}
+    </Suspense>
+
+  </TopBarLayout >
+);
 });
 
-export default (injectIntl(CashbackPageContainer): React$ComponentType<StoresAndActionsProps>);
+export default (injectIntl(CashbackPageContainer): React$ComponentType < StoresAndActionsProps >);

From d9dd2c663e546616c0b6c7d56757a65ebafcc3a1 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Tue, 10 Dec 2024 19:17:48 +0800
Subject: [PATCH 091/143] implement wallet switch dialog UI

---
 .../AboutYoroiSettingsBlock.js                |  16 ++-
 .../wallet/settings/SwitchNetworkDialog.js    | 107 ++++++++++++++++++
 .../categories/GeneralSettingsPage.js         |  26 ++++-
 .../SwitchNetworkDialogContainer.js           |  47 ++++++++
 .../app/i18n/global-messages.js               |  16 +++
 5 files changed, 206 insertions(+), 6 deletions(-)
 create mode 100644 packages/yoroi-extension/app/components/wallet/settings/SwitchNetworkDialog.js
 create mode 100644 packages/yoroi-extension/app/containers/settings/categories/SwitchNetworkDialogContainer.js

diff --git a/packages/yoroi-extension/app/components/settings/categories/general-setting/AboutYoroiSettingsBlock.js b/packages/yoroi-extension/app/components/settings/categories/general-setting/AboutYoroiSettingsBlock.js
index 7d755b205e..1b803ca7b1 100644
--- a/packages/yoroi-extension/app/components/settings/categories/general-setting/AboutYoroiSettingsBlock.js
+++ b/packages/yoroi-extension/app/components/settings/categories/general-setting/AboutYoroiSettingsBlock.js
@@ -20,7 +20,7 @@ import RawHash from '../../../widgets/hashWrappers/RawHash';
 import ExplorableHash from '../../../widgets/hashWrappers/ExplorableHash';
 import { handleExternalLinkClick } from '../../../../utils/routing';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
-import { Box, Link, Typography } from '@mui/material';
+import { Box, Link, Typography, Button } from '@mui/material';
 import { withLayout } from '../../../../styles/context/layout';
 import type { InjectedLayoutProps } from '../../../../styles/context/layout';
 
@@ -81,6 +81,10 @@ const messages = defineMessages({
     id: 'settings.general.aboutYoroi.git.branch',
     defaultMessage: '!!!Branch:',
   },
+  switchNetwork: {
+    id: 'settings.general.aboutYoroi.switchNetwork',
+    defaultMessage: '!!!SWITCH NETWORK',
+  },
 });
 
 const basePageComponentPath = 'settings:general';
@@ -134,7 +138,8 @@ const socialMediaLinks = [
 const baseGithubUrl = 'https://github.com/Emurgo/yoroi-frontend/';
 
 type Props = {|
-  wallet: null | { isTestnet: boolean, ... }
+  wallet: null | { isTestnet: boolean, ... },
+  onSwitchNetwork: () => void,
 |};
 
 @observer
@@ -269,6 +274,13 @@ class AboutYoroiSettingsBlock extends Component<Props & InjectedLayoutProps> {
           />
         )}
 
+        <Button
+          onClick={this.props.onSwitchNetwork}
+          variant="primary"
+        >
+          {intl.formatMessage(messages.switchNetwork)}
+        </Button>
+
         <div className={styles.aboutSocial}>
           <GridFlexContainer rowSize={socialMediaLinks.length}>
             {socialMediaLinks.map(link => (
diff --git a/packages/yoroi-extension/app/components/wallet/settings/SwitchNetworkDialog.js b/packages/yoroi-extension/app/components/wallet/settings/SwitchNetworkDialog.js
new file mode 100644
index 0000000000..907e2ee676
--- /dev/null
+++ b/packages/yoroi-extension/app/components/wallet/settings/SwitchNetworkDialog.js
@@ -0,0 +1,107 @@
+// @flow
+import type { Node } from 'react';
+import { Component } from 'react';
+import { observer } from 'mobx-react';
+import { defineMessages, intlShape } from 'react-intl';
+import ReactToolboxMobxForm from '../../../utils/ReactToolboxMobxForm';
+import DialogCloseButton from '../../widgets/DialogCloseButton';
+import Dialog from '../../widgets/Dialog';
+import { isValidWalletPassword, isValidRepeatPassword } from '../../../utils/validations';
+import globalMessages from '../../../i18n/global-messages';
+import type { $npm$ReactIntl$IntlFormat, $npm$ReactIntl$MessageDescriptor } from 'react-intl';
+import { MenuItem, Box } from '@mui/material';
+import { styled } from '@mui/material/styles';
+import Select from '../../common/Select';
+
+const messages = defineMessages({
+  dialogTitle: {
+    id: 'settings.general.switchNetwork.dialog.title',
+    defaultMessage: '!!!Switch network',
+  },
+  dialogText: {
+    id: 'settings.general.switchNetwork.dialog.text',
+    defaultMessage: '!!!The Cardano network is a technical infrastructure combining Cardano nodes and their interactions in one unified system. It consists of a collection of nodes that communicate with each other to maintain the distributed ledger.',
+  },
+  applyButton: {
+    id: 'settings.general.switchNetwork.dialog.button.apply',
+    defaultMessage: '!!!apply',
+  },
+  selectLabel: {
+    id: 'settings.general.switchNetwork.dialog.label.select',
+    defaultMessage: '!!!Select Network',
+  },
+});
+
+const DialogText = styled(Box)(() => ({
+  fontSize: '16px',
+  fontWeight: 400,
+  lineHeight: '24px',
+}));
+
+type Props = {|
+  +onCancel: void => void,
+  +networks: Array<{|
+    id: number,
+    name: $npm$ReactIntl$MessageDescriptor,
+  |}>,
+  +onApply: (number) => void,
+  +currentNetworkId: number,
+|};
+
+@observer
+export default class Switch extends Component<Props> {
+  static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
+    intl: intlShape.isRequired,
+  };
+
+  form: ReactToolboxMobxForm = new ReactToolboxMobxForm({
+    fields: {
+      selectedNetwork: {
+        label: this.context.intl.formatMessage(messages.selectLabel),
+        value: this.props.currentNetworkId,
+      },
+    },
+  });
+
+  render(): Node {
+    const { intl } = this.context;
+    const { onCancel, onApply, networks } = this.props;
+
+    return (
+      <Dialog
+        title={intl.formatMessage(messages.dialogTitle)}
+        closeOnOverlayClick={false}
+        onClose={onCancel}
+        closeButton={<DialogCloseButton onClose={onCancel} />}
+        id="switchNetworkDialog"
+        actions={[
+          {
+            label: intl.formatMessage(globalMessages.cancel),
+            onClick: onCancel,
+            primary: false,
+          },
+          {
+            label: intl.formatMessage(messages.applyButton),
+            onClick: () => onApply(this.form.$('selectedNetwork').value),
+            primary: true,
+          },
+        ]}          
+      >
+        <DialogText>
+          {intl.formatMessage(messages.dialogText)}
+        </DialogText>
+        <Select
+          formControlProps={{ sx: { marginTop: '25px' } }}
+          labelId="network-select"
+          {...this.form.$('selectedNetwork').bind()}
+        >
+          {networks.map(({ id, name }) => (
+            <MenuItem value={id} key={id}>
+              {intl.formatMessage(name)}
+            </MenuItem>
+          ))}
+        </Select>
+      </Dialog>
+    );
+  }
+}
diff --git a/packages/yoroi-extension/app/containers/settings/categories/GeneralSettingsPage.js b/packages/yoroi-extension/app/containers/settings/categories/GeneralSettingsPage.js
index 9a7f6f4fdf..99d156f659 100644
--- a/packages/yoroi-extension/app/containers/settings/categories/GeneralSettingsPage.js
+++ b/packages/yoroi-extension/app/containers/settings/categories/GeneralSettingsPage.js
@@ -14,6 +14,7 @@ import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import { Box, Typography } from '@mui/material';
 import { settingsMenuMessages } from '../../../components/settings/menu/SettingsMenu';
 import LocalStorageApi from '../../../api/localStorage/index';
+import SwitchNetworkDialogContainer from './SwitchNetworkDialogContainer';
 
 const currencyLabels = defineMessages({
   USD: {
@@ -66,8 +67,9 @@ export default class GeneralSettingsPage extends Component<StoresAndActionsProps
 
   render(): Node {
     const { intl } = this.context;
-    const profileStore = this.props.stores.profile;
-    const coinPriceStore = this.props.stores.coinPriceStore;
+    const { stores, actions } = this.props;
+    const profileStore = stores.profile;
+    const coinPriceStore = stores.coinPriceStore;
 
     const isSubmittingLocale = profileStore.setProfileLocaleRequest.isExecuting;
     const isSubmittingUnitOfAccount = profileStore.setUnitOfAccountRequest.isExecuting;
@@ -100,7 +102,7 @@ export default class GeneralSettingsPage extends Component<StoresAndActionsProps
           </Typography>
         )}
         <GeneralSettings
-          onSelectLanguage={this.props.actions.profile.updateLocale.trigger}
+          onSelectLanguage={actions.profile.updateLocale.trigger}
           isSubmitting={isSubmittingLocale}
           languages={profileStore.LANGUAGE_OPTIONS}
           currentLocale={profileStore.currentLocale}
@@ -115,7 +117,23 @@ export default class GeneralSettingsPage extends Component<StoresAndActionsProps
           lastUpdatedTimestamp={coinPriceStore.lastUpdateTimestamp}
         />
         <ThemeSettingsBlock />
-        <AboutYoroiSettingsBlock wallet={this.props.stores.wallets.selected} />
+        <AboutYoroiSettingsBlock
+          wallet={stores.wallets.selected}
+          onSwitchNetwork={() =>
+            actions.dialogs.open.trigger({
+              dialog: SwitchNetworkDialogContainer,
+            })
+          }
+        />
+        {/* pop up dialogs */}
+        {
+          stores.uiDialogs.isOpen(SwitchNetworkDialogContainer) && (
+            <SwitchNetworkDialogContainer
+              actions={actions}
+              stores={stores}
+            />
+          )
+        }
       </Box>
     );
   }
diff --git a/packages/yoroi-extension/app/containers/settings/categories/SwitchNetworkDialogContainer.js b/packages/yoroi-extension/app/containers/settings/categories/SwitchNetworkDialogContainer.js
new file mode 100644
index 0000000000..3f1a3211fe
--- /dev/null
+++ b/packages/yoroi-extension/app/containers/settings/categories/SwitchNetworkDialogContainer.js
@@ -0,0 +1,47 @@
+// @flow
+import type { Node } from 'react';
+import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
+import type { StoresAndActionsProps } from '../../../types/injectedProps.types';
+import { Component } from 'react';
+import { action, observable } from 'mobx';
+import { observer } from 'mobx-react';
+import SwitchNetworkDialog from '../../../components/wallet/settings/SwitchNetworkDialog';
+import { networks } from '../../../api/ada/lib/storage/database/prepackaged/networks';
+import globalMessages from '../../../i18n/global-messages';
+
+type Props = {|
+  ...StoresAndActionsProps,
+|};
+
+const networkNames = Object.freeze({
+  CardanoMainnet: globalMessages.mainnet,
+  CardanoPreprodTestnet: globalMessages.preprod,
+  CardanoPreviewTestnet: globalMessages.preview,
+  CardanoSanchoTestnet: globalMessages.sancho,
+});
+// type assertion to ensure we have all names:
+(networks: {| [$Keys<typeof networkNames>]: any |});
+
+@observer
+export default class SwitchNetworkDialogContainer extends Component<Props> {
+  componentWillUnmount() {
+  }
+
+  render(): Node {
+    return (
+      <SwitchNetworkDialog
+        onCancel={() => {
+          this.props.actions.dialogs.closeActiveDialog.trigger();
+        }}
+        onApply={(networkId) => {
+          console.log('>>>', networkId);
+        }}
+        networks={Object.keys(networks).map(network => ({
+          id: networks[network].NetworkId,
+          name: networkNames[network],
+        }))}
+        currentNetworkId={0}
+      />
+    );
+  }
+}
diff --git a/packages/yoroi-extension/app/i18n/global-messages.js b/packages/yoroi-extension/app/i18n/global-messages.js
index 9e59660816..00c9e57733 100644
--- a/packages/yoroi-extension/app/i18n/global-messages.js
+++ b/packages/yoroi-extension/app/i18n/global-messages.js
@@ -1008,6 +1008,22 @@ const globalMessages: * = defineMessages({
     id: 'buysell.dialog.provider',
     defaultMessage: '!!!Provider',
   },
+  mainnet: {
+    id: 'networkName.mainnet',
+    defaultMessage: '!!!Mainnet',
+  },
+  preprod: {
+    id: 'networkName.preprod',
+    defaultMessage: '!!!Preproduction testnet',
+  },
+  preview: {
+    id: 'networkName.preview',
+    defaultMessage: '!!!Preview testnet',
+  },
+  sancho: {
+    id: 'networkName.sancho',
+    defaultMessage: '!!!Sancho testnet',
+  },
 });
 export default globalMessages;
 

From e0bdd5edf93f90ddf33565df9df9dac1bb89afef Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Tue, 10 Dec 2024 19:29:32 +0800
Subject: [PATCH 092/143] change not current cashback wallet warning dialog
 text

---
 .../app/containers/cashback/CashbackPage.js         |  7 +++----
 .../yoroi-extension/app/i18n/locales/en-US.json     | 13 +++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index d3bb061524..375fcdca40 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -78,7 +78,7 @@ const messages = defineMessages({
   },
   chooseTitle: {
     id: 'cashback.not.current.warning.title.choose',
-    defaultMessage: '!!!choose cashback wallet',
+    defaultMessage: '!!!wrong wallet',
   },
   setThis: {
     id: 'cashback.not.current.warning.button.set.this',
@@ -94,7 +94,7 @@ const messages = defineMessages({
   },
   chooseText2: {
     id: 'cashback.not.current.warning.text.choose.2',
-    defaultMessage: '!!!Would you like to set this wallet as your cashback wallet?',
+    defaultMessage: '!!!Switch wallet to access your rewards or set this wallet as your cashback wallet.',
   },
   setCurrentTitle: {
     id: 'cashback.not.current.warning.title.set.current',
@@ -110,7 +110,7 @@ const messages = defineMessages({
   },
   switchText: {
     id: 'cashback.not.current.warning.text.switch',
-    defaultMessage: '!!!To claim your ADA cashback, either switch to your Cashback Wallet or choose your current wallet as your new Cashback Wallet.'
+    defaultMessage: '!!!You will no longer be able to claim rewards linked to your previous cashback wallet until you link it again.'
   },
 });
 
@@ -278,7 +278,6 @@ const CashbackPageContainer = observer((props: AllProps) => {
 
   const signMessage = useCallback(async (msg: string, pwd: string) => {
     const { address, addressing } = wallet.externalAddressesByType[CoreAddressTypes.CARDANO_BASE][0];
-    console.log('BRING', { msg });
 
     try {
       let res;
diff --git a/packages/yoroi-extension/app/i18n/locales/en-US.json b/packages/yoroi-extension/app/i18n/locales/en-US.json
index ac857ea9f3..e4ac125fe3 100644
--- a/packages/yoroi-extension/app/i18n/locales/en-US.json
+++ b/packages/yoroi-extension/app/i18n/locales/en-US.json
@@ -72,6 +72,19 @@
   "cashback.disclaimer.note.2": "2. Transactions may be subject to restrictions based on your geographic location, applicable laws, financial institution policies, or the service provider's limitations.",
   "cashback.disclaimer.note.3": "3. Ensure you review and understand the third party's terms, as your interactions are solely governed by their agreements.",
   "cashback.disclaimer.note.4": "4. Yoroi Wallet does not collect or store any personal or financial data submitted through the third-party platform.",
+  "cashback.not.current.warning.button.no": "no",
+  "cashback.not.current.warning.button.set.this": "set this wallet",
+  "cashback.not.current.warning.button.switch": "switch wallet",
+  "cashback.not.current.warning.button.yes": "yes",
+  "cashback.not.current.warning.current": "Current rewards wallet",
+  "cashback.not.current.warning.keep": "keep current wallet",
+  "cashback.not.current.warning.text": "Your cashback rewards are currently linked to another wallet. To claim your ADA cashback, either switch to the wallet connected to Bring or change the rewards wallet to the one you're using now. You can always access settings at anytime to change your cashback wallet and make claiming rewards relevant for you.",
+  "cashback.not.current.warning.text.choose.1": "Your cashback rewards are currently linked to another wallet.",
+  "cashback.not.current.warning.text.choose.2": "Would you like to set this wallet as your cashback wallet?",
+  "cashback.not.current.warning.text.switch": "To claim your ADA cashback, either switch to your Cashback Wallet or choose your current wallet as your new Cashback Wallet.",
+  "cashback.not.current.warning.title": "WARNING",
+  "cashback.not.current.warning.title.choose": "choose cashback wallet",
+  "cashback.not.current.warning.title.set.current": "Set my Current Wallet as my Cashback Wallet",
   "cashback.not.current.warning.current": "Current rewards wallet",
   "cashback.not.current.warning.keep": "keep current wallet",
   "cashback.not.current.warning.text": "Your cashback rewards are currently linked to another wallet. To claim your ADA cashback, either switch to the wallet connected to Bring or change the rewards wallet to the one you're using now. You can always access settings at anytime to change your cashback wallet and make claiming rewards relevant for you.",

From b211d939205dc3ac2cc92d034514cdc48ad5dfb1 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Tue, 10 Dec 2024 19:44:38 +0800
Subject: [PATCH 093/143] fix messages

---
 packages/yoroi-extension/app/i18n/locales/en-US.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/yoroi-extension/app/i18n/locales/en-US.json b/packages/yoroi-extension/app/i18n/locales/en-US.json
index e4ac125fe3..268618a257 100644
--- a/packages/yoroi-extension/app/i18n/locales/en-US.json
+++ b/packages/yoroi-extension/app/i18n/locales/en-US.json
@@ -80,10 +80,10 @@
   "cashback.not.current.warning.keep": "keep current wallet",
   "cashback.not.current.warning.text": "Your cashback rewards are currently linked to another wallet. To claim your ADA cashback, either switch to the wallet connected to Bring or change the rewards wallet to the one you're using now. You can always access settings at anytime to change your cashback wallet and make claiming rewards relevant for you.",
   "cashback.not.current.warning.text.choose.1": "Your cashback rewards are currently linked to another wallet.",
-  "cashback.not.current.warning.text.choose.2": "Would you like to set this wallet as your cashback wallet?",
-  "cashback.not.current.warning.text.switch": "To claim your ADA cashback, either switch to your Cashback Wallet or choose your current wallet as your new Cashback Wallet.",
+  "cashback.not.current.warning.text.choose.2": "Switch wallet to access your rewards or set this wallet as your cashback wallet.",
+  "cashback.not.current.warning.text.switch": "You will no longer be able to claim rewards linked to your previous cashback wallet until you link it again.",
   "cashback.not.current.warning.title": "WARNING",
-  "cashback.not.current.warning.title.choose": "choose cashback wallet",
+  "cashback.not.current.warning.title.choose": "wrong wallet",
   "cashback.not.current.warning.title.set.current": "Set my Current Wallet as my Cashback Wallet",
   "cashback.not.current.warning.current": "Current rewards wallet",
   "cashback.not.current.warning.keep": "keep current wallet",

From 5e60e55323f3786f38c3140222445ed6db035197 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Tue, 10 Dec 2024 19:50:54 +0800
Subject: [PATCH 094/143] fix

---
 packages/yoroi-extension/app/stores/toplevel/WalletStore.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
index 58c39f0510..9a25c54dc7 100644
--- a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
@@ -454,8 +454,8 @@ export default class WalletStore extends Store<StoresMap, ActionsMap> {
   }
 
   setCashbackWallet(id: number): void {
-    this.getCashbackWalletRequest.patch(() => this.wallets.find(w => w.publicDeriverId === id));
     setCashbackWallet(id);
+    this.getCashbackWalletRequest.patch(() => this.wallets.find(w => w.publicDeriverId === id));
   }
 }
 

From 70fbc5dcbb998940084633280ab035f59041fd42 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Tue, 10 Dec 2024 20:34:08 +0800
Subject: [PATCH 095/143] fix

---
 .../yoroi-extension/app/containers/cashback/CashbackPage.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index 375fcdca40..05e7d2b7c5 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -392,7 +392,7 @@ useEffect(() => {
 const [shownCashbackWallet, setShownCashbackWallet] = useState(null);
 
 useEffect(() => {
-  stores.wallets.getCashbackWallet().then((currentCashbackWallet) => {
+  stores.wallets.getCashbackWalletRequest.execute().then((currentCashbackWallet) => {
     if (currentCashbackWallet && currentCashbackWallet !== stores.wallets.selected) {
       setShownCashbackWallet(currentCashbackWallet);
       setPopup(true);

From a7bde282fadd26b06b2f37783b5e43a4e2df0d45 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Tue, 10 Dec 2024 23:05:18 +0800
Subject: [PATCH 096/143] fix flow

---
 .../general-setting/BringCashbackSettings.js        | 13 ++++++-------
 .../app/containers/cashback/CashbackPage.js         |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js b/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
index 3b4eb76e19..4017d723c9 100644
--- a/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
+++ b/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
@@ -44,16 +44,15 @@ type Props = {|
   +cardanoWallets: Array<{ publicDeriverId: number, name: string, plate: WalletChecksum, isTestnet: boolean, ... }>,
   +currentValue: ?number,
   +error?: ?LocalizableError,
-  +isUseSandbox?: boolean,
-  +onSetUseSandbox?: ?((boolean) => *),
+  +isUseSandbox: ?boolean,
+  +onSetUseSandbox: null | (boolean) => *,
 |};
 
 @observer
 class BringCashbackSettings extends Component<Props & InjectedLayoutProps> {
-  static defaultProps: {| error: void |} = {
+  static defaultProps = {
     error: undefined,
     isUseSandbox: false,
-    onSetUseSandbox: null,
   };
 
   static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
@@ -69,7 +68,7 @@ class BringCashbackSettings extends Component<Props & InjectedLayoutProps> {
   });
 
   render(): Node {
-    const { cardanoWallets, error, currentValue } = this.props;
+    const { cardanoWallets, error, currentValue, onSetUseSandbox } = this.props;
     const { intl } = this.context;
     const { form } = this;
     const cashbackWalletId = form.$('cashbackWalletId');
@@ -160,14 +159,14 @@ class BringCashbackSettings extends Component<Props & InjectedLayoutProps> {
             <FormattedHTMLMessage {...messages.note} />
           </Typography>
         </Box>
-        {this.props.onSetUseSandbox != null ? (
+        {onSetUseSandbox != null ? (
           <FormControlLabel
             label="Use Sandbox Backend"
             control={
               <Box ml="8px">
                 <RevampSwitch
                   checked={this.props.isUseSandbox ?? false}
-                  onChange={event => this.props.onSetUseSandbox(event.target.checked)}
+                  onChange={event => onSetUseSandbox(event.target.checked)}
                 />
               </Box>
             }
diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index 05e7d2b7c5..8ec0f6c554 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -37,7 +37,7 @@ import { forceNonNull } from '../../coreUtils';
 import { constructPlate32 } from '../../components/topbar/WalletCard';
 import LocalStorageApi from '../../api/localStorage';
 import DisclaimerDialog from '../../components/widgets/DisclaimerDialog';
-import type { BringConfigType } from '../../../config/config-types';
+import type { BringConfigType, ConfigType } from '../../../config/config-types';
 
 const messages = defineMessages({
   claim: {

From d89b9fdbae86655564b40da63f13f36911ec6885 Mon Sep 17 00:00:00 2001
From: vantuz-subhuman <vantuz-subhuman@yandex.ru>
Date: Wed, 11 Dec 2024 18:40:18 +0300
Subject: [PATCH 097/143] Version bump: 5.4.512 (nightly)

---
 packages/yoroi-extension/package-lock.json | 4 ++--
 packages/yoroi-extension/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index 57eaf5f1ec..caff32fdd3 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "yoroi",
-  "version": "5.4.511",
+  "version": "5.4.512",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "yoroi",
-      "version": "5.4.511",
+      "version": "5.4.512",
       "license": "MIT",
       "dependencies": {
         "@amplitude/analytics-browser": "^2.1.3",
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
index 5e00328ae7..b106d4217b 100644
--- a/packages/yoroi-extension/package.json
+++ b/packages/yoroi-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yoroi",
-  "version": "5.4.511",
+  "version": "5.4.512",
   "description": "Cardano ADA wallet",
   "scripts": {
     "dev-mv2": "rimraf dev/ && NODE_OPTIONS=--openssl-legacy-provider babel-node scripts-mv2/build --type=debug --env 'mainnet'",

From 861ad38837915f08e84e2f524076138c6bebe21d Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Thu, 12 Dec 2024 00:37:16 +0800
Subject: [PATCH 098/143] bug fix - should return base address to bring

---
 .../chrome/extension/background/handlers/content/bring.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
index e0d4345bc5..d1a685da08 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
@@ -41,7 +41,7 @@ const handlers = Object.freeze({
     if (!publicDeriver) {
       return { ok: undefined };
     }
-    const result = (await getAllAddressesForWallet(publicDeriver)).accountingAddresses[0];
+    const result = (await getAllAddressesForWallet(publicDeriver)).utxoAddresses[0];
     return { ok: result.address.Hash };
   },
 

From 873e59b5babdc30d45fe419ad335937ab1c0465c Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Thu, 12 Dec 2024 03:05:27 +0800
Subject: [PATCH 099/143] bug fix

---
 .../extension/background/handlers/content/bring.js     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
index d1a685da08..50ac061e73 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
@@ -1,12 +1,13 @@
 // @flow
 import LocalStorageApi from '../../../../../app/api/localStorage';
 import { isTrezorTWallet } from '../../../../../app/api/ada/lib/storage/models/ConceptualWallet/index';
-import { getAllAddressesForWallet } from '../../../../../app/api/ada/lib/storage/bridge/traitUtils';
+import { getAllAddressesForDisplay } from '../../../../../app/api/ada/lib/storage/bridge/traitUtils';
 import { PublicDeriver, } from '../../../../../app/api/ada/lib/storage/models/PublicDeriver/index';
 import { getDb } from '../../state';
 import { loadWalletsFromStorage } from '../../../../../app/api/ada/lib/storage/models/load';
 import { notifyAllTabsCashbackWalletChange } from '../yoroi/utils';
 import { getBoundsForTabWindow, popupProps, sendToInjector } from './utils';
+import { CoreAddressTypes } from '../../../../../app/api/ada/lib/storage/database/primitives/enums';
 
 declare var chrome;
 
@@ -41,8 +42,9 @@ const handlers = Object.freeze({
     if (!publicDeriver) {
       return { ok: undefined };
     }
-    const result = (await getAllAddressesForWallet(publicDeriver)).utxoAddresses[0];
-    return { ok: result.address.Hash };
+    const { address } = (await getAllAddressesForDisplay({ publicDeriver, type: CoreAddressTypes.CARDANO_BASE }))[0];
+    const s: string = address;
+    return { ok: address };
   },
 
   'get-wallets': async () => {
@@ -53,7 +55,7 @@ const handlers = Object.freeze({
       if (!isTrezorTWallet(publicDeriver.getParent())) {
         result.push({
           id: publicDeriver.getPublicDeriverId(),
-          address: (await getAllAddressesForWallet(publicDeriver)).accountingAddresses[0].address.Hash,
+          address: (await getAllAddressesForDisplay({ publicDeriver, type: CoreAddressTypes.CARDANO_BASE }))[0].address,
           name: (await publicDeriver.getParent().getFullConceptualWalletInfo()).Name
         });
       }

From 6c961d0ec2296d931318ed5c6fddb8970ee2973a Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Thu, 12 Dec 2024 00:34:29 +0800
Subject: [PATCH 100/143] implement network switch

---
 .../app/api/localStorage/index.js             | 13 ++++++++++++
 packages/yoroi-extension/app/api/thunk.js     |  4 ++--
 .../wallet/settings/SwitchNetworkDialog.js    |  2 +-
 .../app/connector/stores/ConnectorStore.js    |  5 ++++-
 .../SwitchNetworkDialogContainer.js           | 14 +++++++------
 .../app/stores/base/BaseProfileStore.js       | 10 +++++++++
 .../app/stores/toplevel/WalletStore.js        | 21 +++++++++++++++++--
 .../extension/background/handlers/utils.js    |  4 ++--
 .../background/handlers/yoroi/wallet.js       |  4 ++--
 9 files changed, 61 insertions(+), 16 deletions(-)

diff --git a/packages/yoroi-extension/app/api/localStorage/index.js b/packages/yoroi-extension/app/api/localStorage/index.js
index 0b27f0a342..39847cb9b8 100644
--- a/packages/yoroi-extension/app/api/localStorage/index.js
+++ b/packages/yoroi-extension/app/api/localStorage/index.js
@@ -33,6 +33,7 @@ const storageKeys = {
   FLAGS: networkForLocalStorage + '-FLAGS',
   USER_THEME: networkForLocalStorage + '-USER-THEME',
   PORTFOLIO_FIAT_PAIR: networkForLocalStorage + '-PORTFOLIO_FIAT_PAIR',
+  CURRENT_NETWORK_ID: networkForLocalStorage + '-CURRENT_NETWORK_ID',
   // ========== CONNECTOR   ========== //
   DAPP_CONNECTOR_WHITELIST: 'connector_whitelist',
   SELECTED_WALLET: 'SELECTED_WALLET',
@@ -343,6 +344,18 @@ export default class LocalStorageApi {
 
   unsetIsAnalyticsAllowed: void => Promise<void> = () => removeLocalItem(storageKeys.IS_ANALYTICS_ALLOWED);
 
+  loadCurrentNetworkId: () => Promise<?number> = async () => {
+    const raw = await getLocalItem(storageKeys.CURRENT_NETWORK_ID);
+    if (raw == null) {
+      return undefined;
+    }
+    return Number(raw);
+  }
+
+  saveCurrentNetworkId: (number) => Promise<void> = async (networkId) => {
+    await setLocalItem(storageKeys.CURRENT_NETWORK_ID, String(networkId));
+  }
+
   async reset(): Promise<void> {
     await this.unsetUserLocale();
     await this.unsetComplexityLevel();
diff --git a/packages/yoroi-extension/app/api/thunk.js b/packages/yoroi-extension/app/api/thunk.js
index 03cf3302b0..d027a64477 100644
--- a/packages/yoroi-extension/app/api/thunk.js
+++ b/packages/yoroi-extension/app/api/thunk.js
@@ -154,8 +154,8 @@ function patchWalletState(walletState: Object): WalletState {
   return walletState;
 }
 
-export async function getWallets(walletId?: number): Promise<Array<WalletState>> {
-  const resp = await callBackground({ type: GetWallets.typeTag, request: { walletId } });
+export async function getWallets(networkId: number): Promise<Array<WalletState>> {
+  const resp = await callBackground({ type: GetWallets.typeTag, request: { networkId } });
   if (resp.error) {
     console.error('error when loading wallets:', resp.error);
     throw new Error(`error when loading wallets: ${resp.error}`);
diff --git a/packages/yoroi-extension/app/components/wallet/settings/SwitchNetworkDialog.js b/packages/yoroi-extension/app/components/wallet/settings/SwitchNetworkDialog.js
index 907e2ee676..5c46a0b128 100644
--- a/packages/yoroi-extension/app/components/wallet/settings/SwitchNetworkDialog.js
+++ b/packages/yoroi-extension/app/components/wallet/settings/SwitchNetworkDialog.js
@@ -44,7 +44,7 @@ type Props = {|
     id: number,
     name: $npm$ReactIntl$MessageDescriptor,
   |}>,
-  +onApply: (number) => void,
+  +onApply: (number) => Promise<void>,
   +currentNetworkId: number,
 |};
 
diff --git a/packages/yoroi-extension/app/connector/stores/ConnectorStore.js b/packages/yoroi-extension/app/connector/stores/ConnectorStore.js
index 5c7b730e80..aac49b371f 100644
--- a/packages/yoroi-extension/app/connector/stores/ConnectorStore.js
+++ b/packages/yoroi-extension/app/connector/stores/ConnectorStore.js
@@ -29,6 +29,7 @@ import {
   getCardanoHaskellBaseConfig,
   getNetworkById,
   isCardanoHaskell,
+  networks,
 } from '../../api/ada/lib/storage/database/prepackaged/networks';
 import { MultiToken } from '../../api/common/lib/MultiToken';
 import { RustModule } from '../../api/ada/lib/cardanoCrypto/rustLoader';
@@ -385,7 +386,9 @@ export default class ConnectorStore extends Store<StoresMap, ActionsMap> {
     });
 
     try {
-      const wallets = await getWallets();
+      const wallets = await getWallets(
+        this.stores.profile.currentNetworkId ?? networks.CardanoMainnet.NetworkId
+      );
 
       runInAction(() => {
         this.loadingWallets = LoadingWalletStates.SUCCESS;
diff --git a/packages/yoroi-extension/app/containers/settings/categories/SwitchNetworkDialogContainer.js b/packages/yoroi-extension/app/containers/settings/categories/SwitchNetworkDialogContainer.js
index 3f1a3211fe..b380f79c26 100644
--- a/packages/yoroi-extension/app/containers/settings/categories/SwitchNetworkDialogContainer.js
+++ b/packages/yoroi-extension/app/containers/settings/categories/SwitchNetworkDialogContainer.js
@@ -24,23 +24,25 @@ const networkNames = Object.freeze({
 
 @observer
 export default class SwitchNetworkDialogContainer extends Component<Props> {
-  componentWillUnmount() {
-  }
-
   render(): Node {
+    const walletStore = this.props.stores.wallets;
+
     return (
       <SwitchNetworkDialog
         onCancel={() => {
           this.props.actions.dialogs.closeActiveDialog.trigger();
         }}
-        onApply={(networkId) => {
-          console.log('>>>', networkId);
+        onApply={async (networkId) => {
+          if (networkId !== walletStore.getCurrentNetworkId()) {
+            await walletStore.setCurrentNetworkId(networkId);
+            window.location.reload();
+          }
         }}
         networks={Object.keys(networks).map(network => ({
           id: networks[network].NetworkId,
           name: networkNames[network],
         }))}
-        currentNetworkId={0}
+        currentNetworkId={walletStore.getCurrentNetworkId()}
       />
     );
   }
diff --git a/packages/yoroi-extension/app/stores/base/BaseProfileStore.js b/packages/yoroi-extension/app/stores/base/BaseProfileStore.js
index 5284176e1c..aea403761a 100644
--- a/packages/yoroi-extension/app/stores/base/BaseProfileStore.js
+++ b/packages/yoroi-extension/app/stores/base/BaseProfileStore.js
@@ -148,6 +148,8 @@ export default class BaseProfileStore
 
   @observable _acceptedTosVersion: {| version: ?number |} = { version: undefined };
 
+  currentNetworkId: ?number = undefined;
+
   setup(): void {
     super.setup();
     this.actions.profile.updateLocale.listen(this._updateLocale);
@@ -175,6 +177,14 @@ export default class BaseProfileStore
       this._loadWhetherAnalyticsAllowed(),
       'load-analytics-flag',
     );
+    this.stores.loading.registerBlockingLoadingRequest(
+      this._loadCurrentNetworkId(),
+      'load-current-network-id',
+    );
+  }
+
+  _loadCurrentNetworkId: () => Promise<void> = async () => {
+    this.currentNetworkId = await this.api.localStorage.loadCurrentNetworkId();
   }
 
   _loadWhetherAnalyticsAllowed: () => Promise<void> = async () => {
diff --git a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
index f9f987564f..12bdd5146b 100644
--- a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
@@ -14,7 +14,11 @@ import { createDebugWalletDialog } from '../../containers/wallet/dialogs/DebugWa
 import { createProblematicWalletDialog } from '../../containers/wallet/dialogs/ProblematicWalletDialogContainer';
 import type { ActionsMap } from '../../actions/index';
 import type { StoresMap } from '../index';
-import { getNetworkById, getCardanoHaskellBaseConfig } from '../../api/ada/lib/storage/database/prepackaged/networks';
+import {
+  getNetworkById,
+  getCardanoHaskellBaseConfig,
+  networks,
+} from '../../api/ada/lib/storage/database/prepackaged/networks';
 import type { WalletState } from '../../../chrome/extension/background/types';
 import { getWallets, subscribe, listenForWalletStateUpdate } from '../../api/thunk';
 import { FlagsApi } from '@emurgo/yoroi-lib/dist/flags';
@@ -231,7 +235,7 @@ export default class WalletStore extends Store<StoresMap, ActionsMap> {
 
   /** Make all API calls required to setup/update wallet */
   @action restoreWalletsFromStorage: void => Promise<void> = async () => {
-    const result = await this.getInitialWallets.execute().promise;
+    const result = await this.getInitialWallets.execute(this.getCurrentNetworkId()).promise;
     if (result == null || result.length === 0) return;
 
     for (const publicDeriver of result) {
@@ -431,6 +435,19 @@ export default class WalletStore extends Store<StoresMap, ActionsMap> {
       submittedTxs,
     );
   }
+
+  getCurrentNetworkId(): number {
+    const { currentNetworkId } = this.stores.profile;
+    if (currentNetworkId == null) {
+      return networks.CardanoMainnet.NetworkId;
+    }
+    return currentNetworkId;
+  }
+
+  async setCurrentNetworkId(id: number): Promise<void> {
+    this.stores.profile.currentNetworkId = id;
+    await this.api.localStorage.saveCurrentNetworkId(id);
+  }
 }
 
 export const WalletCreationNotifications: {| [key: string]: Notification |} = {
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/utils.js b/packages/yoroi-extension/chrome/extension/background/handlers/utils.js
index b8567ee78e..3adbd98a08 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/utils.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/utils.js
@@ -41,7 +41,7 @@ import { loadWalletsFromStorage } from '../../../../app/api/ada/lib/storage/mode
 import { getProtocolParameters } from './yoroi/protocolParameters';
 import AdaApi from '../../../../app/api/ada';
 
-export async function getWalletsState(publicDeriverId: ?number, targetNetworkId?: number): Promise<Array<WalletState>> {
+export async function getWalletsState(publicDeriverId: ?number, targetNetworkId: ?number): Promise<Array<WalletState>> {
   const db = await getDb();
   let publicDerivers = await loadWalletsFromStorage(db);
   if (publicDeriverId != null) {
@@ -53,7 +53,7 @@ export async function getWalletsState(publicDeriverId: ?number, targetNetworkId?
   }
 
   let publicDeriversOfNetwork;
-  if (publicDeriverId == null && targetNetworkId !== undefined) {
+  if (publicDeriverId == null && targetNetworkId != null) {
     publicDeriversOfNetwork = [];
     // group wallets by staking key
     const publicDeriversByPublicKey = new Map<string, Array<PublicDeriver<>>>;
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js
index e0f0fa1d31..92445adf6f 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js
@@ -168,13 +168,13 @@ export const RenameConceptualWallet: HandlerType<
 });
 
 export const GetWallets: HandlerType<
-  {| walletId: ?number |},
+  {| networkId: number |},
   Array<WalletState>,
 > = Object.freeze({
   typeTag: 'get-wallets',
 
   handle: async (request) => {
-    return await getWalletsState(request.walletId);
+    return await getWalletsState(undefined, request.networkId);
   },
 });
 

From fcd9898144d1ef50813c4e3bee6af0f5989b9fce Mon Sep 17 00:00:00 2001
From: kalfada <kalfada3321@gmail.com>
Date: Thu, 12 Dec 2024 16:31:20 +0200
Subject: [PATCH 101/143] fix: update bring npm package

---
 packages/yoroi-extension/package-lock.json | 8 ++++----
 packages/yoroi-extension/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index caff32fdd3..fe5cba6a76 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@amplitude/analytics-browser": "^2.1.3",
         "@babel/preset-typescript": "^7.24.7",
-        "@bringweb3/chrome-extension-kit": "^1.2.4",
+        "@bringweb3/chrome-extension-kit": "^1.2.6",
         "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
         "@emotion/react": "^11.4.1",
         "@emotion/styled": "^11.3.0",
@@ -2139,9 +2139,9 @@
       "dev": true
     },
     "node_modules/@bringweb3/chrome-extension-kit": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@bringweb3/chrome-extension-kit/-/chrome-extension-kit-1.2.4.tgz",
-      "integrity": "sha512-m0zBixNx+YWxtLZ4KX7NNhM+BeQC4RJEPuHISUfiRyyQw4KT5+F3cmXcJWOu0cDHT4KcLwfshPPFfEaI1Ewvgg=="
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@bringweb3/chrome-extension-kit/-/chrome-extension-kit-1.2.6.tgz",
+      "integrity": "sha512-X/i3xk9IoE1+6bD/EkjccYEPbi3Zmvkt7QGwTVA/RYJeky2NotCM/A4+LQvxq6G40xq/oQSl45Elgg/c0jDFfw=="
     },
     "node_modules/@cardano-foundation/ledgerjs-hw-app-cardano": {
       "version": "7.1.3",
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
index b106d4217b..585cd4dc5e 100644
--- a/packages/yoroi-extension/package.json
+++ b/packages/yoroi-extension/package.json
@@ -150,7 +150,7 @@
   "dependencies": {
     "@amplitude/analytics-browser": "^2.1.3",
     "@babel/preset-typescript": "^7.24.7",
-    "@bringweb3/chrome-extension-kit": "^1.2.4",
+    "@bringweb3/chrome-extension-kit": "^1.2.6",
     "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",

From d5c391c92c22bb67643796423dd43e5c82ac86e2 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Thu, 12 Dec 2024 23:52:52 +0800
Subject: [PATCH 102/143] refactor - move some methods

---
 .../SwitchNetworkDialogContainer.js           |  8 +++----
 .../app/stores/base/BaseProfileStore.js       | 19 +++++++++++++++
 .../app/stores/toplevel/WalletStore.js        | 23 ++++---------------
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/packages/yoroi-extension/app/containers/settings/categories/SwitchNetworkDialogContainer.js b/packages/yoroi-extension/app/containers/settings/categories/SwitchNetworkDialogContainer.js
index b380f79c26..3a4f30df1c 100644
--- a/packages/yoroi-extension/app/containers/settings/categories/SwitchNetworkDialogContainer.js
+++ b/packages/yoroi-extension/app/containers/settings/categories/SwitchNetworkDialogContainer.js
@@ -25,7 +25,7 @@ const networkNames = Object.freeze({
 @observer
 export default class SwitchNetworkDialogContainer extends Component<Props> {
   render(): Node {
-    const walletStore = this.props.stores.wallets;
+    const profileStore = this.props.stores.profile;
 
     return (
       <SwitchNetworkDialog
@@ -33,8 +33,8 @@ export default class SwitchNetworkDialogContainer extends Component<Props> {
           this.props.actions.dialogs.closeActiveDialog.trigger();
         }}
         onApply={async (networkId) => {
-          if (networkId !== walletStore.getCurrentNetworkId()) {
-            await walletStore.setCurrentNetworkId(networkId);
+          if (networkId !== profileStore.getCurrentNetworkId()) {
+            await profileStore.setCurrentNetworkId(networkId);
             window.location.reload();
           }
         }}
@@ -42,7 +42,7 @@ export default class SwitchNetworkDialogContainer extends Component<Props> {
           id: networks[network].NetworkId,
           name: networkNames[network],
         }))}
-        currentNetworkId={walletStore.getCurrentNetworkId()}
+        currentNetworkId={profileStore.getCurrentNetworkId()}
       />
     );
   }
diff --git a/packages/yoroi-extension/app/stores/base/BaseProfileStore.js b/packages/yoroi-extension/app/stores/base/BaseProfileStore.js
index aea403761a..692b570e18 100644
--- a/packages/yoroi-extension/app/stores/base/BaseProfileStore.js
+++ b/packages/yoroi-extension/app/stores/base/BaseProfileStore.js
@@ -19,6 +19,8 @@ import { noop } from '../../coreUtils';
 import type { Theme } from '../../styles/themes';
 import { THEMES } from '../../styles/themes';
 import { refreshCurrentCoinPrice } from '../../api/thunk';
+import type { NetworkRow } from '../../api/ada/lib/storage/database/primitives/tables';
+import { getNetworkById, networks } from '../../api/ada/lib/storage/database/prepackaged/networks';
 
 interface LoadingStore {
   +registerBlockingLoadingRequest: (promise: Promise<void>, name: string) => void
@@ -183,10 +185,27 @@ export default class BaseProfileStore
     );
   }
 
+  getCurrentNetworkId(): number {
+    const { currentNetworkId } = this;
+    if (currentNetworkId == null) {
+      return networks.CardanoMainnet.NetworkId;
+    }
+    return currentNetworkId;
+  }
+
+  async setCurrentNetworkId(id: number): Promise<void> {
+    this.currentNetworkId = id;
+    await this.api.localStorage.saveCurrentNetworkId(id);
+  }
+
   _loadCurrentNetworkId: () => Promise<void> = async () => {
     this.currentNetworkId = await this.api.localStorage.loadCurrentNetworkId();
   }
 
+  get selectedNetwork(): $ReadOnly<NetworkRow> {
+    return getNetworkById(this.getCurrentNetworkId());
+  }
+
   _loadWhetherAnalyticsAllowed: () => Promise<void> = async () => {
     const isAnalyticsAllowed = await this.getIsAnalyticsAllowed.execute();
     const AMPLI_FLUSH_INTERVAL_MS = 5000;
diff --git a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
index 12bdd5146b..de02b87924 100644
--- a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
@@ -14,11 +14,7 @@ import { createDebugWalletDialog } from '../../containers/wallet/dialogs/DebugWa
 import { createProblematicWalletDialog } from '../../containers/wallet/dialogs/ProblematicWalletDialogContainer';
 import type { ActionsMap } from '../../actions/index';
 import type { StoresMap } from '../index';
-import {
-  getNetworkById,
-  getCardanoHaskellBaseConfig,
-  networks,
-} from '../../api/ada/lib/storage/database/prepackaged/networks';
+import { getNetworkById, getCardanoHaskellBaseConfig } from '../../api/ada/lib/storage/database/prepackaged/networks';
 import type { WalletState } from '../../../chrome/extension/background/types';
 import { getWallets, subscribe, listenForWalletStateUpdate } from '../../api/thunk';
 import { FlagsApi } from '@emurgo/yoroi-lib/dist/flags';
@@ -235,7 +231,9 @@ export default class WalletStore extends Store<StoresMap, ActionsMap> {
 
   /** Make all API calls required to setup/update wallet */
   @action restoreWalletsFromStorage: void => Promise<void> = async () => {
-    const result = await this.getInitialWallets.execute(this.getCurrentNetworkId()).promise;
+    const result = await this.getInitialWallets.execute(
+      this.stores.profile.getCurrentNetworkId()
+    ).promise;
     if (result == null || result.length === 0) return;
 
     for (const publicDeriver of result) {
@@ -435,19 +433,6 @@ export default class WalletStore extends Store<StoresMap, ActionsMap> {
       submittedTxs,
     );
   }
-
-  getCurrentNetworkId(): number {
-    const { currentNetworkId } = this.stores.profile;
-    if (currentNetworkId == null) {
-      return networks.CardanoMainnet.NetworkId;
-    }
-    return currentNetworkId;
-  }
-
-  async setCurrentNetworkId(id: number): Promise<void> {
-    this.stores.profile.currentNetworkId = id;
-    await this.api.localStorage.saveCurrentNetworkId(id);
-  }
 }
 
 export const WalletCreationNotifications: {| [key: string]: Notification |} = {

From e593421361a7e26645dd2a812bd15867bec559ba Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Thu, 12 Dec 2024 23:54:05 +0800
Subject: [PATCH 103/143] remove the network selection step

---
 .../wallet/create-wallet/CreateWalletPage.js  | 29 ++-----------------
 .../components/wallet/create-wallet/steps.js  |  9 ------
 .../wallet/restore/RestoreWalletPage.js       | 25 ++--------------
 .../app/components/wallet/restore/steps.js    |  7 -----
 .../wallet/CreateWalletPageContainer.js       |  1 -
 .../app/stores/toplevel/ProfileStore.js       | 14 ---------
 6 files changed, 6 insertions(+), 79 deletions(-)

diff --git a/packages/yoroi-extension/app/components/wallet/create-wallet/CreateWalletPage.js b/packages/yoroi-extension/app/components/wallet/create-wallet/CreateWalletPage.js
index 9b4412efd2..e6db7ab597 100644
--- a/packages/yoroi-extension/app/components/wallet/create-wallet/CreateWalletPage.js
+++ b/packages/yoroi-extension/app/components/wallet/create-wallet/CreateWalletPage.js
@@ -5,13 +5,12 @@ import { Box } from '@mui/material';
 import { observer } from 'mobx-react';
 import CreateWalletSteps from './CreateWalletSteps';
 import LearnAboutRecoveryPhrase from './LearnAboutRecoveryPhrase';
-import { CREATE_WALLET_SETPS, getFirstStep, markDialogAsShown } from './steps';
+import { CREATE_WALLET_SETPS, markDialogAsShown } from './steps';
 import SaveRecoveryPhraseStep from './SaveRecoveryPhraseStep';
 import VerifyRecoveryPhraseStep from './VerifyRecoveryPhraseStep';
 import AddWalletDetailsStep from './AddWalletDetailsStep';
 import { networks } from '../../../api/ada/lib/storage/database/prepackaged/networks';
 import CreateWalletPageHeader from './CreateWalletPageHeader';
-import SelectNetworkStep from './SelectNetworkStep';
 import environment from '../../../environment';
 import { ROUTES } from '../../../routes-config';
 import type { NetworkRow } from '../../../api/ada/lib/storage/database/primitives/tables';
@@ -25,7 +24,6 @@ type Props = {|
     recoveryPhrase: Array<string>,
   |}) => void,
   selectedNetwork: $ReadOnly<NetworkRow>,
-  setSelectedNetwork: (params: void | $ReadOnly<NetworkRow>) => void,
   openDialog(dialog: any): void,
   closeDialog(): void,
   isDialogOpen(dialog: any): boolean,
@@ -42,14 +40,13 @@ function CreateWalletPage(props: Props): Node {
   const {
     genWalletRecoveryPhrase,
     createWallet,
-    setSelectedNetwork,
     selectedNetwork,
     isDialogOpen,
     openDialog,
     closeDialog,
     goToRoute,
   } = props;
-  const [currentStep, setCurrentStep] = useState(getFirstStep());
+  const [currentStep, setCurrentStep] = useState(CREATE_WALLET_SETPS.LEARN_ABOUT_RECOVERY_PHRASE);
   const setCurrentStepAndTrack = (step) => {
     setCurrentStep(step);
     if (step === CREATE_WALLET_SETPS.LEARN_ABOUT_RECOVERY_PHRASE) {
@@ -76,20 +73,9 @@ function CreateWalletPage(props: Props): Node {
   };
 
   const steps = {
-    [CREATE_WALLET_SETPS.SELECT_NETWORK]: (
-      <SelectNetworkStep
-        onSelect={network => {
-          setSelectedNetwork(network);
-          setCurrentStepAndTrack(CREATE_WALLET_SETPS.LEARN_ABOUT_RECOVERY_PHRASE);
-        }}
-        goBack={() => goToRoute(ROUTES.WALLETS.ADD)}
-      />
-    ),
     [CREATE_WALLET_SETPS.LEARN_ABOUT_RECOVERY_PHRASE]: (
       <LearnAboutRecoveryPhrase
         nextStep={() => {
-          if (!environment.isDev() && !environment.isNightly())
-            setSelectedNetwork(networks.CardanoMainnet);
           setCurrentStepAndTrack(CREATE_WALLET_SETPS.SAVE_RECOVERY_PHRASE);
           if (recoveryPhrase === null) {
             genWalletRecoveryPhrase()
@@ -101,12 +87,7 @@ function CreateWalletPage(props: Props): Node {
               });
           }
         }}
-        prevStep={() => {
-          if (environment.isProduction()) {
-            return goToRoute(ROUTES.WALLETS.ADD);
-          }
-          setCurrentStep(CREATE_WALLET_SETPS.SELECT_NETWORK);
-        }}
+        prevStep={() => goToRoute(ROUTES.WALLETS.ADD)}
         {...manageDialogsProps}
       />
     ),
@@ -142,9 +123,6 @@ function CreateWalletPage(props: Props): Node {
         prevStep={() => setCurrentStep(CREATE_WALLET_SETPS.VERIFY_RECOVERY_PHRASE)}
         onSubmit={(walletName: string, walletPassword: string) => {
           if (!recoveryPhrase) throw new Error('Recovery phrase must be generated first');
-          if (!environment.isDev() && !environment.isNightly()) {
-            setSelectedNetwork(networks.CardanoMainnet);
-          }
 
           if (!selectedNetwork)
             throw new Error('Network must be selected to create a wallet. Should never happen');
@@ -163,7 +141,6 @@ function CreateWalletPage(props: Props): Node {
   };
 
   const CurrentStep = steps[currentStep];
-  if (currentStep === CREATE_WALLET_SETPS.SELECT_NETWORK) return CurrentStep;
 
   return (
     <Box>
diff --git a/packages/yoroi-extension/app/components/wallet/create-wallet/steps.js b/packages/yoroi-extension/app/components/wallet/create-wallet/steps.js
index 3a9ee15cc2..3e00395a76 100644
--- a/packages/yoroi-extension/app/components/wallet/create-wallet/steps.js
+++ b/packages/yoroi-extension/app/components/wallet/create-wallet/steps.js
@@ -6,7 +6,6 @@ export const CREATE_WALLET_SETPS = Object.freeze({
   SAVE_RECOVERY_PHRASE: 'SAVE_RECOVERY_PHRASE',
   VERIFY_RECOVERY_PHRASE: 'VERIFY_RECOVERY_PHRASE',
   ADD_WALLET_DETAILS: 'ADD_WALLET_DETAILS',
-  SELECT_NETWORK: 'SELECT_NETWORK',
 });
 
 export const TIPS_DIALOGS = Object.freeze({
@@ -16,14 +15,6 @@ export const TIPS_DIALOGS = Object.freeze({
   WALLET_CHECKSUM: 'WALLET_CHECKSUM',
 });
 
-export function getFirstStep(): string {
-  if (environment.isDev() || environment.isNightly()) {
-    return CREATE_WALLET_SETPS.SELECT_NETWORK;
-  }
-
-  return CREATE_WALLET_SETPS.LEARN_ABOUT_RECOVERY_PHRASE;
-}
-
 const asDialogId: string => string = (dialogId: string) => `dialog__${dialogId}`;
 
 export function markDialogAsShown(dialogId: string): void {
diff --git a/packages/yoroi-extension/app/components/wallet/restore/RestoreWalletPage.js b/packages/yoroi-extension/app/components/wallet/restore/RestoreWalletPage.js
index e0c72aa447..2bb5c7d09f 100644
--- a/packages/yoroi-extension/app/components/wallet/restore/RestoreWalletPage.js
+++ b/packages/yoroi-extension/app/components/wallet/restore/RestoreWalletPage.js
@@ -5,7 +5,7 @@ import { useState } from 'react';
 import { defineMessages, injectIntl } from 'react-intl';
 import { Box, Typography, styled } from '@mui/material';
 import { observer } from 'mobx-react';
-import { RESTORE_WALLET_STEPS, getFirstRestorationStep } from './steps';
+import { RESTORE_WALLET_STEPS } from './steps';
 import { ReactComponent as YoroiLogo } from '../../../assets/images/yoroi-logo-shape-blue.inline.svg';
 import SelectWalletTypeStep from './steps/type/SelectWalletTypeStep';
 import Stepper from '../../common/stepper/Stepper';
@@ -14,7 +14,6 @@ import AddWalletDetailsStep from '../create-wallet/AddWalletDetailsStep';
 import { networks } from '../../../api/ada/lib/storage/database/prepackaged/networks';
 import { markDialogAsShown } from '../dialogs/utils';
 import { ROUTES } from '../../../routes-config';
-import SelectNetworkStep from '../create-wallet/SelectNetworkStep';
 import environment from '../../../environment';
 import { useRestoreWallet } from './hooks';
 import { ampli } from '../../../../ampli/index';
@@ -78,7 +77,7 @@ function RestoreWalletPage(props: Props & Intl): Node {
   const { profile, router, wallets: walletsActions } = actions;
   const { walletRestore, profile: profileData, wallets, tokenInfoStore } = stores;
 
-  const [currentStep, setCurrentStep] = useState(getFirstRestorationStep());
+  const [currentStep, setCurrentStep] = useState(RESTORE_WALLET_STEPS.SELECT_WALLET_TYPE);
   const [selectedRestoreMode, setSelectedRestoreMode] = useState<?RestoreModeType>(null);
   const { recoveryPhrase, duplicatedWallet, setRestoreWalletData, resetRestoreWalletData } = useRestoreWallet();
 
@@ -113,20 +112,6 @@ function RestoreWalletPage(props: Props & Intl): Node {
   }
 
   const steps = {
-    [RESTORE_WALLET_STEPS.SELECT_NETWORK]: {
-      stepId: RESTORE_WALLET_STEPS.SELECT_NETWORK,
-      message: messages.firstStep,
-      component: (
-        <SelectNetworkStep
-          onSelect={network => {
-            profile.setSelectedNetwork.trigger(network);
-            setCurrentStep(RESTORE_WALLET_STEPS.SELECT_WALLET_TYPE);
-            ampli.restoreWalletTypeStepViewed();
-          }}
-          goBack={goToAddWalletScreen}
-        />
-      ),
-    },
     [RESTORE_WALLET_STEPS.SELECT_WALLET_TYPE]: {
       stepId: RESTORE_WALLET_STEPS.SELECT_WALLET_TYPE,
       message: messages.firstStep,
@@ -145,8 +130,7 @@ function RestoreWalletPage(props: Props & Intl): Node {
           }}
           goBack={() => {
             resetRestoreWalletData();
-            if (!environment.isDev() && !environment.isNightly()) goToAddWalletScreen();
-            else setCurrentStep(RESTORE_WALLET_STEPS.SELECT_NETWORK);
+            goToAddWalletScreen();
           }}
         />
       ),
@@ -222,12 +206,9 @@ function RestoreWalletPage(props: Props & Intl): Node {
 
   const stepperSteps = Object.keys(steps)
     .map(key => ({ stepId: steps[key].stepId, message: steps[key].message }))
-    .filter(step => step.stepId !== RESTORE_WALLET_STEPS.SELECT_NETWORK);
 
   const CurrentStep = steps[currentStep].component;
 
-  if (currentStep === RESTORE_WALLET_STEPS.SELECT_NETWORK) return CurrentStep;
-
   return (
     <Box>
       <Box
diff --git a/packages/yoroi-extension/app/components/wallet/restore/steps.js b/packages/yoroi-extension/app/components/wallet/restore/steps.js
index 30f13bc1c7..8973a72cd0 100644
--- a/packages/yoroi-extension/app/components/wallet/restore/steps.js
+++ b/packages/yoroi-extension/app/components/wallet/restore/steps.js
@@ -2,14 +2,7 @@
 import environment from '../../../environment';
 
 export const RESTORE_WALLET_STEPS = Object.freeze({
-  SELECT_NETWORK: 'SELECT_NETWORK',
   SELECT_WALLET_TYPE: 'SELECT_WALLET_TYPE',
   ENTER_RECOVERY_PHRASE: 'ENTER_RECOVERY_PHRASE',
   ADD_WALLET_DETAILS: 'ADD_WALLET_DETAILS',
 });
-
-export function getFirstRestorationStep(): string {
-  if (environment.isDev() || environment.isNightly()) return RESTORE_WALLET_STEPS.SELECT_NETWORK;
-
-  return RESTORE_WALLET_STEPS.SELECT_WALLET_TYPE;
-}
diff --git a/packages/yoroi-extension/app/containers/wallet/CreateWalletPageContainer.js b/packages/yoroi-extension/app/containers/wallet/CreateWalletPageContainer.js
index 71c79edb1e..45647d8a6a 100644
--- a/packages/yoroi-extension/app/containers/wallet/CreateWalletPageContainer.js
+++ b/packages/yoroi-extension/app/containers/wallet/CreateWalletPageContainer.js
@@ -23,7 +23,6 @@ export default class CreateWalletPageContainer extends Component<StoresAndAction
         <CreateWalletPage
           genWalletRecoveryPhrase={stores.substores.ada.wallets.genWalletRecoveryPhrase}
           createWallet={actions.ada.wallets.createWallet.trigger}
-          setSelectedNetwork={actions.profile.setSelectedNetwork.trigger}
           selectedNetwork={stores.profile.selectedNetwork}
           openDialog={dialog => this.props.actions.dialogs.open.trigger({ dialog })}
           closeDialog={this.props.actions.dialogs.closeActiveDialog.trigger}
diff --git a/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js b/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
index dbd9140d6f..f84eb96810 100644
--- a/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
@@ -5,7 +5,6 @@ import BaseProfileStore from '../base/BaseProfileStore';
 import Request from '../lib/LocalizedRequest';
 import environment from '../../environment';
 import { ROUTES } from '../../routes-config';
-import type { NetworkRow } from '../../api/ada/lib/storage/database/primitives/tables';
 import type { ActionsMap } from '../../actions/index';
 import type { StoresMap } from '../index';
 import { ComplexityLevels } from '../../types/complexityLevelType';
@@ -14,8 +13,6 @@ import { ampli } from '../../../ampli/index';
 import { subscribe } from '../../api/thunk';
 
 export default class ProfileStore extends BaseProfileStore<StoresMap, ActionsMap> {
-  @observable __selectedNetwork: void | $ReadOnly<NetworkRow> = undefined;
-
   /**
    * We only want to redirect users once when the app launches
    */
@@ -175,7 +172,6 @@ export default class ProfileStore extends BaseProfileStore<StoresMap, ActionsMap
     this.actions.profile.acceptTermsOfUse.listen(this._acceptTermsOfUse);
     this.actions.profile.acceptUriScheme.listen(this._acceptUriScheme);
     this.actions.profile.toggleSidebar.listen(this._toggleSidebar);
-    this.actions.profile.setSelectedNetwork.listen(this._setSelectedNetwork);
     this.registerReactions([
       this._checkSetupSteps,
     ]);
@@ -195,16 +191,6 @@ export default class ProfileStore extends BaseProfileStore<StoresMap, ActionsMap
     });
   };
 
-  // ========== Active API ========== //
-
-  @computed get selectedNetwork(): void | $ReadOnly<NetworkRow> {
-    return this.__selectedNetwork;
-  }
-
-  @action _setSelectedNetwork: ($ReadOnly<NetworkRow> | void) => void = type => {
-    this.__selectedNetwork = type;
-  };
-
   // ========== Paper Wallets ========== //
 
   @computed get paperWalletsIntro(): string {

From d729c0586c1caccaf5d8d4e1b77ce2988caffc95 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Fri, 13 Dec 2024 00:52:33 +0800
Subject: [PATCH 104/143] sync cloned wallets

---
 .../chrome/extension/background/handlers/utils.js              | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/utils.js b/packages/yoroi-extension/chrome/extension/background/handlers/utils.js
index 3adbd98a08..d8fcb70054 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/utils.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/utils.js
@@ -34,12 +34,12 @@ import { asAddressedUtxo, cardanoValueFromRemoteFormat, } from '../../../../app/
 import { MultiToken } from '../../../../app/api/common/lib/MultiToken';
 import { RustModule } from '../../../../app/api/ada/lib/cardanoCrypto/rustLoader';
 import { loadSubmittedTransactions } from '../../../../app/api/localStorage';
-import { getDb } from '../state/databaseManager';
 // eslint-disable-next-line import/no-cycle
 import { refreshingWalletIdSet } from '../state/refreshScheduler';
 import { loadWalletsFromStorage } from '../../../../app/api/ada/lib/storage/models/load';
 import { getProtocolParameters } from './yoroi/protocolParameters';
 import AdaApi from '../../../../app/api/ada';
+import { getDb, syncWallet } from '../state';
 
 export async function getWalletsState(publicDeriverId: ?number, targetNetworkId: ?number): Promise<Array<WalletState>> {
   const db = await getDb();
@@ -85,6 +85,7 @@ export async function getWalletsState(publicDeriverId: ?number, targetNetworkId:
         const adaApi = new AdaApi();
         const clonedWallet = await adaApi.cloneWallet(db, value[0], network);
         publicDeriversOfNetwork.push(clonedWallet);
+        syncWallet(clonedWallet, 'cloned wallet').catch(error => console.error);
       }
     }
   } else {

From 3631030d6cc9717864de60598027bf1c9173c703 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Fri, 13 Dec 2024 00:52:46 +0800
Subject: [PATCH 105/143] use last sync info to determine the blocking syncing
 UI

---
 .../app/containers/wallet/Wallet.js                |  2 +-
 .../app/stores/toplevel/WalletStore.js             | 14 +-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/packages/yoroi-extension/app/containers/wallet/Wallet.js b/packages/yoroi-extension/app/containers/wallet/Wallet.js
index f546c11519..bf669dc24d 100644
--- a/packages/yoroi-extension/app/containers/wallet/Wallet.js
+++ b/packages/yoroi-extension/app/containers/wallet/Wallet.js
@@ -123,7 +123,7 @@ class Wallet extends Component<AllProps> {
     const warning = this.getWarning(selectedWallet.publicDeriverId);
     if (selectedWallet == null) throw new Error(`${nameof(Wallet)} no public deriver`);
 
-    const isInitialSyncing = stores.wallets.isInitialSyncing(selectedWallet.publicDeriverId);
+    const isInitialSyncing = selectedWallet.lastSyncInfo.Time == null;
     const spendableBalance = stores.transactions.balance;
     const walletHasAssets = !!(spendableBalance?.nonDefaultEntries().length);
 
diff --git a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
index de02b87924..633c8c3481 100644
--- a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
@@ -39,7 +39,6 @@ export type SendMoneyRequest = Request<DeferredCall<{| txId: string |}>>;
 export default class WalletStore extends Store<StoresMap, ActionsMap> {
   ON_VISIBLE_DEBOUNCE_WAIT: number = 1000;
 
-  @observable initialSyncingWalletIds: Set<number> = observable.set();
   @observable wallets: Array<WalletState> = [];
   @observable selectedIndex: null | number = null;
   // mobx is not smart enough to update the wallet name on the nav bar without this
@@ -104,12 +103,7 @@ export default class WalletStore extends Store<StoresMap, ActionsMap> {
           runInAction(() => {
             Object.assign(this.wallets[index], newWalletState);
           });
-          if (this.initialSyncingWalletIds.has(params.publicDeriverId)) {
-            this.stores.addresses.refreshAddressesFromDb(this.wallets[index]);
-          }
-          runInAction(() => {
-            this.initialSyncingWalletIds.delete(params.publicDeriverId);
-          });
+          this.stores.addresses.refreshAddressesFromDb(this.wallets[index]);
           await this.stores.transactions.updateNewTransactions(params.newTxs, this.wallets[index]);
         }
       } else if (params.eventType === 'remove') {
@@ -186,7 +180,6 @@ export default class WalletStore extends Store<StoresMap, ActionsMap> {
         publicDeriverId: newWallet.publicDeriverId,
       });
       this.actions.dialogs.closeActiveDialog.trigger();
-      this.initialSyncingWalletIds.add(newWallet.publicDeriverId);
       this.actions.router.goToRoute.trigger({ route: ROUTES.WALLETS.ROOT });
     });
   };
@@ -225,7 +218,6 @@ export default class WalletStore extends Store<StoresMap, ActionsMap> {
 
     runInAction(() => {
       this.wallets.push(wallet);
-      this.initialSyncingWalletIds.add(wallet.publicDeriverId);
     });
   };
 
@@ -412,10 +404,6 @@ export default class WalletStore extends Store<StoresMap, ActionsMap> {
     return resp;
   };
 
-  isInitialSyncing: (number) => boolean = (publicDeriverId) => {
-    return this.initialSyncingWalletIds.has(publicDeriverId);
-  }
-
   @action onRenameSelectedWallet: (string) => void = (newName) => {
     this.selectedWalletName = newName;
     if (this.selectedIndex != null) {

From d329daa6145bff7810260f38acc69c22f25e7a56 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Fri, 13 Dec 2024 01:23:42 +0800
Subject: [PATCH 106/143] handle remove

---
 .../background/handlers/yoroi/wallet.js       | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js
index 92445adf6f..b759083270 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/yoroi/wallet.js
@@ -21,6 +21,7 @@ import {
   asGetSigningKey,
   asGetAllAccounting,
   asHasLevels,
+  asGetPublicKey,
 } from '../../../../../app/api/ada/lib/storage/models/PublicDeriver/traits';
 import {
   removeAllTransactions,
@@ -122,12 +123,27 @@ export const RemoveWallet: HandlerType<
   typeTag: 'remove-wallet',
 
   handle: async (request) => {
-    const publicDeriver = await getPublicDeriverById(request.publicDeriverId);
+    const removeKey = await (async () => {
+      const publicDeriver = await getPublicDeriverById(request.publicDeriverId);
+      const withPublicKey = asGetPublicKey(publicDeriver);
+      if (withPublicKey == null) {
+        throw new Error('unexpected missing public key');
+      }
+      return (await withPublicKey.getPublicKey()).Hash;
+    })();
 
-    await removePublicDeriver({
-      publicDeriver,
-      conceptualWallet: publicDeriver.getParent(),
-    });
+    for (const publicDeriver of await loadWalletsFromStorage(await getDb())) {
+      const withPublicKey = asGetPublicKey(publicDeriver);
+      if (withPublicKey == null) {
+        throw new Error('unexpected missing public key');
+      }
+      if ((await withPublicKey.getPublicKey()).Hash === removeKey) {
+        await removePublicDeriver({
+          publicDeriver,
+          conceptualWallet: publicDeriver.getParent(),
+        });
+      }
+    }
 
     emitUpdateToSubscriptions({
       type: 'wallet-state-update',

From 53c650010fc73ef023a9a75c89c13176f91b4268 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Sat, 14 Dec 2024 11:15:56 +0800
Subject: [PATCH 107/143] revamp wallet list order

---
 .../app/api/localStorage/index.js             |  16 ++-
 .../app/components/topbar/WalletListDialog.js | 111 ++++--------------
 .../app/containers/NavBarContainerRevamp.js   |  31 ++---
 .../categories/RemoveWalletDialogContainer.js |  13 +-
 .../app/stores/toplevel/ProfileStore.js       |  20 ----
 .../stores/toplevel/WalletSettingsStore.js    |  10 --
 .../app/stores/toplevel/WalletStore.js        |  19 +++
 7 files changed, 68 insertions(+), 152 deletions(-)

diff --git a/packages/yoroi-extension/app/api/localStorage/index.js b/packages/yoroi-extension/app/api/localStorage/index.js
index 39847cb9b8..e80c691eba 100644
--- a/packages/yoroi-extension/app/api/localStorage/index.js
+++ b/packages/yoroi-extension/app/api/localStorage/index.js
@@ -27,13 +27,14 @@ const storageKeys = {
   COIN_PRICE_PUB_KEY_DATA: networkForLocalStorage + '-COIN-PRICE-PUB-KEY-DATA',
   EXTERNAL_STORAGE: networkForLocalStorage + '-EXTERNAL-STORAGE',
   TOGGLE_SIDEBAR: networkForLocalStorage + '-TOGGLE-SIDEBAR',
-  WALLETS_NAVIGATION: networkForLocalStorage + '-WALLETS-NAVIGATION',
   SUBMITTED_TRANSACTIONS: 'submittedTransactions',
   CATALYST_ROUND_INFO: networkForLocalStorage + '-CATALYST_ROUND_INFO',
   FLAGS: networkForLocalStorage + '-FLAGS',
   USER_THEME: networkForLocalStorage + '-USER-THEME',
   PORTFOLIO_FIAT_PAIR: networkForLocalStorage + '-PORTFOLIO_FIAT_PAIR',
   CURRENT_NETWORK_ID: networkForLocalStorage + '-CURRENT_NETWORK_ID',
+  WALLET_LIST_ORDER: networkForLocalStorage + '-WALLET_LIST_ORDER',
+
   // ========== CONNECTOR   ========== //
   DAPP_CONNECTOR_WHITELIST: 'connector_whitelist',
   SELECTED_WALLET: 'SELECTED_WALLET',
@@ -44,6 +45,7 @@ const storageKeys = {
   // ========== LEGACY USED FOR MIGRATIONS ========== //
   CUSTOM_THEME: networkForLocalStorage + '-CUSTOM-THEME',
   THEME: networkForLocalStorage + '-THEME',
+  WALLETS_NAVIGATION: networkForLocalStorage + '-WALLETS-NAVIGATION',
 };
 
 export type SetCustomUserThemeRequest = {|
@@ -356,6 +358,18 @@ export default class LocalStorageApi {
     await setLocalItem(storageKeys.CURRENT_NETWORK_ID, String(networkId));
   }
 
+  loadWalletListOrder: () => Promise<Array<string>> = async () => {
+    const raw = await getLocalItem(storageKeys.WALLET_LIST_ORDER);
+    if (raw == null) {
+      return [];
+    }
+    return JSON.parse(raw);
+  }
+
+  saveWalletListOrder: Array<string> => Promise<void> = async (publicKeyList) => {
+    await setLocalItem(storageKeys.WALLET_LIST_ORDER, JSON.stringify(publicKeyList));
+  }
+
   async reset(): Promise<void> {
     await this.unsetUserLocale();
     await this.unsetComplexityLevel();
diff --git a/packages/yoroi-extension/app/components/topbar/WalletListDialog.js b/packages/yoroi-extension/app/components/topbar/WalletListDialog.js
index 0b037a0bcf..00012517a4 100644
--- a/packages/yoroi-extension/app/components/topbar/WalletListDialog.js
+++ b/packages/yoroi-extension/app/components/topbar/WalletListDialog.js
@@ -4,7 +4,6 @@ import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import type { TokenLookupKey } from '../../api/common/lib/MultiToken';
 import type { TokenRow } from '../../api/ada/lib/storage/database/primitives/tables';
 import type { UnitOfAccountSettingType } from '../../types/unitOfAccountType';
-import type { WalletsNavigation } from '../../api/localStorage';
 import { BigNumber } from 'bignumber.js';
 import { Component } from 'react';
 import { observer } from 'mobx-react';
@@ -67,67 +66,25 @@ type Props = {|
   +unitOfAccountSetting: UnitOfAccountSettingType,
   +getCurrentPrice: (from: string, to: string) => ?string,
   +cardanoWallets: Array<WalletInfo>,
-  +walletsNavigation: WalletsNavigation,
-  +updateSortedWalletList: WalletsNavigation => Promise<void>,
+  +onUpdateWalletListOrder: (from: number, to: number) => Promise<void>,
   +onSelect: number => void,
   +selectedWalletId: ?number,
 |};
 type State = {|
-  cardanoWalletsIdx: number[],
   selectedWalletId: number | null,
 |};
 
-const reorder = (list, startIndex, endIndex) => {
-  const result = Array.from(list);
-  const [removed] = result.splice(startIndex, 1);
-  result.splice(endIndex, 0, removed);
-  return result;
-};
-
-const getGeneratedWalletIds = (sortedWalletListIdx, currentWalletIdx) => {
-  let generatedWalletIds;
-  if (sortedWalletListIdx !== undefined && sortedWalletListIdx.length > 0) {
-    const newWalletIds = currentWalletIdx.filter(id => {
-      const index = sortedWalletListIdx.indexOf(id);
-      if (index === -1) {
-        return true;
-      }
-      return false;
-    });
-    generatedWalletIds = [...sortedWalletListIdx, ...newWalletIds];
-  } else {
-    generatedWalletIds = currentWalletIdx;
-  }
-
-  return generatedWalletIds;
-};
 @observer
 export default class WalletListDialog extends Component<Props, State> {
   static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
     intl: intlShape.isRequired,
   };
   state: State = {
-    cardanoWalletsIdx: [],
     selectedWalletId: null,
   };
 
   async componentDidMount(): Promise<void> {
-    const cardanoWalletsId = getGeneratedWalletIds(
-      this.props.walletsNavigation.cardano,
-      this.props.cardanoWallets.map(wallet => wallet.walletId)
-    );
-
-    this.setState(
-      {
-        cardanoWalletsIdx: cardanoWalletsId,
-        selectedWalletId: this.props.selectedWalletId,
-      },
-      async () => {
-        await this.props.updateSortedWalletList({
-          cardano: cardanoWalletsId,
-        });
-      }
-    );
+    this.setState({ selectedWalletId: this.props.selectedWalletId });
   }
 
   onDragEnd: (network: 'cardano', result: Object) => any = async (network, result) => {
@@ -135,20 +92,7 @@ export default class WalletListDialog extends Component<Props, State> {
     if (!destination || destination.index === source.index) {
       return;
     }
-
-    this.setState(
-      prev => {
-        const walletListIdx = reorder(prev.cardanoWalletsIdx, result.source.index, result.destination.index);
-        return {
-          cardanoWalletsIdx: walletListIdx,
-        };
-      },
-      async function () {
-        await this.props.updateSortedWalletList({
-          cardano: this.state.cardanoWalletsIdx,
-        });
-      }
-    );
+    this.props.onUpdateWalletListOrder(source.index, destination.index);
   };
 
   onSelect: void => void = () => {
@@ -165,7 +109,6 @@ export default class WalletListDialog extends Component<Props, State> {
 
   render(): Node {
     const { intl } = this.context;
-    const { cardanoWalletsIdx } = this.state;
 
     const {
       shouldHideBalance,
@@ -239,35 +182,25 @@ export default class WalletListDialog extends Component<Props, State> {
               <Droppable droppableId="cardano-list-droppable">
                 {provided => (
                   <div className={styles.list} {...provided.droppableProps} ref={provided.innerRef}>
-                    {cardanoWalletsIdx.length > 0 &&
-                      cardanoWalletsIdx
-                        .map((walletId, idx) => {
-                          const wallet = cardanoWallets.find(w => w.walletId === walletId);
-                          if (!wallet) {
-                            return null;
-                          }
-
-                          return (
-                            <WalletCard
-                              key={walletId}
-                              idx={idx}
-                              onSelect={() => this.setState({ selectedWalletId: wallet.walletId })}
-                              isCurrentWallet={this.isCurrentWallet(wallet.walletId, 'local')}
-                              plate={wallet.plate}
-                              type={wallet.type}
-                              name={wallet.name}
-                              rewards={wallet.rewards}
-                              shouldHideBalance={this.props.shouldHideBalance}
-                              walletAmount={wallet.amount}
-                              walletId={walletId}
-                              getTokenInfo={this.props.getTokenInfo}
-                              unitOfAccountSetting={unitOfAccountSetting}
-                              getCurrentPrice={getCurrentPrice}
-                              id="changeWalletDialog:walletsList"
-                            />
-                          );
-                        })
-                        .filter(Boolean)}
+                    {cardanoWallets.map((wallet, idx) => (
+                      <WalletCard
+                        key={wallet.walletId}
+                        idx={idx}
+                        onSelect={() => this.setState({ selectedWalletId: wallet.walletId })}
+                        isCurrentWallet={this.isCurrentWallet(wallet.walletId, 'local')}
+                        plate={wallet.plate}
+                        type={wallet.type}
+                        name={wallet.name}
+                        rewards={wallet.rewards}
+                        shouldHideBalance={this.props.shouldHideBalance}
+                        walletAmount={wallet.amount}
+                        walletId={wallet.walletId}
+                        getTokenInfo={this.props.getTokenInfo}
+                        unitOfAccountSetting={unitOfAccountSetting}
+                        getCurrentPrice={getCurrentPrice}
+                        id="changeWalletDialog:walletsList"
+                      />
+                    ))}
                     {provided.placeholder}
                   </div>
                 )}
diff --git a/packages/yoroi-extension/app/containers/NavBarContainerRevamp.js b/packages/yoroi-extension/app/containers/NavBarContainerRevamp.js
index 73553cebf7..9ee940d2d7 100644
--- a/packages/yoroi-extension/app/containers/NavBarContainerRevamp.js
+++ b/packages/yoroi-extension/app/containers/NavBarContainerRevamp.js
@@ -123,26 +123,16 @@ export default class NavBarContainerRevamp extends Component<Props> {
     const getTokenInfo = genLookupOrFail(this.props.stores.tokenInfoStore.tokenInfo);
 
     if (this.props.stores.uiDialogs.isOpen(WalletListDialog)) {
-      const cardanoWallets = [];
-
-      wallets.forEach(wallet => {
-        const rewards = this.props.stores.delegation.getRewardBalanceOrZero(wallet);
-
-        const walletMap = {
-          walletId: wallet.publicDeriverId,
-          rewards,
-          amount: wallet.balance,
-          plate: wallet.plate,
-          type: wallet.type,
-          name: wallet.name,
-        };
-
-        cardanoWallets.push(walletMap);
-      });
-
       return (
         <WalletListDialog
-          cardanoWallets={cardanoWallets}
+          cardanoWallets={wallets.map(wallet => ({
+            walletId: wallet.publicDeriverId,
+            rewards: this.props.stores.delegation.getRewardBalanceOrZero(wallet),
+            amount: wallet.balance,
+            plate: wallet.plate,
+            type: wallet.type,
+            name: wallet.name,
+          }))}
           onSelect={wallet => {
             this.checkAndResetGovRoutes();
             this.onSelectWallet(wallet);
@@ -157,8 +147,9 @@ export default class NavBarContainerRevamp extends Component<Props> {
           getTokenInfo={getTokenInfo}
           walletAmount={selected?.balance}
           onAddWallet={this.addNewWallet}
-          updateSortedWalletList={this.props.actions.profile.updateSortedWalletList.trigger}
-          walletsNavigation={this.props.stores.profile.walletsNavigation}
+          onUpdateWalletListOrder={async (from, to) => {
+            await this.props.stores.wallets.reorderWallets(from, to);
+          }}
           unitOfAccountSetting={this.props.stores.profile.unitOfAccount}
           getCurrentPrice={this.props.stores.coinPriceStore.getCurrentPrice}
         />
diff --git a/packages/yoroi-extension/app/containers/settings/categories/RemoveWalletDialogContainer.js b/packages/yoroi-extension/app/containers/settings/categories/RemoveWalletDialogContainer.js
index 90d0ef75c0..8eba6a456b 100644
--- a/packages/yoroi-extension/app/containers/settings/categories/RemoveWalletDialogContainer.js
+++ b/packages/yoroi-extension/app/containers/settings/categories/RemoveWalletDialogContainer.js
@@ -56,18 +56,7 @@ class RemoveWalletDialogContainer extends Component<AllProps> {
   };
 
   removeWalletRevamp: void => Promise<void> = async () => {
-    const settingsActions = this.props.actions.walletSettings;
-    const selectedWalletId = this.props.publicDeriverId;
-    const walletsNavigation = this.props.stores.profile.walletsNavigation;
-
-    const newWalletsNavigation = {
-      ...walletsNavigation,
-      // $FlowFixMe[invalid-computed-prop]
-      cardano: walletsNavigation.cardano.filter(walletId => walletId !== selectedWalletId),
-    };
-    await this.props.actions.profile.updateSortedWalletList.trigger(newWalletsNavigation);
-
-    settingsActions.removeWallet.trigger({
+    this.props.actions.walletSettings.removeWallet.trigger({
       publicDeriverId: this.props.publicDeriverId,
     });
   };
diff --git a/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js b/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
index f84eb96810..0a999f98c4 100644
--- a/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
@@ -175,9 +175,7 @@ export default class ProfileStore extends BaseProfileStore<StoresMap, ActionsMap
     this.registerReactions([
       this._checkSetupSteps,
     ]);
-    this.actions.profile.updateSortedWalletList.listen(this._updateSortedWalletList);
     this._getUriSchemeAcceptance(); // eagerly cache
-    this._getSortedWalletList()
   }
 
   teardown(): void {
@@ -249,24 +247,6 @@ export default class ProfileStore extends BaseProfileStore<StoresMap, ActionsMap
       }
     }
   };
-
-  // ========== Sort wallets - Revamp ========== //
-  @computed get walletsNavigation(): WalletsNavigation {
-    let { result } = this.getWalletsNavigationRequest;
-    if (result == null) {
-      result = this.getWalletsNavigationRequest.execute().result;
-    }
-    return result ?? { cardano: [] };
-  }
-  _getSortedWalletList: void => Promise<void> = async () => {
-    await this.getWalletsNavigationRequest.execute();
-  };
-
-  _updateSortedWalletList: WalletsNavigation => Promise<void>
-    = async (walletsNavigation) => {
-    await this.setWalletsNavigationRequest.execute(walletsNavigation);
-    await this.getWalletsNavigationRequest.execute();
-  };
 }
 
 function getPaperWalletIntro(currentLocale: string, defaultLocale: string): string {
diff --git a/packages/yoroi-extension/app/stores/toplevel/WalletSettingsStore.js b/packages/yoroi-extension/app/stores/toplevel/WalletSettingsStore.js
index 024aae0bfa..a6eef6e73b 100644
--- a/packages/yoroi-extension/app/stores/toplevel/WalletSettingsStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/WalletSettingsStore.js
@@ -135,16 +135,6 @@ export default class WalletSettingsStore extends Store<StoresMap, ActionsMap> {
     this.removeWalletRequest.reset();
     this.actions.wallets.unselectWallet.trigger(); // deselect before deleting
 
-    // Remove this wallet from wallet sort list
-    const walletsNavigation = this.stores.profile.walletsNavigation
-    const newWalletsNavigation = {
-      ...walletsNavigation,
-      // $FlowFixMe[invalid-computed-prop]
-      'cardano': walletsNavigation.cardano.filter(
-        walletId => walletId !== request.publicDeriverId)
-    }
-    await this.actions.profile.updateSortedWalletList.trigger(newWalletsNavigation);
-
     // ==================== Disconnect related dApps ====================
     await this.actions.connector.getConnectorWhitelist.trigger();
     const connectorWhitelist = this.stores.connector.currentConnectorWhitelist;
diff --git a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
index 633c8c3481..e4fd82aeef 100644
--- a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
@@ -237,6 +237,15 @@ export default class WalletStore extends Store<StoresMap, ActionsMap> {
       this.stores.addresses.refreshAddressesFromDb(publicDeriver);
     }
 
+    const orderMap: Map<string, number> = new Map();
+    (await this.api.localStorage.loadWalletListOrder()).forEach((publicKey, index) => {
+      orderMap.set(publicKey, index)
+    });
+    result.sort((w1, w2) => (
+      (orderMap.get(w1.publicKey) ?? Number.MAX_VALUE) -
+        (orderMap.get(w2.publicKey) ?? Number.MAX_VALUE)
+    ));
+
     runInAction(() => {
       this.wallets.push(...result);
     });
@@ -421,6 +430,16 @@ export default class WalletStore extends Store<StoresMap, ActionsMap> {
       submittedTxs,
     );
   }
+
+  async reorderWallets(from: number, to: number): Promise<void> {
+    const selectedWallet = this.selected;
+    runInAction(() => {
+      const [moved] = this.wallets.splice(from, 1);
+      this.wallets.splice(to, 0, moved);
+      this.selectedIndex = this.wallets.indexOf(selectedWallet);
+    });
+    await this.api.localStorage.saveWalletListOrder(this.wallets.map(wallet => wallet.publicKey));
+  }
 }
 
 export const WalletCreationNotifications: {| [key: string]: Notification |} = {

From 80642ed6dc0aec4b0839ced71ff3ee23aa6fb4d0 Mon Sep 17 00:00:00 2001
From: vantuz-subhuman <vantuz-subhuman@yandex.ru>
Date: Sat, 14 Dec 2024 10:36:33 +0300
Subject: [PATCH 108/143] merge fix

---
 packages/yoroi-extension/package-lock.json | 50 ++++++++++++++++++----
 packages/yoroi-extension/package.json      |  1 -
 2 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index 9820c45fc9..e73077b946 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -11,10 +11,11 @@
       "dependencies": {
         "@amplitude/analytics-browser": "^2.1.3",
         "@babel/preset-typescript": "^7.24.7",
+        "@bringweb3/chrome-extension-kit": "^1.2.6",
         "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
         "@emotion/react": "^11.4.1",
         "@emotion/styled": "^11.3.0",
-        "@emurgo/cardano-message-signing-browser": "1.0.1",
+        "@emurgo/cardano-message-signing-browser": "1.1.0",
         "@emurgo/cardano-serialization-lib-browser": "13.1.0",
         "@emurgo/cip14-js": "2.0.0",
         "@emurgo/cip4-js": "1.0.5",
@@ -79,6 +80,7 @@
         "react-blockies": "1.4.1",
         "react-copy-to-clipboard": "5.0.3",
         "react-dom": "17.0.2",
+        "react-helmet": "6.1.0",
         "react-intl": "2.9.0",
         "react-markdown": "5.0.3",
         "react-query": "^3.39.3",
@@ -113,7 +115,7 @@
         "@babel/register": "7.12.13",
         "@babel/runtime": "7.12.18",
         "@babel/runtime-corejs3": "7.12.18",
-        "@emurgo/cardano-message-signing-nodejs": "1.0.1",
+        "@emurgo/cardano-message-signing-nodejs": "1.1.0",
         "@emurgo/cardano-serialization-lib-nodejs": "13.1.0",
         "@emurgo/cross-csl-nodejs": "6.1.0",
         "@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
@@ -2136,6 +2138,11 @@
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
       "dev": true
     },
+    "node_modules/@bringweb3/chrome-extension-kit": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@bringweb3/chrome-extension-kit/-/chrome-extension-kit-1.2.6.tgz",
+      "integrity": "sha512-X/i3xk9IoE1+6bD/EkjccYEPbi3Zmvkt7QGwTVA/RYJeky2NotCM/A4+LQvxq6G40xq/oQSl45Elgg/c0jDFfw=="
+    },
     "node_modules/@cardano-foundation/ledgerjs-hw-app-cardano": {
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/@cardano-foundation/ledgerjs-hw-app-cardano/-/ledgerjs-hw-app-cardano-7.1.3.tgz",
@@ -2428,14 +2435,14 @@
       "integrity": "sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww=="
     },
     "node_modules/@emurgo/cardano-message-signing-browser": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@emurgo/cardano-message-signing-browser/-/cardano-message-signing-browser-1.0.1.tgz",
-      "integrity": "sha512-yC4Ymq44WR0bXO1wzxCoyc2W/RD1KSAla0oYhin7IYoVkp2raGp8wt7QNF4pDdNnTcejn5fyPyYY9dL4666H1w=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@emurgo/cardano-message-signing-browser/-/cardano-message-signing-browser-1.1.0.tgz",
+      "integrity": "sha512-LyeiGIqCyZu9DZnKsi4wlBjZA1MN+uy3Cqpb5J6RZWvFXDJnCoxrYB/EixUiGRD/la4WsldBgtPsrIHyGsVkpg=="
     },
     "node_modules/@emurgo/cardano-message-signing-nodejs": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@emurgo/cardano-message-signing-nodejs/-/cardano-message-signing-nodejs-1.0.1.tgz",
-      "integrity": "sha512-PoKh1tQnJX18f8iEr8Jk1KXxKCn9eqaSslMI1pyOJvYRJhQVDLCh0+9YReufjp0oFJIY1ShcrR+4/WnECVZUKQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@emurgo/cardano-message-signing-nodejs/-/cardano-message-signing-nodejs-1.1.0.tgz",
+      "integrity": "sha512-PQRc8K8wZshEdmQenNUzVtiI8oJNF/1uAnBhidee5C4o1l2mDLOW+ur46HWHIFKQ6x8mSJTllcjMscHgzju0gQ==",
       "dev": true
     },
     "node_modules/@emurgo/cardano-serialization-lib-browser": {
@@ -23698,6 +23705,25 @@
         "react": "17.0.2"
       }
     },
+    "node_modules/react-fast-compare": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
+      "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="
+    },
+    "node_modules/react-helmet": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz",
+      "integrity": "sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==",
+      "dependencies": {
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.7.2",
+        "react-fast-compare": "^3.1.1",
+        "react-side-effect": "^2.1.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.3.0"
+      }
+    },
     "node_modules/react-intl": {
       "version": "2.9.0",
       "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-2.9.0.tgz",
@@ -23911,6 +23937,14 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
+    "node_modules/react-side-effect": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.2.tgz",
+      "integrity": "sha512-PVjOcvVOyIILrYoyGEpDN3vmYNLdy1CajSFNt4TDsVQC5KpTijDvWVoR+/7Rz2xT978D8/ZtFceXxzsPwZEDvw==",
+      "peerDependencies": {
+        "react": "^16.3.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
     "node_modules/react-smooth": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-4.0.1.tgz",
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
index 6e62521e7a..b82ddf20aa 100644
--- a/packages/yoroi-extension/package.json
+++ b/packages/yoroi-extension/package.json
@@ -1,7 +1,6 @@
 {
   "name": "yoroi",
   "version": "5.4.530",
-  "version": "5.4.512",
   "description": "Cardano ADA wallet",
   "scripts": {
     "dev-mv2": "rimraf dev/ && NODE_OPTIONS=--openssl-legacy-provider babel-node scripts-mv2/build --type=debug --env 'mainnet'",

From 99e8b78a8e75002249615ce4e673c4430c9e86f5 Mon Sep 17 00:00:00 2001
From: vantuz-subhuman <vantuz-subhuman@yandex.ru>
Date: Sat, 14 Dec 2024 10:37:26 +0300
Subject: [PATCH 109/143] Version bump: 5.4.531 (nightly)

---
 packages/yoroi-extension/package-lock.json | 4 ++--
 packages/yoroi-extension/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index e73077b946..18d8de7d4e 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "yoroi",
-  "version": "5.4.530",
+  "version": "5.4.531",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "yoroi",
-      "version": "5.4.530",
+      "version": "5.4.531",
       "license": "MIT",
       "dependencies": {
         "@amplitude/analytics-browser": "^2.1.3",
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
index b82ddf20aa..85da21f848 100644
--- a/packages/yoroi-extension/package.json
+++ b/packages/yoroi-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yoroi",
-  "version": "5.4.530",
+  "version": "5.4.531",
   "description": "Cardano ADA wallet",
   "scripts": {
     "dev-mv2": "rimraf dev/ && NODE_OPTIONS=--openssl-legacy-provider babel-node scripts-mv2/build --type=debug --env 'mainnet'",

From 4c66bc27af7f009c1fc2523ed4c66c000547f8bb Mon Sep 17 00:00:00 2001
From: vantuz-subhuman <vantuz-subhuman@yandex.ru>
Date: Thu, 19 Dec 2024 17:37:43 +0300
Subject: [PATCH 110/143] Version bump: 5.4.532 (nightly)

---
 packages/yoroi-extension/package-lock.json | 4 ++--
 packages/yoroi-extension/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index 18d8de7d4e..c95b23c8ca 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "yoroi",
-  "version": "5.4.531",
+  "version": "5.4.532",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "yoroi",
-      "version": "5.4.531",
+      "version": "5.4.532",
       "license": "MIT",
       "dependencies": {
         "@amplitude/analytics-browser": "^2.1.3",
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
index 85da21f848..5098a6d925 100644
--- a/packages/yoroi-extension/package.json
+++ b/packages/yoroi-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yoroi",
-  "version": "5.4.531",
+  "version": "5.4.532",
   "description": "Cardano ADA wallet",
   "scripts": {
     "dev-mv2": "rimraf dev/ && NODE_OPTIONS=--openssl-legacy-provider babel-node scripts-mv2/build --type=debug --env 'mainnet'",

From f6d717d319b931daea104ba6eb85be5bd39dc54d Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 18 Dec 2024 19:47:46 +0800
Subject: [PATCH 111/143] store public key of last selected/active wallet
 instead of id

---
 .../app/api/localStorage/index.js             | 20 ++++++++++++-------
 .../app/stores/toplevel/WalletStore.js        |  8 +++++---
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/packages/yoroi-extension/app/api/localStorage/index.js b/packages/yoroi-extension/app/api/localStorage/index.js
index e80c691eba..022956c5d6 100644
--- a/packages/yoroi-extension/app/api/localStorage/index.js
+++ b/packages/yoroi-extension/app/api/localStorage/index.js
@@ -34,10 +34,10 @@ const storageKeys = {
   PORTFOLIO_FIAT_PAIR: networkForLocalStorage + '-PORTFOLIO_FIAT_PAIR',
   CURRENT_NETWORK_ID: networkForLocalStorage + '-CURRENT_NETWORK_ID',
   WALLET_LIST_ORDER: networkForLocalStorage + '-WALLET_LIST_ORDER',
+  SELECTED_WALLET_PUBLIC_KEY: networkForLocalStorage + '_SELECTED_WALLET_PUBLIC_KEY',
 
   // ========== CONNECTOR   ========== //
   DAPP_CONNECTOR_WHITELIST: 'connector_whitelist',
-  SELECTED_WALLET: 'SELECTED_WALLET',
 
   IS_ANALYTICS_ALLOWED: networkForLocalStorage + '-IS_ANALYTICS_ALLOWED',
   ACCEPTED_TOS_VERSION: networkForLocalStorage + '-ACCEPTED_TOS_VERSION',
@@ -46,6 +46,7 @@ const storageKeys = {
   CUSTOM_THEME: networkForLocalStorage + '-CUSTOM-THEME',
   THEME: networkForLocalStorage + '-THEME',
   WALLETS_NAVIGATION: networkForLocalStorage + '-WALLETS-NAVIGATION',
+  SELECTED_WALLET: 'SELECTED_WALLET',
 };
 
 export type SetCustomUserThemeRequest = {|
@@ -124,17 +125,17 @@ export default class LocalStorageApi {
   setUserRevampAnnouncementStatus: boolean => Promise<void> = status =>
     setLocalItem(storageKeys.IS_REVAMP_THEME_ANNOUNCED, status.toString());
 
-  // ========== Select Wallet ========== //
+  // ========== Legacy Select Wallet ========== //
 
   getSelectedWalletId: void => Promise<number | null> = async () => {
     let id = await getLocalItem(storageKeys.SELECTED_WALLET);
-    // previously it was stored in window.localStorage, which is not accessible in the mv3 service worker
     if (!id) {
       id = window?.localStorage.getItem(storageKeys.SELECTED_WALLET);
-      if (/^\d+$/.test(id)) {
-        await this.setSelectedWalletId(Number(id));
+      if (!/^\d+$/.test(id)) {
+        id = null;
       }
     }
+
     if (!id) {
       return null;
     }
@@ -142,10 +143,15 @@ export default class LocalStorageApi {
     return Number(id);
   };
 
-  setSelectedWalletId: number => Promise<void> = async (id) => {
-    await setLocalItem(storageKeys.SELECTED_WALLET, id.toString());
+  // ========== Selected Wallet ========== //
+  getSelectedWalletPublicKey: void => Promise<?string> = async () => {
+    return await getLocalItem(storageKeys.SELECTED_WALLET_PUBLIC_KEY);
   };
 
+  setSelectedWalletPublicKey: string => Promise<void> = async (publicKey) => {
+    await setLocalItem(storageKeys.SELECTED_WALLET_PUBLIC_KEY, publicKey);
+  }
+
   // ========== Legacy Theme ========== //
 
   hasAnyLegacyThemeFlags: void => Promise<boolean> = async () => {
diff --git a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
index e4fd82aeef..e6cb01d3c6 100644
--- a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
@@ -291,13 +291,15 @@ export default class WalletStore extends Store<StoresMap, ActionsMap> {
     );
     this.selectedIndex = walletIndex;
     this.selectedWalletName = this.wallets[walletIndex].name;
-    this.api.localStorage.setSelectedWalletId(publicDeriverId);
+    this.api.localStorage.setSelectedWalletPublicKey(
+      this.wallets[walletIndex].publicKey
+    ).catch(console.error);
     subscribe(publicDeriverId);
   };
 
   getLastSelectedWallet: void => Promise<?WalletState> = async () => {
-    const walletId: ?number = await this.api.localStorage.getSelectedWalletId();
-    return this.wallets.find(wallet => wallet.publicDeriverId === walletId);
+    const lastSelectedPublicKey: ?string = await this.api.localStorage.getSelectedWalletPublicKey();
+    return this.wallets.find(wallet => wallet.publicKey === lastSelectedPublicKey);
   };
 
   @action _unsetActiveWallet: void => void = () => {

From 210bc5c454a564ffa8a1f995077ae3ed8a1390bb Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Thu, 19 Dec 2024 23:08:35 +0800
Subject: [PATCH 112/143] migrate old selected wallet and wallet order

---
 .../app/api/ada/lib/storage/adaMigration.js   | 45 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/packages/yoroi-extension/app/api/ada/lib/storage/adaMigration.js b/packages/yoroi-extension/app/api/ada/lib/storage/adaMigration.js
index d7e6b98024..038da97853 100644
--- a/packages/yoroi-extension/app/api/ada/lib/storage/adaMigration.js
+++ b/packages/yoroi-extension/app/api/ada/lib/storage/adaMigration.js
@@ -21,7 +21,7 @@ import { migrateFromStorageV1 } from './bridge/walletBuilder/byron';
 import { RustModule } from '../cardanoCrypto/rustLoader';
 import { removeAllTransactions } from './bridge/updateTransactions';
 import { removePublicDeriver } from './bridge/walletBuilder/remove';
-import { asGetAllUtxos, asHasLevels, } from './models/PublicDeriver/traits';
+import { asGetAllUtxos, asHasLevels, asGetPublicKey, } from './models/PublicDeriver/traits';
 import { ConceptualWallet, isLedgerNanoWallet, } from './models/ConceptualWallet/index';
 import { loadWalletsFromStorage } from './models/load';
 import environment from '../../../../environment';
@@ -32,6 +32,7 @@ import { getAllSchemaTables, raii, } from './database/utils';
 import type { BlockRow } from './database/primitives/tables';
 import { GetBlock } from './database/primitives/api/read';
 import { ModifyUtxoAtSafePoint } from './database/utxo/api/write';
+import type { PublicDeriver } from './models/PublicDeriver/index';
 
 export async function migrateToLatest(
   localStorageApi: LocalStorageApi,
@@ -98,6 +99,7 @@ export async function migrateToLatest(
     ['<3.8.0', () => cardanoTxHistoryReset(persistentDb)],
     ['<4.18', () => populateNewUtxodata(persistentDb)],
     ['<5.4', () => unsetLegacyThemeFlags(localStorageApi)],
+    ['<5.5', () => migrateWalletOrderAndSelectedWalletForNetworkSwitch(persistentDb, localStorageApi)],
   ];
 
   let appliedMigration = false;
@@ -421,4 +423,43 @@ async function unsetLegacyThemeFlags(localStorageApi: LocalStorageApi): Promise<
   }
   await localStorageApi.unsetLegacyThemeFlags();
   return true;
-}
\ No newline at end of file
+}
+
+async function migrateWalletOrderAndSelectedWalletForNetworkSwitch(
+  db: lf$Database,
+  localStorageApi: LocalStorageApi,
+): Promise<boolean> {
+  const wallets = await loadWalletsFromStorage(db);
+
+  const oldWalletOrder = (await localStorageApi.getWalletsNavigation())?.cardano || [];
+  const publicKeyList = [];
+  for (const id of oldWalletOrder) {
+    const wallet = wallets.find(w => w.getPublicDeriverId() === id);
+    if (wallet) {
+      publicKeyList.push(await getPublicKey(wallet));
+    }
+  }
+  for (const wallet of wallets) {
+    if (!oldWalletOrder.includes(wallet.getPublicDeriverId())) {
+      publicKeyList.push(await getPublicKey(wallet));
+    }
+  }
+  await localStorageApi.saveWalletListOrder(publicKeyList);
+
+  const selectedWalletId = await localStorageApi.getSelectedWalletId();
+  const selectedWallet = wallets.find(
+    wallet => wallet.getPublicDeriverId() === selectedWalletId
+  );
+  if (selectedWallet) {
+    await localStorageApi.setSelectedWalletPublicKey(await getPublicKey(selectedWallet));
+  }
+  return true;
+}
+
+async function getPublicKey(publicDeriver: PublicDeriver<>): Promise<string> {
+  const withPubKey = asGetPublicKey(publicDeriver);
+  if (withPubKey == null) {
+    throw new Error('unexpected missing asGetPublicKey result');
+  }
+  return (await withPubKey.getPublicKey()).Hash;
+}

From 5ecb941831a0c1553ca6f38afa66f82f34e312ff Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Thu, 19 Dec 2024 23:20:59 +0800
Subject: [PATCH 113/143] lint

---
 .../app/components/wallet/create-wallet/CreateWalletPage.js     | 2 --
 .../app/components/wallet/create-wallet/steps.js                | 2 --
 packages/yoroi-extension/app/components/wallet/restore/steps.js | 2 --
 .../app/components/wallet/settings/SwitchNetworkDialog.js       | 1 -
 .../settings/categories/SwitchNetworkDialogContainer.js         | 2 --
 packages/yoroi-extension/app/stores/toplevel/ProfileStore.js    | 2 +-
 .../chrome/extension/background/handlers/utils.js               | 2 +-
 .../yoroi-extension/chrome/extension/background/state/index.js  | 1 +
 8 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/packages/yoroi-extension/app/components/wallet/create-wallet/CreateWalletPage.js b/packages/yoroi-extension/app/components/wallet/create-wallet/CreateWalletPage.js
index e6db7ab597..f95181fc22 100644
--- a/packages/yoroi-extension/app/components/wallet/create-wallet/CreateWalletPage.js
+++ b/packages/yoroi-extension/app/components/wallet/create-wallet/CreateWalletPage.js
@@ -9,9 +9,7 @@ import { CREATE_WALLET_SETPS, markDialogAsShown } from './steps';
 import SaveRecoveryPhraseStep from './SaveRecoveryPhraseStep';
 import VerifyRecoveryPhraseStep from './VerifyRecoveryPhraseStep';
 import AddWalletDetailsStep from './AddWalletDetailsStep';
-import { networks } from '../../../api/ada/lib/storage/database/prepackaged/networks';
 import CreateWalletPageHeader from './CreateWalletPageHeader';
-import environment from '../../../environment';
 import { ROUTES } from '../../../routes-config';
 import type { NetworkRow } from '../../../api/ada/lib/storage/database/primitives/tables';
 import { ampli } from '../../../../ampli/index';
diff --git a/packages/yoroi-extension/app/components/wallet/create-wallet/steps.js b/packages/yoroi-extension/app/components/wallet/create-wallet/steps.js
index 3e00395a76..b8f5ba50ee 100644
--- a/packages/yoroi-extension/app/components/wallet/create-wallet/steps.js
+++ b/packages/yoroi-extension/app/components/wallet/create-wallet/steps.js
@@ -1,6 +1,4 @@
 // @flow
-import environment from '../../../environment';
-
 export const CREATE_WALLET_SETPS = Object.freeze({
   LEARN_ABOUT_RECOVERY_PHRASE: 'LEARN_ABOUT_RECOVER_PHRASE',
   SAVE_RECOVERY_PHRASE: 'SAVE_RECOVERY_PHRASE',
diff --git a/packages/yoroi-extension/app/components/wallet/restore/steps.js b/packages/yoroi-extension/app/components/wallet/restore/steps.js
index 8973a72cd0..ba51f77d05 100644
--- a/packages/yoroi-extension/app/components/wallet/restore/steps.js
+++ b/packages/yoroi-extension/app/components/wallet/restore/steps.js
@@ -1,6 +1,4 @@
 // @flow
-import environment from '../../../environment';
-
 export const RESTORE_WALLET_STEPS = Object.freeze({
   SELECT_WALLET_TYPE: 'SELECT_WALLET_TYPE',
   ENTER_RECOVERY_PHRASE: 'ENTER_RECOVERY_PHRASE',
diff --git a/packages/yoroi-extension/app/components/wallet/settings/SwitchNetworkDialog.js b/packages/yoroi-extension/app/components/wallet/settings/SwitchNetworkDialog.js
index 5c46a0b128..a92a75c8fa 100644
--- a/packages/yoroi-extension/app/components/wallet/settings/SwitchNetworkDialog.js
+++ b/packages/yoroi-extension/app/components/wallet/settings/SwitchNetworkDialog.js
@@ -6,7 +6,6 @@ import { defineMessages, intlShape } from 'react-intl';
 import ReactToolboxMobxForm from '../../../utils/ReactToolboxMobxForm';
 import DialogCloseButton from '../../widgets/DialogCloseButton';
 import Dialog from '../../widgets/Dialog';
-import { isValidWalletPassword, isValidRepeatPassword } from '../../../utils/validations';
 import globalMessages from '../../../i18n/global-messages';
 import type { $npm$ReactIntl$IntlFormat, $npm$ReactIntl$MessageDescriptor } from 'react-intl';
 import { MenuItem, Box } from '@mui/material';
diff --git a/packages/yoroi-extension/app/containers/settings/categories/SwitchNetworkDialogContainer.js b/packages/yoroi-extension/app/containers/settings/categories/SwitchNetworkDialogContainer.js
index 3a4f30df1c..bbf2cf8544 100644
--- a/packages/yoroi-extension/app/containers/settings/categories/SwitchNetworkDialogContainer.js
+++ b/packages/yoroi-extension/app/containers/settings/categories/SwitchNetworkDialogContainer.js
@@ -1,9 +1,7 @@
 // @flow
 import type { Node } from 'react';
-import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import type { StoresAndActionsProps } from '../../../types/injectedProps.types';
 import { Component } from 'react';
-import { action, observable } from 'mobx';
 import { observer } from 'mobx-react';
 import SwitchNetworkDialog from '../../../components/wallet/settings/SwitchNetworkDialog';
 import { networks } from '../../../api/ada/lib/storage/database/prepackaged/networks';
diff --git a/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js b/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
index 0a999f98c4..1d6176944f 100644
--- a/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
@@ -1,5 +1,5 @@
 // @flow
-import { action, observable, computed, runInAction } from 'mobx';
+import { observable, computed, runInAction } from 'mobx';
 import BigNumber from 'bignumber.js';
 import BaseProfileStore from '../base/BaseProfileStore';
 import Request from '../lib/LocalizedRequest';
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/utils.js b/packages/yoroi-extension/chrome/extension/background/handlers/utils.js
index d8fcb70054..8000ff49e6 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/utils.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/utils.js
@@ -85,7 +85,7 @@ export async function getWalletsState(publicDeriverId: ?number, targetNetworkId:
         const adaApi = new AdaApi();
         const clonedWallet = await adaApi.cloneWallet(db, value[0], network);
         publicDeriversOfNetwork.push(clonedWallet);
-        syncWallet(clonedWallet, 'cloned wallet').catch(error => console.error);
+        syncWallet(clonedWallet, 'cloned wallet').catch(console.error);
       }
     }
   } else {
diff --git a/packages/yoroi-extension/chrome/extension/background/state/index.js b/packages/yoroi-extension/chrome/extension/background/state/index.js
index c16b876d5b..109516551b 100644
--- a/packages/yoroi-extension/chrome/extension/background/state/index.js
+++ b/packages/yoroi-extension/chrome/extension/background/state/index.js
@@ -2,6 +2,7 @@
 import { getDb } from './databaseManager';
 
 export { getDb };
+// eslint-disable-next-line import/no-cycle
 export { refreshingWalletIdSet, syncWallet } from './refreshScheduler';
 
 export async function init(): Promise<void> {

From a63dfee840152f0ba6c61c56c149f64893112ae4 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Thu, 19 Dec 2024 23:42:12 +0800
Subject: [PATCH 114/143] add i18n message

---
 packages/yoroi-extension/app/i18n/locales/en-US.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/yoroi-extension/app/i18n/locales/en-US.json b/packages/yoroi-extension/app/i18n/locales/en-US.json
index 501e9d078f..3450f90fef 100644
--- a/packages/yoroi-extension/app/i18n/locales/en-US.json
+++ b/packages/yoroi-extension/app/i18n/locales/en-US.json
@@ -294,6 +294,10 @@
   "settings.general.explorer": "explorer",
   "settings.general.languageSelect.info": "For EMURGO, friendliness in Yoroi is an important topic. We believe understanding blockchain concepts is easier in your native language. We try supporting as many languages as possible, but for a broader selection of languages we need to accept the help from community translators. The selected language translation is fully provided by the community.",
   "settings.general.languageSelect.labelInfo": "The selected language translation is fully provided by the community",
+  "settings.general.switchNetwork.dialog.button.apply": "apply",
+  "settings.general.switchNetwork.dialog.label.select": "Select Network",
+  "settings.general.switchNetwork.dialog.text": "The Cardano network is a technical infrastructure combining Cardano nodes and their interactions in one unified system. It consists of a collection of nodes that communicate with each other to maintain the distributed ledger.",
+  "settings.general.switchNetwork.dialog.title": "Switch network",
   "settings.general.translation.acknowledgment": "Thank you to the following for their contribution: ",
   "settings.general.translation.contributors": "_",
   "settings.general.theme.light": "Light Theme",

From 7f04e80ea16c2a28354cb45db86df20bae124a58 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Sat, 21 Dec 2024 00:48:12 +0800
Subject: [PATCH 115/143] i18n

---
 packages/yoroi-extension/app/i18n/locales/en-US.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/yoroi-extension/app/i18n/locales/en-US.json b/packages/yoroi-extension/app/i18n/locales/en-US.json
index 3450f90fef..480fbf0c24 100644
--- a/packages/yoroi-extension/app/i18n/locales/en-US.json
+++ b/packages/yoroi-extension/app/i18n/locales/en-US.json
@@ -221,6 +221,10 @@
   "myWallets.wallets.lastSyncText": "Last sync",
   "myWallets.wallets.neverSync": "Never synced",
   "networkError.label.message": "Server connection failed <br/> Please check your internet connection or reach out to our support team <a target='_blank' href='https://emurgohelpdesk.zendesk.com/hc/en-us/requests/new?ticket_form_id=360013330335'>here</a>.",
+  "networkName.mainnet": "Mainnet",
+  "networkName.preprod": "Preproduction testnet",
+  "networkName.preview": "Preview testnet",
+  "networkName.sancho": "Sancho testnet",
   "nightly.banner.label.message": "YOU ARE ON YOROI NIGHTLY.",
   "notprod.label.message": "WARNING: this is a non-production build. If something unusual occurs, double-check Yoroi's installation.",
   "profile.analytics.accept": "Accept",
@@ -286,6 +290,7 @@
   "settings.general.aboutYoroi.network.mainnet": "Mainnet Network",
   "settings.general.aboutYoroi.network.testnet": "Testnet Network",
   "settings.general.aboutYoroi.networkLabel": "Network:",
+  "settings.general.aboutYoroi.switchNetwork": "SWITCH NETWORK",
   "settings.general.aboutYoroi.telegram": "EMURGO Telegram",
   "settings.general.aboutYoroi.twitter": "Yoroi Twitter",
   "settings.general.aboutYoroi.versionLabel": "Current version:",

From 8c2863fb542b65bdc001e5461e0dcf7d3e2acae7 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Sat, 21 Dec 2024 01:00:58 +0800
Subject: [PATCH 116/143] add badge for testnets

---
 .../app/containers/NavBarContainerRevamp.js   | 52 ++++++++++++++++++-
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/packages/yoroi-extension/app/containers/NavBarContainerRevamp.js b/packages/yoroi-extension/app/containers/NavBarContainerRevamp.js
index 9ee940d2d7..522046c054 100644
--- a/packages/yoroi-extension/app/containers/NavBarContainerRevamp.js
+++ b/packages/yoroi-extension/app/containers/NavBarContainerRevamp.js
@@ -7,7 +7,7 @@ import { intlShape } from 'react-intl';
 import { observer } from 'mobx-react';
 import { ROUTES } from '../routes-config';
 import { genLookupOrFail } from '../stores/stateless/tokenHelpers';
-import { getNetworkById } from '../api/ada/lib/storage/database/prepackaged/networks';
+import { networks, getNetworkById } from '../api/ada/lib/storage/database/prepackaged/networks';
 import { addressToDisplayString } from '../api/ada/lib/storage/bridge/utils';
 import BuySellDialog from '../components/buySell/BuySellDialog';
 import NavBarRevamp from '../components/topbar/NavBarRevamp';
@@ -17,6 +17,22 @@ import BuySellAdaButton from '../components/topbar/BuySellAdaButton';
 import { ampli } from '../../ampli/index';
 import { MultiToken } from '../api/common/lib/MultiToken';
 import LocalStorageApi from '../api/localStorage/index';
+import SwitchNetworkDialogContainer from './settings/categories/SwitchNetworkDialogContainer';
+
+const NETWORK_BADGES = Object.freeze({
+  [networks.CardanoPreprodTestnet.NetworkId]: {
+    color: 'rgba(236, 186, 9, 1)',
+    text: 'preprod',
+  },
+  [networks.CardanoPreviewTestnet.NetworkId]: {
+    color: 'rgba(143, 201, 246, 1)',
+    text: 'preview',
+  },
+  [networks.CardanoSanchoTestnet.NetworkId]: {
+    color: 'rgba(147, 245, 225, 1)',
+    text: 'sancho',
+  },
+});
 
 type Props = {|
   ...StoresAndActionsProps,
@@ -100,11 +116,38 @@ export default class NavBarContainerRevamp extends Component<Props> {
       );
     };
 
+    let title;
+    if (
+      this.props.stores.wallets.selected?.networkId === networks.CardanoMainnet.NetworkId ||
+      !this.props.stores.wallets.selected
+    ) {
+      title = this.props.title;
+    } else {
+      const { color, text } = NETWORK_BADGES[this.props.stores.wallets.selected.networkId];
+      title = (
+        <div style={{ display: 'flex', flexDirection: 'row' }}>
+          {this.props.title}
+          <button
+            style={{
+              backgroundColor: color,
+              marginLeft: '8px',
+              borderRadius: '16px',
+              paddingLeft: '8px',
+              paddingRight: '8px',
+            }}
+            onClick={() => this.props.actions.dialogs.open.trigger({ dialog: SwitchNetworkDialogContainer })}
+          >
+            {text}
+          </button>
+        </div>
+      );
+    }
+
     return (
       <>
         {this.getDialog()}
         <NavBarRevamp
-          title={this.props.title}
+          title={title}
           menu={this.props.menu}
           walletDetails={selected !== null ? <DropdownHead /> : null}
           buyButton={
@@ -175,6 +218,11 @@ export default class NavBarContainerRevamp extends Component<Props> {
       );
     }
 
+    if (this.props.stores.uiDialogs.isOpen(SwitchNetworkDialogContainer)) {
+      return <SwitchNetworkDialogContainer actions={this.props.actions} stores={this.props.stores} />;
+    }
+
     return null;
   };
+
 }

From e3eb147fcafa874c5986d2ff2470d00c57f40d8e Mon Sep 17 00:00:00 2001
From: Denis Nebytov <nebytov.d@gmail.com>
Date: Tue, 17 Dec 2024 11:40:12 +0300
Subject: [PATCH 117/143] updated transferTypeSelect page

---
 .../transfer/cards/TransferTypeSelect.js      | 71 +++++++++++++------
 1 file changed, 49 insertions(+), 22 deletions(-)

diff --git a/packages/yoroi-extension/app/components/transfer/cards/TransferTypeSelect.js b/packages/yoroi-extension/app/components/transfer/cards/TransferTypeSelect.js
index 037f8c0bf8..64d9d8ee61 100644
--- a/packages/yoroi-extension/app/components/transfer/cards/TransferTypeSelect.js
+++ b/packages/yoroi-extension/app/components/transfer/cards/TransferTypeSelect.js
@@ -1,12 +1,14 @@
 // @flow
 import { Component } from 'react';
 import type { Node } from 'react';
-import { defineMessages, intlShape, } from 'react-intl';
+import { defineMessages, intlShape } from 'react-intl';
 import { observer } from 'mobx-react';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import TransferCards from './TransferCards';
 import styles from './TransferTypeSelect.scss';
 import { handleExternalLinkClick } from '../../../utils/routing';
+import { Box, Link, Typography } from '@mui/material';
+import globalMessages from '../../../i18n/global-messages';
 
 type Props = {|
   +onByron: void => void,
@@ -21,38 +23,63 @@ const messages = defineMessages({
   subInstruction: {
     id: 'wallet.transfer.subInstruction',
     defaultMessage: '!!!Learn more about Byron and Shelley eras and how to claim ADA on our',
-  }
+  },
 });
 
 @observer
 export default class TransferTypeSelect extends Component<Props> {
-  static contextTypes: {|intl: $npm$ReactIntl$IntlFormat|} = {
+  static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
     intl: intlShape.isRequired,
   };
 
   render(): Node {
     const { intl } = this.context;
+    const faqLink = (
+      <Link
+        href={intl.formatMessage(globalMessages.faqLinkUrl)}
+        onClick={event => handleExternalLinkClick(event)}
+        id="settings:support-faq-link"
+      >
+        FAQ
+      </Link>
+    );
+
     return (
-      <div className={styles.component}>
-        <div className={styles.hero}>
-          <div className={styles.instructions}>
-            <div className={styles.headerText}>
-              {intl.formatMessage(
-                messages.instruction,
-                { ticker: this.props.ticker }
-              )}
-            </div>
-            <span>
-              {intl.formatMessage(
-                messages.subInstruction,
-                { ticker: this.props.ticker }
-              )}
-              <a onClick={event => handleExternalLinkClick(event)} href="https://yoroi-wallet.com/#/faq/1"> FAQ</a>
-            </span>
-          </div>
+      <Box height="100%">
+        <Box min-height="100%" display="flex" flexDirection="column" alignItems="center">
+          <Box display="flex" flexDirection="column" alignItems="center" marginBottom="40px">
+            <Typography variant="body1" fontWeight={500} color="ds.text_gray_medium">
+              {intl.formatMessage(messages.instruction, { ticker: this.props.ticker })}
+            </Typography>
+            <Typography variant="body1" color="ds.text_gray_medium">
+              {intl.formatMessage(messages.subInstruction, { ticker: this.props.ticker })}
+              &nbsp;
+              {faqLink}
+            </Typography>
+          </Box>
           <TransferCards onByron={this.props.onByron} />
-        </div>
-      </div>
+        </Box>
+      </Box>
+      // <div className={styles.component}>
+      //   <div className={styles.hero}>
+      //     <div className={styles.instructions}>
+      //       <div className={styles.headerText}>
+      //         {intl.formatMessage(
+      //           messages.instruction,
+      //           { ticker: this.props.ticker }
+      //         )}
+      //       </div>
+      //       <span>
+      //         {intl.formatMessage(
+      //           messages.subInstruction,
+      //           { ticker: this.props.ticker }
+      //         )}
+      //         <a onClick={event => handleExternalLinkClick(event)} href="https://yoroi-wallet.com/#/faq/1"> FAQ</a>
+      //       </span>
+      //     </div>
+      //     <TransferCards onByron={this.props.onByron} />
+      //   </div>
+      // </div>
     );
   }
 }

From a1894f53a6fe6e8e11a9fc93f87635f3d067a5bf Mon Sep 17 00:00:00 2001
From: Denis Nebytov <nebytov.d@gmail.com>
Date: Tue, 17 Dec 2024 11:41:55 +0300
Subject: [PATCH 118/143] cleaning

---
 .../transfer/cards/TransferTypeSelect.js      | 21 -----------
 .../transfer/cards/TransferTypeSelect.scss    | 36 -------------------
 2 files changed, 57 deletions(-)
 delete mode 100644 packages/yoroi-extension/app/components/transfer/cards/TransferTypeSelect.scss

diff --git a/packages/yoroi-extension/app/components/transfer/cards/TransferTypeSelect.js b/packages/yoroi-extension/app/components/transfer/cards/TransferTypeSelect.js
index 64d9d8ee61..170048e229 100644
--- a/packages/yoroi-extension/app/components/transfer/cards/TransferTypeSelect.js
+++ b/packages/yoroi-extension/app/components/transfer/cards/TransferTypeSelect.js
@@ -5,7 +5,6 @@ import { defineMessages, intlShape } from 'react-intl';
 import { observer } from 'mobx-react';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import TransferCards from './TransferCards';
-import styles from './TransferTypeSelect.scss';
 import { handleExternalLinkClick } from '../../../utils/routing';
 import { Box, Link, Typography } from '@mui/material';
 import globalMessages from '../../../i18n/global-messages';
@@ -60,26 +59,6 @@ export default class TransferTypeSelect extends Component<Props> {
           <TransferCards onByron={this.props.onByron} />
         </Box>
       </Box>
-      // <div className={styles.component}>
-      //   <div className={styles.hero}>
-      //     <div className={styles.instructions}>
-      //       <div className={styles.headerText}>
-      //         {intl.formatMessage(
-      //           messages.instruction,
-      //           { ticker: this.props.ticker }
-      //         )}
-      //       </div>
-      //       <span>
-      //         {intl.formatMessage(
-      //           messages.subInstruction,
-      //           { ticker: this.props.ticker }
-      //         )}
-      //         <a onClick={event => handleExternalLinkClick(event)} href="https://yoroi-wallet.com/#/faq/1"> FAQ</a>
-      //       </span>
-      //     </div>
-      //     <TransferCards onByron={this.props.onByron} />
-      //   </div>
-      // </div>
     );
   }
 }
diff --git a/packages/yoroi-extension/app/components/transfer/cards/TransferTypeSelect.scss b/packages/yoroi-extension/app/components/transfer/cards/TransferTypeSelect.scss
deleted file mode 100644
index 650c275ac1..0000000000
--- a/packages/yoroi-extension/app/components/transfer/cards/TransferTypeSelect.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-.component {
-  height: 100%;
-
-  .hero {
-    min-height: 100%;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-  }
-
-  .instructions {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    margin-bottom: 40px;
-    font-weight: 400;
-    font-size: 14px;
-    line-height: 30px;
-    color: var(--yoroi-palette-gray-800);
-
-    span {
-      color: var(--yoroi-palette-gray-600);
-      a {
-        text-decoration: none;
-        color: #3154cb;
-      }
-    }
-
-    .headerText {
-      max-width: 421px;
-      font-size: 24px;
-      text-align: center;
-      margin-bottom: 12px;
-    }
-  }
-}

From aa57bea94333d04257c14a24df714bd111849521 Mon Sep 17 00:00:00 2001
From: Denis Nebytov <nebytov.d@gmail.com>
Date: Wed, 18 Dec 2024 11:48:12 +0300
Subject: [PATCH 119/143] updated transfer card

---
 .../restore-paper-wallet-modern.inline.svg    |  2 +-
 .../transfer/cards/TransferCards.js           | 74 +++++++++++--------
 .../transfer/cards/TransferCards.scss         | 29 --------
 3 files changed, 43 insertions(+), 62 deletions(-)
 delete mode 100644 packages/yoroi-extension/app/components/transfer/cards/TransferCards.scss

diff --git a/packages/yoroi-extension/app/assets/images/add-wallet/option-dialog/restore-paper-wallet-modern.inline.svg b/packages/yoroi-extension/app/assets/images/add-wallet/option-dialog/restore-paper-wallet-modern.inline.svg
index 11fab786db..c91afc882b 100644
--- a/packages/yoroi-extension/app/assets/images/add-wallet/option-dialog/restore-paper-wallet-modern.inline.svg
+++ b/packages/yoroi-extension/app/assets/images/add-wallet/option-dialog/restore-paper-wallet-modern.inline.svg
@@ -1 +1 @@
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 520 832.7"><style>.st54{fill:#1d45ba}.st60{display:none;fill:#00fcff}.st254{fill:#e1f2ff}.st275{fill:#2c30d1}.st488{opacity:.3}</style><switch><g><defs><path id="SVGID_208_" d="M1479.8-1226.9s-8-7.6-8.2-7.8c-.2-.2-.2-.2-.2-.4v-12.8c0-.7 4 1.3 8.8 4.2 4.8 2.8 8.8 5.6 8.8 6.2v12.8c0 .2 0 .2-.2.2s-8.2-1.9-8.2-1.9-.3-.1-.4-.1c-.1 0-.4-.4-.4-.4zm-5.1-28.5c0-3.4 2.1-4.3 5.5-2.3s5.5 5.3 5.5 8.7v3.4c-3.9-2.5-7.1-4.5-11-6.5v-3.3zm-5.1-3v3.9c-2.1-.8-4.1-1.6-4.1-.9v20.6s0 .6.6 1.2c2.3 2.3 11.5 10.9 13.6 12.9.3.3.3.3.4.3.1.1.1.1.4.1 2.1.5 11.3 2.7 13.6 3.1.6.1.6-.5.6-.5v-20.6c0-.6-2-2.3-4.1-3.9v-3.9c0-5.8-4.7-13.3-10.5-16.7-5.8-3.3-10.5-1.4-10.5 4.4z"/></defs><clipPath id="SVGID_1_"><use xlink:href="#SVGID_208_" overflow="visible"/></clipPath><g clip-path="url(#SVGID_1_)"><defs><path id="SVGID_210_" d="M-195.6-686.9l3470.3 2041.5v-2467.7L-195.6-3154.7z"/></defs><clipPath id="SVGID_2_"><use xlink:href="#SVGID_210_" overflow="visible"/></clipPath></g><defs><path id="SVGID_226_" d="M1503.3-1235.2v5.1l5.1 3v14l5.8 3.5v-14.1l5.1 3v-5z"/></defs><clipPath id="SVGID_3_"><use xlink:href="#SVGID_226_" overflow="visible"/></clipPath><g clip-path="url(#SVGID_3_)"><defs><path id="SVGID_228_" d="M-195.6-686.9l3470.3 2041.5v-2467.7L-195.6-3154.7z"/></defs><clipPath id="SVGID_4_"><use xlink:href="#SVGID_228_" overflow="visible"/></clipPath></g><defs><path id="SVGID_244_" d="M1527.6-1215.8l3.5 2.1c1 .6 1.9 1.6 1.9 2.6 0 1.1-.9 1-1.9.4l-3.5-2.1v-3zm-5.8-8.5v19.1l5.8 3.4v-6l2.1 1.2 2.6 7.6 6.6 3.9-3.5-8.8c1.5.2 3.4-.5 3.4-3.8 0-3.6-2.4-8-6.9-10.6l-10.1-6z"/></defs><clipPath id="SVGID_5_"><use xlink:href="#SVGID_244_" overflow="visible"/></clipPath><g clip-path="url(#SVGID_5_)"><defs><path id="SVGID_246_" d="M-195.6-686.9l3470.3 2041.5v-2467.7L-195.6-3154.7z"/></defs><clipPath id="SVGID_6_"><use xlink:href="#SVGID_246_" overflow="visible"/></clipPath></g><g><defs><path id="SVGID_262_" d="M1542-1212.4v19.1l14.5 8.5v-5l-8.7-5.1v-2.1l8.5 5v-5.1l-8.5-5v-1.9l8.7 5.2v-5z"/></defs><clipPath id="SVGID_7_"><use xlink:href="#SVGID_262_" overflow="visible"/></clipPath><g clip-path="url(#SVGID_7_)"><defs><path id="SVGID_264_" d="M-195.6-686.9l3470.3 2041.5v-2467.7L-195.6-3154.7z"/></defs><clipPath id="SVGID_8_"><use xlink:href="#SVGID_264_" overflow="visible"/></clipPath></g></g><g><defs><path id="SVGID_280_" d="M1559.5-1202v5l7.3 4.3-7.3 5.2v4.5l15.2 9v-5.1l-7.5-4.4 7.3-5.2v-4.5z"/></defs><clipPath id="SVGID_9_"><use xlink:href="#SVGID_280_" overflow="visible"/></clipPath><g clip-path="url(#SVGID_9_)"><defs><path id="SVGID_282_" d="M-195.6-686.9l3470.3 2041.5v-2467.7L-195.6-3154.7z"/></defs><clipPath id="SVGID_10_"><use xlink:href="#SVGID_282_" overflow="visible"/></clipPath></g></g><g><defs><path id="SVGID_298_" d="M1582-1179.3c0-2.7 1.8-3.7 4.6-2.1s4.6 4.8 4.6 7.5-1.8 3.7-4.6 2.1-4.6-4.8-4.6-7.5m-5.9-3.4c0 5.9 4.6 12.5 10.5 16s10.5 2.2 10.5-3.7-4.6-12.6-10.5-16.1c-5.9-3.4-10.5-2.1-10.5 3.8"/></defs><clipPath id="SVGID_11_"><use xlink:href="#SVGID_298_" overflow="visible"/></clipPath><g clip-path="url(#SVGID_11_)"><defs><path id="SVGID_300_" d="M-195.6-686.9l3470.3 2041.5v-2467.7L-195.6-3154.7z"/></defs><clipPath id="SVGID_12_"><use xlink:href="#SVGID_300_" overflow="visible"/></clipPath></g></g><g><defs><path id="SVGID_316_" d="M1605.4-1170l3.5 2.1c1 .6 1.9 1.6 1.9 2.6 0 1.1-.9 1-1.9.4l-3.5-2.1v-3zm-5.9-8.5v19.1l5.8 3.4v-6l2.1 1.2 2.6 7.6 6.6 3.9-3.5-8.8c1.5.2 3.4-.5 3.4-3.8 0-3.6-2.4-8-6.9-10.6l-10.1-6z"/></defs><clipPath id="SVGID_13_"><use xlink:href="#SVGID_316_" overflow="visible"/></clipPath><g clip-path="url(#SVGID_13_)"><defs><path id="SVGID_318_" d="M-195.6-686.9l3470.3 2041.5v-2467.7L-195.6-3154.7z"/></defs><clipPath id="SVGID_14_"><use xlink:href="#SVGID_318_" overflow="visible"/></clipPath></g></g><path class="st60" d="M281.6-3.2c-20.7-13.1-37.5-3.2-37.5 22v-1.5c0-25.2 16.8-35.1 37.5-22 20.7 13 37.5 44.2 37.5 69.4v1.5c0-25.2-16.8-56.3-37.5-69.4zM319.1 88.8c8.4 7.6 14.7 20.7 14.7 31.6v1.5c0-10.9-6.3-24-14.7-31.6v-1.5z"/><g><g id="_x34__2_"><path id="XMLID_73_" d="M501.2 486.8l.4-224.3c0-6.6-4-14.3-9-17.1L237.1 98.1c-2.1-1.2-4.1-1.3-5.6-.5l-5.5 3.1 6.7 9.5.2 217.5c0 6.6 4 14.3 9 17.1l249.4 152.8 2.4-1 4.8-2.6c1.6-1.3 2.7-3.8 2.7-7.2z" fill="#164dd2"/><linearGradient id="XMLID_99_" gradientUnits="userSpaceOnUse" x1="524.966" y1="308.873" x2="170.823" y2="287.338"><stop offset="0" stop-color="#17d1aa"/><stop offset=".066" stop-color="#1ac2ae"/><stop offset=".265" stop-color="#229bb8"/><stop offset=".462" stop-color="#297cc0"/><stop offset=".652" stop-color="#2d66c6"/><stop offset=".835" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path id="XMLID_72_" d="M488 497.4L232.4 350.1c-4.9-2.9-9-10.5-9-17.1l-.2-225.4c0-6.6 4-9.6 9-6.8l255.6 147.3c4.9 2.9 9 10.5 9 17.1L497 484c0 6.5-4 16.2-9 13.4z" fill="url(#XMLID_99_)"/><path id="XMLID_71_" class="st275" d="M481.8 474.1L238.4 333.9c-2.2-1.3-4-4.6-4-7.6l-.2-203c0-2.9 1.8-4.3 4-3l243.4 140.2c2.2 1.3 4 4.6 4 7.6l.2 203c-.1 2.9-1.9 4.2-4 3z"/><linearGradient id="XMLID_100_" gradientUnits="userSpaceOnUse" x1="-174.26" y1="-110.999" x2="-191.424" y2="-133.608" gradientTransform="rotate(29.946 -529.97 1286.766) skewX(49.108)"><stop offset="0" stop-color="#2f009f"/><stop offset="1" stop-color="#3915a9"/></linearGradient><path id="XMLID_70_" d="M360.4 184.6l-1-.6c-1.3-.7-2.3-2.7-2.3-4.4 0-1.7 1-2.5 2.3-1.7l1 .6c1.3.7 2.3 2.7 2.3 4.4 0 1.7-1 2.5-2.3 1.7z" fill="url(#XMLID_100_)"/><linearGradient id="XMLID_101_" gradientUnits="userSpaceOnUse" x1="189.579" y1="333.843" x2="340.748" y2="680.587"><stop offset="0" stop-color="#17d1aa"/><stop offset=".073" stop-color="#1eb0b3"/><stop offset=".153" stop-color="#2493ba"/><stop offset=".243" stop-color="#297cc0"/><stop offset=".346" stop-color="#2c6ac5"/><stop offset=".469" stop-color="#2f5dc9"/><stop offset=".632" stop-color="#3156ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path id="XMLID_69_" d="M486 496.6l-14.5-1.2-244.4-140.8c-4.9-2.9-13.6-2.5-19.3.8L29.5 458.5l-9.4-.8v3.4c-.1 1.9 1 3.7 3.3 5.1L279 613.5c4.9 2.9 13.6 2.5 19.3-.8l183-99.7c3.1-1.8 4.7-4.1 4.7-6.3v-10.1z" fill="url(#XMLID_101_)"/><linearGradient id="XMLID_102_" gradientUnits="userSpaceOnUse" x1="531.369" y1="475.786" x2="-1.078" y2="478.509"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path id="XMLID_68_" d="M279 609.8L23.4 462.5c-4.9-2.9-4.3-7.8 1.4-11.1l183-105.9c5.7-3.3 14.3-3.7 19.3-.8l255.6 147.2c4.9 2.9 4.3 7.8-1.4 11.1l-183 105.9c-5.7 3.3-14.3 3.7-19.3.9z" fill="url(#XMLID_102_)"/><linearGradient id="XMLID_103_" gradientUnits="userSpaceOnUse" x1="175.983" y1="329.377" x2="414.625" y2="606.51"><stop offset="0" stop-color="#17d1aa"/><stop offset=".227" stop-color="#1cb9b0"/><stop offset=".704" stop-color="#297dc0"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path id="XMLID_67_" d="M352.5 560.2L109.2 420c-2.2-1.3-1.9-3.5.6-4.9L212 355.7c2.5-1.5 6.3-1.6 8.5-.4l243.4 140.2c2.2 1.3 1.9 3.5-.6 4.9L361 559.8c-2.5 1.5-6.3 1.6-8.5.4z" fill="url(#XMLID_103_)"/><linearGradient id="XMLID_104_" gradientUnits="userSpaceOnUse" x1="179.356" y1="458.625" x2="199.663" y2="552.993"><stop offset="0" stop-color="#17d1aa"/><stop offset=".227" stop-color="#1cb9b0"/><stop offset=".704" stop-color="#297dc0"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path id="XMLID_66_" d="M195 549.6l-67.4-38.8c-1.2-.7-1-1.8.3-2.6l54.5-31.6c1.3-.8 3.4-.9 4.5-.2l67.4 38.8c1.2.7 1 1.8-.3 2.6l-54.5 31.6c-1.3.8-3.3.9-4.5.2z" fill="url(#XMLID_104_)"/><path id="XMLID_65_" class="st54" d="M109.2 420l1.2.7 101.6-59c2.5-1.5 6.3-1.6 8.5-.4l242.1 139.5.6-.4c2.5-1.5 2.8-3.7.6-4.9L220.6 355.4c-2.2-1.3-6-1.1-8.5.4l-102.3 59.3c-2.6 1.4-2.8 3.6-.6 4.9z"/><path id="XMLID_64_" class="st54" d="M127.6 510.8l1.9 1.1 52.9-30.7c1.3-.8 3.4-.9 4.5-.2l65.5 37.7 1.6-.9c1.3-.8 1.5-2 .3-2.6l-67.4-38.8c-1.2-.7-3.2-.6-4.5.2L128 508.1c-1.4.8-1.5 2-.4 2.7z"/><path id="XMLID_63_" d="M195.3 549.7l-64.7-37.2c-1.1-.6-2.2-1.1-1.1-1.6l13.3-7.7c.3-.2 1.5.2 2.6.8l64.7 37.2c1.1.6 1.8 1.3 1.4 1.5l-13.5 7.8c-.4.2-1.6-.2-2.7-.8z" fill="#52fcff"/><g id="XMLID_57_"><linearGradient id="XMLID_105_" gradientUnits="userSpaceOnUse" x1="426.023" y1="451.822" x2="-51.773" y2="-202.313"><stop offset="0" stop-color="#17d1aa"/><stop offset=".205" stop-color="#1faab4"/><stop offset=".44" stop-color="#2785be"/><stop offset=".658" stop-color="#2c6ac5"/><stop offset=".852" stop-color="#305ac9"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path id="XMLID_62_" d="M447.4 491.2L204 351c-2.2-1.3-4-4.6-4-7.6l-.2-203c0-2.9 1.8-4.3 4-3l243.4 140.2c2.2 1.3 4 4.6 4 7.6l.2 203c-.1 2.9-1.9 4.3-4 3z" opacity=".15" fill="url(#XMLID_105_)"/><g id="XMLID_58_"><linearGradient id="XMLID_106_" gradientUnits="userSpaceOnUse" x1="423.971" y1="511.659" x2="-108.406" y2="-232.325"><stop offset="0" stop-color="#1d45ba"/><stop offset="1" stop-color="#fff"/></linearGradient><path id="XMLID_59_" d="M419.5 511.7c-.7 0-1.5-.2-2.2-.6L174 370.9c-2.6-1.5-4.6-5.3-4.6-8.6l-.2-203c0-2 .7-3.6 2-4.3 1.1-.7 2.5-.6 3.8.2l243.4 140.2c2.6 1.5 4.6 5.3 4.6 8.6l.2 203c0 2-.7 3.6-2 4.3-.5.3-1.1.4-1.7.4zM172.9 157c-.1 0-.3 0-.4.1-.4.2-.7.9-.7 2.1l.2 203c0 2.5 1.5 5.4 3.3 6.5l243.4 140.2c.3.2.9.5 1.3.2.4-.2.7-.9.7-2.1l-.2-203c0-2.5-1.5-5.4-3.3-6.5L173.8 157.3c-.2-.1-.6-.3-.9-.3z" fill="url(#XMLID_106_)"/></g></g></g><g opacity=".96"><linearGradient id="SVGID_15_" gradientUnits="userSpaceOnUse" x1="339.454" y1="204.652" x2="413.494" y2="335.455"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M374.4 257.5l-3.2.4c-7.8-9.9-15.7-19.7-23.5-29.6v-1.5-2.9c9 11.2 17.8 22.4 26.7 33.6z" fill="url(#SVGID_15_)"/><linearGradient id="SVGID_16_" gradientUnits="userSpaceOnUse" x1="349.404" y1="199.02" x2="423.443" y2="329.823"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M367.9 232.8c-1.4.2-2.9.3-4.3.5-.2 0-.3-.1-.5-.3-1.8-2.2-3.5-4.4-5.3-6.7-1.8-2.3-3.7-4.7-5.5-7-.9-1.1-1.7-2.2-2.6-3.3l-6.3-3.6c.3.4.6.8.9 1.1 1.7 2.1 3.3 4.2 5 6.3 1.6 2.1 3.3 4.1 4.9 6.2 1.5 2 3.1 3.9 4.6 5.9 1.5 1.9 2.9 3.7 4.4 5.5.2.2.3.3.4.2 1.2-.1 2.4-.3 3.6-.4 2.9-.3 5.8-.7 8.8-1 2.1-.2 4.3-.5 6.4-.7.4-.1.9-.1 1.3-.2l-6.4-3.6c-3.2.4-6.3.7-9.4 1.1z" fill="url(#SVGID_16_)"/><linearGradient id="SVGID_17_" gradientUnits="userSpaceOnUse" x1="333.988" y1="207.746" x2="408.028" y2="338.549"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M347.8 234.6c-.1.1-.1.1 0 0v4.5c5.2 6.6 10.4 13.2 15.7 19.8l3.2-.4c-6.4-8-12.6-15.9-18.9-23.9z" fill="url(#SVGID_17_)"/><linearGradient id="SVGID_18_" gradientUnits="userSpaceOnUse" x1="348.87" y1="199.322" x2="422.909" y2="330.125"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M379.1 241.7c-3.9.5-7.8 1-11.7 1.4.1.1.1.2.1.2 1 1.3 2 2.5 3 3.8l.1.1c2.8-.3 5.6-.7 8.5-1v-4.5z" fill="url(#SVGID_18_)"/><linearGradient id="SVGID_19_" gradientUnits="userSpaceOnUse" x1="347.324" y1="200.197" x2="421.363" y2="331"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M379.1 252.7c-1.3.2-2.6.3-3.9.5l3 3.9.9-.1v-4.3z" fill="url(#SVGID_19_)"/><linearGradient id="SVGID_20_" gradientUnits="userSpaceOnUse" x1="320.576" y1="215.337" x2="394.616" y2="346.14"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M350.2 261.1l.6.3-3.5 3.4v4.5l-.5-.3v-4.5l-3.4-7.4.6.3 3.1 6.6 3.1-2.9z" fill="url(#SVGID_20_)"/><linearGradient id="SVGID_21_" gradientUnits="userSpaceOnUse" x1="324.347" y1="213.203" x2="398.387" y2="344.006"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M356.2 274.5c-1.4-.8-2.6-2-3.5-3.4-.9-1.5-1.4-2.9-1.4-4.4 0-1.4.5-2.3 1.4-2.8.9-.4 2.1-.3 3.5.6 1.4.8 2.5 1.9 3.5 3.4.9 1.5 1.4 2.9 1.4 4.4 0 1.5-.5 2.4-1.4 2.8-1 .4-2.1.2-3.5-.6zm0-.5c1.2.7 2.2.9 3.1.5.8-.4 1.3-1.2 1.3-2.5s-.4-2.6-1.3-4c-.8-1.3-1.9-2.3-3.1-3-1.3-.7-2.3-.9-3.1-.5-.8.4-1.2 1.2-1.2 2.5s.4 2.6 1.2 3.9c.8 1.3 1.8 2.4 3.1 3.1z" fill="url(#SVGID_21_)"/><linearGradient id="SVGID_22_" gradientUnits="userSpaceOnUse" x1="329.172" y1="210.472" x2="403.212" y2="341.275"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M369.7 282.1l-.6-.3-3-5.8-2.5-1.4v4.2l-.5-.3v-9.9l3.3 1.9c1 .6 1.8 1.3 2.3 2.1.5.8.8 1.6.8 2.5 0 .9-.3 1.5-.8 1.6-.5.2-1.2.1-2-.4l3 5.8zm-6.1-12.8v4.8l2.6 1.5c1.9 1.1 2.8.8 2.8-.8 0-.8-.2-1.5-.7-2.1-.5-.6-1.1-1.2-1.9-1.7l-2.8-1.7z" fill="url(#SVGID_22_)"/><linearGradient id="SVGID_23_" gradientUnits="userSpaceOnUse" x1="334.433" y1="207.494" x2="408.473" y2="338.297"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M375.9 285.7c-1.4-.8-2.6-2-3.5-3.4-.9-1.5-1.4-2.9-1.4-4.4 0-1.4.5-2.3 1.4-2.8.9-.4 2.1-.3 3.5.6 1.4.8 2.5 1.9 3.5 3.4.9 1.5 1.4 2.9 1.4 4.4 0 1.5-.5 2.4-1.4 2.8-1 .4-2.2.2-3.5-.6zm0-.5c1.2.7 2.2.9 3.1.5.8-.4 1.3-1.2 1.3-2.5s-.4-2.6-1.3-4c-.8-1.3-1.9-2.3-3.1-3-1.3-.7-2.3-.9-3.1-.5-.8.4-1.2 1.2-1.2 2.5s.4 2.6 1.2 3.9c.8 1.4 1.8 2.4 3.1 3.1z" fill="url(#SVGID_23_)"/><linearGradient id="SVGID_24_" gradientUnits="userSpaceOnUse" x1="338.153" y1="205.388" x2="412.193" y2="336.192"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M382.9 289.6v-9.9l.5.3v9.9l-.5-.3z" fill="url(#SVGID_24_)"/><linearGradient id="SVGID_25_" gradientUnits="userSpaceOnUse" x1="321.525" y1="214.8" x2="395.565" y2="345.603"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M359.7 279.7l.2.1-.9 1.9-.2-.1-.7-2.5-.7 1.8-.2-.1-.9-2.9.2.1.8 2.6.7-1.8.2.1.7 2.5.8-1.7z" fill="url(#SVGID_25_)"/><linearGradient id="SVGID_26_" gradientUnits="userSpaceOnUse" x1="323.187" y1="213.859" x2="397.226" y2="344.663"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M362.5 281.3l.2.1v2.4l-.2-.1v-.5c-.2.3-.5.3-1 0-.3-.2-.6-.5-.9-.8-.2-.4-.3-.7-.3-1.1 0-.4.1-.6.3-.7s.5-.1.9.1c.2.1.4.3.6.5.2.2.3.4.4.7v-.6zm-1 1.7c.3.2.5.2.7.1.2-.1.3-.3.3-.6s-.1-.6-.3-.9c-.2-.3-.4-.6-.7-.7-.3-.2-.5-.2-.7-.1-.2.1-.3.3-.3.6s.1.6.3.9c.2.3.4.5.7.7z" fill="url(#SVGID_26_)"/><g><linearGradient id="SVGID_27_" gradientUnits="userSpaceOnUse" x1="324.476" y1="213.13" x2="398.516" y2="343.933"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M363.7 284.4v-3.7l.2.1v3.7l-.2-.1z" fill="url(#SVGID_27_)"/></g><g><linearGradient id="SVGID_28_" gradientUnits="userSpaceOnUse" x1="325.122" y1="212.764" x2="399.161" y2="343.568"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M365 285.1v-3.7l.2.1v3.7l-.2-.1z" fill="url(#SVGID_28_)"/></g><g><linearGradient id="SVGID_29_" gradientUnits="userSpaceOnUse" x1="325.934" y1="212.305" x2="399.973" y2="343.108"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M368.2 285.7v.1l-2-1.2c0 .3.1.6.3.9s.4.5.7.7c.3.2.6.2.8.1l.1.2c-.2.2-.5.1-.9-.1-.3-.2-.6-.5-.8-.8-.2-.4-.3-.7-.3-1.1 0-.4.1-.6.3-.7.2-.1.5-.1.8.1.3.2.6.4.8.8.1.3.2.6.2 1zm-1-1.6c-.3-.1-.5-.2-.7-.1-.2.1-.3.2-.3.5l1.9 1.1c0-.3-.1-.6-.3-.8-.2-.4-.4-.6-.6-.7z" fill="url(#SVGID_29_)"/></g><g><linearGradient id="SVGID_30_" gradientUnits="userSpaceOnUse" x1="327.312" y1="211.525" x2="401.351" y2="342.328"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M369.7 287.8c-.2-.1-.4-.3-.4-.4-.1-.2-.1-.3-.1-.6v-1.6l-.3-.2v-.2l.3.2v-.9l.2.1v.9l.9.5v.2l-.9-.5v1.5c0 .2 0 .4.1.5l.3.3c.2.1.3.1.5.1v.2c-.2.1-.4 0-.6-.1z" fill="url(#SVGID_30_)"/></g><g><linearGradient id="SVGID_31_" gradientUnits="userSpaceOnUse" x1="316.678" y1="217.544" x2="390.717" y2="348.347"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path fill="url(#SVGID_31_)" d="M343.2 271.8l12.4 7.1"/></g><g><linearGradient id="SVGID_32_" gradientUnits="userSpaceOnUse" x1="330.974" y1="209.452" x2="405.013" y2="340.255"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path fill="url(#SVGID_32_)" d="M371.1 287.7l12.4 7.1"/></g></g><linearGradient id="SVGID_33_" gradientUnits="userSpaceOnUse" x1="-1164.786" y1="422.565" x2="-1079.545" y2="269.077" gradientTransform="matrix(-1 0 0 1 -758.16 0)"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path d="M263 277.6l12.9-7.4c.2-.1.4-.1.6 0l161.1 93c.5.3 1 1.1 1 1.8v30.4c0 .3-.1.6-.3.7l-13 7.5-.1-14.7-148.7-85.8c-.5-.3-1-1.1-1-1.8v-10.4L263 277.6z" fill="url(#SVGID_33_)"/><path class="st254" d="M263.5 310.6l161.1 93c.5.3 1 0 1-.7v-30.4c0-.7-.4-1.5-1-1.8l-161.1-93c-.5-.3-1 0-1 .7v30.4c.1.7.5 1.5 1 1.8z"/><path d="M285.7 304.5l125.5 73.8c-3.9 3.3-7.5 7.2-10.9 11.4l-126.4-73c3.6-4.6 7.6-8.7 11.8-12.2z" opacity=".6" fill="#242993"/><path class="st275" d="M268.1 301.5L420 389.2c.4.2.7 0 .7-.5v-7.6c0-.5-.3-1-.7-1.2l-151.9-87.7c-.4-.2-.7 0-.7.5v7.6c.1.4.4 1 .7 1.2z"/><path d="M268.1 292.1l3.1 1.8v4.1c0 .5.3 1 .7 1.2l148.8 85.9v3.5c0 .5-.3.7-.7.5l-151.9-87.7c-.4-.2-.7-.8-.7-1.2v-7.6c.1-.5.4-.7.7-.5z" fill="#4553c7"/><linearGradient id="SVGID_34_" gradientUnits="userSpaceOnUse" x1="-906.719" y1="622.48" x2="-1087.039" y2="302.97" gradientTransform="matrix(-1 0 0 1 -758.16 0)"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M182.8 630.6l-126.4-73c16.3-9.4 30-30 34.2-49.7 1.7-8 6.6-14.9 13.7-19l95.5-55.1c26.6-15.4 43.8-43 45.7-73.7 1.5-25.9 21.1-51.3 36.3-60.1l126.4 73c-15 8.6-31.4 32.8-33.3 58.2-2.3 30.7-18.9 58.4-45.6 73.8l-98.6 56.9c-7.1 4.1-12 11-13.7 19-4.2 19.7-17.9 40.3-34.2 49.7z" opacity=".96" fill="url(#SVGID_34_)"/><g class="st488"><linearGradient id="SVGID_35_" gradientUnits="userSpaceOnUse" x1="232.06" y1="387.826" x2="355.616" y2="391.967"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_35_)" d="M329.3 386.3l22.1 12.8.2-2.5-22.1-12.8z"/><linearGradient id="SVGID_36_" gradientUnits="userSpaceOnUse" x1="232.395" y1="377.835" x2="355.951" y2="381.976"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_36_)" d="M318.1 379.8l7.8 4.6.2-2.5-7.8-4.6z"/><linearGradient id="SVGID_37_" gradientUnits="userSpaceOnUse" x1="232.575" y1="372.47" x2="356.131" y2="376.611"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_37_)" d="M309.5 374.8l5.3 3.1.2-2.5-5.2-3z"/><linearGradient id="SVGID_38_" gradientUnits="userSpaceOnUse" x1="231.774" y1="396.387" x2="355.329" y2="400.529"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_38_)" d="M338.8 397.9L351 405l.2-2.6-12.2-7z"/><linearGradient id="SVGID_39_" gradientUnits="userSpaceOnUse" x1="232.082" y1="387.179" x2="355.638" y2="391.321"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_39_)" d="M320.8 387.4l14.6 8.5.2-2.5-14.6-8.5z"/><linearGradient id="SVGID_40_" gradientUnits="userSpaceOnUse" x1="232.327" y1="379.882" x2="355.882" y2="384.024"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_40_)" d="M312.1 382.3l5.3 3.1.3-2.5-5.3-3z"/><linearGradient id="SVGID_41_" gradientUnits="userSpaceOnUse" x1="232.477" y1="375.411" x2="356.032" y2="379.553"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_41_)" d="M304 377.6l5.2 3.1.3-2.5-5.3-3.1z"/><linearGradient id="SVGID_42_" gradientUnits="userSpaceOnUse" x1="231.545" y1="403.2" x2="355.101" y2="407.342"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_42_)" d="M341.7 405.7l8.9 5.2.2-2.6-8.9-5.1z"/><linearGradient id="SVGID_43_" gradientUnits="userSpaceOnUse" x1="231.718" y1="398.049" x2="355.274" y2="402.191"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_43_)" d="M335.3 402l3 1.7.2-2.5-3-1.8z"/><linearGradient id="SVGID_44_" gradientUnits="userSpaceOnUse" x1="231.858" y1="393.868" x2="355.414" y2="398.009"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_44_)" d="M326.5 396.8l5.4 3.2.2-2.6-5.4-3.1z"/><linearGradient id="SVGID_45_" gradientUnits="userSpaceOnUse" x1="231.564" y1="402.637" x2="355.12" y2="406.779"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_45_)" d="M317.7 397.8l32.5 19.1.2-2.6-32.4-19.1z"/><linearGradient id="SVGID_46_" gradientUnits="userSpaceOnUse" x1="232.001" y1="389.61" x2="355.556" y2="393.752"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_46_)" d="M306.5 391.2l7.9 4.6.2-2.5-7.8-4.6z"/><linearGradient id="SVGID_47_" gradientUnits="userSpaceOnUse" x1="231.145" y1="415.145" x2="354.7" y2="419.287"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_47_)" d="M340.8 417.6l9 5.3.1-2.6-8.9-5.3z"/><linearGradient id="SVGID_48_" gradientUnits="userSpaceOnUse" x1="231.453" y1="405.949" x2="355.009" y2="410.091"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_48_)" d="M320.2 405.4l17.2 10.2.2-2.6-17.2-10.2z"/><linearGradient id="SVGID_49_" gradientUnits="userSpaceOnUse" x1="231.727" y1="397.774" x2="355.283" y2="401.916"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_49_)" d="M311.4 400.2l5.4 3.2.2-2.6-5.3-3.1z"/><linearGradient id="SVGID_50_" gradientUnits="userSpaceOnUse" x1="231.029" y1="418.595" x2="354.585" y2="422.737"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_50_)" d="M331.1 418.1l18.2 10.9.2-2.7-18.2-10.8z"/><linearGradient id="SVGID_51_" gradientUnits="userSpaceOnUse" x1="231.387" y1="407.926" x2="354.942" y2="412.068"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_51_)" d="M314.7 408.4l12.9 7.7.3-2.6-13-7.7z"/><linearGradient id="SVGID_52_" gradientUnits="userSpaceOnUse" x1="231.653" y1="399.99" x2="355.208" y2="404.132"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_52_)" d="M302.7 401.2l8.6 5.2.3-2.6-8.7-5.1z"/><linearGradient id="SVGID_53_" gradientUnits="userSpaceOnUse" x1="230.711" y1="428.076" x2="354.267" y2="432.217"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_53_)" d="M342.7 431.4l6.2 3.7.2-2.6-6.2-3.8z"/><linearGradient id="SVGID_54_" gradientUnits="userSpaceOnUse" x1="230.913" y1="422.064" x2="354.469" y2="426.205"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_54_)" d="M331 424.4l8.2 4.9.2-2.6-8.1-4.9z"/><linearGradient id="SVGID_55_" gradientUnits="userSpaceOnUse" x1="231.177" y1="414.186" x2="354.733" y2="418.327"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_55_)" d="M314.6 414.6l13 7.8.2-2.7-12.9-7.7z"/><linearGradient id="SVGID_56_" gradientUnits="userSpaceOnUse" x1="230.626" y1="430.621" x2="354.182" y2="434.762"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_56_)" d="M329.4 429.9l19.1 11.4.2-2.7-19.1-11.4z"/><linearGradient id="SVGID_57_" gradientUnits="userSpaceOnUse" x1="231.038" y1="418.32" x2="354.594" y2="422.462"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_57_)" d="M308.5 417.3l17.5 10.5.2-2.7-17.4-10.4z"/><linearGradient id="SVGID_58_" gradientUnits="userSpaceOnUse" x1="231.32" y1="409.929" x2="354.875" y2="414.071"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_58_)" d="M299.7 412l5.4 3.2.3-2.6-5.4-3.2z"/><linearGradient id="SVGID_59_" gradientUnits="userSpaceOnUse" x1="231.478" y1="405.197" x2="355.034" y2="409.339"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_59_)" d="M291.4 407l5.3 3.2.3-2.6-5.3-3.2z"/><linearGradient id="SVGID_60_" gradientUnits="userSpaceOnUse" x1="230.346" y1="438.969" x2="353.902" y2="443.11"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_60_)" d="M336.5 440.6l11.5 7 .2-2.8-11.5-6.9z"/><linearGradient id="SVGID_61_" gradientUnits="userSpaceOnUse" x1="233.187" y1="354.209" x2="356.743" y2="358.351"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_61_)" d="M285.8 361.1l-14.4-8.4.3-2.3 14.4 8.3z"/><linearGradient id="SVGID_62_" gradientUnits="userSpaceOnUse" x1="233.032" y1="358.846" x2="356.588" y2="362.988"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_62_)" d="M282 364.8l-11.3-6.6.3-2.4 11.3 6.6z"/><linearGradient id="SVGID_63_" gradientUnits="userSpaceOnUse" x1="232.876" y1="363.502" x2="356.432" y2="367.644"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_63_)" d="M278.2 368.5l-8.3-4.8.4-2.4 8.2 4.8z"/><linearGradient id="SVGID_64_" gradientUnits="userSpaceOnUse" x1="232.654" y1="370.116" x2="356.21" y2="374.258"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_64_)" d="M281.3 376.3l-12.1-7.1.3-2.4 12.1 7.1z"/><linearGradient id="SVGID_65_" gradientUnits="userSpaceOnUse" x1="232.501" y1="374.68" x2="356.057" y2="378.821"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_65_)" d="M276.8 379.7l-8.3-4.9.3-2.4 8.3 4.8z"/><linearGradient id="SVGID_66_" gradientUnits="userSpaceOnUse" x1="232.29" y1="380.968" x2="355.846" y2="385.109"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_66_)" d="M278.3 386.7l-10.6-6.3.4-2.4 10.5 6.2z"/><linearGradient id="SVGID_67_" gradientUnits="userSpaceOnUse" x1="232.145" y1="385.312" x2="355.7" y2="389.453"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_67_)" d="M272.7 389.6l-5.7-3.5.3-2.5 5.8 3.4z"/><linearGradient id="SVGID_68_" gradientUnits="userSpaceOnUse" x1="231.9" y1="392.607" x2="355.456" y2="396.748"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_68_)" d="M277.5 398.6l-11.3-6.8.4-2.5 11.2 6.8z"/><linearGradient id="SVGID_69_" gradientUnits="userSpaceOnUse" x1="231.711" y1="398.244" x2="355.267" y2="402.385"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_69_)" d="M276.1 404.1l-10.6-6.5.3-2.5 10.7 6.4z"/><linearGradient id="SVGID_70_" gradientUnits="userSpaceOnUse" x1="230.569" y1="432.318" x2="354.125" y2="436.46"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_70_)" d="M328.2 435.6l4.8 2.9.2-2.7-4.8-2.9z"/><linearGradient id="SVGID_71_" gradientUnits="userSpaceOnUse" x1="230.784" y1="425.906" x2="354.34" y2="430.047"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_71_)" d="M314 426.9l10.7 6.6.3-2.7-10.8-6.5z"/></g><g class="st488"><linearGradient id="SVGID_72_" gradientUnits="userSpaceOnUse" x1="166.179" y1="450.601" x2="303.933" y2="469.711"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_72_)" d="M247.7 470l-33-19.1 2.4-1.3 32.9 19z"/><linearGradient id="SVGID_73_" gradientUnits="userSpaceOnUse" x1="164.407" y1="463.378" x2="302.16" y2="482.489"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_73_)" d="M266.8 481l-11.9-6.8 2.4-1.4 11.9 6.9z"/><linearGradient id="SVGID_74_" gradientUnits="userSpaceOnUse" x1="163.586" y1="469.294" x2="301.34" y2="488.404"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_74_)" d="M276.4 486.5l-3.5-2 2.3-1.3 3.5 2z"/><linearGradient id="SVGID_76_" gradientUnits="userSpaceOnUse" x1="162.766" y1="475.209" x2="300.519" y2="494.319"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_76_)" d="M294.3 496.9l-11.9-6.9 2.4-1.3 11.9 6.8z"/><g><linearGradient id="SVGID_77_" gradientUnits="userSpaceOnUse" x1="166.401" y1="449.003" x2="304.154" y2="468.113"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_77_)" d="M219.5 459.3l-9.7-5.5 2.4-1.4 9.6 5.6z"/><linearGradient id="SVGID_78_" gradientUnits="userSpaceOnUse" x1="164.628" y1="461.781" x2="302.382" y2="480.891"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_78_)" d="M261.9 483.8l-35.2-20.3 2.4-1.3 35.2 20.3z"/><linearGradient id="SVGID_79_" gradientUnits="userSpaceOnUse" x1="163.112" y1="472.715" x2="300.865" y2="491.825"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_79_)" d="M271.5 489.4l-3.5-2.1 2.4-1.3 3.4 2z"/><linearGradient id="SVGID_80_" gradientUnits="userSpaceOnUse" x1="162.291" y1="478.63" x2="300.044" y2="497.74"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_80_)" d="M289.4 499.7l-11.9-6.8 2.4-1.4 11.9 6.9z"/><linearGradient id="SVGID_81_" gradientUnits="userSpaceOnUse" x1="166.07" y1="451.388" x2="303.824" y2="470.498"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_81_)" d="M209.8 459.3l-4.8-2.7 2.3-1.4 4.8 2.8z"/><linearGradient id="SVGID_82_" gradientUnits="userSpaceOnUse" x1="165.322" y1="456.78" x2="303.076" y2="475.891"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_82_)" d="M222.8 466.8l-5.8-3.3 2.4-1.3 5.7 3.3z"/><linearGradient id="SVGID_83_" gradientUnits="userSpaceOnUse" x1="164.686" y1="461.365" x2="302.44" y2="480.476"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_83_)" d="M232.3 472.4l-3.5-2.1 2.4-1.3 3.4 2z"/><linearGradient id="SVGID_84_" gradientUnits="userSpaceOnUse" x1="163.865" y1="467.28" x2="301.619" y2="486.391"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_84_)" d="M250.2 482.7l-11.8-6.9 2.3-1.3 11.9 6.9z"/><linearGradient id="SVGID_85_" gradientUnits="userSpaceOnUse" x1="165.452" y1="455.845" x2="303.205" y2="474.955"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_85_)" d="M209.7 464.9l-9.6-5.5 2.3-1.4 9.7 5.6z"/><linearGradient id="SVGID_86_" gradientUnits="userSpaceOnUse" x1="164.375" y1="463.604" x2="302.129" y2="482.714"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_86_)" d="M228.9 476l-11.9-6.9 2.3-1.3 11.9 6.8z"/><linearGradient id="SVGID_87_" gradientUnits="userSpaceOnUse" x1="163.555" y1="469.519" x2="301.308" y2="488.629"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_87_)" d="M238.4 481.5l-3.5-2 2.4-1.4 3.5 2.1z"/><linearGradient id="SVGID_89_" gradientUnits="userSpaceOnUse" x1="162.734" y1="475.434" x2="300.488" y2="494.545"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_89_)" d="M256.4 491.9l-11.9-6.9 2.3-1.3 11.9 6.8z"/></g><g><linearGradient id="SVGID_90_" gradientUnits="userSpaceOnUse" x1="164.245" y1="464.542" x2="301.999" y2="483.652"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_90_)" d="M227.8 481.4l-32.9-19 2.3-1.4 33 19.1z"/><linearGradient id="SVGID_91_" gradientUnits="userSpaceOnUse" x1="162.473" y1="477.32" x2="300.226" y2="496.43"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_91_)" d="M247 492.5l-11.9-6.9 2.3-1.3 11.9 6.8z"/><linearGradient id="SVGID_92_" gradientUnits="userSpaceOnUse" x1="161.652" y1="483.235" x2="299.406" y2="502.345"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_92_)" d="M256.5 498l-3.5-2 2.4-1.4 3.5 2z"/><linearGradient id="SVGID_93_" gradientUnits="userSpaceOnUse" x1="160.832" y1="489.15" x2="298.585" y2="508.261"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_93_)" d="M274.5 508.4l-11.9-6.9 2.3-1.4 11.9 6.9z"/><g><linearGradient id="SVGID_94_" gradientUnits="userSpaceOnUse" x1="164.467" y1="462.944" x2="302.221" y2="482.055"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_94_)" d="M199.6 470.8l-9.6-5.6 2.3-1.3 9.7 5.5z"/><linearGradient id="SVGID_95_" gradientUnits="userSpaceOnUse" x1="162.694" y1="475.722" x2="300.448" y2="494.832"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_95_)" d="M242.1 495.3L206.9 475l2.3-1.4 35.3 20.3z"/><linearGradient id="SVGID_96_" gradientUnits="userSpaceOnUse" x1="161.178" y1="486.656" x2="298.931" y2="505.767"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_96_)" d="M251.6 500.8l-3.4-2 2.3-1.4 3.5 2.1z"/><linearGradient id="SVGID_97_" gradientUnits="userSpaceOnUse" x1="160.357" y1="492.571" x2="298.11" y2="511.682"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_97_)" d="M269.6 511.2l-11.9-6.9 2.4-1.3 11.8 6.8z"/><linearGradient id="SVGID_98_" gradientUnits="userSpaceOnUse" x1="164.136" y1="465.329" x2="301.89" y2="484.44"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_98_)" d="M189.9 470.8l-4.8-2.8 2.4-1.3 4.8 2.7z"/><linearGradient id="SVGID_99_" gradientUnits="userSpaceOnUse" x1="163.388" y1="470.722" x2="301.142" y2="489.832"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_99_)" d="M202.9 478.3l-5.7-3.3 2.4-1.4 5.7 3.3z"/><linearGradient id="SVGID_100_" gradientUnits="userSpaceOnUse" x1="162.752" y1="475.307" x2="300.505" y2="494.417"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_100_)" d="M212.5 483.8l-3.5-2 2.3-1.4 3.5 2z"/><linearGradient id="SVGID_101_" gradientUnits="userSpaceOnUse" x1="161.931" y1="481.222" x2="299.685" y2="500.332"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_101_)" d="M230.4 494.2l-11.9-6.9 2.4-1.4 11.9 6.9z"/><linearGradient id="SVGID_102_" gradientUnits="userSpaceOnUse" x1="163.518" y1="469.786" x2="301.271" y2="488.897"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_102_)" d="M189.9 476.4l-9.7-5.6 2.4-1.3 9.6 5.5z"/><linearGradient id="SVGID_103_" gradientUnits="userSpaceOnUse" x1="162.441" y1="477.545" x2="300.195" y2="496.655"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_103_)" d="M209 487.5l-11.9-6.9 2.4-1.4 11.9 6.9z"/><linearGradient id="SVGID_104_" gradientUnits="userSpaceOnUse" x1="161.621" y1="483.46" x2="299.374" y2="502.571"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_104_)" d="M218.6 493l-3.5-2 2.3-1.4 3.5 2z"/><linearGradient id="SVGID_105_" gradientUnits="userSpaceOnUse" x1="160.8" y1="489.376" x2="298.554" y2="508.486"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_105_)" d="M236.5 503.3l-11.9-6.8 2.4-1.4 11.9 6.9z"/></g></g><g><linearGradient id="SVGID_106_" gradientUnits="userSpaceOnUse" x1="162.311" y1="478.483" x2="300.065" y2="497.594"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_106_)" d="M208 492.9l-33-19 2.4-1.4 32.9 19z"/><linearGradient id="SVGID_107_" gradientUnits="userSpaceOnUse" x1="160.539" y1="491.261" x2="298.292" y2="510.371"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_107_)" d="M227.1 503.9l-11.9-6.8 2.4-1.4 11.9 6.9z"/><linearGradient id="SVGID_109_" gradientUnits="userSpaceOnUse" x1="159.718" y1="497.176" x2="297.471" y2="516.287"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_109_)" d="M236.7 509.5l-3.5-2.1 2.3-1.3 3.5 2z"/><linearGradient id="SVGID_110_" gradientUnits="userSpaceOnUse" x1="158.897" y1="503.092" x2="296.651" y2="522.202"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_110_)" d="M254.6 519.8l-11.9-6.8 2.4-1.4 11.9 6.9z"/><g><linearGradient id="SVGID_111_" gradientUnits="userSpaceOnUse" x1="162.533" y1="476.886" x2="300.286" y2="495.996"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_111_)" d="M179.8 482.2l-9.7-5.5 2.4-1.4 9.6 5.6z"/><linearGradient id="SVGID_112_" gradientUnits="userSpaceOnUse" x1="160.76" y1="489.663" x2="298.514" y2="508.774"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_112_)" d="M222.3 506.8L187 486.4l2.4-1.3 35.2 20.3z"/><linearGradient id="SVGID_113_" gradientUnits="userSpaceOnUse" x1="159.243" y1="500.597" x2="296.997" y2="519.708"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_113_)" d="M231.8 512.3l-3.5-2 2.4-1.4 3.5 2z"/><linearGradient id="SVGID_114_" gradientUnits="userSpaceOnUse" x1="158.423" y1="506.513" x2="296.176" y2="525.623"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_114_)" d="M249.7 522.6l-11.8-6.8 2.3-1.4 11.9 6.9z"/><linearGradient id="SVGID_115_" gradientUnits="userSpaceOnUse" x1="162.202" y1="479.271" x2="299.955" y2="498.381"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_115_)" d="M170.1 482.3l-4.8-2.8 2.3-1.4 4.8 2.8z"/><linearGradient id="SVGID_116_" gradientUnits="userSpaceOnUse" x1="161.454" y1="484.663" x2="299.207" y2="503.773"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_116_)" d="M183.1 489.8l-5.7-3.3 2.3-1.4 5.7 3.3z"/><linearGradient id="SVGID_117_" gradientUnits="userSpaceOnUse" x1="160.818" y1="489.248" x2="298.571" y2="508.358"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_117_)" d="M192.6 495.3l-3.5-2 2.4-1.4 3.5 2z"/><linearGradient id="SVGID_118_" gradientUnits="userSpaceOnUse" x1="159.997" y1="495.163" x2="297.751" y2="514.273"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_118_)" d="M210.6 505.6l-11.9-6.8 2.3-1.4 11.9 6.9z"/><linearGradient id="SVGID_119_" gradientUnits="userSpaceOnUse" x1="161.584" y1="483.728" x2="299.337" y2="502.838"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_119_)" d="M170 487.9l-9.6-5.6 2.4-1.4 9.6 5.6z"/><linearGradient id="SVGID_120_" gradientUnits="userSpaceOnUse" x1="160.507" y1="491.486" x2="298.261" y2="510.597"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_120_)" d="M189.2 498.9l-11.9-6.8 2.4-1.4 11.8 6.9z"/><linearGradient id="SVGID_121_" gradientUnits="userSpaceOnUse" x1="159.687" y1="497.402" x2="297.44" y2="516.512"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_121_)" d="M198.7 504.4l-3.4-2 2.3-1.3 3.5 2z"/><linearGradient id="SVGID_122_" gradientUnits="userSpaceOnUse" x1="158.866" y1="503.317" x2="296.62" y2="522.427"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_122_)" d="M216.7 514.8l-11.9-6.9 2.3-1.3 11.9 6.8z"/></g></g></g><linearGradient id="SVGID_123_" gradientUnits="userSpaceOnUse" x1="317.298" y1="298.629" x2="392.014" y2="298.629"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path d="M318.4 284.6l72.2 41.6c.6.3 1.3.7 1.4 0V315c0-.8-.5-1.8-1.2-2.2l-72.7-41.9c-.1 0-.1-.1-.2-.1-.6-.2-.7.5-.7 1.3v10.4c.1.7.6 1.7 1.2 2.1z" fill="url(#SVGID_123_)"/><linearGradient id="SVGID_124_" gradientUnits="userSpaceOnUse" x1="317.054" y1="298.797" x2="391.99" y2="298.797"><stop offset="0" stop-color="#3154cb"/><stop offset=".03" stop-color="#3059ca"/><stop offset=".352" stop-color="#258cbc"/><stop offset=".632" stop-color="#1db2b2"/><stop offset=".858" stop-color="#19c9ac"/><stop offset="1" stop-color="#17d1aa"/></linearGradient><path d="M318 270.7V282c0 .8.5 1.8 1.2 2.2l72.7 41.9c.1 0 .1.1.2.1-.1.6-.6.9-1.1.6l-72.7-41.9c-.6-.4-1.2-1.4-1.2-2.2v-10.9c0-.9.4-1.3.9-1.1z" fill="url(#SVGID_124_)"/><g opacity=".5"><path class="st254" d="M371.2 309.9l-.9 1.7-1.7-2.1 1.3-1.3-1.9-2 .6-1.6 1.7 2.1-.2-2.5 2.1 1.2-.2 2.3 1.7-.1.6 2.3-1.9-.2 1.3 2.8-1.7.2-.8-2.8zM362.9 305.1l-.9 1.7-1.7-2.1 1.3-1.3-1.9-2 .6-1.6 1.7 2.1-.2-2.5 2.1 1.2-.2 2.3 1.7-.1.6 2.3-1.9-.2 1.3 2.8-1.7.2-.8-2.8zM354.5 300.3l-.9 1.7-1.7-2.1 1.3-1.3-1.9-2 .6-1.6 1.7 2.1-.2-2.5 2.1 1.2-.2 2.3 1.7-.1.6 2.3-1.9-.2 1.3 2.8-1.7.2-.8-2.8zM346.2 295.4l-.9 1.7-1.7-2.1 1.3-1.3-1.9-2 .6-1.6 1.7 2.1-.2-2.5 2.1 1.2-.2 2.3 1.7-.1.6 2.3-1.9-.2 1.3 2.8-1.7.2-.8-2.8zM337.8 290.6l-.9 1.7-1.7-2.1 1.3-1.3-1.9-2 .6-1.6 1.7 2.1-.2-2.5 2.1 1.2-.2 2.3 1.7-.1.6 2.3-1.9-.2 1.3 2.8-1.7.2-.8-2.8z"/></g></g></g></switch></svg>
\ No newline at end of file
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 90 520 540"><style>.st54{fill:#1d45ba}.st60{display:none;fill:#00fcff}.st254{fill:#e1f2ff}.st275{fill:#2c30d1}.st488{opacity:.3}</style><switch><g><defs><path id="SVGID_208_" d="M1479.8-1226.9s-8-7.6-8.2-7.8c-.2-.2-.2-.2-.2-.4v-12.8c0-.7 4 1.3 8.8 4.2 4.8 2.8 8.8 5.6 8.8 6.2v12.8c0 .2 0 .2-.2.2s-8.2-1.9-8.2-1.9-.3-.1-.4-.1c-.1 0-.4-.4-.4-.4zm-5.1-28.5c0-3.4 2.1-4.3 5.5-2.3s5.5 5.3 5.5 8.7v3.4c-3.9-2.5-7.1-4.5-11-6.5v-3.3zm-5.1-3v3.9c-2.1-.8-4.1-1.6-4.1-.9v20.6s0 .6.6 1.2c2.3 2.3 11.5 10.9 13.6 12.9.3.3.3.3.4.3.1.1.1.1.4.1 2.1.5 11.3 2.7 13.6 3.1.6.1.6-.5.6-.5v-20.6c0-.6-2-2.3-4.1-3.9v-3.9c0-5.8-4.7-13.3-10.5-16.7-5.8-3.3-10.5-1.4-10.5 4.4z"/></defs><clipPath id="SVGID_1_"><use xlink:href="#SVGID_208_" overflow="visible"/></clipPath><g clip-path="url(#SVGID_1_)"><defs><path id="SVGID_210_" d="M-195.6-686.9l3470.3 2041.5v-2467.7L-195.6-3154.7z"/></defs><clipPath id="SVGID_2_"><use xlink:href="#SVGID_210_" overflow="visible"/></clipPath></g><defs><path id="SVGID_226_" d="M1503.3-1235.2v5.1l5.1 3v14l5.8 3.5v-14.1l5.1 3v-5z"/></defs><clipPath id="SVGID_3_"><use xlink:href="#SVGID_226_" overflow="visible"/></clipPath><g clip-path="url(#SVGID_3_)"><defs><path id="SVGID_228_" d="M-195.6-686.9l3470.3 2041.5v-2467.7L-195.6-3154.7z"/></defs><clipPath id="SVGID_4_"><use xlink:href="#SVGID_228_" overflow="visible"/></clipPath></g><defs><path id="SVGID_244_" d="M1527.6-1215.8l3.5 2.1c1 .6 1.9 1.6 1.9 2.6 0 1.1-.9 1-1.9.4l-3.5-2.1v-3zm-5.8-8.5v19.1l5.8 3.4v-6l2.1 1.2 2.6 7.6 6.6 3.9-3.5-8.8c1.5.2 3.4-.5 3.4-3.8 0-3.6-2.4-8-6.9-10.6l-10.1-6z"/></defs><clipPath id="SVGID_5_"><use xlink:href="#SVGID_244_" overflow="visible"/></clipPath><g clip-path="url(#SVGID_5_)"><defs><path id="SVGID_246_" d="M-195.6-686.9l3470.3 2041.5v-2467.7L-195.6-3154.7z"/></defs><clipPath id="SVGID_6_"><use xlink:href="#SVGID_246_" overflow="visible"/></clipPath></g><g><defs><path id="SVGID_262_" d="M1542-1212.4v19.1l14.5 8.5v-5l-8.7-5.1v-2.1l8.5 5v-5.1l-8.5-5v-1.9l8.7 5.2v-5z"/></defs><clipPath id="SVGID_7_"><use xlink:href="#SVGID_262_" overflow="visible"/></clipPath><g clip-path="url(#SVGID_7_)"><defs><path id="SVGID_264_" d="M-195.6-686.9l3470.3 2041.5v-2467.7L-195.6-3154.7z"/></defs><clipPath id="SVGID_8_"><use xlink:href="#SVGID_264_" overflow="visible"/></clipPath></g></g><g><defs><path id="SVGID_280_" d="M1559.5-1202v5l7.3 4.3-7.3 5.2v4.5l15.2 9v-5.1l-7.5-4.4 7.3-5.2v-4.5z"/></defs><clipPath id="SVGID_9_"><use xlink:href="#SVGID_280_" overflow="visible"/></clipPath><g clip-path="url(#SVGID_9_)"><defs><path id="SVGID_282_" d="M-195.6-686.9l3470.3 2041.5v-2467.7L-195.6-3154.7z"/></defs><clipPath id="SVGID_10_"><use xlink:href="#SVGID_282_" overflow="visible"/></clipPath></g></g><g><defs><path id="SVGID_298_" d="M1582-1179.3c0-2.7 1.8-3.7 4.6-2.1s4.6 4.8 4.6 7.5-1.8 3.7-4.6 2.1-4.6-4.8-4.6-7.5m-5.9-3.4c0 5.9 4.6 12.5 10.5 16s10.5 2.2 10.5-3.7-4.6-12.6-10.5-16.1c-5.9-3.4-10.5-2.1-10.5 3.8"/></defs><clipPath id="SVGID_11_"><use xlink:href="#SVGID_298_" overflow="visible"/></clipPath><g clip-path="url(#SVGID_11_)"><defs><path id="SVGID_300_" d="M-195.6-686.9l3470.3 2041.5v-2467.7L-195.6-3154.7z"/></defs><clipPath id="SVGID_12_"><use xlink:href="#SVGID_300_" overflow="visible"/></clipPath></g></g><g><defs><path id="SVGID_316_" d="M1605.4-1170l3.5 2.1c1 .6 1.9 1.6 1.9 2.6 0 1.1-.9 1-1.9.4l-3.5-2.1v-3zm-5.9-8.5v19.1l5.8 3.4v-6l2.1 1.2 2.6 7.6 6.6 3.9-3.5-8.8c1.5.2 3.4-.5 3.4-3.8 0-3.6-2.4-8-6.9-10.6l-10.1-6z"/></defs><clipPath id="SVGID_13_"><use xlink:href="#SVGID_316_" overflow="visible"/></clipPath><g clip-path="url(#SVGID_13_)"><defs><path id="SVGID_318_" d="M-195.6-686.9l3470.3 2041.5v-2467.7L-195.6-3154.7z"/></defs><clipPath id="SVGID_14_"><use xlink:href="#SVGID_318_" overflow="visible"/></clipPath></g></g><path class="st60" d="M281.6-3.2c-20.7-13.1-37.5-3.2-37.5 22v-1.5c0-25.2 16.8-35.1 37.5-22 20.7 13 37.5 44.2 37.5 69.4v1.5c0-25.2-16.8-56.3-37.5-69.4zM319.1 88.8c8.4 7.6 14.7 20.7 14.7 31.6v1.5c0-10.9-6.3-24-14.7-31.6v-1.5z"/><g><g id="_x34__2_"><path id="XMLID_73_" d="M501.2 486.8l.4-224.3c0-6.6-4-14.3-9-17.1L237.1 98.1c-2.1-1.2-4.1-1.3-5.6-.5l-5.5 3.1 6.7 9.5.2 217.5c0 6.6 4 14.3 9 17.1l249.4 152.8 2.4-1 4.8-2.6c1.6-1.3 2.7-3.8 2.7-7.2z" fill="#164dd2"/><linearGradient id="XMLID_99_" gradientUnits="userSpaceOnUse" x1="524.966" y1="308.873" x2="170.823" y2="287.338"><stop offset="0" stop-color="#17d1aa"/><stop offset=".066" stop-color="#1ac2ae"/><stop offset=".265" stop-color="#229bb8"/><stop offset=".462" stop-color="#297cc0"/><stop offset=".652" stop-color="#2d66c6"/><stop offset=".835" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path id="XMLID_72_" d="M488 497.4L232.4 350.1c-4.9-2.9-9-10.5-9-17.1l-.2-225.4c0-6.6 4-9.6 9-6.8l255.6 147.3c4.9 2.9 9 10.5 9 17.1L497 484c0 6.5-4 16.2-9 13.4z" fill="url(#XMLID_99_)"/><path id="XMLID_71_" class="st275" d="M481.8 474.1L238.4 333.9c-2.2-1.3-4-4.6-4-7.6l-.2-203c0-2.9 1.8-4.3 4-3l243.4 140.2c2.2 1.3 4 4.6 4 7.6l.2 203c-.1 2.9-1.9 4.2-4 3z"/><linearGradient id="XMLID_100_" gradientUnits="userSpaceOnUse" x1="-174.26" y1="-110.999" x2="-191.424" y2="-133.608" gradientTransform="rotate(29.946 -529.97 1286.766) skewX(49.108)"><stop offset="0" stop-color="#2f009f"/><stop offset="1" stop-color="#3915a9"/></linearGradient><path id="XMLID_70_" d="M360.4 184.6l-1-.6c-1.3-.7-2.3-2.7-2.3-4.4 0-1.7 1-2.5 2.3-1.7l1 .6c1.3.7 2.3 2.7 2.3 4.4 0 1.7-1 2.5-2.3 1.7z" fill="url(#XMLID_100_)"/><linearGradient id="XMLID_101_" gradientUnits="userSpaceOnUse" x1="189.579" y1="333.843" x2="340.748" y2="680.587"><stop offset="0" stop-color="#17d1aa"/><stop offset=".073" stop-color="#1eb0b3"/><stop offset=".153" stop-color="#2493ba"/><stop offset=".243" stop-color="#297cc0"/><stop offset=".346" stop-color="#2c6ac5"/><stop offset=".469" stop-color="#2f5dc9"/><stop offset=".632" stop-color="#3156ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path id="XMLID_69_" d="M486 496.6l-14.5-1.2-244.4-140.8c-4.9-2.9-13.6-2.5-19.3.8L29.5 458.5l-9.4-.8v3.4c-.1 1.9 1 3.7 3.3 5.1L279 613.5c4.9 2.9 13.6 2.5 19.3-.8l183-99.7c3.1-1.8 4.7-4.1 4.7-6.3v-10.1z" fill="url(#XMLID_101_)"/><linearGradient id="XMLID_102_" gradientUnits="userSpaceOnUse" x1="531.369" y1="475.786" x2="-1.078" y2="478.509"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path id="XMLID_68_" d="M279 609.8L23.4 462.5c-4.9-2.9-4.3-7.8 1.4-11.1l183-105.9c5.7-3.3 14.3-3.7 19.3-.8l255.6 147.2c4.9 2.9 4.3 7.8-1.4 11.1l-183 105.9c-5.7 3.3-14.3 3.7-19.3.9z" fill="url(#XMLID_102_)"/><linearGradient id="XMLID_103_" gradientUnits="userSpaceOnUse" x1="175.983" y1="329.377" x2="414.625" y2="606.51"><stop offset="0" stop-color="#17d1aa"/><stop offset=".227" stop-color="#1cb9b0"/><stop offset=".704" stop-color="#297dc0"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path id="XMLID_67_" d="M352.5 560.2L109.2 420c-2.2-1.3-1.9-3.5.6-4.9L212 355.7c2.5-1.5 6.3-1.6 8.5-.4l243.4 140.2c2.2 1.3 1.9 3.5-.6 4.9L361 559.8c-2.5 1.5-6.3 1.6-8.5.4z" fill="url(#XMLID_103_)"/><linearGradient id="XMLID_104_" gradientUnits="userSpaceOnUse" x1="179.356" y1="458.625" x2="199.663" y2="552.993"><stop offset="0" stop-color="#17d1aa"/><stop offset=".227" stop-color="#1cb9b0"/><stop offset=".704" stop-color="#297dc0"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path id="XMLID_66_" d="M195 549.6l-67.4-38.8c-1.2-.7-1-1.8.3-2.6l54.5-31.6c1.3-.8 3.4-.9 4.5-.2l67.4 38.8c1.2.7 1 1.8-.3 2.6l-54.5 31.6c-1.3.8-3.3.9-4.5.2z" fill="url(#XMLID_104_)"/><path id="XMLID_65_" class="st54" d="M109.2 420l1.2.7 101.6-59c2.5-1.5 6.3-1.6 8.5-.4l242.1 139.5.6-.4c2.5-1.5 2.8-3.7.6-4.9L220.6 355.4c-2.2-1.3-6-1.1-8.5.4l-102.3 59.3c-2.6 1.4-2.8 3.6-.6 4.9z"/><path id="XMLID_64_" class="st54" d="M127.6 510.8l1.9 1.1 52.9-30.7c1.3-.8 3.4-.9 4.5-.2l65.5 37.7 1.6-.9c1.3-.8 1.5-2 .3-2.6l-67.4-38.8c-1.2-.7-3.2-.6-4.5.2L128 508.1c-1.4.8-1.5 2-.4 2.7z"/><path id="XMLID_63_" d="M195.3 549.7l-64.7-37.2c-1.1-.6-2.2-1.1-1.1-1.6l13.3-7.7c.3-.2 1.5.2 2.6.8l64.7 37.2c1.1.6 1.8 1.3 1.4 1.5l-13.5 7.8c-.4.2-1.6-.2-2.7-.8z" fill="#52fcff"/><g id="XMLID_57_"><linearGradient id="XMLID_105_" gradientUnits="userSpaceOnUse" x1="426.023" y1="451.822" x2="-51.773" y2="-202.313"><stop offset="0" stop-color="#17d1aa"/><stop offset=".205" stop-color="#1faab4"/><stop offset=".44" stop-color="#2785be"/><stop offset=".658" stop-color="#2c6ac5"/><stop offset=".852" stop-color="#305ac9"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path id="XMLID_62_" d="M447.4 491.2L204 351c-2.2-1.3-4-4.6-4-7.6l-.2-203c0-2.9 1.8-4.3 4-3l243.4 140.2c2.2 1.3 4 4.6 4 7.6l.2 203c-.1 2.9-1.9 4.3-4 3z" opacity=".15" fill="url(#XMLID_105_)"/><g id="XMLID_58_"><linearGradient id="XMLID_106_" gradientUnits="userSpaceOnUse" x1="423.971" y1="511.659" x2="-108.406" y2="-232.325"><stop offset="0" stop-color="#1d45ba"/><stop offset="1" stop-color="#fff"/></linearGradient><path id="XMLID_59_" d="M419.5 511.7c-.7 0-1.5-.2-2.2-.6L174 370.9c-2.6-1.5-4.6-5.3-4.6-8.6l-.2-203c0-2 .7-3.6 2-4.3 1.1-.7 2.5-.6 3.8.2l243.4 140.2c2.6 1.5 4.6 5.3 4.6 8.6l.2 203c0 2-.7 3.6-2 4.3-.5.3-1.1.4-1.7.4zM172.9 157c-.1 0-.3 0-.4.1-.4.2-.7.9-.7 2.1l.2 203c0 2.5 1.5 5.4 3.3 6.5l243.4 140.2c.3.2.9.5 1.3.2.4-.2.7-.9.7-2.1l-.2-203c0-2.5-1.5-5.4-3.3-6.5L173.8 157.3c-.2-.1-.6-.3-.9-.3z" fill="url(#XMLID_106_)"/></g></g></g><g opacity=".96"><linearGradient id="SVGID_15_" gradientUnits="userSpaceOnUse" x1="339.454" y1="204.652" x2="413.494" y2="335.455"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M374.4 257.5l-3.2.4c-7.8-9.9-15.7-19.7-23.5-29.6v-1.5-2.9c9 11.2 17.8 22.4 26.7 33.6z" fill="url(#SVGID_15_)"/><linearGradient id="SVGID_16_" gradientUnits="userSpaceOnUse" x1="349.404" y1="199.02" x2="423.443" y2="329.823"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M367.9 232.8c-1.4.2-2.9.3-4.3.5-.2 0-.3-.1-.5-.3-1.8-2.2-3.5-4.4-5.3-6.7-1.8-2.3-3.7-4.7-5.5-7-.9-1.1-1.7-2.2-2.6-3.3l-6.3-3.6c.3.4.6.8.9 1.1 1.7 2.1 3.3 4.2 5 6.3 1.6 2.1 3.3 4.1 4.9 6.2 1.5 2 3.1 3.9 4.6 5.9 1.5 1.9 2.9 3.7 4.4 5.5.2.2.3.3.4.2 1.2-.1 2.4-.3 3.6-.4 2.9-.3 5.8-.7 8.8-1 2.1-.2 4.3-.5 6.4-.7.4-.1.9-.1 1.3-.2l-6.4-3.6c-3.2.4-6.3.7-9.4 1.1z" fill="url(#SVGID_16_)"/><linearGradient id="SVGID_17_" gradientUnits="userSpaceOnUse" x1="333.988" y1="207.746" x2="408.028" y2="338.549"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M347.8 234.6c-.1.1-.1.1 0 0v4.5c5.2 6.6 10.4 13.2 15.7 19.8l3.2-.4c-6.4-8-12.6-15.9-18.9-23.9z" fill="url(#SVGID_17_)"/><linearGradient id="SVGID_18_" gradientUnits="userSpaceOnUse" x1="348.87" y1="199.322" x2="422.909" y2="330.125"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M379.1 241.7c-3.9.5-7.8 1-11.7 1.4.1.1.1.2.1.2 1 1.3 2 2.5 3 3.8l.1.1c2.8-.3 5.6-.7 8.5-1v-4.5z" fill="url(#SVGID_18_)"/><linearGradient id="SVGID_19_" gradientUnits="userSpaceOnUse" x1="347.324" y1="200.197" x2="421.363" y2="331"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M379.1 252.7c-1.3.2-2.6.3-3.9.5l3 3.9.9-.1v-4.3z" fill="url(#SVGID_19_)"/><linearGradient id="SVGID_20_" gradientUnits="userSpaceOnUse" x1="320.576" y1="215.337" x2="394.616" y2="346.14"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M350.2 261.1l.6.3-3.5 3.4v4.5l-.5-.3v-4.5l-3.4-7.4.6.3 3.1 6.6 3.1-2.9z" fill="url(#SVGID_20_)"/><linearGradient id="SVGID_21_" gradientUnits="userSpaceOnUse" x1="324.347" y1="213.203" x2="398.387" y2="344.006"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M356.2 274.5c-1.4-.8-2.6-2-3.5-3.4-.9-1.5-1.4-2.9-1.4-4.4 0-1.4.5-2.3 1.4-2.8.9-.4 2.1-.3 3.5.6 1.4.8 2.5 1.9 3.5 3.4.9 1.5 1.4 2.9 1.4 4.4 0 1.5-.5 2.4-1.4 2.8-1 .4-2.1.2-3.5-.6zm0-.5c1.2.7 2.2.9 3.1.5.8-.4 1.3-1.2 1.3-2.5s-.4-2.6-1.3-4c-.8-1.3-1.9-2.3-3.1-3-1.3-.7-2.3-.9-3.1-.5-.8.4-1.2 1.2-1.2 2.5s.4 2.6 1.2 3.9c.8 1.3 1.8 2.4 3.1 3.1z" fill="url(#SVGID_21_)"/><linearGradient id="SVGID_22_" gradientUnits="userSpaceOnUse" x1="329.172" y1="210.472" x2="403.212" y2="341.275"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M369.7 282.1l-.6-.3-3-5.8-2.5-1.4v4.2l-.5-.3v-9.9l3.3 1.9c1 .6 1.8 1.3 2.3 2.1.5.8.8 1.6.8 2.5 0 .9-.3 1.5-.8 1.6-.5.2-1.2.1-2-.4l3 5.8zm-6.1-12.8v4.8l2.6 1.5c1.9 1.1 2.8.8 2.8-.8 0-.8-.2-1.5-.7-2.1-.5-.6-1.1-1.2-1.9-1.7l-2.8-1.7z" fill="url(#SVGID_22_)"/><linearGradient id="SVGID_23_" gradientUnits="userSpaceOnUse" x1="334.433" y1="207.494" x2="408.473" y2="338.297"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M375.9 285.7c-1.4-.8-2.6-2-3.5-3.4-.9-1.5-1.4-2.9-1.4-4.4 0-1.4.5-2.3 1.4-2.8.9-.4 2.1-.3 3.5.6 1.4.8 2.5 1.9 3.5 3.4.9 1.5 1.4 2.9 1.4 4.4 0 1.5-.5 2.4-1.4 2.8-1 .4-2.2.2-3.5-.6zm0-.5c1.2.7 2.2.9 3.1.5.8-.4 1.3-1.2 1.3-2.5s-.4-2.6-1.3-4c-.8-1.3-1.9-2.3-3.1-3-1.3-.7-2.3-.9-3.1-.5-.8.4-1.2 1.2-1.2 2.5s.4 2.6 1.2 3.9c.8 1.4 1.8 2.4 3.1 3.1z" fill="url(#SVGID_23_)"/><linearGradient id="SVGID_24_" gradientUnits="userSpaceOnUse" x1="338.153" y1="205.388" x2="412.193" y2="336.192"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M382.9 289.6v-9.9l.5.3v9.9l-.5-.3z" fill="url(#SVGID_24_)"/><linearGradient id="SVGID_25_" gradientUnits="userSpaceOnUse" x1="321.525" y1="214.8" x2="395.565" y2="345.603"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M359.7 279.7l.2.1-.9 1.9-.2-.1-.7-2.5-.7 1.8-.2-.1-.9-2.9.2.1.8 2.6.7-1.8.2.1.7 2.5.8-1.7z" fill="url(#SVGID_25_)"/><linearGradient id="SVGID_26_" gradientUnits="userSpaceOnUse" x1="323.187" y1="213.859" x2="397.226" y2="344.663"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M362.5 281.3l.2.1v2.4l-.2-.1v-.5c-.2.3-.5.3-1 0-.3-.2-.6-.5-.9-.8-.2-.4-.3-.7-.3-1.1 0-.4.1-.6.3-.7s.5-.1.9.1c.2.1.4.3.6.5.2.2.3.4.4.7v-.6zm-1 1.7c.3.2.5.2.7.1.2-.1.3-.3.3-.6s-.1-.6-.3-.9c-.2-.3-.4-.6-.7-.7-.3-.2-.5-.2-.7-.1-.2.1-.3.3-.3.6s.1.6.3.9c.2.3.4.5.7.7z" fill="url(#SVGID_26_)"/><g><linearGradient id="SVGID_27_" gradientUnits="userSpaceOnUse" x1="324.476" y1="213.13" x2="398.516" y2="343.933"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M363.7 284.4v-3.7l.2.1v3.7l-.2-.1z" fill="url(#SVGID_27_)"/></g><g><linearGradient id="SVGID_28_" gradientUnits="userSpaceOnUse" x1="325.122" y1="212.764" x2="399.161" y2="343.568"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M365 285.1v-3.7l.2.1v3.7l-.2-.1z" fill="url(#SVGID_28_)"/></g><g><linearGradient id="SVGID_29_" gradientUnits="userSpaceOnUse" x1="325.934" y1="212.305" x2="399.973" y2="343.108"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M368.2 285.7v.1l-2-1.2c0 .3.1.6.3.9s.4.5.7.7c.3.2.6.2.8.1l.1.2c-.2.2-.5.1-.9-.1-.3-.2-.6-.5-.8-.8-.2-.4-.3-.7-.3-1.1 0-.4.1-.6.3-.7.2-.1.5-.1.8.1.3.2.6.4.8.8.1.3.2.6.2 1zm-1-1.6c-.3-.1-.5-.2-.7-.1-.2.1-.3.2-.3.5l1.9 1.1c0-.3-.1-.6-.3-.8-.2-.4-.4-.6-.6-.7z" fill="url(#SVGID_29_)"/></g><g><linearGradient id="SVGID_30_" gradientUnits="userSpaceOnUse" x1="327.312" y1="211.525" x2="401.351" y2="342.328"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M369.7 287.8c-.2-.1-.4-.3-.4-.4-.1-.2-.1-.3-.1-.6v-1.6l-.3-.2v-.2l.3.2v-.9l.2.1v.9l.9.5v.2l-.9-.5v1.5c0 .2 0 .4.1.5l.3.3c.2.1.3.1.5.1v.2c-.2.1-.4 0-.6-.1z" fill="url(#SVGID_30_)"/></g><g><linearGradient id="SVGID_31_" gradientUnits="userSpaceOnUse" x1="316.678" y1="217.544" x2="390.717" y2="348.347"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path fill="url(#SVGID_31_)" d="M343.2 271.8l12.4 7.1"/></g><g><linearGradient id="SVGID_32_" gradientUnits="userSpaceOnUse" x1="330.974" y1="209.452" x2="405.013" y2="340.255"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path fill="url(#SVGID_32_)" d="M371.1 287.7l12.4 7.1"/></g></g><linearGradient id="SVGID_33_" gradientUnits="userSpaceOnUse" x1="-1164.786" y1="422.565" x2="-1079.545" y2="269.077" gradientTransform="matrix(-1 0 0 1 -758.16 0)"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path d="M263 277.6l12.9-7.4c.2-.1.4-.1.6 0l161.1 93c.5.3 1 1.1 1 1.8v30.4c0 .3-.1.6-.3.7l-13 7.5-.1-14.7-148.7-85.8c-.5-.3-1-1.1-1-1.8v-10.4L263 277.6z" fill="url(#SVGID_33_)"/><path class="st254" d="M263.5 310.6l161.1 93c.5.3 1 0 1-.7v-30.4c0-.7-.4-1.5-1-1.8l-161.1-93c-.5-.3-1 0-1 .7v30.4c.1.7.5 1.5 1 1.8z"/><path d="M285.7 304.5l125.5 73.8c-3.9 3.3-7.5 7.2-10.9 11.4l-126.4-73c3.6-4.6 7.6-8.7 11.8-12.2z" opacity=".6" fill="#242993"/><path class="st275" d="M268.1 301.5L420 389.2c.4.2.7 0 .7-.5v-7.6c0-.5-.3-1-.7-1.2l-151.9-87.7c-.4-.2-.7 0-.7.5v7.6c.1.4.4 1 .7 1.2z"/><path d="M268.1 292.1l3.1 1.8v4.1c0 .5.3 1 .7 1.2l148.8 85.9v3.5c0 .5-.3.7-.7.5l-151.9-87.7c-.4-.2-.7-.8-.7-1.2v-7.6c.1-.5.4-.7.7-.5z" fill="#4553c7"/><linearGradient id="SVGID_34_" gradientUnits="userSpaceOnUse" x1="-906.719" y1="622.48" x2="-1087.039" y2="302.97" gradientTransform="matrix(-1 0 0 1 -758.16 0)"><stop offset=".001" stop-color="#d7f2ff"/><stop offset=".092" stop-color="#daf3ff"/><stop offset=".157" stop-color="#e3f8ff"/><stop offset=".212" stop-color="#f2ffff"/><stop offset=".219" stop-color="#eefefe"/><stop offset=".268" stop-color="#daf9f8"/><stop offset=".323" stop-color="#cdf5f4"/><stop offset=".392" stop-color="#c4f3f2"/><stop offset=".513" stop-color="#c2f2f1"/><stop offset=".652" stop-color="#d2f2f8"/><stop offset=".755" stop-color="#e1f2ff"/><stop offset="1" stop-color="#c6f2ff"/></linearGradient><path d="M182.8 630.6l-126.4-73c16.3-9.4 30-30 34.2-49.7 1.7-8 6.6-14.9 13.7-19l95.5-55.1c26.6-15.4 43.8-43 45.7-73.7 1.5-25.9 21.1-51.3 36.3-60.1l126.4 73c-15 8.6-31.4 32.8-33.3 58.2-2.3 30.7-18.9 58.4-45.6 73.8l-98.6 56.9c-7.1 4.1-12 11-13.7 19-4.2 19.7-17.9 40.3-34.2 49.7z" opacity=".96" fill="url(#SVGID_34_)"/><g class="st488"><linearGradient id="SVGID_35_" gradientUnits="userSpaceOnUse" x1="232.06" y1="387.826" x2="355.616" y2="391.967"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_35_)" d="M329.3 386.3l22.1 12.8.2-2.5-22.1-12.8z"/><linearGradient id="SVGID_36_" gradientUnits="userSpaceOnUse" x1="232.395" y1="377.835" x2="355.951" y2="381.976"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_36_)" d="M318.1 379.8l7.8 4.6.2-2.5-7.8-4.6z"/><linearGradient id="SVGID_37_" gradientUnits="userSpaceOnUse" x1="232.575" y1="372.47" x2="356.131" y2="376.611"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_37_)" d="M309.5 374.8l5.3 3.1.2-2.5-5.2-3z"/><linearGradient id="SVGID_38_" gradientUnits="userSpaceOnUse" x1="231.774" y1="396.387" x2="355.329" y2="400.529"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_38_)" d="M338.8 397.9L351 405l.2-2.6-12.2-7z"/><linearGradient id="SVGID_39_" gradientUnits="userSpaceOnUse" x1="232.082" y1="387.179" x2="355.638" y2="391.321"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_39_)" d="M320.8 387.4l14.6 8.5.2-2.5-14.6-8.5z"/><linearGradient id="SVGID_40_" gradientUnits="userSpaceOnUse" x1="232.327" y1="379.882" x2="355.882" y2="384.024"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_40_)" d="M312.1 382.3l5.3 3.1.3-2.5-5.3-3z"/><linearGradient id="SVGID_41_" gradientUnits="userSpaceOnUse" x1="232.477" y1="375.411" x2="356.032" y2="379.553"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_41_)" d="M304 377.6l5.2 3.1.3-2.5-5.3-3.1z"/><linearGradient id="SVGID_42_" gradientUnits="userSpaceOnUse" x1="231.545" y1="403.2" x2="355.101" y2="407.342"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_42_)" d="M341.7 405.7l8.9 5.2.2-2.6-8.9-5.1z"/><linearGradient id="SVGID_43_" gradientUnits="userSpaceOnUse" x1="231.718" y1="398.049" x2="355.274" y2="402.191"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_43_)" d="M335.3 402l3 1.7.2-2.5-3-1.8z"/><linearGradient id="SVGID_44_" gradientUnits="userSpaceOnUse" x1="231.858" y1="393.868" x2="355.414" y2="398.009"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_44_)" d="M326.5 396.8l5.4 3.2.2-2.6-5.4-3.1z"/><linearGradient id="SVGID_45_" gradientUnits="userSpaceOnUse" x1="231.564" y1="402.637" x2="355.12" y2="406.779"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_45_)" d="M317.7 397.8l32.5 19.1.2-2.6-32.4-19.1z"/><linearGradient id="SVGID_46_" gradientUnits="userSpaceOnUse" x1="232.001" y1="389.61" x2="355.556" y2="393.752"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_46_)" d="M306.5 391.2l7.9 4.6.2-2.5-7.8-4.6z"/><linearGradient id="SVGID_47_" gradientUnits="userSpaceOnUse" x1="231.145" y1="415.145" x2="354.7" y2="419.287"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_47_)" d="M340.8 417.6l9 5.3.1-2.6-8.9-5.3z"/><linearGradient id="SVGID_48_" gradientUnits="userSpaceOnUse" x1="231.453" y1="405.949" x2="355.009" y2="410.091"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_48_)" d="M320.2 405.4l17.2 10.2.2-2.6-17.2-10.2z"/><linearGradient id="SVGID_49_" gradientUnits="userSpaceOnUse" x1="231.727" y1="397.774" x2="355.283" y2="401.916"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_49_)" d="M311.4 400.2l5.4 3.2.2-2.6-5.3-3.1z"/><linearGradient id="SVGID_50_" gradientUnits="userSpaceOnUse" x1="231.029" y1="418.595" x2="354.585" y2="422.737"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_50_)" d="M331.1 418.1l18.2 10.9.2-2.7-18.2-10.8z"/><linearGradient id="SVGID_51_" gradientUnits="userSpaceOnUse" x1="231.387" y1="407.926" x2="354.942" y2="412.068"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_51_)" d="M314.7 408.4l12.9 7.7.3-2.6-13-7.7z"/><linearGradient id="SVGID_52_" gradientUnits="userSpaceOnUse" x1="231.653" y1="399.99" x2="355.208" y2="404.132"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_52_)" d="M302.7 401.2l8.6 5.2.3-2.6-8.7-5.1z"/><linearGradient id="SVGID_53_" gradientUnits="userSpaceOnUse" x1="230.711" y1="428.076" x2="354.267" y2="432.217"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_53_)" d="M342.7 431.4l6.2 3.7.2-2.6-6.2-3.8z"/><linearGradient id="SVGID_54_" gradientUnits="userSpaceOnUse" x1="230.913" y1="422.064" x2="354.469" y2="426.205"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_54_)" d="M331 424.4l8.2 4.9.2-2.6-8.1-4.9z"/><linearGradient id="SVGID_55_" gradientUnits="userSpaceOnUse" x1="231.177" y1="414.186" x2="354.733" y2="418.327"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_55_)" d="M314.6 414.6l13 7.8.2-2.7-12.9-7.7z"/><linearGradient id="SVGID_56_" gradientUnits="userSpaceOnUse" x1="230.626" y1="430.621" x2="354.182" y2="434.762"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_56_)" d="M329.4 429.9l19.1 11.4.2-2.7-19.1-11.4z"/><linearGradient id="SVGID_57_" gradientUnits="userSpaceOnUse" x1="231.038" y1="418.32" x2="354.594" y2="422.462"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_57_)" d="M308.5 417.3l17.5 10.5.2-2.7-17.4-10.4z"/><linearGradient id="SVGID_58_" gradientUnits="userSpaceOnUse" x1="231.32" y1="409.929" x2="354.875" y2="414.071"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_58_)" d="M299.7 412l5.4 3.2.3-2.6-5.4-3.2z"/><linearGradient id="SVGID_59_" gradientUnits="userSpaceOnUse" x1="231.478" y1="405.197" x2="355.034" y2="409.339"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_59_)" d="M291.4 407l5.3 3.2.3-2.6-5.3-3.2z"/><linearGradient id="SVGID_60_" gradientUnits="userSpaceOnUse" x1="230.346" y1="438.969" x2="353.902" y2="443.11"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_60_)" d="M336.5 440.6l11.5 7 .2-2.8-11.5-6.9z"/><linearGradient id="SVGID_61_" gradientUnits="userSpaceOnUse" x1="233.187" y1="354.209" x2="356.743" y2="358.351"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_61_)" d="M285.8 361.1l-14.4-8.4.3-2.3 14.4 8.3z"/><linearGradient id="SVGID_62_" gradientUnits="userSpaceOnUse" x1="233.032" y1="358.846" x2="356.588" y2="362.988"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_62_)" d="M282 364.8l-11.3-6.6.3-2.4 11.3 6.6z"/><linearGradient id="SVGID_63_" gradientUnits="userSpaceOnUse" x1="232.876" y1="363.502" x2="356.432" y2="367.644"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_63_)" d="M278.2 368.5l-8.3-4.8.4-2.4 8.2 4.8z"/><linearGradient id="SVGID_64_" gradientUnits="userSpaceOnUse" x1="232.654" y1="370.116" x2="356.21" y2="374.258"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_64_)" d="M281.3 376.3l-12.1-7.1.3-2.4 12.1 7.1z"/><linearGradient id="SVGID_65_" gradientUnits="userSpaceOnUse" x1="232.501" y1="374.68" x2="356.057" y2="378.821"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_65_)" d="M276.8 379.7l-8.3-4.9.3-2.4 8.3 4.8z"/><linearGradient id="SVGID_66_" gradientUnits="userSpaceOnUse" x1="232.29" y1="380.968" x2="355.846" y2="385.109"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_66_)" d="M278.3 386.7l-10.6-6.3.4-2.4 10.5 6.2z"/><linearGradient id="SVGID_67_" gradientUnits="userSpaceOnUse" x1="232.145" y1="385.312" x2="355.7" y2="389.453"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_67_)" d="M272.7 389.6l-5.7-3.5.3-2.5 5.8 3.4z"/><linearGradient id="SVGID_68_" gradientUnits="userSpaceOnUse" x1="231.9" y1="392.607" x2="355.456" y2="396.748"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_68_)" d="M277.5 398.6l-11.3-6.8.4-2.5 11.2 6.8z"/><linearGradient id="SVGID_69_" gradientUnits="userSpaceOnUse" x1="231.711" y1="398.244" x2="355.267" y2="402.385"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_69_)" d="M276.1 404.1l-10.6-6.5.3-2.5 10.7 6.4z"/><linearGradient id="SVGID_70_" gradientUnits="userSpaceOnUse" x1="230.569" y1="432.318" x2="354.125" y2="436.46"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_70_)" d="M328.2 435.6l4.8 2.9.2-2.7-4.8-2.9z"/><linearGradient id="SVGID_71_" gradientUnits="userSpaceOnUse" x1="230.784" y1="425.906" x2="354.34" y2="430.047"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_71_)" d="M314 426.9l10.7 6.6.3-2.7-10.8-6.5z"/></g><g class="st488"><linearGradient id="SVGID_72_" gradientUnits="userSpaceOnUse" x1="166.179" y1="450.601" x2="303.933" y2="469.711"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_72_)" d="M247.7 470l-33-19.1 2.4-1.3 32.9 19z"/><linearGradient id="SVGID_73_" gradientUnits="userSpaceOnUse" x1="164.407" y1="463.378" x2="302.16" y2="482.489"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_73_)" d="M266.8 481l-11.9-6.8 2.4-1.4 11.9 6.9z"/><linearGradient id="SVGID_74_" gradientUnits="userSpaceOnUse" x1="163.586" y1="469.294" x2="301.34" y2="488.404"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_74_)" d="M276.4 486.5l-3.5-2 2.3-1.3 3.5 2z"/><linearGradient id="SVGID_76_" gradientUnits="userSpaceOnUse" x1="162.766" y1="475.209" x2="300.519" y2="494.319"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_76_)" d="M294.3 496.9l-11.9-6.9 2.4-1.3 11.9 6.8z"/><g><linearGradient id="SVGID_77_" gradientUnits="userSpaceOnUse" x1="166.401" y1="449.003" x2="304.154" y2="468.113"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_77_)" d="M219.5 459.3l-9.7-5.5 2.4-1.4 9.6 5.6z"/><linearGradient id="SVGID_78_" gradientUnits="userSpaceOnUse" x1="164.628" y1="461.781" x2="302.382" y2="480.891"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_78_)" d="M261.9 483.8l-35.2-20.3 2.4-1.3 35.2 20.3z"/><linearGradient id="SVGID_79_" gradientUnits="userSpaceOnUse" x1="163.112" y1="472.715" x2="300.865" y2="491.825"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_79_)" d="M271.5 489.4l-3.5-2.1 2.4-1.3 3.4 2z"/><linearGradient id="SVGID_80_" gradientUnits="userSpaceOnUse" x1="162.291" y1="478.63" x2="300.044" y2="497.74"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_80_)" d="M289.4 499.7l-11.9-6.8 2.4-1.4 11.9 6.9z"/><linearGradient id="SVGID_81_" gradientUnits="userSpaceOnUse" x1="166.07" y1="451.388" x2="303.824" y2="470.498"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_81_)" d="M209.8 459.3l-4.8-2.7 2.3-1.4 4.8 2.8z"/><linearGradient id="SVGID_82_" gradientUnits="userSpaceOnUse" x1="165.322" y1="456.78" x2="303.076" y2="475.891"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_82_)" d="M222.8 466.8l-5.8-3.3 2.4-1.3 5.7 3.3z"/><linearGradient id="SVGID_83_" gradientUnits="userSpaceOnUse" x1="164.686" y1="461.365" x2="302.44" y2="480.476"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_83_)" d="M232.3 472.4l-3.5-2.1 2.4-1.3 3.4 2z"/><linearGradient id="SVGID_84_" gradientUnits="userSpaceOnUse" x1="163.865" y1="467.28" x2="301.619" y2="486.391"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_84_)" d="M250.2 482.7l-11.8-6.9 2.3-1.3 11.9 6.9z"/><linearGradient id="SVGID_85_" gradientUnits="userSpaceOnUse" x1="165.452" y1="455.845" x2="303.205" y2="474.955"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_85_)" d="M209.7 464.9l-9.6-5.5 2.3-1.4 9.7 5.6z"/><linearGradient id="SVGID_86_" gradientUnits="userSpaceOnUse" x1="164.375" y1="463.604" x2="302.129" y2="482.714"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_86_)" d="M228.9 476l-11.9-6.9 2.3-1.3 11.9 6.8z"/><linearGradient id="SVGID_87_" gradientUnits="userSpaceOnUse" x1="163.555" y1="469.519" x2="301.308" y2="488.629"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_87_)" d="M238.4 481.5l-3.5-2 2.4-1.4 3.5 2.1z"/><linearGradient id="SVGID_89_" gradientUnits="userSpaceOnUse" x1="162.734" y1="475.434" x2="300.488" y2="494.545"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_89_)" d="M256.4 491.9l-11.9-6.9 2.3-1.3 11.9 6.8z"/></g><g><linearGradient id="SVGID_90_" gradientUnits="userSpaceOnUse" x1="164.245" y1="464.542" x2="301.999" y2="483.652"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_90_)" d="M227.8 481.4l-32.9-19 2.3-1.4 33 19.1z"/><linearGradient id="SVGID_91_" gradientUnits="userSpaceOnUse" x1="162.473" y1="477.32" x2="300.226" y2="496.43"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_91_)" d="M247 492.5l-11.9-6.9 2.3-1.3 11.9 6.8z"/><linearGradient id="SVGID_92_" gradientUnits="userSpaceOnUse" x1="161.652" y1="483.235" x2="299.406" y2="502.345"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_92_)" d="M256.5 498l-3.5-2 2.4-1.4 3.5 2z"/><linearGradient id="SVGID_93_" gradientUnits="userSpaceOnUse" x1="160.832" y1="489.15" x2="298.585" y2="508.261"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_93_)" d="M274.5 508.4l-11.9-6.9 2.3-1.4 11.9 6.9z"/><g><linearGradient id="SVGID_94_" gradientUnits="userSpaceOnUse" x1="164.467" y1="462.944" x2="302.221" y2="482.055"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_94_)" d="M199.6 470.8l-9.6-5.6 2.3-1.3 9.7 5.5z"/><linearGradient id="SVGID_95_" gradientUnits="userSpaceOnUse" x1="162.694" y1="475.722" x2="300.448" y2="494.832"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_95_)" d="M242.1 495.3L206.9 475l2.3-1.4 35.3 20.3z"/><linearGradient id="SVGID_96_" gradientUnits="userSpaceOnUse" x1="161.178" y1="486.656" x2="298.931" y2="505.767"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_96_)" d="M251.6 500.8l-3.4-2 2.3-1.4 3.5 2.1z"/><linearGradient id="SVGID_97_" gradientUnits="userSpaceOnUse" x1="160.357" y1="492.571" x2="298.11" y2="511.682"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_97_)" d="M269.6 511.2l-11.9-6.9 2.4-1.3 11.8 6.8z"/><linearGradient id="SVGID_98_" gradientUnits="userSpaceOnUse" x1="164.136" y1="465.329" x2="301.89" y2="484.44"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_98_)" d="M189.9 470.8l-4.8-2.8 2.4-1.3 4.8 2.7z"/><linearGradient id="SVGID_99_" gradientUnits="userSpaceOnUse" x1="163.388" y1="470.722" x2="301.142" y2="489.832"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_99_)" d="M202.9 478.3l-5.7-3.3 2.4-1.4 5.7 3.3z"/><linearGradient id="SVGID_100_" gradientUnits="userSpaceOnUse" x1="162.752" y1="475.307" x2="300.505" y2="494.417"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_100_)" d="M212.5 483.8l-3.5-2 2.3-1.4 3.5 2z"/><linearGradient id="SVGID_101_" gradientUnits="userSpaceOnUse" x1="161.931" y1="481.222" x2="299.685" y2="500.332"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_101_)" d="M230.4 494.2l-11.9-6.9 2.4-1.4 11.9 6.9z"/><linearGradient id="SVGID_102_" gradientUnits="userSpaceOnUse" x1="163.518" y1="469.786" x2="301.271" y2="488.897"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_102_)" d="M189.9 476.4l-9.7-5.6 2.4-1.3 9.6 5.5z"/><linearGradient id="SVGID_103_" gradientUnits="userSpaceOnUse" x1="162.441" y1="477.545" x2="300.195" y2="496.655"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_103_)" d="M209 487.5l-11.9-6.9 2.4-1.4 11.9 6.9z"/><linearGradient id="SVGID_104_" gradientUnits="userSpaceOnUse" x1="161.621" y1="483.46" x2="299.374" y2="502.571"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_104_)" d="M218.6 493l-3.5-2 2.3-1.4 3.5 2z"/><linearGradient id="SVGID_105_" gradientUnits="userSpaceOnUse" x1="160.8" y1="489.376" x2="298.554" y2="508.486"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_105_)" d="M236.5 503.3l-11.9-6.8 2.4-1.4 11.9 6.9z"/></g></g><g><linearGradient id="SVGID_106_" gradientUnits="userSpaceOnUse" x1="162.311" y1="478.483" x2="300.065" y2="497.594"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_106_)" d="M208 492.9l-33-19 2.4-1.4 32.9 19z"/><linearGradient id="SVGID_107_" gradientUnits="userSpaceOnUse" x1="160.539" y1="491.261" x2="298.292" y2="510.371"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_107_)" d="M227.1 503.9l-11.9-6.8 2.4-1.4 11.9 6.9z"/><linearGradient id="SVGID_109_" gradientUnits="userSpaceOnUse" x1="159.718" y1="497.176" x2="297.471" y2="516.287"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_109_)" d="M236.7 509.5l-3.5-2.1 2.3-1.3 3.5 2z"/><linearGradient id="SVGID_110_" gradientUnits="userSpaceOnUse" x1="158.897" y1="503.092" x2="296.651" y2="522.202"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_110_)" d="M254.6 519.8l-11.9-6.8 2.4-1.4 11.9 6.9z"/><g><linearGradient id="SVGID_111_" gradientUnits="userSpaceOnUse" x1="162.533" y1="476.886" x2="300.286" y2="495.996"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_111_)" d="M179.8 482.2l-9.7-5.5 2.4-1.4 9.6 5.6z"/><linearGradient id="SVGID_112_" gradientUnits="userSpaceOnUse" x1="160.76" y1="489.663" x2="298.514" y2="508.774"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_112_)" d="M222.3 506.8L187 486.4l2.4-1.3 35.2 20.3z"/><linearGradient id="SVGID_113_" gradientUnits="userSpaceOnUse" x1="159.243" y1="500.597" x2="296.997" y2="519.708"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_113_)" d="M231.8 512.3l-3.5-2 2.4-1.4 3.5 2z"/><linearGradient id="SVGID_114_" gradientUnits="userSpaceOnUse" x1="158.423" y1="506.513" x2="296.176" y2="525.623"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_114_)" d="M249.7 522.6l-11.8-6.8 2.3-1.4 11.9 6.9z"/><linearGradient id="SVGID_115_" gradientUnits="userSpaceOnUse" x1="162.202" y1="479.271" x2="299.955" y2="498.381"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_115_)" d="M170.1 482.3l-4.8-2.8 2.3-1.4 4.8 2.8z"/><linearGradient id="SVGID_116_" gradientUnits="userSpaceOnUse" x1="161.454" y1="484.663" x2="299.207" y2="503.773"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_116_)" d="M183.1 489.8l-5.7-3.3 2.3-1.4 5.7 3.3z"/><linearGradient id="SVGID_117_" gradientUnits="userSpaceOnUse" x1="160.818" y1="489.248" x2="298.571" y2="508.358"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_117_)" d="M192.6 495.3l-3.5-2 2.4-1.4 3.5 2z"/><linearGradient id="SVGID_118_" gradientUnits="userSpaceOnUse" x1="159.997" y1="495.163" x2="297.751" y2="514.273"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_118_)" d="M210.6 505.6l-11.9-6.8 2.3-1.4 11.9 6.9z"/><linearGradient id="SVGID_119_" gradientUnits="userSpaceOnUse" x1="161.584" y1="483.728" x2="299.337" y2="502.838"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_119_)" d="M170 487.9l-9.6-5.6 2.4-1.4 9.6 5.6z"/><linearGradient id="SVGID_120_" gradientUnits="userSpaceOnUse" x1="160.507" y1="491.486" x2="298.261" y2="510.597"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_120_)" d="M189.2 498.9l-11.9-6.8 2.4-1.4 11.8 6.9z"/><linearGradient id="SVGID_121_" gradientUnits="userSpaceOnUse" x1="159.687" y1="497.402" x2="297.44" y2="516.512"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_121_)" d="M198.7 504.4l-3.4-2 2.3-1.3 3.5 2z"/><linearGradient id="SVGID_122_" gradientUnits="userSpaceOnUse" x1="158.866" y1="503.317" x2="296.62" y2="522.427"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path fill="url(#SVGID_122_)" d="M216.7 514.8l-11.9-6.9 2.3-1.3 11.9 6.8z"/></g></g></g><linearGradient id="SVGID_123_" gradientUnits="userSpaceOnUse" x1="317.298" y1="298.629" x2="392.014" y2="298.629"><stop offset="0" stop-color="#17d1aa"/><stop offset=".142" stop-color="#19c9ac"/><stop offset=".368" stop-color="#1db2b2"/><stop offset=".648" stop-color="#258cbc"/><stop offset=".97" stop-color="#3059ca"/><stop offset="1" stop-color="#3154cb"/></linearGradient><path d="M318.4 284.6l72.2 41.6c.6.3 1.3.7 1.4 0V315c0-.8-.5-1.8-1.2-2.2l-72.7-41.9c-.1 0-.1-.1-.2-.1-.6-.2-.7.5-.7 1.3v10.4c.1.7.6 1.7 1.2 2.1z" fill="url(#SVGID_123_)"/><linearGradient id="SVGID_124_" gradientUnits="userSpaceOnUse" x1="317.054" y1="298.797" x2="391.99" y2="298.797"><stop offset="0" stop-color="#3154cb"/><stop offset=".03" stop-color="#3059ca"/><stop offset=".352" stop-color="#258cbc"/><stop offset=".632" stop-color="#1db2b2"/><stop offset=".858" stop-color="#19c9ac"/><stop offset="1" stop-color="#17d1aa"/></linearGradient><path d="M318 270.7V282c0 .8.5 1.8 1.2 2.2l72.7 41.9c.1 0 .1.1.2.1-.1.6-.6.9-1.1.6l-72.7-41.9c-.6-.4-1.2-1.4-1.2-2.2v-10.9c0-.9.4-1.3.9-1.1z" fill="url(#SVGID_124_)"/><g opacity=".5"><path class="st254" d="M371.2 309.9l-.9 1.7-1.7-2.1 1.3-1.3-1.9-2 .6-1.6 1.7 2.1-.2-2.5 2.1 1.2-.2 2.3 1.7-.1.6 2.3-1.9-.2 1.3 2.8-1.7.2-.8-2.8zM362.9 305.1l-.9 1.7-1.7-2.1 1.3-1.3-1.9-2 .6-1.6 1.7 2.1-.2-2.5 2.1 1.2-.2 2.3 1.7-.1.6 2.3-1.9-.2 1.3 2.8-1.7.2-.8-2.8zM354.5 300.3l-.9 1.7-1.7-2.1 1.3-1.3-1.9-2 .6-1.6 1.7 2.1-.2-2.5 2.1 1.2-.2 2.3 1.7-.1.6 2.3-1.9-.2 1.3 2.8-1.7.2-.8-2.8zM346.2 295.4l-.9 1.7-1.7-2.1 1.3-1.3-1.9-2 .6-1.6 1.7 2.1-.2-2.5 2.1 1.2-.2 2.3 1.7-.1.6 2.3-1.9-.2 1.3 2.8-1.7.2-.8-2.8zM337.8 290.6l-.9 1.7-1.7-2.1 1.3-1.3-1.9-2 .6-1.6 1.7 2.1-.2-2.5 2.1 1.2-.2 2.3 1.7-.1.6 2.3-1.9-.2 1.3 2.8-1.7.2-.8-2.8z"/></g></g></g></switch></svg>
\ No newline at end of file
diff --git a/packages/yoroi-extension/app/components/transfer/cards/TransferCards.js b/packages/yoroi-extension/app/components/transfer/cards/TransferCards.js
index f63a391da8..ae8bb0fe13 100644
--- a/packages/yoroi-extension/app/components/transfer/cards/TransferCards.js
+++ b/packages/yoroi-extension/app/components/transfer/cards/TransferCards.js
@@ -8,7 +8,8 @@ import globalMessages from '../../../i18n/global-messages';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import CustomTooltip from '../../widgets/CustomTooltip';
 
-import styles from './TransferCards.scss';
+import { Box, Button, Typography, styled } from '@mui/material';
+import PaperWalletLogo from '../../../assets/images/add-wallet/option-dialog/restore-paper-wallet-modern.inline.svg';
 
 const messages = defineMessages({
   yoroiPaperLabel: {
@@ -17,6 +18,23 @@ const messages = defineMessages({
   },
 });
 
+const GradientBox = styled(Box)(({ theme }: any) => ({
+  backgroundImage: theme.palette.ds.bg_gradient_1,
+  '&:hover': {
+    backgroundImage: theme.palette.ds.bg_gradient_2,
+  },
+}));
+
+const SBox = styled(Box)(({ theme }) => ({
+  '& svg': {
+    width: "20px",
+    height: "20px",
+    '& g': {
+      fill: theme.palette.ds.el_gray_medium,
+    },
+  },
+}));
+
 type Props = {|
   +onByron: void => void,
 |};
@@ -31,38 +49,30 @@ export default class TransferCards extends Component<Props> {
     const { intl } = this.context;
 
     return (
-      <div className={styles.heroCardsList}>
-        {/* paper wallet */}
-        <button
-          type="button"
-          className="TransferCards_byronEra"
-          onClick={this.props.onByron}
-        >
-          <div
-            className={classnames([
-              styles.heroCardsItem,
-              styles.heroCardsItemBg,
-              styles.bgByronMainnet,
-            ])}
-          >
-            <div className={styles.heroCardsItemTitle}>
-              {intl.formatMessage(messages.yoroiPaperLabel)}
-              <div className={styles.tooltip}>
-                <CustomTooltip
-                  toolTip={
-                    <div className={styles.tooltipSize}>
+      <Box display="flex">
+        <GradientBox component="button" onClick={this.props.onByron} borderRadius="8px" width="312px" height="475px">
+          <Box padding="24px" textAlign="center" display="flex" flexDirection="column" justifyContent="flex-end" height="100%">
+            <Box marginBottom="60px">
+              <img src={PaperWalletLogo} alt={intl.formatMessage(messages.yoroiPaperLabel)} />
+            </Box>
+            <SBox paddingTop="32px" display="flex" flexDirection="row" justifyContent="space-between" alignItems="flex-end">
+              <Typography color="ds.text_gray_max" variant="h4" fontWeight={500} textAlign="center">
+                {intl.formatMessage(messages.yoroiPaperLabel)}
+              </Typography>
+              <CustomTooltip
+                toolTip={
+                  <Box>
+                    <Typography color="ds.gray_min">
                       {intl.formatMessage(globalMessages.restoreByronEraWalletDescription)}
-                    </div>
-                  }
-                />
-              </div>
-            </div>
-            <div className={styles.heroCardsItemDate}>
-              2017-2020
-            </div>
-          </div>
-        </button>
-      </div>
+                    </Typography>
+                  </Box>
+                }
+              />
+            </SBox>
+            <Typography color="ds.text_gray_low">2017-2020</Typography>
+          </Box>
+        </GradientBox>
+      </Box>
     );
   }
 }
diff --git a/packages/yoroi-extension/app/components/transfer/cards/TransferCards.scss b/packages/yoroi-extension/app/components/transfer/cards/TransferCards.scss
deleted file mode 100644
index 737783f665..0000000000
--- a/packages/yoroi-extension/app/components/transfer/cards/TransferCards.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-@import '../../mixins/card-mixin.scss';
-
-.heroCardsList {
-  display: flex;
-}
-
-.heroCardsItem {
-  @include card-mixin;
-}
-
-.heroCardsItemBg {
-  flex: 1 0 auto;
-  background-repeat: no-repeat;
-  background-position: top center;
-  background-size: contain;
-}
-
-.heroCardsItemBg {
-  &.bgByronMainnet {
-    background-image: url(../../../assets/images/add-wallet/option-dialog/restore-paper-wallet-modern.inline.svg);
-  }
-}
-
-.tooltipSize {
-  max-width: 500px;
-  overflow-wrap: break-word;
-  white-space: normal;
-}
-

From 7dffb7c852cf25abec3ac8238af30f3c6642c5c6 Mon Sep 17 00:00:00 2001
From: Denis Nebytov <nebytov.d@gmail.com>
Date: Thu, 19 Dec 2024 20:05:25 +0300
Subject: [PATCH 120/143] updated transfer paper wallet workflow to dark theme

---
 .../app/components/common/Autocomplete.js     | 50 ++++++--------
 .../components/transfer/BaseTransferPage.js   | 57 ++++++++--------
 .../components/transfer/BaseTransferPage.scss | 31 ---------
 .../transfer/TransferSummaryPage.js           | 34 ++++++----
 .../transfer/TransferSummaryPage.scss         |  1 -
 .../wallet/WalletRestoreVerifyDialog.js       | 68 +++++++++----------
 .../wallet/WalletRestoreVerifyDialog.scss     | 13 ----
 .../components/widgets/DialogTextBlock.scss   | 19 ------
 .../components/widgets/forms/MnemonicInput.js | 11 ++-
 .../components/widgets/forms/PasswordInput.js |  9 ++-
 10 files changed, 119 insertions(+), 174 deletions(-)
 delete mode 100644 packages/yoroi-extension/app/components/transfer/BaseTransferPage.scss

diff --git a/packages/yoroi-extension/app/components/common/Autocomplete.js b/packages/yoroi-extension/app/components/common/Autocomplete.js
index 23ec71326f..6f4ad9ae41 100644
--- a/packages/yoroi-extension/app/components/common/Autocomplete.js
+++ b/packages/yoroi-extension/app/components/common/Autocomplete.js
@@ -7,9 +7,8 @@ import { useCombobox, useMultipleSelection } from 'downshift';
 import { Input, Box, InputLabel, FormControl, FormHelperText, Chip, useTheme } from '@mui/material';
 import { styled } from '@mui/system';
 import { slice } from 'lodash';
-import { ReactComponent as SuccessIcon }  from '../../assets/images/forms/done.inline.svg';
-import { ReactComponent as ErrorIcon }  from '../../assets/images/forms/error.inline.svg';
-import { ReactComponent as CloseIcon }  from '../../assets/images/close-chip.inline.svg';
+import { ReactComponent as SuccessIcon } from '../../assets/images/forms/done.inline.svg';
+import { ReactComponent as CloseIcon } from '../../assets/images/close-chip.inline.svg';
 
 type Props = {|
   +options: Array<string>,
@@ -56,12 +55,7 @@ function Autocomplete({
     : options;
   const sliceArrayItems = slice(filteredList, 0, maxVisibleOptions);
 
-  const {
-    getSelectedItemProps,
-    getDropdownProps,
-    addSelectedItem,
-    removeSelectedItem,
-  } = useMultipleSelection({
+  const { getSelectedItemProps, getDropdownProps, addSelectedItem, removeSelectedItem } = useMultipleSelection({
     onSelectedItemsChange: ({ selectedItems }) => {
       onChange(selectedItems);
     },
@@ -131,7 +125,11 @@ function Autocomplete({
         {...(value.length || theme.name === 'classic' ? { shrink: true } : {})}
         htmlFor={id ?? 'autocomplete-combobox'}
         {...getLabelProps()}
-        sx={{ backgroundColor: 'var(--yoroi-palette-common-white)', padding: '0px 6px' }}
+        sx={{
+          backgroundColor: 'ds.bg_color_contrast_high',
+          padding: '0px 6px',
+          color: isOpen ? 'ds.text_gray_medium' : 'ds.text_gray_low',
+        }}
       >
         {label}
       </InputLabel>
@@ -177,10 +175,7 @@ function Autocomplete({
             })}
           />
         </Box>
-        <CheckWrapper>
-          {done === true ? <SuccessIcon /> : null}
-          {Boolean(error) === true ? <ErrorIcon /> : null}
-        </CheckWrapper>
+        <CheckWrapper>{done === true ? <SuccessIcon /> : null}</CheckWrapper>
       </InputWrapper>
       <FormHelperText id={id ?? 'autocomplete-combobox'}>{error}</FormHelperText>
 
@@ -195,7 +190,9 @@ function Autocomplete({
           <Box
             sx={{
               padding: '14px 20px',
-              bgcolor: 'var(--yoroi-palette-common-white)',
+              color: 'ds.text_gray_medium',
+              bgcolor: 'ds.bg_color_contrast_high',
+              boxShadow: isOpen ? 'ds.light_shadow_dropdown_menu' : 'unset',
             }}
           >
             {noResultsMessage}
@@ -208,11 +205,10 @@ function Autocomplete({
                   key={`${item}${index}`}
                   sx={{
                     padding: '14px 20px',
-                    backgroundColor:
-                      highlightedIndex === index
-                        ? 'var(--yoroi-palette-gray-50)'
-                        : 'var(--yoroi-palette-common-white)',
+                    color: 'ds.text_gray_medium',
+                    backgroundColor: highlightedIndex === index ? 'ds.bg_color_contrast_min' : 'ds.bg_color_contrast_high',
                     cursor: 'pointer',
+                    boxShadow: isOpen ? 'ds.light_shadow_dropdown_menu' : 'unset',
                   }}
                   {...getItemProps({
                     item,
@@ -270,17 +266,9 @@ const ULList = styled(Box)({
 const InputWrapper = styled(Box)(
   ({ theme, error, isOpen }) => `
   width: 100%;
-  border: ${isOpen ? '2px' : '1px'} solid ${
-    error
-      ? 'var(--yoroi-comp-input-error)'
-      : isOpen
-      ? 'var(--yoroi-comp-input-text-focus)'
-      : theme.name === 'classic'
-      ? '#c7ced6'
-      : 'var(--yoroi-comp-input-border)'
-  };
-  border-radius: ${theme.name === 'classic' ? '0' : '8px'};
-  background-color: ${theme.name === 'classic' ? '#f4f4f6' : 'var(--yoroi-palette-common-white)'};
+  border: ${isOpen ? '2px' : '1px'} solid ${error ? theme.palette.ds.sys_magenta_500 : theme.palette.ds.primary_200};
+  border-radius: 8px;
+  background-color: ${theme.palette.ds.bg_color_contrast_high};
   min-height: ${theme.name === 'classic' ? '73px' : '140px'};
   align-content: baseline;
   display: inline-flex;
@@ -292,7 +280,7 @@ const InputWrapper = styled(Box)(
   cursor: text;
   & input {
     background-color: transparent;
-    color: ${theme.name === 'classic' ? 'var(--yoroi-comp-input-border)' : '#000000d9'};
+    color: ${theme.palette.ds.text_gray_medium};
     font-size: 1rem;
     padding: 4px 6px;
     letter-spacing: 0;
diff --git a/packages/yoroi-extension/app/components/transfer/BaseTransferPage.js b/packages/yoroi-extension/app/components/transfer/BaseTransferPage.js
index 7addab7f7d..c3b8e00794 100644
--- a/packages/yoroi-extension/app/components/transfer/BaseTransferPage.js
+++ b/packages/yoroi-extension/app/components/transfer/BaseTransferPage.js
@@ -7,9 +7,9 @@ import { intlShape } from 'react-intl';
 import globalMessages from '../../i18n/global-messages';
 import DialogBackButton from '../widgets/DialogBackButton';
 import Dialog from '../widgets/Dialog';
-import styles from './BaseTransferPage.scss';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import LocalizableError from '../../i18n/LocalizableError';
+import { Box, Typography } from '@mui/material';
 
 type Props = {|
   +children: Node,
@@ -22,21 +22,17 @@ type Props = {|
 
 @observer
 export default class BaseTransferPage extends Component<Props> {
-
-  static defaultProps: {|error: void|} = {
-    error: undefined
+  static defaultProps: {| error: void |} = {
+    error: undefined,
   };
 
-  static contextTypes: {|intl: $npm$ReactIntl$IntlFormat|} = {
-    intl: intlShape.isRequired
+  static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
+    intl: intlShape.isRequired,
   };
 
   render(): Node {
     const { intl } = this.context;
-    const {
-      onBack,
-      step0,
-    } = this.props;
+    const { onBack, step0 } = this.props;
 
     const actions = [
       {
@@ -59,28 +55,35 @@ export default class BaseTransferPage extends Component<Props> {
         actions={actions}
         closeOnOverlayClick={false}
         onClose={onBack}
-        className={styles.dialog}
+        className={undefined}
         backButton={<DialogBackButton onBack={onBack} />}
       >
-        <div className={styles.component}>
-          <div className={styles.body}>
-            <div>
-              <ul className={styles.instructionsList}>
-                <div className={styles.text}>
-                  {step0}
-                  <br /><br />
-                  {intl.formatMessage(globalMessages.step1)}
-                </div>
-              </ul>
-            </div>
+        <Box>
+          <Box>
+            <Box>
+              <Typography variant="body2" color="ds.text_gray_medium">
+                {step0}
+              </Typography>
+              <Typography
+                variant="body2"
+                color="ds.text_gray_medium"
+                sx={{
+                  pt: '16px',
+                }}
+              >
+                {intl.formatMessage(globalMessages.step1)}
+              </Typography>
+            </Box>
             {this.props.children}
             {this.props.error && (
-              <div className={styles.error}>
-                {intl.formatMessage(this.props.error, this.props.error.values)}
-              </div>
+              <Box textAlign="center">
+                <Typography variant="body1" color="ds.text_error">
+                  {intl.formatMessage(this.props.error, this.props.error.values)}
+                </Typography>
+              </Box>
             )}
-          </div>
-        </div>
+          </Box>
+        </Box>
       </Dialog>
     );
   }
diff --git a/packages/yoroi-extension/app/components/transfer/BaseTransferPage.scss b/packages/yoroi-extension/app/components/transfer/BaseTransferPage.scss
deleted file mode 100644
index ba1a39770e..0000000000
--- a/packages/yoroi-extension/app/components/transfer/BaseTransferPage.scss
+++ /dev/null
@@ -1,31 +0,0 @@
-@import '../../themes/mixins/error-message';
-
-.component {
-  .body {
-    color: var(--yoroi-palette-gray-900);
-    font-weight: 400;
-    font-size: 14px;
-    line-height: 19px;
-
-    .text {
-      font-size: 15px;
-      margin-bottom: 0.3%;
-      word-break: break-word;
-    }
-
-    .instructionsList {
-      list-style-type: disc;
-      list-style-position: inside;
-      margin-bottom: 10px;
-    }
-  }
-
-  .error {
-    @include error-message;
-    font-size: 16px;
-    line-height: 22px;
-    margin-bottom: 12px;
-    word-break: break-word;
-    text-align: center;
-  }
-}
diff --git a/packages/yoroi-extension/app/components/transfer/TransferSummaryPage.js b/packages/yoroi-extension/app/components/transfer/TransferSummaryPage.js
index 5265910771..ec94476460 100644
--- a/packages/yoroi-extension/app/components/transfer/TransferSummaryPage.js
+++ b/packages/yoroi-extension/app/components/transfer/TransferSummaryPage.js
@@ -26,6 +26,7 @@ import type {
 } from '../../api/common/lib/MultiToken';
 import type { TokenRow } from '../../api/ada/lib/storage/database/primitives/tables';
 import { getTokenName, genFormatTokenAmount } from '../../stores/stateless/tokenHelpers';
+import { Box, Typography, styled, useTheme } from '@mui/material';
 
 const messages = defineMessages({
   addressFromLabel: {
@@ -50,6 +51,11 @@ const messages = defineMessages({
   },
 });
 
+const STypography = styled(Typography)(({ theme }) => ({
+  color: theme.palette.ds.text_gray_medium,
+  fontWeight: 500,
+}));
+
 type Props = {|
   +dialogTitle: string,
   +selectedExplorer: SelectedExplorer,
@@ -210,9 +216,9 @@ export default class TransferSummaryPage extends Component<Props> {
     return (
       <>
         <div className={styles.addressLabelWrapper}>
-          <div className={styles.addressLabel}>
+          <STypography variant="body2">
             {intl.formatMessage(messages.addressFromLabel)}
-          </div>
+          </STypography>
           {
             transferTx.senders.map((sender, index) => {
               const addressesClasses = classnames([
@@ -243,9 +249,9 @@ export default class TransferSummaryPage extends Component<Props> {
           }
         </div>
         <div className={styles.addressLabelWrapper}>
-          <div className={styles.addressLabel}>
+          <STypography variant="body2">
             {intl.formatMessage(globalMessages.walletSendConfirmationAddressToLabel)}
-          </div>
+          </STypography>
           {
             transferTx.receivers.map((receiver, index) => {
               const addressesClasses = classnames([
@@ -342,9 +348,9 @@ export default class TransferSummaryPage extends Component<Props> {
 
         <div className={styles.amountFeesWrapper}>
           <div className={styles.amountWrapper}>
-            <div className={styles.amountLabel}>
+            <STypography variant="body2">
               {intl.formatMessage(messages.recoveredBalanceLabel)}
-            </div>
+            </STypography>
             {unitOfAccountSetting.enabled /* tmp */ && false ? (
               <>
                 <div className={styles.amount}>
@@ -370,9 +376,9 @@ export default class TransferSummaryPage extends Component<Props> {
           </div>
 
           <div className={styles.feesWrapper}>
-            <div className={styles.feesLabel}>
+            <STypography variant="body2">
               {intl.formatMessage(messages.transactionFeeLabel)}
-            </div>
+            </STypography>
             {unitOfAccountSetting.enabled /* tmp */ && false ? (
               <>
                 <div className={styles.fees}>
@@ -399,9 +405,9 @@ export default class TransferSummaryPage extends Component<Props> {
         </div>
 
         <div className={styles.totalAmountWrapper}>
-          <div className={styles.totalAmountLabel}>
+          <STypography variant="body2">
             {intl.formatMessage(globalMessages.finalBalanceLabel)}
-          </div>
+          </STypography>
           {unitOfAccountSetting.enabled /* tmp */ && false ? (
             <>
               <div className={styles.totalAmount}>
@@ -449,10 +455,10 @@ export default class TransferSummaryPage extends Component<Props> {
   _getTxIdNode: string => Node = (txId) => {
     const { intl } = this.context;
     return (
-      <div className={styles.addressLabelWrapper}>
-        <div className={styles.addressLabel}>
+      <Box mb="20px">
+        <STypography variant="body2">
           {intl.formatMessage(globalMessages.transactionId)}
-        </div>
+        </STypography>
         <ExplorableHashContainer
           selectedExplorer={this.props.selectedExplorer}
           light
@@ -463,7 +469,7 @@ export default class TransferSummaryPage extends Component<Props> {
             <span className={styles.address}>{txId}</span>
           </RawHash>
         </ExplorableHashContainer>
-      </div>
+      </Box>
     );
   }
 }
diff --git a/packages/yoroi-extension/app/components/transfer/TransferSummaryPage.scss b/packages/yoroi-extension/app/components/transfer/TransferSummaryPage.scss
index 2048d5491c..bd178c09ea 100644
--- a/packages/yoroi-extension/app/components/transfer/TransferSummaryPage.scss
+++ b/packages/yoroi-extension/app/components/transfer/TransferSummaryPage.scss
@@ -2,7 +2,6 @@
 @import '../../themes/mixins/loading-spinner';
 
 .body {
-  color: var(--yoroi-palette-gray-900);
   font-weight: 400;
   font-size: 14px;
   line-height: 19px;
diff --git a/packages/yoroi-extension/app/components/wallet/WalletRestoreVerifyDialog.js b/packages/yoroi-extension/app/components/wallet/WalletRestoreVerifyDialog.js
index 4241cae7c8..c762fa3391 100644
--- a/packages/yoroi-extension/app/components/wallet/WalletRestoreVerifyDialog.js
+++ b/packages/yoroi-extension/app/components/wallet/WalletRestoreVerifyDialog.js
@@ -21,6 +21,7 @@ import type { WalletChecksum } from '@emurgo/cip4-js';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import { truncateAddress } from '../../utils/formatters';
 import type { PlateWithMeta } from '../../stores/toplevel/WalletRestoreStore';
+import { Box, Typography } from '@mui/material';
 
 const messages = defineMessages({
   dialogTitleVerifyWalletRestoration: {
@@ -70,13 +71,23 @@ export default class WalletRestoreVerifyDialog extends Component<Props> {
 
   generatePlate(title: string, plate: WalletChecksum): Node {
     return (
-      <div key={title}>
-        <h2 className={styles.addressLabel}>{title}</h2>
-        <div className={styles.plateRowDiv}>
+      <Box key={title}>
+        <Typography variant="body1" color="ds.text_gray_medium" mb="10px">
+          {title}
+        </Typography>
+        <Box
+          display="flex"
+          flexDirection="row"
+          justifyContent="flex-start"
+          alignItems="flex-end"
+          sx={{ '& .identicon': { borderRadius: '4px' } }}
+        >
           <WalletAccountIcon iconSeed={plate.ImagePart} />
-          <span className={styles.plateIdSpan}>{plate.TextPart}</span>
-        </div>
-      </div>
+          <Typography color="ds.text_gray_medium" variant="h1" pl="10px" fontSize="35px" fontWeight={500}>
+            {plate.TextPart}
+          </Typography>
+        </Box>
+      </Box>
     );
   }
 
@@ -88,7 +99,9 @@ export default class WalletRestoreVerifyDialog extends Component<Props> {
   ): Node {
     return (
       <>
-        <h2 className={styles.addressLabel}>{title}</h2>
+        <Typography variant="body1" mb="10px" color="ds.text_gray_medium">
+          {title}
+        </Typography>
         {addresses.map((address, index) => {
           const notificationElementId = `${address}-${index}`;
           return (
@@ -119,14 +132,7 @@ export default class WalletRestoreVerifyDialog extends Component<Props> {
 
   render(): Node {
     const { intl } = this.context;
-    const {
-      error,
-      isSubmitting,
-      onCancel,
-      onNext,
-      onCopyAddressTooltip,
-      notification,
-    } = this.props;
+    const { error, isSubmitting, onCancel, onNext, onCopyAddressTooltip, notification } = this.props;
 
     const dialogClasses = classnames(['walletRestoreVerifyDialog', styles.dialog]);
 
@@ -146,40 +152,34 @@ export default class WalletRestoreVerifyDialog extends Component<Props> {
     ];
 
     const introMessage = (
-      <div>
-        <span>{intl.formatMessage(messages.walletRestoreVerifyIntroLine1)}</span>
-        <br />
+      <Box>
+        <Typography variant="body1" color="ds.text_gray_medium">
+          {intl.formatMessage(messages.walletRestoreVerifyIntroLine1)}
+        </Typography>
         <ul>
           <li className={styles.smallTopMargin}>
-            <span>
+            <Typography component="span" variant="body1" color="ds.text_gray_medium">
               <FormattedHTMLMessage {...messages.walletRestoreVerifyIntroLine2} />
-            </span>
+            </Typography>
           </li>
           <li className={styles.smallTopMargin}>
-            <span>
+            <Typography component="span" variant="body1" color="ds.text_gray_medium">
               <FormattedHTMLMessage {...messages.walletRestoreVerifyIntroLine3} />
-            </span>
+            </Typography>
           </li>
           <li className={styles.smallTopMargin}>
-            <span>
+            <Typography component="span" variant="body1" color="ds.text_gray_medium">
               <FormattedHTMLMessage {...messages.walletRestoreVerifyIntroLine4} />
-            </span>
+            </Typography>
           </li>
         </ul>
-      </div>
+      </Box>
     );
 
-    const plateElems = this.props.plates.map(plate =>
-      this.generatePlate(intl.formatMessage(plate.checksumTitle), plate.plate)
-    );
+    const plateElems = this.props.plates.map(plate => this.generatePlate(intl.formatMessage(plate.checksumTitle), plate.plate));
 
     const addressElems = this.props.plates.map(plate =>
-      this.generateAddresses(
-        intl.formatMessage(plate.addressMessage),
-        plate.addresses,
-        onCopyAddressTooltip,
-        notification
-      )
+      this.generateAddresses(intl.formatMessage(plate.addressMessage), plate.addresses, onCopyAddressTooltip, notification)
     );
 
     return (
diff --git a/packages/yoroi-extension/app/components/wallet/WalletRestoreVerifyDialog.scss b/packages/yoroi-extension/app/components/wallet/WalletRestoreVerifyDialog.scss
index b33291dafc..f35657fd7e 100644
--- a/packages/yoroi-extension/app/components/wallet/WalletRestoreVerifyDialog.scss
+++ b/packages/yoroi-extension/app/components/wallet/WalletRestoreVerifyDialog.scss
@@ -34,19 +34,6 @@
   margin-bottom: 6px;
 }
 
-.plateRowDiv {
-  display: table;
-}
-
-.plateIdSpan {
-  display: table-cell;
-  vertical-align: middle;
-  padding-left: 10px;
-  font-size: 35px;
-  font-weight: 500;
-  opacity: 0.7;
-}
-
 .error {
   @include error-message;
   margin-top: 30px;
diff --git a/packages/yoroi-extension/app/components/widgets/DialogTextBlock.scss b/packages/yoroi-extension/app/components/widgets/DialogTextBlock.scss
index 1a40b0899b..ba489aca2b 100644
--- a/packages/yoroi-extension/app/components/widgets/DialogTextBlock.scss
+++ b/packages/yoroi-extension/app/components/widgets/DialogTextBlock.scss
@@ -4,25 +4,6 @@
   color: var(--yoroi-palette-gray-900);
   text-align: justify;
   padding: 10px 0 24px 0;
-
-  h1 {
-    color: var(--yoroi-palette-gray-900);
-    font-weight: 500;
-    font-size: 14px;
-    margin-bottom: 11px;
-  }
-
-  p {
-    font-weight: 400;
-    font-size: 12px;
-    letter-spacing: 0.5px;
-    line-height: 1.38;
-    margin-bottom: 11px;
-  }
-
-  p em {
-    font-weight: bold;
-  }
 }
 
 .component-bottom {
diff --git a/packages/yoroi-extension/app/components/widgets/forms/MnemonicInput.js b/packages/yoroi-extension/app/components/widgets/forms/MnemonicInput.js
index 7e6916a433..b669d07cbb 100644
--- a/packages/yoroi-extension/app/components/widgets/forms/MnemonicInput.js
+++ b/packages/yoroi-extension/app/components/widgets/forms/MnemonicInput.js
@@ -86,7 +86,16 @@ export default class MnemonicInput extends Component<Props> {
         error={recoveryPhraseField.error}
         maxVisibleOptions={5}
         noResultsMessage={intl.formatMessage(globalMessages.recoveryPhraseNoResults)}
-        chipProps={{ sx: { bgcolor: ' #f0f3f5' } }}
+        chipProps={{
+          sx: {
+            bgcolor: 'ds.primary_100',
+            color: 'ds.text_primary_medium',
+            ':hover': {
+              bgcolor: 'ds.primary_200',
+              color: 'ds.text_primary_max',
+            }
+          }
+        }}
       />
     );
   }
diff --git a/packages/yoroi-extension/app/components/widgets/forms/PasswordInput.js b/packages/yoroi-extension/app/components/widgets/forms/PasswordInput.js
index 374e1495e1..b4d5a520b2 100644
--- a/packages/yoroi-extension/app/components/widgets/forms/PasswordInput.js
+++ b/packages/yoroi-extension/app/components/widgets/forms/PasswordInput.js
@@ -9,6 +9,7 @@ import globalMessages from '../../../i18n/global-messages';
 import config from '../../../config';
 import TextField from '../../common/TextField';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
+import { Box, Typography } from '@mui/material';
 
 type Props = {|
   +setForm: ReactToolboxMobxForm => void,
@@ -93,8 +94,10 @@ export default class PasswordInput extends Component<Props> {
     const passwordField = form.$(this.props.fieldName);
 
     return (
-      <div>
-        {this.props.disclaimer}
+      <Box>
+        <Typography variant="body1" color="ds.text_gray_medium">
+          {this.props.disclaimer}
+        </Typography>
         <TextField
           className={this.props.fieldName}
           {...passwordField.bind()}
@@ -102,7 +105,7 @@ export default class PasswordInput extends Component<Props> {
           error={passwordField.error}
           done={this.props.done}
         />
-      </div>
+      </Box>
     );
   }
 }

From 6cd7a86d1a2969619b328ae63fb42a3411b4009a Mon Sep 17 00:00:00 2001
From: Denis Nebytov <nebytov.d@gmail.com>
Date: Thu, 19 Dec 2024 20:10:42 +0300
Subject: [PATCH 121/143] lint fixes

---
 .../app/components/transfer/TransferSummaryPage.js         | 2 +-
 .../app/components/transfer/cards/TransferCards.js         | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/yoroi-extension/app/components/transfer/TransferSummaryPage.js b/packages/yoroi-extension/app/components/transfer/TransferSummaryPage.js
index ec94476460..be3ed4c1f4 100644
--- a/packages/yoroi-extension/app/components/transfer/TransferSummaryPage.js
+++ b/packages/yoroi-extension/app/components/transfer/TransferSummaryPage.js
@@ -26,7 +26,7 @@ import type {
 } from '../../api/common/lib/MultiToken';
 import type { TokenRow } from '../../api/ada/lib/storage/database/primitives/tables';
 import { getTokenName, genFormatTokenAmount } from '../../stores/stateless/tokenHelpers';
-import { Box, Typography, styled, useTheme } from '@mui/material';
+import { Box, Typography, styled } from '@mui/material';
 
 const messages = defineMessages({
   addressFromLabel: {
diff --git a/packages/yoroi-extension/app/components/transfer/cards/TransferCards.js b/packages/yoroi-extension/app/components/transfer/cards/TransferCards.js
index ae8bb0fe13..5cdf3fe46f 100644
--- a/packages/yoroi-extension/app/components/transfer/cards/TransferCards.js
+++ b/packages/yoroi-extension/app/components/transfer/cards/TransferCards.js
@@ -3,12 +3,11 @@ import { Component } from 'react';
 import type { Node } from 'react';
 import { observer } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
-import classnames from 'classnames';
 import globalMessages from '../../../i18n/global-messages';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import CustomTooltip from '../../widgets/CustomTooltip';
 
-import { Box, Button, Typography, styled } from '@mui/material';
+import { Box, Typography, styled } from '@mui/material';
 import PaperWalletLogo from '../../../assets/images/add-wallet/option-dialog/restore-paper-wallet-modern.inline.svg';
 
 const messages = defineMessages({
@@ -27,8 +26,8 @@ const GradientBox = styled(Box)(({ theme }: any) => ({
 
 const SBox = styled(Box)(({ theme }) => ({
   '& svg': {
-    width: "20px",
-    height: "20px",
+    width: '20px',
+    height: '20px',
     '& g': {
       fill: theme.palette.ds.el_gray_medium,
     },

From 399c4b12258d6e7c3a01cf7b49e85f070f447f88 Mon Sep 17 00:00:00 2001
From: Denis Nebytov <nebytov.d@gmail.com>
Date: Fri, 20 Dec 2024 14:47:07 +0300
Subject: [PATCH 122/143] applied dark theme to the complexity cards

---
 .../complexity-level/ComplexityLevelForm.js   | 145 ++++++------------
 .../complexity-level/ComplexityLevelForm.scss |  97 ------------
 2 files changed, 50 insertions(+), 192 deletions(-)
 delete mode 100644 packages/yoroi-extension/app/components/profile/complexity-level/ComplexityLevelForm.scss

diff --git a/packages/yoroi-extension/app/components/profile/complexity-level/ComplexityLevelForm.js b/packages/yoroi-extension/app/components/profile/complexity-level/ComplexityLevelForm.js
index 3484721f7e..ecfb8ecc50 100644
--- a/packages/yoroi-extension/app/components/profile/complexity-level/ComplexityLevelForm.js
+++ b/packages/yoroi-extension/app/components/profile/complexity-level/ComplexityLevelForm.js
@@ -3,16 +3,13 @@ import { Component } from 'react';
 import type { Node, ComponentType } from 'react';
 import { intlShape, defineMessages, FormattedHTMLMessage } from 'react-intl';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
-import styles from './ComplexityLevelForm.scss';
-import classnames from 'classnames';
 import { ReactComponent as BeginnerLevel } from '../../../assets/images/complexity-level/beginner-level.inline.svg';
 import { ReactComponent as AdvancedLevel } from '../../../assets/images/complexity-level/advanced-level.inline.svg';
 import LocalizableError from '../../../i18n/LocalizableError';
-import { LoadingButton } from '@mui/lab';
 import { ComplexityLevels } from '../../../types/complexityLevelType';
 import type { ComplexityLevelType } from '../../../types/complexityLevelType';
 import { withLayout } from '../../../styles/context/layout';
-import { Box, Typography } from '@mui/material';
+import { Box, Typography, styled } from '@mui/material';
 import { settingsMenuMessages } from '../../settings/menu/SettingsMenu';
 
 const messages = defineMessages({
@@ -52,6 +49,35 @@ const messages = defineMessages({
     defaultMessage: '!!!Choose',
   },
 });
+
+const GradientBox = styled(Box)(({ theme, isSelected }) => ({
+  maxWidth: '294px',
+  maxHeight: '362px',
+  flex: 1,
+  display: 'flex',
+  flexDirection: 'column',
+  alignItems: 'center',
+  justifyContent: 'flex-start',
+  textAlign: 'center',
+  alignSelf: 'stretch',
+  padding: '16px',
+  cursor: isSelected ? 'not-allowed' : 'pointer',
+  backgroundImage: isSelected ? theme.palette.ds.bg_gradient_2 : 'unset',
+  outline: `solid 1px ${isSelected ? 'transparent' : theme.palette.ds.gray_200}`,
+  borderRadius: '8px',
+  '&:hover': {
+    backgroundImage: theme.palette.ds.bg_gradient_1,
+    outlineColor: 'transparent',
+    '&::before': {
+      opacity: 1,
+    },
+  },
+  '&::before': {
+    opacity: 0,
+    transition: 'opacity 300ms linear',
+  }
+}));
+
 type Props = {|
   +complexityLevel: ?ComplexityLevelType,
   +onSubmit: ComplexityLevelType => PossiblyAsync<void>,
@@ -73,7 +99,7 @@ class ComplexityLevel extends Component<Props & InjectedProps> {
 
   render(): Node {
     const { intl } = this.context;
-    const { complexityLevel, isSubmitting, isRevampLayout, baseTheme } = this.props;
+    const { complexityLevel, isRevampLayout } = this.props;
 
     const levels = [
       {
@@ -91,9 +117,9 @@ class ComplexityLevel extends Component<Props & InjectedProps> {
     ];
 
     return (
-      <Box className={styles.component}>
+      <Box maxWidth="930px" margin="0 auto" mt="24px">
         {isRevampLayout && (
-          <Typography component="div" textAlign="center" color="grayscale.900" mb="16px" variant="h3" fontWeight={500}>
+          <Typography component="div" textAlign="center" color="ds.text_gray_medium" mb="16px" variant="h3" fontWeight={500}>
             {intl.formatMessage(settingsMenuMessages.levelOfComplexity)}
           </Typography>
         )}
@@ -102,7 +128,7 @@ class ComplexityLevel extends Component<Props & InjectedProps> {
           component="div"
           textAlign="center"
           variant="body1"
-          color={isRevampLayout ? 'grayscale.800' : 'var(--yoroi-palette-gray-600)'}
+          color="ds.text_gray_low"
         >
           {intl.formatMessage(messages.subtitle)}
         </Typography>
@@ -113,10 +139,11 @@ class ComplexityLevel extends Component<Props & InjectedProps> {
             variant="body1"
             my="1rem"
             mx="auto"
+            color="ds.text_gray_medium"
             sx={{
               textAlign: 'center',
               '& strong': {
-                color: isRevampLayout ? 'primary.500' : 'var(--yoroi-comp-button-secondary-text)',
+                color: 'ds.text_primary_medium',
                 fontWeight: 500,
                 textTransform: 'uppercase',
               },
@@ -133,105 +160,33 @@ class ComplexityLevel extends Component<Props & InjectedProps> {
           </Typography>
         )}
 
-        {isRevampLayout ? (
-          <Box
-            sx={{
-              display: 'flex',
-              flexDirection: 'row',
-              alignItems: 'center',
-              justifyContent: 'center',
-              gap: '24px',
-              mt: '32px',
-              maxWidth: '700px',
-            }}
-          >
-            {levels.map(level => {
+        <Box display="flex" alignItems="center" justifyContent="center" mt="32px">
+          <Box display="flex" flexDirection="row" justifyContent="center" gap="24px">
+          {levels.map(level => {
               const isSelected = level.key === complexityLevel;
-
               return (
-                <Box
+                <GradientBox
                   key={level.key}
-                  sx={{
-                    flex: 1,
-                    display: 'flex',
-                    flexDirection: 'column',
-                    alignItems: 'center',
-                    justifyContent: 'flex-start',
-                    textAlign: 'center',
-                    p: '1px',
-                    border: 'solid 1px transparent',
-                    background: theme =>
-                      isSelected
-                        ? baseTheme === 'light-theme'
-                          ? theme.palette.gradients.green
-                          : theme.palette.gradients_2
-                        : baseTheme === 'light-theme'
-                        ? 'linear-gradient( 0deg, var(--yoroi-palette-common-white), var(--yoroi-palette-common-white)), linear-gradient(180deg, #e4e8f7 0%, #c6f7f7 100%)'
-                        : theme.palette.ds.bg_gradient_3,
-                    backgroundClip: 'content-box, border-box',
-                    backgroundOrigin: 'border-box',
-                    borderRadius: '8px',
-                    alignSelf: 'stretch',
-                    cursor: isSelected ? 'not-allowed' : 'pointer',
-                    position: 'relative',
-                    zIndex: 1,
-                    '&::before': {
-                      position: 'absolute',
-                      content: '""',
-                      top: '0px',
-                      right: '0px',
-                      left: '0px',
-                      bottom: '0px',
-                      background: theme => theme.palette.gradients['blue-green-bg'],
-                      borderRadius: '8px',
-                      zIndex: -1,
-                      opacity: 0,
-                      transition: 'opacity 300ms linear',
-                    },
-                    '&:hover::before': {
-                      opacity: 1,
-                    },
-                  }}
+                  isSelected={isSelected}
                   onClick={() => this.props.onSubmit(level.key)}
                 >
-                  <Box sx={{ p: '15px' }}>
-                    <Box sx={{ mb: '16px' }}>{level.image}</Box>
-                    <Box mb="10px">
-                      <Typography component="div" mb="4px" variant="h3" fontWeight={500}>
+                  <Box display="flex" flexDirection="column" alignItems="center">
+                    <Box sx={{ mb: '16px' }} width="180px" height="116px">{level.image}</Box>
+                    <Box>
+                      <Typography component="div" mb="4px" variant="h3" fontWeight={500} color="ds.text_gray_medium">
                         {level.name}
                       </Typography>
-                      <Typography component="div" variant="body2">
+                      <Typography component="div" variant="body2" color="ds.text_gray_medium">
                         {level.description}
                       </Typography>
                     </Box>
                   </Box>
-                </Box>
+                </GradientBox>
               );
-            })}
+              })
+          }
           </Box>
-        ) : (
-          <div className={styles.cardsWrapper}>
-            {levels.map(level => (
-              <div className={styles.card} key={level.key}>
-                <div className={classnames([styles.cardImage, styles[level.key]])}>{level.image}</div>
-                <div className={styles.cardContent}>
-                  <div>
-                    <h3>{level.name}</h3>
-                    <div>{level.description}</div>
-                  </div>
-                  <LoadingButton
-                    variant={isRevampLayout ? 'contained' : 'primary'}
-                    loading={isSubmitting}
-                    disabled={complexityLevel === level.key}
-                    onClick={() => this.props.onSubmit(level.key)}
-                  >
-                    {intl.formatMessage(messages.labelChoose)}
-                  </LoadingButton>
-                </div>
-              </div>
-            ))}
-          </div>
-        )}
+        </Box>
       </Box>
     );
   }
diff --git a/packages/yoroi-extension/app/components/profile/complexity-level/ComplexityLevelForm.scss b/packages/yoroi-extension/app/components/profile/complexity-level/ComplexityLevelForm.scss
deleted file mode 100644
index 3b563162fe..0000000000
--- a/packages/yoroi-extension/app/components/profile/complexity-level/ComplexityLevelForm.scss
+++ /dev/null
@@ -1,97 +0,0 @@
-@import '../../../themes/mixins/loading-spinner';
-@import '../../../themes/mixins/error-message';
-
-.component {
-  max-width: 650px;
-  margin: 0 auto;
-  margin-top: 24px;
-
-  .header {
-    color: var(--yoroi-palette-gray-600);
-    text-align: center;
-    margin-bottom: 50px;
-    font-size: 1.125rem;
-    font-weight: bold;
-    letter-spacing: 0;
-    line-height: 1.375rem;
-  }
-
-  .description {
-    color: var(--yoroi-palette-gray-600);
-    font-size: 1rem;
-    line-height: 1.375rem;
-    text-align: center;
-  }
-
-  .cardsWrapper {
-    margin: 30px auto;
-    display: flex;
-    & > div {
-      flex: 1;
-    }
-  }
-
-  .card {
-    margin-right: 30px;
-    border-radius: 8px;
-    background-color: var(--yoroi-palette-common-white);
-    border: 1px solid #dce0e9;
-    overflow: hidden;
-    &:last-child {
-      margin-right: 0;
-    }
-
-    .cardImage {
-      background-color: var(--yoroi-palette-gray-100);
-      height: 184px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-
-    .simple {
-      background: #f1fdfa;
-    }
-
-    .advanced {
-      background: #f3f5fd;
-    }
-
-    .cardContent {
-      padding: 24px;
-      color: var(--yoroi-palette-gray-900);
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-      height: 300px;
-      h3 {
-        font-size: 1.5rem;
-        letter-spacing: 0;
-        line-height: 1.875rem;
-        text-align: center;
-        text-transform: capitalize;
-        margin-bottom: 16px;
-      }
-      p {
-        font-size: 0.75rem;
-        letter-spacing: 0;
-        line-height: 1.25rem;
-      }
-    }
-
-    .error {
-      @include error-message;
-      text-align: center;
-      margin-bottom: 1rem;
-    }
-  }
-}
-
-:global(.YoroiRevamp) .component {
-  min-width: 650px;
-  max-width: unset;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-}

From f50284fd13088b9edb016c437aa0e1fc237a332d Mon Sep 17 00:00:00 2001
From: Denis Nebytov <nebytov.d@gmail.com>
Date: Fri, 20 Dec 2024 17:19:00 +0300
Subject: [PATCH 123/143] fixed remarks

---
 .../app/components/transfer/BaseTransferPage.js             | 1 -
 .../app/components/transfer/cards/TransferTypeSelect.js     | 6 +++++-
 packages/yoroi-extension/app/i18n/locales/en-US.json        | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/yoroi-extension/app/components/transfer/BaseTransferPage.js b/packages/yoroi-extension/app/components/transfer/BaseTransferPage.js
index c3b8e00794..c87f7f6aa7 100644
--- a/packages/yoroi-extension/app/components/transfer/BaseTransferPage.js
+++ b/packages/yoroi-extension/app/components/transfer/BaseTransferPage.js
@@ -55,7 +55,6 @@ export default class BaseTransferPage extends Component<Props> {
         actions={actions}
         closeOnOverlayClick={false}
         onClose={onBack}
-        className={undefined}
         backButton={<DialogBackButton onBack={onBack} />}
       >
         <Box>
diff --git a/packages/yoroi-extension/app/components/transfer/cards/TransferTypeSelect.js b/packages/yoroi-extension/app/components/transfer/cards/TransferTypeSelect.js
index 170048e229..7813c07f4d 100644
--- a/packages/yoroi-extension/app/components/transfer/cards/TransferTypeSelect.js
+++ b/packages/yoroi-extension/app/components/transfer/cards/TransferTypeSelect.js
@@ -23,6 +23,10 @@ const messages = defineMessages({
     id: 'wallet.transfer.subInstruction',
     defaultMessage: '!!!Learn more about Byron and Shelley eras and how to claim ADA on our',
   },
+  faqAbbreviation: {
+    id: 'settings.support.faq.abbreviation',
+    defaultMessage: '!!!FAQ',
+  }
 });
 
 @observer
@@ -39,7 +43,7 @@ export default class TransferTypeSelect extends Component<Props> {
         onClick={event => handleExternalLinkClick(event)}
         id="settings:support-faq-link"
       >
-        FAQ
+        {intl.formatMessage(messages.faqAbbreviation)}
       </Link>
     );
 
diff --git a/packages/yoroi-extension/app/i18n/locales/en-US.json b/packages/yoroi-extension/app/i18n/locales/en-US.json
index 268618a257..400e76bb00 100644
--- a/packages/yoroi-extension/app/i18n/locales/en-US.json
+++ b/packages/yoroi-extension/app/i18n/locales/en-US.json
@@ -351,6 +351,7 @@
   "settings.support.faq.faqLink": "FAQ on Yoroi website",
   "settings.support.faq.faqLinkURL": "https://yoroi-wallet.com/faq/",
   "settings.support.faq.title": "Frequently asked questions",
+  "settings.support.faq.abbreviation": "FAQ",
   "settings.support.logs.content": "If you want to inspect logs, you can {downloadLogsLink}. Logs do not contain sensitive information, and it would be helpful to attach them to problem reports to help the team investigate the issue you are experiencing.",
   "settings.support.logs.downloadLogsButtonLabel": "Download Logs",
   "settings.support.logs.downloadLogsLink": "download them here",

From 05219341356c206ed8d217a0f79c46281265a0ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Dec 2024 03:27:42 +0000
Subject: [PATCH 124/143] Bump chromedriver from 131.0.3 to 131.0.4 in
 /packages/e2e-tests

Bumps [chromedriver](https://github.com/giggio/node-chromedriver) from 131.0.3 to 131.0.4.
- [Commits](https://github.com/giggio/node-chromedriver/compare/131.0.3...131.0.4)

---
updated-dependencies:
- dependency-name: chromedriver
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/e2e-tests/package-lock.json | 8 ++++----
 packages/e2e-tests/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/e2e-tests/package-lock.json b/packages/e2e-tests/package-lock.json
index 68ae79d124..ed4a7e6219 100644
--- a/packages/e2e-tests/package-lock.json
+++ b/packages/e2e-tests/package-lock.json
@@ -41,7 +41,7 @@
         "@emurgo/cardano-serialization-lib-nodejs": "^12.0.0-alpha.26",
         "bignumber.js": "^9.1.2",
         "chai": "^4.3.10",
-        "chromedriver": "131.0.3",
+        "chromedriver": "131.0.4",
         "cross-env": "^7.0.3",
         "json-server": "^0.17.4",
         "mocha": "^10.2.0",
@@ -450,9 +450,9 @@
       }
     },
     "node_modules/chromedriver": {
-      "version": "131.0.3",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-131.0.3.tgz",
-      "integrity": "sha512-DKHFt0ilcA/RJzY1ApBiJAil6fh08f9mXM8XbdDE1u+S1V5YVUNTUi4bOtJFZoAwS9nlV0H5W6InWrpXqSs2xg==",
+      "version": "131.0.4",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-131.0.4.tgz",
+      "integrity": "sha512-JgIkept8YrnqT05ldLaOzxxEJDUV1t3PFIIMO/gQz9AbnpZx7Pl1zq6tQTTz2HoY5T2JKZ5kyiEWwc48g4fJ5w==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
index 5d527c19f3..8eea930e5b 100644
--- a/packages/e2e-tests/package.json
+++ b/packages/e2e-tests/package.json
@@ -47,7 +47,7 @@
     "@emurgo/cardano-serialization-lib-nodejs": "^12.0.0-alpha.26",
     "bignumber.js": "^9.1.2",
     "chai": "^4.3.10",
-    "chromedriver": "131.0.3",
+    "chromedriver": "131.0.4",
     "cross-env": "^7.0.3",
     "json-server": "^0.17.4",
     "mocha": "^10.2.0",

From d9a4f5fec47fd1f62b4fbd794bf86e9a55deb598 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Mon, 23 Dec 2024 19:43:31 +0800
Subject: [PATCH 125/143] fix

---
 .../chrome/content-scripts/bringLib.js        |  8 ++---
 .../background/handlers/content/bring.js      | 33 +++++++++++--------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/packages/yoroi-extension/chrome/content-scripts/bringLib.js b/packages/yoroi-extension/chrome/content-scripts/bringLib.js
index 5f3e9ac197..68116e9932 100644
--- a/packages/yoroi-extension/chrome/content-scripts/bringLib.js
+++ b/packages/yoroi-extension/chrome/content-scripts/bringLib.js
@@ -55,11 +55,11 @@ export function popUpCashbackWalletSelection(): void {
 }
 
 export async function promptCreationOrSelection(): Promise<void> {
-  const address = await getFirstAddress()
-  if (address) {
-    return await popUpCashbackWalletSelection()
+  const address = await getFirstAddress();
+  if (address === null) {
+    return await popUpWalletCreation();
   } else {
-    return await popUpWalletCreation()
+    return await popUpCashbackWalletSelection();
   }
 }
 
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
index 50ac061e73..f645d5a79c 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
@@ -40,7 +40,7 @@ const handlers = Object.freeze({
   'get-address': async () => {
     const publicDeriver = await getCashbackWallet();
     if (!publicDeriver) {
-      return { ok: undefined };
+      return { ok: publicDeriver };
     }
     const { address } = (await getAllAddressesForDisplay({ publicDeriver, type: CoreAddressTypes.CARDANO_BASE }))[0];
     const s: string = address;
@@ -72,28 +72,35 @@ const handlers = Object.freeze({
   },
 });
 
-async function getCashbackWallet(): Promise<PublicDeriver<> | null> {
+// return a wallet if either there is a saved cashback wallet or there is only one wallet
+// return null if there is no wallet
+// return undefines if there is no saved cashback wallet but there are multiple wallets
+async function getCashbackWallet(): Promise<PublicDeriver<> | null | void> {
   const db = await getDb();
-  const publicDerivers = await loadWalletsFromStorage(db);
-  const localStorageApi = new LocalStorageApi();
+  const publicDerivers = (await loadWalletsFromStorage(db)).filter(publicDeriver =>
+    !isTrezorTWallet(publicDeriver.getParent())
+  );
+  if (!publicDerivers.length) {
+    return null;
+  }
+
   // try to load saved cashback wallet
+  const localStorageApi = new LocalStorageApi();
   const savedCashbackWalletId = await localStorageApi.getCashbackWalletId();
-  for (const publicDeriver of publicDerivers) {
-    if (
-      publicDeriver.getPublicDeriverId() === savedCashbackWalletId &&
-        !isTrezorTWallet(publicDeriver.getParent())
-    ) {
-      return publicDeriver;
-    }
+  const savedCashbackWallet = publicDerivers.find(publicDeriver =>
+    publicDeriver.getPublicDeriverId() === savedCashbackWalletId
+  );
+  if (savedCashbackWallet) {
+    return savedCashbackWallet;
   }
 
   // if there is one and only wallet use it as the cashback wallet
-  if (publicDerivers.length === 1 && !isTrezorTWallet(publicDerivers[0].getParent())) {
+  if (publicDerivers.length === 1) {
     await localStorageApi.saveCashbackWalletId(publicDerivers[0].getPublicDeriverId());
     return publicDerivers[0];
   }
 
-  return null;
+  return undefined;
 }
 
 function sendRpcResponse(response: Object, tabId: number, messageUid: number) {

From c1c149934a535ee05e28cf39858d2585b1d43c2e Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Mon, 23 Dec 2024 20:23:08 +0800
Subject: [PATCH 126/143] fix set cashback wallet message getting lost

---
 .../app/connector/containers/SelectCashbackWalletContainer.js  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/yoroi-extension/app/connector/containers/SelectCashbackWalletContainer.js b/packages/yoroi-extension/app/connector/containers/SelectCashbackWalletContainer.js
index f61b90ee66..267277ab96 100644
--- a/packages/yoroi-extension/app/connector/containers/SelectCashbackWalletContainer.js
+++ b/packages/yoroi-extension/app/connector/containers/SelectCashbackWalletContainer.js
@@ -19,7 +19,8 @@ export default class SelectCashbackWalletContainer extends Component<ConnectorSt
 
   onSelectWallet(wallet: WalletState) {
     setCashbackWallet(wallet.publicDeriverId);
-    window.close();
+    // must delay or the message gets lost
+    setTimeout(window.close, 50);
   }
 
   render(): Node {

From 99e8641caca3872232565628c2ad4fe39181398e Mon Sep 17 00:00:00 2001
From: kalfada <kalfada3321@gmail.com>
Date: Sun, 5 Jan 2025 20:14:09 +0200
Subject: [PATCH 127/143] fix: update bring npm package

---
 packages/yoroi-extension/package-lock.json | 23 ++++++++++++++++++----
 packages/yoroi-extension/package.json      |  2 +-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index c95b23c8ca..2c1d093a6e 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@amplitude/analytics-browser": "^2.1.3",
         "@babel/preset-typescript": "^7.24.7",
-        "@bringweb3/chrome-extension-kit": "^1.2.6",
+        "@bringweb3/chrome-extension-kit": "^1.2.10",
         "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
         "@emotion/react": "^11.4.1",
         "@emotion/styled": "^11.3.0",
@@ -2139,9 +2139,24 @@
       "dev": true
     },
     "node_modules/@bringweb3/chrome-extension-kit": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@bringweb3/chrome-extension-kit/-/chrome-extension-kit-1.2.6.tgz",
-      "integrity": "sha512-X/i3xk9IoE1+6bD/EkjccYEPbi3Zmvkt7QGwTVA/RYJeky2NotCM/A4+LQvxq6G40xq/oQSl45Elgg/c0jDFfw=="
+      "version": "1.2.10",
+      "resolved": "https://registry.npmjs.org/@bringweb3/chrome-extension-kit/-/chrome-extension-kit-1.2.10.tgz",
+      "integrity": "sha512-dRslgUQOxPGpyrXBb+8vtsurztFy+jDEk8oqA3QbURNH7lfNNQdTKh+36oP7wk/udOOzeQWHBIv4qApATz9vaQ==",
+      "dependencies": {
+        "uuid": "^11.0.3"
+      }
+    },
+    "node_modules/@bringweb3/chrome-extension-kit/node_modules/uuid": {
+      "version": "11.0.4",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.4.tgz",
+      "integrity": "sha512-IzL6VtTTYcAhA/oghbFJ1Dkmqev+FpQWnCBaKq/gUluLxliWvO8DPFWfIviRmYbtaavtSQe4WBL++rFjdcGWEg==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "bin": {
+        "uuid": "dist/esm/bin/uuid"
+      }
     },
     "node_modules/@cardano-foundation/ledgerjs-hw-app-cardano": {
       "version": "7.1.3",
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
index 5098a6d925..6b40188f2e 100644
--- a/packages/yoroi-extension/package.json
+++ b/packages/yoroi-extension/package.json
@@ -150,7 +150,7 @@
   "dependencies": {
     "@amplitude/analytics-browser": "^2.1.3",
     "@babel/preset-typescript": "^7.24.7",
-    "@bringweb3/chrome-extension-kit": "^1.2.6",
+    "@bringweb3/chrome-extension-kit": "^1.2.10",
     "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",

From 2b958389223549132e72620e700d8c54ce8b24c6 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 8 Jan 2025 21:11:56 +0800
Subject: [PATCH 128/143] seperate setting active wallet from routing

---
 packages/yoroi-extension/app/Routes.js        |  11 -
 .../app/containers/NavBarContainer.js         | 143 ------------
 .../app/containers/NavBarContainerRevamp.js   |   3 +-
 .../ConnectedWebsitesContainer.js             |   6 -
 .../app/containers/uri/URILandingPage.js      |   9 +-
 .../app/containers/wallet/MyWalletsPage.js    | 211 ------------------
 .../app/containers/wallet/Wallet.js           |  13 +-
 packages/yoroi-extension/app/routes-config.js |   1 -
 .../app/stores/toplevel/AppStore.js           |  24 +-
 .../app/stores/toplevel/ProfileStore.js       |   3 +-
 10 files changed, 12 insertions(+), 412 deletions(-)
 delete mode 100644 packages/yoroi-extension/app/containers/NavBarContainer.js
 delete mode 100644 packages/yoroi-extension/app/containers/wallet/MyWalletsPage.js

diff --git a/packages/yoroi-extension/app/Routes.js b/packages/yoroi-extension/app/Routes.js
index 0f2f5c2df4..a3eef56843 100644
--- a/packages/yoroi-extension/app/Routes.js
+++ b/packages/yoroi-extension/app/Routes.js
@@ -85,9 +85,6 @@ const AnalyticsSettingsPage = React.lazy(AnalyticsSettingsPagePromise);
 const NightlyPagePromise = () => import('./containers/profile/NightlyPage');
 const NightlyPage = React.lazy(NightlyPagePromise);
 
-const MyWalletsPagePromise = () => import('./containers/wallet/MyWalletsPage');
-const MyWalletsPage = React.lazy(MyWalletsPagePromise);
-
 const WalletSummaryPagePromise = () => import('./containers/wallet/WalletSummaryPage');
 const WalletSummaryPage = React.lazy(WalletSummaryPagePromise);
 
@@ -159,7 +156,6 @@ export const LazyLoadPromises: Array<() => any> = [
   TermsOfUseSettingsPagePromise,
   SupportSettingsPagePromise,
   NightlyPagePromise,
-  MyWalletsPagePromise,
   WalletSummaryPagePromise,
   WalletSendPagePromise,
   WalletAssetsPagePromise,
@@ -226,11 +222,6 @@ export const Routes = (stores: StoresMap): Node => {
             path={ROUTES.PROFILE.OPT_FOR_ANALYTICS}
             component={props => <OptForAnalyticsPage {...props} stores={stores} />}
           />
-          <Route
-            exact
-            path={ROUTES.MY_WALLETS}
-            component={props => <MyWalletsPage {...props} stores={stores} />}
-          />
           <Route exact path={ROUTES.STAKING} component={props => <StakingPage {...props} stores={stores} />} />
           <Route
             path={ROUTES.ASSETS.ROOT}
@@ -304,8 +295,6 @@ export const Routes = (stores: StoresMap): Node => {
             path={ROUTES.PORTFOLIO.ROOT}
             component={props => wrapPortfolio({ ...props, stores }, PortfolioSubpages(stores))}
           />
-
-          <Redirect to={ROUTES.MY_WALLETS} />
         </Switch>
       </Suspense>
     </QueryClientProvider>
diff --git a/packages/yoroi-extension/app/containers/NavBarContainer.js b/packages/yoroi-extension/app/containers/NavBarContainer.js
deleted file mode 100644
index e00a83b0c9..0000000000
--- a/packages/yoroi-extension/app/containers/NavBarContainer.js
+++ /dev/null
@@ -1,143 +0,0 @@
-// @flow
-import moment from 'moment';
-import { Component } from 'react';
-import type { Node } from 'react';
-import { observer } from 'mobx-react';
-import { intlShape } from 'react-intl';
-import NavBar from '../components/topbar/NavBar';
-import NavPlate from '../components/topbar/NavPlate';
-import NavWalletDetails from '../components/topbar/NavWalletDetails';
-import NoWalletsDropdown from '../components/topbar/NoWalletsDropdown';
-import NavDropdown from '../components/topbar/NavDropdown';
-import NavDropdownRow from '../components/topbar/NavDropdownRow';
-import { ROUTES } from '../routes-config';
-import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
-import { genLookupOrFail } from '../stores/stateless/tokenHelpers';
-import BuySellDialog from '../components/buySell/BuySellDialog';
-import globalMessages from '../i18n/global-messages';
-import { MultiToken } from '../api/common/lib/MultiToken';
-import type { StoresProps } from '../stores';
-
-type LocalProps = {|
-  title: Node,
-|};
-
-@observer
-export default class NavBarContainer extends Component<{| ...StoresProps, ...LocalProps |}> {
-  static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
-    intl: intlShape.isRequired,
-  };
-
-  updateHideBalance: void => Promise<void> = async () => {
-    await this.props.stores.profile.updateHideBalance();
-  };
-
-  switchToNewWallet: (number) => void = publicDeriverId => {
-    this.props.stores.app.goToRoute({
-      route: this.props.stores.app.currentRoute,
-      publicDeriverId,
-    });
-  };
-
-  openDialogWrapper: any => void = dialog => {
-    this.props.stores.app.goToRoute({ route: ROUTES.MY_WALLETS });
-    this.props.stores.uiDialogs.open({ dialog });
-  };
-
-  render(): Node {
-    const { intl } = this.context;
-    const { stores } = this.props;
-    const { profile, wallets: walletsStore } = stores;
-    const { wallets } = walletsStore;
-
-    const walletComponents = wallets.map(wallet => {
-      const rewards: MultiToken = this.props.stores.delegation.getRewardBalanceOrZero(wallet);
-      const { lastSyncInfo } = wallet;
-
-      return (
-        <NavDropdownRow
-          key={wallet.publicDeriverId}
-          plateComponent={<NavPlate plate={wallet.plate} walletType={wallet.type} name={wallet.name} />}
-          onSelect={() => this.switchToNewWallet(wallet.publicDeriverId)}
-          isCurrentWallet={wallet === stores.wallets.selected}
-          syncTime={lastSyncInfo?.Time ? moment(lastSyncInfo.Time).fromNow() : null}
-          detailComponent={
-            <NavWalletDetails
-              walletAmount={wallet.balance}
-              rewards={rewards}
-              onUpdateHideBalance={this.updateHideBalance}
-              shouldHideBalance={profile.shouldHideBalance}
-              getTokenInfo={genLookupOrFail(stores.tokenInfoStore.tokenInfo)}
-              defaultToken={stores.tokenInfoStore.getDefaultTokenInfo(
-                wallet.networkId
-              )}
-              showEyeIcon={false}
-              unitOfAccountSetting={profile.unitOfAccount}
-              getCurrentPrice={stores.coinPriceStore.getCurrentPrice}
-              purpose='allWallets'
-            />
-          }
-        />
-      );
-    });
-    const dropdownContent = (
-      <>
-        <NavDropdownRow
-          title={intl.formatMessage(globalMessages.allWalletsLabel)}
-          detailComponent={undefined}
-        />
-        {walletComponents}
-      </>
-    );
-
-    const dropdownComponent = (() => {
-      const getDropdownHead = () => {
-        const publicDeriver = walletsStore.selected;
-        if (publicDeriver == null) {
-          return <NoWalletsDropdown />;
-        }
-
-        const rewards: MultiToken = stores.delegation.getRewardBalanceOrZero(
-          publicDeriver
-        );
-
-        return (
-          <NavWalletDetails
-            onUpdateHideBalance={this.updateHideBalance}
-            shouldHideBalance={profile.shouldHideBalance}
-            rewards={rewards}
-            walletAmount={publicDeriver.balance}
-            getTokenInfo={genLookupOrFail(stores.tokenInfoStore.tokenInfo)}
-            defaultToken={stores.tokenInfoStore.getDefaultTokenInfo(
-              publicDeriver.networkId
-            )}
-            unitOfAccountSetting={profile.unitOfAccount}
-            getCurrentPrice={stores.coinPriceStore.getCurrentPrice}
-            purpose='topBar'
-          />
-        );
-      };
-
-      return (
-        <NavDropdown
-          headerComponent={getDropdownHead()}
-          contentComponents={dropdownContent}
-          onAddWallet={() =>
-            stores.app.goToRoute({ route: ROUTES.WALLETS.ADD })
-          }
-          openBuySellDialog={() => this.openDialogWrapper(BuySellDialog)}
-        />
-      );
-    })();
-
-    const getPlate = () => {
-      const { selected, selectedWalletName } = walletsStore;
-      if (selected == null || selectedWalletName == null) return null;
-      return <NavPlate plate={selected.plate} walletType={selected.type} name={selectedWalletName} />;
-    };
-
-    return (
-      <NavBar title={this.props.title} walletPlate={getPlate()} walletDetails={dropdownComponent} />
-    );
-  }
-}
diff --git a/packages/yoroi-extension/app/containers/NavBarContainerRevamp.js b/packages/yoroi-extension/app/containers/NavBarContainerRevamp.js
index 8c679c0c68..2c4c43a048 100644
--- a/packages/yoroi-extension/app/containers/NavBarContainerRevamp.js
+++ b/packages/yoroi-extension/app/containers/NavBarContainerRevamp.js
@@ -69,8 +69,9 @@ export default class NavBarContainerRevamp extends Component<{| ...StoresProps,
     const isRewardWallet = delegation.isRewardWallet(newWalletId);
     const isStakingPage = app.currentRoute === ROUTES.STAKING;
     await localStorage.unsetPortfolioFiatPair();
+    this.props.stores.wallets.setActiveWallet({ publicDeriverId: newWalletId });
     const route = !isRewardWallet && isStakingPage ? ROUTES.WALLETS.ROOT : app.currentRoute;
-    this.props.stores.app.goToRoute({ route, publicDeriverId: newWalletId });
+    this.props.stores.app.goToRoute({ route });
   };
 
   checkAndResetGovRoutes: void => void = () => {
diff --git a/packages/yoroi-extension/app/containers/dapp-connector/ConnectedWebsitesContainer.js b/packages/yoroi-extension/app/containers/dapp-connector/ConnectedWebsitesContainer.js
index 2ea405f85e..01c0ec0da2 100644
--- a/packages/yoroi-extension/app/containers/dapp-connector/ConnectedWebsitesContainer.js
+++ b/packages/yoroi-extension/app/containers/dapp-connector/ConnectedWebsitesContainer.js
@@ -27,12 +27,6 @@ export default class ConnectedWebsitesPageContainer extends Component<StoresProp
   };
 
   async componentDidMount() {
-    // User should not be able to access the route when using Yoroi Light
-    if (environment.isLight) {
-      this.props.stores.app.goToRoute({
-        route: ROUTES.MY_WALLETS,
-      });
-    }
     await this.props.stores.connector.refreshActiveSites();
     await this.props.stores.connector.getConnectorWhitelist();
   }
diff --git a/packages/yoroi-extension/app/containers/uri/URILandingPage.js b/packages/yoroi-extension/app/containers/uri/URILandingPage.js
index c2f9c24666..7ddd72fce7 100644
--- a/packages/yoroi-extension/app/containers/uri/URILandingPage.js
+++ b/packages/yoroi-extension/app/containers/uri/URILandingPage.js
@@ -18,11 +18,12 @@ export default class URILandingPage extends Component<StoresProps> {
   };
 
   onConfirm: void => void = () => {
+    const firstSelectedWalletId = this.firstSelectedWalletId();
+    if (firstSelectedWalletId) {
+      this.props.stores.wallets.setActiveWallet({ publicDeriverId: firstSelectedWalletId });
+    }
     // this will automatically reroute to the right page if no wallet exists
-    this.props.stores.app.goToRoute({
-      route: ROUTES.WALLETS.SEND,
-      publicDeriverId: this.firstSelectedWalletId(),
-    });
+    this.props.stores.app.goToRoute({ route: ROUTES.WALLETS.SEND });
   };
 
   render(): Node {
diff --git a/packages/yoroi-extension/app/containers/wallet/MyWalletsPage.js b/packages/yoroi-extension/app/containers/wallet/MyWalletsPage.js
deleted file mode 100644
index 4a70f81321..0000000000
--- a/packages/yoroi-extension/app/containers/wallet/MyWalletsPage.js
+++ /dev/null
@@ -1,211 +0,0 @@
-// @flow
-import type { Node } from 'react';
-import { Component } from 'react';
-import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
-import { intlShape } from 'react-intl';
-import { observer } from 'mobx-react';
-import { ROUTES } from '../../routes-config';
-import { genLookupOrFail, getTokenName } from '../../stores/stateless/tokenHelpers';
-import { Box } from '@mui/system';
-import MyWallets from '../../components/wallet/my-wallets/MyWallets';
-import TopBarLayout from '../../components/layout/TopBarLayout';
-import WalletRow from '../../components/wallet/my-wallets/WalletRow';
-import WalletDetails from '../../components/wallet/my-wallets/WalletDetails';
-import WalletCurrency from '../../components/wallet/my-wallets/WalletCurrency';
-import WalletSubRow from '../../components/wallet/my-wallets/WalletSubRow';
-import NavPlate from '../../components/topbar/NavPlate';
-import SidebarContainer from '../SidebarContainer';
-import BannerContainer from '../banners/BannerContainer';
-import NavBarTitle from '../../components/topbar/NavBarTitle';
-import WalletSync from '../../components/wallet/my-wallets/WalletSync';
-import moment from 'moment';
-import globalMessages from '../../i18n/global-messages';
-import NavBarRevamp from '../../components/topbar/NavBarRevamp';
-import { MultiToken } from '../../api/common/lib/MultiToken';
-import type { WalletState } from '../../../chrome/extension/background/types';
-import type { StoresProps } from '../../stores';
-
-@observer
-export default class MyWalletsPage extends Component<StoresProps> {
-  static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
-    intl: intlShape.isRequired,
-  };
-
-  onClose: void => void = () => {
-    this.props.stores.uiDialogs.closeActiveDialog();
-  };
-
-  openDialogWrapper: any => void = dialog => {
-    this.props.stores.uiDialogs.open({ dialog });
-  };
-
-  updateHideBalance: void => Promise<void> = async () => {
-    await this.props.stores.profile.updateHideBalance();
-  };
-
-  handleWalletNavItemClick: number => void = (
-    publicDeriverId
-  ) => {
-    this.props.stores.app.goToRoute({
-      route: ROUTES.WALLETS.ROOT,
-      publicDeriverId,
-    });
-  };
-
-  openToSettings: (number) => void = publicDeriverId => {
-    this.props.stores.wallets.setActiveWallet({
-      publicDeriverId
-    });
-    this.props.stores.app.goToRoute({
-      route: ROUTES.SETTINGS.WALLET,
-    });
-  };
-
-  render(): Node {
-    const { intl } = this.context;
-    const { stores } = this.props;
-
-    const sidebarContainer = <SidebarContainer stores={stores} />;
-    const { wallets } = stores.wallets;
-    const navbarTitle = <NavBarTitle title={intl.formatMessage(globalMessages.sidebarWallets)} />;
-
-    const navbarElementRevamp = (
-      <NavBarRevamp
-        title={navbarTitle}
-        buyButton={
-          <>
-            {/* <Button variant="secondary">{intl.formatMessage(globalMessages.send)}</Button>
-            <Button variant="secondary">{intl.formatMessage(globalMessages.receive)}</Button> */}
-          </>
-        }
-      />
-    );
-
-    const walletsList = <Box flex={1}>{wallets.map(wallet => this.generateRow(wallet))}</Box>;
-
-    return (
-      <TopBarLayout
-        banner={<BannerContainer stores={stores} />}
-        sidebar={sidebarContainer}
-        navbar={navbarElementRevamp}
-        showInContainer
-      >
-        <MyWallets>{walletsList}</MyWallets>
-      </TopBarLayout>
-    );
-  }
-
-  generateRow: (WalletState) => Node = wallet => {
-    const walletSumCurrencies = (() => {
-      const defaultToken = this.props.stores.tokenInfoStore.getDefaultTokenInfo(
-        wallet.networkId
-      );
-      const defaultTokenInfo = genLookupOrFail(this.props.stores.tokenInfoStore.tokenInfo)({
-        identifier: defaultToken.Identifier,
-        networkId: wallet.networkId,
-      });
-      return (
-        <>
-          <WalletCurrency
-            currency={getTokenName(defaultTokenInfo)}
-            tooltipText={undefined /* TODO */}
-          />
-        </>
-      );
-    })();
-
-    const rewards: MultiToken = this.props.stores.delegation.getRewardBalanceOrZero(
-      wallet
-    );
-
-    const { plate, lastSyncInfo } = wallet;
-
-    const isLoading = this.props.stores.transactions.isWalletLoading(wallet.publicDeriverId);
-
-    return (
-      <WalletRow
-        isExpandable={false /* TODO: should be expandable if > 1 public deriver */}
-        key={wallet.publicDeriverId}
-        onRowClicked={() => this.handleWalletNavItemClick(wallet.publicDeriverId)}
-        walletSumDetails={
-          <WalletDetails
-            walletAmount={wallet.balance}
-            rewards={rewards}
-            // TODO: This should be probably bound to an individual wallet
-            onUpdateHideBalance={this.updateHideBalance}
-            shouldHideBalance={this.props.stores.profile.shouldHideBalance}
-            getTokenInfo={genLookupOrFail(this.props.stores.tokenInfoStore.tokenInfo)}
-            isRefreshing={wallet.isRefreshing}
-          />
-        }
-        walletSumCurrencies={walletSumCurrencies}
-        walletSubRow={() => this.createSubrow(wallet)}
-        walletPlate={<NavPlate plate={plate} walletType={wallet.type} name={wallet.name}/>}
-        walletSync={
-          <WalletSync
-            time={lastSyncInfo.Time ? moment(lastSyncInfo.Time).fromNow() : null}
-            isRefreshing={wallet.isRefreshing}
-            isLoading={isLoading}
-          />
-        }
-        onSettings={() => this.openToSettings(wallet.publicDeriverId)}
-      />
-    );
-  };
-
-  createSubrow: (WalletState) => Node = wallet => {
-    const { intl } = this.context;
-
-    const defaultToken = this.props.stores.tokenInfoStore.getDefaultTokenInfo(
-      wallet.networkId,
-    );
-    const defaultTokenInfo = genLookupOrFail(this.props.stores.tokenInfoStore.tokenInfo)({
-      identifier: defaultToken.Identifier,
-      networkId: wallet.networkId,
-    });
-
-    // TODO: replace with wallet addresses
-    const walletAddresses = [
-      'Ae45dPwUPEZMen5UdmKCeiNqCooMVBpDQbmhM1dtFSFigvbvDTZdF4nbdf4u3',
-      'Ae2tdPwUPEZMen5UdmKCeiNqCooMVBpDQbmhM1dtFSFigvbvDTZdF4nmt4s7',
-    ];
-
-    const addressesLength = walletAddresses.length;
-
-    const plate = wallet.plate;
-
-    const walletSubRow = (
-      <WalletSubRow
-        walletInfo={{
-          conceptualWalletName: wallet.name,
-          plate,
-        }}
-        // TODO: do we delete WalletDetails? Lots of duplication with Nav alternative
-        walletDetails={
-          <WalletDetails
-            infoText={`${addressesLength} ${intl.formatMessage(
-              addressesLength > 1 ? globalMessages.addressesLabel : globalMessages.addressLabel
-            )}`}
-            // TODO: This should be probably bound to an individual wallet
-            onUpdateHideBalance={this.updateHideBalance}
-            shouldHideBalance={this.props.stores.profile.shouldHideBalance}
-            rewards={null /* TODO */}
-            walletAmount={null /* TODO */}
-            getTokenInfo={genLookupOrFail(this.props.stores.tokenInfoStore.tokenInfo)}
-            isRefreshing={false /* not actually used */}
-          />
-        }
-        walletNumber={1}
-        walletAddresses={walletAddresses /* TODO: replace with proper hashes */}
-        walletCurrencies={
-          <WalletCurrency
-            currency={getTokenName(defaultTokenInfo)}
-            tooltipText="0.060" // TODO
-          />
-        }
-      />
-    );
-
-    return walletSubRow;
-  };
-}
diff --git a/packages/yoroi-extension/app/containers/wallet/Wallet.js b/packages/yoroi-extension/app/containers/wallet/Wallet.js
index a9d19141af..78cd2ee8fb 100644
--- a/packages/yoroi-extension/app/containers/wallet/Wallet.js
+++ b/packages/yoroi-extension/app/containers/wallet/Wallet.js
@@ -7,7 +7,6 @@ import { intlShape } from 'react-intl';
 import TopBarLayout from '../../components/layout/TopBarLayout';
 import VerticallyCenteredLayout from '../../components/layout/VerticallyCenteredLayout';
 import SidebarContainer from '../SidebarContainer';
-import NavBarContainer from '../NavBarContainer';
 import BannerContainer from '../banners/BannerContainer';
 import LoadingSpinner from '../../components/widgets/LoadingSpinner';
 import { ROUTES } from '../../routes-config';
@@ -89,17 +88,7 @@ export default class Wallet extends Component<{| ...Props, ...StoresProps |}> {
     const selectedWallet = stores.wallets.selectedOrFail;
 
     if (!selectedWallet) {
-      return (
-        <TopBarLayout
-          banner={<BannerContainer stores={stores} />}
-          navbar={<NavBarContainer title="" stores={stores} />}
-          showInContainer
-        >
-          <VerticallyCenteredLayout>
-            <LoadingSpinner />
-          </VerticallyCenteredLayout>
-        </TopBarLayout>
-      );
+      return null;
     }
     const warning = this.getWarning(selectedWallet.publicDeriverId);
 
diff --git a/packages/yoroi-extension/app/routes-config.js b/packages/yoroi-extension/app/routes-config.js
index e7b226fd2e..badc57cb03 100644
--- a/packages/yoroi-extension/app/routes-config.js
+++ b/packages/yoroi-extension/app/routes-config.js
@@ -6,7 +6,6 @@ export const ROUTES = {
   ROOT: '/',
   PAGE_ERROR: PAGE_ERROR_SUBROUTE,
   NIGHTLY_INFO: '/nightly',
-  MY_WALLETS: '/my-wallets',
   PROFILE: {
     LANGUAGE_SELECTION: '/profile/language-selection',
     TERMS_OF_USE: '/profile/terms-of-use',
diff --git a/packages/yoroi-extension/app/stores/toplevel/AppStore.js b/packages/yoroi-extension/app/stores/toplevel/AppStore.js
index 7cf884a083..45635c4d85 100644
--- a/packages/yoroi-extension/app/stores/toplevel/AppStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/AppStore.js
@@ -24,31 +24,13 @@ export default class AppStore extends Store<StoresMap> {
   goToRoute: {|
     route: string,
     params?: Object,
-    publicDeriverId?: null | number,
   |} => void = (
     options
   ) => {
     const routePath = buildRoute(options.route, options.params);
-    const { stores } = this;
-    const currentRoute = stores.router.location.pathname;
-    if (
-      options.publicDeriverId !== undefined &&
-      options.publicDeriverId !== stores.wallets.selected?.publicDeriverId
-    ) {
-      if (options.publicDeriverId == null) {
-        stores.wallets.unsetActiveWallet();
-      } else {
-        stores.wallets.setActiveWallet({ publicDeriverId: options.publicDeriverId });
-      }
-      // we can't clear the browser history programmatically (requires root privilege)
-      // so instead, we route the user to a page that blocks the back button
-      stores.router.push({ pathname: ROUTES.SWITCH });
-      // we need the timeout otherwise mobx will optimize out the fake path
-      setTimeout(() => {
-        stores.router.push({ pathname: routePath });
-      });
-    } else if (currentRoute !== routePath) {
-      stores.router.push(routePath);
+    const currentRoute = this.stores.router.location.pathname;
+    if (currentRoute !== routePath) {
+      this.stores.router.push(routePath);
     }
   };
 }
diff --git a/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js b/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
index 53d6353a4b..ef10ef7999 100644
--- a/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
@@ -113,8 +113,7 @@ export default class ProfileStore extends BaseProfileStore<StoresMap> {
             return;
           }
           const lastSelectedWallet = await this.stores.wallets.getLastSelectedWallet();
-          stores.app.goToRoute({
-            route: ROUTES.WALLETS.ROOT,
+          stores.wallets.setActiveWallet({
             publicDeriverId: lastSelectedWallet?.publicDeriverId ?? firstWallet.publicDeriverId,
           });
         }

From d72e0041add1e0b514178e9cf9867e7a0776a3f4 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 8 Jan 2025 21:23:56 +0800
Subject: [PATCH 129/143] restructure some code

---
 .../stores/toplevel/ConnectorLoadingStore.js  |  7 +--
 .../app/stores/base/BaseLoadingStore.js       | 55 +++++++++----------
 .../app/stores/toplevel/LoadingStore.js       | 38 +++++--------
 3 files changed, 41 insertions(+), 59 deletions(-)

diff --git a/packages/yoroi-extension/app/connector/stores/toplevel/ConnectorLoadingStore.js b/packages/yoroi-extension/app/connector/stores/toplevel/ConnectorLoadingStore.js
index 6185aff515..49c289d01f 100644
--- a/packages/yoroi-extension/app/connector/stores/toplevel/ConnectorLoadingStore.js
+++ b/packages/yoroi-extension/app/connector/stores/toplevel/ConnectorLoadingStore.js
@@ -7,18 +7,13 @@ import {
 
 export default class ConnectorLoadingStore extends BaseLoadingStore<StoresMap> {
 
-  async preLoadingScreenEnd(): Promise<void> {
-    await super.preLoadingScreenEnd();
+  async loadingEnd(): Promise<void> {
     // fixme ? wait for wallets loading
 
     await this.stores.tokenInfoStore.refreshTokenInfo();
     await this.stores.coinPriceStore.loadFromStorage();
   }
 
-  postLoadingScreenEnd(): void {
-    super.postLoadingScreenEnd();
-  }
-
   getTabIdKey(): string {
     return TabIdKeys.YoroiConnector;
   }
diff --git a/packages/yoroi-extension/app/stores/base/BaseLoadingStore.js b/packages/yoroi-extension/app/stores/base/BaseLoadingStore.js
index baea1048bf..f0c49a7cbf 100644
--- a/packages/yoroi-extension/app/stores/base/BaseLoadingStore.js
+++ b/packages/yoroi-extension/app/stores/base/BaseLoadingStore.js
@@ -34,34 +34,32 @@ export default class BaseLoadingStore<TStores> extends Store<TStores> {
         + stringifyError(e)
       );
     }
-    await Promise
-      .all(this.__blockingLoadingRequests.map(([r]) => r.execute()))
-      .then(async () => {
-        Logger.debug(`[yoroi] closing other instances`);
-        await closeOtherInstances(this.getTabIdKey.bind(this)());
-        Logger.debug(`[yoroi][preLoadingScreenEnd]`);
-        await this.preLoadingScreenEnd.bind(this)();
-        runInAction(() => {
-          this.error = null;
-          this._loading = false;
-          this.postLoadingScreenEnd();
-          Logger.debug(`[yoroi] loading ended`);
-        });
-        return undefined;
-      })
-      .catch((error) => {
-        const failedBlockingLoadingRequestName =
-          this.__blockingLoadingRequests.find(([r]) => r.error != null)?.[1];
-        const errorType = failedBlockingLoadingRequestName || 'unclear';
-        Logger.error(
-          `${nameof(BaseLoadingStore)}::${nameof(this.load)}
+    try {
+      await Promise.all(this.__blockingLoadingRequests.map(([r]) => r.execute()))
+
+      Logger.debug(`[yoroi] closing other instances`);
+      await closeOtherInstances(this.getTabIdKey.bind(this)());
+
+      await this.loadingEnd();
+
+      runInAction(() => {
+        this.error = null;
+        this._loading = false;
+        Logger.debug(`[yoroi] loading ended`);
+      });
+    } catch (error) {
+      const failedBlockingLoadingRequestName =
+        this.__blockingLoadingRequests.find(([r]) => r.error != null)?.[1];
+      const errorType = failedBlockingLoadingRequestName || 'unclear';
+      Logger.error(
+        `${nameof(BaseLoadingStore)}::${nameof(this.load)}
            Unable to load libraries (error type: ${errorType}) `
           + stringifyError(error)
-        );
-        runInAction(() => {
-          this.error = new UnableToLoadError();
-        });
+      );
+      runInAction(() => {
+        this.error = new UnableToLoadError();
       });
+    }
   }
 
   @computed get isLoading(): boolean {
@@ -72,10 +70,7 @@ export default class BaseLoadingStore<TStores> extends Store<TStores> {
     throw new Error(`${nameof(BaseLoadingStore)}::${nameof(this.getTabIdKey)} child needs to override this function`);
   }
 
-  async preLoadingScreenEnd(): Promise<void> {
-    // eslint-disable-line no-empty-function
-  }
-  postLoadingScreenEnd(): void {
-    // eslint-disable-line no-empty-function
+  async loadingEnd(): Promise<void> {
+    throw new Error('should be overridden by subclass');
   }
 }
diff --git a/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js b/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js
index 8faab29781..32b34deaf8 100644
--- a/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js
@@ -21,6 +21,8 @@ type SellAdaParamsType = {|
   amount: string,
 |};
 
+const REDIRECT_REGEX: RegExp = pathToRegexp(ROUTES.OAUTH_FROM_EXTERNAL.DROPBOX);
+
 export default class LoadingStore extends BaseLoadingStore<StoresMap> {
   /**
    * null if app not opened from URI Scheme OR URI scheme was invalid
@@ -75,9 +77,19 @@ export default class LoadingStore extends BaseLoadingStore<StoresMap> {
     return this._redirectUri;
   }
 
-  async preLoadingScreenEnd(): Promise<void> {
-    await super.preLoadingScreenEnd();
-
+  async loadingEnd(): Promise<void> {
+    if (REDIRECT_REGEX.test(this.stores.app.currentRoute)) {
+      this._shouldRedirect = true;
+      this._redirectUri = this.stores.app.currentRoute;
+    }
+    // before redirecting, save origin route in case we need to come back to
+    // it later (this is the case when user comes from a URI link)
+    runInAction(() => {
+      this._originRoute = {
+        route: this.stores.app.currentRoute,
+        location: window.location.href,
+      };
+    });
     if (this.fromUriScheme) {
       const networkId = networks.CardanoMainnet.NetworkId;
       const cardanoMeta = defaultAssets.filter(
@@ -117,26 +129,6 @@ export default class LoadingStore extends BaseLoadingStore<StoresMap> {
     });
   }
 
-  _redirectRegex: RegExp = pathToRegexp(ROUTES.OAUTH_FROM_EXTERNAL.DROPBOX);
-
-  postLoadingScreenEnd(): void {
-    super.postLoadingScreenEnd();
-    const { stores } = this;
-    if (this._redirectRegex.test(stores.app.currentRoute)) {
-      this._shouldRedirect = true;
-      this._redirectUri = stores.app.currentRoute;
-    }
-    // before redirecting, save origin route in case we need to come back to
-    // it later (this is the case when user comes from a URI link)
-    runInAction(() => {
-      this._originRoute = {
-        route: stores.app.currentRoute,
-        location: window.location.href,
-      };
-    });
-    stores.app.goToRoute({ route: ROUTES.ROOT });
-  }
-
   getTabIdKey(): string {
     return TabIdKeys.Primary;
   }

From 8fe0f0e32e9571b45e58123f77a99427a089801a Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 8 Jan 2025 22:04:23 +0800
Subject: [PATCH 130/143] remove unused stuff

---
 packages/yoroi-extension/app/Routes.js        |  8 ----
 .../settings/categories/OAuthDropboxPage.js   | 41 -------------------
 packages/yoroi-extension/app/routes-config.js |  4 --
 .../app/stores/toplevel/LoadingStore.js       | 24 -----------
 .../app/stores/toplevel/ProfileStore.js       |  4 +-
 5 files changed, 1 insertion(+), 80 deletions(-)
 delete mode 100644 packages/yoroi-extension/app/containers/settings/categories/OAuthDropboxPage.js

diff --git a/packages/yoroi-extension/app/Routes.js b/packages/yoroi-extension/app/Routes.js
index a3eef56843..530ae99fb8 100644
--- a/packages/yoroi-extension/app/Routes.js
+++ b/packages/yoroi-extension/app/Routes.js
@@ -73,8 +73,6 @@ const WalletSettingsPagePromise = () => import('./containers/settings/categories
 const WalletSettingsPage = React.lazy(WalletSettingsPagePromise);
 const ExternalStorageSettingsPagePromise = () => import('./containers/settings/categories/ExternalStorageSettingsPage');
 const ExternalStorageSettingsPage = React.lazy(ExternalStorageSettingsPagePromise);
-const OAuthDropboxPagePromise = () => import('./containers/settings/categories/OAuthDropboxPage');
-const OAuthDropboxPage = React.lazy(OAuthDropboxPagePromise);
 const TermsOfUseSettingsPagePromise = () => import('./containers/settings/categories/TermsOfUseSettingsPage');
 const TermsOfUseSettingsPage = React.lazy(TermsOfUseSettingsPagePromise);
 const SupportSettingsPagePromise = () => import('./containers/settings/categories/SupportSettingsPage');
@@ -152,7 +150,6 @@ export const LazyLoadPromises: Array<() => any> = [
   GeneralSettingsPagePromise,
   WalletSettingsPagePromise,
   ExternalStorageSettingsPagePromise,
-  OAuthDropboxPagePromise,
   TermsOfUseSettingsPagePromise,
   SupportSettingsPagePromise,
   NightlyPagePromise,
@@ -269,11 +266,6 @@ export const Routes = (stores: StoresMap): Node => {
             path={ROUTES.SEND_FROM_URI.ROOT}
             component={props => <URILandingPage {...props} stores={stores} />}
           />
-          <Route
-            exact
-            path={ROUTES.OAUTH_FROM_EXTERNAL.DROPBOX}
-            component={props => <OAuthDropboxPage {...props} stores={stores} />}
-          />
           <Route exact path={ROUTES.SWITCH} component={props => <WalletSwitch {...props} stores={stores} />} />
           <Route
             exact
diff --git a/packages/yoroi-extension/app/containers/settings/categories/OAuthDropboxPage.js b/packages/yoroi-extension/app/containers/settings/categories/OAuthDropboxPage.js
deleted file mode 100644
index 99a597e147..0000000000
--- a/packages/yoroi-extension/app/containers/settings/categories/OAuthDropboxPage.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// @flow
-import type { Node } from 'react';
-import { Component } from 'react';
-import { Redirect } from 'react-router-dom';
-import { observer } from 'mobx-react';
-import { ExternalStorageList } from '../../../domain/ExternalStorage';
-import type { StoresProps } from '../../../stores';
-
-type Props = {|
-  match: {|
-    params: {|
-      token: string,
-      token_type: string,
-      uid: string,
-      account_id: string,
-    |}
-  |},
-|};
-
-@observer
-export default class OAuthDropboxPage extends Component<{| ...Props, ...StoresProps |}> {
-
-  onLoad: string => Promise<void> = async (token) => {
-    await this.props.stores.memos.setExternalStorageProvider({
-      provider: ExternalStorageList.DROPBOX,
-      token,
-    });
-  };
-
-  async componentDidMount() {
-    const { token } = this.props.match.params;
-    await this.onLoad(token);
-  }
-
-  render(): Node {
-    // URL params
-    return (
-      <Redirect to="/settings/external-storage" />
-    );
-  }
-}
diff --git a/packages/yoroi-extension/app/routes-config.js b/packages/yoroi-extension/app/routes-config.js
index badc57cb03..6ae080e191 100644
--- a/packages/yoroi-extension/app/routes-config.js
+++ b/packages/yoroi-extension/app/routes-config.js
@@ -49,10 +49,6 @@ export const ROUTES = {
   SEND_FROM_URI: {
     ROOT: '/send-from-uri',
   },
-  OAUTH_FROM_EXTERNAL: {
-    DROPBOX: '/foo', // TODO: think about this. GET params don't work well with react-router I think
-    // DROPBOX: '/access_token=:token&token_type=:token_type&uid=:uid&account_id=:account_id',
-  },
   // revamp
   STAKING: '/staking',
   ASSETS: {
diff --git a/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js b/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js
index 32b34deaf8..6075cb28ae 100644
--- a/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js
@@ -21,15 +21,11 @@ type SellAdaParamsType = {|
   amount: string,
 |};
 
-const REDIRECT_REGEX: RegExp = pathToRegexp(ROUTES.OAUTH_FROM_EXTERNAL.DROPBOX);
-
 export default class LoadingStore extends BaseLoadingStore<StoresMap> {
   /**
    * null if app not opened from URI Scheme OR URI scheme was invalid
    */
   @observable _uriParams: ?UriParams = null;
-  @observable _shouldRedirect: boolean = false;
-  @observable _redirectUri: string = '';
   sellAdaParams: ?SellAdaParamsType = null;
 
   _originRoute: {|
@@ -69,19 +65,7 @@ export default class LoadingStore extends BaseLoadingStore<StoresMap> {
     });
   }
 
-  @computed get shouldRedirect(): boolean {
-    return this._shouldRedirect;
-  }
-
-  @computed get redirectUri() : string {
-    return this._redirectUri;
-  }
-
   async loadingEnd(): Promise<void> {
-    if (REDIRECT_REGEX.test(this.stores.app.currentRoute)) {
-      this._shouldRedirect = true;
-      this._redirectUri = this.stores.app.currentRoute;
-    }
     // before redirecting, save origin route in case we need to come back to
     // it later (this is the case when user comes from a URI link)
     runInAction(() => {
@@ -121,14 +105,6 @@ export default class LoadingStore extends BaseLoadingStore<StoresMap> {
     this._originRoute = { route: '', location: '' };
   }
 
-  @action
-  redirect: void => void = () => {
-    this._shouldRedirect = false;
-    this.stores.app.goToRoute({
-      route: this._redirectUri
-    });
-  }
-
   getTabIdKey(): string {
     return TabIdKeys.Primary;
   }
diff --git a/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js b/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
index ef10ef7999..4f435ee8f9 100644
--- a/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
@@ -116,9 +116,7 @@ export default class ProfileStore extends BaseProfileStore<StoresMap> {
           stores.wallets.setActiveWallet({
             publicDeriverId: lastSelectedWallet?.publicDeriverId ?? firstWallet.publicDeriverId,
           });
-        }
-        if (stores.loading.shouldRedirect) {
-          stores.loading.redirect();
+          stores.app.goToRoute({ route: ROUTES.WALLETS.ROOT });
         }
         runInAction(() => {
           this.hasRedirected = true;

From eaf82ad07a1bbac6639a797d07e72edac1174347 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Thu, 9 Jan 2025 14:49:55 +0800
Subject: [PATCH 131/143] fix uri handling

---
 packages/yoroi-extension/app/Routes.js        |  2 ++
 .../uri/URILandingDialogContainer.js          |  6 +----
 .../app/containers/uri/URILandingPage.js      |  4 ----
 .../app/stores/toplevel/ProfileStore.js       | 23 ++++++++++---------
 .../yoroi-extension/app/utils/URIHandling.js  |  2 +-
 5 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/packages/yoroi-extension/app/Routes.js b/packages/yoroi-extension/app/Routes.js
index 530ae99fb8..0d9b53a0a9 100644
--- a/packages/yoroi-extension/app/Routes.js
+++ b/packages/yoroi-extension/app/Routes.js
@@ -288,6 +288,8 @@ export const Routes = (stores: StoresMap): Node => {
             component={props => wrapPortfolio({ ...props, stores }, PortfolioSubpages(stores))}
           />
         </Switch>
+
+        <Redirect to={ROUTES.ROOT} />
       </Suspense>
     </QueryClientProvider>
   );
diff --git a/packages/yoroi-extension/app/containers/uri/URILandingDialogContainer.js b/packages/yoroi-extension/app/containers/uri/URILandingDialogContainer.js
index af8b8c9707..2d1f3f20b8 100644
--- a/packages/yoroi-extension/app/containers/uri/URILandingDialogContainer.js
+++ b/packages/yoroi-extension/app/containers/uri/URILandingDialogContainer.js
@@ -46,11 +46,7 @@ export default class URILandingDialogContainer extends Component<Props> {
         <URIInvalidDialog
           onClose={this.onCancel}
           onSubmit={this.onCancel}
-          address={
-            this.props.stores.loading.uriParams
-              ? this.props.stores.loading.uriParams.address
-              : null
-          }
+          address={this.props.stores.loading.uriParams?.address || null}
         />
       );
     }
diff --git a/packages/yoroi-extension/app/containers/uri/URILandingPage.js b/packages/yoroi-extension/app/containers/uri/URILandingPage.js
index 7ddd72fce7..45a8196196 100644
--- a/packages/yoroi-extension/app/containers/uri/URILandingPage.js
+++ b/packages/yoroi-extension/app/containers/uri/URILandingPage.js
@@ -18,10 +18,6 @@ export default class URILandingPage extends Component<StoresProps> {
   };
 
   onConfirm: void => void = () => {
-    const firstSelectedWalletId = this.firstSelectedWalletId();
-    if (firstSelectedWalletId) {
-      this.props.stores.wallets.setActiveWallet({ publicDeriverId: firstSelectedWalletId });
-    }
     // this will automatically reroute to the right page if no wallet exists
     this.props.stores.app.goToRoute({ route: ROUTES.WALLETS.SEND });
   };
diff --git a/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js b/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
index 4f435ee8f9..8819cb2ad9 100644
--- a/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
@@ -101,21 +101,22 @@ export default class ProfileStore extends BaseProfileStore<StoresMap> {
         await stores.memos.loadFromStorage();
         await stores.tokenInfoStore.refreshTokenInfo();
         await stores.coinPriceStore.loadFromStorage();
-
         await wallets.restoreWalletsFromStorage();
+
+        const firstWallet =
+          wallets.wallets.length !== 0 ? wallets.wallets[0] : null;
+        if (firstWallet == null) {
+          stores.app.goToRoute({ route: ROUTES.WALLETS.ADD });
+          return;
+        }
+        const lastSelectedWallet = await this.stores.wallets.getLastSelectedWallet();
+        stores.wallets.setActiveWallet({
+          publicDeriverId: lastSelectedWallet?.publicDeriverId ?? firstWallet.publicDeriverId,
+        });
+
         if (wallets.hasAnyWallets && stores.loading.fromUriScheme) {
           stores.app.goToRoute({ route: ROUTES.SEND_FROM_URI.ROOT });
         } else {
-          const firstWallet =
-            wallets.wallets.length !== 0 ? wallets.wallets[0] : null;
-          if (firstWallet == null) {
-            stores.app.goToRoute({ route: ROUTES.WALLETS.ADD });
-            return;
-          }
-          const lastSelectedWallet = await this.stores.wallets.getLastSelectedWallet();
-          stores.wallets.setActiveWallet({
-            publicDeriverId: lastSelectedWallet?.publicDeriverId ?? firstWallet.publicDeriverId,
-          });
           stores.app.goToRoute({ route: ROUTES.WALLETS.ROOT });
         }
         runInAction(() => {
diff --git a/packages/yoroi-extension/app/utils/URIHandling.js b/packages/yoroi-extension/app/utils/URIHandling.js
index 41e0b59606..8687225cb9 100644
--- a/packages/yoroi-extension/app/utils/URIHandling.js
+++ b/packages/yoroi-extension/app/utils/URIHandling.js
@@ -47,7 +47,7 @@ const extractAddress: (
   currencyValidator,
 ) => {
   // consider use of URLSearchParams
-  const addressRegex = new RegExp('cardano:([A-Za-z0-9]+)');
+  const addressRegex = new RegExp('cardano:([A-Za-z0-9_]+)');
   const currencyRegex = new RegExp('(cardano+):');
   const addressMatch = addressRegex.exec(uri);
   const currencyMatch = currencyRegex.exec(uri);

From 0d3891ffa8effd694d50abe47230880475317383 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Thu, 9 Jan 2025 18:40:12 +0800
Subject: [PATCH 132/143] remove unused flag

---
 packages/yoroi-extension/app/api/thunk.js                   | 4 ++--
 packages/yoroi-extension/app/stores/toplevel/WalletStore.js | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/yoroi-extension/app/api/thunk.js b/packages/yoroi-extension/app/api/thunk.js
index 495b8359f1..c6fab20ae4 100644
--- a/packages/yoroi-extension/app/api/thunk.js
+++ b/packages/yoroi-extension/app/api/thunk.js
@@ -169,8 +169,8 @@ export async function getWallets(networkId: number): Promise<Array<WalletState>>
   return resp;
 }
 
-export async function subscribe(activeWalletId: ?number, changed?: boolean): Promise<void> {
-  await callBackground({ type: 'subscribe', request: { activeWalletId, changed: changed === true } });
+export async function subscribe(activeWalletId: ?number): Promise<void> {
+  await callBackground({ type: 'subscribe', request: { activeWalletId } });
 }
 
 export const createWallet: GetEntryFuncType<typeof CreateWallet> = async (request) => {
diff --git a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
index 3bcdcac8f3..9258949217 100644
--- a/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/WalletStore.js
@@ -285,13 +285,12 @@ export default class WalletStore extends Store<StoresMap> {
     if (walletIndex === -1) {
       throw new Error('unexpected missing wallet id');
     }
-    const changed = (this.selectedIndex != null) && (this.selectedIndex !== walletIndex);
     this.selectedIndex = walletIndex;
     this.selectedWalletName = this.wallets[walletIndex].name;
     noop(this.api.localStorage.setSelectedWalletPublicKey(
       this.wallets[walletIndex].publicKey
     ));
-    noop(subscribe(publicDeriverId, changed));
+    noop(subscribe(publicDeriverId));
     // Catalyst update // todo: maybe check if network changed
     noop(this.stores.substores.ada.votingStore.updateCatalystRoundInfo());
   };

From 2f5c0bb498b08cc3fffda8a424e124ebcac1e02b Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Thu, 9 Jan 2025 19:10:49 +0800
Subject: [PATCH 133/143] support opening the cashback page from URL

---
 .../app/stores/toplevel/LoadingStore.js       |  4 ++++
 .../app/stores/toplevel/ProfileStore.js       | 22 +++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js b/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js
index 6075cb28ae..0780d21dec 100644
--- a/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js
@@ -55,6 +55,10 @@ export default class LoadingStore extends BaseLoadingStore<StoresMap> {
     return matchRoute(ROUTES.SEND_FROM_URI.ROOT, this._originRoute.route);
   }
 
+  get shouldGotoCashback(): boolean {
+    return matchRoute(ROUTES.CASHBACK.ROOT, this._originRoute.route);
+  }
+
   @computed get uriParams(): ?UriParams {
     return this._uriParams;
   }
diff --git a/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js b/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
index 8819cb2ad9..2e1ff39a44 100644
--- a/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
@@ -103,19 +103,27 @@ export default class ProfileStore extends BaseProfileStore<StoresMap> {
         await stores.coinPriceStore.loadFromStorage();
         await wallets.restoreWalletsFromStorage();
 
-        const firstWallet =
-          wallets.wallets.length !== 0 ? wallets.wallets[0] : null;
+        const firstWallet = wallets.wallets.length !== 0 ? wallets.wallets[0] : null;
         if (firstWallet == null) {
           stores.app.goToRoute({ route: ROUTES.WALLETS.ADD });
           return;
         }
-        const lastSelectedWallet = await this.stores.wallets.getLastSelectedWallet();
-        stores.wallets.setActiveWallet({
-          publicDeriverId: lastSelectedWallet?.publicDeriverId ?? firstWallet.publicDeriverId,
-        });
+        let wallet;
+        if (stores.loading.shouldGotoCashback) {
+          wallet = await wallets.getCashbackWallet();
+        }
+        if (!wallet) {
+          wallet = await wallets.getLastSelectedWallet();
+        }
+        if (!wallet) {
+          wallet = firstWallet;
+        }
+        stores.wallets.setActiveWallet({ publicDeriverId: wallet.publicDeriverId });
 
-        if (wallets.hasAnyWallets && stores.loading.fromUriScheme) {
+        if (stores.loading.fromUriScheme) {
           stores.app.goToRoute({ route: ROUTES.SEND_FROM_URI.ROOT });
+        } else if (stores.loading.shouldGotoCashback) {
+          stores.app.goToRoute({ route: ROUTES.CASHBACK.ROOT });
         } else {
           stores.app.goToRoute({ route: ROUTES.WALLETS.ROOT });
         }

From d09dbf0c1c574bb2cb6bd85525d5bc98850eb592 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Fri, 10 Jan 2025 14:19:49 +0800
Subject: [PATCH 134/143] add buttons on cashback wallet select popup

---
 .../components/connect/ConnectPage.js         | 30 +++++++++++++++++++
 .../app/i18n/locales/en-US.json               |  1 +
 .../app/stores/toplevel/LoadingStore.js       |  8 +++++
 .../app/stores/toplevel/ProfileStore.js       |  6 ++--
 4 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/packages/yoroi-extension/app/connector/components/connect/ConnectPage.js b/packages/yoroi-extension/app/connector/components/connect/ConnectPage.js
index 84261870cb..82a87cf9ec 100644
--- a/packages/yoroi-extension/app/connector/components/connect/ConnectPage.js
+++ b/packages/yoroi-extension/app/connector/components/connect/ConnectPage.js
@@ -81,6 +81,10 @@ const messages = defineMessages({
     id: 'connector.connect.cashback.trezor.disabled',
     defaultMessage: '!!!Bring cashback service doesn’t support Trezor wallet connection',
   },
+  addWallet: {
+    id: 'connector.connect.cashback.addWallet',
+    defaultMessage: '!!!Add wallet',
+  },
 });
 
 type Props = {|
@@ -372,6 +376,32 @@ export default class ConnectPage extends Component<Props> {
             <div className={styles.infoText}>{intl.formatMessage(connectorMessages.messageReadOnly)}</div>
           </div>
         ) : null}
+        {isSelectingCashbackWallet && (
+          <Box sx={{ display: 'flex', gap: '15px', padding: '32px' }}>
+            <Button
+              sx={{ minWidth: 0 }}
+              fullWidth
+              variant="outlined"
+              color="primary"
+              onClick={this.onCancel}
+              id="cancelButton"
+            >
+              {intl.formatMessage(globalMessages.cancel)}
+            </Button>
+            <Button
+              variant="contained"
+              color="primary"
+              fullWidth
+              onClick={() => {
+                this.onCreateWallet();
+              }}
+              sx={{ minWidth: 0 }}
+              id="addWalletButton"
+            >
+              {intl.formatMessage(messages.addWallet)}
+            </Button>
+          </Box>
+        )}
       </div>
     );
   }
diff --git a/packages/yoroi-extension/app/i18n/locales/en-US.json b/packages/yoroi-extension/app/i18n/locales/en-US.json
index 8d2edbe0d5..1b5d1d28bb 100644
--- a/packages/yoroi-extension/app/i18n/locales/en-US.json
+++ b/packages/yoroi-extension/app/i18n/locales/en-US.json
@@ -97,6 +97,7 @@
   "connector.assetsReceived": "{quantity} assets received",
   "connector.assetsSent": "{quantity} assets sent",
   "connector.connect.connectedWallets": "Connected Wallets",
+  "connector.connect.cashback.addWallet": "Add wallet",
   "connector.connect.cashback.apply.all": "The wallet you select will be applied for all partner websites.",
   "connector.connect.cashback.trezor.disabled": "Bring cashback service doesn’t support Trezor wallet connection",
   "connector.connect.connectedWallets.active": "Active",
diff --git a/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js b/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js
index 0780d21dec..01577ff37d 100644
--- a/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js
@@ -51,6 +51,14 @@ export default class LoadingStore extends BaseLoadingStore<StoresMap> {
     }
   }
 
+  get landingRoute(): string | null {
+    const route = this._originRoute.route.replace(/\/$/, '');
+    if (route === '') {
+      return null;
+    }
+    return route;
+  }
+
   @computed get fromUriScheme(): boolean {
     return matchRoute(ROUTES.SEND_FROM_URI.ROOT, this._originRoute.route);
   }
diff --git a/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js b/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
index 2e1ff39a44..e5804418f7 100644
--- a/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/ProfileStore.js
@@ -120,10 +120,8 @@ export default class ProfileStore extends BaseProfileStore<StoresMap> {
         }
         stores.wallets.setActiveWallet({ publicDeriverId: wallet.publicDeriverId });
 
-        if (stores.loading.fromUriScheme) {
-          stores.app.goToRoute({ route: ROUTES.SEND_FROM_URI.ROOT });
-        } else if (stores.loading.shouldGotoCashback) {
-          stores.app.goToRoute({ route: ROUTES.CASHBACK.ROOT });
+        if (stores.loading.landingRoute) {
+          stores.app.goToRoute({ route: stores.loading.landingRoute });
         } else {
           stores.app.goToRoute({ route: ROUTES.WALLETS.ROOT });
         }

From dcea885fdcf8e66825103bfa36b1b844cffbb6cd Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Fri, 10 Jan 2025 16:16:26 +0800
Subject: [PATCH 135/143] bug fix

---
 packages/yoroi-extension/app/api/localStorage/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/yoroi-extension/app/api/localStorage/index.js b/packages/yoroi-extension/app/api/localStorage/index.js
index 022956c5d6..22fbc03e68 100644
--- a/packages/yoroi-extension/app/api/localStorage/index.js
+++ b/packages/yoroi-extension/app/api/localStorage/index.js
@@ -130,7 +130,7 @@ export default class LocalStorageApi {
   getSelectedWalletId: void => Promise<number | null> = async () => {
     let id = await getLocalItem(storageKeys.SELECTED_WALLET);
     if (!id) {
-      id = window?.localStorage.getItem(storageKeys.SELECTED_WALLET);
+      id = window.localStorage?.getItem(storageKeys.SELECTED_WALLET);
       if (!/^\d+$/.test(id)) {
         id = null;
       }

From e4c00f75bedb2e1e3bb15c9369aedb1914a261ab Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 15 Jan 2025 01:10:49 +0800
Subject: [PATCH 136/143] fix unmatched route

---
 packages/yoroi-extension/app/Routes.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/yoroi-extension/app/Routes.js b/packages/yoroi-extension/app/Routes.js
index 0d9b53a0a9..70c1fa7b03 100644
--- a/packages/yoroi-extension/app/Routes.js
+++ b/packages/yoroi-extension/app/Routes.js
@@ -287,9 +287,8 @@ export const Routes = (stores: StoresMap): Node => {
             path={ROUTES.PORTFOLIO.ROOT}
             component={props => wrapPortfolio({ ...props, stores }, PortfolioSubpages(stores))}
           />
+          <Redirect to={ROUTES.WALLETS.ROOT} />
         </Switch>
-
-        <Redirect to={ROUTES.ROOT} />
       </Suspense>
     </QueryClientProvider>
   );

From 842fc8c84a66a766592139533b6b98300edbc6ee Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 15 Jan 2025 01:13:59 +0800
Subject: [PATCH 137/143] fix: should always go to loading page initially

---
 packages/yoroi-extension/app/stores/toplevel/LoadingStore.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js b/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js
index 6075cb28ae..a84c4f9d54 100644
--- a/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js
@@ -66,14 +66,15 @@ export default class LoadingStore extends BaseLoadingStore<StoresMap> {
   }
 
   async loadingEnd(): Promise<void> {
-    // before redirecting, save origin route in case we need to come back to
-    // it later (this is the case when user comes from a URI link)
+    // Save the landing route and go to the route that shows the loading screen
     runInAction(() => {
       this._originRoute = {
         route: this.stores.app.currentRoute,
         location: window.location.href,
       };
     });
+    this.stores.app.goToRoute({ route: ROUTES.ROOT });
+
     if (this.fromUriScheme) {
       const networkId = networks.CardanoMainnet.NetworkId;
       const cardanoMeta = defaultAssets.filter(

From d0e3c16672ef9aefd671172282fef9df999d76f1 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 15 Jan 2025 16:31:27 +0800
Subject: [PATCH 138/143] remove the word Bring from UI

---
 .../general-setting/BringCashbackSettings.js         |  4 ++--
 .../app/connector/components/connect/ConnectPage.js  |  2 +-
 .../app/containers/cashback/CashbackPage.js          |  2 +-
 .../categories/RemoveWalletDialogContainer.js        |  2 +-
 packages/yoroi-extension/app/i18n/locales/en-US.json | 12 ++++++------
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js b/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
index 79d3285f9a..b57595433f 100644
--- a/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
+++ b/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
@@ -23,12 +23,12 @@ import FormControlLabel from '@mui/material/FormControlLabel';
 const messages = defineMessages({
   bringCashbackTitle: {
     id: 'settings.cashback.title',
-    defaultMessage: '!!!Bring cashback wallet',
+    defaultMessage: '!!!Cashback rewards wallet',
   },
   note: {
     id: 'settings.cashback.note',
     defaultMessage:
-      '!!!Your connected wallet is the designated wallet for receiving ADA cashback rewards through Bring and applied to all partner websites. You can switch to a different wallet anytime to ensure your cashback is directed to your preferred wallet or select “None” to decline this service.',
+      '!!!Your connected wallet is the designated wallet for receiving ADA cashback rewards and applied to all partner websites. You can switch to a different wallet anytime to ensure your cashback is directed to your preferred wallet or select “None” to decline this service.',
   },
   label: {
     id: 'settings.cashback.label',
diff --git a/packages/yoroi-extension/app/connector/components/connect/ConnectPage.js b/packages/yoroi-extension/app/connector/components/connect/ConnectPage.js
index 82a87cf9ec..774291477a 100644
--- a/packages/yoroi-extension/app/connector/components/connect/ConnectPage.js
+++ b/packages/yoroi-extension/app/connector/components/connect/ConnectPage.js
@@ -79,7 +79,7 @@ const messages = defineMessages({
   },
   cashbackDisabledTrezor: {
     id: 'connector.connect.cashback.trezor.disabled',
-    defaultMessage: '!!!Bring cashback service doesn’t support Trezor wallet connection',
+    defaultMessage: '!!!Cashback service doesn’t support Trezor wallet connection',
   },
   addWallet: {
     id: 'connector.connect.cashback.addWallet',
diff --git a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
index 81a25fc583..897d36f5ac 100644
--- a/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
+++ b/packages/yoroi-extension/app/containers/cashback/CashbackPage.js
@@ -58,7 +58,7 @@ const messages = defineMessages({
   },
   notCurrentText: {
     id: 'cashback.not.current.warning.text',
-    defaultMessage: '!!!Your cashback rewards are currently linked to another wallet. To claim your ADA cashback, either switch to the wallet connected to Bring or change the rewards wallet to the one you\'re using now. You can always access settings at anytime to change your cashback wallet and make claiming rewards relevant for you.',
+    defaultMessage: '!!!Your cashback rewards are currently linked to another wallet. To claim your ADA cashback, either switch to the rewards wallet or change the rewards wallet to the one you\'re using now. You can always access settings at anytime to change your cashback wallet and make claiming rewards relevant for you.',
   },
   currentWalletLabel: {
     id: 'cashback.not.current.warning.current',
diff --git a/packages/yoroi-extension/app/containers/settings/categories/RemoveWalletDialogContainer.js b/packages/yoroi-extension/app/containers/settings/categories/RemoveWalletDialogContainer.js
index 0332a84707..b4bf63e456 100644
--- a/packages/yoroi-extension/app/containers/settings/categories/RemoveWalletDialogContainer.js
+++ b/packages/yoroi-extension/app/containers/settings/categories/RemoveWalletDialogContainer.js
@@ -36,7 +36,7 @@ const dialogMessages = defineMessages({
   },
   cashbackWarning1: {
     id: 'wallet.settings.delete.warning1.cashback',
-    defaultMessage: '!!!Removing this wallet will not impact its balance, but as it’s connected to Bring, this may disrupt your cashback process. You can also use another wallet for connecting the cashback before removing this wallet.'
+    defaultMessage: '!!!Removing this wallet will not impact its balance, but as it is the rewards wallet, this may disrupt your cashback process. You can also use another wallet for connecting the cashback before removing this wallet.'
   },
   cashbackWarning2: {
     id: 'wallet.settings.delete.warning2.cashback',
diff --git a/packages/yoroi-extension/app/i18n/locales/en-US.json b/packages/yoroi-extension/app/i18n/locales/en-US.json
index 1b5d1d28bb..429b6e03c4 100644
--- a/packages/yoroi-extension/app/i18n/locales/en-US.json
+++ b/packages/yoroi-extension/app/i18n/locales/en-US.json
@@ -78,7 +78,7 @@
   "cashback.not.current.warning.button.yes": "yes",
   "cashback.not.current.warning.current": "Current rewards wallet",
   "cashback.not.current.warning.keep": "keep current wallet",
-  "cashback.not.current.warning.text": "Your cashback rewards are currently linked to another wallet. To claim your ADA cashback, either switch to the wallet connected to Bring or change the rewards wallet to the one you're using now. You can always access settings at anytime to change your cashback wallet and make claiming rewards relevant for you.",
+  "cashback.not.current.warning.text": "Your cashback rewards are currently linked to another wallet. To claim your ADA cashback, either switch to the rewards wallet or change the rewards wallet to the one you're using now. You can always access settings at anytime to change your cashback wallet and make claiming rewards relevant for you.",
   "cashback.not.current.warning.text.choose.1": "Your cashback rewards are currently linked to another wallet.",
   "cashback.not.current.warning.text.choose.2": "Switch wallet to access your rewards or set this wallet as your cashback wallet.",
   "cashback.not.current.warning.text.switch": "You will no longer be able to claim rewards linked to your previous cashback wallet until you link it again.",
@@ -87,7 +87,7 @@
   "cashback.not.current.warning.title.set.current": "Set my Current Wallet as my Cashback Wallet",
   "cashback.not.current.warning.current": "Current rewards wallet",
   "cashback.not.current.warning.keep": "keep current wallet",
-  "cashback.not.current.warning.text": "Your cashback rewards are currently linked to another wallet. To claim your ADA cashback, either switch to the wallet connected to Bring or change the rewards wallet to the one you're using now. You can always access settings at anytime to change your cashback wallet and make claiming rewards relevant for you.",
+  "cashback.not.current.warning.text": "Your cashback rewards are currently linked to another wallet. To claim your ADA cashback, either switch to the rewards wallet or change the rewards wallet to the one you're using now. You can always access settings at anytime to change your cashback wallet and make claiming rewards relevant for you.",
   "cashback.not.current.warning.title": "WARNING",
   "cashback.not.current.warning.use.this": "use this wallet",
   "connector.appName": "Dapp Connector",
@@ -99,7 +99,7 @@
   "connector.connect.connectedWallets": "Connected Wallets",
   "connector.connect.cashback.addWallet": "Add wallet",
   "connector.connect.cashback.apply.all": "The wallet you select will be applied for all partner websites.",
-  "connector.connect.cashback.trezor.disabled": "Bring cashback service doesn’t support Trezor wallet connection",
+  "connector.connect.cashback.trezor.disabled": "Cashback service doesn’t support Trezor wallet connection",
   "connector.connect.connectedWallets.active": "Active",
   "connector.connect.createWallet": "create wallet",
   "connector.connect.hardwareWalletsConnectWithAuthNotSupported": "Connecting to hardware wallet with authentication is not supported",
@@ -387,8 +387,8 @@
   "settings.unitOfAccount.note": "<strong>Note:</strong> coin price is approximate and may not match the price of any given trading platform. Any transactions based on these price approximates are done at your own risk.",
   "settings.unitOfAccount.revamp.label": "Select currency",
   "settings.unitOfAccount.title": "Fiat pairing",
-  "settings.cashback.title": "Bring cashback wallet",
-  "settings.cashback.note": "Your connected wallet is the designated wallet for receiving ADA cashback rewards through Bring and applied to all partner websites. You can switch to a different wallet anytime to ensure your cashback is directed to your preferred wallet or select “None” to decline this service.",
+  "settings.cashback.title": "Cashback rewards wallet",
+  "settings.cashback.note": "Your connected wallet is the designated wallet for receiving ADA cashback rewards and applied to all partner websites. You can switch to a different wallet anytime to ensure your cashback is directed to your preferred wallet or select “None” to decline this service.",
   "settings.cashback.label": "Connected wallet",
   "sidebar.assets": "Assets",
   "sidebar.portfolio": "Portfolio",
@@ -886,7 +886,7 @@
   "wallet.settings.changePassword.dialog.title.changePassword": "Change password",
   "wallet.settings.delete.accept": "I still have the means to restore this wallet",
   "wallet.settings.delete.accept.cashback": "I still have the means to restore this wallet and want to stop generating cashback rewards for this wallet.",
-  "wallet.settings.delete.warning1.cashback": "Removing this wallet will not impact its balance, but as it’s connected to Bring, this may disrupt your cashback process. You can also use another wallet for connecting the cashback before removing this wallet.",
+  "wallet.settings.delete.warning1.cashback": "Removing this wallet will not impact its balance, but as it the rewards wallet, this may disrupt your cashback process. You can also use another wallet for connecting the cashback before removing this wallet.",
   "wallet.settings.delete.warning2": "Please double-check you still have the means to restore access to this wallet. If you cannot, removing the wallet may result in irreversible loss of funds.",
   "wallet.settings.delete.warning2.cashback": "This wallet can be restored again at any time, but double-check if you still have the means to restore access to it. If you cannot, removing the wallet may result in irreversible loss of funds.",
   "wallet.settings.export.explanation": "This can be used to transfer a wallet between devices.",

From c9c26facf5fc5e304e52aa50716c114f65ce199c Mon Sep 17 00:00:00 2001
From: kalfada <kalfada3321@gmail.com>
Date: Wed, 15 Jan 2025 11:56:34 +0200
Subject: [PATCH 139/143] fix: update bring npm package

---
 packages/yoroi-extension/package-lock.json | 8 ++++----
 packages/yoroi-extension/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index 2c1d093a6e..b30d02ce60 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@amplitude/analytics-browser": "^2.1.3",
         "@babel/preset-typescript": "^7.24.7",
-        "@bringweb3/chrome-extension-kit": "^1.2.10",
+        "@bringweb3/chrome-extension-kit": "^1.2.11",
         "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
         "@emotion/react": "^11.4.1",
         "@emotion/styled": "^11.3.0",
@@ -2139,9 +2139,9 @@
       "dev": true
     },
     "node_modules/@bringweb3/chrome-extension-kit": {
-      "version": "1.2.10",
-      "resolved": "https://registry.npmjs.org/@bringweb3/chrome-extension-kit/-/chrome-extension-kit-1.2.10.tgz",
-      "integrity": "sha512-dRslgUQOxPGpyrXBb+8vtsurztFy+jDEk8oqA3QbURNH7lfNNQdTKh+36oP7wk/udOOzeQWHBIv4qApATz9vaQ==",
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/@bringweb3/chrome-extension-kit/-/chrome-extension-kit-1.2.11.tgz",
+      "integrity": "sha512-xrcbJq3OBY8HXy/PYu+6+iiUsRUcicMd9My2fIo5G8E36h2V6xO8hg1sAzGskOXeL3YkGzGQHGjobfeUuP+5QQ==",
       "dependencies": {
         "uuid": "^11.0.3"
       }
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
index 6b40188f2e..58ab93c767 100644
--- a/packages/yoroi-extension/package.json
+++ b/packages/yoroi-extension/package.json
@@ -150,7 +150,7 @@
   "dependencies": {
     "@amplitude/analytics-browser": "^2.1.3",
     "@babel/preset-typescript": "^7.24.7",
-    "@bringweb3/chrome-extension-kit": "^1.2.10",
+    "@bringweb3/chrome-extension-kit": "^1.2.11",
     "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",

From f1f8d93ebe9c8e76a58fa0da0876803bbd1bc335 Mon Sep 17 00:00:00 2001
From: yushi <yushihuang@gmail.com>
Date: Wed, 15 Jan 2025 17:21:39 +0800
Subject: [PATCH 140/143] add space

---
 .../categories/general-setting/BringCashbackSettings.js         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js b/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
index b57595433f..50e574fe06 100644
--- a/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
+++ b/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
@@ -145,7 +145,7 @@ class BringCashbackSettings extends Component<Props> {
                 <Stack direction="row">
                   <WalletIcon imagePart={wallet.plate.ImagePart} />
                   <Typography variant="body1" color="ds.text_gray_medium" mt="2px">
-                    {wallet.name}| {wallet.plate.TextPart}
+                    {wallet.name} | {wallet.plate.TextPart}
                   </Typography>
                 </Stack>
               );

From 13af7c85130ce5e58984dd7991222a7b202d9a0a Mon Sep 17 00:00:00 2001
From: kalfada <kalfada3321@gmail.com>
Date: Thu, 23 Jan 2025 17:27:47 +0200
Subject: [PATCH 141/143] fix: upgrade bring NPM package

---
 packages/yoroi-extension/package-lock.json | 8 ++++----
 packages/yoroi-extension/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index b30d02ce60..5279a047d9 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@amplitude/analytics-browser": "^2.1.3",
         "@babel/preset-typescript": "^7.24.7",
-        "@bringweb3/chrome-extension-kit": "^1.2.11",
+        "@bringweb3/chrome-extension-kit": "^1.2.12",
         "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
         "@emotion/react": "^11.4.1",
         "@emotion/styled": "^11.3.0",
@@ -2139,9 +2139,9 @@
       "dev": true
     },
     "node_modules/@bringweb3/chrome-extension-kit": {
-      "version": "1.2.11",
-      "resolved": "https://registry.npmjs.org/@bringweb3/chrome-extension-kit/-/chrome-extension-kit-1.2.11.tgz",
-      "integrity": "sha512-xrcbJq3OBY8HXy/PYu+6+iiUsRUcicMd9My2fIo5G8E36h2V6xO8hg1sAzGskOXeL3YkGzGQHGjobfeUuP+5QQ==",
+      "version": "1.2.12",
+      "resolved": "https://registry.npmjs.org/@bringweb3/chrome-extension-kit/-/chrome-extension-kit-1.2.12.tgz",
+      "integrity": "sha512-ilt+oHWOfGavDuQ2sJjIBHzyQ2WJVUosoKlA+xxUb6BrAHMBKbH3FQhnxagwQtPRdetHt4Rm6qMaGW/+wpYD/g==",
       "dependencies": {
         "uuid": "^11.0.3"
       }
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
index 58ab93c767..b9d0be8f98 100644
--- a/packages/yoroi-extension/package.json
+++ b/packages/yoroi-extension/package.json
@@ -150,7 +150,7 @@
   "dependencies": {
     "@amplitude/analytics-browser": "^2.1.3",
     "@babel/preset-typescript": "^7.24.7",
-    "@bringweb3/chrome-extension-kit": "^1.2.11",
+    "@bringweb3/chrome-extension-kit": "^1.2.12",
     "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",

From eba94b1be1f39f8a12be226fa993ce140e1e8cfb Mon Sep 17 00:00:00 2001
From: vantuz-subhuman <vantuz-subhuman@yandex.ru>
Date: Fri, 24 Jan 2025 17:16:26 +0300
Subject: [PATCH 142/143] post-merge fixes

---
 packages/yoroi-extension/app/Routes.js        |  6 --
 .../general-setting/BringCashbackSettings.js  |  1 -
 .../wallet/restore/RestoreWalletPage.js       |  2 -
 .../app/containers/NavBarContainerRevamp.js   |  2 +-
 .../ConnectedWebsitesContainer.js             |  2 -
 .../app/containers/wallet/AddWalletPage.js    |  1 -
 .../app/containers/wallet/Wallet.js           |  2 -
 .../app/stores/toplevel/AppStore.js           |  1 -
 .../app/stores/toplevel/LoadingStore.js       |  1 -
 .../background/handlers/content/bring.js      |  1 -
 packages/yoroi-extension/package-lock.json    | 65 ++++++++++++++++---
 11 files changed, 58 insertions(+), 26 deletions(-)

diff --git a/packages/yoroi-extension/app/Routes.js b/packages/yoroi-extension/app/Routes.js
index e67b1185a1..d3cdf1b58e 100644
--- a/packages/yoroi-extension/app/Routes.js
+++ b/packages/yoroi-extension/app/Routes.js
@@ -212,7 +212,6 @@ export const Routes = (stores: StoresMap): Node => {
             path={ROUTES.PROFILE.OPT_FOR_ANALYTICS}
             component={props => <OptForAnalyticsPage {...props} stores={stores} />}
           />
-          <Route exact path={ROUTES.MY_WALLETS} component={props => <MyWalletsPage {...props} stores={stores} />} />
           <Route exact path={ROUTES.STAKING} component={props => <StakingPage {...props} stores={stores} />} />
           <Route path={ROUTES.ASSETS.ROOT} component={props => wrapAssets({ ...props, stores }, AssetsSubpages(stores))} />
           <Route path={ROUTES.NFTS.ROOT} component={props => wrapNFTs({ ...props, stores }, NFTsSubPages(stores))} />
@@ -241,11 +240,6 @@ export const Routes = (stores: StoresMap): Node => {
           <Route path={ROUTES.SWAP.ROOT} component={props => wrapSwap({ ...props, stores }, SwapSubpages(stores))} />
           <Route path={ROUTES.TRANSFER.ROOT} component={props => <Transfer {...props} stores={stores} />} />
           <Route exact path={ROUTES.SEND_FROM_URI.ROOT} component={props => <URILandingPage {...props} stores={stores} />} />
-          <Route
-            exact
-            path={ROUTES.OAUTH_FROM_EXTERNAL.DROPBOX}
-            component={props => <OAuthDropboxPage {...props} stores={stores} />}
-          />
           <Route exact path={ROUTES.SWITCH} component={props => <WalletSwitch {...props} stores={stores} />} />
           <Route exact path={ROUTES.REVAMP.CATALYST_VOTING} component={props => <VotingPage {...props} stores={stores} />} />
           <Route exact path={ROUTES.EXCHANGE_END} component={props => <ExchangeEndPage {...props} stores={stores} />} />
diff --git a/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js b/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
index 50e574fe06..da7d7a21bb 100644
--- a/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
+++ b/packages/yoroi-extension/app/components/settings/categories/general-setting/BringCashbackSettings.js
@@ -50,7 +50,6 @@ type Props = {|
 class BringCashbackSettings extends Component<Props> {
   static defaultProps = {
     error: undefined,
-    isUseSandbox: false,
   };
 
   static contextTypes: {| intl: $npm$ReactIntl$IntlFormat |} = {
diff --git a/packages/yoroi-extension/app/components/wallet/restore/RestoreWalletPage.js b/packages/yoroi-extension/app/components/wallet/restore/RestoreWalletPage.js
index 394e39ad66..075d5d305e 100644
--- a/packages/yoroi-extension/app/components/wallet/restore/RestoreWalletPage.js
+++ b/packages/yoroi-extension/app/components/wallet/restore/RestoreWalletPage.js
@@ -11,10 +11,8 @@ import SelectWalletTypeStep from './steps/type/SelectWalletTypeStep';
 import Stepper from '../../common/stepper/Stepper';
 import EnterRecoveryPhraseStep from './steps/phrase/EnterRecoveryPhraseStep';
 import AddWalletDetailsStep from '../create-wallet/AddWalletDetailsStep';
-import { networks } from '../../../api/ada/lib/storage/database/prepackaged/networks';
 import { markDialogAsShown } from '../dialogs/utils';
 import { ROUTES } from '../../../routes-config';
-import environment from '../../../environment';
 import { useRestoreWallet } from './hooks';
 import { ampli } from '../../../../ampli/index';
 import { runInAction } from 'mobx';
diff --git a/packages/yoroi-extension/app/containers/NavBarContainerRevamp.js b/packages/yoroi-extension/app/containers/NavBarContainerRevamp.js
index 2c4c43a048..bfac4266d8 100644
--- a/packages/yoroi-extension/app/containers/NavBarContainerRevamp.js
+++ b/packages/yoroi-extension/app/containers/NavBarContainerRevamp.js
@@ -17,6 +17,7 @@ import { ampli } from '../../ampli/index';
 import { MultiToken } from '../api/common/lib/MultiToken';
 import LocalStorageApi from '../api/localStorage/index';
 import SwitchNetworkDialogContainer from './settings/categories/SwitchNetworkDialogContainer';
+import type { StoresProps } from '../stores';
 
 const NETWORK_BADGES = Object.freeze({
   [networks.CardanoPreprodTestnet.NetworkId]: {
@@ -32,7 +33,6 @@ const NETWORK_BADGES = Object.freeze({
     text: 'sancho',
   },
 });
-import type { StoresProps } from '../stores';
 
 type LocalProps = {|
   title: Node,
diff --git a/packages/yoroi-extension/app/containers/dapp-connector/ConnectedWebsitesContainer.js b/packages/yoroi-extension/app/containers/dapp-connector/ConnectedWebsitesContainer.js
index 01c0ec0da2..c9e2a2fd92 100644
--- a/packages/yoroi-extension/app/containers/dapp-connector/ConnectedWebsitesContainer.js
+++ b/packages/yoroi-extension/app/containers/dapp-connector/ConnectedWebsitesContainer.js
@@ -9,8 +9,6 @@ import BannerContainer from '../banners/BannerContainer';
 import SidebarContainer from '../SidebarContainer';
 import { genLookupOrFail } from '../../stores/stateless/tokenHelpers';
 import FullscreenLayout from '../../components/layout/FullscreenLayout';
-import environment from '../../environment';
-import { ROUTES } from '../../routes-config';
 import NavBarContainerRevamp from '../NavBarContainerRevamp';
 import NavBarTitle from '../../components/topbar/NavBarTitle';
 import { connectorMessages } from '../../i18n/global-messages';
diff --git a/packages/yoroi-extension/app/containers/wallet/AddWalletPage.js b/packages/yoroi-extension/app/containers/wallet/AddWalletPage.js
index f9ee395a26..9420a30c95 100644
--- a/packages/yoroi-extension/app/containers/wallet/AddWalletPage.js
+++ b/packages/yoroi-extension/app/containers/wallet/AddWalletPage.js
@@ -5,7 +5,6 @@ import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import { intlShape } from 'react-intl';
 import { observer } from 'mobx-react';
 import { ROUTES } from '../../routes-config';
-import { networks } from '../../api/ada/lib/storage/database/prepackaged/networks';
 import { Box } from '@mui/material';
 import TopBarLayout from '../../components/layout/TopBarLayout';
 import BannerContainer from '../banners/BannerContainer';
diff --git a/packages/yoroi-extension/app/containers/wallet/Wallet.js b/packages/yoroi-extension/app/containers/wallet/Wallet.js
index 78cd2ee8fb..b665881901 100644
--- a/packages/yoroi-extension/app/containers/wallet/Wallet.js
+++ b/packages/yoroi-extension/app/containers/wallet/Wallet.js
@@ -5,10 +5,8 @@ import { observer } from 'mobx-react';
 import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
 import { intlShape } from 'react-intl';
 import TopBarLayout from '../../components/layout/TopBarLayout';
-import VerticallyCenteredLayout from '../../components/layout/VerticallyCenteredLayout';
 import SidebarContainer from '../SidebarContainer';
 import BannerContainer from '../banners/BannerContainer';
-import LoadingSpinner from '../../components/widgets/LoadingSpinner';
 import { ROUTES } from '../../routes-config';
 import { allSubcategoriesRevamp } from '../../stores/stateless/topbarCategories';
 import NavBarContainerRevamp from '../NavBarContainerRevamp';
diff --git a/packages/yoroi-extension/app/stores/toplevel/AppStore.js b/packages/yoroi-extension/app/stores/toplevel/AppStore.js
index 45635c4d85..e9282c981d 100644
--- a/packages/yoroi-extension/app/stores/toplevel/AppStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/AppStore.js
@@ -2,7 +2,6 @@
 import { computed } from 'mobx';
 import Store from '../base/Store';
 import { buildRoute } from '../../utils/routing';
-import { ROUTES } from '../../routes-config';
 import type { StoresMap } from '../index';
 
 export default class AppStore extends Store<StoresMap> {
diff --git a/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js b/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js
index 1ff73aee9b..4fafe09abf 100644
--- a/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js
+++ b/packages/yoroi-extension/app/stores/toplevel/LoadingStore.js
@@ -1,7 +1,6 @@
 // @flow
 import BigNumber from 'bignumber.js';
 import { action, observable, computed, runInAction } from 'mobx';
-import { pathToRegexp } from 'path-to-regexp';
 import BaseLoadingStore from '../base/BaseLoadingStore';
 import { ROUTES } from '../../routes-config';
 import { matchRoute } from '../../utils/routing';
diff --git a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
index f645d5a79c..e80e2964e1 100644
--- a/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
+++ b/packages/yoroi-extension/chrome/extension/background/handlers/content/bring.js
@@ -43,7 +43,6 @@ const handlers = Object.freeze({
       return { ok: publicDeriver };
     }
     const { address } = (await getAllAddressesForDisplay({ publicDeriver, type: CoreAddressTypes.CARDANO_BASE }))[0];
-    const s: string = address;
     return { ok: address };
   },
 
diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index 3e5196a2bd..c4c7cabb0c 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -11,10 +11,11 @@
       "dependencies": {
         "@amplitude/analytics-browser": "^2.1.3",
         "@babel/preset-typescript": "^7.24.7",
+        "@bringweb3/chrome-extension-kit": "^1.2.12",
         "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
         "@emotion/react": "^11.4.1",
         "@emotion/styled": "^11.3.0",
-        "@emurgo/cardano-message-signing-browser": "1.0.1",
+        "@emurgo/cardano-message-signing-browser": "1.1.0",
         "@emurgo/cardano-serialization-lib-browser": "13.2.1",
         "@emurgo/cip14-js": "2.0.0",
         "@emurgo/cip4-js": "1.0.5",
@@ -79,6 +80,7 @@
         "react-blockies": "1.4.1",
         "react-copy-to-clipboard": "5.0.3",
         "react-dom": "17.0.2",
+        "react-helmet": "6.1.0",
         "react-intl": "2.9.0",
         "react-markdown": "5.0.3",
         "react-query": "^3.39.3",
@@ -113,7 +115,7 @@
         "@babel/register": "7.12.13",
         "@babel/runtime": "7.12.18",
         "@babel/runtime-corejs3": "7.12.18",
-        "@emurgo/cardano-message-signing-nodejs": "1.0.1",
+        "@emurgo/cardano-message-signing-nodejs": "1.1.0",
         "@emurgo/cardano-serialization-lib-nodejs": "13.2.1",
         "@emurgo/cross-csl-nodejs": "6.2.1",
         "@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
@@ -2136,6 +2138,26 @@
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
       "dev": true
     },
+    "node_modules/@bringweb3/chrome-extension-kit": {
+      "version": "1.2.12",
+      "resolved": "https://registry.npmjs.org/@bringweb3/chrome-extension-kit/-/chrome-extension-kit-1.2.12.tgz",
+      "integrity": "sha512-ilt+oHWOfGavDuQ2sJjIBHzyQ2WJVUosoKlA+xxUb6BrAHMBKbH3FQhnxagwQtPRdetHt4Rm6qMaGW/+wpYD/g==",
+      "dependencies": {
+        "uuid": "^11.0.3"
+      }
+    },
+    "node_modules/@bringweb3/chrome-extension-kit/node_modules/uuid": {
+      "version": "11.0.5",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.5.tgz",
+      "integrity": "sha512-508e6IcKLrhxKdBbcA2b4KQZlLVp2+J5UwQ6F7Drckkc5N9ZJwFa4TgWtsww9UG8fGHbm6gbV19TdM5pQ4GaIA==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "bin": {
+        "uuid": "dist/esm/bin/uuid"
+      }
+    },
     "node_modules/@cardano-foundation/ledgerjs-hw-app-cardano": {
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/@cardano-foundation/ledgerjs-hw-app-cardano/-/ledgerjs-hw-app-cardano-7.1.3.tgz",
@@ -2428,14 +2450,14 @@
       "integrity": "sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww=="
     },
     "node_modules/@emurgo/cardano-message-signing-browser": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@emurgo/cardano-message-signing-browser/-/cardano-message-signing-browser-1.0.1.tgz",
-      "integrity": "sha512-yC4Ymq44WR0bXO1wzxCoyc2W/RD1KSAla0oYhin7IYoVkp2raGp8wt7QNF4pDdNnTcejn5fyPyYY9dL4666H1w=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@emurgo/cardano-message-signing-browser/-/cardano-message-signing-browser-1.1.0.tgz",
+      "integrity": "sha512-LyeiGIqCyZu9DZnKsi4wlBjZA1MN+uy3Cqpb5J6RZWvFXDJnCoxrYB/EixUiGRD/la4WsldBgtPsrIHyGsVkpg=="
     },
     "node_modules/@emurgo/cardano-message-signing-nodejs": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@emurgo/cardano-message-signing-nodejs/-/cardano-message-signing-nodejs-1.0.1.tgz",
-      "integrity": "sha512-PoKh1tQnJX18f8iEr8Jk1KXxKCn9eqaSslMI1pyOJvYRJhQVDLCh0+9YReufjp0oFJIY1ShcrR+4/WnECVZUKQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@emurgo/cardano-message-signing-nodejs/-/cardano-message-signing-nodejs-1.1.0.tgz",
+      "integrity": "sha512-PQRc8K8wZshEdmQenNUzVtiI8oJNF/1uAnBhidee5C4o1l2mDLOW+ur46HWHIFKQ6x8mSJTllcjMscHgzju0gQ==",
       "dev": true
     },
     "node_modules/@emurgo/cardano-serialization-lib-browser": {
@@ -23687,6 +23709,25 @@
         "react": "17.0.2"
       }
     },
+    "node_modules/react-fast-compare": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
+      "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="
+    },
+    "node_modules/react-helmet": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz",
+      "integrity": "sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==",
+      "dependencies": {
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.7.2",
+        "react-fast-compare": "^3.1.1",
+        "react-side-effect": "^2.1.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.3.0"
+      }
+    },
     "node_modules/react-intl": {
       "version": "2.9.0",
       "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-2.9.0.tgz",
@@ -23900,6 +23941,14 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
+    "node_modules/react-side-effect": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.2.tgz",
+      "integrity": "sha512-PVjOcvVOyIILrYoyGEpDN3vmYNLdy1CajSFNt4TDsVQC5KpTijDvWVoR+/7Rz2xT978D8/ZtFceXxzsPwZEDvw==",
+      "peerDependencies": {
+        "react": "^16.3.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
     "node_modules/react-smooth": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-4.0.1.tgz",

From 4bd2eb9cfcf6acee3988897969c2da2a70d19355 Mon Sep 17 00:00:00 2001
From: vantuz-subhuman <vantuz-subhuman@yandex.ru>
Date: Fri, 24 Jan 2025 19:20:39 +0300
Subject: [PATCH 143/143] Version bump: 5.4.601

---
 packages/yoroi-extension/package-lock.json | 4 ++--
 packages/yoroi-extension/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
index c4c7cabb0c..eecc7827e2 100644
--- a/packages/yoroi-extension/package-lock.json
+++ b/packages/yoroi-extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "yoroi",
-  "version": "5.4.600",
+  "version": "5.4.601",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "yoroi",
-      "version": "5.4.600",
+      "version": "5.4.601",
       "license": "MIT",
       "dependencies": {
         "@amplitude/analytics-browser": "^2.1.3",
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
index 037eb57b22..0c9681114a 100644
--- a/packages/yoroi-extension/package.json
+++ b/packages/yoroi-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yoroi",
-  "version": "5.4.600",
+  "version": "5.4.601",
   "description": "Cardano ADA wallet",
   "scripts": {
     "dev-mv2": "rimraf dev/ && NODE_OPTIONS=--openssl-legacy-provider babel-node scripts-mv2/build --type=debug --env 'mainnet'",