Skip to content

Commit f71779d

Browse files
frankvonhovenfrankvonhoven
authored
Merge branch 'main' into feat/1295-advanced-configuration-pt-1.1
2 parents abb998d + bc81a64 commit f71779d

33 files changed

Lines changed: 694 additions & 284 deletions

File tree

‎app/components/UI/AddCustomToken/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ class AddCustomToken extends PureComponent {
192192
if (!(await this.validateCustomToken())) return;
193193
const { TokensController } = Engine.context;
194194
const { address, symbol, decimals, name } = this.state;
195-
await TokensController.addToken(address, symbol, decimals, { name });
195+
await TokensController.addToken({ address, symbol, decimals, name });
196196

197197
this.props.metrics.trackEvent(
198198
MetaMetricsEvents.TOKEN_ADDED,

‎app/components/UI/Ramp/hooks/useHandleSuccessfulOrder.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function useHandleSuccessfulOrder() {
4949
toLowerCaseEquals(t.address, address),
5050
)
5151
) {
52-
await TokensController.addToken(address, symbol, decimals, { name });
52+
await TokensController.addToken({ address, symbol, decimals, name });
5353
}
5454
},
5555
[selectedChainId],

‎app/components/UI/SearchTokenAutocomplete/index.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,10 @@ const SearchTokenAutocomplete = ({ navigation }: Props) => {
147147
const addToken = useCallback(
148148
async ({ address, symbol, decimals, iconUrl, name }) => {
149149
const { TokensController } = Engine.context as any;
150-
await TokensController.addToken(address, symbol, decimals, {
150+
await TokensController.addToken({
151+
address,
152+
symbol,
153+
decimals,
151154
image: iconUrl,
152155
name,
153156
});

‎app/components/UI/Swaps/QuotesView.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ async function addTokenToAssetsController(newToken) {
358358
)
359359
) {
360360
const { address, symbol, decimals, name } = newToken;
361-
await TokensController.addToken(address, symbol, decimals, { name });
361+
await TokensController.addToken({ address, symbol, decimals, name });
362362
}
363363
}
364364

‎app/components/UI/Swaps/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ function SwapsAmountView({
545545
) {
546546
const { TokensController } = Engine.context;
547547
const { address, symbol, decimals, name } = sourceToken;
548-
await TokensController.addToken(address, symbol, decimals, { name });
548+
await TokensController.addToken({ address, symbol, decimals, name });
549549
}
550550
return navigation.navigate(
551551
'SwapsQuotesView',

‎app/components/Views/confirmations/SendFlow/Confirm/index.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,10 @@ class Confirm extends PureComponent {
608608
const { TokensController } = Engine.context;
609609

610610
if (!contractBalances[address]) {
611-
await TokensController.addToken(address, symbol, decimals, {
611+
await TokensController.addToken({
612+
address,
613+
symbol,
614+
decimals,
612615
image,
613616
name,
614617
});

‎app/components/Views/confirmations/components/WatchAssetRequest/index.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ const WatchAssetRequest = ({
160160
decimals,
161161
standard,
162162
}}
163+
dontWatchAsset
163164
/>
164165
</View>
165166
<View style={styles.titleWrapper}>

‎app/components/hooks/useAddressBalance/useAddressBalance.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@ const useAddressBalance = (
4747
}
4848

4949
if (!contractBalances[contractAddress] && !dontWatchAsset) {
50-
TokensController.addToken(contractAddress, symbol, decimals, {
50+
TokensController.addToken({
51+
address: contractAddress,
52+
symbol,
53+
decimals,
5154
image,
5255
name,
5356
});

‎app/core/BackgroundBridge/BackgroundBridge.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,8 @@ export class BackgroundBridge extends EventEmitter {
387387
Engine.context,
388388
Engine.controllerMessenger,
389389
origin,
390-
SubjectType.Snap,
390+
// We assume that origins connecting through the BackgroundBridge are websites
391+
SubjectType.Website,
391392
),
392393
);
393394
///: END:ONLY_INCLUDE_IF

‎app/core/Engine.ts‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,6 @@ class Engine {
421421
onNetworkStateChange: (listener) =>
422422
this.controllerMessenger.subscribe(
423423
AppConstants.NETWORK_STATE_CHANGE_EVENT,
424-
//@ts-expect-error AssetsController needs to be updated to v14 for this error disappears
425424
listener,
426425
),
427426
chainId: networkController.state.providerConfig.chainId,
@@ -436,7 +435,6 @@ class Engine {
436435
onNetworkStateChange: (listener) =>
437436
this.controllerMessenger.subscribe(
438437
AppConstants.NETWORK_STATE_CHANGE_EVENT,
439-
//@ts-expect-error AssetsController needs to be updated to v14 for this error disappears
440438
listener,
441439
),
442440
// @ts-expect-error TODO: Resolve/patch mismatch between base-controller versions. Before: never, never. Now: string, string, which expects 3rd and 4th args to be informed for restrictedControllerMessengers
@@ -509,15 +507,15 @@ class Engine {
509507
onNetworkStateChange: (listener) =>
510508
this.controllerMessenger.subscribe(
511509
AppConstants.NETWORK_STATE_CHANGE_EVENT,
512-
//@ts-expect-error AssetsController needs to be updated to v14 for this error disappears
513510
listener,
514511
),
515512
onTokenListStateChange: (listener) =>
516513
this.controllerMessenger.subscribe(
517514
AppConstants.TOKEN_LIST_STATE_CHANGE_EVENT,
518515
listener,
519516
),
520-
517+
getNetworkClientById:
518+
networkController.getNetworkClientById.bind(networkController),
521519
chainId: networkController.state.providerConfig.chainId,
522520
config: {
523521
provider: networkController.getProviderAndBlockTracker().provider,
@@ -543,7 +541,6 @@ class Engine {
543541
onNetworkStateChange: (listener) =>
544542
this.controllerMessenger.subscribe(
545543
AppConstants.NETWORK_STATE_CHANGE_EVENT,
546-
//@ts-expect-error AssetsController needs to be updated to v14 for this error disappears
547544
listener,
548545
),
549546
// @ts-expect-error TODO: Resolve/patch mismatch between base-controller versions. Before: never, never. Now: string, string, which expects 3rd and 4th args to be informed for restrictedControllerMessengers
@@ -985,7 +982,6 @@ class Engine {
985982
onNetworkStateChange: (listener) =>
986983
this.controllerMessenger.subscribe(
987984
AppConstants.NETWORK_STATE_CHANGE_EVENT,
988-
//@ts-expect-error AssetsController needs to be updated to v14 for this error disappears
989985
listener,
990986
),
991987
onTokenListStateChange: (listener) =>
@@ -1009,7 +1005,6 @@ class Engine {
10091005
},
10101006
getTokensState: () => tokensController.state,
10111007
getTokenListState: () => tokenListController.state,
1012-
//@ts-expect-error AssetsController needs to be updated to v14 for this error disappears
10131008
getNetworkState: () => networkController.state,
10141009
getPreferencesState: () => preferencesController.state,
10151010
getBalancesInSingleCall:
@@ -1024,7 +1019,6 @@ class Engine {
10241019
onNetworkStateChange: (listener) =>
10251020
this.controllerMessenger.subscribe(
10261021
AppConstants.NETWORK_STATE_CHANGE_EVENT,
1027-
//@ts-expect-error AssetsController needs to be updated to v14 for this error disappears
10281022
listener,
10291023
),
10301024
chainId: networkController.state.providerConfig.chainId,
@@ -1053,7 +1047,6 @@ class Engine {
10531047
onNetworkStateChange: (listener) =>
10541048
this.controllerMessenger.subscribe(
10551049
AppConstants.NETWORK_STATE_CHANGE_EVENT,
1056-
//@ts-expect-error AssetsController needs to be updated to v14 for this error disappears
10571050
listener,
10581051
),
10591052
onPreferencesStateChange: (listener) =>

0 commit comments

Comments
 (0)