Skip to content
This repository was archived by the owner on Feb 8, 2025. It is now read-only.

Commit c8a1603

Browse files
authored
Merge pull request #273 from zallo-labs/Z-323-swaps-mobile
Z 323 swaps mobile
2 parents 9424378 + 94cf268 commit c8a1603

File tree

8 files changed

+11
-31
lines changed

8 files changed

+11
-31
lines changed
Binary file not shown.

api/src/core/networks/networks.service.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
webSocket,
1616
nonceManager,
1717
} from 'viem';
18-
import { eip712WalletActions, ZkSyncTransactionSerializableEIP712 } from 'viem/zksync';
18+
import { eip712WalletActions, ZkSyncTransactionSerializableEIP712, publicActionsL2 } from 'viem/zksync';
1919
import { privateKeyToAccount } from 'viem/accounts';
2020
import Redis from 'ioredis';
2121
import { InjectRedis } from '@songkeys/nestjs-redis';
@@ -80,6 +80,7 @@ function create({ chainKey, redis }: CreateParams) {
8080
batch: { multicall: true },
8181
pollingInterval: 500 /* ms */, // Used when websocket is unavailable
8282
}).extend((client) => ({
83+
...publicActionsL2()(client),
8384
...eip712WalletActions()(client),
8485
...walletActions(client, transport, redis),
8586
...blockNumberAndStatusActions(client),

app/babel.config.js

+1-6
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ module.exports = function (api) {
3131
'@ledgerhq/domain-service': '@ledgerhq/domain-service/lib-es',
3232
'@ledgerhq/evm-tools': '@ledgerhq/evm-tools/lib-es',
3333
'@ledgerhq/live-network': '@ledgerhq/live-network/lib-es',
34-
viem: 'viem/_cjs',
3534
},
3635
},
3736
],
@@ -43,11 +42,7 @@ module.exports = function (api) {
4342
],
4443
env: {
4544
production: {
46-
plugins: [
47-
'react-native-paper/babel',
48-
'transform-remove-console',
49-
// [gqlBabelOptimizer, { artifactDirectory: './src/gql/api/generated', gqlTagName: 'gql' }], // TODO: enable with preset: 'client-preset'
50-
],
45+
plugins: ['react-native-paper/babel', 'transform-remove-console'],
5146
},
5247
},
5348
};

app/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
"babel-preset-expo": "~11.0.8",
5555
"chardet": "^2.0.0",
5656
"color": "^4.2.3",
57-
"core-js": "^3.37.1",
5857
"crypto-browserify": "^3.12.0",
5958
"decimal.js": "^10.4.3",
6059
"dotenv": "^16.4.5",

app/src/app/(nav)/[account]/(home)/index.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ function HomePane_() {
6868
center
6969
headline={<AccountSelector account={account} />}
7070
style={styles.appbar}
71-
noPadding
7271
/>
7372
<FlatList
7473
contentContainerStyle={styles.container}

app/src/util/patches/index.native.ts

+3-8
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,15 @@
22
// Among those, which are overridden below: Buffer, atob, btoa
33
// import 'node-libs-react-native/globals'; // This is needed for atob for some reason, even though react-native-quick-base64 should override it
44

5-
global.process = require('process');
6-
7-
// @ts-expect-error Some modules expect userAgent to be a string
8-
global.navigator.userAgent ??= 'React Native';
9-
105
import './shared';
116

127
import '@walletconnect/react-native-compat';
138

149
// Intl pollyfills - required for iOS
1510
import './intl';
1611

17-
// Core JS
18-
import 'core-js/features/symbol/async-iterator'; // Required by urql
19-
import 'core-js/features/promise'; // Promise.allSettled required by viem client.multicall
12+
global.process = require('process');
13+
// @ts-expect-error Cannot assign to userAgent because it is a read-only property.
14+
global.navigator.userAgent ??= 'React Native';
2015

2116
export default {};

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
"turbo": "^2.0.6"
5252
},
5353
"resolutions": {
54-
"dotenv": "patch:dotenv@npm:16.4.5#.yarn/patches/dotenv-npm-16.4.5-bcb20eb95d.patch"
54+
"dotenv": "patch:dotenv@npm:16.4.5#.yarn/patches/dotenv-npm-16.4.5-bcb20eb95d.patch",
55+
"promise": "8.3.0"
5556
}
5657
}

yarn.lock

+3-13
Original file line numberDiff line numberDiff line change
@@ -14513,7 +14513,6 @@ __metadata:
1451314513
babel-preset-expo: "npm:~11.0.8"
1451414514
chardet: "npm:^2.0.0"
1451514515
color: "npm:^4.2.3"
14516-
core-js: "npm:^3.37.1"
1451714516
crypto-browserify: "npm:^3.12.0"
1451814517
decimal.js: "npm:^10.4.3"
1451914518
dotenv: "npm:^16.4.5"
@@ -14838,7 +14837,7 @@ __metadata:
1483814837
languageName: node
1483914838
linkType: hard
1484014839

14841-
"asap@npm:~2.0.3, asap@npm:~2.0.6":
14840+
"asap@npm:~2.0.6":
1484214841
version: 2.0.6
1484314842
resolution: "asap@npm:2.0.6"
1484414843
checksum: 10/b244c0458c571945e4b3be0b14eb001bea5596f9868cc50cc711dc03d58a7e953517d3f0dad81ccde3ff37d1f074701fa76a6f07d41aaa992d7204a37b915dda
@@ -17366,7 +17365,7 @@ __metadata:
1736617365
languageName: node
1736717366
linkType: hard
1736817367

17369-
"core-js@npm:^3.31.1, core-js@npm:^3.37.1":
17368+
"core-js@npm:^3.31.1":
1737017369
version: 3.37.1
1737117370
resolution: "core-js@npm:3.37.1"
1737217371
checksum: 10/25d6bd15fcc6ffd2a0ec0be57a78ff3358b3e1fdffdb6800fc93dcfdb3854037aee41f3d101aed8c37905d107daf98218b3e7ee95cec383710d2a66a5d9e541b
@@ -30533,16 +30532,7 @@ __metadata:
3053330532
languageName: node
3053430533
linkType: hard
3053530534

30536-
"promise@npm:^7.1.1":
30537-
version: 7.3.1
30538-
resolution: "promise@npm:7.3.1"
30539-
dependencies:
30540-
asap: "npm:~2.0.3"
30541-
checksum: 10/37dbe58ca7b0716cc881f0618128f1fd6ff9c46cdc529a269fd70004e567126a449a94e9428e2d19b53d06182d11b45d0c399828f103e06b2bb87643319bd2e7
30542-
languageName: node
30543-
linkType: hard
30544-
30545-
"promise@npm:^8.3.0":
30535+
"promise@npm:8.3.0":
3054630536
version: 8.3.0
3054730537
resolution: "promise@npm:8.3.0"
3054830538
dependencies:

0 commit comments

Comments
 (0)