Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

Ethereum Branch Merge to Master #1872

Merged
merged 238 commits into from
Mar 9, 2020
Merged

Ethereum Branch Merge to Master #1872

merged 238 commits into from
Mar 9, 2020

Conversation

@hoffmabc
Copy link
Member

@hoffmabc hoffmabc commented Mar 9, 2020

Rc1 merge.

rmisio added 30 commits May 13, 2019 11:36
@rmisio
converting from integer to decimal in the listing short model
41b405d
@rmisio
base unti conversions in the listing models
f791c87
@rmisio
adding in the coin divisibility when creating a new listing
e74c1ea
@rmisio
setting the coinDivisibility in the Edit Listing modal
7d897a3
@rmisio
tweaking formatPrice to use coinDiv
2b8047e
@rmisio
fixd lint error
909af58
@rmisio
merging in top level nested model errors into the nested instances
9216bd3
@rmisio
removing the format pric function and instad doing error validations …
9760d2f 
…in the model
@rmisio
some lint cleanup
96cf85a
@rmisio
adjusting the formatCurrency function to base decimal places bases of…
7139d88 
…f of coin divsibility
@rmisio
some coinDivisibility related tweaks in the listing model for crypto …
20ac92c 
…cur listings
@rmisio
converting the crypto quantity in the listing model based on the coin…
52e4ab9 
… div
@rmisio
added some crypto quantity validations to the purchase item model
3ef2c1a
@rmisio
Using the coin divisibility to convert the moderator fee in the profile
dbce4a7
@rmisio
using the coinDivisibility to convert wallet balances
b3761b8
@rmisio
convrting the price in the transactions models using a coin div
bf82b34
@rmisio
initial implementation of an init function for the wallet currencies …
41fad47 
…module
@rmisio
initial changs to start.js to initialized the wallet currencies module
82f7d12
@rmisio
a couple bug tweaks in start regarding wallet cur initialization
2c14b4a
@rmisio
working through a couple precision related bugs in the edit listing m…
e37340f 
…odal
@rmisio
putting in some temporary code to account for ob-go bug 1694
764f9ef
@rmisio
removing temp code that accounted for a server bug which has since be…
db926f3 
…en fixed
@rmisio
fixed bug in the initialization of the resyncBlockchain module
d9dce7c
@rmisio
converting the wallet transaction value into an integer
2042a5e
@rmisio
updating the wallet balance model to consume the updated API schema
ffb3728
@rmisio
updatd the estimate fee functionality to handle the new amount schema…
f41d069 
… of the estimatefee api
@rmisio
WIP - updating the spend model to send an amount object
9b0ada2
@rmisio
updated the spend model to handle the new amount format
1ba7add
@rmisio
fixing an issue where the edit listing modal errored when open in cry…
017259e 
…pto listing currency mode
@rmisio
fixing an issue where a hidden moderation error can prevent a real er…
b5d80ba 
…ror from showing
rmisio and others added 28 commits December 13, 2019 15:24
@rmisio
fixed lint error
9850cfe
@rmisio
updated the payment notification handler to handle the updated payloa…
b2ace61 
…d from the server
@rmisio
lint fixes
e61ea7f
Merge branch 'master' into eth-master
10f42a9
@rmisio
Merge pull request #1850 from OpenBazaar/eth-master-update
7d9618c 
Eth master update
@rmisio
tweaks in the wallet stats area to better handle lengthy amounts
350a85e
@rmisio
updating the mod component to pass in an asyncID rather than relying …
92cef69 
…on the server to provide one
@rmisio
removing some debugging code
b82afd6
@rmisio
fixed issue where the moderator fixed fee curreency was not properly …
96eabae 
…being displayed in settings
@jjeffryes
Merge pull request #1838 from OpenBazaar/disput-payout-precision
8cde596 
Dispute payout precision
@rmisio
not showing the receipt total tip after the "pay" phase
03b13e0
@rmisio
fixed wrong variable reference in the spendConfirmBox template
eaf2896
@rmisio
mergd in eth-master
e013240
@rmisio
fixed lint errors
b76c078
@rmisio
capping the width of the fee column in the mod card so long decimals …
88b0df9 
…don't break the layout
@rmisio
setting escrow timeout hours to 1 on testnet
063342f
@jjeffryes
Merge pull request #1848 from OpenBazaar/more-tweaks
446289b 
More tweaks
better naming
6fd61d1
update package lock
65ea496
Merge branch 'master' into updateEthFromMaster
9b2249c
switch back to using a set
b9f0c1e
@rmisio
Merge pull request #1863 from OpenBazaar/updateEthFromMaster
b46514a 
Update eth from master
@rmisio
updates to the case and transaction model to convert the cur def as o…
820d422 
…pposed to a pure string based total
@rmisio
locking the version of the bignumber js npm package
ff13c5f
@jjeffryes
Merge pull request #1865 from OpenBazaar/transactions-api-fix
ec574f7 
Transactions api fix
@hoffmabc
Account for v4/v5 search API pricing schemas
5fc57ce
@hoffmabc
Linting fixes
6ac697e
@hoffmabc
Merge pull request #1871 from OpenBazaar/brian.fix-search-v5
f46c9dc 
Fix search results for v5 format
@hoffmabc hoffmabc self-assigned this Mar 9, 2020
@hoffmabc hoffmabc merged commit 8caf2b7 into master Mar 9, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

@hoffmabc hoffmabc

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@hoffmabc @rmisio @jjeffryes