Merge pull request #685 from tonkeeper/feature/usd-icon

feature(mobile): Update "buy" icon
tonkeeper · Jan 23, 2024 · e85d5ff · e85d5ff
2 parents 1d656c2 + e27c8db
commit e85d5ff
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 6 deletions.
diff --git a/packages/mobile/src/core/Wallet/ToncoinScreen.tsx b/packages/mobile/src/core/Wallet/ToncoinScreen.tsx
@@ -2,7 +2,7 @@ import React, { memo, useCallback, useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import * as S from './Wallet.style';
 import { useWalletInfo } from '$hooks/useWalletInfo';
-import { Button, PopupMenu, PopupMenuItem, IconButton, SwapIcon } from '$uikit';
+import { Button, PopupMenu, PopupMenuItem } from '$uikit';
 import { MainStackRouteNames, openDAppBrowser, openSend } from '$navigation';
 import { openRequireWalletModal } from '$core/ModalContainer/RequireWallet/RequireWallet';
 import { walletActions, walletWalletSelector } from '$store/wallet';
@@ -21,7 +21,7 @@ import { formatter } from '$utils/formatter';
 import { Toast } from '$store';
 import { useFlags } from '$utils/flags';
 import { HideableAmount } from '$core/HideableAmount/HideableAmount';
-import { Icon, Screen, TonIcon } from '@tonkeeper/uikit';
+import { Icon, Screen, TonIcon, IconButton } from '@tonkeeper/uikit';
 
 import { ActivityList } from '@tonkeeper/shared/components';
 import { useTonActivityList } from '@tonkeeper/shared/query/hooks/useTonActivityList';
@@ -213,13 +213,13 @@ const HeaderList = memo(() => {
           />
           <IconButton
             onPress={handleOpenExchange}
-            iconName="ic-plus-28"
+            iconName="ic-usd-28"
             title={t('wallet.buy_btn')}
           />
           {!flags.disable_swap && (
             <IconButton
               onPress={handlePressSwap}
-              icon={<SwapIcon />}
+              iconName="ic-swap-horizontal-28"
               title={t('wallet.swap_btn')}
             />
           )}

diff --git a/packages/mobile/src/tabs/Wallet/WalletScreen.tsx b/packages/mobile/src/tabs/Wallet/WalletScreen.tsx
@@ -180,7 +180,7 @@ export const WalletScreen = memo(() => {
           />
           <IconButton
             onPress={handlePressBuy}
-            iconName="ic-plus-28"
+            iconName="ic-usd-28"
             title={t('wallet.buy_btn')}
           />
           {!flags.disable_swap && (

diff --git a/packages/shared/i18n/locales/tonkeeper/en.json b/packages/shared/i18n/locales/tonkeeper/en.json
@@ -963,7 +963,7 @@
   "wallet_about" : "About",
   "wallet_buy" : "Buy",
   "wallet" : {
-    "buy_btn" : "Buy TON",
+    "buy_btn" : "Buy & Sell",
     "collectibles_tab_lable" : "Collectibles",
     "edit_tokens_btn" : "Edit",
     "nft_tab_lable" : "Collectibles",

diff --git a/packages/uikit/assets/icons/png/[email protected] b/packages/uikit/assets/icons/png/[email protected]
diff --git a/packages/uikit/assets/icons/svg/28/ic-usd-28.svg b/packages/uikit/assets/icons/svg/28/ic-usd-28.svg
diff --git a/packages/uikit/src/components/Icon/Icon.types.ts b/packages/uikit/src/components/Icon/Icon.types.ts
@@ -95,6 +95,7 @@ export type IconNames =
   | 'ic-trash-bin-28'
   | 'ic-tray-arrow-down-28'
   | 'ic-tray-arrow-up-28'
+  | 'ic-usd-28'
   | 'ic-viewfinder-28'
   | 'ic-wallet-28'
   | 'ic-warning-28'
@@ -219,6 +220,7 @@ export const AllIcons = [
   'ic-trash-bin-28',
   'ic-tray-arrow-down-28',
   'ic-tray-arrow-up-28',
+  'ic-usd-28',
   'ic-viewfinder-28',
   'ic-wallet-28',
   'ic-warning-28',
@@ -344,6 +346,7 @@ export const IconSizes = {
   'ic-trash-bin-28': 28,
   'ic-tray-arrow-down-28': 28,
   'ic-tray-arrow-up-28': 28,
+  'ic-usd-28': 28,
   'ic-viewfinder-28': 28,
   'ic-wallet-28': 28,
   'ic-warning-28': 28,

diff --git a/packages/uikit/src/components/Icon/IconList.native.ts b/packages/uikit/src/components/Icon/IconList.native.ts
@@ -95,6 +95,7 @@ export const IconList = {
   'ic-trash-bin-28': require('../../../assets/icons/png/ic-trash-bin-28.png'),
   'ic-tray-arrow-down-28': require('../../../assets/icons/png/ic-tray-arrow-down-28.png'),
   'ic-tray-arrow-up-28': require('../../../assets/icons/png/ic-tray-arrow-up-28.png'),
+  'ic-usd-28': require('../../../assets/icons/png/ic-usd-28.png'),
   'ic-viewfinder-28': require('../../../assets/icons/png/ic-viewfinder-28.png'),
   'ic-wallet-28': require('../../../assets/icons/png/ic-wallet-28.png'),
   'ic-warning-28': require('../../../assets/icons/png/ic-warning-28.png'),