status-im
/
safe-react
mirror of https://github.com/status-im/safe-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

notification code fixes (typos, wrong types)

This commit is contained in:
mmv 2019-10-22 14:43:52 +04:00
parent 7ef89535da
commit 3d8082c4d7
3 changed files with 15 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/logic/notifications/notificationBuilder.js
View File

@ -67,7 +67,7 @@ const safeNameChangeNotificationsQueue: NotificationsQueue = {
moreConfirmationsNeeded: null,
},
afterRejection: null,
afterExecution: NOTIFICATIONS.SAFE_NAME_CHANGE_EXECUTED_MSG,
afterExecution: NOTIFICATIONS.SAFE_NAME_CHANGED_MSG,
afterExecutionError: null,
}

26
src/logic/notifications/notificationTypes.js
View File

@ -10,15 +10,15 @@ export const INFO = 'info'
const shortDuration = 5000
const longDuration = 10000
export type Variant = SUCCESS | ERROR | WARNING | INFO
export type Variant = 'success' | 'error' | 'warning' | 'info'
export type Notification = {
message: string,
options: {
variant: Variant,
persist: boolean,
autoHideDuration?: shortDuration | longDuration,
preventDuplicate: boolean,
autoHideDuration?: 5000 | 10000,
preventDuplicate?: boolean,
},
}
@ -52,11 +52,11 @@ export type Notifications = {
// Owners
SIGN_OWNER_CHANGE_MSG: Notification,
ONWER_CHANGE_PENDING_MSG: Notification,
ONWER_CHANGE_PENDING_MORE_CONFIRMATIONS_MSG: Notification,
ONWER_CHANGE_REJECTED_MSG: Notification,
ONWER_CHANGE_EXECUTED_MSG: Notification,
ONWER_CHANGE_FAILED_MSG: Notification,
OWNER_CHANGE_PENDING_MSG: Notification,
OWNER_CHANGE_PENDING_MORE_CONFIRMATIONS_MSG: Notification,
OWNER_CHANGE_REJECTED_MSG: Notification,
OWNER_CHANGE_EXECUTED_MSG: Notification,
OWNER_CHANGE_FAILED_MSG: Notification,
// Threshold
SIGN_THRESHOLD_CHANGE_MSG: Notification,
@ -147,7 +147,7 @@ export const NOTIFICATIONS: Notifications = {
},
// Safe Name
SAFE_NAME_CHANGE_EXECUTED_MSG: {
SAFE_NAME_CHANGED_MSG: {
message: 'Safe name changed',
options: { variant: SUCCESS, persist: false, autoHideDuration: shortDuration },
},
@ -163,15 +163,15 @@ export const NOTIFICATIONS: Notifications = {
message: 'Please sign the owner change',
options: { variant: SUCCESS, persist: true },
},
ONWER_CHANGE_PENDING_MSG: {
OWNER_CHANGE_PENDING_MSG: {
message: 'Owner change pending',
options: { variant: SUCCESS, persist: true },
},
ONWER_CHANGE_PENDING_MORE_CONFIRMATIONS_MSG: {
OWNER_CHANGE_PENDING_MORE_CONFIRMATIONS_MSG: {
message: 'Owner change pending: More confirmations required to execute',
options: { variant: SUCCESS, persist: true },
},
ONWER_CHANGE_REJECTED_MSG: {
OWNER_CHANGE_REJECTED_MSG: {
message: 'Owner change rejected',
options: { variant: ERROR, persist: false, autoHideDuration: longDuration },
},
@ -179,7 +179,7 @@ export const NOTIFICATIONS: Notifications = {
message: 'Owner change successfully executed',
options: { variant: SUCCESS, persist: false, autoHideDuration: longDuration },
},
ONWER_CHANGE_FAILED_MSG: {
OWNER_CHANGE_FAILED_MSG: {
message: 'Owner change failed',
options: { variant: ERROR, persist: false, autoHideDuration: longDuration },
},

23
src/logic/wallets/getWeb3.js
View File

@ -80,28 +80,7 @@ const getNetworkIdFrom = async (web3Provider) => {
return networkId
}
export const getProviderInfo: Function = async (): Promise<ProviderProps> => {
let web3Provider
if (window.ethereum) {
web3Provider = window.ethereum
try {
await web3Provider.enable()
} catch (error) {
console.error('Error when enabling web3 provider', error)
}
} else if (window.web3) {
web3Provider = window.web3.currentProvider
} else {
return {
name: '',
available: false,
loaded: false,
account: '',
network: 0,
}
}
export const getProviderInfo: Function = async (web3Provider): Promise<ProviderProps> => {
web3 = new Web3(web3Provider)
const name = getProviderName(web3)