@@ -185,7 +185,7 @@ export default function createClass <ApiType extends ApiTypes> ({ api, apiType,
185185 ) ;
186186 }
187187
188- #observeStatus = ( status : ExtrinsicStatus ) : Observable < ISubmittableResult > => {
188+ #observeStatus = ( hash : Hash , status : ExtrinsicStatus ) : Observable < ISubmittableResult > => {
189189 if ( ! status . isFinalized && ! status . isInBlock ) {
190190 return of ( new SubmittableResult ( { status } ) ) ;
191191 }
@@ -197,7 +197,7 @@ export default function createClass <ApiType extends ApiTypes> ({ api, apiType,
197197 return api . derive . tx . events ( blockHash ) . pipe (
198198 map ( ( { block, events } ) : ISubmittableResult =>
199199 new SubmittableResult ( {
200- events : filterEvents ( this . hash , block , events , status ) ,
200+ events : filterEvents ( hash , block , events , status ) ,
201201 status
202202 } )
203203 )
@@ -213,9 +213,11 @@ export default function createClass <ApiType extends ApiTypes> ({ api, apiType,
213213 }
214214
215215 #observeSubscribe = ( updateId = - 1 ) : Observable < ISubmittableResult > => {
216+ const hash = this . hash ;
217+
216218 return api . rpc . author . submitAndWatchExtrinsic ( this ) . pipe (
217219 switchMap ( ( status ) : Observable < ISubmittableResult > =>
218- this . #observeStatus( status )
220+ this . #observeStatus( hash , status )
219221 ) ,
220222 tap ( ( status ) : void => {
221223 this . #updateSigner( updateId , status ) ;
0 commit comments