Skip to content

Commit 4d65e2a

Browse files
committed
refactor: renamed missing variables from walletconnect to reown
1 parent 6b06901 commit 4d65e2a

11 files changed

+97
-97
lines changed

src/actions.js

+39-39
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import {
1212
} from '@hathor/wallet-lib';
1313
import {
1414
METADATA_CONCURRENT_DOWNLOAD,
15-
WALLETCONNECT_CREATE_TOKEN_STATUS,
16-
WALLETCONNECT_NEW_NANOCONTRACT_TX_STATUS,
15+
REOWN_CREATE_TOKEN_STATUS,
16+
REOWN_NEW_NANOCONTRACT_TX_STATUS,
1717
} from './constants';
1818
import { mapToTxHistory } from './utils';
1919

@@ -114,11 +114,11 @@ export const types = {
114114
FEATURE_TOGGLE_UPDATED: 'FEATURE_TOGGLE_UPDATED',
115115
FEATURE_TOGGLE_READY: 'FEATURE_TOGGLE_READY',
116116
FEATURE_TOGGLE_ERROR: 'FEATURE_TOGGLE_ERROR',
117-
SET_WALLET_CONNECT: 'SET_WALLET_CONNECT',
118-
SET_WALLET_CONNECT_MODAL: 'SET_WALLET_CONNECT_MODAL',
119-
SET_WALLET_CONNECT_SESSIONS: 'SET_WALLET_CONNECT_SESSIONS',
120-
WALLET_CONNECT_ACCEPT: 'WALLET_CONNECT_ACCEPT',
121-
WALLET_CONNECT_REJECT: 'WALLET_CONNECT_REJECT',
117+
SET_REOWN: 'SET_REOWN',
118+
SET_REOWN_MODAL: 'SET_REOWN_MODAL',
119+
SET_REOWN_SESSIONS: 'SET_REOWN_SESSIONS',
120+
REOWN_ACCEPT: 'REOWN_ACCEPT',
121+
REOWN_REJECT: 'REOWN_REJECT',
122122
SET_NEW_NANO_CONTRACT_TRANSACTION: 'SET_NEW_NANO_CONTRACT_TRANSACTION',
123123
SET_UNLEASH_CLIENT: 'SET_UNLEASH_CLIENT',
124124
WC_URI_INPUTTED: 'WC_URI_INPUTTED',
@@ -189,18 +189,18 @@ export const types = {
189189
/* It signals a fetch failure due to an error. */
190190
FIRSTADDRESS_FAILURE: 'FIRSTADDRESS_FAILURE',
191191
/* It updates the redux state of new nano contract transaction status on wallet connect register. */
192-
WALLETCONNECT_NEW_NANOCONTRACT_STATUS: 'WALLETCONNECT_NEW_NANOCONTRACT_STATUS',
192+
REOWN_NEW_NANOCONTRACT_STATUS: 'REOWN_NEW_NANOCONTRACT_STATUS',
193193
UNREGISTEREDTOKENS_REQUEST: 'UNREGISTEREDTOKENS_REQUEST',
194194
UNREGISTEREDTOKENS_UPDATE: 'UNREGISTEREDTOKENS_UPDATE',
195-
WALLETCONNECT_NEW_NANOCONTRACT_RETRY: 'WALLETCONNECT_NEW_NANOCONTRACT_RETRY',
196-
WALLETCONNECT_NEW_NANOCONTRACT_RETRY_DISMISS: 'WALLETCONNECT_NEW_NANOCONTRACT_RETRY_DISMISS',
195+
REOWN_NEW_NANOCONTRACT_RETRY: 'REOWN_NEW_NANOCONTRACT_RETRY',
196+
REOWN_NEW_NANOCONTRACT_RETRY_DISMISS: 'REOWN_NEW_NANOCONTRACT_RETRY_DISMISS',
197197
SHOW_SIGN_MESSAGE_REQUEST_MODAL: 'SHOW_SIGN_MESSAGE_REQUEST_MODAL',
198198
SHOW_NANO_CONTRACT_SEND_TX_MODAL: 'SHOW_NANO_CONTRACT_SEND_TX_MODAL',
199199
SHOW_SIGN_ORACLE_DATA_REQUEST_MODAL: 'SHOW_SIGN_ORACLE_DATA_REQUEST_MODAL',
200200
SHOW_CREATE_TOKEN_REQUEST_MODAL: 'SHOW_CREATE_TOKEN_REQUEST_MODAL',
201-
WALLETCONNECT_CREATE_TOKEN_STATUS: 'WALLETCONNECT_CREATE_TOKEN_STATUS',
202-
WALLETCONNECT_CREATE_TOKEN_RETRY: 'WALLETCONNECT_CREATE_TOKEN_RETRY',
203-
WALLETCONNECT_CREATE_TOKEN_RETRY_DISMISS: 'WALLETCONNECT_CREATE_TOKEN_RETRY_DISMISS',
201+
REOWN_CREATE_TOKEN_STATUS: 'REOWN_CREATE_TOKEN_STATUS',
202+
REOWN_CREATE_TOKEN_RETRY: 'REOWN_CREATE_TOKEN_RETRY',
203+
REOWN_CREATE_TOKEN_RETRY_DISMISS: 'REOWN_CREATE_TOKEN_RETRY_DISMISS',
204204
NETWORK_CHANGED: 'NETWORK_CHANGED',
205205
APPSTATE_UPDATED: 'APPSTATE_UPDATED',
206206
};
@@ -234,7 +234,7 @@ export const setUnleashClient = (unleashClient) => ({
234234
* sessions {Array} List of sessions to store
235235
*/
236236
export const setReownSessions = (sessions) => ({
237-
type: types.SET_WALLET_CONNECT_SESSIONS,
237+
type: types.SET_REOWN_SESSIONS,
238238
payload: sessions,
239239
});
240240

@@ -246,12 +246,12 @@ export const setReownSessions = (sessions) => ({
246246
* modal.onRejectAction {Object} Action to be dispatched on reject
247247
*/
248248
export const setReownModal = (modal) => ({
249-
type: types.SET_WALLET_CONNECT_MODAL,
249+
type: types.SET_REOWN_MODAL,
250250
payload: modal,
251251
});
252252

253253
export const hideReownModal = () => ({
254-
type: types.SET_WALLET_CONNECT_MODAL,
254+
type: types.SET_REOWN_MODAL,
255255
payload: { show: false },
256256
});
257257

@@ -267,12 +267,12 @@ export const reownCancelSession = (sessionKey) => ({
267267
* @param {Object} data Data that the user has accepted.
268268
*/
269269
export const reownAccept = (data) => ({
270-
type: types.WALLET_CONNECT_ACCEPT,
270+
type: types.REOWN_ACCEPT,
271271
payload: data,
272272
});
273273

274274
export const reownReject = () => ({
275-
type: types.WALLET_CONNECT_REJECT,
275+
type: types.REOWN_REJECT,
276276
});
277277

278278
/**
@@ -872,7 +872,7 @@ export const sharedAddressUpdate = (lastSharedAddress, lastSharedIndex) => ({
872872
* reown {Reown} The Reown instance
873873
*/
874874
export const setReown = (reown) => ({
875-
type: types.SET_WALLET_CONNECT,
875+
type: types.SET_REOWN,
876876
payload: reown,
877877
});
878878

@@ -1270,92 +1270,92 @@ export const firstAddressFailure = (failurePayload) => ({
12701270
* Signals that the user wants to attempt to retry the nano contract tx send
12711271
*/
12721272
export const newNanoContractRetry = () => ({
1273-
type: types.WALLETCONNECT_NEW_NANOCONTRACT_RETRY,
1273+
type: types.REOWN_NEW_NANOCONTRACT_RETRY,
12741274
});
12751275

12761276
/**
12771277
* Signals that the user doesn't want to retry the new nano contract tx send
12781278
*/
12791279
export const newNanoContractRetryDismiss = () => ({
1280-
type: types.WALLETCONNECT_NEW_NANOCONTRACT_RETRY_DISMISS,
1280+
type: types.REOWN_NEW_NANOCONTRACT_RETRY_DISMISS,
12811281
});
12821282

12831283
/**
12841284
* Signals update on new nano contract status to ready.
12851285
*/
12861286
export const setNewNanoContractStatusReady = () => ({
1287-
type: types.WALLETCONNECT_NEW_NANOCONTRACT_STATUS,
1288-
payload: WALLETCONNECT_NEW_NANOCONTRACT_TX_STATUS.READY,
1287+
type: types.REOWN_NEW_NANOCONTRACT_STATUS,
1288+
payload: REOWN_NEW_NANOCONTRACT_TX_STATUS.READY,
12891289
});
12901290

12911291
/**
12921292
* Signals update on new nano contract status to loading.
12931293
*/
12941294
export const setNewNanoContractStatusLoading = () => ({
1295-
type: types.WALLETCONNECT_NEW_NANOCONTRACT_STATUS,
1296-
payload: WALLETCONNECT_NEW_NANOCONTRACT_TX_STATUS.LOADING,
1295+
type: types.REOWN_NEW_NANOCONTRACT_STATUS,
1296+
payload: REOWN_NEW_NANOCONTRACT_TX_STATUS.LOADING,
12971297
});
12981298

12991299
/**
13001300
* Signals update on new nano contract status to failed.
13011301
*/
13021302
export const setNewNanoContractStatusFailure = () => ({
1303-
type: types.WALLETCONNECT_NEW_NANOCONTRACT_STATUS,
1304-
payload: WALLETCONNECT_NEW_NANOCONTRACT_TX_STATUS.FAILED,
1303+
type: types.REOWN_NEW_NANOCONTRACT_STATUS,
1304+
payload: REOWN_NEW_NANOCONTRACT_TX_STATUS.FAILED,
13051305
});
13061306

13071307
/**
13081308
* Signals update on new nano contract status to successful.
13091309
*/
13101310
export const setNewNanoContractStatusSuccess = () => ({
1311-
type: types.WALLETCONNECT_NEW_NANOCONTRACT_STATUS,
1312-
payload: WALLETCONNECT_NEW_NANOCONTRACT_TX_STATUS.SUCCESSFUL,
1311+
type: types.REOWN_NEW_NANOCONTRACT_STATUS,
1312+
payload: REOWN_NEW_NANOCONTRACT_TX_STATUS.SUCCESSFUL,
13131313
});
13141314

13151315
/**
13161316
* Signals that the user wants to attempt to retry the create token request
13171317
*/
13181318
export const createTokenRetry = () => ({
1319-
type: types.WALLETCONNECT_CREATE_TOKEN_RETRY,
1319+
type: types.REOWN_CREATE_TOKEN_RETRY,
13201320
});
13211321

13221322
/**
13231323
* Signals that the user doesn't want to retry the create token request
13241324
*/
13251325
export const createTokenRetryDismiss = () => ({
1326-
type: types.WALLETCONNECT_CREATE_TOKEN_RETRY_DISMISS,
1326+
type: types.REOWN_CREATE_TOKEN_RETRY_DISMISS,
13271327
});
13281328

13291329
/**
13301330
* Signals update on create token status to ready.
13311331
*/
13321332
export const setCreateTokenStatusReady = () => ({
1333-
type: types.WALLETCONNECT_CREATE_TOKEN_STATUS,
1334-
payload: WALLETCONNECT_CREATE_TOKEN_STATUS.READY,
1333+
type: types.REOWN_CREATE_TOKEN_STATUS,
1334+
payload: REOWN_CREATE_TOKEN_STATUS.READY,
13351335
});
13361336

13371337
/**
13381338
* Signals update on create token status to loading.
13391339
*/
13401340
export const setCreateTokenStatusLoading = () => ({
1341-
type: types.WALLETCONNECT_CREATE_TOKEN_STATUS,
1342-
payload: WALLETCONNECT_CREATE_TOKEN_STATUS.LOADING,
1341+
type: types.REOWN_CREATE_TOKEN_STATUS,
1342+
payload: REOWN_CREATE_TOKEN_STATUS.LOADING,
13431343
});
13441344

13451345
/**
13461346
* Signals update on create token status to failed.
13471347
*/
13481348
export const setCreateTokenStatusFailed = () => ({
1349-
type: types.WALLETCONNECT_CREATE_TOKEN_STATUS,
1350-
payload: WALLETCONNECT_CREATE_TOKEN_STATUS.FAILED,
1349+
type: types.REOWN_CREATE_TOKEN_STATUS,
1350+
payload: REOWN_CREATE_TOKEN_STATUS.FAILED,
13511351
});
13521352

13531353
/**
13541354
* Signals update on create token status to successful.
13551355
*/
13561356
export const setCreateTokenStatusSuccessful = () => ({
1357-
type: types.WALLETCONNECT_CREATE_TOKEN_STATUS,
1358-
payload: WALLETCONNECT_CREATE_TOKEN_STATUS.SUCCESSFUL,
1357+
type: types.REOWN_CREATE_TOKEN_STATUS,
1358+
payload: REOWN_CREATE_TOKEN_STATUS.SUCCESSFUL,
13591359
});
13601360

13611361
/**

src/components/Reown/CreateTokenRequest.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import NewHathorButton from '../NewHathorButton';
2929
import { DappContainer } from './NanoContract/DappContainer';
3030
import { commonStyles } from './theme';
3131
import { FeedbackContent } from '../FeedbackContent';
32-
import { DEFAULT_TOKEN, WALLETCONNECT_CREATE_TOKEN_STATUS } from '../../constants';
32+
import { DEFAULT_TOKEN, REOWN_CREATE_TOKEN_STATUS } from '../../constants';
3333
import FeedbackModal from '../FeedbackModal';
3434
import Spinner from '../Spinner';
3535
import errorIcon from '../../assets/images/icErrorBig.png';
@@ -126,10 +126,10 @@ export const CreateTokenRequest = ({ createTokenRequest }) => {
126126
navigation.goBack();
127127
};
128128

129-
const isTxReady = status === WALLETCONNECT_CREATE_TOKEN_STATUS.READY;
130-
const isTxProcessing = status === WALLETCONNECT_CREATE_TOKEN_STATUS.LOADING;
131-
const isTxSuccessful = status === WALLETCONNECT_CREATE_TOKEN_STATUS.SUCCESSFUL;
132-
const isTxFailed = status === WALLETCONNECT_CREATE_TOKEN_STATUS.FAILED;
129+
const isTxReady = status === REOWN_CREATE_TOKEN_STATUS.READY;
130+
const isTxProcessing = status === REOWN_CREATE_TOKEN_STATUS.LOADING;
131+
const isTxSuccessful = status === REOWN_CREATE_TOKEN_STATUS.SUCCESSFUL;
132+
const isTxFailed = status === REOWN_CREATE_TOKEN_STATUS.FAILED;
133133

134134
const onFeedbackModalDismiss = () => {
135135
dispatch(createTokenRetryDismiss());

src/components/Reown/NanoContract/NewNanoContractTransactionModal.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { useDispatch, useSelector } from 'react-redux';
1616
import { ModalBase } from '../../ModalBase';
1717
import { reownReject } from '../../../actions';
1818
import { WarnDisclaimer } from '../WarnDisclaimer';
19-
import { WALLETCONNECT_SKIP_CONFIRMATION_MODAL } from '../../../config';
19+
import { REOWN_SKIP_CONFIRMATION_MODAL } from '../../../config';
2020

2121
export const NewNanoContractTransactionModal = ({
2222
onDismiss,
@@ -39,7 +39,7 @@ export const NewNanoContractTransactionModal = ({
3939
};
4040

4141
useEffect(() => {
42-
if (WALLETCONNECT_SKIP_CONFIRMATION_MODAL || isRetrying) {
42+
if (REOWN_SKIP_CONFIRMATION_MODAL || isRetrying) {
4343
navigatesToNewNanoContractScreen();
4444
}
4545
}, [isRetrying]);

src/components/Reown/NanoContract/NewNanoContractTransactionRequest.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import { COLORS } from '../../../styles/themes';
3636
import NewHathorButton from '../../NewHathorButton';
3737
import { SelectAddressModal } from '../../NanoContract/SelectAddressModal';
3838
import { FeedbackContent } from '../../FeedbackContent';
39-
import { DEFAULT_TOKEN, NANOCONTRACT_BLUEPRINTINFO_STATUS, NANOCONTRACT_REGISTER_STATUS, WALLETCONNECT_NEW_NANOCONTRACT_TX_STATUS } from '../../../constants';
39+
import { DEFAULT_TOKEN, NANOCONTRACT_BLUEPRINTINFO_STATUS, NANOCONTRACT_REGISTER_STATUS, REOWN_NEW_NANOCONTRACT_TX_STATUS } from '../../../constants';
4040
import Spinner from '../../Spinner';
4141
import FeedbackModal from '../../FeedbackModal';
4242
import errorIcon from '../../../assets/images/icErrorBig.png';
@@ -198,7 +198,7 @@ export const NewNanoContractTransactionRequest = ({ ncTxRequest }) => {
198198
}, [firstAddress]);
199199

200200
useEffect(() => {
201-
if (newTxStatus === WALLETCONNECT_NEW_NANOCONTRACT_TX_STATUS.SUCCESSFUL) {
201+
if (newTxStatus === REOWN_NEW_NANOCONTRACT_TX_STATUS.SUCCESSFUL) {
202202
navigation.navigate(
203203
'SuccessFeedbackScreen',
204204
{
@@ -229,12 +229,12 @@ export const NewNanoContractTransactionRequest = ({ ncTxRequest }) => {
229229
|| blueprintInfo.status === NANOCONTRACT_BLUEPRINTINFO_STATUS.LOADING
230230
);
231231
const isTxInfoLoaded = () => (
232-
!isTxInfoLoading() && newTxStatus !== WALLETCONNECT_NEW_NANOCONTRACT_TX_STATUS.LOADING
232+
!isTxInfoLoading() && newTxStatus !== REOWN_NEW_NANOCONTRACT_TX_STATUS.LOADING
233233
);
234234
const isTxProcessing = () => (
235-
!isTxInfoLoading() && newTxStatus === WALLETCONNECT_NEW_NANOCONTRACT_TX_STATUS.LOADING
235+
!isTxInfoLoading() && newTxStatus === REOWN_NEW_NANOCONTRACT_TX_STATUS.LOADING
236236
);
237-
const isTxFailed = () => newTxStatus === WALLETCONNECT_NEW_NANOCONTRACT_TX_STATUS.FAILED;
237+
const isTxFailed = () => newTxStatus === REOWN_NEW_NANOCONTRACT_TX_STATUS.FAILED;
238238

239239
return (
240240
<>

src/components/Reown/NanoContract/SignOracleDataModal.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { COLORS } from '../../../styles/themes';
1414
import { ModalBase } from '../../ModalBase';
1515
import { WarnDisclaimer } from '../WarnDisclaimer';
1616
import { reownReject } from '../../../actions';
17-
import { WALLETCONNECT_SKIP_CONFIRMATION_MODAL } from '../../../config';
17+
import { REOWN_SKIP_CONFIRMATION_MODAL } from '../../../config';
1818

1919
const styles = StyleSheet.create({
2020
body: {
@@ -53,7 +53,7 @@ export default ({
5353
};
5454

5555
useEffect(() => {
56-
if (WALLETCONNECT_SKIP_CONFIRMATION_MODAL) {
56+
if (REOWN_SKIP_CONFIRMATION_MODAL) {
5757
navigateToSignOracleDataScreen();
5858
}
5959
}, []);

src/components/Reown/SignMessageModal.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { COLORS } from '../../styles/themes';
1414
import { ModalBase } from '../ModalBase';
1515
import { WarnDisclaimer } from './WarnDisclaimer';
1616
import { reownReject } from '../../actions';
17-
import { WALLETCONNECT_SKIP_CONFIRMATION_MODAL } from '../../config';
17+
import { REOWN_SKIP_CONFIRMATION_MODAL } from '../../config';
1818

1919
const styles = StyleSheet.create({
2020
body: {
@@ -53,7 +53,7 @@ export default ({
5353
};
5454

5555
useEffect(() => {
56-
if (WALLETCONNECT_SKIP_CONFIRMATION_MODAL) {
56+
if (REOWN_SKIP_CONFIRMATION_MODAL) {
5757
navigateToSignMessageRequestScreen();
5858
}
5959
}, []);

src/config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@ export const _SENTRY_DSN = 'https://[email protected]
6767
/**
6868
* Whether we should skip the initial modal on wallet-connect requests
6969
*/
70-
export const WALLETCONNECT_SKIP_CONFIRMATION_MODAL = true;
70+
export const REOWN_SKIP_CONFIRMATION_MODAL = true;

src/constants.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ export const PUSH_ACTION = {
161161

162162
export const WALLET_SERVICE_FEATURE_TOGGLE = 'wallet-service-mobile.rollout';
163163
export const PUSH_NOTIFICATION_FEATURE_TOGGLE = 'push-notification.rollout';
164-
export const WALLET_CONNECT_FEATURE_TOGGLE = 'wallet-connect-mobile.rollout';
164+
export const REOWN_FEATURE_TOGGLE = 'wallet-connect-mobile.rollout';
165165
export const NETWORK_SETTINGS_FEATURE_TOGGLE = 'network-settings.rollout';
166166
export const NANO_CONTRACT_FEATURE_TOGGLE = 'nano-contract.rollout';
167167

@@ -176,13 +176,13 @@ export const NANO_CONTRACT_FEATURE_TOGGLE = 'nano-contract.rollout';
176176
export const FEATURE_TOGGLE_DEFAULTS = {
177177
[WALLET_SERVICE_FEATURE_TOGGLE]: false,
178178
[PUSH_NOTIFICATION_FEATURE_TOGGLE]: false,
179-
[WALLET_CONNECT_FEATURE_TOGGLE]: false,
179+
[REOWN_FEATURE_TOGGLE]: false,
180180
[NETWORK_SETTINGS_FEATURE_TOGGLE]: false,
181181
[NANO_CONTRACT_FEATURE_TOGGLE]: false,
182182
};
183183

184184
// Project id configured in https://walletconnect.com
185-
export const WALLET_CONNECT_PROJECT_ID = '8264fff563181da658ce64ee80e80458';
185+
export const REOWN_PROJECT_ID = '8264fff563181da658ce64ee80e80458';
186186

187187
export const STAGE_DEV_PRIVNET = 'dev-privnet';
188188
export const STAGE_TESTNET = 'testnet';
@@ -256,15 +256,15 @@ export const NETWORKSETTINGS_STATUS = {
256256
WAITING: 'waiting',
257257
};
258258

259-
export const WALLETCONNECT_CREATE_TOKEN_STATUS = {
259+
export const REOWN_CREATE_TOKEN_STATUS = {
260260
...BASE_STATUS,
261261
};
262262

263263
export const NANOCONTRACT_REGISTER_STATUS = {
264264
...BASE_STATUS,
265265
};
266266

267-
export const WALLETCONNECT_NEW_NANOCONTRACT_TX_STATUS = {
267+
export const REOWN_NEW_NANOCONTRACT_TX_STATUS = {
268268
...BASE_STATUS,
269269
};
270270

0 commit comments

Comments
 (0)