Merge branch 'feat/new-home-profiles' into tmp/20241220

RabbyHub · Dec 23, 2024 · c3bf4ea · c3bf4ea
2 parents 833fe4f + 1880b72
commit c3bf4ea
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 23 deletions.
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
@@ -65,7 +65,7 @@
     "@rabby-wallet/object-multiplex": "workspace:^",
     "@rabby-wallet/persist-store": "workspace:^",
     "@rabby-wallet/rabby-action": "0.1.8",
-    "@rabby-wallet/rabby-api": "0.9.5-beta.3",
+    "@rabby-wallet/rabby-api": "0.9.5",
     "@rabby-wallet/rabby-security-engine": "2.0.7",
     "@rabby-wallet/rabby-sign-bvm": "0.1.0",
     "@rabby-wallet/rabby-swap": "0.0.43",

diff --git a/apps/mobile/src/screens/Home/AssetContainer.tsx b/apps/mobile/src/screens/Home/AssetContainer.tsx
@@ -106,13 +106,6 @@ export const AssetContainer: React.FC<Props> = ({ onRefresh }) => {
       ) {
         openTokenDetailPopup(token);
       } else {
-        console.log('🔍 CUSTOM_LOGGER:=>: handleOpenTokenDetail)', {
-          id: `${token.chain}:${token._tokenId}`,
-          pin: token._isPined,
-          fold: token._isFold,
-          exclude: token._isExcludeBalance,
-          PinIndex: token._pinIndex,
-        });
         navigate(RootNames.TokenDetail, {
           token: token,
           // todo fix ts
@@ -125,7 +118,6 @@ export const AssetContainer: React.FC<Props> = ({ onRefresh }) => {
 
   const handleOpenDefiDetail = useCallback(
     (data: AbstractProject, itemList: AbstractPortfolio[]) => {
-      console.log('🔍 CUSTOM_LOGGER:=>: defi id)', data.id);
       if (data.id === DEFI_ID) {
         setFoldDefi(pre => !pre);
         return;
@@ -136,7 +128,6 @@ export const AssetContainer: React.FC<Props> = ({ onRefresh }) => {
   );
 
   const handlePressNft = (item: NFTItem) => {
-    console.log('🔍 CUSTOM_LOGGER:=>: item)', item);
     if (item.id === NFT_ID) {
       setFoldNft(pre => !pre);
       return;
@@ -272,7 +263,6 @@ export const AssetContainer: React.FC<Props> = ({ onRefresh }) => {
           <RefreshControl
             style={styles.bgContainer}
             onRefresh={() => {
-              console.log('🔍 CUSTOM_LOGGER:=>: onRefresh)');
               refreshPositions();
               onRefresh();
             }}

diff --git a/apps/mobile/src/screens/Home/Home.tsx b/apps/mobile/src/screens/Home/Home.tsx
@@ -42,6 +42,7 @@ const getStyles = createGetStyles2024(() => ({
   },
   safeView: {
     flex: 1,
+    paddingBottom: 56,
     width: '100%',
     overflow: 'hidden',
   },

diff --git a/apps/mobile/src/utils/getTokenSettings.ts b/apps/mobile/src/utils/getTokenSettings.ts
@@ -13,11 +13,6 @@ export const getTokenSettings = async (address: string) => {
       ?.map(item => `${item.chainid}:${item.id}`) || [];
   const excluded_protocol_ids =
     excludeDefiAndTokens?.filter(i => i.type === 'defi').map(i => i.id) || [];
-  // console.log('🔍 CUSTOM_LOGGER:=>: getTokenSettings)', {
-  //   included_token_uuids,
-  //   excluded_token_uuids,
-  //   excluded_protocol_ids,
-  // });
   return {
     included_token_uuids,
     excluded_token_uuids,

diff --git a/packages/biz-utils/package.json b/packages/biz-utils/package.json
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@rabby-wallet/base-utils": "workspace:^",
-    "@rabby-wallet/rabby-api": "0.9.5-beta.3",
+    "@rabby-wallet/rabby-api": "0.9.5",
     "bignumber.js": "^9.1.2",
     "ethereumjs-util": "^7.1.5"
   },

diff --git a/yarn.lock b/yarn.lock
@@ -6140,7 +6140,7 @@ __metadata:
   dependencies:
     "@metamask/auto-changelog": ^3.4.3
     "@rabby-wallet/base-utils": "workspace:^"
-    "@rabby-wallet/rabby-api": 0.9.5-beta.3
+    "@rabby-wallet/rabby-api": 0.9.5
     "@types/jest": ^27.4.1
     "@types/sinon": ^9.0.10
     bignumber.js: ^9.1.2
@@ -6511,9 +6511,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rabby-wallet/rabby-api@npm:0.9.5-beta.3":
-  version: 0.9.5-beta.3
-  resolution: "@rabby-wallet/rabby-api@npm:0.9.5-beta.3"
+"@rabby-wallet/rabby-api@npm:0.9.5":
+  version: 0.9.5
+  resolution: "@rabby-wallet/rabby-api@npm:0.9.5"
   dependencies:
     "@rabby-wallet/rabby-sign": 0.4.0
     axios: ^0.27.2
@@ -6524,7 +6524,7 @@ __metadata:
   peerDependencies:
     "@debank/common": ^0.3.9
     "@rabby-wallet/rabby-sign": ">= 0.3"
-  checksum: f2c79c70f682ddd3cc5e5e63b1e17ad3edf594d40af6987087cbfda8bf9cdaafe186213ac8f7518be9cb595766ced8a094625f0135ede8f0042f9d50d14bd4b6
+  checksum: b430e159f549207a06195ca4ae14c6dac4220bcfcad69a07b2a2612e5823f9d07a892ae1e99382642bc645113910a544aadc7c66e9faacdc933c872947c9ab8f
   languageName: node
   linkType: hard
 
@@ -27539,7 +27539,7 @@ __metadata:
     "@rabby-wallet/object-multiplex": "workspace:^"
     "@rabby-wallet/persist-store": "workspace:^"
     "@rabby-wallet/rabby-action": 0.1.8
-    "@rabby-wallet/rabby-api": 0.9.5-beta.3
+    "@rabby-wallet/rabby-api": 0.9.5
     "@rabby-wallet/rabby-security-engine": 2.0.7
     "@rabby-wallet/rabby-sign-bvm": 0.1.0
     "@rabby-wallet/rabby-swap": 0.0.43