Darwinia staking #8131
Darwinia staking #8131
Conversation
# Conflicts: # packages/page-staking/package.json # yarn.lock
# Conflicts: # packages/page-staking/package.json # yarn.lock
# Conflicts: # packages/page-staking/package.json # yarn.lock
# Conflicts: # packages/page-staking/package.json # packages/react-hooks/package.json # yarn.lock
# Conflicts: # packages/page-staking/package.json # yarn.lock
# Conflicts: # packages/page-staking/package.json # packages/react-components/package.json # packages/react-hooks/package.json # yarn.lock
# Conflicts: # packages/page-staking/package.json # yarn.lock
# Conflicts: # packages/page-staking/package.json # yarn.lock
|
Hi @jacogr . Could you please help me reviewing this pull request. Thanks for your time. |
# Conflicts: # packages/page-staking/package.json # yarn.lock
|
@jacogr please help me reviewing this pull request. Thanks for your time. |
# Conflicts: # packages/page-staking/package.json # yarn.lock
|
@jacogr I'm so sorry for the inconvenience. Please help me reviewing this pull request. I've made some changes in some package.json files, if you don't merge my code on time, there will still be some conflicts like the ones that have been happening. If that still goes on that means my code will forever be impossible to merge with the master branch. Thank you so much for your time 🙏 |
# Conflicts: # packages/page-staking/package.json # yarn.lock
|
I'm aware of the PR - just have a bunch of stuff to dive into atm, so the review queue is a bit behind. |
# Conflicts: # packages/page-staking/package.json # yarn.lock
|
@jacogr I'm so sorry for the incovenience. I've actually made some changes on the package.json file, specifically in packages/page-staking/package.json file. I've noticed that your the version number changes very frequent. This makes it almost impossible for me to merge my code with yours unless you merge my code first before merging any other code. Thank you sooo much |
|
Yes, the packages update on each merge. I would not try to keep on top-of those until approved and then just do a final merge if required. Having said that, I have not taken a look - but generally, you don't want to mess with |
# Conflicts: # packages/page-staking/package.json # yarn.lock
|
@jacogr I have to use bignumber.js for some Darwinia power calculations. Please allow me to add this one package. Thanks in deed |
# Conflicts: # packages/page-staking/package.json # packages/react-hooks/package.json # yarn.lock
# Conflicts: # packages/apps-routing/package.json # packages/page-staking/package.json # packages/react-components/package.json # packages/react-hooks/package.json # yarn.lock
|
@jacogr Hi! Please help me reviewing this PR. Thanks for your time |
|
Hi @jacogr .Sorry for the inconvenience, could you please help me reviewing this PR. Thank you so much for your time |
# Conflicts: # packages/apps-routing/package.json # packages/apps/public/locales/en/react-components.json # packages/apps/public/locales/en/translation.json # packages/page-staking/src/Actions/Account/Unbond.tsx # packages/page-staking/src/Actions/Account/index.tsx # packages/page-staking/src/Query/ChartStake.tsx # packages/page-staking/src/Targets/Summary.tsx # packages/page-staking/src/Targets/Validator.tsx # packages/page-staking/src/Targets/index.tsx # packages/page-staking/src/Validators/Address/StakeOther.tsx # packages/page-staking/src/Validators/Address/index.tsx # packages/page-staking/src/index.tsx # packages/react-api/src/Api.tsx # packages/react-components/package.json # packages/react-components/src/AddressInfo.tsx # packages/react-components/src/Balance.tsx # packages/react-components/src/CardSummary.tsx # packages/react-hooks/package.json # packages/react-hooks/src/types.ts # packages/react-query/src/FormatBalance.tsx # yarn.lock
-Changed the Test Rococo and Parachains' Pangolin RPC
Added Darwinia staking functionality.