-
Notifications
You must be signed in to change notification settings - Fork 16
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Issue fix #75
Issue fix #75
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok on the changes related to #2 #6 #7 #9 #10 #13 #14 #40 #53
would the reporters of those issues (@lukaw3d, @bennetyee) please also leave feedback if you think these aren't sufficient. I reported #40 and it looks like the changes will be sufficient.
I do not see commits related to #44 and #52. could we remove them from the PR description?
requesting changes to separate the version bump into another PR
package.json
Outdated
@@ -1,14 +1,12 @@ | |||
{ | |||
"name": "oasis-wallet", | |||
"version": "0.1.0", | |||
"version": "1.0.0", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
proposing a version change must be in a separate PR
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, i will restore version
public/manifest.json
Outdated
@@ -3,7 +3,7 @@ | |||
"short_name": "__MSG_appName__", | |||
"description": "__MSG_appDescription__", | |||
"manifest_version": 2, | |||
"version": "0.1.0", | |||
"version": "1.0.0", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
here as well, separate PR for version bump
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, i will restore version too
var index = str.indexOf(startStr); | ||
let lastIndex = -endStr.length | ||
let specialIndex = -1 | ||
while (index !== -1) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
caveat: the string must have at least one [[...]]
pair or the output will be empty
"storybook": "start-storybook -p 6006 -s public", | ||
"build-storybook": "build-storybook -s public" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it be hard to make storybook work? Some story files still exist https://github.com/oasisprotocol/oasis-wallet-ext/tree/master/src/stories
initLockedState=()=>{ | ||
return { | ||
isUnlocked: false, | ||
data: '', | ||
password: '', | ||
currentAccount: {}, | ||
mne: "" | ||
}; | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Forgot to use this in constructor
- this.memStore = new ObservableStore({
- isUnlocked: false,
- data: '',
- password: '',
- currentAccount: {},
- mne: ""
- })
+ this.memStore = new ObservableStore(this.initLockedState())
@@ -22,37 +20,26 @@ | |||
"base64-arraybuffer": "0.2.0", | |||
"bech32": "2.0.0", | |||
"bignumber.js": "9.0.1", | |||
"bip32": "2.0.6", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yarn.lock file is out of sync
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok , i will fix it
src/popup/pages/Lock/index.js
Outdated
let cancelText = getLanguage('confirmRestore') | ||
let confirmText = getLanguage('cancelRestore') | ||
let tipImgSrc = txFailed | ||
content = [ | ||
getLanguage('restore_tip_1'), | ||
getLanguage('restore_tip_2'),] | ||
ConfirmModal.show({ | ||
title, | ||
content, | ||
cancelText, | ||
confirmText, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rename.
- cancelText and confirmText are reversed.
- confirmRestore should be confirmReset.
- onConfirmRestore should be onConfirmReset.
let cancelText = getLanguage('confirmRestore') | |
let confirmText = getLanguage('cancelRestore') | |
let tipImgSrc = txFailed | |
content = [ | |
getLanguage('restore_tip_1'), | |
getLanguage('restore_tip_2'),] | |
ConfirmModal.show({ | |
title, | |
content, | |
cancelText, | |
confirmText, | |
let confirmText = getLanguage('confirmReset') | |
let cancelText = getLanguage('cancelReset') | |
let tipImgSrc = txFailed | |
content = [ | |
getLanguage('restore_tip_1'), | |
getLanguage('restore_tip_2'),] | |
ConfirmModal.show({ | |
title, | |
content, | |
cancelText, | |
confirmText, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The button reversed is for users to focus on it. The left side is for confirmation. Generally, users are more accustomed to confirming on the right side, but this operation is very sensitive, so I hope to put it on the left to let users confirm. The reason for the name here is because most of the encapsulated components are canceled on the left, so the name is like this。 but i will change restore to reset , it's better
src/popup/pages/Lock/index.js
Outdated
<div className={"restore-bottom-container"} onClick={this.onClickRestore}> | ||
<p className="restore-bottom">{getLanguage('resetWallet')}</p> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Move onClick
to .restore-bottom
element (because .restore-bottom
has cursor: pointer
)
renderSpicalStyle = (list,outerIndex) => { | ||
return ( | ||
<p className={"wallet-tip-description"} key={outerIndex+""}> | ||
{ | ||
list.map((item, index) => { | ||
if (item.type === "common") { | ||
return (<span key={index + ""}>{item.showStr}</span>) | ||
} else { | ||
return (<span key={index + ""} className={"tips-spical"}>{item.showStr}</span>) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is too complex to maintain. Just use Trans
element from react-i18next
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The prompts displayed here are passed over. If you use Trans, you may need to pass components over. I don’t find it difficult to maintain, because when you want a special display, you can directly add special symbols. Trans is the same, and The bolding here is not a variable, I don’t think there is any difference between using Trans and the current one
i will close this PR and open another one |
confirming that the version change is removed from this PR as requested, thanks |
issue fix ,contain
#2, #6, #7, #9, #10, #11, #13, #14, #40, #52, #53